Added remaining dynamic content on payout modal box #51
|
|
@ -8,7 +8,22 @@ if ($_SESSION["userId"] <> "") {
|
|||
header("location: login.php");
|
||||
}
|
||||
|
||||
// $customer_data = getCustomerbyLoginId($_SESSION["userId"]);
|
||||
if (isset($_SESSION["token"])) {
|
||||
$token = $_SESSION["token"];
|
||||
$token_parts = explode(".", $token);
|
||||
$token_payload = base64_decode($token_parts[1]);
|
||||
$token_data = json_decode($token_payload);
|
||||
|
||||
$issued_at_time = $token_data->iat;
|
||||
$expiration_time = $token_data->exp;
|
||||
$renewal_time = $issued_at_time + 3300;
|
||||
|
||||
if (time() >= $renewal_time || time() >= $expiration_time) {
|
||||
header("Location:vendor-payoutsTokenRN.php");
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
$vendorLoginId = searchVendorbyLoginId($_SESSION["userId"]);
|
||||
$vendorLoginIdjson = json_decode($vendorLoginId, true);
|
||||
if (isset($vendorLoginIdjson['results'][0])) {
|
||||
|
|
@ -17,24 +32,8 @@ if (isset($vendorLoginIdjson['results'][0])) {
|
|||
$_SESSION["LoggedInVendorId"] = $vendorId;
|
||||
}
|
||||
|
||||
$token = $_SESSION["token"];
|
||||
|
||||
$token_parts = explode(".", $token);
|
||||
$token_payload = base64_decode($token_parts[1]);
|
||||
$token_data = json_decode($token_payload);
|
||||
|
||||
$expiration_time = $token_data->exp;
|
||||
$issued_at_time = $token_data->iat;
|
||||
|
||||
$renewal_time = $issued_at_time + 3300;
|
||||
|
||||
|
||||
if (time() >= $renewal_time) {
|
||||
$token = loginRenew($_SESSION["email"], $_SESSION["password"], $token);
|
||||
$_SESSION["token"] = $token;
|
||||
}
|
||||
|
||||
$authToken = $_SESSION['token'];
|
||||
|
||||
$response = getAllPayout($authToken);
|
||||
$vendorPayoutData = json_decode($response, true);
|
||||
|
||||
|
|
@ -81,23 +80,6 @@ $vendorPayoutData = json_decode($response, true);
|
|||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2@latest/dist/css/select2.min.css" crossorigin="anonymous" referrerpolicy="no-referrer" />
|
||||
<script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/select2@latest/dist/js/select2.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||
<style>
|
||||
#pagination {
|
||||
display: flex;
|
||||
list-style: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
#pagination a {
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
padding: 5px 10px;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body class="shop_page">
|
||||
|
|
@ -155,19 +137,6 @@ $vendorPayoutData = json_decode($response, true);
|
|||
<!-- Sidebar Category Block -->
|
||||
<div class="ec-sidebar-block">
|
||||
<div class="ec-vendor-block">
|
||||
<!-- <div class="ec-vendor-block-items">
|
||||
<ul>
|
||||
<li><a href="vendor-dashboard.php">Dashboard</a></li>
|
||||
<li><a href="vendor-profile.html">Public Profile</a></li>
|
||||
<li><a href="vendor-uploads.html">Uploads</a></li>
|
||||
<li><a href="vendor-uploads.php">Uploads</a></li>
|
||||
<li><a href="#">Track Shipping</a></li>
|
||||
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
|
||||
<li><a href="vendor-dashboard.php">Dashboard</a></li>
|
||||
<li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
|
||||
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
|
||||
</ul>
|
||||
</div> -->
|
||||
<?php include "vendor-user-tabs.php" ?>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -269,12 +238,12 @@ $vendorPayoutData = json_decode($response, true);
|
|||
</strong>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="text-sm mt-3">
|
||||
<!-- <div class="text-sm mt-3">
|
||||
Payout Generation: Tue, Mar 25, 2024
|
||||
</div>
|
||||
<div class="text-sm">
|
||||
Receive Payout on or before: Wed, Mar 26, 2024
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="text-sm">
|
||||
Receipient: Philippine National Bank (PNB) Account ending in <?php echo $bankNumEnding?>
|
||||
</div>
|
||||
|
|
@ -324,10 +293,7 @@ $vendorPayoutData = json_decode($response, true);
|
|||
<td> <?php echo $payoutDate ?> </td>
|
||||
<td> <?php echo $status ?> </td>
|
||||
<td>
|
||||
<button type="button" class="btn btn-primary showSinglePayoutBtn" data-order-id="<?php echo $payoutId; ?>" data-bs-toggle="modal" data-bs-target="#payoutsModal">View</button>
|
||||
<!-- <button type="button" class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#payoutModal">
|
||||
Details
|
||||
</button> -->
|
||||
<button type="button" class="btn btn-primary btn-sm showSinglePayoutBtn" data-order-id="<?php echo $payoutId; ?>" data-bs-toggle="modal" data-bs-target="#payoutsModal">View</button>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
|
@ -336,7 +302,6 @@ $vendorPayoutData = json_decode($response, true);
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div id='pagination'></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -379,14 +344,14 @@ $vendorPayoutData = json_decode($response, true);
|
|||
<!-- raymart remove popup feb 20 2024 -->
|
||||
<!-- Recent Purchase Popup -->
|
||||
<!-- <div class=" recent-purchase">
|
||||
<img src="assets/images/product-image/1.jpg" alt="payment image">
|
||||
<div class="detail">
|
||||
<p>Someone in new just bought</p>
|
||||
<h6>stylish baby shoes</h6>
|
||||
<p>10 Minutes ago</p>
|
||||
</div>
|
||||
<a href="javascript:void(0)" class="icon-btn recent-close">×</a>
|
||||
</div> -->
|
||||
<img src="assets/images/product-image/1.jpg" alt="payment image">
|
||||
<div class="detail">
|
||||
<p>Someone in new just bought</p>
|
||||
<h6>stylish baby shoes</h6>
|
||||
<p>10 Minutes ago</p>
|
||||
</div>
|
||||
<a href="javascript:void(0)" class="icon-btn recent-close">×</a>
|
||||
</div> -->
|
||||
<!-- Recent Purchase Popup end -->
|
||||
|
||||
<!-- Cart Floating Button -->
|
||||
|
|
@ -637,30 +602,25 @@ $vendorPayoutData = json_decode($response, true);
|
|||
var bankNumEnding = bankNum.slice(-3); // Extract last three characters of bankNum
|
||||
var maskedBankNum = "Ending in " + bankNumEnding; // Create message
|
||||
var bankAccName = response.bank_information[0].bank_account_name;
|
||||
// var paymentType = response.transaction_logs[0].Type;
|
||||
// // var transDate = response.transaction_logs[0].Transaction + " " + date;
|
||||
// // var transGrossAmt = response.transaction_logs[0].Gross + " " + amount;
|
||||
// var transFee = response.transaction_logs[0].Fee;
|
||||
// // var transNetAmt = response.transaction_logs[0].Net + " " + amount;
|
||||
// var transDesc = response.transaction_logs[0].Description;
|
||||
var transactionLogsHtml = ''; // Initialize empty string to store HTML for transaction logs
|
||||
// Inside the success callback function
|
||||
var transactionLogsHtml = ''; // Initialize empty string to store HTML for transaction logs
|
||||
response.transaction_logs.forEach(function(log) {
|
||||
var paymentType = log.Type; // Assuming Transaction field holds the date
|
||||
var grossAmount = log.Gross; // Assuming Gross field holds the gross amount
|
||||
response.transaction_logs.forEach(function(log)
|
||||
{
|
||||
|
||||
var paymentType = log.Type;
|
||||
var transDate = log?.Transaction_date;
|
||||
var transGrossAmount = log?.Gross_Amount;
|
||||
var transFee = log.Fee;
|
||||
var netAmount = log.Net;
|
||||
var transNetAmount = log?.Net_Amount;
|
||||
var transDesc = log.Description;
|
||||
|
||||
// Append HTML for current transaction log to the transactionLogsHtml string
|
||||
transactionLogsHtml += `
|
||||
<tr>
|
||||
<td>${paymentType}</td>
|
||||
<td>Wala Muna</td>
|
||||
<td>₱ Wala muna</td>
|
||||
<td>${transDate}</td>
|
||||
<td>₱ ${transGrossAmount}</td>
|
||||
<td>- ₱ ${transFee}</td>
|
||||
<td>₱ Wala Muna</td>
|
||||
<td>₱ ${transNetAmount}</td>
|
||||
<td>${transDesc}</td>
|
||||
</tr>`;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
<?php
|
||||
|
||||
include "functions.php";
|
||||
|
||||
$token = loginRenew($_SESSION["email"], $_SESSION["password"], $_SESSION["token"]);
|
||||
$_SESSION["token"] = $token;
|
||||
|
||||
header("Location: vendor-payouts.php");
|
||||
exit;
|
||||
|
||||
?>
|
||||
Loading…
Reference in New Issue