From 3b15aef71a0384bb086840352c2eb9af32cf0757 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 11 Apr 2022 11:39:24 +0800
Subject: [PATCH 01/20] update deptno for transactions export

---
 .../Exports/Services/ExportsPaymentTransactions.php       | 6 ++++--
 .../Exports/Services/ExportsWalletTransactions.php        | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
index 0ca1d730..57dba200 100644
--- a/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsPaymentTransactions.php
@@ -39,7 +39,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'DetailDescription',
             'Qty',
             'UnitPrice',
-            'AccNo'
+            'AccNo',
+            'DeptNo'
         ];
     }
 
@@ -100,7 +101,8 @@ class ExportsPaymentTransactions implements FromQuery, WithHeadings, WithHeading
             'PLEASE REFER TO THE ATTACHED APPENDIX REF ' . $booking->marking,
             1,
             $transaction->amount,
-            '500-0000'
+            '500-0000',
+            'CIEF'
         ];
     }
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php
index af4d2d07..29c1728c 100644
--- a/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsWalletTransactions.php
@@ -39,7 +39,8 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR
             'DetailDescription',
             'Qty',
             'UnitPrice',
-            'AccNo'
+            'AccNo',
+            'DeptNo'
         ];
     }
 
@@ -80,7 +81,7 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR
     }
 
     /**
-     * @param Company $transaction
+     * @param Transaction $transaction
      *
      * @return array
      */
@@ -99,7 +100,8 @@ class ExportsWalletTransactions implements FromQuery, WithHeadings, WithHeadingR
             'CREDIT SALES',
             1,
             $transaction->amount,
-            '500-0000'
+            '500-0000',
+            'WALLET'
         ];
     }
 }
\ No newline at end of file

From ed2f38610139fb551c1301b3cab087e04a29b7fe Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 11 Apr 2022 14:18:35 +0800
Subject: [PATCH 02/20] show top up transactions for null debtors

---
 .../Modules/Exports/Services/ExportsNullDebtors.php       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php b/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
index be216473..0d676eb1 100644
--- a/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
+++ b/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
@@ -56,8 +56,12 @@ class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, Wit
     {
         return Company::where(function($query){
             $query->whereNull('debtor')->orWhere('debtor', '');
-        })->whereNotIn('id', [2207, 2248, 2029])->where('business_type', BusinessType::IMPORTER)->where('status', ApprovalStatus::APPROVED)->whereHas('transactions', function($query){
-            return $query->whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP])->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED, ApprovalStatus::PENDING_VERIFICATION]);
+        })->whereNotIn('id', [2207, 2248, 2029])->where('business_type', BusinessType::IMPORTER)->where('status', ApprovalStatus::APPROVED)->where(function($query){
+            $query->whereHas('transactions', function($query){
+                return $query->whereIn('type', [TransactionType::PAYMENT, TransactionType::TOP_UP])->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED, ApprovalStatus::PENDING_VERIFICATION]);
+            })->orWhereHas('wallets', function($query){
+                return $query->whereHas('transactions');
+            });
         });
     }
 

From 55cd573aeeb8a8c68d3b6dc15d12b98b70db9200 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 12 Apr 2022 11:08:33 +0800
Subject: [PATCH 03/20] update transfer fee formula

---
 .../Processors/CreateSupplierTransactionProcessor.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
index 75516fdf..fe0e7a12 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
@@ -97,7 +97,7 @@ class CreateSupplierTransactionProcessor
             $this->pushBill($billTransaction);
 
             $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
-            $transferFee = $this->calculatesTransactionTransferFee->execute($payment->original_amount, $constant);
+            $transferFee = $this->calculatesTransactionTransferFee->execute($payment->amount, $constant);
             $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
                 $payment->original_amount, $payment->original_amount, $payment->original_currency_id, $payment->original_currency_id,

From 41c46c1af1c25cc829ddb0a090a3aa974cd928f3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 12 Apr 2022 11:12:33 +0800
Subject: [PATCH 04/20] update transfer fee formula

---
 .../Processors/CreateSupplierTransactionProcessor.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
index fe0e7a12..f8d6b20a 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
@@ -97,7 +97,7 @@ class CreateSupplierTransactionProcessor
             $this->pushBill($billTransaction);
 
             $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
-            $transferFee = $this->calculatesTransactionTransferFee->execute($payment->amount, $constant);
+            $transferFee = $this->calculatesTransactionTransferFee->execute(($payment->original_amount * ( 1 / $payment->currency_rate)), $constant);
             $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
                 $payment->original_amount, $payment->original_amount, $payment->original_currency_id, $payment->original_currency_id,

