This commit is contained in:
suseendhiran17 2023-06-08 13:21:36 +05:30
parent f7fba0c3c1
commit 660846a5ca
7 changed files with 78 additions and 34 deletions

View File

@ -26,14 +26,14 @@ class Database extends Config
*/ */
public array $default = [ public array $default = [
'DSN' => '', 'DSN' => '',
// 'hostname' => '43.225.55.221', 'hostname' => '43.225.55.221',
// 'username' => 'mprkvcoi_golf879', 'username' => 'mprkvcoi_golf879',
// 'password' => 'j3Lq(S1J9HFd', 'password' => 'j3Lq(S1J9HFd',
// 'database' => 'mprkvcoi_golf879', 'database' => 'mprkvcoi_golf879',
'hostname' => 'localhost', // 'hostname' => 'localhost',
'username' => 'root', // 'username' => 'root',
'password' => '', // 'password' => '',
'database' => 'golf', // 'database' => 'golf',
'DBDriver' => 'mysqli', 'DBDriver' => 'mysqli',
'DBPrefix' => '', 'DBPrefix' => '',
'pConnect' => false, 'pConnect' => false,

View File

@ -40,6 +40,7 @@ $routes->match(['get','post'],'/member_address_form','Member_controller::member_
$routes->match(['get','post'],'/member_address_edit_or_add','Member_controller::member_address_edit_or_add'); $routes->match(['get','post'],'/member_address_edit_or_add','Member_controller::member_address_edit_or_add');
$routes->match(['get','post'],'/member_home','Member_controller::member_dashboard'); $routes->match(['get','post'],'/member_home','Member_controller::member_dashboard');
$routes->match(['get','post'],'/check_old_password','Member_controller::check_old_password'); $routes->match(['get','post'],'/check_old_password','Member_controller::check_old_password');
$routes->match(['get','post'],'/zipcode_data','Member_controller::zipcode_data');
$routes->match(['post'],'/buy_pack','Member_controller::buy_pack'); $routes->match(['post'],'/buy_pack','Member_controller::buy_pack');
$routes->match(['post'],'/use_points','Member_controller::use_points'); $routes->match(['post'],'/use_points','Member_controller::use_points');

View File

@ -15,6 +15,7 @@ use App\Models\Cart_token_model;
use App\Models\Member_address_model; use App\Models\Member_address_model;
use App\Models\transaction_model; use App\Models\transaction_model;
use App\Models\Rule_model; use App\Models\Rule_model;
use App\Models\Zipcode_model;
class Member_controller extends BaseController class Member_controller extends BaseController
{ {
@ -35,6 +36,7 @@ class Member_controller extends BaseController
$this->MemberAddressModel = new Member_address_model(); $this->MemberAddressModel = new Member_address_model();
$this->TransactionModel = new transaction_model(); $this->TransactionModel = new transaction_model();
$this->RuleModel = new Rule_model(); $this->RuleModel = new Rule_model();
$this->ZipcodeModel = new Zipcode_model();
helper('form'); helper('form');
} }
public function index() public function index()
@ -573,6 +575,10 @@ class Member_controller extends BaseController
public function member_dashboard() public function member_dashboard()
{ {
$creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll(); $creditsData = $this->creditsModel->where('member_id',$this->session->get('logged_user'))->orderBy('id' , 'ASC')->findAll();
$recent_expiry = $this->creditsModel->select('expiring_date')->selectSum('running_balance', 'no_of_credits')->groupBy('expiring_date')->orderBy('expiring_date', 'asc')->where('member_id',$this->session->get('logged_user'))->where('is_active',1)->first();
$data['no_of_credits'] = $recent_expiry['no_of_credits'];
$data['expiring_date'] = $recent_expiry['expiring_date'];
$data['credit_data'] = []; $data['credit_data'] = [];
$data['avaiable_credit'] = 0; $data['avaiable_credit'] = 0;
// $data['no_of_credits']; // $data['no_of_credits'];
@ -607,10 +613,26 @@ class Member_controller extends BaseController
} }
$data['gst'] = $this->RuleModel->select('value')->where('rule_key', 3 )->get()->getRow()->value; $data['gst'] = $this->RuleModel->select('value')->where('rule_key', 3 )->get()->getRow()->value;
$data['pst'] = $this->RuleModel->select('value')->where('rule_key', 4 )->get()->getRow()->value; $data['pst'] = $this->RuleModel->select('value')->where('rule_key', 4 )->get()->getRow()->value;
$zip = $this->ZipcodeModel->findAll();
$output = '<option value="">Select Zipcode</option>';
foreach($zip as $row)
{
$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
}
$data['zipcode'] = $output;
echo view('memberaccess',$data); //dashboard echo view('memberaccess',$data); //dashboard
} }
public function zipcode_data()
{
$id = $this->request->getVar('id');
$data = $this->ZipcodeModel->where('id' , $id)->find();
if($data)
echo json_encode($data);
else
echo 0;
}
// ----------------------------------------------- // -----------------------------------------------

View File

@ -18,6 +18,7 @@ use App\Models\Credits_usage_tracking_model;
use App\Models\Rule_model; use App\Models\Rule_model;
use App\Models\Cart_token_model; use App\Models\Cart_token_model;
use App\Models\Member_address_model; use App\Models\Member_address_model;
use App\Models\Zipcode_model;
class PaymentController extends BaseController class PaymentController extends BaseController
{ {
@ -36,6 +37,7 @@ class PaymentController extends BaseController
$this->RuleModel = new Rule_model(); $this->RuleModel = new Rule_model();
$this->Cart_token_model = new Cart_token_model(); $this->Cart_token_model = new Cart_token_model();
$this->MemberAddressModel = new Member_address_model(); $this->MemberAddressModel = new Member_address_model();
$this->ZipcodeModel = new Zipcode_model();
} }
@ -158,6 +160,14 @@ class PaymentController extends BaseController
$insert = $this->TransactionModel->save($TrancactionData); $insert = $this->TransactionModel->save($TrancactionData);
} }
$zip = $this->ZipcodeModel->findAll();
$output = '<option value="">'.$data['userdata'][0]['pincode'].'</option>';
foreach($zip as $row)
{
$output .= '<option value="'.$row['id'].'">'.$row['code'].'</option>';
}
$data['zipcode'] = $output;
echo view('checkout',$data); echo view('checkout',$data);
} else { return redirect()->to(base_url()."view/".md5(session()->get('logged_user'))); } } else { return redirect()->to(base_url()."view/".md5(session()->get('logged_user'))); }

