From 9d3c301ab5c5f45c6e587095c1e3659306ee44dc Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 22 Mar 2024 10:40:44 +0800 Subject: [PATCH 01/11] changes on the data table format --- vendor-payouts.php | 67 +++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 970d1a4..96f269b 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -241,47 +241,34 @@ if ($_SESSION["userId"] <> "") { $val) { $vendorIdCheck = $val['vendor_details'][0]['vendor_id']; - if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($val['status'] == "DEPOSITED")) { - echo ""; - echo "" . "₱ " . $val['net_amount'] . ""; - if (empty($val['bank_information'][0]['bank_name']) == false) { - echo "" . $val['bank_information'][0]['bank_name'] . ""; - // echo "" . $val['bank_information'][0]['account_number'] . ""; - } else { - echo 'N/A'; - } - if (empty($val['bank_information'][0]['bank_account_number']) == false) { - $accNum = $val['bank_information'][0]['bank_account_number']; - // Replace characters with asterisks for all characters except the last three segments - $maskedAccNum = substr_replace($accNum, str_repeat('*', strlen($accNum) - 3), 0, -3); - echo "" . $maskedAccNum . ""; - // echo "" . $val['bank_information'][0]['bank_account_number'] . ""; - } else { - echo 'N/A'; - }; - echo "December 08, 2024"; - echo "" . $val['status'] . ""; - echo "" . - "" . - ""; - echo ""; + if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($val['status'] == "DEPOSITED")) { ?> + + + + + + N/A + + + + N/A + + December 08, 2023 + + + + + + - + } ?> From ce9edf65938481c228c25f54d91f1226eede3fe4 Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 22 Mar 2024 14:10:51 +0800 Subject: [PATCH 02/11] added get payout by Id function --- functions.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/functions.php b/functions.php index ed25bb6..5748d5f 100644 --- a/functions.php +++ b/functions.php @@ -1858,3 +1858,27 @@ function getAllPayout($token) return $response; } + +function getPayoutById($id, $token) +{ + $curl = curl_init(); + curl_setopt_array($curl, array( + CURLOPT_URL => "https://" . $_SESSION["data_endpoint"] . "/api/v1/payouts/$id", + CURLOPT_RETURNTRANSFER => true, + CURLOPT_ENCODING => '', + CURLOPT_MAXREDIRS => 10, + CURLOPT_TIMEOUT => 0, + CURLOPT_FOLLOWLOCATION => true, + CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1, + CURLOPT_CUSTOMREQUEST => 'GET', + CURLOPT_HTTPHEADER => array( + 'X-Api-Key: {{apiKey}}', + 'Content-Type: application/json', + 'Authorization: Bearer ' . $token + ), + )); + $response = curl_exec($curl); + curl_close($curl); + + return $response; +} From 947f491a23906a656701a7d15dc70f35e509dd89 Mon Sep 17 00:00:00 2001 From: jouls Date: Fri, 22 Mar 2024 18:21:43 +0800 Subject: [PATCH 03/11] added dynamic values to modal box --- vendor-payouts.php | 165 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 148 insertions(+), 17 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index 96f269b..e1780a8 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -15,7 +15,8 @@ if ($_SESSION["userId"] <> "") { // // var_dump($vendor); // $array = json_decode($vendor,true); // var_dump($array); - $response = getAllPayout($_SESSION['token']); + $authToken = $_SESSION['token']; + $response = getAllPayout($authToken); $vendorPayoutData = json_decode($response, true); } else { $_SESSION["isLoggedIn"] = false; @@ -241,7 +242,8 @@ if ($_SESSION["userId"] <> "") { $val) { $vendorIdCheck = $val['vendor_details'][0]['vendor_id']; - if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($val['status'] == "DEPOSITED")) { ?> + if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($val['status'] == "DEPOSITED")) { + $payoutId = $val['_id'] ?> "") { December 08, 2023 - + "") { -
@@ -310,9 +328,7 @@ if ($_SESSION["userId"] <> "") {
Fees, Deductions, Adjustments - +
- ₱ 35.00
@@ -378,7 +394,7 @@ if ($_SESSION["userId"] <> "") { - + --> @@ -612,14 +628,129 @@ if ($_SESSION["userId"] <> "") { - --> + + From 8eb07ad94f63c142fa7a718a634f61825a58624e Mon Sep 17 00:00:00 2001 From: jouls Date: Sat, 23 Mar 2024 12:01:46 +0800 Subject: [PATCH 04/11] added bankNum masking in modal box --- vendor-payouts.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index e1780a8..b5a372e 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -284,6 +284,7 @@ if ($_SESSION["userId"] <> "") { + @@ -704,6 +724,56 @@ $vendorPayoutData = json_decode($response, true); }); }); + From c3523bfddc86621ca2b03583189310362cdfbc39 Mon Sep 17 00:00:00 2001 From: jouls Date: Tue, 26 Mar 2024 13:53:58 +0800 Subject: [PATCH 09/11] Added Data Table Responsiveness --- vendor-payouts.php | 68 ++++++++-------------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/vendor-payouts.php b/vendor-payouts.php index bc8ff57..2256f05 100644 --- a/vendor-payouts.php +++ b/vendor-payouts.php @@ -72,6 +72,9 @@ $vendorPayoutData = json_decode($response, true); + + + @@ -263,8 +266,8 @@ $vendorPayoutData = json_decode($response, true);
Payout History
-
- +
+
@@ -276,16 +279,14 @@ $vendorPayoutData = json_decode($response, true); - + $val) { $vendorIdCheck = $val['vendor_details'][0]['vendor_id']; $status = ucfirst(strtolower($val['status'])); $payoutDate = date("F d, Y", strtotime($val['createdAt'])); $payoutId = $val['_id']; - if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($status == "Deposited")) { - $payoutsCount++; ?> + if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($status == "Deposited")) { ?> + +
-
Amount