Obanana.Corporation
/
obanana_b2b_test
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Obanana.Corporation:142418da3c391597729ed04293e8c2d9f6856402
Branches Tags
Obanana.Corporation:main
Obanana.Corporation:louie_branch
Obanana.Corporation:mark_4
Obanana.Corporation:gelo_branch
Obanana.Corporation:stacy_branch
Obanana.Corporation:raymart_branch
Obanana.Corporation:jun-branch
Obanana.Corporation:mark_3
Obanana.Corporation:mark
Obanana.Corporation:mark_2
Obanana.Corporation:working_vendor_upload_branch
...
compare: Obanana.Corporation:533f64d4fe443285a9a7663e714aaf1edefb0e60
Branches Tags
Obanana.Corporation:main
Obanana.Corporation:louie_branch
Obanana.Corporation:mark_4
Obanana.Corporation:gelo_branch
Obanana.Corporation:stacy_branch
Obanana.Corporation:raymart_branch
Obanana.Corporation:jun-branch
Obanana.Corporation:mark_3
Obanana.Corporation:mark
Obanana.Corporation:mark_2
Obanana.Corporation:working_vendor_upload_branch

14 Commits
142418da3c ... 533f64d4fe

Author SHA1 Message Date
MarkHipe 533f64d4fe Merge pull request 'Added remaining dynamic content on payout modal box' (#51) from louie_branch into main 
Reviewed-on: #51
 2024-04-16 11:00:34 +08:00
jouls c62160014f Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-16 10:55:57 +08:00
jouls 3609c5eee6 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:05:32 +08:00
jouls 9a39b1e116 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:05:06 +08:00
jouls 0adfc24884 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:03:25 +08:00
jouls 82d8191c53 added token refresh on vendor payouts 2024-04-12 16:03:14 +08:00
jouls 7751fecf0c added token refresh on vendor payouts 2024-04-12 15:58:43 +08:00
jouls cf866edd41 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 08:33:06 +08:00
jouls 6feb68fde8 removed unneccesary comments 2024-04-05 12:59:25 +08:00
jouls c94863aa99 Merge branch 'main' into louie_branch 2024-04-04 18:22:54 +08:00
jouls c92635ca1c Merge branch 'main' into louie_branch 2024-04-04 18:10:57 +08:00
jouls f121a053ee removed unused codes 2024-04-02 10:37:35 +08:00
jouls d8f5ed576c Merge branch 'main' into louie_branch 2024-04-02 08:40:58 +08:00
jouls 55affaa372 Added remaining dynamic content on payout modal box 2024-03-26 18:15:52 +08:00
2 changed files with 49 additions and 78 deletions
Show Stats Expand all files Collapse all files

116
vendor-payouts.php
View File

@ -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>`;
});

11
vendor-payoutsTokenRN.php Normal file
View File

@ -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;
?>