From bad6a99efa9cab14fe7ac734af57a77be80ad31a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 12 Apr 2022 11:13:52 +0800
Subject: [PATCH 05/20] update transfer fee formula

---
 .../Processors/CreateSupplierTransactionProcessor.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
index f8d6b20a..58a37ed1 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
@@ -97,7 +97,7 @@ class CreateSupplierTransactionProcessor
             $this->pushBill($billTransaction);
 
             $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
-            $transferFee = $this->calculatesTransactionTransferFee->execute(($payment->original_amount * ( 1 / $payment->currency_rate)), $constant);
+            $transferFee = $this->calculatesTransactionTransferFee->execute(($payment->amount - $payment->service_charge - $payment->tax), $constant);
             $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
                 $payment->original_amount, $payment->original_amount, $payment->original_currency_id, $payment->original_currency_id,

From 13b136b4c43390a4af471c1f32d951fa58b44ebe Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 12 Apr 2022 11:15:11 +0800
Subject: [PATCH 06/20] update transfer fee formula

---
 .../Processors/CreateSupplierTransactionProcessor.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
index 58a37ed1..db443184 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateSupplierTransactionProcessor.php
@@ -97,7 +97,7 @@ class CreateSupplierTransactionProcessor
             $this->pushBill($billTransaction);
 
             $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
-            $transferFee = $this->calculatesTransactionTransferFee->execute(($payment->amount - $payment->service_charge - $payment->tax), $constant);
+            $transferFee = $this->calculatesTransactionTransferFee->execute($billTransaction->amount, $constant);
             $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
                 $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
                 $payment->original_amount, $payment->original_amount, $payment->original_currency_id, $payment->original_currency_id,

From f7de7d290af8b2642a5a6c0385b530314394af11 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 12 Apr 2022 11:19:57 +0800
Subject: [PATCH 07/20] update transfer fee formula

---
 .../Services/CalculatesTransactionServiceCharge.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php b/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
index e04edee2..29751d80 100644
--- a/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
+++ b/app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
@@ -31,7 +31,7 @@ class CalculatesTransactionServiceCharge
             return 0;
         }
 
-        $transfer_fee = $this->calculatesTransactionTransferFee->execute($amount, $service_charge);
+        $transfer_fee = $this->calculatesTransactionTransferFee->execute(($amount * (1 / $rate)), $service_charge);
         return $service_charge->detail->amount->type === 'percentage' ? (($amount + $transfer_fee) * ( (float) $service_charge->detail->amount->value /100) * (1/$rate)) :  (float) $service_charge->detail->amount->value;
 
     }

From 8aa853c7c4f2af722a8a021fb88166e720c32710 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 13 Apr 2022 12:38:37 +0800
Subject: [PATCH 08/20] add border to payment proof

---
 .../vue/components/bookings/elements/PaymentProofComponent.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
index 5af5548c..ff8452a5 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-b-10">
+    <div class="row m-b-10 p-b-10 b-b" style="border-bottom-width: 3px;">
         <div class="col">
             <div class="row">
                 <div class="col">

From 89865302e35b7421a8031f18ef9ad5f1c6d2b028 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 13 Apr 2022 15:50:49 +0800
Subject: [PATCH 09/20] update jack suppliers

---
 resources/views/pages/currency_orders.blade.php          | 8 ++++----
 resources/views/pages/dashboards/account_admin.blade.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php
index 5c981374..b548f9cb 100644
--- a/resources/views/pages/currency_orders.blade.php
+++ b/resources/views/pages/currency_orders.blade.php
@@ -35,7 +35,7 @@
                                 <div class="col bg-white padding-25">
                                     <div class="row tabsContainer tabContent active" tab-name="complete">
                                         <div class="col">
-                                            <list-component  section="CompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_not_in: [2185, 1970, 1921]}">
+                                            <list-component  section="CompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_not_in: [1921, 1970, 2185, 2327]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -125,7 +125,7 @@
                                 <div class="col bg-white padding-25">
                                     <div class="row tabsContainer tabContent active" tab-name="paymentProof">
                                         <div class="col">
-                                            <list-component ref="paymentProofList" section="jackPaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [2185, 1970, 1921]}">
+                                            <list-component ref="paymentProofList" section="jackPaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -134,7 +134,7 @@
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="paymentProofVerification">
                                         <div class="col">
-                                            <list-component ref="paymentProofList" section="jackPaymentProofVerificationSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3, issuer_in: [2185, 1970, 1921]}">
+                                            <list-component ref="paymentProofList" section="jackPaymentProofVerificationSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -143,7 +143,7 @@
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="complete">
                                         <div class="col">
