gwm
This commit is contained in:
sriramv
commit
c722038694
@ -39,6 +39,7 @@ $routes->match(['get','post'],'/member_add','Member_controller::member_add');
|
||||
$routes->match(['get','post'],'/member_address_form','Member_controller::member_address_form');
|
||||
$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'],'/check_old_password','Member_controller::check_old_password');
|
||||
|
||||
$routes->match(['post'],'/buy_pack','Member_controller::buy_pack');
|
||||
$routes->match(['post'],'/use_points','Member_controller::use_points');
|
||||
|
||||
@ -13,6 +13,8 @@ use Config\Services;
|
||||
use App\Libraries\SquareService;
|
||||
use App\Models\Cart_token_model;
|
||||
use App\Models\Member_address_model;
|
||||
use App\Models\transaction_model;
|
||||
use App\Models\Rule_model;
|
||||
|
||||
class Member_controller extends BaseController
|
||||
{
|
||||
@ -31,6 +33,8 @@ class Member_controller extends BaseController
|
||||
$this->CreditsUsageTrackingModel = new Credits_usage_tracking_model();
|
||||
$this->Cart_token_model = new Cart_token_model();
|
||||
$this->MemberAddressModel = new Member_address_model();
|
||||
$this->TransactionModel = new transaction_model();
|
||||
$this->RuleModel = new Rule_model();
|
||||
helper('form');
|
||||
}
|
||||
public function index()
|
||||
@ -543,13 +547,24 @@ class Member_controller extends BaseController
|
||||
|
||||
$array = $this->request->getVar();
|
||||
$id = $this->request->getVar('id');
|
||||
$update =$this->MemberAddressModel->where('id', $id )->where('member_id',session()->get('logged_user'))->set($array)->update();
|
||||
$update =$this->MemberModel->where('id', $id )->set($array)->update();
|
||||
if($update)
|
||||
{
|
||||
echo true;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
public function check_old_password()
|
||||
{
|
||||
$id = $this->request->getVar('id');
|
||||
$old_password = $this->request->getVar('old_password');
|
||||
$data =$this->MemberModel->where('id', $id )->find();
|
||||
if(password_verify($old_password , $data[0]['password']))
|
||||
echo 1;
|
||||
else
|
||||
echo 0;
|
||||
}
|
||||
|
||||
public function member_dashboard()
|
||||
@ -566,8 +581,31 @@ class Member_controller extends BaseController
|
||||
array_push($data['credit_data'] , $creditsDataValue);
|
||||
|
||||
}
|
||||
|
||||
$TransactionData = $this->TransactionModel->where('member_id', session()->get('logged_user'))->where('status', 'success')->findAll();
|
||||
$data['TransactionData'] = [];
|
||||
foreach ($TransactionData as $TransactionDatakey => $TransactionDatavalue) {
|
||||
$credit_data = $this->creditsModel->where('member_id', session()->get('logged_user'))
|
||||
->select('package_name')
|
||||
->select('cost')
|
||||
->select('credit_points')
|
||||
->select('expiring_date')
|
||||
->selectSum('credit_points', 'creditPointsSum')
|
||||
->selectSum('cost', 'costSum')
|
||||
->selectCount('package_name', 'pack_count')
|
||||
->groupBy('package_name')
|
||||
->where('order_id',$TransactionDatavalue['order_id'])
|
||||
->where('is_active',1)->findAll();
|
||||
$TransactionDatavalue['credit_data'] = $credit_data;
|
||||
array_push($data['TransactionData'] ,$TransactionDatavalue);
|
||||
}
|
||||
$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;
|
||||
|
||||
echo view('memberaccess',$data); //dashboard
|
||||
}
|
||||
|
||||
|
||||
|
||||
// -----------------------------------------------
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@
|
||||
|
||||
|
||||
<div class="quantity">
|
||||
<div class="d-flex"><span class="price-symbol">$</span><span class="price">500</span><span>x</span></div>
|
||||
<div class="d-flex"><span class="price-symbol">$</span><span class="price"><?= $value['cost']; ?></span><span>x</span></div>
|
||||
<input type="number" id="<?php echo $key; ?>" class="input-text qty text" name="count[]" value="<?php if ($pack_id[$key]['count'] == 0) {
|
||||
echo 1;
|
||||
} else {
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
<link href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@300;400;500;600;700&family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script>
|
||||
<script src="<?= base_url()."/public"; ?>/assets/member_js/ajax.js"></script>
|
||||
</head>
|
||||
<body class="memberaccess">
|
||||
<?php include 'member_layout/header.php' ?>
|
||||
@ -121,91 +122,85 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
<table class="table-white mb-5">
|
||||
<tr>
|
||||
<th>Order ID</th>
|
||||
<th>Order Date</th>
|
||||
<th>Cost</th>
|
||||
<th>Credit Usage</th>
|
||||
<th>Details</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>#EG452527</td>
|
||||
<td>2023-05-11 14:20:15</td>
|
||||
<td>$1000.00</td>
|
||||
<td></td>
|
||||
<td class="down-icon"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
<tr class="table-grey">
|
||||
<td>#EG452526</td>
|
||||
<td>2023-05-11 14:15:21</td>
|
||||
<td>$1550.00</td>
|
||||
<td><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> 4</td>
|
||||
<td><i class="fa fa-caret-up" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
<tr class="table-grey">
|
||||
<td>Items</td>
|
||||
<td>Description</td>
|
||||
<td>Nos</td>
|
||||
<td>Cost</td>
|
||||
<td>Credit Usage</td>
|
||||
</tr>
|
||||
<tr class="table-grey table-bottom">
|
||||
<td>Evo Pack 1</td>
|
||||
<td><p>Pack Credits:24 Nos</p><p>Pack Expiry:12-12-2023</p></td>
|
||||
<td>x1</td>
|
||||
<td><span>$</span>550.00</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey">
|
||||
<td>Evo Pack 2</td>
|
||||
<td><p>Pack Credits:24 Nos</p><p>Pack Expiry:12-12-2023</p></td>
|
||||
<td>x1</td>
|
||||
<td><span>$</span>550.00</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey table-bottom">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Subtotal</td>
|
||||
<td><span>$</span>595.80</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey table-bottom">
|
||||
<td></td>
|
||||
<td style="text-align:end;">Taxes</td>
|
||||
<td>PST(7%)</td>
|
||||
<td><span>$</span>41.70</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>GST(5%)</td>
|
||||
<td><span>$</span>29.79</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey table-bottom">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Total</td>
|
||||
<td><span>$</span>66.29</td>
|
||||
<td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> 4</div></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>#EGF452527</td>
|
||||
<td>2023-05-11 14:20:15</td>
|
||||
<td><span>$</span>1000.00</td>
|
||||
<td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-grey.png" alt=""> 4</div></td>
|
||||
<td><i class="fa fa-caret-down" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Order ID</th>
|
||||
<th>Order Date</th>
|
||||
<th>Cost</th>
|
||||
<th>Credit Usage</th>
|
||||
<th>Details</th>
|
||||
</tr>
|
||||
<?php foreach ($TransactionData as $key => $value) { ?>
|
||||
<tr>
|
||||
<td>#<?= $value['order_id'] ?></td>
|
||||
<td><?= $value['created_at'] ?></td>
|
||||
<td>$<?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
|
||||
<td></td>
|
||||
<td class="down-icon" id="<?= $key."_table-grey" ?>"><i class="fa fa-caret-down" aria-hidden="true"></i></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td><?= $value['order_id'] ?></td>
|
||||
<td><?= $value['created_at'] ?></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></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td>Items</td>
|
||||
<td>Description</td>
|
||||
<td>Nos</td>
|
||||
<td>Cost</td>
|
||||
<td>Credit Usage</td>
|
||||
</tr>
|
||||
<?php foreach ($value['credit_data'] as $credit_datakey => $credit_data_value) { ?>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
|
||||
<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>x<?= $credit_data_value['pack_count'] ?></td>
|
||||
<td><span>$</span><?= $credit_data_value['costSum'] ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Subtotal</td>
|
||||
<td><span>$</span><?= array_sum(array_column($value['credit_data'],'costSum')) ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
|
||||
<td></td>
|
||||
<td style="text-align:end;">Taxes</td>
|
||||
<td>PST (<?= $pst ?>%)</td>
|
||||
<td><span>$</span><?= round(array_sum(array_column($value['credit_data'],'costSum')) * $pst / 100 , 2) ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?>">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>GST (<?= $gst ?>%)</td>
|
||||
<td><span>$</span><?= round(array_sum(array_column($value['credit_data'],'costSum')) * $gst / 100 , 2) ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr class="table-grey <?= $key."_table-grey" ?> table-bottom">
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>Total</td>
|
||||
<td><span>$</span><?= json_decode($value['transaction'] , true)['payment']['amount_money']['amount']; ?></td>
|
||||
<td><div><img src="<?= base_url()."/public/"; ?>assets/member_images/table-order-icon-white.png" alt=""> -</div></td>
|
||||
</tr>
|
||||
|
||||
<?php } ?>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="Profile" class="tabcontent" style="display:none;">
|
||||
<form action="">
|
||||
<div class="row information mb-5">
|
||||
<form id="member-address-save">
|
||||
<input type="hidden" name="id" id="id" value="<?= session()->get('logged_user'); ?>"/>
|
||||
<input type="hidden" id="url" value="<?= base_url(); ?>"/>
|
||||
<div class="row information mb-5">
|
||||
|
||||
<div class="col-6 col-lg-6">
|
||||
<h5 class="dashboard-maintitle">Personal Information</h5>
|
||||
@ -214,73 +209,78 @@
|
||||
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="first_name">First Name</label><br>
|
||||
<input type="text" name="first_name" id="first_name"/>
|
||||
<input type="text" name="name" id="first_name" value="<?= $profile[0]['name']?>"/>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="last_name">Last Name</label><br>
|
||||
<input type="text" name="last_name" id="last_name"/>
|
||||
<input type="text" name="last_name" id="last_name" value="<?= $profile[0]['last_name']?>" />
|
||||
</div>
|
||||
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="street_address">Street Address</label><br>
|
||||
<input type="text" name="street_address" id="street_address">
|
||||
<input type="text" name="address" id="street_address" value="<?= $profile[0]['address']?>">
|
||||
</div>
|
||||
<div class="col-6 col-lg-6">
|
||||
<label>Select your gender</label>
|
||||
<div class="row mt-1">
|
||||
<div class="col-3 col-lg-3"><input type="radio" name="male" id="male"><label for="male">Male</label></div>
|
||||
<div class="col-4 col-lg-4"><input type="radio" name="female" id="female"><label for="female">Female<label> </div>
|
||||
<div class="col-5 col-lg-5"><input type="radio" name="non-binary" id="non-binary"><label for="non-binary">Non-binary</label></div>
|
||||
<div class="col-3 col-lg-3"><input type="radio" name="gender" value="male" id="gender" <?php if($profile[0]['gender'] == 'male') { echo 'checked';} ?>><label for="male">Male</label></div>
|
||||
<div class="col-4 col-lg-4"><input type="radio" name="gender" value="female" id="gender" <?php if($profile[0]['gender'] == 'female') { echo 'checked';} ?>><label for="female">Female<label> </div>
|
||||
<div class="col-5 col-lg-5"><input type="radio" name="gender" value="non-binary" id="gender" <?php if($profile[0]['gender'] == 'non-binary') { echo 'checked';} ?>><label for="non-binary">Non-binary</label></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-4 col-lg-4 mb-3">
|
||||
<label for="city">City</label><br>
|
||||
<input type="text" name="city" id="city">
|
||||
<input type="text" name="city" id="city" value="<?= $profile[0]['city']?>">
|
||||
</div>
|
||||
<div class="col-4 col-lg-4 mb-3">
|
||||
<label for="state">State</label><br>
|
||||
<input type="text" name="state" id="state">
|
||||
<input type="text" name="state" id="state" value="<?= $profile[0]['state']?>">
|
||||
</div>
|
||||
<div class="col-4 col-lg-4 mb-3">
|
||||
<label for="zipcode">Zip Code</label><br>
|
||||
<input type="text" name="zipcode" id="zipcode">
|
||||
<input type="text" name="pincode" id="zipcode" value="<?= $profile[0]['pincode']?>">
|
||||
</div>
|
||||
|
||||
<div class="col-6 col-lg-6">
|
||||
<button>save</button>
|
||||
<div id="address-btn" class="custom-btn">save</div>
|
||||
<div class="success-message" style="display:none;">Successfully Saved</div>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
|
||||
<div class="password">
|
||||
|
||||
<h3>Change Password</h3>
|
||||
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="old_password">Old Password</label><br>
|
||||
<input type="text" name="old_password" id="old_password">
|
||||
<input type="text" name="old_password" id="old_password" required>
|
||||
<span id="error_op"></span>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="new_password">New Password</label><br>
|
||||
<input type="text" name="new_password" id="new_password">
|
||||
<input type="text" name="password" id="new_password" required>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
<div class="col-6 col-lg-6 mb-3">
|
||||
<label for="confirm_password">Confirm Password</label><br>
|
||||
<input type="text" name="confirm_password" id="confirm_password">
|
||||
<input type="text" name="confirm_password" id="confirm_password" required>
|
||||
<span id="error_cp"></span>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
|
||||
<div class="col-6 col-lg-6">
|
||||
<button>update</button>
|
||||
<button id="pass-btn" class="custom-btn">update</button>
|
||||
<div class="success-message" style="display:none;">Successfully Saved</div>
|
||||
</div>
|
||||
<div class="col-6 col-lg-6"></div>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -312,7 +312,8 @@
|
||||
<script>
|
||||
$(document).ready(function(){
|
||||
$(".down-icon").click(function(){
|
||||
$(".table-grey").slideToggle();
|
||||
id = $(this).attr('id');
|
||||
$("."+id+"").slideToggle();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user