View File

@ -0,0 +1,13 @@
<?php namespace App\Models;
use CodeIgniter\Model;
class Zipcode_model extends Model
{
protected $table = 'zipcode';
protected $primaryKey = 'id';
protected $allowedFields = ['code','state','city','is_active'];
}

View File

@ -145,19 +145,19 @@ $web_payment_sdk_url = $_ENV["ENVIRONMENT"] === Environment::PRODUCTION ? "https
<label for="address">Street Address</label> <label for="address">Street Address</label>
<input type="text" value="<?= $userdata[0]['address']; ?>" name="address" id="address"> <input type="text" value="<?= $userdata[0]['address']; ?>" name="address" id="address">
</div> </div>
<div class="col-lg-4 mb-3">
<label for="zipcode">Zip Code</label>
<select name="pincode" id="pincode">
<?= $zipcode ?>
</select>
</div>
<div class="col-lg-4 mb-3"> <div class="col-lg-4 mb-3">
<label for="city">City</label> <label for="city">City</label>
<input type="text" value="<?= $userdata[0]['city']; ?>" name="city" id="city"> <input type="text" value="<?= $userdata[0]['city']; ?>" name="city" id="city">
</div> </div>
<div class="col-lg-4 mb-3"> <div class="col-lg-4 mb-3">
<label for="state">State</label> <label for="state">State</label>
<select id="state" name="state"> <input type="text" name="state" id="state" value="<?= $userdata[0]['state']; ?>">
<option value="<?= $userdata[0]['state']; ?>"><?= $userdata[0]['state']; ?></option>
</select>
</div>
<div class="col-lg-4 mb-3">
<label for="zipcode">Zip Code</label>
<input type="text" value="<?= $userdata[0]['pincode']; ?>" name="pincode" id="zipcode">
</div> </div>
</div> </div>
<!-- <div class="row form-button"> <!-- <div class="row form-button">

