louie_branch #65

Merged
MarkHipe merged 11 commits from louie_branch into main 2024-04-23 09:32:23 +08:00
2 changed files with 6 additions and 4 deletions
Showing only changes of commit c95015152d - Show all commits

View File

@ -101,7 +101,7 @@ $num_orders = count($all_orders);
<li class="dropdown-header">
<img src="assets/img/user/user.png" class="img-circle" alt="User Image" />
<div class="d-inline-block">
John Deo <small class="pt-1">john.example@gmail.com</small>
John Deo <small class="pt-1"><?php echo $_SESSION['email']?></small>
</div>
</li>
<li>

View File

@ -169,7 +169,7 @@ $vendorPayoutData = json_decode($response, true);
<div class="ec-vendor-card-body">
<div class="row">
<div class="col-md-4 mb-5">
<div class="col-md-12 mb-5">
<div class="panel panel-primary">
<div class="panel-heading">
<h5 class="panel-title"><strong>Upcoming Payout</strong></h5>
@ -219,6 +219,7 @@ $vendorPayoutData = json_decode($response, true);
</div>
</div>
</div>
<!-- ADDITIONAL PANELS FOR PAYOUTS FOR FUTURE USE, DO NOT REMOVE -->
<!-- <div class="col-md-4 mb-5">
<div class="panel panel-primary">
<div class="panel-heading">
@ -267,7 +268,7 @@ $vendorPayoutData = json_decode($response, true);
Receive Payout on or before: Wed, Mar 26, 2024
</div> -
<div class="text-sm">
Receipient: Philippine National Bank (PNB) Account ending in <?php echo $bankNumEnding?>
Receipient: Philippine National Bank (PNB) Account ending in <php echo $bankNumEnding?>
</div>
</div>
</div>
@ -616,6 +617,7 @@ $vendorPayoutData = json_decode($response, true);
console.log(response);
var grossAmount = response.gross_amount;
var totalFees = response.fees_deduction_adjustment;
var feeBreakdown = response.breakdown[0].transfer_fee;
var netAmount = response.net_amount;
var payoutStatus = response.status;
payoutStatus = payoutStatus.charAt(0).toUpperCase() + payoutStatus.slice(1).toLowerCase();
@ -675,7 +677,7 @@ $vendorPayoutData = json_decode($response, true);
<div class="fw-bold"> Fees, Deductions, Adjustments
</div>
<div> - ${totalFees}</div>
<div> - ${totalFees} (${feeBreakdown})</div>
</div>
<div class="d-flex justify-content-between p-2">
<div class="fw-bold"> Net Amount</div>