-                                            <list-component  section="jackCompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 3, type: 3, issuer_in: [2185, 1970, 1921]}">
+                                            <list-component  section="jackCompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 3, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
diff --git a/resources/views/pages/dashboards/account_admin.blade.php b/resources/views/pages/dashboards/account_admin.blade.php
index d22d3637..91816a32 100644
--- a/resources/views/pages/dashboards/account_admin.blade.php
+++ b/resources/views/pages/dashboards/account_admin.blade.php
@@ -2,14 +2,14 @@
     <div class="col">
         <div class="row">
             <div class="col col-md-5 bg-white padding-25">
-                <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185]}">
+                <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
                     <template slot="list" slot-scope="{data}">
                         <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                     </template>
                 </list-component>
             </div>
             <div class="col col-md-5 bg-white padding-25">
-                <list-component ref="paymentProofList" section="paymentProofHistorySection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_in: [1921, 1970, 2185]}">
+                <list-component ref="paymentProofList" section="paymentProofHistorySection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
                     <template slot="list" slot-scope="{data}">
                         <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                     </template>

From 1c97dcefcefab08ee037750f6cbe8b1679616d17 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 14 Apr 2022 11:50:42 +0800
Subject: [PATCH 10/20] fix rack do's

---
 routes/web.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index f0d13b86..e304edb2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -100,7 +100,11 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
 Route::get('/fix_bills', function () {
     ini_set('max_execution_time', '1000000');
     Auth()->login(User::find(1));
-    $bookings = \App\Models\Booking::whereIn('id', [11257, 11268, 11281, 11287, 11288, 11290, 11292, 11293, 11296, 11298, 11299, 11302, 11303, 11307, 11314, 11324, 11345, 11346])->get();
+    $bookings = \App\Models\Booking::whereHas('transactions', function ($query){
+        return $query->where('type', 1)->whereHas('transactions', function($query){
+           return $query->where('type', 3)->where('issuer', 2210);
+        });
+    })->get();
     foreach ($bookings as $booking){
         $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
         $po = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();

From 4e5fc70eea82ae93bfdffbf656c1df55934d0e83 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 14 Apr 2022 11:53:50 +0800
Subject: [PATCH 11/20] fix rack do's

---
 routes/web.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index e304edb2..d7382c01 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -106,9 +106,10 @@ Route::get('/fix_bills', function () {
         });
     })->get();
     foreach ($bookings as $booking){
-        $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
+//        $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
         $po = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
         $supplier_deliver_order_transaction = $booking->transactions()->where('type', TransactionType::SUPPLIER_DELIVER)->first();
+        dd($supplier_deliver_order_transaction);
         $supplier = Company::find($booking->transactions()->where('type', TransactionType::PAYMENT)->where('status', 3)->first()->transactions()->first());
         $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po, 'supplier' => $supplier]);
         $document_object = new DocumentObject(

From e3da93807b4d78eb543406fbb760a9b917df8e1d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 14 Apr 2022 11:55:12 +0800
Subject: [PATCH 12/20] fix rack do's

---
 routes/web.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index d7382c01..99e07dd3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -100,16 +100,15 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
 Route::get('/fix_bills', function () {
     ini_set('max_execution_time', '1000000');
     Auth()->login(User::find(1));
-    $bookings = \App\Models\Booking::whereHas('transactions', function ($query){
+    $bookings = \App\Models\Booking::where('status', 3)->whereHas('transactions', function ($query){
         return $query->where('type', 1)->whereHas('transactions', function($query){
            return $query->where('type', 3)->where('issuer', 2210);
         });
     })->get();
     foreach ($bookings as $booking){
-//        $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
+        $booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
         $po = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
         $supplier_deliver_order_transaction = $booking->transactions()->where('type', TransactionType::SUPPLIER_DELIVER)->first();
-        dd($supplier_deliver_order_transaction);
         $supplier = Company::find($booking->transactions()->where('type', TransactionType::PAYMENT)->where('status', 3)->first()->transactions()->first());
         $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po, 'supplier' => $supplier]);
         $document_object = new DocumentObject(

From f89db64bead1c5d87add41e3b1ae9366c7e243ee Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 14 Apr 2022 11:59:54 +0800
Subject: [PATCH 13/20] fix rack do's

---
 .../views/pages/pdfs/supplier_deliver_order.blade.php      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 996a6103..17c0bcf2 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -10,10 +10,13 @@
                         Atvantic Import & Export Snd. Bhd (1309816-P)
                     @endif
                     @if(in_array($supplier_deliver_order_transaction->issuer, [1937, 1970]))
-                            BK Gemilang Sdn Bhd (1403513-U)
+                        BK Gemilang Sdn Bhd (1403513-U)
                     @endif
                     @if(in_array($supplier_deliver_order_transaction->issuer, [2165, 2185]))
-                            YSN SOLUTION TRADING SDN BHD (1393892-D)
+                        YSN SOLUTION TRADING SDN BHD (1393892-D)
+                    @endif
+                    @if(in_array($supplier_deliver_order_transaction->issuer, [2210]))
+                        RACK SOLUTION INDUSTRIES SDN BHD (954723-W)
                     @endif
                 </td>
             </tr>

From 9c8a0e5a92be86eeb3b2f36d20ef70fd58ddcef1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 14 Apr 2022 16:08:44 +0800
Subject: [PATCH 14/20] update debtor export format

---
 app/Classes/Modules/Exports/Services/ExportsNullDebtors.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php b/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
index 0d676eb1..53a71772 100644
--- a/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
+++ b/app/Classes/Modules/Exports/Services/ExportsNullDebtors.php
@@ -26,7 +26,6 @@ class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, Wit
             'Code',
             'DebtorControlAcc',
             'ControlAccount',
-            'AccNo',
             'CompanyName',
             'Desc2',
             'DebtorType',
@@ -76,7 +75,6 @@ class ExportsNullDebtors implements FromQuery, WithHeadings, WithHeadingRow, Wit
             '<<New>>',
             '300-0000',
             '300-0000',
-            '300-0000',
             $company->name.' (PURCHASE)',
             $company->reference,
             '',

From b6dbd6c5175e5c63858c25ec1a002ea5e3b0acc5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 15 Apr 2022 10:47:58 +0800
Subject: [PATCH 15/20] update jack suppliers

---
 resources/views/pages/currency_orders.blade.php          | 8 ++++----
 resources/views/pages/dashboards/account_admin.blade.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/views/pages/currency_orders.blade.php b/resources/views/pages/currency_orders.blade.php
index b548f9cb..269591e1 100644
--- a/resources/views/pages/currency_orders.blade.php
+++ b/resources/views/pages/currency_orders.blade.php
@@ -35,7 +35,7 @@
                                 <div class="col bg-white padding-25">
                                     <div class="row tabsContainer tabContent active" tab-name="complete">
                                         <div class="col">
-                                            <list-component  section="CompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_not_in: [1921, 1970, 2185, 2327]}">
+                                            <list-component  section="CompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_not_in: [1921, 1970, 2185, 2327, 2351]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -125,7 +125,7 @@
                                 <div class="col bg-white padding-25">
                                     <div class="row tabsContainer tabContent active" tab-name="paymentProof">
                                         <div class="col">
-                                            <list-component ref="paymentProofList" section="jackPaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
+                                            <list-component ref="paymentProofList" section="jackPaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327, 2351]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -134,7 +134,7 @@
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="paymentProofVerification">
                                         <div class="col">
-                                            <list-component ref="paymentProofList" section="jackPaymentProofVerificationSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
+                                            <list-component ref="paymentProofList" section="jackPaymentProofVerificationSection" :endpoint="route('api.transaction.list')" :options="{status: 2, type: 3, issuer_in: [1921, 1970, 2185, 2327, 2351, 2351]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
@@ -143,7 +143,7 @@
                                     </div>
                                     <div class="row tabsContainer tabContent hide" tab-name="complete">
                                         <div class="col">
-                                            <list-component  section="jackCompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 3, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
+                                            <list-component  section="jackCompletePaymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 3, type: 3, issuer_in: [1921, 1970, 2185, 2327, 2351]}">
                                                 <template slot="list" slot-scope="{data}">
                                                     <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                                                 </template>
diff --git a/resources/views/pages/dashboards/account_admin.blade.php b/resources/views/pages/dashboards/account_admin.blade.php
index 91816a32..14c3fc19 100644
--- a/resources/views/pages/dashboards/account_admin.blade.php
+++ b/resources/views/pages/dashboards/account_admin.blade.php
@@ -2,14 +2,14 @@
     <div class="col">
         <div class="row">
             <div class="col col-md-5 bg-white padding-25">
-                <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
+                <list-component ref="paymentProofList" section="paymentProofSection" :endpoint="route('api.transaction.list')" :options="{status: 1, type: 3, issuer_in: [1921, 1970, 2185, 2327, 2351]}">
                     <template slot="list" slot-scope="{data}">
                         <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                     </template>
                 </list-component>
             </div>
             <div class="col col-md-5 bg-white padding-25">
-                <list-component ref="paymentProofList" section="paymentProofHistorySection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_in: [1921, 1970, 2185, 2327]}">
+                <list-component ref="paymentProofList" section="paymentProofHistorySection" :endpoint="route('api.transaction.list')" :options="{status_in: [2, 3], type: 3, issuer_in: [1921, 1970, 2185, 2327, 2351]}">
                     <template slot="list" slot-scope="{data}">
                         <payment-proof-component :data="data" class="m-b-15 m-r-0"></payment-proof-component>
                     </template>

From a3f4de7c1a034dcccc56e07e8d8154c9f529a128 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 15 Apr 2022 14:06:13 +0800
Subject: [PATCH 16/20] debug wallet top up

---
 app/Classes/General/Abstracts/AbstractControllerLogic.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index 2fdd0dab..ec712527 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -14,6 +14,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -61,6 +62,7 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions $exception){
+            Log::error($exception);
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 

From e0ed003c269eb5f73b5f65de9c5ff46fc911d8d5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 15 Apr 2022 14:08:09 +0800
Subject: [PATCH 17/20] debug wallet top up

---
 .../Modules/Wallets/ControllersLogic/TopUpWalletLogic.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
index 9bbe6073..2250d54a 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -23,6 +23,7 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class TopUpWalletLogic extends AbstractControllerLogic
 {
@@ -103,7 +104,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         }
 
         $billPlzBill = $this->createsBillplzBill->execute($user->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
-
+Log::error($billPlzBill);
         $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
 
         $transaction = $this->createsTransaction->execute($wallet, $transaction_object);

From 43b9d181b232b0858335685453c72cb9d20f0132 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 15 Apr 2022 14:09:26 +0800
Subject: [PATCH 18/20] debug wallet top up

---
 app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php   | 2 ++
 .../Modules/Wallets/ControllersLogic/TopUpWalletLogic.php      | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
index 5b331fca..1bed083c 100644
--- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
+++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Billplzs\Services;
 
 use Illuminate\Support\Facades\Http;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\Log;
 
 class CreatesBillplzBill
 {
@@ -43,6 +44,7 @@ class CreatesBillplzBill
 
                 return (object) $data;
             }else{
+                Log::error($response);
                 return null;
             }
         }catch(\Exception $exception){
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
index 2250d54a..9bbe6073 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -23,7 +23,6 @@ use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 class TopUpWalletLogic extends AbstractControllerLogic
 {
@@ -104,7 +103,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         }
 
         $billPlzBill = $this->createsBillplzBill->execute($user->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
-Log::error($billPlzBill);
+
         $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
 
         $transaction = $this->createsTransaction->execute($wallet, $transaction_object);

From a79cb718d9a1c16bf020f8dbb52ac26f6fcb9eec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 15 Apr 2022 14:11:15 +0800
Subject: [PATCH 19/20] debug wallet top up

---
 app/Classes/General/Abstracts/AbstractControllerLogic.php       | 2 --
 .../Modules/Wallets/ControllersLogic/TopUpWalletLogic.php       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index ec712527..2fdd0dab 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -14,7 +14,6 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -62,7 +61,6 @@ abstract class AbstractControllerLogic
             return $response;
 
         } catch (ErrorException|GeneralExceptions $exception){
-            Log::error($exception);
             return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(),
                 $exception->getCode() ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler();
 
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
index 9bbe6073..c60cbf54 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -102,7 +102,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
             throw new MalformedRequestException('Top up credit value must be greater than zero.');
         }
 
-        $billPlzBill = $this->createsBillplzBill->execute($user->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
+        $billPlzBill = $this->createsBillplzBill->execute($company->name, $user->email, 'This payment is credit topup for company ref. ' . $company->reference, $amount, $billNumber, $request->input('bank_code'), true);
 
         $transaction_object = new TransactionObject($billNumber, TransactionType::TOP_UP, 1, $company->id, 1, PaymentMethodType::PAYMENT_GATEWAY, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, [], $billPlzBill->id);
 

From c49718e27832a1f5f6d5a42ad9bcdfe11e4a538b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sat, 16 Apr 2022 12:48:50 +0800
Subject: [PATCH 20/20] fix fpx payment

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index ecb6a87c..a0124002 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -113,7 +113,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $amount = $configurations->getTotal();
 
         if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){
-            $billPlzBill = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, 'This payment is made for transfer ref. '.$booking->marking, $configurations->getTotal(), $billNumber, $request->input('bank_code'));
+            $billPlzBill = $this->createsBillplzBill->execute($booking->company->name, $request->user()->email, 'This payment is made for transfer ref. '.$booking->marking, $configurations->getTotal(), $billNumber, $request->input('bank_code'));
             $paymentReference = $billPlzBill->id;
         }