From 55affaa372bf7e6ed65a195ad166a2bcf679ab50 Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 26 Mar 2024 18:15:52 +0800 Subject: [PATCH 1/5] Added remaining dynamic content on payout modal box --- vendor-payouts.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 5b84f9c..f6db480 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -645,21 +645,24 @@ $vendorPayoutData = json_decode($response, true); 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 += ` ${paymentType} - Wala Muna - ₱ Wala muna + ${transDate} + ₱ ${transGrossAmount} - ₱ ${transFee} - ₱ Wala Muna + ₱ ${transNetAmount} ${transDesc} `; }); -- 2.40.1 From f121a053ee0caa7539eb2716b85e38a9bbe87657 Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 2 Apr 2024 10:37:35 +0800 Subject: [PATCH 2/5] removed unused codes --- vendor-payouts.php | 57 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 46 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 2e751f9..7970417 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -8,7 +8,6 @@ if ($_SESSION["userId"] <> "") { header("location: login.php"); } -// $customer_data = getCustomerbyLoginId($_SESSION["userId"]); $vendorLoginId = searchVendorbyLoginId($_SESSION["userId"]); $vendorLoginIdjson = json_decode($vendorLoginId, true); if (isset($vendorLoginIdjson['results'][0])) { @@ -81,23 +80,6 @@ $vendorPayoutData = json_decode($response, true); - @@ -155,19 +137,6 @@ $vendorPayoutData = json_decode($response, true);
-
@@ -269,12 +238,12 @@ $vendorPayoutData = json_decode($response, true); -
+
Receipient: Philippine National Bank (PNB) Account ending in
@@ -324,10 +293,7 @@ $vendorPayoutData = json_decode($response, true); - - +
- @@ -379,14 +344,14 @@ $vendorPayoutData = json_decode($response, true); + payment image +
+

Someone in new just bought

+
stylish baby shoes
+

10 Minutes ago

+
+ × + --> -- 2.40.1 From 6feb68fde8e568443a1f8473251cb244247bf430 Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 5 Apr 2024 12:59:25 +0800 Subject: [PATCH 3/5] removed unneccesary comments --- vendor-payouts.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 7970417..825094c 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -602,14 +602,6 @@ $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) { -- 2.40.1 From 7751fecf0c5380de5911ab87ab4f4c296d411714 Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 12 Apr 2024 15:58:43 +0800 Subject: [PATCH 4/5] added token refresh on vendor payouts --- vendor-payouts.php | 35 ++++++++++++++++++----------------- vendor-payoutsTokenRN.php | 11 +++++++++++ 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 vendor-payoutsTokenRN.php diff --git a/vendor-payouts.php b/vendor-payouts.php index 825094c..b525125 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -8,6 +8,22 @@ if ($_SESSION["userId"] <> "") { header("location: login.php"); } +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])) { @@ -16,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); @@ -142,6 +142,7 @@ $vendorPayoutData = json_decode($response, true); +
diff --git a/vendor-payoutsTokenRN.php b/vendor-payoutsTokenRN.php new file mode 100644 index 0000000..7b62c10 --- /dev/null +++ b/vendor-payoutsTokenRN.php @@ -0,0 +1,11 @@ + -- 2.40.1 From 82d8191c53d97491c4a8cbc63d6c54775274bd0a Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 12 Apr 2024 15:58:43 +0800 Subject: [PATCH 5/5] added token refresh on vendor payouts --- vendor-payouts.php | 34 +++++++++++++++++----------------- vendor-payoutsTokenRN.php | 11 +++++++++++ 2 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 vendor-payoutsTokenRN.php diff --git a/vendor-payouts.php b/vendor-payouts.php index 825094c..d4bb7b5 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -8,6 +8,22 @@ if ($_SESSION["userId"] <> "") { header("location: login.php"); } +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])) { @@ -16,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); diff --git a/vendor-payoutsTokenRN.php b/vendor-payoutsTokenRN.php new file mode 100644 index 0000000..7b62c10 --- /dev/null +++ b/vendor-payoutsTokenRN.php @@ -0,0 +1,11 @@ + -- 2.40.1