From fff77aee7f0327beff22c1f8f54c96d2a423ea18 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 1 Sep 2022 17:50:22 +0800
Subject: [PATCH 001/179] update june xpo

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

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
index e32d9bb2..19a01704 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
@@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $bookings = Booking::where(function($query){
-            return $query->whereMonth('created_at', 05)->whereYear('created_at', 2022);
+            return $query->whereMonth('created_at', 06)->whereYear('created_at', 2022);
         })->whereDoesntHave('transactions', function($q){
                 $q->where('type', TransactionType::PURCHASE_ORDER);
                 $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);

From 732b0cf5cf16d36b050ffea2368505ce09f0c36b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:43:25 +0800
Subject: [PATCH 002/179] clear out filter pending orders

---
 routes/web.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 758b054f..f20e7a74 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -256,9 +256,6 @@ Route::get('/pending_orders', function(){
     $i = 0;
     foreach ($payments as $payment){
         $booking = $payment->owner;
-        if($booking->service_id === 4){
-            continue;
-        }
         $bankType = str::length($booking->bank->holder_name) > 4 ? 'Company' : 'Personal';
 
         if (!preg_match('/[^A-Za-z0-9]/', $booking->bank->holder_name))

From d6bda82b843448913fb0aebc724a7ff4ec0987f0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 7 Sep 2022 15:49:22 +0800
Subject: [PATCH 003/179] give hazait access for credit and debit wallet

---
 .../vue/components/wallets/forms/WalletTopUpFormComponent.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
index 7e2cfd47..ba2a15c2 100644
--- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
+++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row m-b-20 text-center" v-if="$store.getters.isSuperAdmin && creditable">
+            <div class="row m-b-20 text-center" v-if="($store.getters.isSuperAdmin || $store.getters.getUserId === 2231)&& creditable">
                 <div class="col">
                     <div class="row">
                         <div class="col p-r-5">

From 1ab2567a4d037f069474dc4dc1fff2b3c345f4c3 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 7 Sep 2022 23:58:47 +0800
Subject: [PATCH 004/179] exports leads data to csv

---
 .../Services/ExportsLeadsTransactions.php     | 71 +++++++++++++++++++
 .../ExportCustomersToExcelController.php      |  7 ++
 .../views/pages/customers/index.blade.php     |  3 +
 routes/web.php                                |  1 +
 4 files changed, 82 insertions(+)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsLeadsTransactions.php

diff --git a/app/Classes/Modules/Exports/Services/ExportsLeadsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsLeadsTransactions.php
new file mode 100644
index 00000000..4b8581d6
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsLeadsTransactions.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Companies\Services\ListsCompanies;
+
+class ExportsLeadsTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request, ListsCompanies $listsCompanies)
+    {
+        $this->request = $request;
+        $this->listsCompanies = $listsCompanies;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Agent Name',
+            'User Name',
+            'Contact Number',
+            'Email',
+            'Customer Code',
+            'Register Date'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $query = $this->listsCompanies->execute(
+            [
+                'business_type' => 2,
+                'with_bookings' => true,
+                'without_confirmed_payments' => true,
+                'does_not_have_segments' => [5],
+            ]
+        );
+
+        return $query->toQuery();
+    }
+
+    /**
+     * @param $row
+     * @return array
+     */
+    public function map($row): array
+    {
+        return [
+            '',
+            $row->name,
+            strval($row->contacts->first()->phone),
+            // $row->contacts->first()->email,
+            $row->employees()->first() == null ? '' : $row->employees()->first()->email,
+            $row->reference,
+            $row->created_at->format('d-m-Y')
+        ];
+    }
+}
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 8563f78a..1f7594f8 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Exports;
 use App\Classes\Modules\Exports\Services\ExportsCustomers;
 use App\Classes\Modules\Exports\Services\ExportsTransactions;
 use App\Classes\Modules\Exports\Services\ExportsBookingTransactions;
+use App\Classes\Modules\Exports\Services\ExportsLeadsTransactions;
 use App\Classes\Modules\Exports\Services\ExportsNullDebtors;
 use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions;
 
@@ -61,4 +62,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function leadsData(ExportsLeadsTransactions $exportsLeadsTransactions, Request $request){
+        $response = $exportsLeadsTransactions->download('leadsData.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
 }
\ No newline at end of file
diff --git a/resources/views/pages/customers/index.blade.php b/resources/views/pages/customers/index.blade.php
index 25099bc7..dc22b5b8 100644
--- a/resources/views/pages/customers/index.blade.php
+++ b/resources/views/pages/customers/index.blade.php
@@ -263,6 +263,9 @@
                             <div class="row no-margin">
                                 <div class="col bg-white padding-25">
                                     <div class="row tabsContainer tabContent hide m-l-0 m-r-0 hide" tab-name="customer-leads" v-if="$store.getters.isAdmin">
+                                        <a :href="route('leads.export')" class="m-b-15" target="_blank">
+                                            <button class="btn btn-success btn-xs">Export Leads Data</button>
+                                        </a>
                                         <list-component  key="2" section="leadCustomerListSection" :endpoint="route('api.company.list')" :options="{'business_type': 2, with_bookings:true, without_confirmed_payments: true, does_not_have_segments: [5]}">
                                             <template slot="list" slot-scope="{data}">
                                                 <company-component :data="data"></company-component>
diff --git a/routes/web.php b/routes/web.php
index f20e7a74..457f94bf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -102,6 +102,7 @@ Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\Export
 Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
 Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@bookingData');
 Route::get('/export/analytic/bills', 'Exports\ExportAnalyticToExcelController@billingData');
+Route::get('/export/customers/leads', 'Exports\ExportCustomersToExcelController@leadsData')->name('leads.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']);

From 455575221873cb51ef39e43ce36e56315fe4fc4a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 8 Sep 2022 20:22:30 +0800
Subject: [PATCH 005/179] generate invoices for 1688 orders

---
 .../UploadPurchaseOrderLogic.php              | 14 +++-
 ...eatePurchaseOrderFor1688OrderProcessor.php | 73 +++++++++++++++++++
 .../CreateInvoiceDocumentProcessor.php        | 23 ++++++
 composer.json                                 |  3 +-
 config/app.php                                |  6 +-
 routes/web.php                                | 12 +++
 6 files changed, 127 insertions(+), 4 deletions(-)
 create mode 100644 app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
index 1a99d852..b4f0a4b8 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
@@ -4,6 +4,7 @@ namespace App\Classes\Modules\Bookings\ControllersLogic;
 
 
 use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Processors\CreatePurchaseOrderFor1688OrderProcessor;
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Documents\Services\ApprovesDocument;
@@ -11,11 +12,15 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\Services\FetchesDocument;
 use App\Classes\Modules\Documents\Services\RejectsDocument;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Document;
 use Illuminate\Http\JsonResponse;
@@ -43,18 +48,23 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
     /** @var CreatesFiles */
     private $createsFile;
 
+    /** @var CreatePurchaseOrderFor1688OrderProcessor */
+    private $createPurchaseOrderFor1688OrderProcessor;
+
 
     /**
      * UploadPurchaseOrderLogic constructor.
      * @param FetchesBooking $fetchesBooking
      * @param CreatesDocument $createsDocument
      * @param CreatesFiles $createsFile
+     * @param CreatePurchaseOrderFor1688OrderProcessor $createPurchaseOrderFor1688OrderProcessor
      */
-    public function __construct(FetchesBooking $fetchesBooking, CreatesDocument $createsDocument, CreatesFiles $createsFile)
+    public function __construct(FetchesBooking $fetchesBooking, CreatesDocument $createsDocument, CreatesFiles $createsFile, CreatePurchaseOrderFor1688OrderProcessor $createPurchaseOrderFor1688OrderProcessor)
     {
         $this->fetchesBooking = $fetchesBooking;
         $this->createsDocument = $createsDocument;
         $this->createsFile = $createsFile;
+        $this->createPurchaseOrderFor1688OrderProcessor = $createPurchaseOrderFor1688OrderProcessor;
     }
 
     /**
@@ -74,6 +84,8 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
 
         $this->createsFile->execute($document, $object);
 
+        $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
+
         return $this->response([]);
     }
 
diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
new file mode 100644
index 00000000..aa7f2ed7
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Processors;
+
+
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+
+class CreatePurchaseOrderFor1688OrderProcessor
+{
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatePurchaseOrderTransactionProcessor */
+    private $createPurchaseOrderTransactionProcessor;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreateInvoiceTransactionProcessor */
+    private $createInvoiceTransactionProcessor;
+
+    /**
+     * CreatePurchaseOrderFor1688OrderProcessor constructor.
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     */
+    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
+    {
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+    }
+
+    public function execute(Booking $booking){
+        $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
+
+        $products = [
+            [
+                'description' => 'please refer to the attachment below',
+                'quantity' => 1,
+                'stockCode' => '',
+                'unit_price' => $booking->fix_amount
+            ]
+        ];
+
+        $total = collect($products)->sum(function($product){
+            return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));
+        });
+
+        $object = new TransactionObject($billNumber, TransactionType::PURCHASE_ORDER, $booking->company->id, 1,
+            1, PaymentMethodType::CASH,
+            $total, $total, $booking->fix_currency_id, $booking->fix_currency_id,
+            1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, $products);
+
+        $purchaseOrder = $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+
+        $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
+
+        $this->createInvoiceTransactionProcessor->execute($booking);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
index d6231e0c..ae57a626 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
@@ -6,7 +6,10 @@ use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Document;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Webklex\PDFMerger\Facades\PDFMergerFacade as PDFMerger;
 
 class CreateInvoiceDocumentProcessor
 {
@@ -40,6 +43,24 @@ class CreateInvoiceDocumentProcessor
         $lowercaseDocumentType = strtolower($document_type);
 
         $order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier]);
+
+        if($purchaseOrder->booking->service_id === 4) {
+            $purchaseOrderDocuments = $purchaseOrder->booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+
+
+            $oMerger = PDFMerger::init();
+            $order_pdf->save(storage_path('app/documents/temp.pdf'));
+
+            $oMerger->addPDF(storage_path('app/documents/temp.pdf'), 'all');
+            foreach ($purchaseOrderDocuments as $document){
+                $oMerger->addPDF(storage_path('app/documents/'.$document->files()->first()->file->file_info->original->file), 'all');
+            }
+
+            $oMerger->merge();
+
+            $order_pdf = $oMerger;
+        }
+
         $document_object = new DocumentObject(
             $document_type,
             [chunk_split('data:application/pdf;base64,' . base64_encode($order_pdf->output()))],
@@ -48,7 +69,9 @@ class CreateInvoiceDocumentProcessor
             $lowercaseDocumentType . 's'
         );
 
+        /** @var Document $document */
         $document = $this->createsDocument->execute($purchaseOrder->booking, $document_object);
         $this->createsFile->execute($document, $document_object);
+
     }
 }
diff --git a/composer.json b/composer.json
index ee759dbb..80a34ede 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,8 @@
         "spatie/laravel-permission": "^3.17",
         "staudenmeir/eloquent-has-many-deep": "^1.7",
         "timehunter/laravel-google-recaptcha-v3": "~2.5",
-        "tymon/jwt-auth": "^1.0"
+        "tymon/jwt-auth": "^1.0",
+        "webklex/laravel-pdfmerger": "^1.3"
     },
     "require-dev": {
         "facade/ignition": "^2.0",
diff --git a/config/app.php b/config/app.php
index 55cdb890..d48e24c6 100644
--- a/config/app.php
+++ b/config/app.php
@@ -179,7 +179,8 @@ return [
         Spatie\Permission\PermissionServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
         Meneses\LaravelMpdf\LaravelMpdfServiceProvider::class,
-        TimeHunter\LaravelGoogleReCaptchaV3\Providers\GoogleReCaptchaV3ServiceProvider::class
+        TimeHunter\LaravelGoogleReCaptchaV3\Providers\GoogleReCaptchaV3ServiceProvider::class,
+        Webklex\PDFMerger\Providers\PDFMergerServiceProvider::class
 
     ],
 
@@ -234,7 +235,8 @@ return [
         'View' => Illuminate\Support\Facades\View::class,
         'PDF' => Barryvdh\DomPDF\Facade::class,
         'MPDF' => Meneses\LaravelMpdf\Facades\LaravelMpdf::class,
-        'GoogleReCaptchaV3'=> TimeHunter\LaravelGoogleReCaptchaV3\Facades\GoogleReCaptchaV3::class
+        'GoogleReCaptchaV3'=> TimeHunter\LaravelGoogleReCaptchaV3\Facades\GoogleReCaptchaV3::class,
+        'PDFMerger' => Webklex\PDFMerger\Facades\PDFMergerFacade::class
 
     ],
 
diff --git a/routes/web.php b/routes/web.php
index f20e7a74..b017f298 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,6 @@
 <?php
 
+use App\Classes\Modules\Bookings\Processors\CreatePurchaseOrderFor1688OrderProcessor;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
@@ -18,6 +19,7 @@ use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Excel;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
+use Webklex\PDFMerger\Facades\PDFMergerFacade as PDFMerger;
 
 /*
 |--------------------------------------------------------------------------
@@ -359,6 +361,7 @@ Route::get('/wallets/active', function(){
 });
 
 Route::get('/payments/manual', function(){
+
     $payments = Transaction::where('type', TransactionType::PAYMENT)->whereIn('payment_method', [\App\Classes\ValueObjects\Constants\PaymentMethodType::CASH, \App\Classes\ValueObjects\Constants\PaymentMethodType::BA, \App\Classes\ValueObjects\Constants\PaymentMethodType::CHEQUE])->where('owner_type', Booking::class)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     $i = 0;
@@ -375,3 +378,12 @@ Route::get('/payments/manual', function(){
     echo '</table>';
 });
 
+Route::get('/1688/fix', function(){
+    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+
+    foreach($purchaseOrderDocuments as $document){
+        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
+        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
+    }
+});
+

From 5cc2ae1c581af6b454c3fcb6dbd9827982ca6469 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 8 Sep 2022 20:37:42 +0800
Subject: [PATCH 006/179] generate invoices for 1688 orders

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

diff --git a/routes/web.php b/routes/web.php
index 5f9e323e..eb0927c1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,10 +380,11 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->doesntHave('owner', function($query){
+        return $query->where('owner.status', ApprovalStatus::COMPLETED);
+    })->get();
 
     foreach($purchaseOrderDocuments as $document){
-        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
         (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
     }
 });

From eee38b94ce36776c5ca0308786ab1da13b42228c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 8 Sep 2022 20:38:46 +0800
Subject: [PATCH 007/179] generate invoices for 1688 orders

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

diff --git a/routes/web.php b/routes/web.php
index eb0927c1..5f9e323e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,11 +380,10 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->doesntHave('owner', function($query){
-        return $query->where('owner.status', ApprovalStatus::COMPLETED);
-    })->get();
+    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
     foreach($purchaseOrderDocuments as $document){
+        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
         (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
     }
 });

From 510ee642b3ca505c17661281f2959b1dbf1614e9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 12 Sep 2022 16:21:26 +0800
Subject: [PATCH 008/179] change pi to june

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

diff --git a/routes/web.php b/routes/web.php
index 5f9e323e..ec95f5ba 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -203,7 +203,7 @@ Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWh
 Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
 
 Route::get('/supplier/pi/export', function(){
-   $groups = \App\Models\Group::where('issuer', 2210)->whereMonth('created_at', 5)->whereYear('created_at', 2022)->get();
+   $groups = \App\Models\Group::where('issuer', 2210)->whereMonth('created_at', 6)->whereYear('created_at', 2022)->get();
 
    echo '<table>';
    $i = 0;

From 6883dc7f9100b08811846fac9308507852731b0f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 14 Sep 2022 13:00:27 +0800
Subject: [PATCH 009/179] show wallet id in the wallet audit

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

diff --git a/routes/web.php b/routes/web.php
index ec95f5ba..a0dcb63a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -343,7 +343,7 @@ Route::get('/wallet/audit', function (Request $request) {
 
         $i++;
 
-        echo $i.". Marking: ". $wallet->owner->reference ."<br>Current Balance: ". $wallet->amount ."<br>Audit Balance: ". (($topups + $credit) - ($payments + $debit)) ."<br>Difference: ". round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) ."<br><br><br>";
+        echo $i.". Marking: ". $wallet->owner->reference ."(".$wallet->id.")<br>Current Balance: ". $wallet->amount ."<br>Audit Balance: ". (($topups + $credit) - ($payments + $debit)) ."<br>Difference: ". round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) ."<br><br><br>";
     }
 });
 

From 2f5915e810cda8aa160b14025cd4d6e846a64069 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 15 Sep 2022 14:32:20 +0800
Subject: [PATCH 010/179] disable sales data from company resource

---
 app/Http/Resources/CompanyResource.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index fceab5bc..be908ba4 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -27,8 +27,8 @@ class CompanyResource extends JsonResource
      */
     public function toArray($request)
     {
-        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
-        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+//        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
+//        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
 
         $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
         $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
@@ -45,15 +45,19 @@ class CompanyResource extends JsonResource
             'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
-            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
-                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            })->count(),
-            'total_payments' => (float) $totalPayments,
-            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
-            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
-                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->count() : $totalPayments,
-            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
+            'confirmed_bookings' => 0,
+            'total_payments' => 0,
+            'average_spending_per_day' => 0,
+            'average_spending_per_booking' => 0,
+//            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
+//                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+//            })->count(),
+//            'total_payments' => (float) $totalPayments,
+//            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
+//            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
+//                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+//                })->count() : $totalPayments,
+//            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
             'personal_banks' => BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
             'recipient_banks' => [
                 'accounts' => BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),

From c054d9d3a22c8882afb676c70868de2a2527cd6c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 15 Sep 2022 14:58:24 +0800
Subject: [PATCH 011/179] temporary remove booking from transactions resource

