From ecf89b070ffe7d00740f38aea96935ac5b3b553e Mon Sep 17 00:00:00 2001
From: jouls <jl.superalis@gmail.com>
Date: Tue, 26 Mar 2024 09:22:33 +0800
Subject: [PATCH] Minor changes on payout details

---
 functions.php      |   6 ++-
 vendor-payouts.php | 111 +++++----------------------------------------
 2 files changed, 16 insertions(+), 101 deletions(-)

diff --git a/functions.php b/functions.php
index 5748d5f..19c5c5d 100644
--- a/functions.php
+++ b/functions.php
@@ -1241,7 +1241,7 @@ function simpleVendorsWithProducts()
   }
 } */
 
-function getVendorbyId($id)
+function getVendorbyId($id, $token)
 {
   $url = "https://" . $_SESSION["data_endpoint"] . "/api/v1/vendors/$id";
   $curl = curl_init();
@@ -1256,7 +1256,9 @@ function getVendorbyId($id)
     CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
     CURLOPT_CUSTOMREQUEST => 'GET',
     CURLOPT_HTTPHEADER => array(
-      'X-Api-Key: {{apiKey}}'
+      'X-Api-Key: {{apiKey}}',
+      'Content-Type: application/json',
+      'Authorization: Bearer ' . $token
     ),
   ));
   $response = curl_exec($curl);
diff --git a/vendor-payouts.php b/vendor-payouts.php
index ceaf2c0..5261c75 100644
--- a/vendor-payouts.php
+++ b/vendor-payouts.php
@@ -156,14 +156,19 @@ if ($_SESSION["userId"] <> "") {
                                                         </strong>
                                                     </div>
                                                 </h4>
-                                                <div class="text-sm mt-3">
+                                                <!-- <div class="text-sm mt-3">
                                                     Payout Generation: Tue, Mar 19, 2024
                                                 </div>
                                                 <div class="text-sm">
                                                     Receive Payout on or before: Wed, Mar 20, 2024
-                                                </div>
+                                                </div> -->
                                                 <div class="text-sm">
-                                                    Receipient: Philippine National Bank (PNB) Account ending in 6685
+                                                    <?php $vendorResponse = getVendorbyId( $vendorId, $authToken);
+                                                    $vendorInformation = json_decode($vendorResponse, true);
+                                                    $bankAccountNumber = $vendorInformation['bank_acount_details'][0]['bank_account_number'];
+                                                    $bankNumEnding = substr($bankAccountNumber, -3);
+                                                    ?>
+                                                    Receipient: Philippine National Bank (PNB) Account ending in <?php echo $bankNumEnding?>
                                                 </div>
                                             </div>
                                         </div>
@@ -217,7 +222,7 @@ if ($_SESSION["userId"] <> "") {
                                                     Receive Payout on or before: Wed, Mar 26, 2024
                                                 </div>
                                                 <div class="text-sm">
-                                                    Receipient: Philippine National Bank (PNB) Account ending in 6685
+                                                    Receipient: Philippine National Bank (PNB) Account ending in <?php echo $bankNumEnding?>
                                                 </div>
                                             </div>
                                         </div>
@@ -243,7 +248,7 @@ if ($_SESSION["userId"] <> "") {
                                                 foreach ($vendorPayoutData as $x => $val) {
                                                     $vendorIdCheck = $val['vendor_details'][0]['vendor_id'];
                                                     $status = ucfirst(strtolower($val['status']));
-                                                    $payoutDate = date("F d, Y", strtotime($val['updatedAt']));
+                                                    $payoutDate = date("F d, Y", strtotime($val['createdAt']));
                                                     $payoutId = $val['_id'];
                                                     if ((empty($vendorIdCheck) == false) && ($vendorIdCheck == $vendorId) && ($status == "Deposited")) { ?>
                                                         <tr>
@@ -306,98 +311,6 @@ if ($_SESSION["userId"] <> "") {
         </div>
     </div>
 
-    <!-- <div class="modal fade" id="payoutModal" tabindex="-1" aria-labelledby="payoutModalLabel" aria-hidden="true">
-        <div class="modal-dialog modal-xl" style="min-width: 90%;">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title fs-5" id="payoutModalLabel">Payout ID: po123034923482934</h5>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="container-fluid">
-                        <div class="row">
-                            <div class="col-md-7 mb-4">
-                                <div class="d-flex flex-column">
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div>
-                                            <h6><strong>Payout Information</strong></h6>
-                                        </div>
-
-                                        <button class="fw-bold border border-success border-2 btn-outline-success btn-sm" disabled>DEPOSITED</button>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div class="fw-bold">Gross Amount</div>
-                                        <div>₱ 1,150.00</div>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2" style="border-bottom: 1px solid #000;">
-                                        <div class="fw-bold"> Fees, Deductions, Adjustments
-
-                                        </div>
-                                        <div>- ₱ 35.00</div>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div class="fw-bold"> Net Amount</div>
-                                        <div>- ₱ 1125.00</div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-md-5 mb-4">
-                                <div class="d-flex flex-column" style="border-bottom: 1px solid #000;">
-                                    <div class="d-flex justify-content-between p-2">
-                                        <h6><strong>Bank Information</strong></h6>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div class="fw-bold">Bank</div>
-                                        <div>EastWest Bank</div>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div class="fw-bold">Account Name</div>
-                                        <div>Juan De La Cruz</div>
-                                    </div>
-                                    <div class="d-flex justify-content-between p-2">
-                                        <div class="fw-bold">Account Number</div>
-                                        <div>Ending in 6618</div>
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="col-12">
-                                <div class="mt-5">
-                                    <h6><strong>Transaction Logs</strong></h6>
-                                    <div class="table-responsive">
-                                        <table id="example" class="table ec-table">
-                                            <thead>
-                                                <tr>
-                                                    <th>Type</th>
-                                                    <th>Transaction Date</th>
-                                                    <th>Gross Amount</th>
-                                                    <th>Fee</th>
-                                                    <th>Net Amount</th>
-                                                    <th>Description</th>
-
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <td> Payment </td>
-                                                <td> December 1, 2020, 10:00 PM </td>
-                                                <td> ₱ 150.OO </td>
-                                                <td> - ₱ 5.00 </td>
-                                                <td> ₱ 145.00 </td>
-                                                <td> FOURFORTY - 175 </td>
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-primary" data-bs-dismiss="modal">Confirm</button>
-                </div>
-            </div>
-        </div>
-    </div> -->
     <!-- End Vendor setting section -->
 
     <!-- Footer Start -->
@@ -686,7 +599,7 @@ if ($_SESSION["userId"] <> "") {
                             transactionLogsHtml += `
                                 <tr>
                                     <td>${paymentType}</td>
-                                    <td>December 08, 2024</td>
+                                    <td>Wala Muna</td>
                                     <td>₱ Wala muna</td>
                                     <td>- ₱ ${transFee}</td>
                                     <td>₱ Wala Muna</td>
@@ -715,7 +628,7 @@ if ($_SESSION["userId"] <> "") {
                                         <div class="fw-bold"> Fees, Deductions, Adjustments
 
                                         </div>
-                                        <div>- ₱ ${totalFees}</div>
+                                        <div> - ${totalFees}</div>
                                     </div>
                                     <div class="d-flex justify-content-between p-2">
                                         <div class="fw-bold"> Net Amount</div>