View File

@ -114,16 +114,14 @@
<div class="col-lg-4"> <div class="col-lg-4">
<div>Upcoming Credit Expiry:</div> <div>Upcoming Credit Expiry:</div>
</div> </div>
<?php foreach ($credit_data as $key => $value) {
if($value['running_balance'] != 0) { ?>
<div class="col-lg-4"> <div class="col-lg-4">
<div>Credits: <span><?= $value['running_balance'] ?></span></div> <div>Credits: <span><?= $no_of_credits ?></span></div>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<div>Expiry Date: <span><?php $date = new DateTime($value['expiring_date']); echo $date->format('M-d-Y'); ?></span></div> <div>Expiry Date: <span><?php $date = new DateTime($expiring_date); echo $date->format('M-d-Y'); ?></span></div>
</div> </div>
<?php }
break; } ?>
</div> </div>
</div> </div>
</div> </div>
@ -143,14 +141,14 @@
<?php foreach ($TransactionData as $key => $value) { ?> <?php foreach ($TransactionData as $key => $value) { ?>
<tr> <tr>
<td>#<?= $value['order_id'] ?></td> <td>#<?= $value['order_id'] ?></td>
<td><?= $value['created_at'] ?></td> <td><?php $date = new DateTime($value['created_at']); echo $date->format('M-d-Y'); ?></td>
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td> <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
<td></td> <td></td>
<td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td> <td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
</tr> </tr>
<tr class="table-grey <?= $key."_table-grey" ?>"> <tr class="table-grey <?= $key."_table-grey" ?>">
<td><?= $value['order_id'] ?></td> <td><?= $value['order_id'] ?></td>
<td><?= $value['created_at'] ?></td> <td><?php $date = new DateTime($value['created_at']); echo $date->format('M-d-Y'); ?></td>
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td> <td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
<td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td> <td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> - </td>
<td></td> <td></td>
@ -165,7 +163,7 @@
<?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?> <?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?>
<tr class="table-grey <?= $key."_table-grey" ?> table-bottom"> <tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
<td><?= $credit_data_value['package_name'] ?></td> <td><?= $credit_data_value['package_name'] ?></td>
<td><p>Pack Cost:$<?= $credit_data_value['cost'] ?></p><p>Pack Credits:<?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry:<?= $credit_data_value['expiring_date'] ?></p></td> <td><p>Pack Cost : $<?= $credit_data_value['cost'] ?></p><p>Pack Credits : <?= $credit_data_value['credit_points'] ?> Nos</p><p>Pack Expiry : <?php $date = new DateTime($credit_data_value['expiring_date']); echo $date->format('M-d-Y'); ?></p></td>
<td>x<?= $credit_data_value['pack_count'] ?></td> <td>x<?= $credit_data_value['pack_count'] ?></td>
<td><span>$</span><?= $credit_data_value['costSum'] ?></td> <td><span>$</span><?= $credit_data_value['costSum'] ?></td>
<td></td> <td></td>
@ -241,9 +239,9 @@
</div> </div>
<div class="col-4 col-lg-4 mb-3"> <div class="col-4 col-lg-4 mb-3">
<label for="zipcode">Zip Code</label><br> <label for="zipcode">Zip Code</label><br>
<input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>"> <!-- <input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>"> -->
<select id="selectize-select" class="form-control city" name="city" id="city"> <select name="pincode" id="pincode">
<?php if(isset($Memberdata)){ ?> <option value="<?= $Memberdata[0]['city']; ?>"> <?= $Memberdata[0]['city_name']; ?> </option> <?php } ?> <?= $zipcode ?>
</select> </select>
</div> </div>
<div class="col-4 col-lg-4 mb-3"> <div class="col-4 col-lg-4 mb-3">