---
 app/Http/Resources/CompanyResource.php        | 26 ++++++++-----------
 app/Http/Resources/TransactionResource.php    |  2 +-
 .../SupplierPendingOrderComponent.vue         | 16 ++++++------
 3 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index be908ba4..fceab5bc 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -27,8 +27,8 @@ class CompanyResource extends JsonResource
      */
     public function toArray($request)
     {
-//        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
-//        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
+        $lastPayment = $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->orderBy('id', 'DESC')->first();
+        $totalPayments =  $this->transactions()->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
 
         $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
         $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
@@ -45,19 +45,15 @@ class CompanyResource extends JsonResource
             'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
-            'confirmed_bookings' => 0,
-            'total_payments' => 0,
-            'average_spending_per_day' => 0,
-            'average_spending_per_booking' => 0,
-//            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
-//                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-//            })->count(),
-//            'total_payments' => (float) $totalPayments,
-//            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
-//            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
-//                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-//                })->count() : $totalPayments,
-//            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
+            'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })->count(),
+            'total_payments' => (float) $totalPayments,
+            'average_spending_per_day' => (float) $totalPayments / ($this->created_at->diff(Carbon::now())->days === 0 ? 1 : $this->created_at->diff(Carbon::now())->days),
+            'average_spending_per_booking' => (float) $totalPayments > 0 ? $totalPayments / $this->bookings()->whereHas('transactions', function ($query){
+                $query->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->count() : $totalPayments,
+            'last_payment' => $lastPayment ? $lastPayment->created_at->diffForHumans() : 'No Payments',
             'personal_banks' => BankResource::collection($this->banks->where('type', BankAccountType::PERSONAL)),
             'recipient_banks' => [
                 'accounts' => BankResource::collection($this->banks->where('type', BankAccountType::EXTERNAL)),
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index e35dcc36..29e456d9 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -23,7 +23,7 @@ class TransactionResource extends JsonResource
 
         return [
             'id' => $this->id,
-            'booking' => new BookingResource($booking),
+//            'booking' => new BookingResource($booking),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
index e4877e96..b3e8d662 100644
--- a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -30,24 +30,24 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">
-                                                <div class="col">
-                                                    <span class="rounded badge-danger" style="padding: 5px">1688</span>
-                                                </div>
-                                            </div>
+                                            <!--<div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">-->
+                                                <!--<div class="col">-->
+                                                    <!--<span class="rounded badge-danger" style="padding: 5px">1688</span>-->
+                                                <!--</div>-->
+                                            <!--</div>-->
                                         </div>
                                     </div>
                                     <div class="row m-b-10">
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">reference</div>
                                             <div class="font-heading fs-10">
-                                                <a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>
+                                                <!--<a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>-->
                                             </div>
                                         </div>
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">Marking</div>
                                             <div class="font-heading fs-10">
-                                                <a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>
+                                                <!--<a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>-->
                                             </div>
                                         </div>
                                         <div class="col-auto">
@@ -89,7 +89,7 @@
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">Service</div>
                                             <div class="font-heading fs-10">
-                                                {{item.booking.service.name}}
+                                                <!--{{item.booking.service.name}}-->
                                             </div>
                                         </div>
                                         <div class="col text-right">

From 63d5cc141073992c4607f1da1c7ebbbb036483ef Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 15 Sep 2022 15:19:06 +0800
Subject: [PATCH 012/179] reverse temporary remove booking from transactions
 resource

---
 app/Http/Resources/TransactionResource.php       |  2 +-
 .../elements/SupplierPendingOrderComponent.vue   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 29e456d9..e35dcc36 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -23,7 +23,7 @@ class TransactionResource extends JsonResource
 
         return [
             'id' => $this->id,
-//            'booking' => new BookingResource($booking),
+            'booking' => new BookingResource($booking),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,
diff --git a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
index b3e8d662..e4877e96 100644
--- a/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/SupplierPendingOrderComponent.vue
@@ -30,24 +30,24 @@
                                                     </div>
                                                 </div>
                                             </div>
-                                            <!--<div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">-->
-                                                <!--<div class="col">-->
-                                                    <!--<span class="rounded badge-danger" style="padding: 5px">1688</span>-->
-                                                <!--</div>-->
-                                            <!--</div>-->
+                                            <div class="row" v-if="item.booking.bank.bank_name.includes('浙江网商银行')">
+                                                <div class="col">
+                                                    <span class="rounded badge-danger" style="padding: 5px">1688</span>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
                                     <div class="row m-b-10">
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">reference</div>
                                             <div class="font-heading fs-10">
-                                                <!--<a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>-->
+                                                <a :href="route('booking.details', item.booking.marking)">{{item.booking.marking}}</a>
                                             </div>
                                         </div>
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">Marking</div>
                                             <div class="font-heading fs-10">
-                                                <!--<a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>-->
+                                                <a :href="route('customer.profile', item.booking.company.reference)">{{item.booking.company.reference}}</a>
                                             </div>
                                         </div>
                                         <div class="col-auto">
@@ -89,7 +89,7 @@
                                         <div class="col-auto">
                                             <div class="font-heading fs-10 muted all-caps">Service</div>
                                             <div class="font-heading fs-10">
-                                                <!--{{item.booking.service.name}}-->
+                                                {{item.booking.service.name}}
                                             </div>
                                         </div>
                                         <div class="col text-right">

From 709679d73540b19dfd37b975cce0a108c1b0dc38 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 26 Sep 2022 13:19:07 +0800
Subject: [PATCH 013/179] update cief address in invoice documents

---
 .../pages/pdfs/bulk_purchase_order.blade.php  | 10 +++---
 .../views/pages/pdfs/deliver_order.blade.php  | 20 +++++------
 resources/views/pages/pdfs/invoice.blade.php  | 18 +++++-----
 .../pages/pdfs/proforma_invoice.blade.php     | 14 ++++----
 .../views/pages/pdfs/purchase_order.blade.php | 24 +++++++------
 .../pdfs/supplier_deliver_order.blade.php     | 36 ++++++++-----------
 6 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/resources/views/pages/pdfs/bulk_purchase_order.blade.php b/resources/views/pages/pdfs/bulk_purchase_order.blade.php
index 3abf6725..b4513850 100644
--- a/resources/views/pages/pdfs/bulk_purchase_order.blade.php
+++ b/resources/views/pages/pdfs/bulk_purchase_order.blade.php
@@ -40,10 +40,12 @@
                     CIEF Worldwide Sdn Bhd (1134596-M)
                 </span>
                 <div class="address">
-                    Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya
+                    No. 72-3, Jalan Jalil 1,<br>
+                    The Earth Bukit Jalil,<br>
+                    57000 Kuala Lumpur
                 </div>
                 <div class="contact-no">
-                    Phone: 0182909252
+                    Tel: 03-8082 1252
                 </div>
             </td>
         </tr>
@@ -66,7 +68,7 @@
             @php
                 $subtotal = 0;
             @endphp
-            
+
             @foreach($group->transactions as $po_order_transaction)
                 @foreach ($po_order_transaction->owner->owner->transactions()->where('type', \App\Classes\ValueObjects\Constants\TransactionType::PURCHASE_ORDER)->where('status', \App\Classes\ValueObjects\Constants\ApprovalStatus::APPROVED)->first()->transactionDetails as $key => $transaction_detail)
                     <tr>
@@ -91,7 +93,7 @@
         <tfoot>
             <tr class="subtotal">
                 <td colspan="4"></td>
-                <td class="right middle">Subtotal</td>                    
+                <td class="right middle">Subtotal</td>
                 <td class="right middle">
                     {{ number_format($subtotal, 2) }}
                 </td>
diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index d16a0060..ec1a34d7 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -18,10 +18,10 @@
                     </strong>
                 </span>
                 <span class="company-reg">(1134596-M)</span><br>
-                Malaysian Global Innovation &amp; Creativity Center <br>
-                Level 1 CWS, Block 3730, Persiaran APEC, <br>
-                63000 Cyberjaya, Malaysia. <br>
-                Tel: 018-2909252
+                No. 72-3, Jalan Jalil 1,<br>
+                The Earth Bukit Jalil,<br>
+                57000 Kuala Lumpur<br>
+                Tel: 03-8082 1252
             </td>
             <td class="header-details">
                 <div class="title">
@@ -85,7 +85,7 @@
             @php
                 $subtotal = 0;
             @endphp
-            
+
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -101,13 +101,13 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($transaction->booking()->first()->fix_currency_id !== 1)
-                        
+
                             {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
-                            
+
                             @php
                                 $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
-                        @else                            
+                        @else
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
 
                             @php
@@ -137,9 +137,9 @@
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
                         {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
-                    @else                        
+                    @else
                         {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index a2a33daa..99785ef8 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -17,10 +17,10 @@
                     </strong>
                 </span>
                 <span class="company-reg">(1134596-M)</span><br>
-                Malaysian Global Innovation &amp; Creativity Center <br>
-                Level 1 CWS, Block 3730, Persiaran APEC, <br>
-                63000 Cyberjaya, Malaysia. <br>
-                Tel: 018-2909252
+                No. 72-3, Jalan Jalil 1,<br>
+                The Earth Bukit Jalil,<br>
+                57000 Kuala Lumpur<br>
+                Tel: 03-8082 1252
             </td>
             <td class="header-details">
                 <div class="title">
@@ -100,13 +100,13 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($transaction->booking()->first()->fix_currency_id !== 1)
-                        
+
                             {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
-                            
+
                             @php
                                 $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
-                        @else                            
+                        @else
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
 
                             @php
@@ -136,9 +136,9 @@
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
                         {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
-                    @else                        
+                    @else
                         {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php
index da14e2c0..d2b3977b 100644
--- a/resources/views/pages/pdfs/proforma_invoice.blade.php
+++ b/resources/views/pages/pdfs/proforma_invoice.blade.php
@@ -17,10 +17,10 @@
                     </strong>
                 </span>
                 <span class="company-reg">(1134596-M)</span><br>
-                Malaysian Global Innovation &amp; Creativity Center <br>
-                Level 1 CWS, Block 3730, Persiaran APEC, <br>
-                63000 Cyberjaya, Malaysian. <br>
-                Tel: 018-2909252
+                No. 72-3, Jalan Jalil 1,<br>
+                The Earth Bukit Jalil,<br>
+                57000 Kuala Lumpur<br>
+                Tel: 03-8082 1252
             </td>
             <td class="header-details">
                 <div class="title">
@@ -100,13 +100,13 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($invoice_transaction->booking()->first()->fix_currency_id !== 1)
-                        
+
                             {{  number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
-                            
+
                             @php
                                 $subtotal += number_format((float)number_format( (1/$invoice_transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
-                        @else                            
+                        @else
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
 
                             @php
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index 84205178..9f72b531 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -44,8 +44,8 @@
                    @php
                         $addresses = $supplier->addresses()->where('billing', '=', true)->first();
                     @endphp
-                    {{ $addresses->street_one }} 
-                    {{ $addresses->street_two }} 
+                    {{ $addresses->street_one }}
+                    {{ $addresses->street_two }}
                     {{ $addresses->state()->first()->name }}
                     {{ $addresses->district()->first()->name }}
                 </span>
@@ -63,10 +63,12 @@
                     CIEF Worldwide Sdn Bhd (1134596-M)
                 </span>
                 <div class="address">
-                    Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya
+                    No. 72-3, Jalan Jalil 1,<br>
+                    The Earth Bukit Jalil,<br>
+                    57000 Kuala Lumpur
                 </div>
                 <div class="contact-no">
-                    Phone: 0182909252
+                    Tel: 03-8082 1252
                 </div>
             </td>
         </tr>
@@ -89,7 +91,7 @@
             @php
                 $subtotal = 0;
             @endphp
-            
+
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -105,13 +107,13 @@
                     </td>
                     <td width="20%" class="right top">
                         @if($transaction->booking()->first()->fix_currency_id !== 1)
-                        
+
                             {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
-                            
+
                             @php
                                 $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
-                        @else                            
+                        @else
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
 
                             @php
@@ -125,7 +127,7 @@
         <tfoot>
             <tr class="subtotal">
                 <td colspan="4"></td>
-                <td class="right middle">Subtotal</td>                    
+                <td class="right middle">Subtotal</td>
                 <td class="right middle">
                     {{ number_format($subtotal, 2) }}
                 </td>
@@ -141,9 +143,9 @@
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
                         {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
-                    @else                        
+                    @else
                         {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>
diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index 89d25cc4..66b9c687 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -34,25 +34,17 @@
                     Buyer
                 </span>
                 <br>
-
-                <div class="buyer-company">
-                    CIEF Worldwide Sdn Bhd (1134596-M)
-                </div>
-
                 <span class="buyer-company">
-                    Malaysia Global Innovation & CreativityCentre, Level 1 CWS, Block 3730, PersiaranAPEC 63000 Cyberjaya
-                </span>
-                <span class="reg">
-                    {{-- {{ $supplier }} --}}
-                </span>
-                <br>
-                <span class="address">
-                    {{-- {{ $buyer['address'] }} --}}
-                </span>
-                <br>
-                <span class="contact-no">
-                    Phone: 0182909252
+                    CIEF Worldwide Sdn Bhd (1134596-M)
                 </span>
+                <div class="address">
+                    No. 72-3, Jalan Jalil 1,<br>
+                    The Earth Bukit Jalil,<br>
+                    57000 Kuala Lumpur
+                </div>
+                <div class="contact-no">
+                    Tel: 03-8082 1252
+                </div>
             </td>
         </tr>
     </table>
@@ -74,7 +66,7 @@
             @php
                 $subtotal = 0;
             @endphp
-            
+
             @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
                 <tr>
                     <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -92,11 +84,11 @@
                         @if($transaction->booking()->first()->fix_currency_id !== 1)
 
                             {{  number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
-                            
+
                             @php
                                 $subtotal += number_format((float)number_format( (1/$transaction->currency_rate) * $transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2,'.','');
                             @endphp
-                        @else                                                        
+                        @else
                             {{ number_format((float)number_format($transaction_detail->price, 2,'.','')*$transaction_detail->quantity,2) }}
 
                             @php
@@ -119,9 +111,9 @@
                 <td colspan="4"></td>
                 <td class="right">Adjustment</td>
                 <td class="right">
-                    @if($transaction->booking()->first()->fix_currency_id !== 1)                        
+                    @if($transaction->booking()->first()->fix_currency_id !== 1)
                         {{ number_format((float)number_format( (1/$transaction->currency_rate) * $transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
-                    @else                        
+                    @else
                         {{ number_format((float)number_format($transaction->amount, 2,'.','') - (float)number_format($subtotal, 2,'.',''),2) }}
                     @endif
                 </td>

From ae4260dd15cd10559e52c170c85f6f57b7092fe7 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:24:19 +0800
Subject: [PATCH 014/179] update july xpo and pi

---
 .../Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php  | 4 ++--
 routes/web.php                                                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
index 19a01704..69a09f5c 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
@@ -65,7 +65,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
     public function logic(Request $request) : JsonResponse
     {
         $bookings = Booking::where(function($query){
-            return $query->whereMonth('created_at', 06)->whereYear('created_at', 2022);
+            return $query->whereMonth('created_at', 07)->whereYear('created_at', 2022);
         })->whereDoesntHave('transactions', function($q){
                 $q->where('type', TransactionType::PURCHASE_ORDER);
                 $q->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]);
@@ -111,4 +111,4 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
 
         return $this->response([]);
     }
-}
\ No newline at end of file
+}
diff --git a/routes/web.php b/routes/web.php
index a0dcb63a..364fb6e7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -203,7 +203,7 @@ Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWh
 Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
 
 Route::get('/supplier/pi/export', function(){
-   $groups = \App\Models\Group::where('issuer', 2210)->whereMonth('created_at', 6)->whereYear('created_at', 2022)->get();
+   $groups = \App\Models\Group::where('issuer', 2210)->whereMonth('created_at', 7)->whereYear('created_at', 2022)->get();
 
    echo '<table>';
    $i = 0;

From bf18a18f1df9a14652fcbf448eddc1d0bd48e20b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:31:44 +0800
Subject: [PATCH 015/179] update july xpo and pi

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

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
index 69a09f5c..230e1bb8 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
@@ -64,7 +64,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $bookings = Booking::where(function($query){
+        $bookings = Booking::where('service_id', '!=', 4)->where(function($query){
             return $query->whereMonth('created_at', 07)->whereYear('created_at', 2022);
         })->whereDoesntHave('transactions', function($q){
                 $q->where('type', TransactionType::PURCHASE_ORDER);

From d72ebd4fdc3e54a7ca0c3379a84605194bc6cd35 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:34:28 +0800
Subject: [PATCH 016/179] fix 1688 xpo

---
 routes/web.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 364fb6e7..46196c14 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,11 +380,14 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
-
-    foreach($purchaseOrderDocuments as $document){
-        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
-        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
-    }
+    Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
+        return $query->where('type', TransactionType::PURCHASE_ORDER);
+    })->get();
+//    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+//
+//    foreach($purchaseOrderDocuments as $document){
+//        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
+//        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
+//    }
 });
 

From e8332066002c5bb3ccf1c9fe5fdab2a60b0f1a5e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:35:25 +0800
Subject: [PATCH 017/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 46196c14..1bcce7f9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,9 +380,9 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
+    dd(Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
         return $query->where('type', TransactionType::PURCHASE_ORDER);
-    })->get();
+    })->get());
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From b0afd8592a2d7aab3713e8a8093956754e1357f4 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:36:33 +0800
Subject: [PATCH 018/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 1bcce7f9..57690e22 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,9 +380,11 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    dd(Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
+    $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
         return $query->where('type', TransactionType::PURCHASE_ORDER);
-    })->get());
+    })->get();
+
+    dd($bookings->pluck('created_at'));
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From 11477a16ab7cf9dac64dd2c95b75d33e1aceea74 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:39:22 +0800
Subject: [PATCH 019/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 57690e22..bed0e322 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -381,7 +381,7 @@ Route::get('/payments/manual', function(){
 
 Route::get('/1688/fix', function(){
     $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
-        return $query->where('type', TransactionType::PURCHASE_ORDER);
+        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('created_at', '>=', Carbon\Carbon::now()->subDay());
     })->get();
 
     dd($bookings->pluck('created_at'));

From ddeba0e3ce5aff3e4a4679aea9c04f1580870b60 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:40:17 +0800
Subject: [PATCH 020/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index bed0e322..5ea7730c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -381,7 +381,7 @@ Route::get('/payments/manual', function(){
 
 Route::get('/1688/fix', function(){
     $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
-        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('created_at', '>=', Carbon\Carbon::now()->subDay());
+        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('created_at', '>=', Carbon::now()->subDay());
     })->get();
 
     dd($bookings->pluck('created_at'));

From 82b09c25e2273e56ceeb7bb570c4267c0f7e6c37 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:42:58 +0800
Subject: [PATCH 021/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 5ea7730c..938e4839 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -381,7 +381,7 @@ Route::get('/payments/manual', function(){
 
 Route::get('/1688/fix', function(){
     $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
-        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('created_at', '>=', Carbon::now()->subDay());
+        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%');
     })->get();
 
     dd($bookings->pluck('created_at'));

From 973dd08fda66fd2d33f7f860d5bd0fac6ade70d7 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:44:16 +0800
Subject: [PATCH 022/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 938e4839..b3904b29 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -382,9 +382,9 @@ Route::get('/payments/manual', function(){
 Route::get('/1688/fix', function(){
     $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
         return $query->where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%');
-    })->get();
+    });
 
-    dd($bookings->pluck('created_at'));
+    $bookings->dd();
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From 0749e8fd4e72ed92a0eaba623bea43f97544a5cd Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:48:37 +0800
Subject: [PATCH 023/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index b3904b29..a3832185 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -384,7 +384,7 @@ Route::get('/1688/fix', function(){
         return $query->where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%');
     });
 
-    $bookings->dd();
+    $bookings->limit(10)->get();
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From a54434004de6094a0aab3dbe5ca4c1cb3e27fbae Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:49:10 +0800
Subject: [PATCH 024/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index a3832185..c219ae81 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -384,7 +384,7 @@ Route::get('/1688/fix', function(){
         return $query->where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%');
     });
 
-    $bookings->limit(10)->get();
+    dd($bookings->limit(10)->get());
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From 83ed6331b1e1684c9d927e5b15907e5f8fef4b78 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:53:05 +0800
Subject: [PATCH 025/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index c219ae81..61fa1283 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,11 +380,11 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    $bookings = Booking::where('service_id', 4)->where('status', 2)->whereHas('transactions', function($query){
-        return $query->where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%');
+    $transactions = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%')->whereHas('booking', function($query){
+        return $query->where('service_id', 4)->where('status', 2);
     });
 
-    dd($bookings->limit(10)->get());
+    dd($transactions->limit(10)->get());
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From 5b88992ee5374e3d681c1e70a57226b88d073b82 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 27 Sep 2022 11:56:24 +0800
Subject: [PATCH 026/179] fix 1688 xpo

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

diff --git a/routes/web.php b/routes/web.php
index 61fa1283..792f0895 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -384,7 +384,7 @@ Route::get('/1688/fix', function(){
         return $query->where('service_id', 4)->where('status', 2);
     });
 
-    dd($transactions->limit(10)->get());
+    $transactions->delete();
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //
 //    foreach($purchaseOrderDocuments as $document){

From 090636af7f7fa02f1fed6ed66cb1a128f4f9c737 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 28 Sep 2022 11:52:05 +0800
Subject: [PATCH 027/179] show swift code input in account when booking usd

---
 .../banks/forms/BankAccountFormComponent.vue          | 11 ++++++++---
 .../elements/BookingConfirmationComponent.vue         |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
index 3bf7fa65..fa23fac4 100644
--- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -56,14 +56,14 @@
                                     </validation-wrapper-component>
                                 </div>
                             </div>
-                            <div class="row m-b-10 hide">
+                            <div class="row m-b-10" v-if="currency === 'USD'">
                                 <div class="col p-r-5">
                                     <validation-wrapper-component :validator="$v.parameters.swift">
                                         <label>Swift</label>
                                         <input type="text" class="form-control" v-model="parameters.swift" :disabled="disabled">
                                     </validation-wrapper-component>
                                 </div>
-                                <div class="col p-l-5">
+                                <div class="col p-l-5 hide">
                                     <validation-wrapper-component :validator="$v.parameters.snap">
                                         <label>Snap</label>
                                         <input type="text" class="form-control" v-model="parameters.snap" :disabled="disabled">
@@ -122,6 +122,11 @@
                 type: Object,
                 required: false,
                 default: null
+            },
+            currency: {
+                type: String,
+                required: false,
+                default: 'RMB'
             }
         },
         data(){
@@ -181,4 +186,4 @@
         mixins: [FormHandler]
 
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
index e04d0bfb..492a2af8 100644
--- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue
@@ -148,7 +148,7 @@
                                             </div>
                                             <div class="row" v-show="createBank">
                                                 <div class="col">
-                                                    <bank-account-form-component v-if="data.serviceType.id !== 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
+                                                    <bank-account-form-component v-if="data.serviceType.id !== 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" :currency="data.serviceType.selectedCurrency.short_code" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></bank-account-form-component>
                                                     <phone-account-form-component v-if="data.serviceType.id === 4" section="customerProfileSection" :disabled="formDisabled" :data="Object.keys(parameters.bankAccount).length ? parameters.bankAccount  : {account_no: account_no, company_id: data.company.id, country_id: 2, account_type: 2}" :company_id="data.company.id" :country_id="2" :type="2" v-on:createdBank="updateBank($event)" :serviceType="data.serviceType" :closable=false v-on:close="clearAccount()"></phone-account-form-component>
                                                 </div>
                                             </div>

From e16b325036db06985ba34561fa82883cb1f5936d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 28 Sep 2022 11:58:35 +0800
Subject: [PATCH 028/179] show swift code input in account when booking usd

---
 .../banks/forms/BankAccountFormComponent.vue  | 118 +++++++++++++-----
 1 file changed, 85 insertions(+), 33 deletions(-)

diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
index fa23fac4..6e9518d9 100644
--- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
+++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue
@@ -14,49 +14,101 @@
                             <small class="bold fs-10 text-danger">{{error}}</small>
                         </div>
                     </div>
-                    <div class="row m-b-10" v-if="type === 2">
+                    <div class="row" v-if="currency !== 'USD'">
                         <div class="col">
-                            <validation-wrapper-component :validator="$v.parameters.reference">
-                                <label>Reference</label>
-                                <input type="text" class="form-control" v-model="parameters.reference" :disabled="disabled">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row m-b-10">
-                        <div class="col">
-                            <validation-wrapper-component :validator="$v.parameters.holder_name">
-                                <label>Account Holder Name</label>
-                                <input type="text" class="form-control" v-model="parameters.holder_name" :disabled="disabled">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row m-b-10">
-                        <div class="col">
-                            <validation-wrapper-component :validator="$v.parameters.account_no">
-                                <label>{{ serviceType ? serviceType.id === 4 ? 'Alipay recipient Email / Phone' : 'Account No.' : 'Account No.'}}</label>
-                                <input type="text" class="form-control" v-model="parameters.account_no" :disabled="disabled">
-                            </validation-wrapper-component>
-                        </div>
-                    </div>
-                    <div class="row" v-if="type === 2">
-                        <div class="col">
-                            <div class="row m-b-10">
+                            <div class="row m-b-10" v-if="type === 2">
                                 <div class="col">
-                                    <validation-wrapper-component :validator="$v.parameters.bank_name">
-                                        <label>Bank Name</label>
-                                        <input type="text" class="form-control" v-model="parameters.bank_name" :disabled="disabled">
+                                    <validation-wrapper-component :validator="$v.parameters.reference">
+                                        <label>Reference</label>
+                                        <input type="text" class="form-control" v-model="parameters.reference" :disabled="disabled">
                                     </validation-wrapper-component>
                                 </div>
                             </div>
                             <div class="row m-b-10">
                                 <div class="col">
-                                    <validation-wrapper-component :validator="$v.parameters.bank_branch">
-                                        <label>Bank Branch / 所在地</label>
-                                        <input type="text" class="form-control" v-model="parameters.bank_branch" :disabled="disabled">
+                                    <validation-wrapper-component :validator="$v.parameters.holder_name">
+                                        <label>Account Holder Name</label>
+                                        <input type="text" class="form-control" v-model="parameters.holder_name" :disabled="disabled">
                                     </validation-wrapper-component>
                                 </div>
                             </div>
-                            <div class="row m-b-10" v-if="currency === 'USD'">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.account_no">
+                                        <label>{{ serviceType ? serviceType.id === 4 ? 'Alipay recipient Email / Phone' : 'Account No.' : 'Account No.'}}</label>
+                                        <input type="text" class="form-control" v-model="parameters.account_no" :disabled="disabled">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row" v-if="type === 2">
+                                <div class="col">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.bank_name">
+                                                <label>Bank Name</label>
+                                                <input type="text" class="form-control" v-model="parameters.bank_name" :disabled="disabled">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.bank_branch">
+                                                <label>Bank Branch / 所在地</label>
+                                                <input type="text" class="form-control" v-model="parameters.bank_branch" :disabled="disabled">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row" v-if="currency === 'USD'">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.holder_name">
+                                        <label>Account Holder Name</label>
+                                        <input type="text" class="form-control" v-model="parameters.holder_name" :disabled="disabled">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.reference">
+                                        <label>Account Holder Address</label>
+                                        <input type="text" class="form-control" v-model="parameters.reference" :disabled="disabled">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.parameters.account_no">
+                                        <label>Account No</label>
+                                        <input type="text" class="form-control" v-model="parameters.account_no" :disabled="disabled">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row" v-if="type === 2">
+                                <div class="col">
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.bank_name">
+                                                <label>Bank Name</label>
+                                                <input type="text" class="form-control" v-model="parameters.bank_name" :disabled="disabled">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                    <div class="row m-b-10">
+                                        <div class="col">
+                                            <validation-wrapper-component :validator="$v.parameters.bank_branch">
+                                                <label>Bank Address</label>
+                                                <input type="text" class="form-control" v-model="parameters.bank_branch" :disabled="disabled">
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-b-10" >
                                 <div class="col p-r-5">
                                     <validation-wrapper-component :validator="$v.parameters.swift">
                                         <label>Swift</label>

From 00ff3750dd208c1560cb5acc03b0a1787e038fcc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:17:22 +0800
Subject: [PATCH 029/179] convert 1688 purchase order to po

---
 composer.json  | 11 ++++++-----
 routes/web.php | 41 +++++++++++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index 80a34ede..421d9248 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,13 @@
         "doctrine/dbal": "^2.12.1",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0.1",
         "intervention/image": "^2.5",
-        "laravel/framework": "^7.0",
+        "laravel/framework": "^8.0",
         "laravel/tinker": "^2.0",
         "maatwebsite/excel": "^3.1",
         "rinvex/countries": "^6.1",
+        "smalot/pdfparser": "^2.2",
         "spatie/laravel-activitylog": "^3.14",
         "spatie/laravel-permission": "^3.17",
         "staudenmeir/eloquent-has-many-deep": "^1.7",
@@ -31,12 +32,12 @@
         "webklex/laravel-pdfmerger": "^1.3"
     },
     "require-dev": {
-        "facade/ignition": "^2.0",
+        "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",
         "laravel/dusk": "^6.23",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^4.1",
-        "phpunit/phpunit": "^8.5"
+        "nunomaduro/collision": "^5.0",
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
         "optimize-autoloader": true,
diff --git a/routes/web.php b/routes/web.php
index 792f0895..e0546f38 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,16 +380,41 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-    $transactions = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%')->whereHas('booking', function($query){
-        return $query->where('service_id', 4)->where('status', 2);
-    });
-
-    $transactions->delete();
-//    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+//    $transactions = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%')->whereHas('booking', function($query){
+//        return $query->where('service_id', 4)->where('status', 2);
+//    });
 //
-//    foreach($purchaseOrderDocuments as $document){
+//    $transactions->delete();
+    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+
+    foreach($purchaseOrderDocuments as $document){
+        foreach($document->files as $file) {
+            $parser = new \Smalot\PdfParser\Parser();
+            $pdf = $parser->parseFile($file>file->file_info->original->file);
+
+            $text = $pdf->getText();
+            $tables = explode('Amount (yuan)', $text);
+            array_shift($tables);
+
+            $purchaseOrder = [];
+            foreach ($tables as $table){
+                $products = preg_split('/(yuan\/|yuan \/)/', str_replace("\r\n","",$table));
+
+                array_pop($products);
+                foreach ($products as $product){
+                    $product = preg_split('/[\t]/',$product);
+                    $type = count($product) === 10 ? 2 : 1;
+                    $purchaseOrder[] = [
+                        'description' => str_replace("\n","",$product[$type === 2 ? 6 : 3]),
+                        'quantity' =>  (int) str_replace("\n","",$product[$type === 2 ? 8 : 5]),
+                        'unit_price' =>  (float) str_replace("\n","",$product[$type === 2 ? 9 : 6])
+                    ];
+                }
+            }
+            dd($purchaseOrder = []);
+        }
 //        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
-//    }
+    }
 });
 

From 027eef2aaa97b1e61d1bb6ca364ba3657c35d295 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:19:08 +0800
Subject: [PATCH 030/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index e0546f38..584bd455 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -411,7 +411,7 @@ Route::get('/1688/fix', function(){
                     ];
                 }
             }
-            dd($purchaseOrder = []);
+            dd($purchaseOrder);
         }
 //        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);

From 7bf94082fed0915e0fadb103f9c05dcf2e2f9df3 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:21:08 +0800
Subject: [PATCH 031/179] convert 1688 purchase order to po

---
 routes/web.php | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 584bd455..fb3dc155 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,38 +380,11 @@ Route::get('/payments/manual', function(){
 });
 
 Route::get('/1688/fix', function(){
-//    $transactions = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('bill_no', 'like', 'XPO-%')->whereHas('booking', function($query){
-//        return $query->where('service_id', 4)->where('status', 2);
-//    });
-//
-//    $transactions->delete();
     $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
-            $parser = new \Smalot\PdfParser\Parser();
-            $pdf = $parser->parseFile($file>file->file_info->original->file);
 
-            $text = $pdf->getText();
-            $tables = explode('Amount (yuan)', $text);
-            array_shift($tables);
-
-            $purchaseOrder = [];
-            foreach ($tables as $table){
-                $products = preg_split('/(yuan\/|yuan \/)/', str_replace("\r\n","",$table));
-
-                array_pop($products);
-                foreach ($products as $product){
-                    $product = preg_split('/[\t]/',$product);
-                    $type = count($product) === 10 ? 2 : 1;
-                    $purchaseOrder[] = [
-                        'description' => str_replace("\n","",$product[$type === 2 ? 6 : 3]),
-                        'quantity' =>  (int) str_replace("\n","",$product[$type === 2 ? 8 : 5]),
-                        'unit_price' =>  (float) str_replace("\n","",$product[$type === 2 ? 9 : 6])
-                    ];
-                }
-            }
-            dd($purchaseOrder);
         }
 //        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);

From 7f51142b6d030c3d7ea8ebf82b8c1caa34750d04 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:23:09 +0800
Subject: [PATCH 032/179] convert 1688 purchase order to po

---
 routes/web.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index fb3dc155..e23afe64 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -384,7 +384,29 @@ Route::get('/1688/fix', function(){
 
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
+            $parser = new \Smalot\PdfParser\Parser();
+            $pdf = $parser->parseFile($file>file->file_info->original->file);
 
+            $text = $pdf->getText();
+            $tables = explode('Amount (yuan)', $text);
+            array_shift($tables);
+
+            $purchaseOrder = [];
+            foreach ($tables as $table){
+                $products = preg_split('/(yuan\/|yuan \/)/', str_replace("\r\n","",$table));
+
+                array_pop($products);
+                foreach ($products as $product){
+                    $product = preg_split('/[\t]/',$product);
+                    $type = count($product) === 10 ? 2 : 1;
+                    $purchaseOrder[] = [
+                        'description' => str_replace("\n","",$product[$type === 2 ? 6 : 3]),
+                        'quantity' =>  (int) str_replace("\n","",$product[$type === 2 ? 8 : 5]),
+                        'unit_price' =>  (float) str_replace("\n","",$product[$type === 2 ? 9 : 6])
+                    ];
+                }
+            }
+            dd($purchaseOrder);
         }
 //        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);

From cb270abbe0152d544dd227cb7da7ca93905af01e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:24:11 +0800
Subject: [PATCH 033/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index e23afe64..5d5643e0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -385,7 +385,7 @@ Route::get('/1688/fix', function(){
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
             $parser = new \Smalot\PdfParser\Parser();
-            $pdf = $parser->parseFile($file>file->file_info->original->file);
+            $pdf = $parser->parseFile($file->file->file_info->original->file);
 
             $text = $pdf->getText();
             $tables = explode('Amount (yuan)', $text);

From bcf0c649c10d5183b200ed82ca07fad6d81bee54 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:27:15 +0800
Subject: [PATCH 034/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index 5d5643e0..d1f17652 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -385,7 +385,7 @@ Route::get('/1688/fix', function(){
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
             $parser = new \Smalot\PdfParser\Parser();
-            $pdf = $parser->parseFile($file->file->file_info->original->file);
+            $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
 
             $text = $pdf->getText();
             $tables = explode('Amount (yuan)', $text);

From c50b84d4403997795e1768f770d9dea73e60e234 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:28:32 +0800
Subject: [PATCH 035/179] convert 1688 purchase order to po

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index d1f17652..b77f5a62 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -383,6 +383,7 @@ Route::get('/1688/fix', function(){
     $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
     foreach($purchaseOrderDocuments as $document){
+        var_dump($document->owner->marking);
         foreach($document->files as $file) {
             $parser = new \Smalot\PdfParser\Parser();
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));

From 6d4475920b1335da0b3bea9f16bca9dc995ee0f5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:34:03 +0800
Subject: [PATCH 036/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index b77f5a62..285e66b1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -382,8 +382,8 @@ Route::get('/payments/manual', function(){
 Route::get('/1688/fix', function(){
     $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
+    $bookings = [];
     foreach($purchaseOrderDocuments as $document){
-        var_dump($document->owner->marking);
         foreach($document->files as $file) {
             $parser = new \Smalot\PdfParser\Parser();
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
@@ -392,7 +392,6 @@ Route::get('/1688/fix', function(){
             $tables = explode('Amount (yuan)', $text);
             array_shift($tables);
 
-            $purchaseOrder = [];
             foreach ($tables as $table){
                 $products = preg_split('/(yuan\/|yuan \/)/', str_replace("\r\n","",$table));
 
@@ -400,17 +399,17 @@ Route::get('/1688/fix', function(){
                 foreach ($products as $product){
                     $product = preg_split('/[\t]/',$product);
                     $type = count($product) === 10 ? 2 : 1;
-                    $purchaseOrder[] = [
+                    $bookings[$document->owner->marking] = [
                         'description' => str_replace("\n","",$product[$type === 2 ? 6 : 3]),
                         'quantity' =>  (int) str_replace("\n","",$product[$type === 2 ? 8 : 5]),
                         'unit_price' =>  (float) str_replace("\n","",$product[$type === 2 ? 9 : 6])
                     ];
                 }
             }
-            dd($purchaseOrder);
         }
 //        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
     }
+    dd($bookings);
 });
 

From 2bf072e18111f08b6a20f13c3d50b9057b09259e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:37:36 +0800
Subject: [PATCH 037/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index 285e66b1..238ecf15 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -385,6 +385,8 @@ Route::get('/1688/fix', function(){
     $bookings = [];
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
+            if(!$file->file->file_info) $file;
+            continue;
             $parser = new \Smalot\PdfParser\Parser();
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
 

From 2d8eac1345cb86cabe95b5e7a9a966c2ef154043 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:38:04 +0800
Subject: [PATCH 038/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index 238ecf15..c1cef285 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -385,7 +385,7 @@ Route::get('/1688/fix', function(){
     $bookings = [];
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
-            if(!$file->file->file_info) $file;
+            if(!$file->file) $file;
             continue;
             $parser = new \Smalot\PdfParser\Parser();
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));

From 1ac4dd52acd5f304d56f586c8b0228d6632b4cbf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:39:49 +0800
Subject: [PATCH 039/179] convert 1688 purchase order to po

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

diff --git a/routes/web.php b/routes/web.php
index c1cef285..56e895c2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -385,7 +385,7 @@ Route::get('/1688/fix', function(){
     $bookings = [];
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
-            if(!$file->file) $file;
+            if(!$file->file->file_info) dd($file);
             continue;
             $parser = new \Smalot\PdfParser\Parser();
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));

From 15f695763d49619ada186e81f929f84e6e347040 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:46:26 +0800
Subject: [PATCH 040/179] convert 1688 purchase orders to po

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

diff --git a/routes/web.php b/routes/web.php
index 56e895c2..50c36cbe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,6 +16,7 @@ use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Excel;
 use Meneses\LaravelMpdf\Facades\LaravelMpdf;
@@ -385,10 +386,12 @@ Route::get('/1688/fix', function(){
     $bookings = [];
     foreach($purchaseOrderDocuments as $document){
         foreach($document->files as $file) {
-            if(!$file->file->file_info) dd($file);
-            continue;
             $parser = new \Smalot\PdfParser\Parser();
-            $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
+            try {
+                $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
+            } catch (Exception $e){
+                dd($file);
+            }
 
             $text = $pdf->getText();
             $tables = explode('Amount (yuan)', $text);

From 819bcb7f367f8d53b5cb5b4d6a4770a0f59a968e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 03:48:59 +0800
Subject: [PATCH 041/179] convert 1688 purchase orders to po

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

diff --git a/routes/web.php b/routes/web.php
index 50c36cbe..5b7f93f5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -389,8 +389,8 @@ Route::get('/1688/fix', function(){
             $parser = new \Smalot\PdfParser\Parser();
             try {
                 $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
-            } catch (Exception $e){
-                dd($file);
+            } catch (Exception $e) {
+                continue;
             }
 
             $text = $pdf->getText();

From 0d2dc1ba0dfb3c46edfb80f961838b756be2d97e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 04:18:04 +0800
Subject: [PATCH 042/179] convert 1688 purchase orders to po

---
 routes/web.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 5b7f93f5..6aadda47 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -403,11 +403,14 @@ Route::get('/1688/fix', function(){
                 array_pop($products);
                 foreach ($products as $product){
                     $product = preg_split('/[\t]/',$product);
-                    $type = count($product) === 10 ? 2 : 1;
+
+                    $adjuster = (count($product) - 7);
+                    $descriptionIndex = 3 + $adjuster;
+
                     $bookings[$document->owner->marking] = [
-                        'description' => str_replace("\n","",$product[$type === 2 ? 6 : 3]),
-                        'quantity' =>  (int) str_replace("\n","",$product[$type === 2 ? 8 : 5]),
-                        'unit_price' =>  (float) str_replace("\n","",$product[$type === 2 ? 9 : 6])
+                        'description' => str_replace("\n","",$product[$descriptionIndex]),
+                        'quantity' =>  (int) str_replace("\n","",$product[$descriptionIndex + 2]),
+                        'unit_price' =>  (float) str_replace("\n","",$product[$descriptionIndex + 3])
                     ];
                 }
             }

From 16d823f10c75124ee8d37e4545b894d39ab3653a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 04:23:51 +0800
Subject: [PATCH 043/179] convert 1688 purchase orders to po

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

diff --git a/routes/web.php b/routes/web.php
index 6aadda47..811a6712 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -407,7 +407,7 @@ Route::get('/1688/fix', function(){
                     $adjuster = (count($product) - 7);
                     $descriptionIndex = 3 + $adjuster;
 
-                    $bookings[$document->owner->marking] = [
+                    $bookings[$document->owner->marking][] = [
                         'description' => str_replace("\n","",$product[$descriptionIndex]),
                         'quantity' =>  (int) str_replace("\n","",$product[$descriptionIndex + 2]),
                         'unit_price' =>  (float) str_replace("\n","",$product[$descriptionIndex + 3])

From 52974fd5149249943d6074970ff4c643dfd6e467 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 29 Sep 2022 05:01:45 +0800
Subject: [PATCH 044/179] convert 1688 purchase orders to po

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

diff --git a/routes/web.php b/routes/web.php
index 811a6712..84980320 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -394,6 +394,8 @@ Route::get('/1688/fix', function(){
             }
 
             $text = $pdf->getText();
+            if(str_contains($text, '订单详情单')) continue;
+
             $tables = explode('Amount (yuan)', $text);
             array_shift($tables);
 

From c9fadcaed51dcb5723aad9f16d564441a6580f32 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 02:19:35 +0800
Subject: [PATCH 045/179] convert 1688 purchase order to po on document upload

---
 ...eatePurchaseOrderFor1688OrderProcessor.php | 37 +++++++-----
 .../Convert1688PurchaseOrderToProductList.php | 58 +++++++++++++++++++
 2 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php

diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index aa7f2ed7..1dfbe85c 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -3,12 +3,15 @@
 namespace App\Classes\Modules\Bookings\Processors;
 
 
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Bookings\Services\Convert1688PurchaseOrderToProductList;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
@@ -27,32 +30,39 @@ class CreatePurchaseOrderFor1688OrderProcessor
     /** @var CreateInvoiceTransactionProcessor */
     private $createInvoiceTransactionProcessor;
 
+    /** @var Convert1688PurchaseOrderToProductList */
+    private $convert1688PurchaseOrderToProductList;
+
     /**
-     * CreatePurchaseOrderFor1688OrderProcessor constructor.
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     * @param Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList
      */
-    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
+    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor, Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList)
     {
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+        $this->convert1688PurchaseOrderToProductList = $convert1688PurchaseOrderToProductList;
     }
 
+
     public function execute(Booking $booking){
         $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
 
-        $products = [
-            [
-                'description' => 'please refer to the attachment below',
-                'quantity' => 1,
-                'stockCode' => '',
-                'unit_price' => $booking->fix_amount
-            ]
-        ];
+        $documents = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+        foreach($documents as $document) {
+            foreach ($document->files as $file) {
+                try {
+                    $products = $this->convert1688PurchaseOrderToProductList->execute($file);
+                } catch (MalformedRequestException $exception) {
+                    continue;
+                }
+            }
+        }
 
         $total = collect($products)->sum(function($product){
             return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));
@@ -63,11 +73,8 @@ class CreatePurchaseOrderFor1688OrderProcessor
             $total, $total, $booking->fix_currency_id, $booking->fix_currency_id,
             1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, $products);
 
-        $purchaseOrder = $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+        $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
 
-        $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
-
-        $this->createInvoiceTransactionProcessor->execute($booking);
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
new file mode 100644
index 00000000..f22c50e7
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Models\File;
+use Exception;
+use Illuminate\Support\Facades\Storage;
+
+class Convert1688PurchaseOrderToProductList
+{
+    /**
+     * @param File $file
+     * @return array
+     * @throws MalformedRequestException
+     */
+    public function execute(File $file): array
+    {
+        $parser = new \Smalot\PdfParser\Parser();
+        $productList = [];
+        try {
+            $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
+        } catch (Exception $exception) {
+            throw new MalformedRequestException('Invalid file format.');
+        }
+
+        $text = $pdf->getText();
+        if(str_contains($text, '订单详情单')) throw new MalformedRequestException('Can\'t process non english documents');
+
+        $tables = explode('Amount (yuan)', $text);
+        array_shift($tables);
+
+        foreach ($tables as $table){
+            $products = preg_split('/(yuan\/|yuan \/|元\/|元 \/)/', str_replace("\r\n","",$table));
+
+            array_pop($products);
+            foreach ($products as $product){
+                $product = preg_split('/[\t]/',$product);
+
+                $adjuster = (count($product) - 7);
+                $descriptionIndex = 3 + $adjuster;
+
+                $quantity = (int) str_replace("\n","",$product[$descriptionIndex + 2]);
+                $unitPrice = (float) str_replace("\n","",$product[$descriptionIndex + 3]);
+
+                $productList[] = [
+                    'stockCode' => str_replace("\n","",$product[$descriptionIndex]),
+                    'description' => str_replace("\n","",$product[$descriptionIndex]),
+                    'quantity' =>  $quantity,
+                    'unit_price' =>  $unitPrice,
+                    'total' =>  (float) str_replace("\n","",$product[$descriptionIndex + 3])
+                ];
+            }
+        }
+
+        return $productList;
+    }
+}

From d1d4b2a770f4f854647578a29d4c85b0552dde7d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 02:26:39 +0800
Subject: [PATCH 046/179] convert 1688 purchase order to po on document upload

---
 .../bookings/sections/BookingDetailsSectionComponent.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 12d91e5d..39172163 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -228,7 +228,7 @@
                                                     </div>
                                                 </div>
                                                 <div class="col">
-                                                    <p class="m-b-0 fs-12">Due to the system upgrades, you are no longer required to fill out the Purchase Order. We apologize that the invoices won't be available until the system has been fully upgraded. Thanks for your patience.</p>
+                                                    <p class="m-b-0 fs-12">You are no longer required to key in your purchase order details manually, the system will automatically get your purchase order detail from 1688.</p>
                                                 </div>
                                             </div>
                                             <div class="row">
@@ -263,7 +263,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <purchase-order-form-component v-if="booking.service.id !== 4" :data="booking" :section="section"></purchase-order-form-component>
+                                    <purchase-order-form-component v-if="booking.service.id !== 4 || ($store.getters.isAdmin && booking.purchase_order)" :data="booking" :section="section"></purchase-order-form-component>
                                 </div>
                             </div>
                             <div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin">
@@ -494,4 +494,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>

From ff3baa2b9cd3bb39173550dffc6ef3dd35767fb1 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 02:30:05 +0800
Subject: [PATCH 047/179] convert 1688 purchase order to po on document upload

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

diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
index f22c50e7..faeb585a 100644
--- a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -44,7 +44,7 @@ class Convert1688PurchaseOrderToProductList
                 $unitPrice = (float) str_replace("\n","",$product[$descriptionIndex + 3]);
 
                 $productList[] = [
-                    'stockCode' => str_replace("\n","",$product[$descriptionIndex]),
+                    'stockCode' => '',
                     'description' => str_replace("\n","",$product[$descriptionIndex]),
                     'quantity' =>  $quantity,
                     'unit_price' =>  $unitPrice,

From dea9d5f4150e122ba41e5bda9899fa5e66485533 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 02:34:22 +0800
Subject: [PATCH 048/179] convert 1688 purchase order to po on document upload

---
 .../bookings/sections/BookingDetailsSectionComponent.vue    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 39172163..d12c42b9 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -228,14 +228,14 @@
                                                     </div>
                                                 </div>
                                                 <div class="col">
-                                                    <p class="m-b-0 fs-12">You are no longer required to key in your purchase order details manually, the system will automatically get your purchase order detail from 1688.</p>
+                                                    <p class="m-b-0 fs-12">You are no longer required to key in your purchase order details manually, the system will automatically get your purchase order detail from 1688 directly.</p>
                                                 </div>
                                             </div>
                                             <div class="row">
                                                 <div class="col">
                                                     <div class="row" v-if="booking.documents.ecommerce_purchase_order">
-                                                        <div class="col-md col-6 h-100">
-                                                            <document-file-viewer-component :file="booking.documents.ecommerce_purchase_order.files[0]" v-if="booking.documents.ecommerce_purchase_order">
+                                                        <div class="col-md col-6 h-100" v-for="file in booking.documents.ecommerce_purchase_order.files">
+                                                            <document-file-viewer-component :file="file">
                                                                 <template slot="button">
                                                                     <div class="bg-white text-center padding-20 pointer b-grey">
                                                                         <div class="m-b-10">

From 2873a08256aac53480761d9b7e813b1231dda5a1 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:29:53 +0800
Subject: [PATCH 049/179] convert 1688 purchase order to po on document upload

---
 ...eatePurchaseOrderFor1688OrderProcessor.php | 12 +-------
 .../Convert1688PurchaseOrderToProductList.php | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index 1dfbe85c..d089d7c7 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -24,28 +24,18 @@ class CreatePurchaseOrderFor1688OrderProcessor
     /** @var CreatePurchaseOrderTransactionProcessor */
     private $createPurchaseOrderTransactionProcessor;
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
-    /** @var CreateInvoiceTransactionProcessor */
-    private $createInvoiceTransactionProcessor;
-
     /** @var Convert1688PurchaseOrderToProductList */
     private $convert1688PurchaseOrderToProductList;
 
     /**
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
-     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      * @param Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList
      */
-    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor, Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList)
+    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList)
     {
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
-        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
         $this->convert1688PurchaseOrderToProductList = $convert1688PurchaseOrderToProductList;
     }
 
diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
index faeb585a..26c519ef 100644
--- a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -28,6 +28,34 @@ class Convert1688PurchaseOrderToProductList
         if(str_contains($text, '订单详情单')) throw new MalformedRequestException('Can\'t process non english documents');
 
         $tables = explode('Amount (yuan)', $text);
+        $footer = end($tables);
+        $footer = preg_split('(Shipping|运费)', $footer)[1];
+        $footer = preg_split('/[\t\n]/', $footer);
+        $shipping = (float) filter_var( $footer[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+        $discount = array_filter($footer, function($var) { return preg_match("/(Discount|优惠)/", $var); });
+        $discount = (float) filter_var(reset($discount), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+
+        if($shipping > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Shipping Fee',
+                'quantity' =>  1,
+                'unit_price' =>  $shipping,
+                'total' => $shipping
+            ];
+        }
+
+        if($discount > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Discount',
+                'quantity' =>  1,
+                'unit_price' =>  $discount * -1,
+                'total' => $discount * -1
+            ];
+        }
+
+
         array_shift($tables);
 
         foreach ($tables as $table){

From 5627345e7e96848cdd43d4fddf6097e6cfce1347 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:30:19 +0800
Subject: [PATCH 050/179] convert 1688 purchase order to po on document upload

---
 routes/web.php | 41 +++++++----------------------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 84980320..1e676c62 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -380,46 +380,19 @@ Route::get('/payments/manual', function(){
     echo '</table>';
 });
 
+
+
 Route::get('/1688/fix', function(){
     $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
-    $bookings = [];
     foreach($purchaseOrderDocuments as $document){
-        foreach($document->files as $file) {
-            $parser = new \Smalot\PdfParser\Parser();
-            try {
-                $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
-            } catch (Exception $e) {
-                continue;
-            }
+        $booking = $document->owner;
+        $booking->status = ApprovalStatus::APPROVED;
+        $booking->save();
 
-            $text = $pdf->getText();
-            if(str_contains($text, '订单详情单')) continue;
+        $booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
 
-            $tables = explode('Amount (yuan)', $text);
-            array_shift($tables);
-
-            foreach ($tables as $table){
-                $products = preg_split('/(yuan\/|yuan \/)/', str_replace("\r\n","",$table));
-
-                array_pop($products);
-                foreach ($products as $product){
-                    $product = preg_split('/[\t]/',$product);
-
-                    $adjuster = (count($product) - 7);
-                    $descriptionIndex = 3 + $adjuster;
-
-                    $bookings[$document->owner->marking][] = [
-                        'description' => str_replace("\n","",$product[$descriptionIndex]),
-                        'quantity' =>  (int) str_replace("\n","",$product[$descriptionIndex + 2]),
-                        'unit_price' =>  (float) str_replace("\n","",$product[$descriptionIndex + 3])
-                    ];
-                }
-            }
-        }
-//        if($document->owner->status === ApprovalStatus::COMPLETED) continue;
-//        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
+        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
     }
-    dd($bookings);
 });
 

From 879d6abdbdd5a4b29a6810dfd047cf8f49b1fb5d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:33:08 +0800
Subject: [PATCH 051/179] convert 1688 purchase order to po on document upload

---
 .../Convert1688PurchaseOrderToProductList.php | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
index 26c519ef..934adea3 100644
--- a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -35,27 +35,6 @@ class Convert1688PurchaseOrderToProductList
         $discount = array_filter($footer, function($var) { return preg_match("/(Discount|优惠)/", $var); });
         $discount = (float) filter_var(reset($discount), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
 
-        if($shipping > 0) {
-            $productList[] = [
-                'stockCode' => '',
-                'description' => 'Shipping Fee',
-                'quantity' =>  1,
-                'unit_price' =>  $shipping,
-                'total' => $shipping
-            ];
-        }
-
-        if($discount > 0) {
-            $productList[] = [
-                'stockCode' => '',
-                'description' => 'Discount',
-                'quantity' =>  1,
-                'unit_price' =>  $discount * -1,
-                'total' => $discount * -1
-            ];
-        }
-
-
         array_shift($tables);
 
         foreach ($tables as $table){
@@ -81,6 +60,26 @@ class Convert1688PurchaseOrderToProductList
             }
         }
 
+        if($shipping > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Shipping Fee',
+                'quantity' =>  1,
+                'unit_price' =>  $shipping,
+                'total' => $shipping
+            ];
+        }
+
+        if($discount > 0) {
+            $productList[] = [
+                'stockCode' => '',
+                'description' => 'Discount',
+                'quantity' =>  1,
+                'unit_price' =>  $discount * -1,
+                'total' => $discount * -1
+            ];
+        }
+
         return $productList;
     }
 }

From 6986b2b09abe9a7a44fa6ebbd4bf25d9ec616038 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:51:19 +0800
Subject: [PATCH 052/179] add purchase orders list page

---
 .../Filters/DoesNotHaveTransactionType.php    |  22 ++++
 .../Filters/HasPurchaseOrderStatusIn.php      |  23 ++++
 .../Eloquent/Filters/HasTransactionType.php   |  22 ++++
 .../views/pages/purchase_orders.blade.php     | 103 ++++++++++++++++++
 4 files changed, 170 insertions(+)
 create mode 100644 app/Classes/General/Eloquent/Filters/DoesNotHaveTransactionType.php
 create mode 100644 app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
 create mode 100644 app/Classes/General/Eloquent/Filters/HasTransactionType.php
 create mode 100644 resources/views/pages/purchase_orders.blade.php

diff --git a/app/Classes/General/Eloquent/Filters/DoesNotHaveTransactionType.php b/app/Classes/General/Eloquent/Filters/DoesNotHaveTransactionType.php
new file mode 100644
index 00000000..22ed9573
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/DoesNotHaveTransactionType.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHaveTransactionType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDoesntHave('transactions', function($query) use($value) {
+            return $query->where('transactions.type', $value);
+        });
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
new file mode 100644
index 00000000..64cbad31
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class HasPurchaseOrderStatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->has('transactions', function($query) use($value) {
+            return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->whereIn('transactions.status', $value);
+        });
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasTransactionType.php b/app/Classes/General/Eloquent/Filters/HasTransactionType.php
new file mode 100644
index 00000000..7b277dae
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasTransactionType.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class HasTransactionType implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->has('transactions', function($query) use($value) {
+            return $query->where('transactions.type', $value);
+        });
+    }
+}
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
new file mode 100644
index 00000000..631b5eb4
--- /dev/null
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -0,0 +1,103 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col p-t-15 p-b-15">
+            <div class="row tabsContainer">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0 d-flex">
+                        <div class="col">
+                            <div class="row justify-content-end">
+                                <div class="col">
+                                    <div class="row">
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="pending-submission">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Pending Submission</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="pending-review">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Pending Review</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="approved">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">Approved</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col bg-white padding-25">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, does_not_have_transaction_type: 7}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <booking-component :data="data"></booking-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_purchase_order_status_in: [1]}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <booking-component :data="data"></booking-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_purchase_order_status_in: [2]}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <booking-component :data="data"></booking-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection

From d2ff175c8840231b83aeb3ebc830c3b22bd70b3d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:52:50 +0800
Subject: [PATCH 053/179] add purchase orders list page

---
 routes/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 1e676c62..593c0663 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -99,6 +99,10 @@ Route::get('/transfer/merge/{marking}', function ($marking) {
     return view('pages.bookings.merge', ['marking' => $marking]);
 })->name('booking.merge');
 
+Route::get('/purchase_orders', function () {
+    return view('pages.purchase_orders');
+})->name('purchase_orders');
+
 Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect');
 
 Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');

From 61b207b7b24a654de8b0c77c3c141d6f075744a9 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:55:18 +0800
Subject: [PATCH 054/179] log list query exception

---
 app/Classes/General/Eloquent/AbstractListRecord.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Classes/General/Eloquent/AbstractListRecord.php b/app/Classes/General/Eloquent/AbstractListRecord.php
index c5d2e6e6..7b7d0df9 100644
--- a/app/Classes/General/Eloquent/AbstractListRecord.php
+++ b/app/Classes/General/Eloquent/AbstractListRecord.php
@@ -6,6 +6,7 @@ namespace App\Classes\General\Eloquent;
 use App\Classes\Exceptions\MalformedRequestException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractListRecord extends AbstractGetRecord
 {
@@ -23,6 +24,7 @@ abstract class AbstractListRecord extends AbstractGetRecord
             return $this->handler($filters);
 
         } catch (QueryException $exception){
+            log::error($exception);
             throw new MalformedRequestException('Unable to fetch the list of records due to unexpected error');
         }
 
@@ -43,4 +45,4 @@ abstract class AbstractListRecord extends AbstractGetRecord
 
     }
 
-}
\ No newline at end of file
+}

From dadbbb60ba2f808ac90f2ac09454487058c1ce34 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 03:58:32 +0800
Subject: [PATCH 055/179] log list query exception

---
 .../General/Eloquent/Filters/HasPurchaseOrderStatusIn.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
index 64cbad31..d211c94c 100644
--- a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -18,6 +18,6 @@ class HasPurchaseOrderStatusIn implements Filter
     {
         return $builder->has('transactions', function($query) use($value) {
             return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->whereIn('transactions.status', $value);
-        });
+        })->dd();
     }
 }

From e81f8253232016004382ced84c53ee0e3af91b78 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:02:23 +0800
Subject: [PATCH 056/179] log list query exception

---
 .../General/Eloquent/Filters/HasPurchaseOrderStatusIn.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
index d211c94c..ff379aad 100644
--- a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -17,7 +17,7 @@ class HasPurchaseOrderStatusIn implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->has('transactions', function($query) use($value) {
-            return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->whereIn('transactions.status', $value);
-        })->dd();
+            return $query->whereIn('transactions.status', $value)->where('transactions.type', TransactionType::PURCHASE_ORDER);
+        });
     }
 }

From a7e759b263a0c6a439578227ac6f447d32c3246d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:08:51 +0800
Subject: [PATCH 057/179] log list query exception

---
 app/Classes/General/Abstracts/AbstractControllerLogic.php     | 4 +++-
 .../General/Eloquent/Filters/HasPurchaseOrderStatusIn.php     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php
index b0e6e7bf..815219c8 100644
--- a/app/Classes/General/Abstracts/AbstractControllerLogic.php
+++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php
@@ -16,6 +16,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Resources\Json\ResourceCollection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 abstract class AbstractControllerLogic
 {
@@ -66,6 +67,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();
 
@@ -99,4 +101,4 @@ abstract class AbstractControllerLogic
         return $this->response(json_decode($collection->response()->getContent(), true));
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
index ff379aad..edebfa7f 100644
--- a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -17,7 +17,7 @@ class HasPurchaseOrderStatusIn implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->has('transactions', function($query) use($value) {
-            return $query->whereIn('transactions.status', $value)->where('transactions.type', TransactionType::PURCHASE_ORDER);
+            return $query->where('transactions.status', $value)->where('transactions.type', TransactionType::PURCHASE_ORDER);
         });
     }
 }

From 6fde70cbc10a27f1da190b729046e094ba361416 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:11:33 +0800
Subject: [PATCH 058/179] log list query exception

---
 .../General/Eloquent/Filters/HasPurchaseOrderStatusIn.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
index edebfa7f..0e8c3d88 100644
--- a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -16,8 +16,8 @@ class HasPurchaseOrderStatusIn implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->has('transactions', function($query) use($value) {
-            return $query->where('transactions.status', $value)->where('transactions.type', TransactionType::PURCHASE_ORDER);
+        return $builder->whereHas('transactions', function($query) use($value) {
+            return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->where('transactions.status', $value);
         });
     }
 }

From e45d9c8420e22d6c685c7dfc4aa5eda47ce611bf Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:14:45 +0800
Subject: [PATCH 059/179] log list query exception

---
 app/Http/Resources/BookingResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 7d116db6..ab750406 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -26,7 +26,7 @@ class BookingResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'company' => new CompanyResource($this->company),
+//            'company' => new CompanyResource($this->company),
             'bank' => new BankResource($this->bank),
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,

From 6ad167f73e6c70b304b567aeea6f3edc0c58d3fe Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:20:49 +0800
Subject: [PATCH 060/179] conditionally load wallet in company resource

---
 .../General/Eloquent/Filters/WithWallets.php  | 20 +++++++++++++++++++
 .../ControllersLogic/FetchCompanyLogic.php    |  4 ++--
 app/Http/Resources/BookingResource.php        |  2 +-
 app/Http/Resources/CompanyResource.php        |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/WithWallets.php

diff --git a/app/Classes/General/Eloquent/Filters/WithWallets.php b/app/Classes/General/Eloquent/Filters/WithWallets.php
new file mode 100644
index 00000000..5b002922
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithWallets.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WithWallets implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->with('wallets');
+    }
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
index 5406d682..3c3fb088 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyLogic.php
@@ -52,10 +52,10 @@ class FetchCompanyLogic extends AbstractControllerLogic
     {
         $this->canFetchCompany->passes();
 
-        $query = $this->fetchesCompany->execute(['id' => $request->route('id'), 'with_bookings' => true]);
+        $query = $this->fetchesCompany->execute(['id' => $request->route('id'), 'with_bookings' => true, 'with_wallets' => true]);
 
         return $this->resourceResponse(new CompanyResource($query));
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index ab750406..7d116db6 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -26,7 +26,7 @@ class BookingResource extends JsonResource
     {
         return [
             'id' => $this->id,
-//            'company' => new CompanyResource($this->company),
+            'company' => new CompanyResource($this->company),
             'bank' => new BankResource($this->bank),
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index fceab5bc..7070b87f 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -61,7 +61,7 @@ class CompanyResource extends JsonResource
             ],
             'segments' => SegmentResource::collection($this->segments),
             'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
-            'wallet' => new WalletResource($this->wallets()->first()),
+            'wallet' => $this->whenLoaded('wallets', new WalletResource($this->wallets()->first()), ''),
             'created_at' => $this->created_at->format('d-m-Y'),
             $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
                 'currencies' => $segment ? CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],

From 475846ab652a074374e1c368936d9245c636e96c Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:29:27 +0800
Subject: [PATCH 061/179] conditionally load wallet in company resource

---
 ...eatePurchaseOrderFor1688OrderProcessor.php | 19 +++++++++++++++++--
 app/Http/Resources/CompanyResource.php        |  2 +-
 app/Http/Resources/WalletResource.php         |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index d089d7c7..80c406e6 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -27,16 +27,26 @@ class CreatePurchaseOrderFor1688OrderProcessor
     /** @var Convert1688PurchaseOrderToProductList */
     private $convert1688PurchaseOrderToProductList;
 
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var CreateInvoiceTransactionProcessor */
+    private $createInvoiceTransactionProcessor;
+
     /**
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
      * @param Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      */
-    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList)
+    public function __construct(GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, Convert1688PurchaseOrderToProductList $convert1688PurchaseOrderToProductList, UpdatesTransactionStatus $updatesTransactionStatus, CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor)
     {
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
         $this->convert1688PurchaseOrderToProductList = $convert1688PurchaseOrderToProductList;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
     }
 
 
@@ -63,7 +73,12 @@ class CreatePurchaseOrderFor1688OrderProcessor
             $total, $total, $booking->fix_currency_id, $booking->fix_currency_id,
             1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, $products);
 
-        $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+        $purchaseOrder = $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+
+        if($purchaseOrder->amount === $booking->fix_amount){
+            $this->updatesTransactionStatus->execute($purchaseOrder, ApprovalStatus::APPROVED);
+            $this->createInvoiceTransactionProcessor->execute($booking);
+        }
 
     }
 
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 7070b87f..cb357684 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -61,7 +61,7 @@ class CompanyResource extends JsonResource
             ],
             'segments' => SegmentResource::collection($this->segments),
             'services' => (new FetchesCompanyServices())->getServices($this->servicesConfigurations()),
-            'wallet' => $this->whenLoaded('wallets', new WalletResource($this->wallets()->first()), ''),
+            'wallet' => $this->whenLoaded('wallets', new WalletResource($this->wallets()->with('transactions')->first()), new WalletResource($this->wallets()->first())),
             'created_at' => $this->created_at->format('d-m-Y'),
             $this->mergeWhen($this->business_type === BusinessType::CURRENCY_VENDOR, [
                 'currencies' => $segment ? CurrencyResource::collection(Currency::whereIn('id', $segment->detail->currencies)->get()) : [],
diff --git a/app/Http/Resources/WalletResource.php b/app/Http/Resources/WalletResource.php
index 143af1c4..4fa484ad 100644
--- a/app/Http/Resources/WalletResource.php
+++ b/app/Http/Resources/WalletResource.php
@@ -21,8 +21,8 @@ class WalletResource extends JsonResource
             'currency_id' => $this->currency_id,
             'amount' => (double) $this->amount,
             'company_id' => (int) $this->owner->id,
-            'transactions' => WalletTransactionResource::collection($this->transactions()->whereIn('status', [2, 3])->orderBy('id', 'DESC')->get()),
-            'top_up_records' => WalletTransactionResource::collection($this->transactions()->whereNotIn('status', [0])->where('type', TransactionType::TOP_UP)->orderBy('id', 'DESC')->get())
+            'transactions' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereIn('status', [2, 3])->orderBy('id', 'DESC')->get()), []),
+            'top_up_records' => $this->whenLoaded('transactions', WalletTransactionResource::collection($this->transactions()->whereNotIn('status', [0])->where('type', TransactionType::TOP_UP)->orderBy('id', 'DESC')->get()), []),
         ];
     }
 }

From 2945018f008a480a3ece69d520466958981c8267 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:35:04 +0800
Subject: [PATCH 062/179] show only purchase orders for bookings with confirmed
 payments

---
 .../Eloquent/Filters/HasPaymentStatusIn.php   | 23 +++++++++++++++++++
 .../views/pages/purchase_orders.blade.php     |  6 ++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php

diff --git a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
new file mode 100644
index 00000000..18ba1201
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class HasPaymentStatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('transactions', function($query) use($value) {
+            return $query->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', $value);
+        });
+    }
+}
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 631b5eb4..9d9d43a6 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -74,21 +74,21 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
-                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, does_not_have_transaction_type: 7}">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], does_not_have_transaction_type: 7}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_purchase_order_status_in: [2]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], has_purchase_order_status_in: [2]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 1db224810dc10971eafe1c56d1a15b23440fabfe Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:36:06 +0800
Subject: [PATCH 063/179] show only purchase orders for bookings with confirmed
 payments

---
 resources/views/pages/purchase_orders.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 9d9d43a6..c7204600 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -74,21 +74,21 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
-                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], does_not_have_transaction_type: 7}">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_id: [2, 3], has_purchase_order_status_in: [2]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [2]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 20e5a7be5e0d86b81b9827a4c9aac4f569c34f8f Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:37:52 +0800
Subject: [PATCH 064/179] show only purchase orders for bookings with confirmed
 payments

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index c7204600..5a489ecf 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -81,7 +81,7 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From f55384e205f55b1b457d7acefa9c49de2849899a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:38:50 +0800
Subject: [PATCH 065/179] show only purchase orders for bookings with confirmed
 payments

---
 app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
index 18ba1201..3d17b04a 100644
--- a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
@@ -18,6 +18,6 @@ class HasPaymentStatusIn implements Filter
     {
         return $builder->whereHas('transactions', function($query) use($value) {
             return $query->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', $value);
-        });
+        })->dd();
     }
 }

From 4b2f891ee97a2138236fa4b636638654c4fcbd8b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:39:04 +0800
Subject: [PATCH 066/179] show only purchase orders for bookings with confirmed
 payments

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 5a489ecf..c7204600 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -81,7 +81,7 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 93560f841b4adcccddc31dc5bbc6d5aabb79fb7c Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:41:22 +0800
Subject: [PATCH 067/179] show only purchase orders for bookings with confirmed
 payments

---
 app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php | 2 +-
 resources/views/pages/purchase_orders.blade.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
index 3d17b04a..18ba1201 100644
--- a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
@@ -18,6 +18,6 @@ class HasPaymentStatusIn implements Filter
     {
         return $builder->whereHas('transactions', function($query) use($value) {
             return $query->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', $value);
-        })->dd();
+        });
     }
 }
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index c7204600..a6dedfe3 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -88,7 +88,7 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [2]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 72fe1e9fcc341d7dd6297f87f1acc649d2d577e2 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:42:31 +0800
Subject: [PATCH 068/179] show only purchase orders for bookings with confirmed
 payments

---
 resources/views/pages/purchase_orders.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index a6dedfe3..88aaf073 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -74,14 +74,14 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
-                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 667c02aacecfae8bbff1861b5507b66bc3de1c75 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:47:49 +0800
Subject: [PATCH 069/179] fix create purchase order for 1688 processor

---
 .../Processors/CreatePurchaseOrderFor1688OrderProcessor.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index 80c406e6..969c2c15 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -54,6 +54,7 @@ class CreatePurchaseOrderFor1688OrderProcessor
         $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
 
         $documents = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+        $products = [];
         foreach($documents as $document) {
             foreach ($document->files as $file) {
                 try {
@@ -64,6 +65,8 @@ class CreatePurchaseOrderFor1688OrderProcessor
             }
         }
 
+        if(empty($products)) return false;
+
         $total = collect($products)->sum(function($product){
             return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));
         });

From 95aa0a631f57e957af1e0951b9dcb22ce0f756b0 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 04:55:33 +0800
Subject: [PATCH 070/179] fix create purchase order for 1688 processor

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index 593c0663..7e9f16bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -387,6 +387,7 @@ Route::get('/payments/manual', function(){
 
 
 Route::get('/1688/fix', function(){
+    set_time_limit(1800);
     $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 
     foreach($purchaseOrderDocuments as $document){

From 757bf0b73fc35e5e4dda6b1d2f848dc7b705f720 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:00:54 +0800
Subject: [PATCH 071/179] fix create purchase order for 1688 processor

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 88aaf073..c6ce69cf 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -88,7 +88,7 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2, 3], has_payment_status_in: [2, 3], has_purchase_order_status_in: [2, 3]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From fe07b820f5046b9b971e90f621147bff82c97ba0 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:08:40 +0800
Subject: [PATCH 072/179] fix create purchase order for 1688 processor

---
 .../Convert1688PurchaseOrderToProductList.php    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
index 934adea3..b956aa39 100644
--- a/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
+++ b/app/Classes/Modules/Bookings/Services/Convert1688PurchaseOrderToProductList.php
@@ -18,6 +18,9 @@ class Convert1688PurchaseOrderToProductList
     {
         $parser = new \Smalot\PdfParser\Parser();
         $productList = [];
+        $shipping = 0;
+        $discount = 0;
+
         try {
             $pdf = $parser->parseFile(Storage::disk('documents')->path($file->file->file_info->original->file));
         } catch (Exception $exception) {
@@ -29,11 +32,14 @@ class Convert1688PurchaseOrderToProductList
 
         $tables = explode('Amount (yuan)', $text);
         $footer = end($tables);
-        $footer = preg_split('(Shipping|运费)', $footer)[1];
-        $footer = preg_split('/[\t\n]/', $footer);
-        $shipping = (float) filter_var( $footer[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
-        $discount = array_filter($footer, function($var) { return preg_match("/(Discount|优惠)/", $var); });
-        $discount = (float) filter_var(reset($discount), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+        $footer = preg_split('(Shipping|运费)', $footer);
+        if(array_key_exists(1, $footer)){
+            $footer = preg_split('/[\t\n]/', $footer[1]);
+            $shipping = (float) filter_var( $footer[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+            $discount = array_filter($footer, function($var) { return preg_match("/(Discount|优惠)/", $var); });
+            $discount = (float) filter_var(reset($discount), FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION );
+        }
+
 
         array_shift($tables);
 

From 84bf954ad94c4bc65b37abda7e183516406c6a94 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:10:32 +0800
Subject: [PATCH 073/179] fix create purchase order for 1688 processor

---
 .../views/pages/purchase_orders.blade.php     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index c6ce69cf..0179752e 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -9,6 +9,25 @@
                             <div class="row justify-content-end">
                                 <div class="col">
                                     <div class="row">
+                                        <div class="col b-r b-white">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="all">
+                                                    <div class="row justify-content-center m-b-5">
+                                                        <div class="col-auto">
+                                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                 width="35" height="35"
+                                                                 viewBox="0 0 172 172"
+                                                                 style=" fill:#000000;"><defs><linearGradient x1="104.8125" y1="95.74219" x2="104.8125" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-1_TUOBhQt-Vj1j_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="67.1875" y1="95.74219" x2="67.1875" y2="114.9175" gradientUnits="userSpaceOnUse" id="color-2_TUOBhQt-Vj1j_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="125.40413" x2="86" y2="133.41288" gradientUnits="userSpaceOnUse" id="color-3_TUOBhQt-Vj1j_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="10.234" x2="86" y2="158.13788" gradientUnits="userSpaceOnUse" id="color-4_TUOBhQt-Vj1j_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><circle cx="39" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-1_TUOBhQt-Vj1j_gr1)"></circle><circle cx="25" cy="39" transform="scale(2.6875,2.6875)" r="3" fill="url(#color-2_TUOBhQt-Vj1j_gr2)"></circle><rect x="28" y="47" transform="scale(2.6875,2.6875)" width="8" height="3" fill="url(#color-3_TUOBhQt-Vj1j_gr3)"></rect><path d="M142.4375,80.11975v-7.55725c0,-31.11856 -25.31625,-56.4375 -56.4375,-56.4375c-31.12125,0 -56.4375,25.31894 -56.4375,56.4375v7.55725c-4.81062,2.79231 -8.0625,7.98994 -8.0625,13.94275c0,8.89294 7.23206,16.125 16.125,16.125h0.13706c1.40556,25.42106 22.47019,45.6875 48.23794,45.6875c25.76775,0 46.83238,-20.26644 48.23794,-45.6875h0.13706c8.89294,0 16.125,-7.23206 16.125,-16.125c0,-5.95281 -3.25188,-11.15044 -8.0625,-13.94275zM34.9375,77.9375v-5.375h16.125c7.40944,0 13.4375,-6.02806 13.4375,-13.4375v-5.375h-5.375v5.375c0,4.44512 -3.61738,8.0625 -8.0625,8.0625h-15.83744c2.69556,-25.63875 24.43475,-45.6875 50.77494,-45.6875c26.34019,0 48.07938,20.04875 50.77494,45.6875h-42.71244c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-5.375h-5.375v5.375c0,7.40944 6.02806,13.4375 13.4375,13.4375h43v5.375h-46.91837c-8.213,0 -14.89413,-6.68113 -14.89413,-14.89413v-9.29337h-5.375v8.94937c0,8.40113 -6.837,15.23813 -15.23813,15.23813zM26.875,94.0625c0,-5.92863 4.82138,-10.75 10.75,-10.75v8.0625h-2.6875c-1.4835,0 -2.6875,1.20131 -2.6875,2.6875c0,1.48619 1.204,2.6875 2.6875,2.6875h2.6875v8.0625c-5.92862,0 -10.75,-4.82137 -10.75,-10.75zM86,150.5c-23.70912,0 -43,-19.29087 -43,-43v-24.1875h11.63687c7.61906,0 14.28675,-4.15488 17.85575,-10.31731c3.48031,6.15438 10.08888,10.31731 17.6515,10.31731h38.85587v24.1875c0,23.70913 -19.29087,43 -43,43zM134.375,104.8125v-8.0625h2.6875c1.4835,0 2.6875,-1.20131 2.6875,-2.6875c0,-1.48619 -1.204,-2.6875 -2.6875,-2.6875h-2.6875v-8.0625c5.92863,0 10.75,4.82137 10.75,10.75c0,5.92863 -4.82137,10.75 -10.75,10.75z" fill="url(#color-4_TUOBhQt-Vj1j_gr4)"></path></g></g></svg>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5 all-caps">All</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="col b-r b-white">
                                             <div class="row fs-12 text-center">
                                                 <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="pending-submission">
@@ -73,6 +92,13 @@
                     </div>
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="all">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <booking-component :data="data"></booking-component>
+                                    </template>
+                                </list-component>
+                            </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
                                 <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
                                     <template slot="list" slot-scope="{data}">

From 8bcf8f0e42b531572fdf4018558db1bc3e8cc95d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:11:32 +0800
Subject: [PATCH 074/179] fix create purchase order for 1688 processor

---
 resources/views/pages/purchase_orders.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 0179752e..0554dc35 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -30,7 +30,7 @@
                                         </div>
                                         <div class="col b-r b-white">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="pending-submission">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="pending-submission">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -99,7 +99,7 @@
                                     </template>
                                 </list-component>
                             </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="pending-submission">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-submission">
                                 <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>

From 8de0790d738c5472a4722ca32d16286c4c8273d4 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:13:41 +0800
Subject: [PATCH 075/179] fix create purchase order for 1688 processor

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 0554dc35..40134960 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,7 +93,7 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="all">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 1718fc459776a7707a055487ea187c676fe66ee3 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:14:19 +0800
Subject: [PATCH 076/179] fix create purchase order for 1688 processor

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 40134960..b9ab4079 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,7 +93,7 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="all">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [2, 3]}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 52d67df9687703de1ab1f829fad23f3f639b6de7 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:16:33 +0800
Subject: [PATCH 077/179] fix create purchase order for 1688 processor

---
 app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php | 2 +-
 resources/views/pages/purchase_orders.blade.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
index 18ba1201..158dc0a5 100644
--- a/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPaymentStatusIn.php
@@ -17,7 +17,7 @@ class HasPaymentStatusIn implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereHas('transactions', function($query) use($value) {
-            return $query->where('transactions.type', TransactionType::PAYMENT)->where('transactions.status', $value);
+            return $query->where('transactions.type', TransactionType::PAYMENT)->whereIn('transactions.status', $value);
         });
     }
 }
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index b9ab4079..40134960 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,7 +93,7 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="all">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3]}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 4e30f08cc239b11be16d21217d9dca68c09d4a5f Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:23:22 +0800
Subject: [PATCH 078/179] fix create purchase order for 1688 processor

---
 resources/views/pages/purchase_orders.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 40134960..3d5fca60 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -107,14 +107,14 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [0, 1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[3]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[3], has_purchase_order_status_in: [2]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 52bebef8420361542d23612b42b3f2b13f57417a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 05:51:17 +0800
Subject: [PATCH 079/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 3e7e8137..d69e11b5 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -100,7 +100,7 @@ class CreateProformaInvoiceTransactionProcessor
      * @return void
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function execute(Booking $booking) 
+    public function execute(Booking $booking)
     {
 
         $po_order_transaction = $booking->transactions()
@@ -136,7 +136,11 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $booking_amount / $booking->transactions()->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])->payments()->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
+                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+            })->orWhere(function($query){
+                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 
         $total_service_charge = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)

From c1330111ca087141ee1a51ac042945184a24157e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 06:08:58 +0800
Subject: [PATCH 080/179] remove hardcoded rmb, use dynamic value

---
 .../Modules/Exports/Services/ExportsTransactions.php      | 6 +++---
 .../views/pages/pdfs/currency_vendor_order.blade.php      | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index b7f0e5ad..b12c1ef9 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -80,9 +80,9 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho
             $transactionTypes[$transaction->type],
             $transaction->issuerCompany->name,
             $transaction->reciver,
-            $transaction->currency_id === 1 ? 'MYR' : 'RMB',
+            $transaction->currency->short_code,
             $transaction->amount,
-            $transaction->original_currency_id === 1 ? 'MYR' : 'RMB',
+            $transaction->original_currency->short_code,
             $transaction->original_amount,
             $transaction->currency_rate,
             $transaction->tax,
@@ -93,4 +93,4 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho
             $marking
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/resources/views/pages/pdfs/currency_vendor_order.blade.php b/resources/views/pages/pdfs/currency_vendor_order.blade.php
index 3f37cc08..1c92e205 100644
--- a/resources/views/pages/pdfs/currency_vendor_order.blade.php
+++ b/resources/views/pages/pdfs/currency_vendor_order.blade.php
@@ -54,21 +54,21 @@
             @php
             $sub_total_booking_amount = number_format((float)$transactions->sum('original_amount'), 2, '.', '');
             @endphp
-            <td>RMB {{$sub_total_booking_amount}}</td>
+            <td>{{$transaction->original_currency->short_code}} {{$sub_total_booking_amount}}</td>
         </tr>
         <tr>
             <td width="70%" style="text-align: right;">Transfer fee: </td>
             @php
             $transfer_fee = number_format((float)$transferFeeTransactions->sum('service_charge'), 2, '.', '');
             @endphp
-            <td>RMB {{$transfer_fee}}</td>
+            <td>{{$transaction->original_currency->short_code}} {{$transfer_fee}}</td>
         </tr>
         <tr>
             <td width="70%" style="text-align: right;">Total booking amount: </td>
             @php
             $total_booking_amount = number_format((float) ($transactions->sum('original_amount') + $transfer_fee), 2, '.', '');
             @endphp
-            <td>RMB {{$total_booking_amount}}</td>
+            <td>{{$transaction->original_currency->short_code}} {{$total_booking_amount}}</td>
         </tr>
         <tr>
             <td width="70%" style="text-align: right;">Sub total amount: </td>
@@ -100,4 +100,4 @@
         </tr>
     </table>
 </htmlpagefooter>
-@endsection
\ No newline at end of file
+@endsection

From 314253ef00c6d9a91fe3692264c3fa25bd79790a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 06:09:18 +0800
Subject: [PATCH 081/179] remove hardcoded rmb, use dynamic value

---
 app/Classes/Modules/Exports/Services/ExportsTransactions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
index b12c1ef9..6d6751bf 100644
--- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php
@@ -90,7 +90,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping, Sho
             $transactionStatus[$transaction->status],
             \PhpOffice\PhpSpreadsheet\Shared\Date::dateTimeToExcel($transaction->created_at),
             \PhpOffice\PhpSpreadsheet\Shared\Date::dateTimeToExcel($transaction->updated_at),
-            $marking
+//            $marking
         ];
     }
 }

From 821657ebc3ea52cbccb23628bb6736252509f4c7 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:20:13 +0800
Subject: [PATCH 082/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php     | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index d69e11b5..87b87950 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -136,11 +136,12 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
-                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-            })->orWhere(function($query){
-                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
+//        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
+//                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+//            })->orWhere(function($query){
+//                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+//            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 
         $total_service_charge = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)

From f0e84b92b8e55df2392e63f9481f4559ff9e326d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:28:28 +0800
Subject: [PATCH 083/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 87b87950..6aa7b979 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -136,7 +136,11 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
+        $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
+            return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+        })->orWhere(function($query){
+            return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+        })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 //        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
 //                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
 //            })->orWhere(function($query){

From 8664d77ad580600de56d8429a72049f8f3d44033 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:29:19 +0800
Subject: [PATCH 084/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 6aa7b979..ef3d7516 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,11 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-
+dd($booking->transactions()->payments()->where(function($query){
+    return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+})->orWhere(function($query){
+    return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
         })->orWhere(function($query){

From 744675cb514daab953ee7c54c2373e30d2ae8902 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:31:58 +0800
Subject: [PATCH 085/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index ef3d7516..947ed26f 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-dd($booking->transactions()->payments()->where(function($query){
+dd($booking->transactions()->where('type', TransactionType::PAYMENT)->where(function($query){
     return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
 })->orWhere(function($query){
     return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);

From f6dc3066269e4eb8cba3c178f22764a779bd7819 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:33:52 +0800
Subject: [PATCH 086/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 947ed26f..7e8a7359 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,10 +135,12 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-dd($booking->transactions()->where('type', TransactionType::PAYMENT)->where(function($query){
-    return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-})->orWhere(function($query){
-    return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+dd($booking->transactions()->payments()->where(function($query){
+    return $query->where(function($query){
+        return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+    })->orWhere(function($query){
+        return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+    });
 })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();

From cec56a943541fde805340438788c27757c673196 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:35:39 +0800
Subject: [PATCH 087/179] fix proforma invoice currency rate

---
 .../Processors/CreateProformaInvoiceTransactionProcessor.php    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 7e8a7359..2295d8d6 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -138,8 +138,6 @@ class CreateProformaInvoiceTransactionProcessor
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-    })->orWhere(function($query){
-        return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
     });
 })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){

From 2f9b63ba700446d991f45a5a3f777d6e7018e060 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:37:16 +0800
Subject: [PATCH 088/179] fix proforma invoice currency rate

---
 .../Processors/CreateProformaInvoiceTransactionProcessor.php     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 2295d8d6..6a4fe5aa 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,6 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
+        dd($booking->transactions()->payments()->get());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();

From 30ca010f3f9e0f5b2330c7dd48ea09204adef4c4 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:40:18 +0800
Subject: [PATCH 089/179] fix proforma invoice currency rate

---
 .../Processors/CreateProformaInvoiceTransactionProcessor.php   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 6a4fe5aa..054665d6 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,12 +135,11 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->payments()->get());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
     });
-})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
+})->get());
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
         })->orWhere(function($query){

From b7c985515c760a188733b40628d1cb0196edcfa2 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:42:00 +0800
Subject: [PATCH 090/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 054665d6..3ec789f9 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -136,10 +136,12 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 dd($booking->transactions()->payments()->where(function($query){
-    return $query->where(function($query){
-        return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
+    $query->where(function($query){
+        $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
+    })->orWhere(function($query){
+        $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
     });
-})->get());
+})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
         })->orWhere(function($query){

From 39ac9ec369fb8fb5b26ff223bb88fa5b0507494e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:42:47 +0800
Subject: [PATCH 091/179] fix proforma invoice currency rate

---
 .../Processors/CreateProformaInvoiceTransactionProcessor.php    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 3ec789f9..6b68bc53 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -138,8 +138,6 @@ class CreateProformaInvoiceTransactionProcessor
 dd($booking->transactions()->payments()->where(function($query){
     $query->where(function($query){
         $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
-    })->orWhere(function($query){
-        $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
     });
 })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){

From 9dce1ee9d3f879fc862d39b58dc86dfb3867c253 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:43:58 +0800
Subject: [PATCH 092/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 6b68bc53..21902f9c 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,11 +135,11 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-dd($booking->transactions()->payments()->where(function($query){
-    $query->where(function($query){
+dd($booking->transactions()->payments()
+    ->where(function($query){
         $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
-    });
-})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
+    })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
+
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
         })->orWhere(function($query){

From ef01cbe77f5c4f2d0c6669e19559b06e7b08ea3f Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:44:41 +0800
Subject: [PATCH 093/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 21902f9c..7e25680c 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -137,7 +137,7 @@ class CreateProformaInvoiceTransactionProcessor
             ->first();
 dd($booking->transactions()->payments()
     ->where(function($query){
-        $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
+        $query->where('status', ApprovalStatus::PENDING_SUBMISSION);
     })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
 
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){

From e81fc62fd7a22031f8f3a7ff615de3a9b0572978 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:46:54 +0800
Subject: [PATCH 094/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 7e25680c..8c1e27a7 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,11 +135,14 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-dd($booking->transactions()->payments()
-    ->where(function($query){
-        $query->where('status', ApprovalStatus::PENDING_SUBMISSION);
-    })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
-
+        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get());
+dd($booking->transactions()->payments()->where(function($query){
+    return $query->where(function($query){
+        return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
+    })->orWhere(function($query){
+        return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+    });
+})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
             return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
         })->orWhere(function($query){

From 08d4aa1e1e72ff91572f78cd1b5f5771325d194b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:47:35 +0800
Subject: [PATCH 095/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 8c1e27a7..f64568a5 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get());
+        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->get());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());

From 05c8b709ab1274bf8abf52f927afccbf1aa5c78f Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:51:22 +0800
Subject: [PATCH 096/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index f64568a5..376b3080 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->get());
+        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->dd());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());

From b029a7d59dc2f79ab7dea726d7a48c7b1995e39d Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:52:37 +0800
Subject: [PATCH 097/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 376b3080..3a373ae0 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->dd());
+        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now()->toDateTimeString())->get());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());

From dbc66adad151f3eed167515f2db44f5da8d9b440 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:57:16 +0800
Subject: [PATCH 098/179] fix proforma invoice currency rate

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

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 3a373ae0..382ebfd5 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,7 +135,7 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now()->toDateTimeString())->get());
+        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get());
 dd($booking->transactions()->payments()->where(function($query){
     return $query->where(function($query){
         return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());

From c4ac262621d3e743c6a3b11d24b3aca51da7e649 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 13:59:36 +0800
Subject: [PATCH 099/179] fix proforma invoice currency rate

---
 ...eateProformaInvoiceTransactionProcessor.php | 18 +++++++-----------
 app/Http/Resources/BookingResource.php         |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 382ebfd5..bf4dde0b 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -135,19 +135,15 @@ class CreateProformaInvoiceTransactionProcessor
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
-        dd($booking->transactions()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get());
-dd($booking->transactions()->payments()->where(function($query){
-    return $query->where(function($query){
-        return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now());
-    })->orWhere(function($query){
-        return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-    });
-})->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total'));
+
         $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
-            return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-        })->orWhere(function($query){
-            return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            return $query->where(function($query){
+                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString());
+            })->orWhere(function($query){
+                return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            });
         })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
+        dd($booking_currency_average_rate);
 //        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
 //                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
 //            })->orWhere(function($query){
diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 7d116db6..015a86ee 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -56,7 +56,7 @@ class BookingResource extends JsonResource
                         ->whereDate('expires_on', '>=', Carbon::now())
                         ->get()
                 ),
-                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '<', Carbon::now())->get()),
+                'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()),
                 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){
                     $query->where(function($query){
                         $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]);

From ca4c158755defdca7b646fca23f454a644740126 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 14:02:21 +0800
Subject: [PATCH 100/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index bf4dde0b..2ce1d63e 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -129,21 +129,27 @@ class CreateProformaInvoiceTransactionProcessor
 
         $billNumber = $this->generatesTransactionBillNumber->execute('PROFORMA-');
 
-        $payable_amount = $booking->transactions()->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])->payments()->sum('amount');
+        $payable_amount = $booking->transactions()->payments()->where(function($query){
+            return $query->where(function($query){
+                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString());
+            })->orWhere(function($query){
+                return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+            });
+        })->sum('amount');
         $booking_amount = $booking->fix_amount;
 
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id) / $booking->transactions()->payments()->where(function($query){
+        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
             return $query->where(function($query){
                 return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString());
             })->orWhere(function($query){
                 return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             });
         })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
-        dd($booking_currency_average_rate);
+        dd($payable_amount, $booking_currency_average_rate);
 //        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
 //                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
 //            })->orWhere(function($query){

From aa8c99eb63ffca9ffef301f6bf99bac15b450df9 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 14:03:04 +0800
Subject: [PATCH 101/179] fix proforma invoice currency rate

---
 .../CreateProformaInvoiceTransactionProcessor.php           | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 2ce1d63e..0a42bcfc 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -149,12 +149,6 @@ class CreateProformaInvoiceTransactionProcessor
                 return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             });
         })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
-        dd($payable_amount, $booking_currency_average_rate);
-//        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
-//                return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>', Carbon::now())->get();
-//            })->orWhere(function($query){
-//                return $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-//            })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 
         $total_service_charge = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)

From 03368ff1d9dcff9d29efc2c69525ff4e26e7d97c Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 16:27:34 +0800
Subject: [PATCH 102/179] fix smc profile can't load bug

---
 app/Http/Resources/WalletTransactionResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/WalletTransactionResource.php b/app/Http/Resources/WalletTransactionResource.php
index cfc8ab10..2805faed 100644
--- a/app/Http/Resources/WalletTransactionResource.php
+++ b/app/Http/Resources/WalletTransactionResource.php
@@ -27,7 +27,8 @@ class WalletTransactionResource extends JsonResource
                 $description = 'Credit Voucher for '.$this->payment_reference;
                 break;
             case 1:
-                $marking = Transaction::where('payment_reference', $this->bill_no)->first()->owner->marking;
+                $bill = Transaction::where('payment_reference', $this->bill_no)->first();
+                $marking = $bill ? $bill->owner->marking : 'Unknown';
                 $description = 'Payment For booking refs.'.'<a href="'.route('booking.details', $marking).'">'.$marking.'</a>';
                 break;
             case 11:

From dc8a2d411c64183057e3c1845c42cea7570512d3 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 30 Sep 2022 18:02:26 +0800
Subject: [PATCH 103/179] fix smc profile can't load bug

---
 app/Http/Resources/WalletTransactionResource.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Http/Resources/WalletTransactionResource.php b/app/Http/Resources/WalletTransactionResource.php
index 2805faed..cfc8ab10 100644
--- a/app/Http/Resources/WalletTransactionResource.php
+++ b/app/Http/Resources/WalletTransactionResource.php
@@ -27,8 +27,7 @@ class WalletTransactionResource extends JsonResource
                 $description = 'Credit Voucher for '.$this->payment_reference;
                 break;
             case 1:
-                $bill = Transaction::where('payment_reference', $this->bill_no)->first();
-                $marking = $bill ? $bill->owner->marking : 'Unknown';
+                $marking = Transaction::where('payment_reference', $this->bill_no)->first()->owner->marking;
                 $description = 'Payment For booking refs.'.'<a href="'.route('booking.details', $marking).'">'.$marking.'</a>';
                 break;
             case 11:

From 0680a8cfdcf36c795635b0a4de58e5d9409f76bf Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Sat, 1 Oct 2022 10:31:18 +0800
Subject: [PATCH 104/179] debug group transaction compiler

---
 .../Processors/GeneratesGroupTransactionsPurchaseOrder.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php b/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
index 70c84a89..015ff40c 100644
--- a/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
+++ b/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
@@ -67,7 +67,7 @@ class GeneratesGroupTransactionsPurchaseOrder
             $document_type = DocumentType::BULK_PURCHASE_ORDER;
 
             $lowercaseDocumentType = strtolower($document_type);
-
+dd(['group' => $group, 'supplier' => $supplier]);
             $order_pdf = LaravelMpdf::loadView('pages.pdfs.bulk_purchase_order', ['group' => $group, 'supplier' => $supplier]);
             $document_object = new DocumentObject(
                 $document_type,
@@ -86,4 +86,4 @@ class GeneratesGroupTransactionsPurchaseOrder
 
         }
     }
-}
\ No newline at end of file
+}

From c0f0b7a4d60cb009f7474059b3dbb92dd14eca11 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Sat, 1 Oct 2022 10:39:01 +0800
Subject: [PATCH 105/179] debug group transaction compiler

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

diff --git a/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php b/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
index 015ff40c..80f218a6 100644
--- a/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
+++ b/app/Classes/Modules/Transactions/Processors/GeneratesGroupTransactionsPurchaseOrder.php
@@ -67,7 +67,7 @@ class GeneratesGroupTransactionsPurchaseOrder
             $document_type = DocumentType::BULK_PURCHASE_ORDER;
 
             $lowercaseDocumentType = strtolower($document_type);
-dd(['group' => $group, 'supplier' => $supplier]);
+
             $order_pdf = LaravelMpdf::loadView('pages.pdfs.bulk_purchase_order', ['group' => $group, 'supplier' => $supplier]);
             $document_object = new DocumentObject(
                 $document_type,

From b5acf80a2975ce9cc360b7cef0807791a9bf08bc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 11 Oct 2022 17:48:30 +0800
Subject: [PATCH 106/179] fix regenerate invoice function to only include
 invoice documents

---
 .../ControllersLogic/RegenerateInvoiceBookingLogic.php   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
index 71ea7ba1..252412a2 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
@@ -10,6 +10,7 @@ use App\Classes\Modules\Transactions\Services\DeletesTransaction;
 use App\Classes\Modules\Documents\Services\DeletesDocument;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Http\Resources\BookingResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -57,7 +58,7 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
      * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
      */
     public function __construct(
-        CanFetchBooking $canFetchBooking, 
+        CanFetchBooking $canFetchBooking,
         FetchesBooking $fetchesBooking,
         DeletesTransaction $deletesTransaction,
         UpdatesBookingStatus $updatesBookingStatus,
@@ -86,7 +87,7 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
         $this->canFetchBooking->passes();
 
         $booking = $this->fetchesBooking->execute([
-            'id' => $request->route('id'), 
+            'id' => $request->route('id'),
             'status' => ApprovalStatus::COMPLETED,
             'with_transactions' => true]
         );
@@ -98,7 +99,7 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
             $this->deletesTransaction->execute($row);
         }
 
-        $document = $booking->documents()->get();
+        $document = $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::INVOICE, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->get();
         foreach ($document as $key => $row) {
             $this->deletesDocument->execute($row);
         }
@@ -108,4 +109,4 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
         return $this->resourceResponse(new BookingResource($booking));
     }
 
-}
\ No newline at end of file
+}

From 5cc0709927f85d046cd66133b66228dc4b86e9a1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Oct 2022 11:23:52 +0800
Subject: [PATCH 107/179] add excel extension

---
 app/Http/Controllers/Imports/ImportUpdateDebtorController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
index 312b55f2..73793fba 100644
--- a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
+++ b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
@@ -24,7 +24,8 @@ class ImportUpdateDebtorController
      */
     public function import(Request $request) {
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
+        dd(json_decode($object->getFiles()[0])->file_info->original->file);
         Excel::import(new ImportsDebtor(), json_decode($object->getFiles()[0])->file_info->original->file);
         return [];
     }
-}
\ No newline at end of file
+}

From d38f2d83cc15c3d4eea75e6c3fb09ee1702fac2c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Oct 2022 11:31:27 +0800
Subject: [PATCH 108/179] add excel extension

---
 app/Http/Controllers/Imports/ImportUpdateDebtorController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
index 73793fba..1acc7b11 100644
--- a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
+++ b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php
@@ -24,7 +24,6 @@ class ImportUpdateDebtorController
      */
     public function import(Request $request) {
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
-        dd(json_decode($object->getFiles()[0])->file_info->original->file);
         Excel::import(new ImportsDebtor(), json_decode($object->getFiles()[0])->file_info->original->file);
         return [];
     }

From fd1daaa64b6ce4375c3d18bb335afa3ff23f781a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Oct 2022 16:21:35 +0800
Subject: [PATCH 109/179] fix 1688 purchase order

---
 routes/web.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 7e9f16bb..5c4f6563 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -386,18 +386,22 @@ Route::get('/payments/manual', function(){
 
 
 
-Route::get('/1688/fix', function(){
-    set_time_limit(1800);
-    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+Route::get('/1688/fix/{reference}', function($reference){
 
-    foreach($purchaseOrderDocuments as $document){
-        $booking = $document->owner;
-        $booking->status = ApprovalStatus::APPROVED;
-        $booking->save();
+    $booking = Booking::where('marking', $reference)->first();
 
-        $booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
-
-        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
-    }
+    $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
+//    set_time_limit(1800);
+//    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
+//
+//    foreach($purchaseOrderDocuments as $document){
+//        $booking = $document->owner;
+//        $booking->status = ApprovalStatus::APPROVED;
+//        $booking->save();
+//
+//        $booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+//
+//        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
+//    }
 });
 

From 0b268461221aa8c5d8e8a9f3dd6eee0a2ade8b00 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Oct 2022 16:23:44 +0800
Subject: [PATCH 110/179] fix 1688 purchase order

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

diff --git a/routes/web.php b/routes/web.php
index 5c4f6563..e917e17b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -390,7 +390,8 @@ Route::get('/1688/fix/{reference}', function($reference){
 
     $booking = Booking::where('marking', $reference)->first();
 
-    $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
+    (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($booking);
+
 //    set_time_limit(1800);
 //    $purchaseOrderDocuments = \App\Models\Document::where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
 //

From 08ab6dd9c3d62eee72018f288ff493addf98cff0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 19 Oct 2022 16:28:43 +0800
Subject: [PATCH 111/179] fix 1688 purchase order

---
 .../CreatePurchaseOrderFor1688OrderProcessor.php          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index 969c2c15..e0dcce7b 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -65,7 +65,13 @@ class CreatePurchaseOrderFor1688OrderProcessor
             }
         }
 
-        if(empty($products)) return false;
+        if(empty($products))
+            $object = new TransactionObject($billNumber, TransactionType::PURCHASE_ORDER, $booking->company->id, 1,
+                1, PaymentMethodType::CASH,
+                0, 0, $booking->fix_currency_id, $booking->fix_currency_id,
+                1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, []);
+            $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+            return false;
 
         $total = collect($products)->sum(function($product){
             return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));

From 998e3da41d301ea2910dfbe5fd01ec5add30335c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 13:46:20 +0800
Subject: [PATCH 112/179] filter po's without payments

---
 resources/views/pages/dashboards/admin.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index bef6eed6..dc56a268 100644
--- a/resources/views/pages/dashboards/admin.blade.php
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -202,7 +202,7 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col">
-                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true}">
+                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true, has_payment_status_in: [2, 3]}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <booking-component :data="data"></booking-component>
                                                             </template>
@@ -220,7 +220,7 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col">
-                                                        <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, pending_purchase_order: true}">
+                                                        <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, pending_purchase_order: true, has_payment_status_in: [2, 3]}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <booking-component :data="data"></booking-component>
                                                             </template>
@@ -310,4 +310,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

From 4424fbd4e1735fa6fd897c0b9cae0e78d198ea33 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 14:01:02 +0800
Subject: [PATCH 113/179] re categorize purchase order filters

---
 .../DoesNotHavePurchaseOrderStatusIn.php      | 24 +++++++++++++++++++
 .../Filters/HasPurchaseOrderStatusIn.php      |  2 +-
 .../views/pages/dashboards/admin.blade.php    |  2 +-
 .../views/pages/purchase_orders.blade.php     | 18 +++++++-------
 4 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/DoesNotHavePurchaseOrderStatusIn.php

diff --git a/app/Classes/General/Eloquent/Filters/DoesNotHavePurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/DoesNotHavePurchaseOrderStatusIn.php
new file mode 100644
index 00000000..8f8d305e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/DoesNotHavePurchaseOrderStatusIn.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Database\Eloquent\Builder;
+
+class DoesNotHavePurchaseOrderStatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDoesntHave('transactions', function($transaction)  use($value) {
+            return $transaction->where('transactions.type', TransactionType::PURCHASE_ORDER)->whereIn('transactions.status', $value);
+        });
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
index 0e8c3d88..bdc32fa1 100644
--- a/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/HasPurchaseOrderStatusIn.php
@@ -17,7 +17,7 @@ class HasPurchaseOrderStatusIn implements Filter
     public static function apply(Builder $builder, $value)
     {
         return $builder->whereHas('transactions', function($query) use($value) {
-            return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->where('transactions.status', $value);
+            return $query->where('transactions.type', TransactionType::PURCHASE_ORDER)->whereIn('transactions.status', $value);
         });
     }
 }
diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index dc56a268..46a40648 100644
--- a/resources/views/pages/dashboards/admin.blade.php
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -202,7 +202,7 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col">
-                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true, has_payment_status_in: [2, 3]}">
+                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <booking-component :data="data"></booking-component>
                                                             </template>
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 3d5fca60..38b50d6f 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -11,7 +11,7 @@
                                     <div class="row">
                                         <div class="col b-r b-white">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="all">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton active" tab-name="no-submission">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -22,7 +22,7 @@
                                                     </div>
                                                     <div class="row">
                                                         <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">All</div>
+                                                            <div class="fs-12 m-t-5 all-caps">No Submission</div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -30,7 +30,7 @@
                                         </div>
                                         <div class="col b-r b-white">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="pending-submission">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="incomplete-submission">
                                                     <div class="row justify-content-center m-b-5">
                                                         <div class="col-auto">
                                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
@@ -41,7 +41,7 @@
                                                     </div>
                                                     <div class="row">
                                                         <div class="col">
-                                                            <div class="fs-12 m-t-5 all-caps">Pending Submission</div>
+                                                            <div class="fs-12 m-t-5 all-caps">In-complete Submission</div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -92,22 +92,22 @@
                     </div>
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="all">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [2, 3]}">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="no-submission">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], does_not_have_purchase_order_status_in: [1, 2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
-                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-submission">
-                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], does_not_have_transaction_type: 7}">
+                            <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="incomplete-submission">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [0]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [0, 1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From b11ed370e288f266c1a2f5ac096ea5496069de00 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 14:11:50 +0800
Subject: [PATCH 114/179] re categorize purchase order filters

---
 resources/views/pages/purchase_orders.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index 38b50d6f..b8a91f26 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,7 +93,7 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="no-submission">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], does_not_have_purchase_order_status_in: [1, 2, 3]}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [1, 2, 3], does_not_have_purchase_order_status_in: [1, 2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 1709465df46af2d69b99ede28438b1af05ab97ec Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 14:26:19 +0800
Subject: [PATCH 115/179] re categorize purchase order filters

---
 resources/views/pages/purchase_orders.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index b8a91f26..c8786537 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,7 +93,7 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="no-submission">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2,3], has_payment_status_in: [1, 2, 3], does_not_have_purchase_order_status_in: [1, 2, 3]}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [1, 2, 3], does_not_have_purchase_order_status_in: [0, 1, 2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
@@ -107,7 +107,7 @@
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [1, 2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 4f0c39df60eb8c30e8853f78842b5b4f1c0660e4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 14:35:05 +0800
Subject: [PATCH 116/179] re categorize purchase order filters

---
 .../bookings/sections/BookingDetailsSectionComponent.vue   | 7 +++++++
 routes/web.php                                             | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index d12c42b9..acb3d146 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -254,6 +254,13 @@
                                             </div>
                                         </div>
                                     </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <a :href="route('ecommerce.fix', booking.marking)" target="_blank">
+                                                <div class="btn btn-danger">Fix 1688 PO</div>
+                                            </a>
+                                        </div>
+                                    </div>
                                     <div class="row m-b-25" v-if="$store.getters.isAdmin && booking.service.id === 4 && booking.status !== 3">
                                         <div class="col">
                                             <div class="row" v-if="!booking.documents.ecommerce_purchase_order">
diff --git a/routes/web.php b/routes/web.php
index e917e17b..dfc19924 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -404,5 +404,5 @@ Route::get('/1688/fix/{reference}', function($reference){
 //
 //        (App()->make(createPurchaseOrderFor1688OrderProcessor::class))->execute($document->owner);
 //    }
-});
+})->name('ecommerce.fix');
 

From 7edb5bd8b171011908f486fbf06f66de105abe2e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 20 Oct 2022 14:35:56 +0800
Subject: [PATCH 117/179] re categorize purchase order filters

---
 .../bookings/sections/BookingDetailsSectionComponent.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index acb3d146..a226bf39 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -254,7 +254,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="row">
+                                    <div class="row" v-if="booking.documents.ecommerce_purchase_order && $store.getters.isAdmin && !booking.purchase_order">
                                         <div class="col">
                                             <a :href="route('ecommerce.fix', booking.marking)" target="_blank">
                                                 <div class="btn btn-danger">Fix 1688 PO</div>

From 90aaa80f0c8dab41be9f8f20ea34a638e97ffe0d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 26 Oct 2022 17:02:45 +0800
Subject: [PATCH 118/179] hck purchase orders

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

diff --git a/routes/web.php b/routes/web.php
index dfc19924..4ec38f09 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -208,17 +208,19 @@ Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWh
 Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
 
 Route::get('/supplier/pi/export', function(){
-   $groups = \App\Models\Group::where('issuer', 2210)->whereMonth('created_at', 7)->whereYear('created_at', 2022)->get();
+   $groups = \App\Models\Group::where('issuer', 2956)->whereMonth('created_at', 9)->whereYear('created_at', 2022)->get();
 
    echo '<table>';
    $i = 0;
    foreach ($groups as $group){
         foreach ($group->transactions as $transaction){
             $booking = $purchaseOrder = $transaction->owner->owner;
+            $bill = $booking->transactions()->where('type', TransactionType::PAYMENT)->first()->transactions()->first();
             $purchaseOrder = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', ApprovalStatus::APPROVED)->first();
             if(!$purchaseOrder) {
                 echo '<tr>';
                 echo '<td>-</td>';
+                echo '<td>'.$bill->created_at.'</td>';
                 echo '<td style="color: red">warning, booking ref.'.$booking->marking.' doesn\'t have purchase order</td>';
                 echo '<td>0</td>';
                 echo '<td>0</td>';
@@ -231,6 +233,7 @@ Route::get('/supplier/pi/export', function(){
                 $i++;
                 echo '<tr>';
                 echo '<td>'.$i.'</td>';
+                echo '<td>'.$bill->created_at.'</td>';
                 echo '<td>'.$item->product_name.'</td>';
                 echo '<td>'.$item->quantity.'</td>';
                 echo '<td>'.$item->price * (1/$group->currency_rate).'</td>';

From 5c37ae94a4365e48207c7dc75064b5662b15f6d1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 26 Oct 2022 18:52:46 +0800
Subject: [PATCH 119/179] hck purchase orders

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

diff --git a/routes/web.php b/routes/web.php
index 4ec38f09..9460297b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -215,12 +215,11 @@ Route::get('/supplier/pi/export', function(){
    foreach ($groups as $group){
         foreach ($group->transactions as $transaction){
             $booking = $purchaseOrder = $transaction->owner->owner;
-            $bill = $booking->transactions()->where('type', TransactionType::PAYMENT)->first()->transactions()->first();
             $purchaseOrder = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->where('status', ApprovalStatus::APPROVED)->first();
             if(!$purchaseOrder) {
                 echo '<tr>';
                 echo '<td>-</td>';
-                echo '<td>'.$bill->created_at.'</td>';
+                echo '<td>'.$group->created_at.'</td>';
                 echo '<td style="color: red">warning, booking ref.'.$booking->marking.' doesn\'t have purchase order</td>';
                 echo '<td>0</td>';
                 echo '<td>0</td>';
@@ -233,7 +232,7 @@ Route::get('/supplier/pi/export', function(){
                 $i++;
                 echo '<tr>';
                 echo '<td>'.$i.'</td>';
-                echo '<td>'.$bill->created_at.'</td>';
+                echo '<td>'.$group->created_at.'</td>';
                 echo '<td>'.$item->product_name.'</td>';
                 echo '<td>'.$item->quantity.'</td>';
                 echo '<td>'.$item->price * (1/$group->currency_rate).'</td>';

From 5dddd0f77860a95ed9184ac407d090e22a8345e1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 26 Oct 2022 18:56:19 +0800
Subject: [PATCH 120/179] hck purchase orders

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

diff --git a/routes/web.php b/routes/web.php
index 9460297b..2b779516 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -208,7 +208,7 @@ Route::get('/transactions/supplier/{id}/mock_up', 'Transactions\DownloadMockUpWh
 Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list');
 
 Route::get('/supplier/pi/export', function(){
-   $groups = \App\Models\Group::where('issuer', 2956)->whereMonth('created_at', 9)->whereYear('created_at', 2022)->get();
+   $groups = \App\Models\Group::where('issuer', 2729)->whereMonth('created_at', 9)->whereYear('created_at', 2022)->get();
 
    echo '<table>';
    $i = 0;

From a7d075dadf3b07e0b246a5106c73b4210849ed51 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 28 Oct 2022 10:01:52 +0800
Subject: [PATCH 121/179] debug po upload

---
 .../Bookings/ControllersLogic/UploadPurchaseOrderLogic.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
index b4f0a4b8..9f5bd547 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
@@ -78,7 +78,7 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
         $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
 
         $object = new DocumentObject(DocumentType::ECOMMERCE_PURCHASE_ORDER, $request->input('files'), '', ApprovalStatus::APPROVED, '1688_purchase_orders');
-
+dd($object->getFiles());
         /** @var Document $document */
         $document = $this->createsDocument->execute($booking, $object);
 
@@ -89,4 +89,4 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
         return $this->response([]);
     }
 
-}
\ No newline at end of file
+}

From 7892f37ed85049a2e9c31ffab723bf40d7bb2f20 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 28 Oct 2022 10:03:23 +0800
Subject: [PATCH 122/179] debug po upload

---
 .../Bookings/ControllersLogic/UploadPurchaseOrderLogic.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
index 9f5bd547..440ea49f 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
@@ -78,12 +78,12 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
         $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
 
         $object = new DocumentObject(DocumentType::ECOMMERCE_PURCHASE_ORDER, $request->input('files'), '', ApprovalStatus::APPROVED, '1688_purchase_orders');
-dd($object->getFiles());
+
         /** @var Document $document */
         $document = $this->createsDocument->execute($booking, $object);
 
         $this->createsFile->execute($document, $object);
-
+dd($document);
         $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
 
         return $this->response([]);

From 4f7f7bf7aa8948c6c0e4630394f45ecee245b1bc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 28 Oct 2022 10:05:22 +0800
Subject: [PATCH 123/179] debug po upload

---
 .../ControllersLogic/UploadPurchaseOrderLogic.php         | 2 +-
 .../CreatePurchaseOrderFor1688OrderProcessor.php          | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
index 440ea49f..6aebd253 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
@@ -83,7 +83,7 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
         $document = $this->createsDocument->execute($booking, $object);
 
         $this->createsFile->execute($document, $object);
-dd($document);
+
         $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
 
         return $this->response([]);
diff --git a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
index e0dcce7b..fc7190cc 100644
--- a/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
+++ b/app/Classes/Modules/Bookings/Processors/CreatePurchaseOrderFor1688OrderProcessor.php
@@ -50,12 +50,13 @@ class CreatePurchaseOrderFor1688OrderProcessor
     }
 
 
-    public function execute(Booking $booking){
+    public function execute(Booking $booking)
+    {
         $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
 
         $documents = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
         $products = [];
-        foreach($documents as $document) {
+        foreach ($documents as $document) {
             foreach ($document->files as $file) {
                 try {
                     $products = $this->convert1688PurchaseOrderToProductList->execute($file);
@@ -65,13 +66,14 @@ class CreatePurchaseOrderFor1688OrderProcessor
             }
         }
 
-        if(empty($products))
+        if (empty($products)){
             $object = new TransactionObject($billNumber, TransactionType::PURCHASE_ORDER, $booking->company->id, 1,
                 1, PaymentMethodType::CASH,
                 0, 0, $booking->fix_currency_id, $booking->fix_currency_id,
                 1, 0, 0, null, ApprovalStatus::PENDING_SUBMISSION, []);
             $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
             return false;
+        }
 
         $total = collect($products)->sum(function($product){
             return $product['quantity'] * floatval(str_replace(',', '', $product['unit_price']));

From 01aaae05f480245ff7b4c1489c9c0f280f2bdc76 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:17:07 +0800
Subject: [PATCH 124/179] delete 1688 purchase order for special customers

---
 routes/web.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index 2b779516..c3330f65 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -408,3 +408,24 @@ Route::get('/1688/fix/{reference}', function($reference){
 //    }
 })->name('ecommerce.fix');
 
+Route::get('/po/manual/fix', function($reference){
+
+    $purchaseOrders = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('owner', function($query){
+        return $query->whereIn('company_id', [199, 510])->whereHas('documents', function($query){
+            return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
+        });
+    })->first();
+    dd($purchaseOrders);
+    foreach ($purchaseOrders as $purchaseOrder){
+        $purchaseOrder->status = ApprovalStatus::PENDING_SUBMISSION;
+        $purchaseOrder->save();
+
+        $booking = $purchaseOrder->owner;
+        $booking->status = ApprovalStatus::APPROVED;
+        $booking->save();
+
+        $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::INVOICE, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+    }
+
+})->name('ecommerce.fix');
+

From 39894d162291c91907078ad89c76619c8e244727 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:17:44 +0800
Subject: [PATCH 125/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index c3330f65..de6a00f0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -408,7 +408,7 @@ Route::get('/1688/fix/{reference}', function($reference){
 //    }
 })->name('ecommerce.fix');
 
-Route::get('/po/manual/fix', function($reference){
+Route::get('/po/manual/fix', function(){
 
     $purchaseOrders = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('owner', function($query){
         return $query->whereIn('company_id', [199, 510])->whereHas('documents', function($query){

From b84fe886940776916346729e1e71ba566464db62 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:21:12 +0800
Subject: [PATCH 126/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index de6a00f0..4302685f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -410,7 +410,7 @@ Route::get('/1688/fix/{reference}', function($reference){
 
 Route::get('/po/manual/fix', function(){
 
-    $purchaseOrders = Transaction::where('type', TransactionType::PURCHASE_ORDER)->where('owner', function($query){
+    $purchaseOrders = Transaction::where('type', TransactionType::PURCHASE_ORDER)->whereHas('owner', function($query){
         return $query->whereIn('company_id', [199, 510])->whereHas('documents', function($query){
             return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
         });

From bf6fd30dc26b01d30d42ecca705523afeced71c4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:22:46 +0800
Subject: [PATCH 127/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index 4302685f..20d8ecc0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -410,12 +410,11 @@ Route::get('/1688/fix/{reference}', function($reference){
 
 Route::get('/po/manual/fix', function(){
 
-    $purchaseOrders = Transaction::where('type', TransactionType::PURCHASE_ORDER)->whereHas('owner', function($query){
-        return $query->whereIn('company_id', [199, 510])->whereHas('documents', function($query){
-            return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
-        });
-    })->first();
-    dd($purchaseOrders);
+    $bookings = Booking::whereIn('company_id', [199, 510])->whereHas('documents', function($query){
+        return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
+    });
+
+    dd($bookings);
     foreach ($purchaseOrders as $purchaseOrder){
         $purchaseOrder->status = ApprovalStatus::PENDING_SUBMISSION;
         $purchaseOrder->save();

From 11558c630ce643e18c5b9643cc53580741957b12 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:23:16 +0800
Subject: [PATCH 128/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index 20d8ecc0..8de69272 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -412,7 +412,7 @@ Route::get('/po/manual/fix', function(){
 
     $bookings = Booking::whereIn('company_id', [199, 510])->whereHas('documents', function($query){
         return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
-    });
+    })->get();
 
     dd($bookings);
     foreach ($purchaseOrders as $purchaseOrder){

From acf2e7ca23f53f879300842281d00172d9d033a8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:23:51 +0800
Subject: [PATCH 129/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index 8de69272..e5667efa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -414,7 +414,7 @@ Route::get('/po/manual/fix', function(){
         return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
     })->get();
 
-    dd($bookings);
+    dd($bookings->pluck('company_id'));
     foreach ($purchaseOrders as $purchaseOrder){
         $purchaseOrder->status = ApprovalStatus::PENDING_SUBMISSION;
         $purchaseOrder->save();

From e360432ced16ff315df08edca21cebabaaaab2a7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:28:22 +0800
Subject: [PATCH 130/179] delete 1688 purchase order for special customers

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

diff --git a/routes/web.php b/routes/web.php
index e5667efa..90a5ae90 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -414,16 +414,13 @@ Route::get('/po/manual/fix', function(){
         return $query->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER);
     })->get();
 
-    dd($bookings->pluck('company_id'));
-    foreach ($purchaseOrders as $purchaseOrder){
-        $purchaseOrder->status = ApprovalStatus::PENDING_SUBMISSION;
-        $purchaseOrder->save();
-
-        $booking = $purchaseOrder->owner;
+    foreach ($bookings as $booking){
         $booking->status = ApprovalStatus::APPROVED;
         $booking->save();
 
         $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::INVOICE, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+        $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->update(['status' => ApprovalStatus::PENDING_SUBMISSION]);
+
     }
 
 })->name('ecommerce.fix');

From e2c0070d28dc4ef0c834a851a5c67d5debe80883 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 31 Oct 2022 16:59:56 +0800
Subject: [PATCH 131/179] delete 1688 purchase order for special customers

---
 .../bookings/sections/BookingDetailsSectionComponent.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index a226bf39..aeac90a0 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -270,7 +270,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <purchase-order-form-component v-if="booking.service.id !== 4 || ($store.getters.isAdmin && booking.purchase_order)" :data="booking" :section="section"></purchase-order-form-component>
+                                    <purchase-order-form-component v-if="booking.service.id !== 4 || (($store.getters.isAdmin && booking.purchase_order) || ['1350KHC', '769SMC'].includes($store.getters.marking))" :data="booking" :section="section"></purchase-order-form-component>
                                 </div>
                             </div>
                             <div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin">

From 480e09f371e664213c1fa982b45c0d4901509251 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 1 Nov 2022 12:00:37 +0800
Subject: [PATCH 132/179] delete 1688 purchase order for special customers

---
 .../bookings/sections/BookingDetailsSectionComponent.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index aeac90a0..00c79ad9 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -270,7 +270,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <purchase-order-form-component v-if="booking.service.id !== 4 || (($store.getters.isAdmin && booking.purchase_order) || ['1350KHC', '769SMC'].includes($store.getters.marking))" :data="booking" :section="section"></purchase-order-form-component>
+                                    <purchase-order-form-component v-if="booking.service.id !== 4 || $store.getters.isAdmin || ['1350KHC', '769SMC'].includes($store.getters.marking)" :data="booking" :section="section"></purchase-order-form-component>
                                 </div>
                             </div>
                             <div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin">

From a632bc797a817295c6f6cf914559ff6130bf98e2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Nov 2022 12:22:01 +0800
Subject: [PATCH 133/179] delete 1688 purchase order for special customers

---
 .../bookings/sections/BookingDetailsSectionComponent.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index 00c79ad9..7128d7ba 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -270,7 +270,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <purchase-order-form-component v-if="booking.service.id !== 4 || $store.getters.isAdmin || ['1350KHC', '769SMC'].includes($store.getters.marking)" :data="booking" :section="section"></purchase-order-form-component>
+                                    <purchase-order-form-component v-if="booking.service.id !== 4 || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId)" :data="booking" :section="section"></purchase-order-form-component>
                                 </div>
                             </div>
                             <div class="row m-t-15" v-if="booking.status === 3 && $store.getters.isSuperAdmin">

From ca06fd03d5e7960e18e2dff2d85824dc23f1d9ee Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Nov 2022 12:23:49 +0800
Subject: [PATCH 134/179] delete 1688 purchase order for special customers

---
 .../Bookings/ControllersLogic/UploadPurchaseOrderLogic.php    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
index 6aebd253..4fc89d44 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/UploadPurchaseOrderLogic.php
@@ -84,7 +84,9 @@ class UploadPurchaseOrderLogic extends AbstractControllerLogic
 
         $this->createsFile->execute($document, $object);
 
-        $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
+        if(in_array($booking->company->id, [199, 510])){
+            $this->createPurchaseOrderFor1688OrderProcessor->execute($booking);
+        }
 
         return $this->response([]);
     }

From a01ecd4d374f0f909f87a693a7337755d1f6fc83 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 13:12:56 +0800
Subject: [PATCH 135/179] debug pending order export

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

diff --git a/routes/web.php b/routes/web.php
index 90a5ae90..23cceacf 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,6 +266,9 @@ Route::get('/pending_orders', function(){
     $i = 0;
     foreach ($payments as $payment){
         $booking = $payment->owner;
+        if (!$booking->bank){
+            dd($booking->marking);
+        }
         $bankType = str::length($booking->bank->holder_name) > 4 ? 'Company' : 'Personal';
 
         if (!preg_match('/[^A-Za-z0-9]/', $booking->bank->holder_name))

From 1e8959c064e26e33fe3f7517f163dba0065b08e2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 13:14:21 +0800
Subject: [PATCH 136/179] debug pending order export

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

diff --git a/routes/web.php b/routes/web.php
index 23cceacf..cc7664fe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,8 +266,8 @@ Route::get('/pending_orders', function(){
     $i = 0;
     foreach ($payments as $payment){
         $booking = $payment->owner;
-        if (!$booking->bank){
-            dd($booking->marking);
+        if(!$booking instanceof Booking){
+            dd($payment);
         }
         $bankType = str::length($booking->bank->holder_name) > 4 ? 'Company' : 'Personal';
 

From 192992cfc567790d89244073e0e946ba61a18893 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 17:51:46 +0800
Subject: [PATCH 137/179] audit payments bankslips

---
 routes/web.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index cc7664fe..7c4b63a9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -428,3 +428,13 @@ Route::get('/po/manual/fix', function(){
 
 })->name('ecommerce.fix');
 
+Route::get('/payment/check', function(){
+
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+
+    if(!count($transactions->documents)){
+        echo $transactions->owner->marking.'<br>';
+    }
+
+})->name('payment.check');
+

From 365a2fc1e9f2b6489c8ff9b9763a4032180cab11 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 17:54:52 +0800
Subject: [PATCH 138/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 7c4b63a9..d1535670 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -432,9 +432,12 @@ Route::get('/payment/check', function(){
 
     $transactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
-    if(!count($transactions->documents)){
-        echo $transactions->owner->marking.'<br>';
+    foreach ($transactions as $transaction){
+        if(!count($transaction->documents)){
+            echo $transaction->owner->marking.'<br>';
+        }
     }
 
+
 })->name('payment.check');
 

From a9532f882d99a39d3d41725d87d2a4c0f14e70e4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 17:56:37 +0800
Subject: [PATCH 139/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index d1535670..32889668 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         if(!count($transaction->documents)){

From 0c139393d2029e88b0f43105bf57d9e3b34368c1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:04:43 +0800
Subject: [PATCH 140/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 32889668..af341c6e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,12 +430,16 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
-        if(!count($transaction->documents)){
+        $documents = $transaction->documents;
+        if(!count($documents)){
             echo $transaction->owner->marking.'<br>';
+            continue;
         }
+
+        echo $transaction->id.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at;
     }
 
 

From 4264c85d6f8ffd32c8461174ca4ed8126d914bfa Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:05:30 +0800
Subject: [PATCH 141/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index af341c6e..02873984 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -435,11 +435,11 @@ Route::get('/payment/check', function(){
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;
         if(!count($documents)){
-            echo $transaction->owner->marking.'<br>';
+            echo $transaction->owner->marking.'<br><br>';
             continue;
         }
 
-        echo $transaction->id.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at;
+        echo $transaction->id.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
     }
 
 

From 49700f1f33fc4a4a5dd3d33c83c4bf7f70a18a67 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:06:18 +0800
Subject: [PATCH 142/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 02873984..0c97893f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -439,7 +439,7 @@ Route::get('/payment/check', function(){
             continue;
         }
 
-        echo $transaction->id.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
+        echo $transaction->owner->marking.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
     }
 
 

From e3506a668999950e2478d396074dd22c7b7bd978 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:07:09 +0800
Subject: [PATCH 143/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 0c97893f..2591035e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today()->subDay())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;

From 7142a781f920a53076b21d601b0b99494de0bcf4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:07:37 +0800
Subject: [PATCH 144/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 2591035e..cad2b0c1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today()->subDay())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '>=', Carbon::today()->subDay())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;

From 20d4c73285d8d4fd75e6c22507885212b61fceda Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:08:09 +0800
Subject: [PATCH 145/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index cad2b0c1..0c97893f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '>=', Carbon::today()->subDay())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;

From cea65e348410a1d6885dc24ea5c3c0898d43b4d7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:15:03 +0800
Subject: [PATCH 146/179] audit payments bankslips

---
 routes/web.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routes/web.php b/routes/web.php
index 0c97893f..40902a19 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,6 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
+    dd(\App\Models\File::whereDate('created_at', '=', Carbon::today())->get());
     $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){

From b90311edc76c1173be174ca6725b2f44fcb9c495 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 18:16:38 +0800
Subject: [PATCH 147/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 40902a19..5e8ac759 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    dd(\App\Models\File::whereDate('created_at', '=', Carbon::today())->get());
+    dd(\App\Models\File::whereDate('created_at', '>', Carbon::parse('2022-11-08 02:00:00'))->whereDate('created_at', '>', Carbon::parse('2022-11-08 16:00:00'))->get());
     $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){

From 036d1ad0af7c1cc1d51709d32fb42226bf3a74d2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:06:25 +0800
Subject: [PATCH 148/179] audit payments bankslips

---
 routes/web.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index 5e8ac759..0c97893f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,6 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    dd(\App\Models\File::whereDate('created_at', '>', Carbon::parse('2022-11-08 02:00:00'))->whereDate('created_at', '>', Carbon::parse('2022-11-08 16:00:00'))->get());
     $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){

From cdfe0e1ed2830dba955d393477c8fc566ee414a7 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:08:22 +0800
Subject: [PATCH 149/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 0c97893f..ebc8df87 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,16 +430,16 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::PAYMENT)->where('payment_method', \App\Classes\ValueObjects\Constants\PaymentMethodType::CASH)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::BILL)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;
         if(!count($documents)){
-            echo $transaction->owner->marking.'<br><br>';
+            echo $transaction->owner->owner->marking.'<br><br>';
             continue;
         }
 
-        echo $transaction->owner->marking.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
+        echo $transaction->owner->owner->marking.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
     }
 
 

From 4628c2b3513ac596bb75fae9a173879688c6a1fa Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:12:13 +0800
Subject: [PATCH 150/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index ebc8df87..b7956131 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,7 +430,7 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::BILL)->whereDate('created_at', '=', Carbon::today())->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::BILL)->whereDate('created_at', '>=', Carbon::today())->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
 
     foreach ($transactions as $transaction){
         $documents = $transaction->documents;

From 3aaace6b4598c8b50d2ee8d55321ac14db81bc6f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:13:59 +0800
Subject: [PATCH 151/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index b7956131..ada48c39 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,16 +430,17 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::BILL)->whereDate('created_at', '>=', Carbon::today())->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
+    $transactions = Transaction::where('type', TransactionType::INVOICE)->whereDate('created_at', '>=', Carbon::today())->get();
 
     foreach ($transactions as $transaction){
-        $documents = $transaction->documents;
+        $booking = $transactions->owner;
+        $documents = $booking->documents()->where('document_type', DocumentType::INVOICE);
         if(!count($documents)){
-            echo $transaction->owner->owner->marking.'<br><br>';
+            echo $booking->marking.'<br><br>';
             continue;
         }
 
-        echo $transaction->owner->owner->marking.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
+//        echo $transaction->owner->owner->marking.'. payment: '.$transaction->updated_at.' -> document: '.$documents[0]->created_at.'<br>';
     }
 
 

From 63da1b330f3b58421383378c3d5fe13c750466a0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:14:52 +0800
Subject: [PATCH 152/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index ada48c39..738b5ef0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -433,8 +433,8 @@ Route::get('/payment/check', function(){
     $transactions = Transaction::where('type', TransactionType::INVOICE)->whereDate('created_at', '>=', Carbon::today())->get();
 
     foreach ($transactions as $transaction){
-        $booking = $transactions->owner;
-        $documents = $booking->documents()->where('document_type', DocumentType::INVOICE);
+        $booking = $transaction->owner;
+        $documents = $booking->documents()->where('document_type', DocumentType::INVOICE)->get();
         if(!count($documents)){
             echo $booking->marking.'<br><br>';
             continue;

From 467992f267c1f379e364898b8c9e92e45de19f87 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 8 Nov 2022 19:19:53 +0800
Subject: [PATCH 153/179] audit payments bankslips

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

diff --git a/routes/web.php b/routes/web.php
index 738b5ef0..38a61cec 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -430,11 +430,11 @@ Route::get('/po/manual/fix', function(){
 
 Route::get('/payment/check', function(){
 
-    $transactions = Transaction::where('type', TransactionType::INVOICE)->whereDate('created_at', '>=', Carbon::today())->get();
+    $transactions = Transaction::where('type', TransactionType::BILL)->whereDate('created_at', '>=', Carbon::today())->get();
 
     foreach ($transactions as $transaction){
-        $booking = $transaction->owner;
-        $documents = $booking->documents()->where('document_type', DocumentType::INVOICE)->get();
+        $booking = $transaction->owner->owner;
+        $documents = $transaction->documents;
         if(!count($documents)){
             echo $booking->marking.'<br><br>';
             continue;

From 12b226a828d2d0deb6071f884e24f2b461ed867f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Nov 2022 12:04:18 +0800
Subject: [PATCH 154/179] hide smc and khc from incomplete po

---
 .../Eloquent/Filters/CompanyIdNotIn.php       | 20 +++++++++++++++++++
 .../views/pages/purchase_orders.blade.php     |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/CompanyIdNotIn.php

diff --git a/app/Classes/General/Eloquent/Filters/CompanyIdNotIn.php b/app/Classes/General/Eloquent/Filters/CompanyIdNotIn.php
new file mode 100644
index 00000000..bde6e0ea
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/CompanyIdNotIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class CompanyIdNotIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotIn('company_id', $value);
+    }
+
+}
diff --git a/resources/views/pages/purchase_orders.blade.php b/resources/views/pages/purchase_orders.blade.php
index c8786537..c3783022 100644
--- a/resources/views/pages/purchase_orders.blade.php
+++ b/resources/views/pages/purchase_orders.blade.php
@@ -93,28 +93,28 @@
                     <div class="row no-margin">
                         <div class="col bg-white padding-25">
                             <div class="row tabsContainer tabContent m-l-0 m-r-0" tab-name="no-submission">
-                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [1, 2, 3], does_not_have_purchase_order_status_in: [0, 1, 2, 3]}">
+                                <list-component key="2" section="all" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], company_id_not_in: [199, 510], has_payment_status_in: [1, 2, 3], does_not_have_purchase_order_status_in: [0, 1, 2, 3]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="incomplete-submission">
-                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [2, 3], has_purchase_order_status_in: [0]}">
+                                <list-component key="2" section="poPendingSubmissionSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], company_id_not_in: [199, 510], has_payment_status_in: [2, 3], has_purchase_order_status_in: [0]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="pending-review">
-                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], has_payment_status_in: [1, 2, 3], has_purchase_order_status_in: [1]}">
+                                <list-component key="2" section="poPendingReviewSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[2], company_id_not_in: [199, 510], has_payment_status_in: [1, 2, 3], has_purchase_order_status_in: [1]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>
                                 </list-component>
                             </div>
                             <div class="row tabsContainer tabContent m-l-0 m-r-0 hide" tab-name="approved">
-                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[3], has_purchase_order_status_in: [2]}">
+                                <list-component key="2" section="poApprovedSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, ServiceId: 4, status_in:[3], company_id_not_in: [199, 510], has_purchase_order_status_in: [2]}">
                                     <template slot="list" slot-scope="{data}">
                                         <booking-component :data="data"></booking-component>
                                     </template>

From 62657e511cb878f3723d130971cd592c3ae7d914 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Nov 2022 17:42:14 +0800
Subject: [PATCH 155/179] fix wallet insufficient balance when amount is below
 0.01

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index d4ba9807..0f6a8525 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -129,7 +129,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             /** @var Wallet $wallet */
             $wallet = $booking->company->wallets()->first();
 
-            if(round($wallet->amount) < round($amount, 2)){
+            if(($wallet->amount - $amount) < 0.01){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 
@@ -161,4 +161,4 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     }
 
 
-}
\ No newline at end of file
+}

From f8ec4815a703871c5ec4a925d80be8bf502466fc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Nov 2022 17:48:47 +0800
Subject: [PATCH 156/179] fix wallet insufficient balance when amount is below
 0.01

---
 .../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 0f6a8525..1140ecd9 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -129,7 +129,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             /** @var Wallet $wallet */
             $wallet = $booking->company->wallets()->first();
 
-            if(($wallet->amount - $amount) < 0.01){
+            if((float) number_format(($wallet->amount - $amount),2) < 0){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

From e6b977ee4627871952c440a0ed17b27b2d32832b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Nov 2022 15:54:28 +0800
Subject: [PATCH 157/179] show wallets with negative amounts in wallet audit

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

diff --git a/routes/web.php b/routes/web.php
index 38a61cec..578711fd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -349,7 +349,7 @@ Route::get('/wallet/audit', function (Request $request) {
             if((int) $transaction->type === TransactionType::PAYMENT) $payments += (float) $transaction->amount;
             if((int) $transaction->type === TransactionType::DEBIT_NOTE) $debit += (float) $transaction->amount;
         }
-        if(round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) continue;
+        if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) || $wallet->amount < 0) continue;
 
         $i++;
 

From 2931246e772637760a1706fb95daaafecc96d178 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Nov 2022 15:56:15 +0800
Subject: [PATCH 158/179] show wallets with negative amounts in wallet audit

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

diff --git a/routes/web.php b/routes/web.php
index 578711fd..aede88b6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -349,7 +349,7 @@ Route::get('/wallet/audit', function (Request $request) {
             if((int) $transaction->type === TransactionType::PAYMENT) $payments += (float) $transaction->amount;
             if((int) $transaction->type === TransactionType::DEBIT_NOTE) $debit += (float) $transaction->amount;
         }
-        if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) || $wallet->amount < 0) continue;
+        if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) AND $wallet->amount > 0) continue;
 
         $i++;
 

From d14812b5c4e0954046ae7e63d16e5cc483a65f84 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Nov 2022 15:56:54 +0800
Subject: [PATCH 159/179] show wallets with negative amounts in wallet audit

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

diff --git a/routes/web.php b/routes/web.php
index aede88b6..a8ad44ba 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -349,7 +349,7 @@ Route::get('/wallet/audit', function (Request $request) {
             if((int) $transaction->type === TransactionType::PAYMENT) $payments += (float) $transaction->amount;
             if((int) $transaction->type === TransactionType::DEBIT_NOTE) $debit += (float) $transaction->amount;
         }
-        if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) AND $wallet->amount > 0) continue;
+        if((round((float) $wallet->amount - (($topups + $credit) - ($payments + $debit)), 2) == 0) AND $wallet->amount > -0.01) continue;
 
         $i++;
 

From eb5347c2cc51f63ba708259486cb46903dd4666b Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 15 Nov 2022 19:55:07 +0800
Subject: [PATCH 160/179] Update in complete dummy data seeder

---
 database/seeds/DummyDataSeeder.php  | 508 ++++++++++++++++++++++++++++
 resources/views/vendor/js.blade.php |   4 +-
 2 files changed, 510 insertions(+), 2 deletions(-)
 create mode 100644 database/seeds/DummyDataSeeder.php

diff --git a/database/seeds/DummyDataSeeder.php b/database/seeds/DummyDataSeeder.php
new file mode 100644
index 00000000..47196db2
--- /dev/null
+++ b/database/seeds/DummyDataSeeder.php
@@ -0,0 +1,508 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Classes\Exceptions\AccessForbiddenException;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Exceptions\RequestValidationException;
+use App\Classes\General\Services\GeneratesInitials;
+use App\Classes\Modules\Accounts\DataTransferObjects\RegistrationObject;
+use App\Classes\Modules\Accounts\Services\CreatesUser;
+use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
+use App\Classes\Modules\Addresses\Services\CreatesAddress;
+use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Classes\Modules\Banks\Services\CreatesBank;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
+use App\Classes\Modules\Bookings\Services\CreatesBooking;
+use App\Classes\Modules\Bookings\Services\GeneratesBookingMarking;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyConnectionObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyModuleObject;
+use App\Classes\Modules\Companies\DataTransferObjects\CompanyObject;
+use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
+use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
+use App\Classes\Modules\Companies\Services\ApprovesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompany;
+use App\Classes\Modules\Companies\Services\CreatesCompanyConnection;
+use App\Classes\Modules\Companies\Services\CreatesCompanyModule;
+use App\Classes\Modules\Companies\Services\GeneratesUniqueAccountNumber;
+use App\Classes\Modules\Contacts\DataTransferObjects\ContactObject;
+use App\Classes\Modules\Contacts\Services\CreatesContact;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\Modules\Orders\Processors\CreateOrderProcessor;
+use App\Classes\Modules\Orders\Services\GeneratesOrderNumber;
+use App\Classes\Modules\PackingLists\DataTransferObjects\ContainerObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackageObject;
+use App\Classes\Modules\PackingLists\DataTransferObjects\PackingListObject;
+use App\Classes\Modules\PackingLists\Processors\CreateContainerProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackageProcessor;
+use App\Classes\Modules\PackingLists\Processors\CreatePackingListProcessor;
+use App\Classes\Modules\Schedules\DataTransferObjects\ScheduleObject;
+use App\Classes\Modules\Schedules\Services\CreatesSchedule;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
+use App\Classes\Modules\Transports\DataTransferObjects\TransportObject;
+use App\Classes\Modules\Transports\Services\CreatesTransport;
+use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
+use App\Classes\Modules\Wallets\Services\CreatesWallet;
+use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
+use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
+use App\Classes\ValueObjects\Constants\AddressType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\BankAccountType;
+use App\Classes\ValueObjects\Constants\BusinessType;
+use App\Classes\ValueObjects\Constants\CompanyType;
+use App\Classes\ValueObjects\Constants\ContainerTypes;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\PackageType;
+use App\Classes\ValueObjects\Constants\PackingListType;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\TransportType;
+use App\Models\Address;
+use App\Models\Company;
+use App\Models\CompanyModule;
+use App\Models\Container;
+use App\Models\Document;
+use App\Models\PackingList;
+use App\Models\ServiceType;
+use App\Models\Transaction;
+use App\Models\Transport;
+use App\Models\User;
+use App\Models\Wallet;
+use Carbon\Carbon;
+use Illuminate\Database\Seeder;
+
+use Faker\Generator as Faker;
+
+class DummyDataSeeder extends Seeder
+{
+
+    /** @var Faker */
+    public $faker;
+
+    /** @var CreatesUser */
+    public $createsUser;
+
+    /** @var CreatesCompany */
+    public $createsCompany;
+
+    /** @var CreatesContact */
+    public $createsContact;
+
+    /** @var CreatesAddress */
+    public $createsAddress;
+
+    /** @var AssignEmployeeProcessor */
+    public $assignEmployeeProcessor;
+
+    /** @var CreatesDocument */
+    public $createsDocument;
+
+    /** @var CreatesFiles */
+    public $createsFiles;
+
+    /** @var GeneratesWalletCode */
+    public $generatesWalletCode;
+
+    /** @var CreatesWallet */
+    public $createsWallet;
+
+    /** @var GeneratesTransactionBillNumber */
+    public $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    public $createsTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    public $updatesTransactionStatus;
+
+    /** @var UpdatesWalletBalance */
+    public $updatesWalletBalance;
+
+    /** @var createsBank  */
+    public $createsBank;
+
+    /** @var GeneratesBookingMarking  */
+    public $generatesBookingMarking;
+
+    /** @var CreatesBooking  */
+    public $createsBooking;
+
+
+
+
+
+    /**
+     * @param Faker $faker
+     * @param CreatesUser $createsUser
+     * @param CreatesCompany $createsCompany
+     * @param CreatesContact $createsContact
+     * @param CreatesAddress $createsAddress
+     * @param AssignEmployeeProcessor $assignEmployeeProcessor
+     * @param CreatesDocument $createsDocument
+     * @param CreatesFiles $createsFiles
+     */
+    public function __construct(Faker $faker, CreatesUser $createsUser, CreatesCompany $createsCompany, CreatesContact $createsContact, CreatesAddress $createsAddress, AssignEmployeeProcessor $assignEmployeeProcessor, CreatesDocument $createsDocument, CreatesFiles $createsFiles)
+    {
+        $this->faker = $faker;
+        $this->createsUser = $createsUser;
+        $this->createsCompany = $createsCompany;
+        $this->createsContact = $createsContact;
+        $this->createsAddress = $createsAddress;
+        $this->assignEmployeeProcessor = $assignEmployeeProcessor;
+        $this->createsDocument = $createsDocument;
+        $this->createsFiles = $createsFiles;
+    }
+
+
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     * @throws MalformedRequestException
+     * @throws AccessForbiddenException
+     * @throws RequestValidationException
+     */
+    public function run()
+    {
+        // Local Development Default Password Hash
+        $password = '123456abcabc';
+
+        // At the moment we only have 3 different user roles:
+        // RoleTypes::SUPER_ADMIN : Full access, at the moment is not attached to a company but should be in the future.
+        // RoleTypes::ADMIN : Full access except for some sensitive features that require higher level of approval, at the moment is not attached to a company but should be in the future.
+        // RoleTypes::USER : This is the customer, can only access their own orders only, must be attached to a company.
+
+        // User Status
+        // ApprovalStatus::PENDING_VERIFICATION : This should be the default status before the user verifies their email status, but currently this is not being implemented.
+        // ApprovalStatus::APPROVED : This is the status of users with verified emails.
+        // ApprovalStatus::SUSPENDED : This is the status if the users is blocked from the system, but currently this is not being implemented.
+
+
+        // =============================================== //
+        //              Create CIEF Entities               //
+        // =============================================== //
+
+        // create super admin
+        $userObject = new RegistrationObject($this->faker->name, 'super_admin@izyim.com', $password, $password,RoleTypes::SUPER_ADMIN, ApprovalStatus::APPROVED);
+        $this->createsUser->execute($userObject);
+
+        // create admin
+        $userObject = new RegistrationObject($this->faker->name, 'admin@izyim.com', $password, $password,RoleTypes::ADMIN, ApprovalStatus::APPROVED);
+        $this->createsUser->execute($userObject);
+
+        // create CIEF
+        $company_object = new CompanyObject('CIEF Worldwide Sdn Bhd', 'CIEF',CompanyType::COMPANY_BUSINESS,ApprovalStatus::APPROVED);
+        /** @var Company $company */
+        $company = $this->createsCompany->execute($company_object);
+
+        // =============================================== //
+        //              Create Supplier Entities           //
+        // =============================================== //
+        // supplier entities consist of 2 type of company module [BusinessType::FREIGHT_FORWARDER, BusinessType::FREIGHT_FORWARDER, BusinessType::WAREHOUSE]
+        // in this use case we are creating 3 supplier, with each supplier having 6 company modules, 1 BusinessType::FREIGHT_FORWARDER and 5 BusinessType::WAREHOUSE. 1 warehouse for each location.
+
+        for ($i = 1; $i <= 3; $i++) {
+            $supplierName = $this->faker->company;
+            $supplierReference = $this->faker->bothify('??-????');
+
+            $company_object = new CompanyObject($supplierName, $supplierReference,CompanyType::COMPANY_BUSINESS,ApprovalStatus::APPROVED);
+            /** @var Company $company */
+            $company = $this->createsCompany->execute($company_object);
+
+            $companyModuleObject = new CompanyModuleObject($supplierName, $supplierReference, '', '', BusinessType::FREIGHT_FORWARDER, ApprovalStatus::APPROVED);
+            $this->createsCompanyModule->execute($company, $companyModuleObject);
+
+            // create supplier warehouses
+            foreach(['Guangzhou', 'Yiwu', 'Klang', 'Sabah', 'Sarawak'] as $name){
+
+                $warehouseReference = '';
+                $isChina = false;
+
+                switch($name) {
+                    case 'Guangzhou': $warehouseReference = 'GZ-V0'.$i; $isChina = true; break;
+                    case 'Yiwu': $warehouseReference = 'YY-V0'.$i; $isChina = true; break;
+                    case 'Klang': $warehouseReference = 'KL-V0'.$i; break;
+                    case 'Sabah': $warehouseReference = 'SB-V0'.$i; break;
+                    case 'Sarawak':$warehouseReference = 'SRW-V0'.$i; break;
+                }
+
+                $companyModuleObject = new CompanyModuleObject($name, $warehouseReference, '', '', BusinessType::WAREHOUSE, ApprovalStatus::APPROVED);
+                /** @var CompanyModule $companyModule */
+                $companyModule = $this->createsCompanyModule->execute($company, $companyModuleObject);
+
+                $address = new AddressObject( $this->faker->streetAddress, $this->faker->streetAddress, $isChina ? 2 : 1, $isChina ? 35 : 15, $isChina ? 633 : 412, $isChina ? 510450 : 41400, AddressType::DELIVERY, ApprovalStatus::APPROVED);
+                $this->createsAddress->execute($companyModule, $address);
+
+                $contact = new ContactObject($this->faker->name, $this->faker->phoneNumber, '', '');
+                $this->createsContact->execute($companyModule, $contact);
+            }
+        }
+
+
+        // =============================================== //
+        //                 Create Customer                 //
+        // =============================================== //
+        // 1. create user
+        // 2. create company
+
+        // 3. Attach Employee
+        // 4. create contact
+        // 5. create Address
+
+        // 6. identification verification
+
+        // =============================================== //
+        //                     Wallet                      //
+        // =============================================== //
+
+        // 7. top up wallet
+
+        // =============================================== //
+        //                 Order Workflow                  //
+        // =============================================== //
+
+        // 8. create recipient bank
+        // 9. create booking
+        // 10. make payment (Manual, FPX, Wallet)
+        // 11. approve payment (For manual payments only) * N
+        // 12. create supplier order
+        // 13. upload china payment proof (outsource * N)
+        // 14. create purchase order (maybe outsource)
+        // 15. approve purchase order ()
+        // 16. generate invoice
+
+        // generate random number of users
+        for($userLoop=1; $userLoop <= rand(20, 50); $userLoop++) {
+
+            // === //
+            //  1  // ========== //
+            //    Create user    //
+            // ================= //
+            $customerName = $this->faker->name;
+            $customerEmail = $this->faker->email;
+            $userObject = new RegistrationObject($customerName, $customerEmail, $password, $password, RoleTypes::USER, ApprovalStatus::APPROVED);
+            /** @var User $user */
+            $user = $this->createsUser->execute($userObject);
+
+            // === //
+            //  2  // ========== //
+            //  Create Company   //
+            // ================= //
+
+            // company reference is called marking, it is the human readable id.
+
+            // CompanyTypes
+            // CompanyType::COMPANY_BUSINESS : For SME Business Entities and requires SSM for identity verification.
+            // CompanyType::PERSONAL_BUSINESS : For Personal Entities and requires IC for identity verification, and the company name will follow the customer name in this case.
+
+            // Company Status
+            // ApprovalStatus::APPROVED : This is the default status of registered company.
+            // ApprovalStatus::SUSPENDED : This is the status if the company is blocked from releasing packages from warehouse due to pending verification.
+
+            $isCompany = $this->faker->numberBetween(0, 1);
+            $companyName = $isCompany ? $this->faker->company : $customerName;
+
+            $company_object = new CompanyObject($companyName,
+                mt_rand(1000, 9999).(new GeneratesInitials())->name($companyName)->length(3)->generate(),
+                $isCompany ? CompanyType::COMPANY_BUSINESS : CompanyType::PERSONAL_BUSINESS,
+                ApprovalStatus::APPROVED);
+
+            /** @var Company $company */
+            $company = $this->createsCompany->execute($company_object);
+
+            // === //
+            //  3  // ===========//
+            //  Attach Employee  //
+            // ==================//
+            // employees are attached to company modules not companies, because an employee maybe working for one or many "Departments".
+            $Object = new EmploymentObject($company, $user);
+            $this->assignEmployeeProcessor->execute($Object);
+
+            // === //
+            //  4  // ========== //
+            //  Create Contact   //
+            // ================= //
+            // Contacts uses eloquent polymorphic relationship to declare its owner. and for this use case it will be attached to the company not the company module.
+            $contactObject = new ContactObject($company->id, $customerName, $this->faker->phoneNumber, $customerEmail, null, $this->faker->bothify('??#####'));
+            $this->createsContact->execute($contactObject);
+
+            // === //
+            //  5  // ========== //
+            //  Create Address   //
+            // ================= //
+            // Addresses uses eloquent polymorphic relationship to declare its owner. and for this use case it will be attached to the company module.
+            // an address has at least 1 contact for the PIC.
+            // there is 1 type of address we use:
+            // AddressType::BILLING : for the invoice billing address
+
+            // create delivery address
+            $addressObject = new AddressObject($this->faker->streetAddress, '', 1, $this->faker->numberBetween(1, 15), $this->faker->numberBetween(1, 442), $this->faker->postcode);
+            /** @var Address $address */
+            $address = $this->createsAddress->execute($company, $addressObject);
+
+            // === //
+            //  6  // ====================== //
+            //  identification verification   //
+            // ============================== //
+            // please refer to company types section for more insight
+            $object = new DocumentObject($isCompany ? DocumentType::SSM_REGISTRATION : DocumentType::IDENTITY_CARD, ['data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAIAAAB7GkOtAAANGklEQVR4nOzXDa/fdX3G8R44Ww54BIFV2wFyoxUoKmsFhA0zEGQj1jOMo5o5IQPmYE5wrSvjdhbHAGWt0BWEwmChuHEjSF2LrY6tlmFjJbblprQstD21UFzbrBhX1tKyR3ElJtfr9QCu78k/v5N3PoOzbv/SmKR/mv94dP+FN9dH95+7+J7o/sjse6P7y3d/Orq/6qKTovtLN94f3Z9w39nR/XeFv/+nrlse3V/xhbXR/Xuv/kx0f3TDjuj+oltviO7PHJf9/veJrgPwK0sAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQafOeyu6MPPP9by6L7f7n/yuj+rWN/Et3/xiu/Gd3/xQduju7ve+KE6P7wc6dG9yde/lx0f86J2e/nO38yLrq/ftXT0f0/m7wzuj9jw4vR/V2n74jub7v8zOi+CwCglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKDWw40dD0Qc2PP+O6P6cJauj+zP+dVl0//izT47uv+eazdH9bf+3I7r/xhFXR/dnzjwmun/lJ56N7n/vA/Oi+5NmnxDdf3jqtuj+8j0PRPfnzPtUdP/Jt++K7rsAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSgwsfXhl94KuHrIjuHzvmxuj+g6+9EN1//Pz/jO5P/2x2f/dTL0X3f+e9S6L7f3zJHdH9jafOjO6/7/LDo/s3bL4+un/rnNOi+yMXDUX3Bw6YFt2/+IyTovsuAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACg1OCEe34UfWDn+SPR/bcWrY3u//DMbdH94w4diu4/sPTo6P7tNx0Z3V92wrzo/k8/uzu6f8DwndH9v5i1ILq/+UO3Rfd3Lz4nuv+VRx6K7s9Y+nJ0f+HKsdF9FwBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUGrw9+84JfrAof89P7r/wf8aG90/d8//RvdvXf/30f3JI8ui+8ceeUd0/+DPr4nuf3jX56L7p168Krr/rcfOiu6PHvhqdH/xLauj+8+Mbozur/vpj6P7E8edH913AQCUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQYXb9kafeDSf/lWdP/fdx4c3X9k60vR/b13Xxjdnzb1Z9H90ctWRfffmvRGdP+8e96M7m+avT26/45vnh3d/9rNY6P7Tz/5w+j+e6bMj+4f8rHro/vHH579/l0AAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAECpwb037R994NK5a6P7/7zgvuj+JTNPiO7/7fKjo/t7H7wmuj/8+pnR/f2nbojuH33tndH9333536L7E25+Kro//NuTo/vLT1oe3f+jNZdG9y+ffHB0f972e6L7LgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoNTgYcd8LvrA9IGd0f3jh6+K7l8/d010f5/hrdH98euGovuf+OvbovsHnPpSdP/p6X8e3d8ztD26v+bJydH9GQfcG91/+MWPRve/vPSX0f2P/OmC6P7AdYdF910AAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAECpgXMG3x59YPXKWdH9xc9+P7q/3/SjovvLjjs3uv83E4+N7p904Lej+9MXfCq6//ULvxvdf2D2KdH9afOuiu5PnPm26P7QM1Oy+yPZ7/PItdui+1v+Y1103wUAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQaeOKXH48+sGnNtOj+mGkrovNvm3tddH/MoWOj8y/cckx0/6D5743u/+ydI9H9O/d+JLr/yuwLovtbHhqI7r//wuz3+Z2PfTC6/5VXVkX3/+G+c6L7Xz9vRnTfBQBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBp4/ZC7og/84cLx0f1fX7gyuj/xy6PR/eueuDG6P/6rS6L7t//g8ej+Xa9Niu6/9sSM6P4bmx6L7t+14+Do/se/NBzd3/7Rq6L7a976dHR/xruy/1+jO/aN7rsAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSg48/PyX6wBenDkX3Z607Lbo/d9f7o/tblmd//5u+Oyu6f/rP50X3B1/dEN2/5O6V0f0rLr0tur/omp9E918deT26/+Dpe6P7N179d9H9TdeORvd33XdOdN8FAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUGpgzcW/0gQ9PPyK6P/jtB6P7nzxrU3T/i/dvjO6vPuWQ6P6Z7/616P76T94Q3X/37qHo/rzfmx/dv2V8dv/+/S6L7j/6B0uj+wftuyS6v+KK7O+/++Xs3+8CACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKDTx24TeiDzz68MnR/UU7D4/uH/ah7P6PH5oT3T/viCuj+18b2RTd//7J+0f3L7nipuj+lAueie6PmXpUdH7mpDOi+y/ueiS6f9kP/iq6/+yEn0f3p1x0UXTfBQBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBo86urN0Qemjk6N7n9v+Nzo/uHXfj66P3fF1uj+Pvv9T3T/wBOj82MeOuvR6P64cVdE9/9x4KDo/m+cdmV0f8HSPdH9910wKbo//gv3Rve/+YszovufufO46L4LAKCUAACUEgCAUgIAUEoAAEoJAEApAQAoJQAApQQAoJQAAJQSAIBSAgBQSgAASgkAQCkBACglAAClBACglAAAlBIAgFICAFBKAABKCQBAKQEAKCUAAKUEAKCUAACUEgCAUgIAUEoAAEoJAEApAQAo9f8BAAD//3aYjHM9JD/iAAAAAElFTkSuQmCC'],
+                $isCompany ? $this->faker->bothify('SSM-#######') : $this->faker->bothify('############'), ApprovalStatus::APPROVED, 'identifications');
+            /** @var Document $document */
+            $document = $this->createsDocument->execute($company, $object);
+            $this->createsFiles->execute($document, $object);
+
+            // === //
+            //  7  // ========= //
+            //  top up wallet   //
+            // ================ //
+            // when a customer tries to top up their wallet, if the wallet doesn't already exist it will be automatically created.
+            // wallet credit can be used to pay for transfer orders to enjoy better conversion rates.
+            // wallet top-ups can only be performed using FPX at the moment. but super admin can manually credit or debit credit to a customer's wallet
+
+            // The transaction table is considered the most confusing part of our database because it is being used by multiple model using a polymorphic relationship
+            // and is used for many use cases in our application which is an unintended flaw, and we are looking for ways to improve it.
+
+
+            // A wallet top up is TransactionType::TOP_UP, there are many types of transactions used by a wallet:
+            // TransactionType::TOP_UP : represent a top-up amount to a wallet;
+            // TransactionType::PAYMENT : represent payment out of the wallet;
+            // TransactionType::CREDIT_NOTE : represent a manual top-up to a wallet, and can only be performed by super admin;
+            // TransactionType::CREDIT_NOTE : represent a deduction from a wallet, and can only be performed by super admin;
+            // TransactionType::WITHDRAW : represent a customer withdrawing credit out of a wallet to a bank account (refund);
+
+
+            // top up only some customers
+            $shouldTopUp = $this->faker->numberBetween(0, 1);
+            if($shouldTopUp) {
+                $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute());
+                /** @var Wallet $wallet */
+                $wallet = $this->createsWallet->execute($object, $company);
+
+                $amount = $this->faker->numberBetween(10, 300000);
+                $billNumber = $this->generatesTransactionBillNumber->execute('TOPUP-');
+
+                // create billplz bill using api, we will skip this part in the seed.
+                $billPlzBill = $this->faker->bothify('???#####');
+
+                $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);
+
+                /** @var Transaction $transaction */
+                $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
+
+
+                // on billplz callback url
+                $status = $this->faker->randomElement([ApprovalStatus::APPROVED, ApprovalStatus::REJECTED]);
+                $this->updatesTransactionStatus->execute($transaction, $status);
+                if($status === ApprovalStatus::APPROVED) {
+                    $this->updatesWalletBalance->execute($wallet, $amount);
+                }
+            }
+
+            // === //
+            //  8  // ========================== //
+            //  Create Recipient Bank Accounts   //
+            // ================================= //
+            // bank accounts are used to store bank account details, and can be used in a variety of ways
+            // Bank types:
+            // 1. PERSONAL : belong to the same entity
+            // 2. EXTERNAL : Doesn't belong to the entity, belongs to an external entity;
+            // 3. ALIPAY : : Is an external entity, but flag the type of bank as alipay e-wallet;
+            //
+            // here are some of the current use cases for banks in our application:
+            // 1. Recipient bank (EXTERNAL) (the account the customer is requesting to transfer funds to)
+            // 2. AliPay Transfer (EXTERNAL) (the account the customer is requesting to transfer funds to when bank type is ALIPAY)
+            // 3. Refund bank (PERSONAL) (the account the customer is requesting his order refunds to be transferred to)
+            $bank_object = new BankObject($company->id, $this->faker->numberBetween(2, 3),
+                $this->faker->bank, $this->faker->name,  $this->faker->bankAccountNumber,
+                $this->faker->city,  null,  null,
+                2, $this->faker->company);
+
+            // todo create multiple bank accounts with multiple types
+            $bank = $this->createsBank->execute($bank_object);
+
+            // generate random number of bookings
+            for($orderLoop=1; $orderLoop <= rand(1, 30); $orderLoop++) {
+
+                // === //
+                //  9  // ========= //
+                //  Create Booking  //
+                // ================ //
+                // A booking is simply a transfer order to a supplier/manufacturer bank account overseas
+                // to pay for goods they are buying from overseas. the booking is not proceed until the
+                // customer requests to make a payment, when the customer start the payment process he
+                // will receive a quote for the cost to transfer the booked amount (e.g. 100 USD) in RM
+
+                // bookings require 2 actions from the customer to be completed
+                // 1. Make Full payment **
+                // 2. Provide Purchase Order (itemized list of the products they are buying)
+
+                // ** A booking will be the sum of payments transferred to one bank account
+                // but can be partially paid (e.g. 1000 USD can be paid:  $300 deposit + $700 balance)
+                // A shipping label can be re-used, and each batch that arrives at the supplier warehouse
+                // is referred to as a packing list. more on this later.
+
+                // service types are configured by the super admin from the settings
+                // it will include things like conversion rates, service charge, etc..
+                // and can be used to place different type of transfer orders (e.g. 1 day transfer, 3 days transfer, 1688 Payment)
+
+                // randomly selects a service type
+                $service = ServiceType::where('reference', $this->faker->numberBetween(1, 3))->first();
+
+                // Booking human readable id
+                $reference = $this->generatesBookingMarking->execute();
+
+                // random currency booking (CNY, USD)
+                $bookedCurrency = $this->faker->numberBetween(2, 3);
+                $object = new BookingObject($service->id, $bank->id, $reference, $this->faker->numberBetween(10, 300000), $bookedCurrency,  $bookedCurrency, 1);
+
+                $booking = $this->createsBooking->execute($company, $object);
+
+
+                // === //
+                //  10  // ====== //
+                //  make payment  //
+                // ============== //
+                // There are few type of transactions related to a booking:
+                // TransactionType::PAYMENT : is used for 2 type of use cases (1. payments to transfer orders, 2. payment out of wallet) and is attached to a booking;
+                // TransactionType::BILL : is to represent the payment out to CIEF currency supplier (expenses) and is attached to a transaction of type TransactionType::PAYMENT;
+                // TransactionType::TRANSFER_FEE : is to represent the transfer fee charged by CIEF currency supplier is attached to a transaction type TransactionType::BILL;
+                // TransactionType::REFUND : is to represent a request for refund on a payment, and  is attached to a transaction type TransactionType::PAYMENT;
+
+                // todo make payment
+                // todo approve payment
+
+                // todo create supplier order
+                // when processing a customer order, we will place an order with one of our currency supplier which will generate a transaction type TransactionType::BILL
+                // and attach it to the customer payment TransactionType::PAYMENT, and it will update the TransactionType::PAYMENT status to ApprovalStatus::COMPLETED
+
+                // todo upload china payment proof
+                // when our currency supplier completes the transfer they will send us the bank slip as proof of payment, then the admin user
+                // will upload the bank slip document and attaching it to transaction type TransactionType::BILL
+
+                // todo create purchase order
+                // creating the purchase order can happen before or after the payment is made, the customer needs to fill up the list of product
+                // they are buying and attaching it to the booking, a purchase order is a transaction of type TransactionType::PURCHASE_ORDER
+                // todo approve purchase order
+
+                // todo generate invoice
+                // the invoicing documents will be generated once they 2 conditions are met:
+                // 1. Full payment completed (completed is flagged when the china payment proof is uploaded)
+                // 2. The purchase order is filled and approved (when the purchase order is not filled for more than 2 months the system will automatically generate a random products for Purchase order to close the order)
+
+                // once the invoice is generated the transaction table will include 2 new transaction type TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVERY
+                // and for documents will be generated and attached to the booking.
+                // once this process is complete the booking status will update to ApprovalStatus::COMPLETED
+
+            }
+
+        }
+
+    }
+
+}
diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php
index 41482a0d..97df1105 100644
--- a/resources/views/vendor/js.blade.php
+++ b/resources/views/vendor/js.blade.php
@@ -8,6 +8,6 @@
 </script>
 <script type="text/javascript">window.$crisp=[];window.CRISP_WEBSITE_ID="665dcd41-1edf-4451-8cb9-f1cf9ed35e15";(function(){d=document;s=d.createElement("script");s.src="https://client.crisp.chat/l.js";s.async=1;d.getElementsByTagName("head")[0].appendChild(s);})();</script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
-<script src="{{mix('vue/app.js')}}"></script>
+<script src="@if (env('APP_ENV') === 'local') {{asset('vue/app.js')}}  @else {{mix('vue/app.js')}} @endif"></script>
 <script src="{{ asset('js/site.js') }}" type="text/javascript"></script>
-{{--END VENDOR JS--}}
\ No newline at end of file
+{{--END VENDOR JS--}}

From 52c2c6840ce2459dceef816c15663645420e3a48 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 22 Nov 2022 11:26:07 +0800
Subject: [PATCH 161/179] hide duplicate purchase orders for verification

---
 resources/views/pages/dashboards/admin.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php
index 46a40648..d7223cc0 100644
--- a/resources/views/pages/dashboards/admin.blade.php
+++ b/resources/views/pages/dashboards/admin.blade.php
@@ -202,7 +202,7 @@
                                                 </div>
                                                 <div class="row">
                                                     <div class="col">
-                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true}">
+                                                        <list-component key="2" section="poPendingApprovalSection" :endpoint="route('api.booking.list')" :options="{per_page: 10, purchase_order_approval: true, status_in: [2]}">
                                                             <template slot="list" slot-scope="{data}">
                                                                 <booking-component :data="data"></booking-component>
                                                             </template>

From ebfcce83ade25ddbcb50cd5a112525101c28f1b5 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:28:45 +0800
Subject: [PATCH 162/179] fix refunded bookings

---
 routes/web.php | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index a8ad44ba..40400621 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -446,3 +446,47 @@ Route::get('/payment/check', function(){
 
 })->name('payment.check');
 
+Route::get('/refund/fix', function(){
+
+    $bookings = Booking::whereIn('marking', [82935, 92135, 96183, 94448, 29819, 30403, 63969, 42116, 79278, 89987, 51432, 76289, 67767, 98433, 47431, 93472, 50933, 87298, 35329, 93845, 55902, 82629, 51019, 42820, 90666, 40167, 29253, 48891, 67364, 64628, 91859, 22123, 34154, 84366, 27370, 58222, 67695, 71233, 26466, 83894, 35664, 65669, 68986, 40382, 63743, 39611, 60658, 32893, 98243, 23822, 64323, 79271, 79053, 48497, 48708, 86463, 30054, 50590, 85808, 88988, 79663, 57558, 85902, 95451, 95897, 33164, 82342, 38091, 27451, 64809, 39444, 32101, 27242, 71851, 50850, 70659, 89403, 55540, 65743, 77315, 22921, 35623, 77315, 32344, 81717, 57176, 48775, 34133, 39396, 67473, 42749, 89395, 32132, 23670, 36783, 21783, 66348, 47205, 72784, 22437, 96271, 45396, 45352, 47896, 61654, 73174, 47002, 25448, 95810, 80827, 81180, 52142, 37640, 30295, 59816, 99197, 76541, 94786, 30776, 89769, 77720, 30610, 28546, 50931, 94525, 43425, 37461, 20629, 60586, 87228, 24814, 68011, 90547, 30572, 26274, 26274, 38599, 44487, 96767, 63872, 29576, 20173, 23555, 64657, 71021, 65316, 86540, 73981, 32747, 71086, 83221, 66168, 90541, 52366, 29227, 30915, 45242, 81384, 37533, 89752, 70133, 45894, 21918, 85579, 48650, 88747, 23200, 37018, 21753, 21188, 60449, 63918, 68888, 49910, 30402, 96338, 36578, 82133, 37872, 90437, 54404, 73439, 94283, 97752, 83333])
+    ->get();
+
+    $notPlaced = [];
+    $placed = [];
+    $completed = [];
+
+    foreach ($bookings as $booking){
+        $payments = $booking->transactions()->where('type', TransactionType::PAYMENT)->get();
+        foreach ($payments as $payment){
+            if($payment->status = ApprovalStatus::APPROVED){
+                $notPlaced[] = $booking;
+                continue;
+            }
+            $bill = $payment->transactions()->where('type', TransactionType::BILL)->first();
+            if(in_array($bill->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])){
+                $completed[] = $booking;
+                continue;
+            }
+            $placed[] = $booking;
+        }
+    }
+
+    echo '<h3>Not Placed ('.count($notPlaced).')</h3>';
+    foreach ($notPlaced as $booking){
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+    }
+
+    echo '<h3>Placed ('.count($placed).')</h3>';
+    foreach ($placed as $booking){
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+    }
+
+    echo '<h3>Complete ('.count($completed).')</h3>';
+    foreach ($completed as $booking){
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+    }
+
+});
+
+
+

From f683f76981aabc404476c06441b67e6e1df83ea3 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:30:39 +0800
Subject: [PATCH 163/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index 40400621..e0a5f741 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -473,17 +473,17 @@ Route::get('/refund/fix', function(){
 
     echo '<h3>Not Placed ('.count($notPlaced).')</h3>';
     foreach ($notPlaced as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
     echo '<h3>Placed ('.count($placed).')</h3>';
     foreach ($placed as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
     echo '<h3>Complete ('.count($completed).')</h3>';
     foreach ($completed as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->reference.'</a><br>';
+        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
 });

From a4b22f92d1475ee7cfcdf763ee5cbe309d93de03 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:31:55 +0800
Subject: [PATCH 164/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index e0a5f741..a2fee9a4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -473,17 +473,17 @@ Route::get('/refund/fix', function(){
 
     echo '<h3>Not Placed ('.count($notPlaced).')</h3>';
     foreach ($notPlaced as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
+        echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
     echo '<h3>Placed ('.count($placed).')</h3>';
     foreach ($placed as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
+        echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
     echo '<h3>Complete ('.count($completed).')</h3>';
     foreach ($completed as $booking){
-        echo '<a href="'.route('booking.details').'" target="_blank">'.$booking->marking.'</a><br>';
+        echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
 });

From 3468864687a03d69c17ee2ca8d99f07e09300937 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:33:34 +0800
Subject: [PATCH 165/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index a2fee9a4..b253c2f4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -458,7 +458,7 @@ Route::get('/refund/fix', function(){
     foreach ($bookings as $booking){
         $payments = $booking->transactions()->where('type', TransactionType::PAYMENT)->get();
         foreach ($payments as $payment){
-            if($payment->status = ApprovalStatus::APPROVED){
+            if($payment->status === ApprovalStatus::APPROVED){
                 $notPlaced[] = $booking;
                 continue;
             }

From 84c8f238fecba8a0e75d4cecaa6cba78053ea270 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:36:41 +0800
Subject: [PATCH 166/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index b253c2f4..54540f19 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -462,7 +462,13 @@ Route::get('/refund/fix', function(){
                 $notPlaced[] = $booking;
                 continue;
             }
+
             $bill = $payment->transactions()->where('type', TransactionType::BILL)->first();
+            if(!$bill){
+                $notPlaced[] = $booking;
+                continue;
+            }
+
             if(in_array($bill->status, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])){
                 $completed[] = $booking;
                 continue;

From 5964342db5e9329ac5f63b8d0b60dc8bf0d09878 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:43:34 +0800
Subject: [PATCH 167/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index 54540f19..bc956601 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -448,7 +448,7 @@ Route::get('/payment/check', function(){
 
 Route::get('/refund/fix', function(){
 
-    $bookings = Booking::whereIn('marking', [82935, 92135, 96183, 94448, 29819, 30403, 63969, 42116, 79278, 89987, 51432, 76289, 67767, 98433, 47431, 93472, 50933, 87298, 35329, 93845, 55902, 82629, 51019, 42820, 90666, 40167, 29253, 48891, 67364, 64628, 91859, 22123, 34154, 84366, 27370, 58222, 67695, 71233, 26466, 83894, 35664, 65669, 68986, 40382, 63743, 39611, 60658, 32893, 98243, 23822, 64323, 79271, 79053, 48497, 48708, 86463, 30054, 50590, 85808, 88988, 79663, 57558, 85902, 95451, 95897, 33164, 82342, 38091, 27451, 64809, 39444, 32101, 27242, 71851, 50850, 70659, 89403, 55540, 65743, 77315, 22921, 35623, 77315, 32344, 81717, 57176, 48775, 34133, 39396, 67473, 42749, 89395, 32132, 23670, 36783, 21783, 66348, 47205, 72784, 22437, 96271, 45396, 45352, 47896, 61654, 73174, 47002, 25448, 95810, 80827, 81180, 52142, 37640, 30295, 59816, 99197, 76541, 94786, 30776, 89769, 77720, 30610, 28546, 50931, 94525, 43425, 37461, 20629, 60586, 87228, 24814, 68011, 90547, 30572, 26274, 26274, 38599, 44487, 96767, 63872, 29576, 20173, 23555, 64657, 71021, 65316, 86540, 73981, 32747, 71086, 83221, 66168, 90541, 52366, 29227, 30915, 45242, 81384, 37533, 89752, 70133, 45894, 21918, 85579, 48650, 88747, 23200, 37018, 21753, 21188, 60449, 63918, 68888, 49910, 30402, 96338, 36578, 82133, 37872, 90437, 54404, 73439, 94283, 97752, 83333])
+    $bookings = Booking::whereIn('marking', [82935, 92135, 96183, 94448, 29819, 30403, 63969, 42116, 79278, 89987, 51432, 76289, 67767, 98433, 47431, 93472, 50933, 87298, 35329, 93845, 55902, 82629, 51019, 42820, 90666, 40167, 29253, 48891, 67364, 64628, 91859, 22123, 34154, 84366, 27370, 58222, 67695, 71233, 26466, 83894, 35664, 65669, 68986, 40382, 63743, 39611, 60658, 32893, 98243, 23822, 64323, 79271, 79053, 48497, 48708, 86463, 30054, 50590, 85808, 88988, 79663, 57558, 85902, 95451, 95897, 33164, 82342, 38091, 27451, 64809, 39444, 32101, 27242, 71851, 50850, 70659, 89403, 55540, 65743, 77315, 22921, 35623, 77315, 32344, 81717, 57176, 48775, 34133, 39396, 67473, 42749, 89395, 32132, 23670, 36783, 21783, 66348, 47205, 72784, 22437, 96271, 45396, 45352, 47896, 61654, 73174, 47002, 25448, 95810, 80827, 81180, 52142, 37640, 30295, 59816, 99197, 76541, 94786, 30776, 89769, 77720, 30610, 28546, 50931, 94525, 43425, 37461, 20629, 60586, 87228, 24814, 68011, 90547, 30572, 26274, 26274, 38599, 44487, 96767, 63872, 29576, 20173, 23555, 64657, 71021, 65316, 86540, 73981, 32747, 71086, 83221, 66168, 90541, 52366, 29227, 30915, 45242, 81384, 37533, 89752, 70133, 45894, 21918, 85579, 48650, 88747, 23200, 37018, 21753, 21188, 60449, 63918, 68888, 49910, 30402, 96338, 36578, 82133, 37872, 90437, 54404, 73439, 94283, 97752, 83333, 38548, 74366, 21060, 43240, 94612, 33164, 98630, 33164, 22898, 44320, 31153, 36480, 55085, 64039, 99796, 42238, 71458, 34415, 49935, 37902, 25598, 51833, 89733, 38081, 71564, 51366, 20173, 91400, 86540, 92131, 76724, 22657, 62117, 86443, 85827, 46570, 99809, 89258, 68834, 20785, 24478, 79588, 49111, 24838, 41989, 79081, 48440, 57375, 86104, 78719, 61502, 96167, 23398, 27873, 80065, 33048, 83138, 99211, 98183, 28639, 54547, 70098, 27216, 67404, 47761, 85049, 41906, 62328, 63645, 46750, 86975, 69955, 21714, 33889, 87344, 58345, 34183, 82504, 68636, 70962, 92553, 20125, 88625, 20661, 98146, 92075, 67543, 99045, 27395, 67163, 32245, 43347, 87947, 97897, 59860, 26003, 47852, 96008, 54166, 50037, 31435, 35821, 81929, 76751, 80379, 32473, 81598, 58716, 70554, 67473, 82491, 93859, 99159, 84772, 84772, 32473, 42050, 26532, 81526, 81526, 45780, 46570, 78657, 35293, 98311, 62095, 86914, 45215, 37650, 57708, 60449, 46750, 91834, 60989, 54877, 98298, 52382, 86346, 65219])
     ->get();
 
     $notPlaced = [];

From 9fde5db903ff9b75943394e6d65389edb2034c45 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:44:45 +0800
Subject: [PATCH 168/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index bc956601..ba8bd29d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -477,17 +477,17 @@ Route::get('/refund/fix', function(){
         }
     }
 
-    echo '<h3>Not Placed ('.count($notPlaced).')</h3>';
+    echo '<h3>Customer Paid ('.count($notPlaced).')</h3>';
     foreach ($notPlaced as $booking){
         echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
-    echo '<h3>Placed ('.count($placed).')</h3>';
+    echo '<h3>White Form Generated ('.count($placed).')</h3>';
     foreach ($placed as $booking){
         echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }
 
-    echo '<h3>Complete ('.count($completed).')</h3>';
+    echo '<h3>China Bankslip Uploaded ('.count($completed).')</h3>';
     foreach ($completed as $booking){
         echo '<a href="'.route('booking.details', $booking->marking).'" target="_blank">'.$booking->marking.'</a><br>';
     }

From b120d44e86ee79cae9534a1d6d32e8885f31969f Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Thu, 24 Nov 2022 22:50:09 +0800
Subject: [PATCH 169/179] fix refunded bookings

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

diff --git a/routes/web.php b/routes/web.php
index ba8bd29d..a177dc5c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -456,7 +456,7 @@ Route::get('/refund/fix', function(){
     $completed = [];
 
     foreach ($bookings as $booking){
-        $payments = $booking->transactions()->where('type', TransactionType::PAYMENT)->get();
+        $payments = $booking->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->get();
         foreach ($payments as $payment){
             if($payment->status === ApprovalStatus::APPROVED){
                 $notPlaced[] = $booking;

From dc1b0327ce65367d7a35c5ccba0d5c24b06ca06a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 16 Dec 2022 13:37:18 +0800
Subject: [PATCH 170/179] log transactional data

---
 app/Classes/General/Traits/LogData.php | 36 ++++++++++++++++++++++++++
 app/Models/Booking.php                 |  2 ++
 app/Models/Group.php                   |  2 ++
 app/Models/Transaction.php             |  2 ++
 app/Models/Wallet.php                  |  2 ++
 5 files changed, 44 insertions(+)
 create mode 100644 app/Classes/General/Traits/LogData.php

diff --git a/app/Classes/General/Traits/LogData.php b/app/Classes/General/Traits/LogData.php
new file mode 100644
index 00000000..efee3915
--- /dev/null
+++ b/app/Classes/General/Traits/LogData.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Classes\General\Traits;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Str;
+
+trait LogData
+{
+
+    public static function boot()
+    {
+        parent::boot();
+
+
+        static::updating(function($model)
+        {
+
+            $tableName = Str::singular($model->table).'_logs';
+            $relationshipColumn = Str::singular($model->table).'_id';
+
+            $originalData = $model->getRawOriginal();
+            $originalData[$relationshipColumn] = $originalData['id'];
+            unset($originalData['id']);
+
+            if (!Schema::hasTable($tableName)) {
+                DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table);
+                DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`');
+            }
+
+            DB::table($tableName)->insert($originalData);
+
+        });
+    }
+}
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index 2dfd945a..ca80d0c3 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Traits\LogData;
 use App\Classes\ValueObjects\Constants\RoleTypes;
 use App\Scopes\CustomerBookingsScope;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -28,6 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable
 {
     use HasRelationships;
     use SoftDeletes;
+    use LogData;
 
     protected $table = 'bookings';
 
diff --git a/app/Models/Group.php b/app/Models/Group.php
index 1fc6ca48..00a7247b 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Classes\General\Traits\LogData;
 use Illuminate\Database\Eloquent\Model;
 use App\Classes\General\Interfaces\Documentable;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -13,6 +14,7 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+    use LogData;
 
 	public function transactions()
     {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 429449a6..a1fb0849 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Traits\LogData;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use Carbon\Carbon;
@@ -22,6 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
 {
     use HasTableAlias;
     use SoftDeletes;
+    use LogData;
 
     protected $table = 'transactions';
 
diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php
index 8c3114fd..00677513 100644
--- a/app/Models/Wallet.php
+++ b/app/Models/Wallet.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Traits\LogData;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -12,6 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 class Wallet extends AbstractModel implements Transactionable
 {
     use SoftDeletes;
+    use LogData;
 
     protected $table = 'wallets';
     /**

From 43ab93b05007c8c20636034c33dbff1e96712b65 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 16 Dec 2022 16:56:48 +0800
Subject: [PATCH 171/179] debug groups

---
 app/Http/Resources/GroupResource.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php
index faae5b43..abd017ec 100644
--- a/app/Http/Resources/GroupResource.php
+++ b/app/Http/Resources/GroupResource.php
@@ -22,6 +22,9 @@ class GroupResource extends JsonResource
     public function toArray($request)
     {
 
+        if(!$this->issuerCompany){
+            dd($this->id);
+        }
         return [
             'id' => $this->id,
             'original_amount' => (float) $this->original_amount,

From e60e5d2e3cda4e70c762168602b83ec4cda96898 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 16 Dec 2022 17:05:02 +0800
Subject: [PATCH 172/179] debug groups

---
 app/Models/Group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Group.php b/app/Models/Group.php
index 00a7247b..0ea4362c 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -14,7 +14,7 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
-    use LogData;
+//    use LogData;
 
 	public function transactions()
     {

From 2abc10ba29828d52b1c72cedefded907bc4f21b0 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 16 Dec 2022 17:06:56 +0800
Subject: [PATCH 173/179] debug groups

---
 app/Models/Booking.php     | 2 +-
 app/Models/Transaction.php | 2 +-
 app/Models/Wallet.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index ca80d0c3..34fb779b 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -29,7 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable
 {
     use HasRelationships;
     use SoftDeletes;
-    use LogData;
+//    use LogData;
 
     protected $table = 'bookings';
 
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index a1fb0849..efbf9b85 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -23,7 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
 {
     use HasTableAlias;
     use SoftDeletes;
-    use LogData;
+//    use LogData;
 
     protected $table = 'transactions';
 
diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php
index 00677513..919220e6 100644
--- a/app/Models/Wallet.php
+++ b/app/Models/Wallet.php
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 class Wallet extends AbstractModel implements Transactionable
 {
     use SoftDeletes;
-    use LogData;
+//    use LogData;
 
     protected $table = 'wallets';
     /**

From bf599890fa99f8abf2afe8491448741929d9b61e Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Sun, 18 Dec 2022 15:14:11 +0800
Subject: [PATCH 174/179] fix log data for transactional tables

---
 app/Classes/General/Traits/LogData.php | 11 +++++++++++
 app/Models/Booking.php                 |  2 +-
 app/Models/Group.php                   |  2 +-
 app/Models/Transaction.php             |  2 +-
 app/Models/Wallet.php                  |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Classes/General/Traits/LogData.php b/app/Classes/General/Traits/LogData.php
index efee3915..de4b68fd 100644
--- a/app/Classes/General/Traits/LogData.php
+++ b/app/Classes/General/Traits/LogData.php
@@ -21,11 +21,22 @@ trait LogData
             $relationshipColumn = Str::singular($model->table).'_id';
 
             $originalData = $model->getRawOriginal();
+
             $originalData[$relationshipColumn] = $originalData['id'];
             unset($originalData['id']);
 
             if (!Schema::hasTable($tableName)) {
                 DB::statement('CREATE TABLE '.$tableName.' LIKE '.$model->table);
+
+                $indexs = DB::select('SHOW INDEX FROM '.$tableName.';');
+
+                $removedIndexes = [];
+                foreach ($indexs as $index){
+                    if($index->Column_name === 'id' || in_array($index->Key_name, $removedIndexes)) continue;
+                    DB::statement('ALTER TABLE '.$tableName.' drop index '.$index->Key_name);
+                    $removedIndexes[] = $index->Key_name;
+                }
+
                 DB::statement('ALTER TABLE '.$tableName.' ADD COLUMN `'.$relationshipColumn.'` BIGINT NOT NULL AFTER `id`');
             }
 
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
index 34fb779b..ca80d0c3 100644
--- a/app/Models/Booking.php
+++ b/app/Models/Booking.php
@@ -29,7 +29,7 @@ class Booking extends AbstractModel implements Documentable, Transactionable
 {
     use HasRelationships;
     use SoftDeletes;
-//    use LogData;
+    use LogData;
 
     protected $table = 'bookings';
 
diff --git a/app/Models/Group.php b/app/Models/Group.php
index 0ea4362c..00a7247b 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -14,7 +14,7 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
-//    use LogData;
+    use LogData;
 
 	public function transactions()
     {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index efbf9b85..a1fb0849 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -23,7 +23,7 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
 {
     use HasTableAlias;
     use SoftDeletes;
-//    use LogData;
+    use LogData;
 
     protected $table = 'transactions';
 
diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php
index 919220e6..00677513 100644
--- a/app/Models/Wallet.php
+++ b/app/Models/Wallet.php
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphMany;
 class Wallet extends AbstractModel implements Transactionable
 {
     use SoftDeletes;
-//    use LogData;
+    use LogData;
 
     protected $table = 'wallets';
     /**

From dfdfb50ead92eb24abdda295275a78e039f58ef5 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 19 Dec 2022 11:16:59 +0800
Subject: [PATCH 175/179] fix log data for transactional tables

---
 app/Models/Group.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Group.php b/app/Models/Group.php
index 00a7247b..0ea4362c 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -14,7 +14,7 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
-    use LogData;
+//    use LogData;
 
 	public function transactions()
     {

From d16436088f5fccfae756546d5851121437b607db Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 19 Dec 2022 11:26:20 +0800
Subject: [PATCH 176/179] fix log data for transactional tables

---
 .../ControllersLogic/CreateSupplierTransactionLogic.php          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index b495cc35..c21c234e 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -106,6 +106,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
             $service_charge += $row->service_charge;
         }
 
+        dd($this->generatesTransactionBillNumber->execute('SPO-'));
         $group->issuer = $issuer;
         $group->receiver = $receiver;
         $group->reference = $this->generatesTransactionBillNumber->execute('SPO-');

From 80c59efd2f7e3c7501b20ca1592c9a8e25732b2a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 19 Dec 2022 11:28:21 +0800
Subject: [PATCH 177/179] fix log data for transactional tables

---
 .../ControllersLogic/CreateSupplierTransactionLogic.php         | 1 -
 app/Models/Group.php                                            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
index c21c234e..b495cc35 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php
@@ -106,7 +106,6 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic
             $service_charge += $row->service_charge;
         }
 
-        dd($this->generatesTransactionBillNumber->execute('SPO-'));
         $group->issuer = $issuer;
         $group->receiver = $receiver;
         $group->reference = $this->generatesTransactionBillNumber->execute('SPO-');
diff --git a/app/Models/Group.php b/app/Models/Group.php
index 0ea4362c..00a7247b 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -14,7 +14,7 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
-//    use LogData;
+    use LogData;
 
 	public function transactions()
     {

From 13dcedf74a089fba36fcae3f010ec083107f46e0 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Mon, 19 Dec 2022 11:30:19 +0800
Subject: [PATCH 178/179] fix log data for transactional tables

---
 app/Models/Group.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Models/Group.php b/app/Models/Group.php
index 00a7247b..01dd257e 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -14,7 +14,6 @@ class Group extends Model implements Documentable
 {
     use HasRelationships;
     use \Staudenmeir\EloquentHasManyDeep\HasTableAlias;
-    use LogData;
 
 	public function transactions()
     {

From d32476d17102a98b85d1fc35295f33d69aa30402 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 4 Jan 2023 22:17:14 +0800
Subject: [PATCH 179/179] api and web route logs

---
 .../ValueObjects/Constants/RouteType.php      | 11 ++++
 app/Http/Kernel.php                           |  2 +
 app/Http/Middleware/ApiRouteLogs.php          | 64 +++++++++++++++++++
 app/Http/Middleware/WebRouteLogs.php          | 55 ++++++++++++++++
 app/Models/RouteLog.php                       | 22 +++++++
 ...2_12_27_165842_create_route_logs_table.php | 42 ++++++++++++
 6 files changed, 196 insertions(+)
 create mode 100644 app/Classes/ValueObjects/Constants/RouteType.php
 create mode 100644 app/Http/Middleware/ApiRouteLogs.php
 create mode 100644 app/Http/Middleware/WebRouteLogs.php
 create mode 100644 app/Models/RouteLog.php
 create mode 100644 database/migrations/2022_12_27_165842_create_route_logs_table.php

diff --git a/app/Classes/ValueObjects/Constants/RouteType.php b/app/Classes/ValueObjects/Constants/RouteType.php
new file mode 100644
index 00000000..f2e43f78
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/RouteType.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class RouteType {
+
+    public const WEB = 1;
+
+    public const API = 2;
+
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 172d428b..7fa25aee 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -45,11 +45,13 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\WebRouteLogs::class,
         ],
 
         'api' => [
             'throttle:300,1',
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\ApiRouteLogs::class,
         ],
     ];
 
diff --git a/app/Http/Middleware/ApiRouteLogs.php b/app/Http/Middleware/ApiRouteLogs.php
new file mode 100644
index 00000000..984ff5ea
--- /dev/null
+++ b/app/Http/Middleware/ApiRouteLogs.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use App\Models\RouteLog;
+use App\Classes\ValueObjects\Constants\RouteType;
+use Illuminate\Support\Facades\Auth;
+
+class ApiRouteLogs
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+	 */
+	public function handle(Request $request, Closure $next)
+	{
+		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
+		$url = urldecode($request->fullUrl());
+		$request_method = $request->method();
+		$platform = $request->header('sec-ch-ua-platform');
+		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
+		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
+		$longitude = $geo["geoplugin_longitude"];
+		$latitude = $geo["geoplugin_latitude"];
+		$last_page = url()->previous();
+		$countryName = $geo["geoplugin_countryName"];
+
+		$user_id = Auth::user() ? Auth::user()->id : 0;
+
+		// if ($user_id != 0) {
+		// 	// $ip_address
+		// 	$webRouteLogWithSameIp = RouteLog::where('ip_address', $ip_address)->where('user_id', 0)->get();
+		// 	dd($webRouteLogWithSameIp);
+		// 	foreach($webRouteLogWithSameIp as $result){
+		// 		$result
+		// 	}
+		// }
+
+		$route_log = [
+		    'user_id' => $user_id,
+		    // 'ip_address' => $request->ip(),
+		    'ip_address' => $ip_address,
+		    'url' => $url,
+		    'request_method' => $request_method,
+		    'browser' => $browser,
+		    'platform' => $platform,
+		    'longitude' => $longitude,
+		    'latitude' => $latitude,
+		    'last_page' => $last_page,
+		    'countryname' => $countryName,
+		    'route_type' => RouteType::API,
+		];
+
+		RouteLog::create($route_log);
+
+		return $next($request);
+	}
+}
diff --git a/app/Http/Middleware/WebRouteLogs.php b/app/Http/Middleware/WebRouteLogs.php
new file mode 100644
index 00000000..b5200de6
--- /dev/null
+++ b/app/Http/Middleware/WebRouteLogs.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Str;
+use Illuminate\Http\Request;
+use App\Models\RouteLog;
+use App\Classes\ValueObjects\Constants\RouteType;
+use Illuminate\Support\Facades\Auth;
+
+class WebRouteLogs
+{
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+	 * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+	 */
+	public function handle(Request $request, Closure $next)
+	{
+		$ip_address = getenv('REMOTE_ADDR') == '::1' ? '127.0.0.1' : getenv('REMOTE_ADDR');
+		$url = $request->fullUrl();
+		$request_method = $request->method();
+		$platform = $request->header('sec-ch-ua-platform');
+		$browser = Str::after($request->header('sec-ch-ua'), 'Not?A_Brand";v="8", "Chromium";v="108", "');
+		$geo = unserialize(file_get_contents("http://www.geoplugin.net/php.gp?ip=$ip_address"));
+		$longitude = $geo["geoplugin_longitude"];
+		$latitude = $geo["geoplugin_latitude"];
+		$last_page = url()->previous();
+		$countryName = $geo["geoplugin_countryName"];
+
+		$route_log = [
+		    'user_id' => Auth::user() ? Auth::user()->id : 0,
+		    // 'ip_address' => $request->ip(),
+		    'ip_address' => $ip_address,
+		    'url' => $url,
+		    'request_method' => $request_method,
+		    'browser' => $browser,
+		    'platform' => $platform,
+		    'longitude' => $longitude,
+		    'latitude' => $latitude,
+		    'last_page' => $last_page,
+		    'countryname' => $countryName,
+		    'route_type' => RouteType::WEB,
+		];
+
+		// dd($route_log);
+
+		RouteLog::create($route_log);
+
+		return $next($request);
+	}
+}
diff --git a/app/Models/RouteLog.php b/app/Models/RouteLog.php
new file mode 100644
index 00000000..5d99a604
--- /dev/null
+++ b/app/Models/RouteLog.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class RouteLog extends Model
+{
+   protected $fillable = [
+        'user_id',
+        'ip_address',
+        'url',
+        'request_method',
+        'browser',
+        'platform',
+        'longitude',
+        'latitude',
+        'last_page',
+        'countryname',
+        'route_type'
+   ];
+}
diff --git a/database/migrations/2022_12_27_165842_create_route_logs_table.php b/database/migrations/2022_12_27_165842_create_route_logs_table.php
new file mode 100644
index 00000000..bdab0257
--- /dev/null
+++ b/database/migrations/2022_12_27_165842_create_route_logs_table.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRouteLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('route_logs', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->unsigned();
+            $table->string('ip_address');
+            $table->string('url', 255);
+            $table->string('request_method');
+            $table->string('browser')->nullable();
+            $table->string('platform')->nullable();
+            $table->string('longitude')->nullable();
+            $table->string('latitude')->nullable();
+            $table->string('last_page')->nullable();
+            $table->string('countryname')->nullable();
+            $table->integer('route_type');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('route_logs');
+    }
+}