From 58ae950a719f0b0dab9a4259a0342e345d33b6fa Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Fri, 8 Sep 2023 14:49:39 +0800
Subject: [PATCH 01/66] bulk download invoices

---
 .../BulkDownloadCustomerInvoicesLogic.php     | 55 +++++++++++++++++++
 ...BulkDownloadCustomerInvoicesController.php | 20 +++++++
 .../customer_invoices_bulk_download.blade.php | 35 ++++++++++++
 routes/web.php                                |  6 ++
 4 files changed, 116 insertions(+)
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
 create mode 100644 app/Http/Controllers/Companies/BulkDownloadCustomerInvoicesController.php
 create mode 100644 resources/views/pages/customer_invoices_bulk_download.blade.php

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
new file mode 100644
index 00000000..25821b03
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+
+use App\Classes\ValueObjects\Constants\TransactionType;
+use ZipArchive;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+
+class BulkDownloadCustomerInvoicesLogic
+{
+    /**
+     * @param Request $request
+     * @return void
+     * @throws MalformedRequestException
+     */
+    public function execute(Request $request)
+    {
+        $company = Company::where('reference', $request->input('marking'))->first();
+
+        $startDate = $request->input('startDate');
+        $endDate = $request->input('endDate');
+        if ($company) {
+            $invoicebookings = $company->bookings()->whereDate('created_at', '>=', $startDate)
+                ->whereDate('created_at', '<=', $endDate)
+                ->whereHas('transactions', function ($query) {
+                    $query->where('transactions.type', TransactionType::INVOICE)
+                    ->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })->orderBy('created_at')->get();
+
+   
+            $zip_file = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
+    
+            $zip = new ZipArchive();
+            if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+                foreach($invoicebookings as $booking) {
+                    $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->whereNull('deleted_at')->first()->files()->first();
+                    $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                } 
+    
+                $zip->close();
+                while (ob_get_level()) {
+                    ob_end_clean();
+                }
+
+                return response()->download($zip_file);
+            }
+        }
+    }
+}
diff --git a/app/Http/Controllers/Companies/BulkDownloadCustomerInvoicesController.php b/app/Http/Controllers/Companies/BulkDownloadCustomerInvoicesController.php
new file mode 100644
index 00000000..4d6944d4
--- /dev/null
+++ b/app/Http/Controllers/Companies/BulkDownloadCustomerInvoicesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\BulkDownloadCustomerInvoicesLogic;
+use Illuminate\Http\Request;
+
+class BulkDownloadCustomerInvoicesController
+{
+    /**
+     * @param Request $request
+     * @param BulkDownloadCustomerInvoicesLogic $logic
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function download(Request $request, BulkDownloadCustomerInvoicesLogic $logic) {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/views/pages/customer_invoices_bulk_download.blade.php b/resources/views/pages/customer_invoices_bulk_download.blade.php
new file mode 100644
index 00000000..faae46a5
--- /dev/null
+++ b/resources/views/pages/customer_invoices_bulk_download.blade.php
@@ -0,0 +1,35 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col bg-white p-t-15 p-b-15">
+            <div class="row no-margin">
+                <div class="col-12">
+                    <form method="post" >
+                        @csrf
+                        <div class="row">
+                            <div class="col">
+                                <label for="marking">Marking:</label>
+                                <input class="form-control" type="text" id="marking" name="marking" placeholder="Marking" required>
+                            </div>
+                            <div class="col">
+                                <div class="row">
+                                    <label for="startDate">Start Date:</label>
+                                    <input class="form-control" type="date" id="startDate" name="startDate" placeholder="Start Date" required>
+                                </div>
+                            </div>
+                            <div class="col">
+                                <div class="row">
+                                    <label for="endDate">End Date:</label>
+                                    <input class="form-control" type="date" id="endDate" name="endDate" placeholder="End Date" required>
+                                </div>
+                            </div>
+                            <div class="col-auto row align-items-center">
+                                <button class="btn btn-complete" type="submit" formtarget="_blank">Search</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index a9e51a50..3a541f2d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -141,6 +141,12 @@ Route::get('/purchase_orders', function () {
     return view('pages.purchase_orders');
 })->name('purchase_orders');
 
+Route::get('/customers/invoices', function () {
+    return view('pages.customer_invoices_bulk_download');
+})->name('customers.invoices');
+
+Route::post('/customers/invoices', 'Companies\BulkDownloadCustomerInvoicesController@download')->name('customers.invoices');
+
 Route::get('/support', function () {
     return view('pages.customer_support', [
         'marking' => null,

From be2e00297b1dc379bf0adb105097a0f6f4f0d85f Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Mon, 11 Sep 2023 20:43:21 +0800
Subject: [PATCH 02/66] fix if customer or no invoices found

---
 .../BulkDownloadCustomerInvoicesLogic.php     | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
index 25821b03..1c9caddb 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -34,22 +34,28 @@ class BulkDownloadCustomerInvoicesLogic
                 })->orderBy('created_at')->get();
 
    
-            $zip_file = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
-    
-            $zip = new ZipArchive();
-            if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
-                foreach($invoicebookings as $booking) {
-                    $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->whereNull('deleted_at')->first()->files()->first();
-                    $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-                } 
-    
-                $zip->close();
-                while (ob_get_level()) {
-                    ob_end_clean();
-                }
+            if (count($invoicebookings) > 0) {
+                $zip_file = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
 
-                return response()->download($zip_file);
+                $zip = new ZipArchive();
+                if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+                    foreach($invoicebookings as $booking) {
+                        $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->whereNull('deleted_at')->first()->files()->first();
+                        $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                    } 
+        
+                    $zip->close();
+                    while (ob_get_level()) {
+                        ob_end_clean();
+                    }
+    
+                    return response()->download($zip_file);
+                }
+            } else {
+                return response("No invoices found for this customer in the given date range.");
             }
+        } else {
+            return response("Customer not found");
         }
     }
 }

From 9f2b431f215c04c255b42b9edf546e634bf8607b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 16 Sep 2023 14:38:02 +0800
Subject: [PATCH 03/66] regenerate-invoice-with-first-bill-no

---
 .../RegenerateInvoiceBookingLogic.php         | 48 ++++++++++++++-----
 ...oiceTransactionWithInvoiceNoProcessor.php} |  2 +-
 routes/web.php                                |  4 +-
 3 files changed, 40 insertions(+), 14 deletions(-)
 rename app/Classes/Modules/Transactions/Processors/{CreateInvoiceTransactionProcessorWithInvoiceNo.php => CreateInvoiceTransactionWithInvoiceNoProcessor.php} (99%)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
index 252412a2..6af18568 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
@@ -9,6 +9,7 @@ use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
 use App\Classes\Modules\Documents\Services\DeletesDocument;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
 
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Http\Resources\BookingResource;
@@ -16,6 +17,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use Illuminate\Support\Carbon;
 
 class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
 {
@@ -23,7 +25,8 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
     /**
      * @return array
      */
-    protected function notification():array {
+    protected function notification(): array
+    {
         return [
             'title' => 'Regenerate Booking Invoice',
             'message' => 'You have successfully regenerate booking invoice'
@@ -48,6 +51,9 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
     /** @var CreateInvoiceTransactionProcessor */
     private $createInvoiceTransactionProcessor;
 
+    /** @var CreateInvoiceTransactionWithInvoiceNoProcessor */
+    private $createInvoiceTransactionWithInvoiceNoProcessor;
+
     /**
      * FetchBookingLogic constructor.
      * @param CanFetchBooking $canFetchBooking
@@ -56,6 +62,7 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
      * @param UpdatesBookingStatus $updatesBookingStatus
      * @param DeletesDocument $deletesDocument
      * @param CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
+     * @param CreateInvoiceTransactionWithInvoiceNoProcessor $createInvoiceTransactionWithInvoiceNoProcessor
      */
     public function __construct(
         CanFetchBooking $canFetchBooking,
@@ -63,15 +70,16 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
         DeletesTransaction $deletesTransaction,
         UpdatesBookingStatus $updatesBookingStatus,
         DeletesDocument $deletesDocument,
-        CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor
-    )
-    {
+        CreateInvoiceTransactionProcessor $createInvoiceTransactionProcessor,
+        CreateInvoiceTransactionWithInvoiceNoProcessor $createInvoiceTransactionWithInvoiceNoProcessor
+    ) {
         $this->canFetchBooking = $canFetchBooking;
         $this->fetchesBooking = $fetchesBooking;
         $this->deletesTransaction = $deletesTransaction;
         $this->updatesBookingStatus = $updatesBookingStatus;
         $this->deletesDocument = $deletesDocument;
         $this->createInvoiceTransactionProcessor = $createInvoiceTransactionProcessor;
+        $this->createInvoiceTransactionWithInvoiceNoProcessor = $createInvoiceTransactionWithInvoiceNoProcessor;
     }
 
 
@@ -82,18 +90,37 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
      * @throws \App\Classes\Exceptions\MalformedRequestException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function logic(Request $request) : JsonResponse
+    public function logic(Request $request): JsonResponse
     {
         $this->canFetchBooking->passes();
 
-        $booking = $this->fetchesBooking->execute([
-            'id' => $request->route('id'),
-            'status' => ApprovalStatus::COMPLETED,
-            'with_transactions' => true]
+        $booking = $this->fetchesBooking->execute(
+            [
+                'id' => $request->route('id'),
+                'status' => ApprovalStatus::COMPLETED,
+                'with_transactions' => true
+            ]
         );
 
         $this->updatesBookingStatus->execute($booking, ApprovalStatus::APPROVED);
 
+        $firstInvoice = $booking->transactions()
+            ->whereIn('type', [TransactionType::INVOICE])
+            ->withTrashed()
+            ->orderBy('created_at', 'asc')
+            ->first();
+
+        // get the first bill_no
+        $firstBillNo = $firstInvoice->bill_no;
+        if (strpos($firstBillNo, '-deleted') !== false) {
+            $firstBillNo = substr($firstBillNo, 0, strpos($firstBillNo, '-deleted'));
+        }
+
+        // update currentInvoice bill_no to '-deleted-'
+        $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
+        $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . (string)(Carbon::now()->timestamp);
+        $currentInvoice->save();
+
         $transaction = $booking->transactions()->whereIn('type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->get();
         foreach ($transaction as $key => $row) {
             $this->deletesTransaction->execute($row);
@@ -104,9 +131,8 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
             $this->deletesDocument->execute($row);
         }
 
-        $this->createInvoiceTransactionProcessor->execute($booking);
+        $this->createInvoiceTransactionWithInvoiceNoProcessor->execute($booking, $firstBillNo);
 
         return $this->resourceResponse(new BookingResource($booking));
     }
-
 }
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessorWithInvoiceNo.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php
similarity index 99%
rename from app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessorWithInvoiceNo.php
rename to app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php
index 27dfbe59..612033f8 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessorWithInvoiceNo.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php
@@ -21,7 +21,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Booking;
 use App\Models\SegmentConstant;
 
-class CreateInvoiceTransactionProcessorWithInvoiceNo
+class CreateInvoiceTransactionWithInvoiceNoProcessor
 {
 
     /** @var CreatesTransaction */
diff --git a/routes/web.php b/routes/web.php
index e2357c00..d75c96b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -26,7 +26,7 @@ use Webklex\PDFMerger\Facades\PDFMergerFacade as PDFMerger;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Bookings\Processors\CreatePurchaseOrderFor1688OrderProcessor;
 use App\Classes\Modules\Documents\Services\DeletesDocument;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessorWithInvoiceNo;
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
 use App\Classes\Modules\Transactions\Services\DeletesTransaction;
 use Illuminate\Support\Facades\Log;
 
@@ -541,7 +541,7 @@ Route::get('/invoice/fix', function(){
                         $existing_invoice_bill_no->forceDelete();
                     }
 
-                    (App()->make(CreateInvoiceTransactionProcessorWithInvoiceNo::class))->execute($booking, $bill_no);
+                    (App()->make(CreateInvoiceTransactionWithInvoiceNoProcessor::class))->execute($booking, $bill_no);
                     dump('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $bill_no . '. Old bill_no - ' . $deletedInvoice->bill_no);
                     Log::channel('regenerateInvoice')->info('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $bill_no . '. Old bill_no - ' . $deletedInvoice->bill_no);
                 } else {

From ec83540a4056a0a1303d8632fc69cf6de888d462 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sat, 30 Sep 2023 12:48:49 +0800
Subject: [PATCH 04/66] wallet pagination filters

---
 .../Eloquent/Filters/CreatedAfterOrEqual.php  |  4 +-
 .../Eloquent/Filters/CreatedBeforeOrEqual.php |  4 +-
 .../General/Eloquent/Filters/OwnerId.php      |  3 +-
 .../General/Eloquent/Filters/OwnerType.php    |  3 +-
 .../General/Eloquent/Filters/StatusIn.php     |  3 +-
 .../Filters/WithBookingMarkingLike.php        | 29 +++++++++
 .../elements/CustomerTransactionComponent.vue | 65 ++++++++++++++++++-
 7 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/WithBookingMarkingLike.php

diff --git a/app/Classes/General/Eloquent/Filters/CreatedAfterOrEqual.php b/app/Classes/General/Eloquent/Filters/CreatedAfterOrEqual.php
index 7e563aee..9df98f40 100644
--- a/app/Classes/General/Eloquent/Filters/CreatedAfterOrEqual.php
+++ b/app/Classes/General/Eloquent/Filters/CreatedAfterOrEqual.php
@@ -16,6 +16,8 @@ class CreatedAfterOrEqual implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('created_at', '>=', Carbon::parse($value));
+        $table = $builder->getModel()->getTable();
+        $startDate = Carbon::createFromFormat('d-m-Y', $value)->startOfDay();
+        return $builder->where("{$table}.created_at", '>=', $startDate);
     }
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/CreatedBeforeOrEqual.php b/app/Classes/General/Eloquent/Filters/CreatedBeforeOrEqual.php
index ed97b48f..5b349540 100644
--- a/app/Classes/General/Eloquent/Filters/CreatedBeforeOrEqual.php
+++ b/app/Classes/General/Eloquent/Filters/CreatedBeforeOrEqual.php
@@ -15,6 +15,8 @@ class CreatedBeforeOrEqual implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('created_at', '<=', Carbon::parse($value));
+        $table = $builder->getModel()->getTable();
+        $endDate = Carbon::createFromFormat('d-m-Y', $value)->endOfDay();    
+        return $builder->where("{$table}.created_at", '<=', $endDate);
     }
 }
diff --git a/app/Classes/General/Eloquent/Filters/OwnerId.php b/app/Classes/General/Eloquent/Filters/OwnerId.php
index eac7e32d..c2dfa685 100644
--- a/app/Classes/General/Eloquent/Filters/OwnerId.php
+++ b/app/Classes/General/Eloquent/Filters/OwnerId.php
@@ -14,7 +14,8 @@ class OwnerId implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_id', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_id", $value);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/OwnerType.php b/app/Classes/General/Eloquent/Filters/OwnerType.php
index 6a13fb08..3feedccd 100644
--- a/app/Classes/General/Eloquent/Filters/OwnerType.php
+++ b/app/Classes/General/Eloquent/Filters/OwnerType.php
@@ -14,7 +14,8 @@ class OwnerType implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->where('owner_type', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->where("{$table}.owner_type", $value);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/StatusIn.php b/app/Classes/General/Eloquent/Filters/StatusIn.php
index cbfdfbd0..85425802 100644
--- a/app/Classes/General/Eloquent/Filters/StatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/StatusIn.php
@@ -14,7 +14,8 @@ class StatusIn implements Filter
      */
     public static function apply(Builder $builder, $value)
     {
-        return $builder->whereIn('status', $value);
+        $table = $builder->getModel()->getTable();
+        return $builder->whereIn("{$table}.status", $value);
     }
 
 }
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WithBookingMarkingLike.php b/app/Classes/General/Eloquent/Filters/WithBookingMarkingLike.php
new file mode 100644
index 00000000..ed35cc31
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WithBookingMarkingLike.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
+
+class WithBookingMarkingLike implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->join('transactions as t2', 't2.payment_reference', '=', 'transactions.bill_no')
+            ->join('bookings', function ($join) use ($value) {
+                $join->on('bookings.id', '=', 't2.owner_id')
+                    ->where('bookings.marking', 'LIKE', '%'.$value.'%');
+            })
+            ->addSelect(['transactions.*','t2.owner_id as bookingId', 'bookings.marking as bookingMarking']);
+    }
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
index 1250432b..aeb045ce 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
@@ -1,6 +1,29 @@
 <template>
     <div class="row">
         <div class="col">
+            <div class="row m-b-5">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.reference_no">
+                        <label class="all-caps">Booking Reference</label>
+                        <input type="text" class="form-control" v-model="parameters.reference_no" @keyup.enter="submitSearch">
+                    </validation-wrapper-component>
+                </div>
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.startDate">
+                        <label class="all-caps">Start Date</label>
+                        <date-picker-component v-model.lazy="parameters.startDate"></date-picker-component>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.parameters.endDate">
+                        <label class="all-caps">End Date</label>
+                        <date-picker-component v-model.lazy="parameters.endDate"></date-picker-component>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col col-md-auto d-flex justify-content-center align-items-center">
+                    <button type="button" class="btn btn-lg btn-primary fs-11 w-100" @click="submitSearch()">Search</button>
+                </div>
+            </div>
             <div class="row">
                 <div class="col">
                     <div class="row padding-10">
@@ -11,7 +34,7 @@
                         <div class="col-2 fs-10 text-right">Balance</div>
                     </div>
 
-                    <list-component :key="key" section="topUp" :endpoint="route('api.transaction.wallet.list')" :options="{status_in: [2, 3], owner_type: 'App\\Models\\Wallet', owner_id: wallet_id, per_page: showingTransactionCount}">
+                    <list-component :key="key" section="topUp" :endpoint="route('api.transaction.wallet.list')" :options="options">
                         <template slot="list" slot-scope="{data}">
                             <customer-wallet-transaction-component :data="data" :deciamls="deciamls"></customer-wallet-transaction-component>
                         </template>
@@ -39,12 +62,50 @@ export default {
     data(){
         return {
             key: 1,
+            parameters: {
+                reference_no: null,
+                startDate: null,
+                endDate: null,
+            },
+            options: {
+                status_in: [2, 3], 
+                owner_type: 'App\\Models\\Wallet', 
+                owner_id: this.wallet_id, 
+                per_page: this.showingTransactionCount
+            }
+        }
+    },
+    validations: {
+        parameters: {
+            reference_no: {  },
+            startDate: {  },
+            endDate: {  },
         }
     },
     watch: {
         showingTransactionCount() {
+            this.options.per_page = this.showingTransactionCount;
             this.key ++;
         }
-    }
+    },
+    methods: {
+        submitSearch() {
+            delete this.options.with_booking_marking_like;
+            delete this.options.created_after_or_equal;
+            delete this.options.created_before_or_equal;
+
+            if (this.parameters.reference_no) {
+                this.options.with_booking_marking_like = this.parameters.reference_no
+            }
+            if (this.parameters.startDate) {
+                this.options.created_after_or_equal = this.parameters.startDate
+            }
+            if (this.parameters.endDate) {
+                this.options.created_before_or_equal = this.parameters.endDate
+            }
+            
+            this.key ++;
+        },
+    },
 }
 </script>

From 18cbccbd32cce2df1f5dbdc37b3d3e654ae8e306 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 30 Sep 2023 13:42:19 +0800
Subject: [PATCH 05/66] update customer wallet

---
 .../elements/CustomerTransactionComponent.vue |  6 +--
 .../CustomerTransactionSectionComponent.vue   | 54 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
index aeb045ce..f0a4bac8 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
@@ -2,19 +2,19 @@
     <div class="row">
         <div class="col">
             <div class="row m-b-5">
-                <div class="col">
+                <div class="col p-r-0">
                     <validation-wrapper-component :validator="$v.parameters.reference_no">
                         <label class="all-caps">Booking Reference</label>
                         <input type="text" class="form-control" v-model="parameters.reference_no" @keyup.enter="submitSearch">
                     </validation-wrapper-component>
                 </div>
-                <div class="col">
+                <div class="col p-r-0">
                     <validation-wrapper-component :validator="$v.parameters.startDate">
                         <label class="all-caps">Start Date</label>
                         <date-picker-component v-model.lazy="parameters.startDate"></date-picker-component>
                     </validation-wrapper-component>
                 </div>
-                <div class="col">
+                <div class="col p-r-0">
                     <validation-wrapper-component :validator="$v.parameters.endDate">
                         <label class="all-caps">End Date</label>
                         <date-picker-component v-model.lazy="parameters.endDate"></date-picker-component>
diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
index 698b35be..cc091588 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
@@ -1,36 +1,37 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row">
-                <div class="col-8">
-                    <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
-                        <div class="col no-padding">
-                            <h6>Wallet Transaction History</h6>
-                        </div>
-                    </div>
-                    <div class="row m-t-10 m-b-10">
-                        <div class="col">
-                            <div class="d-flex align-items-center h-100">
-                                <span class="btn btn-md fs-11 bg-primary text-white fs-12 bold m-r-5" :class="[{'bg-primary-darker': showingPreciseAmount}]" @click="showingPreciseAmount=!showingPreciseAmount">{{ showingPreciseAmount ? 'Showing Precise Wallet Transaction' : 'Show Precise Wallet Transaction'}}</span>
-                                <a v-if="company" :href="route('wallet.details-export', company.reference, showingPreciseAmount)" target="_blank" class="btn btn-md btn-primary fs-11"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div v-if="!isLoading">
+                <div class="row">
+                    <div class="col-8">
+                        <div class="row p-b-5 b-b b-grey m-b-10 m-l-0 m-r-0">
+                            <div class="col no-padding">
+                                <h6>Wallet Transaction History</h6>
                             </div>
                         </div>
-                        <div class="col-2">
-                            <validation-wrapper-component selectable :validator="$v.showingTransactionCount">
-                                <label>Showing Rows</label>
-                                <select-component :options="[5, 10, 20, 30, 50]" v-model="showingTransactionCount"></select-component>
-                            </validation-wrapper-component>
+                        <div class="row m-t-10 m-b-10">
+                            <div class="col">
+                                <div class="d-flex align-items-center h-100">
+                                    <span class="btn btn-md fs-11 bg-primary text-white fs-12 m-r-5" :class="[{'bg-primary-darker': showingPreciseAmount}]" @click="showingPreciseAmount=!showingPreciseAmount">{{ showingPreciseAmount ? 'Showing Precise Wallet Transaction' : 'Show Precise Wallet Transaction'}}</span>
+                                    <a v-if="company" :href="route('wallet.details-export', company.reference, showingPreciseAmount)" target="_blank" class="btn btn-md btn-primary fs-11"><i class="fa fa-download m-r-5"></i>{{ showingPreciseAmount ? 'Download Precise Transaction' : 'Download Transaction'}}</a>
+                                </div>
+                            </div>
+                            <div class="col-2">
+                                <validation-wrapper-component selectable :validator="$v.showingTransactionCount">
+                                    <label>Showing Rows</label>
+                                    <select-component :options="[5, 10, 20, 30, 50]" v-model="showingTransactionCount"></select-component>
+                                </validation-wrapper-component>
+                            </div>
+                        </div>
+                        <div v-show="!showingPreciseAmount">
+                            <customer-transaction-component :deciamls="2" :wallet_id="wallet_id" :showingTransactionCount="showingTransactionCount"></customer-transaction-component>
+                        </div>
+                        <div v-show="showingPreciseAmount">
+                            <customer-transaction-component :deciamls="5" :wallet_id="wallet_id" :showingTransactionCount="showingTransactionCount"></customer-transaction-component>
                         </div>
                     </div>
-                    <div v-show="!showingPreciseAmount">
-                        <customer-transaction-component :deciamls="2" :wallet_id="wallet_id" :showingTransactionCount="showingTransactionCount"></customer-transaction-component>
-                    </div>
-                    <div v-show="showingPreciseAmount">
-                        <customer-transaction-component :deciamls="5" :wallet_id="wallet_id" :showingTransactionCount="showingTransactionCount"></customer-transaction-component>
-                    </div>
-                </div>
-                <div class="col-3 m-l-15">
-                    <div v-if="!isLoading">
+                    <div class="col-3 m-l-15">
                         <wallet-component :data="company" :creditable=true></wallet-component>
                         <div class="row m-t-20">
                             <div class="col">
@@ -68,7 +69,6 @@
                             </div>
                         </div>
                     </div>
-                    <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
                 </div>
             </div>
         </div>

From 52e645471651a7c7466c1c67616f6b1f7570e31a Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 30 Sep 2023 15:51:09 +0800
Subject: [PATCH 06/66] deploy module download bulk invoice

---
 .../BulkDownloadCustomerInvoicesLogic.php     |  12 +-
 .../elements/BulkDownloadInvoiceComponent.vue | 103 ++++++++++++++++++
 .../elements/CustomerTransactionComponent.vue |   4 +-
 .../wallets/elements/WalletComponent.vue      |  20 +++-
 .../customer_invoices_bulk_download.blade.php |  33 +-----
 routes/api.php                                |   1 +
 routes/web.php                                |   2 -
 7 files changed, 135 insertions(+), 40 deletions(-)
 create mode 100644 resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
index 1c9caddb..b2bac4fd 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -52,10 +52,16 @@ class BulkDownloadCustomerInvoicesLogic
                     return response()->download($zip_file);
                 }
             } else {
-                return response("No invoices found for this customer in the given date range.");
+                return response()->json([
+                    'status' => 'Failed',
+                    'message' => 'No invoices found for this customer in the given date range.',
+                ]);
             }
         } else {
-            return response("Customer not found");
+            return response()->json([
+                'status' => 'Failed',
+                'message' => 'Customer not found.',
+            ]);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
new file mode 100644
index 00000000..7b6786b3
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
@@ -0,0 +1,103 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row m-b-5" @keyup.enter="submitSearch">
+                <div class="col p-r-0">
+                    <validation-wrapper-component :validator="$v.parameters.marking">
+                        <label class="all-caps">Marking</label>
+                        <!-- <input type="text" class="form-control" v-model="parameters.marking" :class="[{ 'not-allowed': hasMarkingParameter }]" :disabled="hasMarkingParameter"> -->
+                        <input type="text" class="form-control" v-model="parameters.marking" :class="[{ 'not-allowed': hasMarking }]" :disabled="hasMarking">
+                    </validation-wrapper-component>
+                </div>
+                <div class="col p-r-0">
+                    <validation-wrapper-component :validator="$v.parameters.startDate">
+                        <label class="all-caps">Start Date</label>
+                        <date-picker-component v-model.lazy="parameters.startDate"></date-picker-component>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col p-r-0">
+                    <validation-wrapper-component :validator="$v.parameters.endDate">
+                        <label class="all-caps">End Date</label>
+                        <date-picker-component v-model.lazy="parameters.endDate"></date-picker-component>
+                    </validation-wrapper-component>
+                </div>
+                <div class="col col-md-auto d-flex justify-content-center align-items-center">
+                    <button type="button" class="btn btn-lg btn-primary fs-11 w-100"
+                        @click="submitSearch()">Download</button>
+                </div>
+            </div>
+            <loading-component style="height: 100px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row align-items-center justify-content-center bg-white p-t-50 p-b-50 p-l-15 p-r-15 margin-15"
+                v-if="!isLoading && returnData">
+                <div class="col-10">
+                    <div class="row align-items-center justify-content-center  hint-text">
+                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png"
+                                class="w-100 hint-text" /></div>
+                    </div>
+                    <div class="row text-center">
+                        <div class="col">
+                            <div class="row m-t-20">
+                                <div class="col">
+                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">{{ returnData.message
+                                    }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+
+    export default {
+        data() {
+            return {
+                key: 1,
+                returnData: null,
+                isLoading: false,
+                hasMarking: false,
+                parameters: {
+                    marking: null,
+                    startDate: null,
+                    endDate: null,
+                },
+            }
+        },
+        validations: {
+            parameters: {
+                marking: { required },
+                startDate: { required },
+                endDate: { required },
+            }
+        },
+        created() {
+            const urlSearchParams = new URLSearchParams(window.location.search);
+            if (urlSearchParams.has('marking')) {
+                this.parameters.marking = urlSearchParams.get('marking');
+            }
+            this.hasMarkingParameter();
+        },
+        methods: {
+            submitSearch() {
+                this.isLoading = true;
+                this.submit(this.route('api.customers.invoices'), 'post', this.section, false, false);
+            },
+            errorHandler(error) {
+                this.isLoading = false;
+                console.log(error);
+            },
+            successHandler(response) {
+                this.isLoading = false;
+                this.returnData = response;
+            },
+            hasMarkingParameter() {
+                const urlSearchParams = new URLSearchParams(window.location.search);
+                this.hasMarking = urlSearchParams.has('marking');
+            },
+
+        },
+    }
+</script>
diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
index f0a4bac8..b2e6a0c2 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionComponent.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="row">
         <div class="col">
-            <div class="row m-b-5">
+            <div class="row m-b-5" @keyup.enter="submitSearch">
                 <div class="col p-r-0">
                     <validation-wrapper-component :validator="$v.parameters.reference_no">
                         <label class="all-caps">Booking Reference</label>
-                        <input type="text" class="form-control" v-model="parameters.reference_no" @keyup.enter="submitSearch">
+                        <input type="text" class="form-control" v-model="parameters.reference_no">
                     </validation-wrapper-component>
                 </div>
                 <div class="col p-r-0">
diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
index c7789454..aef834f1 100644
--- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
@@ -35,7 +35,7 @@
                             <div class="col-auto">
                                 <div class="btn btn-xs p-l-15 p-r-20 b-rad-none font-heading btn-rounded bg-white" @click="reload = true"><i class="fa fa-plus fs-8 m-r-5"></i> Reload</div>
                             </div>
-                            <div class="col-auto p-l-0" v-if="!mini">
+                            <div class="col-auto p-l-0" v-if="!mini && data.wallet">
                                 <a class="text-white fs-10" :href="route('wallet.details', data.reference)" target="_blank">Transaction History<i class="fa fa-angle-right p-l-5"></i></a>
                             </div>
                         </div>
@@ -52,9 +52,18 @@
                     <wallet-top-up-form-component :data="data" :amount="(!data.wallet ? amount : (Math.round((((amount - data.wallet.amount) < '0.00' ? '0.00' : (amount - data.wallet.amount))  + Number.EPSILON) * 100) / 100).toFixed(2))" :creditable="creditable"></wallet-top-up-form-component>
                 </div>
             </div>
-            <div class="row m-t-20" v-if="$store.getters.isAdmin">
+            <div class="row m-t-10" v-if="$store.getters.isAdmin">
                 <div class="col">
-                    <a :href="route('account.statment', data.reference)">View Account Statement<i class="fa fa-angle-right p-l-5"></i></a>
+                    <div class="row m-t-10" v-if="$store.getters.isSuperAdmin">
+                        <div class="col">
+                            <a :href="route('account.statment', data.reference)">View Account Statement<i class="fa fa-angle-right p-l-5"></i></a>
+                        </div>
+                    </div>
+                    <div class="row m-t-10">
+                        <div class="col">
+                            <a :href="downloadInvoiceUrl()">Download All Invoices<i class="fa fa-angle-right p-l-5"></i></a>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
@@ -79,6 +88,11 @@
                 default: false
             }
         },
+        methods: {
+            downloadInvoiceUrl(){
+                return this.route('customers.invoices') + '?marking=' + this.data.reference;
+            },
+        },
         data(){
             return {
                 reload: false,
diff --git a/resources/views/pages/customer_invoices_bulk_download.blade.php b/resources/views/pages/customer_invoices_bulk_download.blade.php
index faae46a5..6ddc25cf 100644
--- a/resources/views/pages/customer_invoices_bulk_download.blade.php
+++ b/resources/views/pages/customer_invoices_bulk_download.blade.php
@@ -1,35 +1,8 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row">
-        <div class="col bg-white p-t-15 p-b-15">
-            <div class="row no-margin">
-                <div class="col-12">
-                    <form method="post" >
-                        @csrf
-                        <div class="row">
-                            <div class="col">
-                                <label for="marking">Marking:</label>
-                                <input class="form-control" type="text" id="marking" name="marking" placeholder="Marking" required>
-                            </div>
-                            <div class="col">
-                                <div class="row">
-                                    <label for="startDate">Start Date:</label>
-                                    <input class="form-control" type="date" id="startDate" name="startDate" placeholder="Start Date" required>
-                                </div>
-                            </div>
-                            <div class="col">
-                                <div class="row">
-                                    <label for="endDate">End Date:</label>
-                                    <input class="form-control" type="date" id="endDate" name="endDate" placeholder="End Date" required>
-                                </div>
-                            </div>
-                            <div class="col-auto row align-items-center">
-                                <button class="btn btn-complete" type="submit" formtarget="_blank">Search</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
+    <div class="row" v-if="$store.getters.isAdmin">
+        <div class="col">
+            <bulk-download-invoice-component section="BulkDownloadInvoiceComponent"></bulk-download-invoice-component>
         </div>
     </div>
 @endsection
diff --git a/routes/api.php b/routes/api.php
index 08673517..310305d3 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -32,6 +32,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         Route::post('/import/upload-honey-trap', 'Imports\ImportHoneyTrapController@import')->name('honey_trap.upload');
         Route::post('/import/upload-import-invoices', 'Imports\ImportStatementInvoiceController@import')->name('import_invoices.upload');
         Route::post('/import/upload-import-receipt', 'Imports\ImportStatementReceiptsController@import')->name('import_receipts.upload');
+        Route::post('/customers/invoices', 'Companies\BulkDownloadCustomerInvoicesController@download')->name('customers.invoices');
 
         require __DIR__ . '/company.php';
 
diff --git a/routes/web.php b/routes/web.php
index 5d134cc1..612fa976 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -145,8 +145,6 @@ Route::get('/customers/invoices', function () {
     return view('pages.customer_invoices_bulk_download');
 })->name('customers.invoices');
 
-Route::post('/customers/invoices', 'Companies\BulkDownloadCustomerInvoicesController@download')->name('customers.invoices');
-
 Route::get('/support', function () {
     return view('pages.customer_support', [
         'marking' => null,

From 67ea1c7de4aec6229e1eb8d0429e9163ffbf0d2c Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sat, 30 Sep 2023 19:29:36 +0800
Subject: [PATCH 07/66] fixing code in statement module

---
 .../GroupApproveStatementTransactionLogic.php        |  9 ++-------
 app/Classes/ValueObjects/Constants/SystemType.php    | 12 ++++++++++++
 app/Http/Resources/BankStatementDetailResource.php   |  4 ++++
 .../BankStatementTransactionOwnerResource.php        |  2 +-
 .../sections/TransactionsMappingComponent.vue        |  1 +
 .../forms/GeneralConfirmationFormComponent.vue       | 10 +++++++++-
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
index 3b220146..f9eb9c7b 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
@@ -57,13 +57,8 @@ class GroupApproveStatementTransactionLogic extends AbstractControllerLogic
     public function logic(Request $request): JsonResponse
     {
 
-        $filters = [
-            "min_amount" => 0,
-            "is_mapped" => true,
-            "is_mapped_with_multiple" => false,
-            "statement_transaction_owner_type_in" => [1, 2],
-            "statement_transaction_owner_status_in" => [1]
-        ];
+        $filters = $request->except(['per_page','order_by']);
+
         $statementTransactions = $this->listsBankStatementTransactions->execute($filters);
 
         foreach ($statementTransactions as $statementTransaction) {
diff --git a/app/Classes/ValueObjects/Constants/SystemType.php b/app/Classes/ValueObjects/Constants/SystemType.php
index dd948f13..76f6bffa 100644
--- a/app/Classes/ValueObjects/Constants/SystemType.php
+++ b/app/Classes/ValueObjects/Constants/SystemType.php
@@ -8,9 +8,21 @@ final class SystemType {
 
     public const SHIPPING_PORTAL = 'SHIPPING_PORTAL';
 
+    public const CNTR = 'CNTR';
+
+    public const LITE = 'LITE';
+
+    public const PROBASHI = 'PROBASHI';
+    
+    public const PETS = 'PETS';
+
     public const SYSTEM_NAMES = [
         'exchange'               => self::EXCHANGE,
         'shipping_portal'        => self::SHIPPING_PORTAL,
         'izyim'                  => self::SHIPPING_PORTAL,
+        'lite'                   => self::LITE,
+        'cntr'                   => self::CNTR,
+        'probashi'               => self::PROBASHI,
+        'pets'                   => self::PETS
     ];
 }
diff --git a/app/Http/Resources/BankStatementDetailResource.php b/app/Http/Resources/BankStatementDetailResource.php
index 5087b00b..c5bfba28 100644
--- a/app/Http/Resources/BankStatementDetailResource.php
+++ b/app/Http/Resources/BankStatementDetailResource.php
@@ -21,6 +21,10 @@ class BankStatementDetailResource extends JsonResource
             'id' => $this->id,
             'date' => Carbon::parse($transaction->posting_date)->format('Y-m-d'),
             'transaction_description_1' => $transaction->transaction_description,
+            'transaction_description_2' => $transaction->transaction_description_2,
+            'transaction_description_3' => $transaction->transaction_description_3,
+            'transaction_description_4' => $transaction->transaction_description_4,
+            'transaction_description_5' => $transaction->transaction_description_5,
             'pay_for' => $transaction->transaction_description_2,
             'system_references' => $this->system,
             'amount' => $transaction->amount,
diff --git a/app/Http/Resources/BankStatementTransactionOwnerResource.php b/app/Http/Resources/BankStatementTransactionOwnerResource.php
index 468d9ec5..3b67eed4 100644
--- a/app/Http/Resources/BankStatementTransactionOwnerResource.php
+++ b/app/Http/Resources/BankStatementTransactionOwnerResource.php
@@ -28,7 +28,7 @@ class BankStatementTransactionOwnerResource extends JsonResource
                 }
 
                 if($this->type === StatementTransactionOwnerType::WALLET_TOP_UP){
-                    $referenceLink = route('booking.details', $this->owner_reference);
+                    $referenceLink = route('wallet.details', $this->owner_reference);
                 }
             }
         }
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 7bbf87aa..4b676e04 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -68,6 +68,7 @@
                                         class="text-center"
                                         :apiRoute="route('api.accounting.statement_transaction.owner.groupApprove')"
                                         apiMethod="post"
+                                        :params="filter"
                                         :section="section"
                                     >
                                     </general-confirmation-form-component>
diff --git a/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue b/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
index 0b5c92ec..cdb477ee 100644
--- a/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/GeneralConfirmationFormComponent.vue
@@ -15,7 +15,7 @@
                             <div class="btn btn-sm btn-default btn-block bg-master-lighter" data-dismiss="modal">Cancel</div>
                         </div>
                         <div class="col p-l-5">
-                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]" @click="submit(apiRoute, apiMethod, section, true, true)">{{ buttonText }}</div>
+                            <div class="btn btn-sm btn-block b-rad-none" :class="[{'btn-danger': modalType !== 'confirm'}, {'btn-success': modalType === 'confirm'}]" @click="submitForm()">{{ buttonText }}</div>
                         </div>
                     </div>
                 </div>
@@ -32,6 +32,10 @@
                 type: String,
                 required: true
             },
+            params: {
+                type: Array,
+                required: false
+            },
             modalType: {
                 type: String,
                 default: 'confirm'
@@ -50,6 +54,10 @@
             },
         },
         methods: {
+            submitForm() {
+                if (this.params) this.parameters = this.params;
+                return this.submit(this.apiRoute, this.apiMethod, this.section, true, true);
+            }
         },
         mixins: [componentHandler, ModalFormHandler]
 

From 9308975c4ad8ad75e9111a3045efbb3b2296a83b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 30 Sep 2023 20:01:38 +0800
Subject: [PATCH 08/66] update bull number to 7 digits

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

diff --git a/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php b/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php
index 57b68277..6a49c941 100644
--- a/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php
+++ b/app/Classes/Modules/Transactions/Services/GeneratesTransactionBillNumber.php
@@ -35,7 +35,7 @@ class GeneratesTransactionBillNumber
         $attempt = 0;
         while ($attempt < 10) {  // Retry up to 10 times
             // $billNumber = $prefix . $date->format('Y') . $date->format('m') . '-' . intval(microtime(true));
-            $billNumber = $prefix . $date->format('Y') . $date->format('m') . '-' . mt_rand(1000000000, 9999999999);
+            $billNumber = $prefix . $date->format('Y') . $date->format('m') . '-' . mt_rand(1000000, 9999999);
             if (!$this->checksIfTransactionBillNumberExists->execute($billNumber)) {
                 return $billNumber;
             }

From 5f7df8ab3627fb80f262d53d31278618f0239e45 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 30 Sep 2023 20:02:52 +0800
Subject: [PATCH 09/66] update account mapping - reference link

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

diff --git a/app/Http/Resources/BankStatementTransactionOwnerResource.php b/app/Http/Resources/BankStatementTransactionOwnerResource.php
index 468d9ec5..3b67eed4 100644
--- a/app/Http/Resources/BankStatementTransactionOwnerResource.php
+++ b/app/Http/Resources/BankStatementTransactionOwnerResource.php
@@ -28,7 +28,7 @@ class BankStatementTransactionOwnerResource extends JsonResource
                 }
 
                 if($this->type === StatementTransactionOwnerType::WALLET_TOP_UP){
-                    $referenceLink = route('booking.details', $this->owner_reference);
+                    $referenceLink = route('wallet.details', $this->owner_reference);
                 }
             }
         }

From 5445b7f0a6b70963db0d6b49dc869dc55c5cfb23 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Sun, 1 Oct 2023 15:10:38 +0800
Subject: [PATCH 10/66] update

---
 .../BulkDownloadCustomerInvoicesLogic.php     | 10 +++--
 .../elements/BulkDownloadInvoiceComponent.vue |  6 ++-
 .../assets/vue/general/mixins/request.js      | 38 ++++++++++++++-----
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
index b2bac4fd..875f28e2 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -11,6 +11,8 @@ use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Company;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Session;
 
 class BulkDownloadCustomerInvoicesLogic
 {
@@ -23,8 +25,9 @@ class BulkDownloadCustomerInvoicesLogic
     {
         $company = Company::where('reference', $request->input('marking'))->first();
 
-        $startDate = $request->input('startDate');
-        $endDate = $request->input('endDate');
+        $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
+        $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
+
         if ($company) {
             $invoicebookings = $company->bookings()->whereDate('created_at', '>=', $startDate)
                 ->whereDate('created_at', '<=', $endDate)
@@ -33,9 +36,8 @@ class BulkDownloadCustomerInvoicesLogic
                     ->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
                 })->orderBy('created_at')->get();
 
-   
             if (count($invoicebookings) > 0) {
-                $zip_file = "invoices_{$startDate}_to_{$endDate}_{$company->reference}.zip";
+                $zip_file = "invoices_{$request->input('startDate')}_to_{$request->input('endDate')}_{$company->reference}.zip";
 
                 $zip = new ZipArchive();
                 if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
diff --git a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
index 7b6786b3..0ae4b102 100644
--- a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
+++ b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
@@ -91,7 +91,11 @@
             },
             successHandler(response) {
                 this.isLoading = false;
-                this.returnData = response;
+                if (response.message) {
+                    this.returnData = response;
+                } else {
+                    this.returnData = null;
+                }
             },
             hasMarkingParameter() {
                 const urlSearchParams = new URLSearchParams(window.location.search);
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index a3c212e8..4c3e5929 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -13,19 +13,39 @@ export default {
                 let statusCode = response.status,
                     success = response.ok;
 
-                response.json().then(response => {
+                if (response.headers.get("content-type") === "application/zip") {
+                    const fileName = response.headers.get('Content-Disposition').split('filename=')[1];
 
-                    if(!success){
-                        this.openModal();
-                        errorNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'error'}): null;
-                        this.errorHandler(response, statusCode); return;
-                    }
+                    response.blob().then(response => {
+                        if (!success) {
+                            this.openModal();
+                            errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
+                            this.errorHandler(response, statusCode); return;
+                        }
 
-                    successNotification ? this.$store.dispatch('createNotification', {title: response.title, message: response.message, type: 'success'}): null;
-                    this.successHandler(response)
+                        successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
+
+                        const link = document.createElement('a');
+                        link.href = window.URL.createObjectURL(response);
+                        link.download = fileName;
+                        link.click();
+                        this.successHandler(response)
+                    });
+                } else {
+                    response.json().then(response => {
+
+                        if (!success) {
+                            this.openModal();
+                            errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
+                            this.errorHandler(response, statusCode); return;
+                        }
+
+                        successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
+                        this.successHandler(response)
 
 
-                });
+                    });
+                }
             }).catch((error) => {
                 console.log(error);
                 this.$store.dispatch('createNotification', {title: 'Unexpected Error', message: 'An unexpected error has occurred. Try again!', type: 'error'});

From 28feae50c152bcb1365b434182cbf6ff2f136c6a Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Tue, 3 Oct 2023 00:35:35 +0800
Subject: [PATCH 11/66] invoice adjustment

---
 resources/views/pages/pdfs/invoice.blade.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index db6c42c5..9a862fe2 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -80,8 +80,9 @@
         @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
             @php
                 $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+                $displayUnitPrice = round($exactUnitPrice, 2);
                 $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
-                $displayedItemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 2);
+                $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);
                 $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
                 $subtotal = bcadd($subtotal, $itemTotal, 5);
             @endphp
@@ -91,10 +92,10 @@
                 <td class="description">{{ $transaction_detail->product_name }}</td>
                 <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
                 <td width="15%" class="center top">
-                    {{ number_format($exactUnitPrice, 2) }}
+                    {{ $displayUnitPrice }}
                 </td>
                 <td width="20%" class="right top">
-                    {{ number_format($itemTotal, 2) }}
+                    {{ $displayedItemTotal }}
                 </td>
             </tr>
         @endforeach
@@ -106,7 +107,7 @@
         <tr class="subtotal">
             <td colspan="4"></td>
             <td class="right middle">Subtotal</td>
-            <td class="right middle">{{ number_format($subtotal, 2) }}</td>
+            <td class="right middle">{{ number_format($displayedSubtotal, 2) }}</td>
         </tr>
         <tr class="billingcharges">
             <td colspan="4"></td>
@@ -130,9 +131,9 @@
             </tr>
         @endif
         @php
-            $displayedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
+            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
             $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-            $discrepancy = bcsub($displayedTotal, $expectedTotal, 5);
+            $discrepancy = bcsub($expectedTotal, $displayedTotal, 5);
             $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
         @endphp
         <tr>

From 9938615fe4ce4311371e1238967c5b0569c27c68 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 3 Oct 2023 15:20:11 +0800
Subject: [PATCH 12/66] enhance the code in
 ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update
 status to approve and revert back pending

---
 ...plicateBankStatementDetailsStatusLogic.php | 112 ++++++++----------
 app/Models/StatementTransactionOwner.php      |   6 +
 .../StatementTransactionComponent.vue         |  38 +++++-
 .../sections/TransactionsMappingComponent.vue |   2 +-
 routes/accounting.php                         |   2 +-
 5 files changed, 96 insertions(+), 64 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/ApproveDuplicateBankStatementDetailsStatusLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/ApproveDuplicateBankStatementDetailsStatusLogic.php
index e7d1a7c9..3872039b 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/ApproveDuplicateBankStatementDetailsStatusLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/ApproveDuplicateBankStatementDetailsStatusLogic.php
@@ -135,7 +135,7 @@ class ApproveDuplicateBankStatementDetailsStatusLogic extends AbstractController
     public function logic(Request $request): JsonResponse
     {
         // Determine the approval status
-        $status = $this->getApprovalStatus($request);
+        $status = $this->getConstantStatus($request->route('status'));
 
         // Find the statement transaction owner
         $owner = $this->getOwner($request);
@@ -143,21 +143,33 @@ class ApproveDuplicateBankStatementDetailsStatusLogic extends AbstractController
         // Update owner status
         $this->updateOwnerStatus($owner, $status);
 
-        // If the status is 'approved', handle the approval process
-        if ($status === ApprovalStatus::APPROVED) {
-            $this->handleApprovedStatus($owner);
-        }
+        //  handle the siblings process
+        $this->handleSiblingsStatus($owner, $this->getSiblingsStatus($status));
 
         // Check and approve remaining matches if any
-        $this->checkAndApproveRemainingMatches($owner);
+        $this->checkAndApproveRemainingMatches($owner, $status);
 
         // Return an empty response
         return $this->response([]);
     }
 
-    private function getApprovalStatus(Request $request): int
+    private function getConstantStatus(String $statusName=null): int
     {
-        return $request->route('status') == 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED;
+        switch ($statusName) {
+            case 'approve':
+                return ApprovalStatus::APPROVED;
+
+            case 'pending_verification':
+                return ApprovalStatus::PENDING_VERIFICATION;
+            
+            default:
+                return ApprovalStatus::REJECTED;
+        }
+    }
+
+    private function getSiblingsStatus(int $status): int
+    {
+        return $status == ApprovalStatus::APPROVED ? ApprovalStatus::REJECTED : ApprovalStatus::PENDING_VERIFICATION;
     }
 
     private function getOwner(Request $request): StatementTransactionOwner
@@ -170,23 +182,24 @@ class ApproveDuplicateBankStatementDetailsStatusLogic extends AbstractController
         $this->updatesBankStatementTransactionOwnerStatus->execute($owner, $status);
     }
 
-    private function handleApprovedStatus(StatementTransactionOwner $owner): void
+    private function handleSiblingsStatus(StatementTransactionOwner $owner, int $siblingStatus): void
     {
-        // Reject all other owners with the same system, owner type, and owner ID
-        $this->rejectOtherOwners($owner);
+        // update all other owners with the same system, owner type, and owner ID
+        $this->updateOtherOwners($owner, $siblingStatus);
 
         // Find all siblings and process them
         $siblings = $this->getSiblings($owner);
-        $this->processSiblings($siblings);
+
+        foreach ($siblings as $sibling) {
+            $this->processSibling($sibling, $siblingStatus);
+        }
     }
 
-    private function rejectOtherOwners(StatementTransactionOwner $owner): void
+    private function updateOtherOwners(StatementTransactionOwner $owner, int $status): void
     {
-        StatementTransactionOwner::where('system', $owner->system)
-            ->where('owner_type', $owner->owner_type)
-            ->where('owner_id', $owner->owner_id)
+        StatementTransactionOwner::getSiblingsOwner()
             ->where('id', '!=', $owner->id)
-            ->update(['status' => ApprovalStatus::REJECTED]);
+            ->update(['status' => $status]);
     }
 
     private function getSiblings(StatementTransactionOwner $owner): Collection
@@ -196,86 +209,65 @@ class ApproveDuplicateBankStatementDetailsStatusLogic extends AbstractController
             ->get();
     }
 
-    private function processSiblings(Collection $siblings): void
-    {
-        foreach ($siblings as $sibling) {
-            $this->processSibling($sibling);
-        }
-    }
-
-    private function processSibling(StatementTransactionOwner $sibling): void
+    private function processSibling(StatementTransactionOwner $sibling, int $siblingStatus): void
     {
         // Reject the sibling and save the changes
-        $sibling->status = ApprovalStatus::REJECTED;
+        $sibling->status = $siblingStatus;
         $sibling->save();
-
+        
         // Find all twins and process them
         $twins = $this->getTwins($sibling);
-        $this->processTwins($twins);
-    }
 
-    private function getTwins(StatementTransactionOwner $sibling): Collection
-    {
-        return StatementTransactionOwner::where('system', $sibling->system)
-            ->where('owner_type', $sibling->owner_type)
-            ->where('owner_id', $sibling->owner_id)
-            ->where('id', '!=', $sibling->id)
-            ->get();
-    }
-
-    private function processTwins(Collection $twins): void
-    {
         foreach ($twins as $twin) {
             $this->processTwin($twin);
         }
     }
 
+    private function getTwins(StatementTransactionOwner $sibling): Collection
+    {
+        return StatementTransactionOwner::getSiblingsOwner()
+            ->where('id', '!=', $sibling->id)
+            ->get();
+    }
+
     private function processTwin(StatementTransactionOwner $twin): void
     {
         // Find all owners with the same statement transaction ID as the twin
-        $owners = $this->getOwners($twin);
+        $owners = $this->getSiblings($twin);
 
         // If there is only one owner (the twin itself), approve it
         if ($owners->count() === 1) {
-            $this->updateOwnerStatus($twin, ApprovalStatus::APPROVED);
+            $this->updateOwnerStatus($twin, $this->getConstantStatus(request()->route('status')));
         }
     }
 
-    private function getOwners(StatementTransactionOwner $transactionOwner): Collection
-    {
-        return StatementTransactionOwner::where('statement_transaction_id', $transactionOwner->statement_transaction_id)
-            ->where('id', '!=', $transactionOwner->id)
-            ->get();
-    }
-
-    private function checkAndApproveRemainingMatches(StatementTransactionOwner $owner): void
+    private function checkAndApproveRemainingMatches(StatementTransactionOwner $owner, int $status): void
     {
         // Find all remaining matching owners for the related transaction
-        $remainingMatches = $this->getRemainingMatches($owner);
+        $checkStatus = ($status == ApprovalStatus::APPROVED ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::APPROVED);
+        $remainingMatches = $this->getRemainingMatches($owner, $checkStatus);
 
         // Process each remaining match
         foreach ($remainingMatches as $match) {
-            $this->processRemainingMatch($match);
+            $this->processRemainingMatch($match, $status);
         }
     }
 
-    private function getRemainingMatches(StatementTransactionOwner $owner): Collection
+    private function getRemainingMatches(StatementTransactionOwner $owner, int $checkStatus): Collection
     {
-        return StatementTransactionOwner::where('system', $owner->system)
-            ->where('owner_type', $owner->owner_type)
-            ->where('owner_id', $owner->owner_id)
-            ->where('status', ApprovalStatus::PENDING_VERIFICATION)
+        return StatementTransactionOwner::getSiblingsOwner()
+            ->where('status', $checkStatus)
             ->get();
     }
 
-    private function processRemainingMatch(StatementTransactionOwner $match): void
+    private function processRemainingMatch(StatementTransactionOwner $match, int $status): void
     {
         // Find all owners with the same statement transaction ID as the match
-        $owners = $this->getOwners($match);
+        $owners = $this->getSiblings($match);
 
         // If there is only one owner (the match itself), approve it
         if ($owners->count() === 1) {
-            $this->updateOwnerStatus($match, ApprovalStatus::APPROVED);
+            $this->updateOwnerStatus($match, $status);
         }
 
     }
diff --git a/app/Models/StatementTransactionOwner.php b/app/Models/StatementTransactionOwner.php
index 52e8d1fc..5bfe6f82 100644
--- a/app/Models/StatementTransactionOwner.php
+++ b/app/Models/StatementTransactionOwner.php
@@ -26,4 +26,10 @@ class StatementTransactionOwner extends Model
     {
         return $this->belongsTo(StatementTransaction::class, 'statement_transaction_id', 'id');
     }
+
+    public function scopeGetSiblingsOwner($query) {
+        $query->where('system', $this->system)
+        ->where('owner_type', $this->owner_type)
+        ->where('owner_id', $this->owner_id);
+    }
 }
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index db2fc252..d36c149f 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -11,6 +11,36 @@
                         <div class="col"><a :href="item.owners.pending_verification[0].reference_link" target="_blank">{{item.owners.pending_verification[0].reference}}</a></div>
                     </div>
                 </div>
+                
+                <!-- Pending Export tab -->
+                <div class="col-5" v-if="item.owners.approved.length === 1">
+                    <div class="row">
+                        <div class="col">{{item.owners.approved[0].system}}</div>
+                        <div class="col">{{ typeString(item.owners.approved[0].type) }}</div>
+                        <div class="col">
+                            <div class="col d-flex justify-content-between">
+                                <a :href="item.owners.approved[0].reference_link" target="_blank">{{item.owners.approved[0].reference}}</a>
+                                <div v-if="stage === 4">
+                                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
+                                        <i class="fa fa-times fa-fw"></i>
+                                    </button>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="approveCorrectMappingTransaction">
+                                        <general-confirmation-form-component
+                                            :contentText="returnTextRevert(item.owners.approved[0].reference)"
+                                            modalType="confirm"
+                                            class="text-center"
+                                            :apiRoute="route('api.accounting.bankStatement.details.status.update', item.owners.approved[0].id, 'pending_verification')"
+                                            apiMethod="post"
+                                            :section="section"
+                                        >
+                                        </general-confirmation-form-component>
+                                    </modal-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
                 <div class="col-5" v-if="item.owners.pending_verification.length > 1">
                     <div class="row">
                         <div class="col">
@@ -52,7 +82,8 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-5" v-if="!item.owners.pending_verification.length">
+
+                <div class="col-5" v-if="!item.owners.pending_verification.length && !item.owners.approved.length">
                     <div class="row">
                         <div class="col">
                             <button class="btn btn-xs btn-outline-success b-rad-none m-r-5 requestModal" data-type="updateOwner">
@@ -81,7 +112,7 @@
 
                 </div>
                 <div class="col-1">{{ item.amount }}</div>
-                <div class="col-1 text-success" v-if="item.owners.approved.length">{{ [6, 7, 8, 9, 10, 11, 12, 13, 14].include(item.owners.approved[0].type) ? 'Miscellaneous' : 'Approved'  }}</div>
+                <div class="col-1 text-success" v-if="item.owners.approved.length">{{ [6, 7, 8, 9, 10, 11, 12, 13, 14].includes(item.owners.approved[0].type) ? 'Miscellaneous' : 'Approved'  }}</div>
                 <div class="col-1 text-danger" v-if="!item.owners.approved.length">Pending...</div>
                 <div class="col-1" v-if="stage === 1">
                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteMappingTransaction">
@@ -154,6 +185,9 @@
             },
             returnTextWithVariable(variable) {
                 return "Are you sure you want to choose this mapping " + variable + "?";
+            },
+            returnTextRevert(variable) {
+                return "Are you sure you want to revert this mapping " + variable + "?";
             }
         },
         mixins: [componentHandler]
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 7bbf87aa..ff6fe7e7 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -55,7 +55,7 @@
                 <div class="col"></div>
                 <div class="col-auto pointer bold text-danger" @click="step=0">X</div>
             </div>
-            <div class="row parentContainer" v-if="step > 0 && stage !== 4">
+            <div class="row parentContainer" v-if="step > 0">
                 <div class="col">
                     <div class="row">
                         <div class="col">
diff --git a/routes/accounting.php b/routes/accounting.php
index c7112947..4fe0a1ad 100644
--- a/routes/accounting.php
+++ b/routes/accounting.php
@@ -10,7 +10,7 @@ Route::group(['prefix' => 'accounting', 'as' => 'accounting.', 'namespace' => 'A
         Route::put('/details/update', 'BankStatementController@update')->name('details.update');
     });
 
-    Route::post('bankStatement/{id}/details/{status}', 'ApproveDuplicateBankStatementDetailsStatusController@update')->where('status', 'approve|reject')->name('bankStatement.details.status.update');
+    Route::post('bankStatement/{id}/details/{status}', 'ApproveDuplicateBankStatementDetailsStatusController@update')->where('status', 'approve|reject|pending_verification')->name('bankStatement.details.status.update');
 
     Route::group(['prefix' => 'statement_transaction', 'as' => 'statement_transaction.'], function () {
         Route::post('/owner/group-approve', 'GroupApproveStatementTransactionController@approve')->name('owner.groupApprove');

From a0f600037b86781744632de6c664458bc237694b Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Tue, 3 Oct 2023 22:35:37 +0800
Subject: [PATCH 13/66] import purchase order function

---
 .../ImportPurchaseOrderTransactionLogic.php   | 111 ++++++++++++++++++
 ...portPurchaseOrderTransactionController.php |  21 ++++
 .../forms/PurchaseOrderFormComponent.vue      |  42 ++++++-
 routes/transaction.php                        |   1 +
 4 files changed, 174 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
 create mode 100644 app/Http/Controllers/Transactions/ImportPurchaseOrderTransactionController.php

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
new file mode 100644
index 00000000..3617bcfe
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
@@ -0,0 +1,111 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\TransactionResource;
+use App\Models\Booking;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+use Maatwebsite\Excel\Facades\Excel;
+
+class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Purchase Order',
+            'message' => 'You have successfully updated you booking\'s purchase order'
+        ];
+    }
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatePurchaseOrderTransactionProcessor */
+    private $createPurchaseOrderTransactionProcessor;
+
+    /**
+     * CreatePurchaseOrderTransactionLogic constructor.
+     * @param FetchesBooking $fetchesBooking
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
+     */
+    public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor)
+    {
+        $this->fetchesBooking = $fetchesBooking;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @param string $id
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request, $id = '') : JsonResponse
+    {
+        $files = $request->file('files');
+
+        $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
+        foreach ($object->getFiles() as $file){
+            $collection = Excel::toCollection(null, json_decode($file)->file_info->original->file, null, null, true);
+
+            $sheet = $collection->first()->skip(1);
+
+            $products = $sheet->map(function ($row) {
+                Log::info($row);
+                $stockCode = $row[0];
+                $description = $row[1];
+                $quantity = $row[2];
+                $unit_price = $row[3];
+
+                return [
+                    'stockCode' => $stockCode,
+                    'description' => $description,
+                    'quantity' => $quantity,
+                    'unit_price' => $unit_price
+                ];
+            })->all();
+        }
+
+        // dd($products);
+
+        /** @var Booking $booking */
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
+
+        $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);
+
+
+        $transaction = $this->createPurchaseOrderTransactionProcessor->execute($booking, $object);
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+
+    }
+}
diff --git a/app/Http/Controllers/Transactions/ImportPurchaseOrderTransactionController.php b/app/Http/Controllers/Transactions/ImportPurchaseOrderTransactionController.php
new file mode 100644
index 00000000..78caf5a4
--- /dev/null
+++ b/app/Http/Controllers/Transactions/ImportPurchaseOrderTransactionController.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use App\Classes\Modules\Transactions\ControllersLogic\ImportPurchaseOrderTransactionLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class ImportPurchaseOrderTransactionController
+{
+    /**
+     * @param Request $request
+     * @param ImportPurchaseOrderTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function import(Request $request, ImportPurchaseOrderTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 7b7ec3d4..1ea2ecf8 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -81,6 +81,24 @@
                                             <button id="add-product" name="add-product" class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
                                         </div>
                                     </div>
+                                    <div class="row">
+                                        <div class="col p-b-15 pb-md-0">
+                                            <file-input-component :validator="$v.files" v-model="files">
+                                                <template slot="label">
+                                                    <div class="font-heading fs-11 text-primary all-caps">Import Product CSV</div>
+                                                </template>
+                                            </file-input-component>
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="uploadProducts">Upload</button>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -175,6 +193,8 @@
 </template>
 <script>
     import formHandler from '../../../general/mixins/formHandler';
+    import { required, requiredIf } from "vuelidate/lib/validators";
+
     export default {
         data(){
             return {
@@ -187,6 +207,13 @@
                     unit_price: 0,
                 },
                 products: [],
+                files: [],
+                uploadFiles: false,
+            }
+        },
+        validations: {
+            files: {
+                required: requiredIf(function () { return this.uploadFiles })
             }
         },
         created() {
@@ -203,6 +230,11 @@
                 }, 0);
             }
         },
+        watch: {
+            'data': function () {
+                this.products = this.data.purchase_order.details
+            }
+        },
         methods: {
             updateQuantity(type){
                 if(!this.interval){
@@ -225,13 +257,21 @@
 
             },
             submitForm(){
-
+                this.uploadFiles = false;
                 this.parameters = {
                     products: this.products
                 };
 
                 this.submit(route('api.transaction.po.create', this.data.id), 'post', this.section, true, true);
             },
+            uploadProducts() {
+                this.uploadFiles = true
+                this.parameters = {
+                    files: this.files
+                };
+
+                this.submit(route('api.transaction.po.import', this.data.id), 'post', this.section, true, true);
+            },
             successHandler(){
                 if((Math.round((this.poTotal  + Number.EPSILON) * 1000) / 1000).toFixed(3) === (Math.round((this.data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3)){
                     this.submitted = true;
diff --git a/routes/transaction.php b/routes/transaction.php
index 708c2439..e714d6b7 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -16,6 +16,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     route::delete('{id}/bill/delete', 'DeletePaymentProofDocumentController@delete')->name('bill.delete');
 
     Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
+    Route::post('booking/{id}/details/import', 'ImportPurchaseOrderTransactionController@import')->name('po.import');
 
     Route::get('bulk/po/{issuer_id}/{start_date}/{end_date}', 'CreateBulkPurchaseOrderTransactionController@create')->name('po.bulk.create');
     

From 276a95f920d2c4445a78e7096d6740ba8cb46baf Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Wed, 4 Oct 2023 12:56:28 +0800
Subject: [PATCH 14/66] reuse table blade

---
 .../views/pages/pdfs/deliver_order.blade.php  | 103 +-----------------
 resources/views/pages/pdfs/invoice.blade.php  |  92 +---------------
 .../views/pages/pdfs/purchase_order.blade.php | 103 +-----------------
 .../pages/pdfs/purchase_order_table.blade.php |  92 ++++++++++++++++
 4 files changed, 95 insertions(+), 295 deletions(-)
 create mode 100644 resources/views/pages/pdfs/purchase_order_table.blade.php

diff --git a/resources/views/pages/pdfs/deliver_order.blade.php b/resources/views/pages/pdfs/deliver_order.blade.php
index e957c0f0..d16a68f5 100644
--- a/resources/views/pages/pdfs/deliver_order.blade.php
+++ b/resources/views/pages/pdfs/deliver_order.blade.php
@@ -69,109 +69,8 @@
 
     <br>
     <br>
-    <table class="line-table" style="overflow: wrap" autosize="1">
-        <!-- Table Header -->
-        <thead>
-        <tr>
-            <th width="5%">No</th>
-            <th class="stock-code" width="10%">Stock Code</th>
-            <th class="description">Description</th>
-            <th width="10%">Quantity</th>
-            <th width="15%">Unit Price (RM)</th>
-            <th width="10%">Total Amount<br>(RM)</th>
-        </tr>
-        </thead>
-        <tbody>
-        @php
-            $subtotal = "0";
-            $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 5) : "0";
-            $displayedSubtotal = "0";
-            $exactTotal = "0";
-        @endphp
+    @include('pages.pdfs.purchase_order_table')
 
-        @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
-            @php
-                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 5);
-                $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
-
-                // Round half to even for displayed item total
-                $displayedItemTotal = round(bcmul($exactUnitPrice, $transaction_detail->quantity, 2), 2, PHP_ROUND_HALF_EVEN);
-
-                $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-                $exactTotal = bcadd($exactTotal, $displayedItemTotal, 5);
-            @endphp
-            <tr>
-                <td width="5%" class="center top">{{ $key + 1 }}</td>
-                <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
-                <td class="description">{{ $transaction_detail->product_name }}</td>
-                <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                <td width="15%" class="center top">
-                    {{ number_format($exactUnitPrice, 2) }}
-                </td>
-                <td width="20%" class="right top">
-                    {{ number_format($itemTotal, 2) }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-        <tfoot>
-        @php
-            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5);
-        @endphp
-        <tr class="subtotal">
-            <td colspan="4"></td>
-            <td class="right middle">Subtotal</td>
-            <td class="right middle">{{ number_format($subtotal, 2) }}</td>
-        </tr>
-        <tr class="billingcharges">
-            <td colspan="4"></td>
-            <td class="right">Service Charges</td>
-            <td class="right">{{ number_format($transaction->service_charge, 2) }}</td>
-        </tr>
-
-        @if($voucher_redemption)
-            <tr class="voucher">
-                <td colspan="4"></td>
-                <td class="right middle">Voucher ({{ $voucher_redemption->voucher->code }})</td>
-                <td class="right middle">-{{ number_format($voucherDiscount, 2) }}</td>
-            </tr>
-        @endif
-
-        @if($transaction->tax > 0)
-            <tr class="billingcharges">
-                <td colspan="4"></td>
-                <td class="right">Tax</td>
-                <td class="right">{{ number_format($transaction->tax, 2) }}</td>
-            </tr>
-        @endif
-        @php
-            // Calculate the totals with 5 decimal places
-            $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-
-            // Calculate the displayed totals with 2 decimal places
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
-
-            // Calculate the discrepancy
-            $discrepancy = bcsub($expectedTotal, $displayedTotal, 5);
-
-            // Calculate the final total
-            $total = bcadd($expectedTotal, $discrepancy, 5);
-        @endphp
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Adjustment</td>
-            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
-        </tr>
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Total</td>
-            <td class="total right middle">
-                {{ number_format($total, 2) }}
-            </td>
-        </tr>
-        </tfoot>
-    </table>
     <htmlpagefooter name="page-footer">
         <table width="100%">
             <tr>
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 9a862fe2..810df954 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -58,98 +58,8 @@
     <br>
 
     <!-- Invoice Table -->
-    <table class="line-table" style="overflow: wrap" autosize="1">
-        <!-- Table Header -->
-        <thead>
-        <tr>
-            <th width="5%">No</th>
-            <th class="stock-code" width="10%">Stock Code</th>
-            <th class="description">Description</th>
-            <th width="10%">Quantity</th>
-            <th width="15%">Unit Price (RM)</th>
-            <th width="10%">Total Amount<br>(RM)</th>
-        </tr>
-        </thead>
-        <tbody>
-        @php
-            $subtotal = "0";
-            $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
-            $displayedSubtotal = 0;
-        @endphp
+    @include('pages.pdfs.purchase_order_table')
 
-        @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
-            @php
-                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
-                $displayUnitPrice = round($exactUnitPrice, 2);
-                $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
-                $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);
-                $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-            @endphp
-            <tr>
-                <td width="5%" class="center top">{{ $key + 1 }}</td>
-                <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
-                <td class="description">{{ $transaction_detail->product_name }}</td>
-                <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                <td width="15%" class="center top">
-                    {{ $displayUnitPrice }}
-                </td>
-                <td width="20%" class="right top">
-                    {{ $displayedItemTotal }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-        <tfoot>
-        @php
-            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5);
-        @endphp
-        <tr class="subtotal">
-            <td colspan="4"></td>
-            <td class="right middle">Subtotal</td>
-            <td class="right middle">{{ number_format($displayedSubtotal, 2) }}</td>
-        </tr>
-        <tr class="billingcharges">
-            <td colspan="4"></td>
-            <td class="right">Service Charges</td>
-            <td class="right">{{ number_format($transaction->service_charge, 2) }}</td>
-        </tr>
-
-        @if($voucher_redemption)
-            <tr class="voucher">
-                <td colspan="4"></td>
-                <td class="right middle">Voucher ({{ $voucher_redemption->voucher->code }})</td>
-                <td class="right middle">-{{ number_format($voucherDiscount, 2) }}</td>
-            </tr>
-        @endif
-
-        @if($transaction->tax > 0)
-            <tr class="billingcharges">
-                <td colspan="4"></td>
-                <td class="right">Tax</td>
-                <td class="right">{{ number_format($transaction->tax, 2) }}</td>
-            </tr>
-        @endif
-        @php
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-            $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-            $discrepancy = bcsub($expectedTotal, $displayedTotal, 5);
-            $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-        @endphp
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Adjustment</td>
-            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
-        </tr>
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Total</td>
-            <td class="total right middle">
-                {{ number_format($total, 2) }}
-            </td>
-        </tr>
-        </tfoot>
-    </table>
     <br>
     <div class="note">
         <strong>Note:</strong> All items purchased are subject to our Terms & Conditions. Please refer to our official website for more information.
diff --git a/resources/views/pages/pdfs/purchase_order.blade.php b/resources/views/pages/pdfs/purchase_order.blade.php
index 3e79691a..1f6d72d9 100644
--- a/resources/views/pages/pdfs/purchase_order.blade.php
+++ b/resources/views/pages/pdfs/purchase_order.blade.php
@@ -76,109 +76,8 @@
 
     <br>
 
-    <table class="line-table" style="overflow: wrap" autosize="1">
-        <!-- Table Header -->
-        <thead>
-        <tr>
-            <th width="5%">No</th>
-            <th class="stock-code" width="10%">Stock Code</th>
-            <th class="description">Description</th>
-            <th width="10%">Quantity</th>
-            <th width="15%">Unit Price (RM)</th>
-            <th width="10%">Total Amount<br>(RM)</th>
-        </tr>
-        </thead>
-        <tbody>
-        @php
-            $subtotal = "0";
-            $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 5) : "0";
-            $displayedSubtotal = "0";
-            $exactTotal = "0";
-        @endphp
+    @include('pages.pdfs.purchase_order_table')
 
-        @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
-            @php
-                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 5);
-                $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
-
-                // Round half to even for displayed item total
-                $displayedItemTotal = round(bcmul($exactUnitPrice, $transaction_detail->quantity, 2), 2, PHP_ROUND_HALF_EVEN);
-
-                $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-                $exactTotal = bcadd($exactTotal, $displayedItemTotal, 5);
-            @endphp
-            <tr>
-                <td width="5%" class="center top">{{ $key + 1 }}</td>
-                <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
-                <td class="description">{{ $transaction_detail->product_name }}</td>
-                <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
-                <td width="15%" class="center top">
-                    {{ number_format($exactUnitPrice, 2) }}
-                </td>
-                <td width="20%" class="right top">
-                    {{ number_format($itemTotal, 2) }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-        <tfoot>
-        @php
-            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5);
-        @endphp
-        <tr class="subtotal">
-            <td colspan="4"></td>
-            <td class="right middle">Subtotal</td>
-            <td class="right middle">{{ number_format($subtotal, 2) }}</td>
-        </tr>
-        <tr class="billingcharges">
-            <td colspan="4"></td>
-            <td class="right">Service Charges</td>
-            <td class="right">{{ number_format($transaction->service_charge, 2) }}</td>
-        </tr>
-
-        @if($voucher_redemption)
-            <tr class="voucher">
-                <td colspan="4"></td>
-                <td class="right middle">Voucher ({{ $voucher_redemption->voucher->code }})</td>
-                <td class="right middle">-{{ number_format($voucherDiscount, 2) }}</td>
-            </tr>
-        @endif
-
-        @if($transaction->tax > 0)
-            <tr class="billingcharges">
-                <td colspan="4"></td>
-                <td class="right">Tax</td>
-                <td class="right">{{ number_format($transaction->tax, 2) }}</td>
-            </tr>
-        @endif
-        @php
-            // Calculate the totals with 5 decimal places
-            $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-
-            // Calculate the displayed totals with 2 decimal places
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
-
-            // Calculate the discrepancy
-            $discrepancy = bcsub($expectedTotal, $displayedTotal, 5);
-
-            // Calculate the final total
-            $total = bcadd($expectedTotal, $discrepancy, 5);
-        @endphp
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Adjustment</td>
-            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
-        </tr>
-        <tr>
-            <td colspan="4"></td>
-            <td class="right middle">Total</td>
-            <td class="total right middle">
-                {{ number_format($total, 2) }}
-            </td>
-        </tr>
-        </tfoot>
-    </table>
     <htmlpagefooter name="page-footer">
         <table width="100%">
             <tr>
diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
new file mode 100644
index 00000000..20fac9b8
--- /dev/null
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -0,0 +1,92 @@
+<table class="line-table" style="overflow: wrap" autosize="1">
+    <!-- Table Header -->
+    <thead>
+    <tr>
+        <th width="5%">No</th>
+        <th class="stock-code" width="10%">Stock Code</th>
+        <th class="description">Description</th>
+        <th width="10%">Quantity</th>
+        <th width="15%">Unit Price (RM)</th>
+        <th width="10%">Total Amount<br>(RM)</th>
+    </tr>
+    </thead>
+    <tbody>
+    @php
+        $subtotal = "0";
+        $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
+        $displayedSubtotal = 0;
+    @endphp
+
+    @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
+        @php
+            $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+            $displayUnitPrice = round($exactUnitPrice, 2);
+            $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
+            $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);
+            $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
+            $subtotal = bcadd($subtotal, $itemTotal, 5);
+        @endphp
+        <tr>
+            <td width="5%" class="center top">{{ $key + 1 }}</td>
+            <td class="stock-code top" width="10%">{{ $transaction_detail->product_code }}</td>
+            <td class="description">{{ $transaction_detail->product_name }}</td>
+            <td width="10%" class="center top">{{ $transaction_detail->quantity }}</td>
+            <td width="15%" class="center top">
+                {{ number_format($displayUnitPrice, 2) }}
+            </td>
+            <td width="20%" class="right top">
+                {{ number_format($displayedItemTotal, 2) }}
+            </td>
+        </tr>
+    @endforeach
+    </tbody>
+    <tfoot>
+    @php
+        $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5);
+    @endphp
+    <tr class="subtotal">
+        <td colspan="4"></td>
+        <td class="right middle">Subtotal</td>
+        <td class="right middle">{{ number_format($displayedSubtotal, 2) }}</td>
+    </tr>
+    <tr class="billingcharges">
+        <td colspan="4"></td>
+        <td class="right">Service Charges</td>
+        <td class="right">{{ number_format($transaction->service_charge, 2) }}</td>
+    </tr>
+
+    @if($voucher_redemption)
+        <tr class="voucher">
+            <td colspan="4"></td>
+            <td class="right middle">Voucher ({{ $voucher_redemption->voucher->code }})</td>
+            <td class="right middle">-{{ number_format($voucherDiscount, 2) }}</td>
+        </tr>
+    @endif
+
+    @if($transaction->tax > 0)
+        <tr class="billingcharges">
+            <td colspan="4"></td>
+            <td class="right">Tax</td>
+            <td class="right">{{ number_format($transaction->tax, 2) }}</td>
+        </tr>
+    @endif
+    @php
+        $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
+        $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
+        $discrepancy = bcsub($expectedTotal, $displayedTotal, 5);
+        $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
+    @endphp
+    <tr>
+        <td colspan="4"></td>
+        <td class="right middle">Adjustment</td>
+        <td class="right middle">{{number_format($discrepancy, 5)}}</td>
+    </tr>
+    <tr>
+        <td colspan="4"></td>
+        <td class="right middle">Total</td>
+        <td class="total right middle">
+            {{ number_format($total, 2) }}
+        </td>
+    </tr>
+    </tfoot>
+</table>
\ No newline at end of file

From 49d41102412e2495a731718e9890ccdf750184e0 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 4 Oct 2023 23:21:00 +0800
Subject: [PATCH 15/66] fix remove correct po item

---
 app/Http/Resources/TransactionDetailResource.php                | 1 +
 .../components/bookings/forms/PurchaseOrderFormComponent.vue    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/TransactionDetailResource.php b/app/Http/Resources/TransactionDetailResource.php
index 1b60cfce..4257a9fb 100644
--- a/app/Http/Resources/TransactionDetailResource.php
+++ b/app/Http/Resources/TransactionDetailResource.php
@@ -16,6 +16,7 @@ class TransactionDetailResource extends JsonResource
     {
         
         return [
+            'id' => $this->id,
             'stockCode' => $this->product_code,
             'description' => $this->product_name,
             'quantity' => $this->quantity,
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 1ea2ecf8..dcdb3422 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -19,7 +19,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <div class="row" v-for="(product, index) in products">
+                            <div class="row" v-for="(product, index) in products" :key="product.id">
                                 <div class="col p-b-10 p-t-10 " :class="[{'b-grey' : index !== Object.keys(products).length - 1}, {'b-b' : index !== Object.keys(products).length - 1}]">
                                     <purchase-order-item-form-component :data="product" :index="index" :currency="data.fixed_currency.short_code" :editable="!submitted" :section="section" @change="updateProduct($event, index)" v-on:remove="removeProduct(index)"></purchase-order-item-form-component>
                                 </div>

From 455a6fcc22fc681fce259fbd1cdaa2a6f3aa02ff Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Thu, 5 Oct 2023 11:26:51 +0800
Subject: [PATCH 16/66] add sample template

---
 public/template/import-po-template.xlsx          | Bin 0 -> 8893 bytes
 .../forms/PurchaseOrderFormComponent.vue         |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 public/template/import-po-template.xlsx

diff --git a/public/template/import-po-template.xlsx b/public/template/import-po-template.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d1565aa81760dd37e4939cc5ab780e184fff13ef
GIT binary patch
literal 8893
zcmeHN1y@|j)@=d=cemgK2@b&m!GmicxNGCxxJ%H+ogjfgfZ*=#9^54m2=4A*&&-=Q
zGnx5*!JFG_Rjpp@o^$I~?OprSIaf&*77iEi6o3c-04M=Q2k91iFaSU_8~}g=KzyPt
zW@qbYYU`-~*3I4&tjpqRV@>f1?g@P+;0g5pf3N@H87PV$ROn>Gl(>|-6I*ANS*#F7
z<lgu1#b#6%YU_&YDKOT~u(W*42))G=&B6onlw*Hg^x!xiwy3bRsqqi#X;eXl`1Q4^
z>5=fTcK7blwh|D<g0wUbGjU0T*@^V^Bg|3($qu!hDqP~LA~Hq97I^qVzTea5d)2X4
zdg@UNwDS4-7TUils4rvj4t$xw{62;=3AAMJ&^!IkEDZ;t@>s-o*88kPsiDeXq*4#M
zNs?^=)7NoM85loVW($gLMqe6PdD_^*^Gu$LxZ+FLS%Fqhv=vjUr;ew4D}5y7OzEcK
zC7y*ovv!8CAEp2JEI`Q$QiWg4Vf)pq>os1s+~83M#nLV9Dh_Ga3W-TWMpU$k0wI;n
zi*KKMGsG47co_Y?^ZNShc-s{BjY&OibH@<Y;UumeaWAm88&2CqG5gynX}p5>zx8bk
zc<haCXa^h|CvN+2JUj&e9v@)=N`IkcwHh1s85C=BP}ZS9X{iq~wFa}Y{L=nQ$Nymt
z{^`|=V&xS(*-(QHrS5|JE~l2FF-2uvM5G!i-+KE>FJe?jWYdr=wLT}sd`lbv`^Kl)
z`)*)i=~cu|ALYdwR}lmoSAe?4r8p?*#=!}Jkq(q7=}@%Vh2=bTK6R1uM#hcaxjBll
zur5DKwtt0Ma^hIL9P=y7J7Of9&!j>4f+>DlJ@T5%Mpq>;Q=+Q-#X)7YJefOjUsHW%
z5_7lFUWf3>?Tx44^?{Ad=Sn>LtSQg0iPcms_$<qeGC=%PZu%zHZKvX?tvL6d%nE6J
zDpXw9R~%p8^wMUY`)E~h9S^3vb@3o|7WN(W`$Nd{m!S&vcar!C#V4IYXQTm25@G-%
zjH@;4Z#;3a16di_*;)OfUcYk&1}b4tFaO(Dk&3)*7aL|X%0n=lOR6&-)|?|N)t=fe
z24a5|!vY;8r}x<k31fq<#<VOetX+`X;c&0>B{%vSEY5j5Q+^mWoI8&7p#Z$y@aZrt
zqS1cwGyga6IM{nTyM_BG=pVp1^+K_IFEVg>e_YYi5(Q`HQi-3{j|Xu9N7$S=fZ$QG
z0Vrk$tJZyQ-mC5v`&ZT0QhZ=A+jy)OTex`o(cg`H?34&e`W2cRU~FrWlIf~l;sWuc
z>CQ~vZN#cQ`v!G`v{3e00k@!MkRwHK-y3othFI{%r<6vu!&OJo+X05wg_9S9XNP9%
z{k>Bw(3So>WU@AU?44i%fNp5?g8{t*3YkBHrAW=jE}Iwg!F&83q00p*=L-Nftf{^G
zqN`?E(|r53-oRh2Esb5i0Qh(tDJ``yydA%*7e8BW?s_*g#QEcHu;xp(Iiq{eLSW=q
zIo)iV5tQi?f}2`3GuMV`*>U`wAI!R2tW`6uI(H8X*FliHHzOap02a4_deU?7i05t+
zB;y~CBWny8>McUvf7Zxu!HLK9lK5f`G)c*Y5O-*K1!IP&vbkzjq|v=1C!QZ53(4e;
z5pFHjm{GKl_eRzc>zWuP;<MxTbv5CRW2Me7;dZmHx2>m$;(p)U9a)2S<g^+rPgt}~
z!$w9nRi<;4k#vHZITm@Qd^amj=p)sB!HbYbIVUx0o(ps}pj}j~0AXkxkPyD~AwmnN
zk}QUcZc_ZjhhUrN?VwljVR=8NFs9^IhFI;3)(mibu*x77AH@q@wk3=FW!I<#Y+-wt
zJo#5AM~CRsh*4y%*sMe*%o8|_$dX;{$P+lj_tiO{Xk&Yt5;8lzbXp7Qu>?wZ>2<Wn
zTM_8!x$w78i~?iUVchoYLW-(HCQ-<|b}3!OA-Qz>#I&9h)1<_x&8l>KwgHcs^09@!
zSmI5_)whq}Ghqd|xCh&u(Ql8YAb9RN+OJAj`5xtVv$6>%b7H9w!0V<S^$(IQ-$@*{
zw4O%pcOl|D=PcXro?BGtsNeSvHh536o`za6PoOQr>PW)qVbVai(C<HNV9-qx@ecgR
zK6y96HrG<<J5}x6yOrw`7pMhX@R-K;tQ=+T<)$o1vJ?cr(6E)<6=X7TvY*?(7ny5#
zGB8U-Ch{0IFY42sk<{(5P7;|eDal_;);Y+rkenBK_}<mb-SDM~=pk<e54}B!c`=!q
zPob?E>bvR>y)Sk@AWjmkRkRu7<@JJ8HZwuo5s}YcGV8mI7B}r|@CLLce=<*9T|Bet
zlrxVs^k^}4y%^%iR8ijn^mBpU`c0BhT)jSMSKe$t11i5@qFR@UzC+TJlGT#TL6F#g
z@}%XkUow&)g)`H_oR`yjFI5t^zGjtXZYbqDjRINUhPZm5zV`|K$><dqEyx#LZJ4hF
zmfP%hsne`}VRmL)>=b@be8cPUtd(zB^o(0@jIU8(jQzpAxj|^`l2KQ1(L9eoct#mJ
z<A9tcX;r`Q?CUn-Srn3lar+eS0Iobo{nbBi>akMUj3v+wJr5ceq5Z~Cu%nx`DfpMo
zyhu&kYJm;cn|$vzVsm4~60fZPegzjdZUegof`^(lAJ!DDl*|w7z1GV<XJBxoO_fJz
zRAgk!X}Z;Tp(L`SK@X^ygH-oDA-md6SfPASs}OEGD)nxDLH=l%=~ds0mVuR4*<t}?
z=T_4pN?)ayo!XnuD5BQ&rm^!V&Bn;KKpPq-doB_qm!PqMn>Q-ayr_BNDkb*8Wzie0
zzEZ$vmyMZ|pf_at;P$2R?hdI$$U?+;Pzk(}%_k&gWgL0=aAGiM9H@U4)5JBuGp`F^
z8FLzzy@)+X8$x16pb_>aQ;Cme6M{6emx_PD>_lHo!q~JdPN>YE^w{7ag;oCO-<>_a
zqPAL^+0m?)F;BiF3~ym1cTzPeO0u5m7+v3Ig_}@RS(ocyigr2hL53wVy}@fny|Ffq
z6m(b|vN={xbT{;XVF9s$Nkd^ru2x-VID2m_iDwUSzh12iNXD(Q>qRSh05-Fq5q9@)
z!B~?0*w#u#?%9Yp`S?{KA<usb{S%L8<+*;I%TeR>h=}ZlW%sru6QifM0;@Yr2SW<x
zrFTxtl=-ZD#H1en_>wwN(CS%=U?`>(tF!A;`}e3Z{ym<~Pq{+92whnFoa0{)V(dPl
z`dkPI3kzIeS~PEVIGmGo_-b;CA&ct6Y;M-ek5m%$iFX4V2o6@SIXVOGLe)H34WGCd
zvfgFtqQtC<w45e{<t`&wEv5%%1hUSPWUPMV8N@i9lE*@*wC6*iOL~FyqaTDv6Suno
zR2%B#ZF=CIXSADT*vB4HO`Z<KD|3@0w^n@c9yN7!+}f%YM6T*x+&t#GOBOd&(g{*#
zOBvT>OVy(ji4i{r@@p>BNN}uWG=VPP(}XoJ|LA{?(o2h@lMZw$7}Y?L@c&NkPmw1R
zy-H5!1BLJ3rKg<$vqb>`0O+Ck<)r<q^f+3W+L*Hb+Oq!w?>)_72ni2vE5XfcRItk(
z_xC8;<!@iD<CbVl(&I_1Yxb1YIXPmRNN}Fe@|~;D=X_2QwG)gV7luV^hBAw$YMXrQ
z`S2`t@diz*wTzZC8syDGb6(zMhPV5v<MDWNviqB4l#bX${T8JY!L;z%WSWUYA1hvZ
zE>A_N_;4&!B-?A07k9D?AH6|XHvNdbv#{6V)>(<<(tHby_}z#>F?DTbynZWm;k{BF
z)F1JCNy!41lku58s}vJb$6o3A8!35saZpn4p(V)pczkJ6TxE|DMGL22c~?+Qn^pe3
zvqCf^a7*QYjB@_OFoRv-*_y}rB|SE_x5YK>{U$*zEB=@|o%qI6O)=ZdM~-?q15b@H
z@X2;NaGU}$K+EH^K5V{D@A>Y%R%^|89*hN-e?o4}EdOqTZL}ep(#=#><GVw(LHy-W
zecj4>vVy3<nasC7WkKYq4c{bCN<|oibUK66&GO85XEJg1wL52I_w|%&&#aWhr9pK;
zEP>TPm-=};la8%OoMqGik>*&2ugcMAg?lQhavD@T8(QH996|u!Cn_}3YyI7*ilc}X
zbr5>KZ(R$t6NuP$LD+N#b#EEaWYn%oh5R0Jsl#g6IC2tn4MH_YR4!bNy87j6?wB&C
zcqmvi1U(*(woijw1%1x8t~>QB>Z=)LZ4qcyRS%}3^dIl<36}L+AC7j8dA28?A9r-M
z-dztSwLTv6pO>vI;<2`Pot$jP5v+KfZz@KS%`cFWB_C0SmLHX@8XwX@4E@k=k6~V?
zcd?0f#R_9>Ip-e?_C3+lrr7ClD%<Z^Al2xBZ+g{gHP=9XTu&33QYu*vzi1rpOz6V@
zt>DAp(UE<I+)~_WeQ0CoXpGeXi%b#Va+5Rj-I~f=M49Oiv@q<@T;BF^)z)&caI(Ti
zv5<`!L5?-Kve2^w%+i3630g6b0j&y4m6%b;V23Hi`}vdMWt-B@e5)xzPZMfG=s4KC
zL%wYE3|g=#@2T*KvvZTRKup#-KtAnn=t@{=#NERfPH&7~yqEpKAAC+M(u$1w9sTy1
zZr96LS<u#aJ%o@mM$maSLg^KFUM{w;%bO0JQX<ABK$^faYED30P>fWmf_<?Tsix!J
zjH(WP9rz*sdB~0F2w8bkcuF%lfunyJ#B}~u&205>D5n7b>6e80MnYA`@E$^sS|PB;
zs3GUzX8qVZDuV>FJ((h=z7e(aGy@pZ*aE9*22c_rlj-GgyiJ+8orAwCK7A<GO3pR0
z_>zn+??&2N_w-0~`ET4$Hptf@6AUx(TWqn7t<t*@h??d}?)V3uy7o-oc9p#b`pbg*
zEpSAhKq88Z+KXXKWh?(zhCztPs02&?A$Siu;^~E2)(7#av#BpJU~whYn{ndSBf7ta
zRy@CR8F=Ob1AYo0rG0!G&!0+fx+(5giF8T+!phwuW3kOXwg^1!rUurVx_Z1VFq_a5
zDm5LkN;%c)Ilnj;0j4y0`VG(>o@`|(HkEI1QpO()!gn`{x_H4gjfEqy<u52VJg*1B
zj8I*D;7)$A7*Eao-GT1)bB_6_QB*B4)1|hwFuC)$uAFq4#yP=GOn4thi*FT9U85o<
z6wK?38a{kMfseg*WzdNbOOnam(h@veE}q==-g@hzne>!?Zi3KI&WuFaiBMS|T@+W(
z{Jq{>ipH3u#+cGhQkIsa!v->&4IZBB#>F>@=8a&Hd66J9()dki<WrT>6kdWnk|OCI
z$N41%M#+eklOoDdb*{m|4d`T9&@7R|Odal68NoKr=1;KtLSQ)YR<oxeC3uoUvEHbj
z1jM-$fq`WuLG`@OkB&}tv`fJDx*CXB%Sg>-b&az{*g50+w4QoWo8XgboimYihV7M$
zVImPhMX-20zfPROz*F{^WRLhRW_@O#1T?NO(oZ%_?|d<Zw7!23W+G2@z;qPobLD8K
zwhUS#RL)Q!_ghshv41G&ULh-@nIr9JCXa|}hUMSn!OGFlU}Zvx4E2QsfOdx2{Zh;D
zVm7W_)(i$LW}3pr`Qjs~`5{WqpOQ^7I=DkihQ<_`$O#qaKD1};vb;(zfW2r|T;d_0
z8UR1F{9&Hk&A2n^7`GiPu#Q%EA~spU_}TVeff-a{#Zr%sJ>@3Tv^wbpfo*4F{y4-T
zui2!~8CF@TyimpY0ufbl^5vC{lO(U;amn-7ed$A5PQovCWzw&11{Ry9%n)4sUb)-*
z@aCy(DT&%8QPbaylk~;EG=MC|X+|KfH1R!We)MLrMp%-WWsWB{Y{h&Vppu1EQyAz>
zs6KdKrnBS3i1E!JMp*}aV)q6{$8c1_*|M~EhUMV<2J>(r76c-vKSWTydb8G|Gw11W
zh((cpTRo7eY2yqGG^-Y*hig{I9^ISf57aBxK16e0DjOqxb<|9ahCV-KtF+65Tn(z#
zMg-EDdS`3qBP7TO<kyniXWmmV85?Xcc$u^SE`g0TkN+4~X0{_|wLyj18Xf>3{Nv;Y
zwlFny1hf9y{i?xfak5dVY`B4!2{+^~4nx@uM|~->Q%3VE3vZG&Nx(?zcbPS(DpQYo
zV(~dDFUO=PQmk$TE@y*Jwlitw{hT_skS8?5u`F!0vS#oe&cS$sM(eL8nByeH0;9ei
zO{|^ff$a8r&H>Nh{hjd+n#qwxNe@NXc{pLW*d~YylQBLz%P$)ERZq~-N@MpDDa%=S
zQsG`a3)<#y&wA-uD13|4<!>T%cIeJt$0>j8VIMX(>>N_3EGEn)itLk?NywnrR8n1D
z6w`j`mm8iPfToDOe649#utLw!UhI&2S}9DImtnWRN%K5hU#j-uuwyh{V>a~oNooGN
zG4oh33R8W@5Aye>1hcL>HM3zg9X^R?vLDthi8sK+Z@6SD>7#ao>AiKjzn+5<T1Jyv
zU6pI77LT@&HMbb=<RJX*CdvxeZa8Hwj}bBE!x+(Rf^cYIV}xIOl85V#xZ~G^9Vh%_
z`sxS-H2mZ7(BH0mD-u740V!+5&m3#oaKqoEN}z$uxK4DdS}<Z)do8n!wYOVS@84nW
zE(Zhg!=w5c=8e%JgZqNi&9b9>piB7p_-hj%Er{Mpfht+*@9BGl(;yD_g_%GE_lv3)
zy!gbzj55_)*;L&ACEC}Q+eF6BLLOE>W`c*Qr3|+B^WHCI`Z25Avb}0y$;Hfj<-dii
zfit~@S6L^`OTdK6I(<}DNn(03bP#`T{)1jM!J(=!YzISPNL^xyUd7oGcZM2b)3wyH
zpMzZ$Is2nOs`lZJL2(VYBX_W2!j0-9-NLA2ZGYbGjzh?5#ayt#o=h*(#C=?5Tz_eY
z&M791S@TM9M?FLrUl9Rx!LTQ7AJn8_6{N(2PAlH>G(xk$;|Q2>(U_6;BU$TZypIQ!
zO8`-Zd}wFK%|uMibB)fLh32fw56L!n{}^=EbMevkLPsSD<peIYhvqxL7KR{G6IDl$
zrLFm|hbqTt5!)y1sL;IrBIU_54oANNMkEv(1z`+KS{5932hlx|jSG3m?5Okg{oTDy
z>XLcJBpykgDE`Y`7+e*4_Obqs+v75K`0h1^n=hDJb(EbW%mhK2Z!fX62_<$?r%5G;
zGG;zgIh`nLU5uLwSeBr9tz#*l<md+(7FH_4F~+BKb>L6RZF78o$Vy*b59dw99%*L&
zG`1H0P_is7j?S#M4SAg{B>UEe;f_PsOfh!-Vh?j~^X}t$z$5D9J;njbKSkSe=iDF_
z=u2Bdrv(d|8#J*qRsz}CgISI3K&JnxYW<rMgd!q5R$sQ04Yzv*zE!N>BQ<yFt>}WE
z&jkeuqB`!1C};*Rm5XM~c4fJ00T?WFm7E6l;oFS0E{~Hxg729w9>5AU!u4G%&R0vw
zP681vXSVU@!dYp-^UViHK-NyEzJEBGZi}<zCVUrw_DWiFz$vn3#4@aWLpyp%ayhH1
z&N9Megj_z5`#X8jleDg5yu@$G29c}J2zO#aBBk2j<UDW<129R&V6o#Xlf~g4UC9V7
zA4v)0Lsh43OTF@p7a6pV0(cu-YMw>t&PeF;cO6|Ld25$u1Q!?<-{?9BOVIIdJWaNe
zKh~)H=7v&$tPUW`pufi_F<Y8v^;8Y0TOz;^t&xFa$}K>BOcZp<ckm5B^kj3-cTmxr
zXuJi5hS4aDM|T;fCDLS_CXbjO-tU^9dX07lzB0SQa8QrslQ)tndESMSNeKGr6S+q6
zPeAO@(?pDh0+9rob;SHL5Do3^|HUB`fd9GDV&&}?eko_b-jJg%k?`3lqxuyYNxeHO
zGlGeAHdn|s&Z?jZDT>*fQLGu8oO7O!AZOJR`jmfwp3dYhXA)4_1yT-s(u`Dnek=3p
z@EOZ%h(Dnx8jEXD7nbzmHbfB^C)(A8|D_K<gK><bHzD3cYtI+Iejl8N^aXara(-}>
zYx<iPn;n^Z;yY6}rsK9Pt0LC#{Yr9?g&B`CRp@5lvXhqB%?yfLy0(g7MoK3Yr*nj}
zR@aci&q?!{Tb`lv({6Gk@YPx@$8Kb^B&6j5t=d-kqejtqMQL9n?_e2ftUR@*Dt6a9
zx8Tk3-z#luV^Y3@>wqc37NkMR;QU6B8q4k+!@EsR*{lNT%Q3;1>t;{0+AMD#8&r-C
z0IwRb`K|Zxt&LQO-7H&E9KQ}p0<XmwuBF@8z^-tCM|gzz6mL2`$QlqIl1cKmQqN1z
zNL`>jTA6Xvd%J*-J$;R!uq%W&X}oL#3g~ZuZ|%L&J#{hW4M^IaK0k3*)=Rq9H|M5(
zU842)-+Cm>6K1Gp{PTwbzpvWw{Xcv*pd|ZO2Y)ST{%-h7p9H1Gp9-8m8~(M-^Jl{*
z=ve>%qR-EMe$M^>;pq@s4fv@N@U!vHX~{o~V^DvS)&C|be>VL&@$-i%5L$wOKKJJ|
z(9aHj4qg9nu#NxUf&VR#{n^XUp}-$rR)~IkgP#L~pFR9lQ~$6B0A`5+fWIm1&*p#K
i3IA+vNcJc5|LluOvhdK=1ptttKVPVbKd1QR-~Ry+Pk>zj

literal 0
HcmV?d00001

diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index dcdb3422..20ae64a4 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -86,6 +86,7 @@
                                             <file-input-component :validator="$v.files" v-model="files">
                                                 <template slot="label">
                                                     <div class="font-heading fs-11 text-primary all-caps">Import Product CSV</div>
+                                                    <div class="font-heading fs-11 text-primary all-caps"><a href="/template/import-po-template.xlsx" download>Sample Template</a></div>
                                                 </template>
                                             </file-input-component>
                                         </div>

From e83a1cc3aafb1c66b4f32c89795fe2ef31ad4cf4 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 5 Oct 2023 12:10:25 +0800
Subject: [PATCH 17/66] update - only admin can upload po

---
 .../forms/PurchaseOrderFormComponent.vue      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 20ae64a4..dc900942 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -81,18 +81,18 @@
                                             <button id="add-product" name="add-product" class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
                                         </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col p-b-15 pb-md-0">
-                                            <file-input-component :validator="$v.files" v-model="files">
-                                                <template slot="label">
-                                                    <div class="font-heading fs-11 text-primary all-caps">Import Product CSV</div>
-                                                    <div class="font-heading fs-11 text-primary all-caps"><a href="/template/import-po-template.xlsx" download>Sample Template</a></div>
-                                                </template>
-                                            </file-input-component>
-                                        </div>
-                                    </div>
-                                    <div class="row">
+                                    <div class="row" v-if="$store.getters.isAdmin">
                                         <div class="col">
+                                            <div class="row">
+                                                <div class="col p-b-15 pb-md-0">
+                                                    <file-input-component :validator="$v.files" v-model="files">
+                                                        <template slot="label">
+                                                            <div class="font-heading fs-11 text-primary all-caps">Import Product CSV</div>
+                                                            <div class="font-heading fs-9 all-caps muted text-underline"><a href="/template/import-po-template.xlsx" class="muted" download>Click here to download the template</a></div>
+                                                        </template>
+                                                    </file-input-component>
+                                                </div>
+                                            </div>
                                             <div class="row">
                                                 <div class="col">
                                                     <button type="button" class="btn btn-sm btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="uploadProducts">Upload</button>

From d9d3c48e6dffb3646b111b9f62f57249e714c96d Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Fri, 6 Oct 2023 10:59:36 +0800
Subject: [PATCH 18/66] code for statement import invoice mapping

---
 .../ExportsImportedInvoiceMappeds.php         |  78 ++++++++++++
 .../ExportCustomersToExcelController.php      |   8 ++
 .../ImportStatementInvoiceController.php      | 120 ++++++++++++++----
 app/Models/StatementTransactionOwner.php      |   5 +
 app/Models/Transaction.php                    |  19 +++
 app/Models/TransactionMappingLog.php          |  24 ++++
 ..._create_transaction_mapping_logs_table.php |  35 +++++
 .../ImportedInvoiceMappedComponent.vue        | 116 +++++++++++++++++
 .../sections/TransactionsMappingComponent.vue |  17 ++-
 routes/web.php                                |   1 +
 10 files changed, 392 insertions(+), 31 deletions(-)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
 create mode 100644 app/Models/TransactionMappingLog.php
 create mode 100644 database/migrations/2023_10_04_212224_create_transaction_mapping_logs_table.php
 create mode 100644 resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue

diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
new file mode 100644
index 00000000..71363b52
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+use App\Models\TransactionMappingLog;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+
+class ExportsImportedInvoiceMappeds implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $dateTime;
+    private $count;
+    private $counter = 1;
+
+    public function __construct(Request $request)
+    {
+        $this->dateTime = $request->input('date').' '.$request->input('time');
+        $this->count = 0;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Doc No',
+            'Date',
+            'Debtor Code',
+            'Debtor Name',
+            'Shipping Info',
+            'Net Total',
+            'Cancelled',
+            'Mapped Status',
+            'Mapped Reference No'
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return TransactionMappingLog::where('imported_date', $this->dateTime);
+    }
+
+    /**
+     * @param Transaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        // dd($transaction);
+        $this->count += 1;
+        $data = $transaction->data;
+        return [
+            $this->count,
+            Arr::get($data,'doc_no'),
+            Arr::get($data,'date'),
+            Arr::get($data,'debtor_code'),
+            Arr::get($data,'debtor_name'),
+            Arr::get($data,'shipping_info'),
+            Arr::get($data,'net_total'),
+            Arr::get($data,'cancelled'),
+            Arr::get($data,'mapped_status'),
+            Arr::get($data,'mapped_result_reference'),
+        ];
+    
+    }
+}
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 74384157..eebfeed7 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -15,6 +15,8 @@ use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Excel;
+use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
+use App\Models\TransactionMappingLog;
 
 class ExportCustomersToExcelController
 {
@@ -75,4 +77,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function importedInvoiceMapped(ExportsImportedInvoiceMappeds $exportsImportedInvoiceMappeds, Request $request) {
+        $response = $exportsImportedInvoiceMappeds->download('InvoiceMapped.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/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index a59f9463..2535f870 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -2,33 +2,47 @@
 
 namespace App\Http\Controllers\Imports;
 
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Imports\Services\GenericImport;
-use App\Classes\Modules\Segments\DataTransferObjects\SeasonalSegmentObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Segment;
-use App\Models\User;
-use Carbon\Carbon;
 use DateTime;
+use Carbon\Carbon;
+use App\Models\User;
+use App\Models\Company;
+use App\Models\Segment;
+use App\Models\Transaction;
 use Illuminate\Http\Request;
+use App\Models\SeasonalSegment;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
+use App\Models\TransactionMappingLog;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Imports\Services\GenericImport;
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use App\Classes\Modules\Accounting\Processors\ChecksBillNumber;
 use App\Classes\Modules\Segments\Services\CreatesSeasonalSegment;
 use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
-use App\Models\Company;
-use App\Models\SeasonalSegment;
-use App\Models\Transaction;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Segments\DataTransferObjects\SeasonalSegmentObject;
 
 class ImportStatementInvoiceController
 {
+    private $responseTitle;
+    private $responseMessage;
+
+    public function __construct() {
+        $this->responseTitle = 'Import Invoice Mapping';
+        $this->responseMessage = 'You have successfully imported invoice mapping';
+    }
+
     /**
      * @param Request $request
      * @return array
      * @throws \App\Classes\Exceptions\MalformedRequestException
      */
-    public function import(Request $request)
+    public function import(Request $request) : JsonResponse
     {
         ini_set('memory_limit', '-1'); 
-
+        $importDate = date('Y-m-d H:i:s');
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
         $file = json_decode($object->getFiles()[0])->file_info->original->file;
 
@@ -37,26 +51,37 @@ class ImportStatementInvoiceController
         $excelRows = $import->rows;
         $excelRows = $excelRows->toArray();
 
+        $data = [];
         foreach ($excelRows as $row) {
-            dd($row);
-            // $row['debtor_code']
-            
-            // attempt 1 - try map by amount and date 
-            // $transactionDate = $this->changeExcelDate($row['date']);
-            // $transaction = Transaction::where('original_amount', $row['total'])->whereDate('created_at', $transactionDate)->get();
-            // if ($transaction) {
-            //     // check company
-            //         // $company = Company::where('debtor', $row['debtor_code'])->first();
-            //         // dd($company);
-            //     // try to verify is it the correct transaction
-            // }
+            $row['mapped_result_reference'] = null;
+            $row['mapped_status'] = 'failed';
+            $row['date'] = $this->changeExcelDate($row['date']);
 
             // Shipping Info
             // TOPUP -> map with transaction.bill_no
             if (str_starts_with($row['shipping_info'], 'TOPUP')) {
                 // find in exchange first, if cannont then find in izyim
-                // (App()->make(ChecksBillNumber::class))->execute($bill_no, 'exchange');
+                foreach (['exchange','izyim'] as $system) {
+                    $returnReference = $this->mappingTopUp($row, $system);
+                    if ($returnReference) {
+                        $row['mapped_result_reference'] = $returnReference;
+                        $row['mapped_status'] = 'success';
+                    }
+                }
+            } else {
+                $returnReference = $this->mappingExchange($row);
+                if ($returnReference) {
+                    $row['mapped_result_reference'] = $returnReference;
+                    $row['mapped_status'] = 'success';
+                }
             }
+
+            TransactionMappingLog::create([
+                'imported_date'=>$importDate,
+                'data'=>$row,
+            ]);
+            array_push($data, $row);
+
             
             // if 5 digits -> exchange booking reference 
             // find transation
@@ -88,6 +113,51 @@ class ImportStatementInvoiceController
 
 
         }
+
+        return $this->response(['data'=>$data,'importedDate'=>$importDate]);
+    }
+
+    public function response(?array $data = []) : JsonResponse {
+        return (new ApiResponseObject($this->responseTitle,
+            $this->responseMessage,
+            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    }
+
+    private function mappingTopUp(Array $row, String $system) {
+        try {
+            if ($data = (App()->make(ChecksBillNumber::class))->execute($row['shipping_info'], $system)) {
+                if ($system == 'izyim' && isset($data['owner_reference'])) return $data['owner_reference'];
+                
+                if ($system == 'exchange') return $this->updateTransactionOwnerReference($data, $row['doc_no']);
+            }
+        } catch (\Throwable $th) {
+            return false;
+        }
+    }
+
+    private function mappingExchange(Array $row) {
+        $date = $row['date'];
+        $transactions = Transaction::where('original_amount', $row['net_total'])->whereRaw("DATE(created_at) = '$date'")
+        ->whereHas('receiverCompany', function($q) use($row) {
+            $q->where('debtor',$row['debtor_code']);
+        })
+        ->get();
+
+        if ($transactions && $transactions->count() == 1) {
+            foreach ($transactions as $key => $transaction) {
+                return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
+            }
+        }
+        return false;
+    }
+
+    public function updateTransactionOwnerReference($transaction, String $docNo) {
+        $transactionOwner = $transaction->transaction_owner;
+        if ($transactionOwner) {
+            $transactionOwner->update(['invoice_reference'=>$docNo]);
+            return $transactionOwner->owner_reference;
+        }
+        return false;
     }
 
     public function changeExcelDate($date)
diff --git a/app/Models/StatementTransactionOwner.php b/app/Models/StatementTransactionOwner.php
index 5bfe6f82..fb13f4b4 100644
--- a/app/Models/StatementTransactionOwner.php
+++ b/app/Models/StatementTransactionOwner.php
@@ -21,6 +21,11 @@ class StatementTransactionOwner extends Model
         'receipt_reference',
         'status',
     ];
+    
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
 
     public function transaction(): BelongsTo
     {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 05fbfde7..631a5fa5 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Relations\HasOneThrough;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
+use App\Models\StatementTransactionOwner;
 
 
 class Transaction extends AbstractModel implements Documentable, Transactionable, Voucherifiable
@@ -53,6 +54,14 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->MorphOne(Transaction::class, 'owner')->where('type', TransactionType::CREDIT_NOTE);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+     */
+    public function transaction_owner()
+    {
+        return $this->MorphOne(StatementTransactionOwner::class, 'owner','owner_type','owner_id');
+    }
+
     /**
      * @return BelongsTo
      */
@@ -69,6 +78,16 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $this->BelongsTo( Company::class, 'issuer', 'id');
     }
 
+    /**
+     * Get the user that owns the Transaction
+     *
+     * @return BelongsTo
+     */
+    public function receiverCompany(): BelongsTo
+    {
+        return $this->belongsTo(Company::class, 'receiver', 'id');
+    }
+
     /**
      * @return BelongsTo
      */
diff --git a/app/Models/TransactionMappingLog.php b/app/Models/TransactionMappingLog.php
new file mode 100644
index 00000000..d6093f39
--- /dev/null
+++ b/app/Models/TransactionMappingLog.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class TransactionMappingLog extends Model
+{
+    protected $fillable = ['imported_by','data','imported_date'];
+
+    protected $casts = [
+        'data' => 'array',
+    ];
+
+    public static function boot() {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->imported_by = auth()->user()->id;
+        });
+    }
+    
+}
diff --git a/database/migrations/2023_10_04_212224_create_transaction_mapping_logs_table.php b/database/migrations/2023_10_04_212224_create_transaction_mapping_logs_table.php
new file mode 100644
index 00000000..8989d8ae
--- /dev/null
+++ b/database/migrations/2023_10_04_212224_create_transaction_mapping_logs_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTransactionMappingLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('transaction_mapping_logs', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('imported_by')->unsigned();
+            $table->foreign('imported_by')->references('id')->on('users');
+            $table->dateTime('imported_date')->nullable();
+            $table->text('data')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('transaction_mapping_logs');
+    }
+}
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
new file mode 100644
index 00000000..a8df27f7
--- /dev/null
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -0,0 +1,116 @@
+<template>
+    <div class="row h-100 parentContainer">
+        <div class="col-12" style="min-height: 20px;">
+            <loading-component style="height: 20px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        </div>
+
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    <h3>Imported Invoice Mapped</h3>
+                    <div class="text-right">
+                        <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped">
+                            Download Invoices Mapped
+                        </button>
+                    </div>
+                </div>
+                <!-- /.card-header -->
+                <div class="card-body table-responsive p-0">
+                    <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>No</th>
+                            <th>Doc No</th>
+                            <th>Date</th>
+                            <th>Debtor Code</th>
+                            <th>Debtor Name</th>
+                            <th>Shipping Info</th>
+                            <th>Net Total</th>
+                            <th>Cancelled</th>
+                            <th>Mapped Status</th>
+                            <th>Mapped Reference No</th>
+                        </tr>
+                    </thead>
+                    <tbody v-show="!isLoading">
+                        <tr v-for="(item, index) in $store.getters.getListData(section)">
+                            <td>{{index+1}}</td>
+                            <td>{{item.doc_no }}</td>
+                            <td>{{item.date}}</td>
+                            <td>{{item.debtor_code }}}</td>
+                            <td>{{item.debtor_name}}</td>
+                            <td>{{item.shipping_info}}</td>
+                            <td>{{item.net_total}}</td>
+                            <td>{{item.cancelled}}</td>
+                            <td>{{item.mapped_status}}</td>
+                            <td>{{item.mapped_result_reference}}</td>
+                        </tr>
+                    </tbody>
+                    </table>
+                </div>
+                <!-- /.card-body -->
+                <div class="card-footer">
+
+                </div>
+            </div>
+        </div>
+
+        <div class="col-12">
+            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            files: {
+                required: true
+            }
+        },
+        data() {
+            return {
+                section: 'importInvoiceMapping',
+                isLoading: false,
+                importedDate: null,
+            }
+        },
+        computed: {
+            pendingQueue() {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete, oldValue){
+                if(inComplete){
+                    this.importInvoice();
+                }
+            },
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            importInvoice(){
+                this.isLoading = true;
+                this.parameters = {
+                    files: this.files
+                };
+
+                this.submit(this.route('api.import_invoices.upload'), 'post', this.section, true, false);
+            },
+
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.importedDate = response.payload.importedDate;
+                this.isLoading = false;
+            },
+
+            downloadInvoiceMapped() {
+                var arrDateTime = this.importedDate.split(" ");
+
+                window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1], '_blank');
+            },
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 047a9bd5..abebcb83 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -99,7 +99,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row" v-if="stage === 4">
+            <div class="row parentContainer" v-if="stage === 4">
                 <div class="col">
                     <div class="row text-center m-t-50 m-b-50 p-t-50 p-b-50" v-show="exportStage === 0">
                         <div class="col">
@@ -123,7 +123,7 @@
                                     </file-input-component>
                                 </div>
                             </div>
-                            <div class="btn btn-lg btn-primary m-t-20" @click="importInvoice">Import Invoices</div>
+                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportInvoice" @click="importInvoice">Import Invoices</div>
                             <!-- todo-new: delete later --><br><div class="btn btn-lg btn-primary m-t-20" @click="exportStage++">Nest Step</div>
                             <br>
                             <div class="row">
@@ -131,6 +131,13 @@
                                     <a href="https://docs.google.com/presentation/d/1XwKcdBCpHQSCQmsgnUHsypcqk5kdc8uZMqkjW9JXiw4/edit?usp=sharing" target="_blank">Learn How to do this step?</a>
                                 </div>
                             </div>
+                            <div class="row">
+                                <div class="col-12">
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
+                                        <imported-invoice-mapped-component v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                    </modal-component>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row text-center m-t-50 m-b-50 p-t-50 p-b-50" v-show="exportStage === 2">
@@ -191,6 +198,7 @@ export default {
             files: [],
             parameters: {},
             section: 'bankTransactionSection',
+            mappedTrue: false,
         }
     },
     validations: {
@@ -200,10 +208,7 @@ export default {
     },
     methods: {
         importInvoice(){
-            this.parameters = {
-                files: this.files
-            };
-            this.submit(this.route('api.import_invoices.upload'), 'post', this.section, true, false);
+            this.mappedTrue = true;
         },
         importReceipts(){
             this.parameters = {
diff --git a/routes/web.php b/routes/web.php
index 612fa976..1dece5c3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,6 +261,7 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
+Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From a32604cea1431d2852579c804c93c220d3d663d1 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Mon, 9 Oct 2023 14:14:57 +0800
Subject: [PATCH 19/66] this task for have a checkbox to selected which records
 want export invoices to autocount

---
 .../Services/ExportsInvoiceTransactions.php       |  4 +++-
 .../elements/StatementTransactionComponent.vue    |  9 +++++++++
 .../sections/TransactionsMappingComponent.vue     | 15 +++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 90780750..87cf35a2 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -56,9 +56,11 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
      */
     public function query()
     {
-        return StatementTransactionOwner::whereNull('invoice_reference')
+        $data = StatementTransactionOwner::whereNull('invoice_reference')
             ->whereIn('type', [StatementTransactionOwnerType::SALES, StatementTransactionOwnerType::WALLET_TOP_UP])
             ->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED]);
+        if ($this->request->has('bankStatementOwnerId')) $data = $data->whereIn('id',json_decode($this->request->input('bankStatementOwnerId')));
+        return $data;
     }
 
     /**
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index d36c149f..6014bb5d 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -113,6 +113,12 @@
                 </div>
                 <div class="col-1">{{ item.amount }}</div>
                 <div class="col-1 text-success" v-if="item.owners.approved.length">{{ [6, 7, 8, 9, 10, 11, 12, 13, 14].includes(item.owners.approved[0].type) ? 'Miscellaneous' : 'Approved'  }}</div>
+
+                <!-- Pending Export tab for checkbox here -->
+                <div class="col-1" v-if="item.owners.approved.length === 1">
+                    <input type="checkbox" class="request_export_item" v-model="selectAll" :value="item.owners.approved[0].id">
+                </div>
+
                 <div class="col-1 text-danger" v-if="!item.owners.approved.length">Pending...</div>
                 <div class="col-1" v-if="stage === 1">
                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteMappingTransaction">
@@ -148,6 +154,9 @@
             section:{
                 type: String,
                 required: true
+            },
+            selectAll: {
+                type:Boolean
             }
         },
         methods: {
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index abebcb83..f6828bc0 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -87,12 +87,16 @@
                                             </div>
                                         </div>
                                         <div class="col-1">Amount</div>
+                                        <div class="col-1" v-if="stage === 4"></div>                                        
+                                        <div class="col-1" v-if="stage === 4">Select <input type="checkbox"  v-model="selectAll">
+                                        </div>
                                     </div>
                                 </div>
                             </div>
+
                             <list-component ref="bankTransactionsList" section="bankTransactionSection" :endpoint="route('api.accounting.bank.transaction')" :options="this.filter">
                                 <template slot="list" slot-scope="{data}">
-                                    <statement-transaction-component :data="data" :section="section" :stage="stage"></statement-transaction-component>
+                                    <statement-transaction-component :data="data" :section="section" :stage="stage" :selectAll="selectAll"></statement-transaction-component>
                                 </template>
                             </list-component>
                         </div>
@@ -199,6 +203,7 @@ export default {
             parameters: {},
             section: 'bankTransactionSection',
             mappedTrue: false,
+            selectAll: false,
         }
     },
     validations: {
@@ -217,7 +222,13 @@ export default {
             this.submit(this.route('api.import_receipts.upload'), 'post', this.section, true, false);
         },
         exportInvoiceToAutoCount(){
-            window.open(this.route('invoiceTransactions.export'), '_blank');
+            let bankStatementOwnerId = [];
+            $('.request_export_item:checked').each(function() {
+                bankStatementOwnerId.push($(this).val());
+            });
+
+            bankStatementOwnerId = JSON.stringify(bankStatementOwnerId);
+            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+bankStatementOwnerId, '_blank');
         },
         successHandler(){
             this.step += 1;

From 841a6b0c66535a6e99e5ac70be5b50c2ab9af8e2 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 10 Oct 2023 10:49:18 +0800
Subject: [PATCH 20/66] add edit at pending_export

---
 .../UpdateBankStatementDetailLogic.php        | 38 +++++++++++++++++--
 .../EditSingleItemInListComponent.vue         |  9 +++++
 .../StatementTransactionComponent.vue         | 10 +++++
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
index d9eab3db..9f6c28e6 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
@@ -19,6 +19,9 @@ use App\Models\Wallet;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\Modules\Accounting\Services\UpdatesBankStatementTransactionOwnerStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\StatementTransactionOwner;
 
 class UpdateBankStatementDetailLogic extends AbstractControllerLogic
 {
@@ -40,14 +43,21 @@ class UpdateBankStatementDetailLogic extends AbstractControllerLogic
     /** @var ChecksBillNumber */
     private $checksBillNumber;
 
+    /** @var UpdatesBankStatementTransactionOwnerStatus */
+    private $updatesBankStatementTransactionOwnerStatus;
+
     /**
      * @param FetchesBankStatementTransaction $fetchesBankStatementTransaction
      * @param ChecksBillNumber $checksBillNumber
      */
-    public function __construct(FetchesBankStatementTransaction $fetchesBankStatementTransaction, ChecksBillNumber $checksBillNumber)
+    public function __construct(
+        FetchesBankStatementTransaction $fetchesBankStatementTransaction, 
+        ChecksBillNumber $checksBillNumber, 
+        UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus)
     {
         $this->fetchesBankStatementTransaction = $fetchesBankStatementTransaction;
         $this->checksBillNumber = $checksBillNumber;
+        $this->updatesBankStatementTransactionOwnerStatus = $updatesBankStatementTransactionOwnerStatus;
     }
 
     public function logic(Request $request): JsonResponse
@@ -129,7 +139,10 @@ class UpdateBankStatementDetailLogic extends AbstractControllerLogic
 
         $system = $systemReference != null ? SystemType::SYSTEM_NAMES[$systemReference] : '';
 
-        $this->createBankStatementTransactionOwner($bankStatementTransaction, $statementTransactionOwnerType, $system, $owner_type, $owner_id, $owner_reference);
+        $statementTransactionOwner = $this->createBankStatementTransactionOwner($bankStatementTransaction, $statementTransactionOwnerType, $system, $owner_type, $owner_id, $owner_reference);
+
+        // this for edit a transaction already mapped
+        if ($request->has('editMapped')) $this->editAccountMapped($statementTransactionOwner);
 
         return $this->response([]);
     }
@@ -144,9 +157,26 @@ class UpdateBankStatementDetailLogic extends AbstractControllerLogic
             'owner_reference' => $owner_reference,
         ];
 
-        $bankStatementTransaction->owners()->firstOrCreate($ownerData);
-
+        return $bankStatementTransaction->owners()->firstOrCreate($ownerData);
     }
 
+    private function editAccountMapped(StatementTransactionOwner $owner){
+        $this->updateOwnerStatus($owner, ApprovalStatus::APPROVED);
+        
+        // update all other owners with the same system, owner type, and owner ID
+        $this->updateOtherOwners($owner, ApprovalStatus::REJECTED);
+    }
+
+    private function updateOwnerStatus(StatementTransactionOwner $owner, int $status)
+    {
+        $this->updatesBankStatementTransactionOwnerStatus->execute($owner, $status);
+    }
+
+    private function updateOtherOwners(StatementTransactionOwner $owner, int $status): void
+    {
+        StatementTransactionOwner::where('statement_transaction_id', $owner->statement_transaction_id)
+            ->where('id', '!=', $owner->id)
+            ->update(['status' => $status]);
+    }
 
 }
diff --git a/resources/assets/vue/components/accounting/elements/EditSingleItemInListComponent.vue b/resources/assets/vue/components/accounting/elements/EditSingleItemInListComponent.vue
index b3d50d7b..5d1341b1 100644
--- a/resources/assets/vue/components/accounting/elements/EditSingleItemInListComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/EditSingleItemInListComponent.vue
@@ -77,6 +77,13 @@
     import { required } from "vuelidate/lib/validators";
 
     export default {
+        props:{
+            editMapped: {
+                type: Boolean,
+                default: false,
+                required: false
+            }
+        },
         data(){
             return {
                 error: '',
@@ -116,6 +123,8 @@
                     system_references       : this.system_references ? this.system_references.toLowerCase() : '',
                     transaction_reference   : this.transaction_reference
                 };
+                
+                if (this.editMapped) this.parameters['editMapped'] = true;
 
                 this.submit(this.route('api.accounting.statement.details.update', this.data.id), 'put', this.section, true, true);
             },
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 6014bb5d..1caef408 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -21,6 +21,7 @@
                             <div class="col d-flex justify-content-between">
                                 <a :href="item.owners.approved[0].reference_link" target="_blank">{{item.owners.approved[0].reference}}</a>
                                 <div v-if="stage === 4">
+                                    <!-- revert button -->
                                     <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
                                         <i class="fa fa-times fa-fw"></i>
                                     </button>
@@ -35,6 +36,15 @@
                                         >
                                         </general-confirmation-form-component>
                                     </modal-component>
+
+                                    <!-- edit button -->
+                                    <button class="btn btn-xs btn-outline-success b-rad-none m-r-5 requestModal" data-type="updateOwner">
+                                        <i class="fa fa-edit"></i>
+                                    </button>                                    
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="updateOwner">
+                                        <edit-single-item-in-list-component :data="item" :section="section" editMapped="true"></edit-single-item-in-list-component>
+                                    </modal-component>
+
                                 </div>
                             </div>
                         </div>

From 839dc28be268140ef8db2bf7806aeda3f5a3c171 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 11 Oct 2023 00:26:26 +0800
Subject: [PATCH 21/66] update bulk download invoice

---
 .../BulkDownloadCustomerInvoicesLogic.php     | 87 ++++++++++++-------
 .../Commands/DeleteBulkInvoiceFiles.php       | 52 +++++++++++
 app/Console/Kernel.php                        |  5 ++
 3 files changed, 113 insertions(+), 31 deletions(-)
 create mode 100644 app/Console/Commands/DeleteBulkInvoiceFiles.php

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
index 875f28e2..f32e786f 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -8,62 +8,87 @@ use ZipArchive;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Support\Facades\File; 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Company;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Log;
 
 class BulkDownloadCustomerInvoicesLogic
 {
     /**
      * @param Request $request
-     * @return void
-     * @throws MalformedRequestException
+     * @return \Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\BinaryFileResponse
      */
     public function execute(Request $request)
     {
-        $company = Company::where('reference', $request->input('marking'))->first();
+        try {
+            $company = Company::where('reference', $request->input('marking'))->first();
 
-        $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
-        $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
+            if (!$company) {
+                return response()->json([
+                    'status' => 'Failed',
+                    'message' => 'Customer not found.',
+                ]);
+            }
 
-        if ($company) {
-            $invoicebookings = $company->bookings()->whereDate('created_at', '>=', $startDate)
+            $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
+            $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
+
+            $invoicebookings = $company->bookings()
+                ->whereDate('created_at', '>=', $startDate)
                 ->whereDate('created_at', '<=', $endDate)
                 ->whereHas('transactions', function ($query) {
                     $query->where('transactions.type', TransactionType::INVOICE)
-                    ->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-                })->orderBy('created_at')->get();
+                        ->whereIn('transactions.status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+                })
+                ->orderBy('created_at')
+                ->get();
 
-            if (count($invoicebookings) > 0) {
-                $zip_file = "invoices_{$request->input('startDate')}_to_{$request->input('endDate')}_{$company->reference}.zip";
-
-                $zip = new ZipArchive();
-                if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
-                    foreach($invoicebookings as $booking) {
-                        $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->whereNull('deleted_at')->first()->files()->first();
-                        $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
-                    } 
-        
-                    $zip->close();
-                    while (ob_get_level()) {
-                        ob_end_clean();
-                    }
-    
-                    return response()->download($zip_file);
-                }
-            } else {
+            if ($invoicebookings->isEmpty()) {
                 return response()->json([
                     'status' => 'Failed',
                     'message' => 'No invoices found for this customer in the given date range.',
                 ]);
             }
-        } else {
+
+            $zipDirectory = storage_path('app/bulk_invoice'); // Update this with the actual directory path
+
+            if (!file_exists($zipDirectory)) {
+                mkdir($zipDirectory, 0755, true);
+            }
+
+            $zip_file = "{$zipDirectory}/invoices_{$request->input('startDate')}_to_{$request->input('endDate')}_{$company->reference}.zip";
+
+            $zip = new ZipArchive();
+            if ($zip->open($zip_file, ZipArchive::CREATE | ZipArchive::OVERWRITE)) {
+                foreach ($invoicebookings as $booking) {
+                    $invoice_file = $booking->documents()->where('document_type', DocumentType::INVOICE)->whereNull('deleted_at')->first()->files()->first();
+                    $zip->addFile(Storage::disk('documents')->path($invoice_file->file->file_info->original->file), 'invoice-' . $booking->created_at->format('d_m_Y') . '_' . $booking->marking . '.pdf');
+                }
+
+                $zip->close();
+
+                while (ob_get_level()) {
+                    ob_end_clean();
+                }
+
+                return response()->download($zip_file);
+            } else {
+                return response()->json([
+                    'status' => 'Failed',
+                    'message' => 'Failed to create the Zip archive.',
+                ]);
+            }
+        } catch (\Exception $e) {
+            // Log the exception for debugging
+            Log::error('Error in BulkDownloadCustomerInvoicesLogic: ' . $e->getMessage());
+
             return response()->json([
                 'status' => 'Failed',
-                'message' => 'Customer not found.',
+                'message' => 'An error occurred while processing the request.',
             ]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Console/Commands/DeleteBulkInvoiceFiles.php b/app/Console/Commands/DeleteBulkInvoiceFiles.php
new file mode 100644
index 00000000..52ebf121
--- /dev/null
+++ b/app/Console/Commands/DeleteBulkInvoiceFiles.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\File;
+
+class DeleteBulkInvoiceFiles extends Command
+{
+    protected $signature = 'delete:bulk-invoice-files';
+
+    protected $description = 'Delete all files in the storage/app/bulk_invoice directory';
+
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function handle()
+    {
+        $start   = new Carbon();
+        $this->logOutput('Process started');
+
+        $directory = storage_path('app/bulk_invoice');
+
+        if (File::isDirectory($directory)) {
+            File::cleanDirectory($directory);
+            $this->info('All files in the bulk_invoice directory have been deleted.');
+        } else {
+            $this->error('The bulk_invoice directory does not exist.');
+        }
+
+        $end = new Carbon();
+        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+
+        $this->logOutput('Process ended. ElapsedTime: ' . $elapsedTime);
+    }
+
+    public function logOutput($text)
+    {
+        if (is_array($text)) {
+            $text = implode(', ', $text);
+        }
+
+        $this->info(Carbon::now() . ' : ' . $text);
+
+        $filePath = storage_path('logs/delete-orders.log');
+        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $text . PHP_EOL;
+        file_put_contents($filePath, $textToAppend, FILE_APPEND);
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cb9cf060..64b449e4 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -43,6 +43,11 @@ class Kernel extends ConsoleKernel
             ->everyMinute()
             ->appendOutputTo(storage_path().'/logs/regenerateInvoice.log')
             ->withoutOverlapping();
+
+        $schedule->command('delete:bulk-invoice-files')
+            ->dailyAt('00:00')
+            ->appendOutputTo(storage_path().'/logs/delete-bulk-invoice-files.log')
+            ->withoutOverlapping();
     }
 
     /**

From 79150d4d840a70e90f5ad81235e8d18d40272210 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 11 Oct 2023 00:51:13 +0800
Subject: [PATCH 22/66] remove cron job regenerate invoice - not using any more

---
 app/Console/Kernel.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cb9cf060..109256cd 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -39,10 +39,6 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log')
             ->withoutOverlapping();
 
-        $schedule->command('regenerateInvoice')
-            ->everyMinute()
-            ->appendOutputTo(storage_path().'/logs/regenerateInvoice.log')
-            ->withoutOverlapping();
     }
 
     /**

From 56c861792061c715ffcaab39bdcb3d5dc80f4a34 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 11 Oct 2023 00:51:13 +0800
Subject: [PATCH 23/66] remove cron job regenerate invoice - not using any more

---
 app/Console/Kernel.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index cb9cf060..109256cd 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -39,10 +39,6 @@ class Kernel extends ConsoleKernel
             ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log')
             ->withoutOverlapping();
 
-        $schedule->command('regenerateInvoice')
-            ->everyMinute()
-            ->appendOutputTo(storage_path().'/logs/regenerateInvoice.log')
-            ->withoutOverlapping();
     }
 
     /**

From 6599874d4705ca279c81e7481b667ce77f6b9c8c Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 11 Oct 2023 16:44:03 +0800
Subject: [PATCH 24/66] code for import receipts

---
 .../Services/ExportsInvoiceTransactions.php   | 22 +++++--
 .../ExportCustomersToExcelController.php      |  4 +-
 .../ImportStatementReceiptsController.php     | 64 ++++++++++++++++++-
 .../ImportedInvoiceMappedComponent.vue        | 42 +++++++-----
 .../sections/TransactionsMappingComponent.vue | 29 ++++++---
 5 files changed, 124 insertions(+), 37 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 87cf35a2..79ca4380 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -33,12 +33,19 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
     public function headings(): array
     {
-        return [
-            'DocNo',
-            'DocDate',
-            'DebtorCode',
-            'Ref',
-            'DebtorName',
+        $header = [];
+        if ($this->request->input('type') == 'invoices') {
+            $header[] = 'DocNo';
+            $header[] = 'DocDate';
+            $header[] = 'DebtorCode';
+        } else {
+            $header[] = 'OrNo';
+            $header[] = 'OrDate';
+            $header[] = 'CreditorCode';
+        }
+        $header[] = 'Ref';
+        $header[] = ($this->request->input('type') == 'invoices' ? 'DebtorName' : 'CreditorName');
+        $header = array_merge($header, [
             'CurrencyCode',
             'ShipInfo',
             'ItemCode',
@@ -48,7 +55,8 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
             'UnitPrice',
             'AccNo',
             'DeptNo'
-        ];
+        ]);
+        return $header;
     }
 
     /**
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index eebfeed7..7dfe0485 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -61,7 +61,7 @@ class ExportCustomersToExcelController
 
     public function invoiceTransactions(Request $request){
         $exportsTransactions = new ExportsInvoiceTransactions($request);
-        $response = $exportsTransactions->download('invoice-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsTransactions->download(($request->input('type') == 'invoices' ? 'invoice-transactions' : 'receipt-transactions').'.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         ob_end_clean();
         return $response;
     }
@@ -79,7 +79,7 @@ class ExportCustomersToExcelController
     }
 
     public function importedInvoiceMapped(ExportsImportedInvoiceMappeds $exportsImportedInvoiceMappeds, Request $request) {
-        $response = $exportsImportedInvoiceMappeds->download('InvoiceMapped.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsImportedInvoiceMappeds->download($request->input('fileName').'.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         ob_end_clean();
         return $response;
     }
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index 22111881..8021e3a9 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -17,9 +17,21 @@ use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
 use App\Models\Company;
 use App\Models\SeasonalSegment;
 use App\Models\Transaction;
+use App\Models\TransactionMappingLog;
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use Illuminate\Http\JsonResponse;
 
 class ImportStatementReceiptsController
 {
+    private $responseTitle;
+    private $responseMessage;
+
+    public function __construct() {
+        $this->responseTitle = 'Import Receipt Mapping';
+        $this->responseMessage = 'You have successfully imported receipt mapping';
+    }
+
     /**
      * @param Request $request
      * @return array
@@ -27,6 +39,7 @@ class ImportStatementReceiptsController
      */
     public function import(Request $request)
     {
+        $importDate = date('Y-m-d H:i:s');
         $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
         $file = json_decode($object->getFiles()[0])->file_info->original->file;
 
@@ -35,10 +48,57 @@ class ImportStatementReceiptsController
         $excelRows = $import->rows;
         $excelRows = $excelRows->toArray();
 
+        $data = [];
         foreach ($excelRows as $row) {
-            // if has date column
-            // $transactionDate = $this->changeExcelDate($row['date']);
+            $row['mapped_result_reference'] = null;
+            $row['mapped_status'] = 'failed';
+            $row['date'] = $this->changeExcelDate($row['doc_date']);
+
+            $returnReference = $this->mappingExchange($row);
+            if ($returnReference) {
+                $row['mapped_result_reference'] = $returnReference;
+                $row['mapped_status'] = 'success';
+            } 
+
+            TransactionMappingLog::create([
+                'imported_date'=>$importDate,
+                'data'=>$row,
+            ]);
+            array_push($data, $row);
         }
+
+        return $this->response(['data'=>$data,'importedDate'=>$importDate]);
+    }
+
+    public function response(?array $data = []) : JsonResponse {
+        return (new ApiResponseObject($this->responseTitle,
+            $this->responseMessage,
+            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    }
+
+    private function mappingExchange(Array $row) {
+        $date = $row['date'];
+        $transactions = Transaction::where('original_amount', $row['local_payment_amount'])->whereRaw("DATE(created_at) = '$date'")
+        ->whereHas('issuerCompany', function($q) use($row) {
+            $q->where('debtor',$row['debtor_code']);
+        })
+        ->get();
+
+        if ($transactions && $transactions->count() == 1) {
+            foreach ($transactions as $key => $transaction) {
+                return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
+            }
+        }
+        return false;
+    }
+
+    public function updateTransactionOwnerReference($transaction, String $docNo) {
+        $transactionOwner = $transaction->transaction_owner;
+        if ($transactionOwner) {
+            $transactionOwner->update(['receipt_reference'=>$docNo]);
+            return $transactionOwner->owner_reference;
+        }
+        return false;
     }
 
     public function changeExcelDate($date)
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
index a8df27f7..3e52b70b 100644
--- a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -7,7 +7,7 @@
         <div class="col-12">
             <div class="card">
                 <div class="card-header">
-                    <h3>Imported Invoice Mapped</h3>
+                    <h3>{{ componentTitle }}</h3>
                     <div class="text-right">
                         <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped">
                             Download Invoices Mapped
@@ -19,16 +19,7 @@
                     <table class="table table-hover">
                     <thead>
                         <tr>
-                            <th>No</th>
-                            <th>Doc No</th>
-                            <th>Date</th>
-                            <th>Debtor Code</th>
-                            <th>Debtor Name</th>
-                            <th>Shipping Info</th>
-                            <th>Net Total</th>
-                            <th>Cancelled</th>
-                            <th>Mapped Status</th>
-                            <th>Mapped Reference No</th>
+                            <th v-for="item in tableHeaders">{{ item }}</th>
                         </tr>
                     </thead>
                     <tbody v-show="!isLoading">
@@ -65,11 +56,18 @@
         props: {
             files: {
                 required: true
-            }
+            },
+            type: {
+                type: String,
+                required: true,
+            },
+            section:{
+                type: String,
+                required: true
+            },
         },
         data() {
             return {
-                section: 'importInvoiceMapping',
                 isLoading: false,
                 importedDate: null,
             }
@@ -87,16 +85,27 @@
             },
         },
         created(){
+            this.appendComponentTitle();
+            this.appendComponentTableHeader();
             this.$store.dispatch('updateListQueue', {'name': this.section});
         },
         methods: {
+            appendComponentTitle() {
+                this.componentTitle = this.section == 'importInvoiceMapping' ? 'Imported Invoices Mapped' : 'Imported Receipts Mapped';
+            },
+            appendComponentTableHeader() {
+                if (this.section == 'importInvoiceMapping') {
+                    this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
+                } else {
+                    this.tableHeaders = ['No','OR No','Date','Creditor Code','Creditor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
+                }
+            },
             importInvoice(){
                 this.isLoading = true;
                 this.parameters = {
                     files: this.files
                 };
-
-                this.submit(this.route('api.import_invoices.upload'), 'post', this.section, true, false);
+                this.submit(this.route('api.'+(this.section == 'importInvoiceMapping' ? 'import_invoices' : 'import_receipts')+'.upload'), 'post', this.section, true, false);
             },
 
             successHandler(response){
@@ -107,8 +116,9 @@
 
             downloadInvoiceMapped() {
                 var arrDateTime = this.importedDate.split(" ");
+                const fileName = this.section == 'importInvoiceMapping' ? 'InvoiceMapped' : 'ReceiptMapped';
 
-                window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1], '_blank');
+                window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
             },
         }
     }
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index f6828bc0..10f541f4 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -138,7 +138,7 @@
                             <div class="row">
                                 <div class="col-12">
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
-                                        <imported-invoice-mapped-component v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                        <imported-invoice-mapped-component section="importInvoiceMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
                                     </modal-component>
                                 </div>
                             </div>
@@ -146,7 +146,8 @@
                     </div>
                     <div class="row text-center m-t-50 m-b-50 p-t-50 p-b-50" v-show="exportStage === 2">
                         <div class="col">
-                            <div class="btn btn-lg btn-primary" @click="exportStage++">Export Receipts To AutoCount</div>
+                            <div class="btn btn-lg btn-primary" @click="exportReceiptToAutoCount">Export Receipts To AutoCount</div>
+                            <!-- todo-new: delete later --><br><div class="btn btn-lg btn-primary m-t-20" @click="exportStage++">Nest Step</div>
                             <br>
                             <div class="row">
                                 <div class="col">
@@ -165,7 +166,7 @@
                                     </file-input-component>
                                 </div>
                             </div>
-                            <div class="btn btn-lg btn-primary m-t-20" @click="importReceipts">Import Receipts</div>
+                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportInvoice" @click="importReceipts">Import Receipts</div>
                             <!-- todo-new: delete later --><br><div class="btn btn-lg btn-primary m-t-20" @click="exportStage++">Nest Step</div>
                             <br>
                             <div class="row">
@@ -173,6 +174,13 @@
                                     <a href="https://docs.google.com/presentation/d/1xMiWjU1hqPaihMhbgflFSDsu1sC_0Lk7OFmwDaXVt-w/edit?usp=sharing" target="_blank">Learn How to do this step?</a>
                                 </div>
                             </div>
+                            <div class="row">
+                                <div class="col-12">
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
+                                        <imported-invoice-mapped-component section="importReceiptMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                    </modal-component>
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div class="row text-center m-t-50 m-b-50 p-t-50 p-b-50" v-show="exportStage === 4">
@@ -216,19 +224,20 @@ export default {
             this.mappedTrue = true;
         },
         importReceipts(){
-            this.parameters = {
-                files: this.files
-            };
-            this.submit(this.route('api.import_receipts.upload'), 'post', this.section, true, false);
+            this.mappedTrue = true;
         },
         exportInvoiceToAutoCount(){
+            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+this.getCheckedStatementOwners()+'&type=invoices', '_blank');
+        },
+        exportReceiptToAutoCount(){
+            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+this.getCheckedStatementOwners()+'&type=receipts', '_blank');
+        },
+        getCheckedStatementOwners() {
             let bankStatementOwnerId = [];
             $('.request_export_item:checked').each(function() {
                 bankStatementOwnerId.push($(this).val());
             });
-
-            bankStatementOwnerId = JSON.stringify(bankStatementOwnerId);
-            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+bankStatementOwnerId, '_blank');
+            return JSON.stringify(bankStatementOwnerId);
         },
         successHandler(){
             this.step += 1;

From f17fe5201114ce1d154087c9cf3aa10f17bb4e07 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 10:25:21 +0800
Subject: [PATCH 25/66] enable upload csv for customer

---
 .../forms/PurchaseOrderFormComponent.vue      | 107 ++++++++++--------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index dc900942..9a1bf774 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -26,68 +26,77 @@
                             </div>
                             <div class="row m-t-20" v-if="!submitted">
                                 <div class="col">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-4 pr-md-1">
-                                            <div class="form-group form-group-default b-rad-none">
-                                                <label>Stock Code</label>
-                                                <input id="stock_code" name="stock_code" type="text" class="form-control b-rad-none" v-model="product.stockCode" />
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md pl-md-1">
-                                            <div class="form-group form-group-default b-rad-none required">
-                                                <label>description</label>
-                                                <input id="desc" name="desc" class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
-                                            </div>
+                                    <div class="row m-b-15">
+                                        <div class="col">
+                                            <span class="pointer text-complete fs-11 text-upper text-underline" @click="useUploadCsvPo = !useUploadCsvPo">{{ useUploadCsvPo ? '< Back to Manual Enter Purchase Order' : 'Click here to Upload PURCHASE ORDER CSV' }}</span>
                                         </div>
                                     </div>
-                                    <div class="row align-items-center">
-                                        <div class="col-sm-12 col-md-6 pr-md-1">
-                                            <div class="form-group form-group-default b-rad-none required">
-                                                <label>Unit Price</label>
-                                                <input id="unit_price" name="unit_price" type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
+                                    <div class="row" v-if="!useUploadCsvPo">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col-sm-12 col-md-4 pr-md-1">
+                                                    <div class="form-group form-group-default b-rad-none">
+                                                        <label>Stock Code</label>
+                                                        <input id="stock_code" name="stock_code" type="text" class="form-control b-rad-none" v-model="product.stockCode" />
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-12 col-md pl-md-1">
+                                                    <div class="form-group form-group-default b-rad-none required">
+                                                        <label>description</label>
+                                                        <input id="desc" name="desc" class="form-control b-rad-none" rows="1" @keyup="onlyEnglish($event)" v-model="product.description">
+                                                    </div>
+                                                </div>
                                             </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-6 pl-md-1">
-                                            <div class="form-group form-group-default b-rad-none no-padding no-border">
-                                                <div class="row no-margin">
-                                                    <div  id="minus-quantity" name="minus-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
-                                                        <div class="row h-100 align-items-center">
-                                                            <div class="col">
-                                                                <i class="fa fa-minus"></i>
+                                            <div class="row align-items-center">
+                                                <div class="col-sm-12 col-md-6 pr-md-1">
+                                                    <div class="form-group form-group-default b-rad-none required">
+                                                        <label>Unit Price</label>
+                                                        <input id="unit_price" name="unit_price" type="text" class="form-control b-rad-none" placeholder="Unit Price" v-model.lazy="product.unit_price" v-money="productPrice" />
+                                                    </div>
+                                                </div>
+                                                <div class="col-sm-12 col-md-6 pl-md-1">
+                                                    <div class="form-group form-group-default b-rad-none no-padding no-border">
+                                                        <div class="row no-margin">
+                                                            <div  id="minus-quantity" name="minus-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity" @touchend="clearInterval" @touchcancel="clearInterval">
+                                                                <div class="row h-100 align-items-center">
+                                                                    <div class="col">
+                                                                        <i class="fa fa-minus"></i>
+                                                                    </div>
+                                                                </div>
                                                             </div>
-                                                        </div>
-                                                    </div>
-                                                    <div class="col no-padding">
-                                                        <label class="p-t-5 p-l-5 text-center">Quantity</label>
-                                                        <input  id="quantity" name="quantity" type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
-                                                    </div>
-                                                    <div id="add-quantity" name="add-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
-                                                        <div class="row h-100 align-items-center">
-                                                            <div class="col">
-                                                                <i class="fa fa-plus"></i>
+                                                            <div class="col no-padding">
+                                                                <label class="p-t-5 p-l-5 text-center">Quantity</label>
+                                                                <input  id="quantity" name="quantity" type="text" class="form-control m-b-5 b-rad-none no-border text-center" v-model.lazy="product.quantity" v-mask="'#########'"/>
+                                                            </div>
+                                                            <div id="add-quantity" name="add-quantity" class="col-auto bg-master-lightest pointer" @mousedown="updateQuantity('add')" @mouseleave="clearInterval" @mouseup="clearInterval" @touchstart="updateQuantity('add')" @touchend="clearInterval" @touchcancel="clearInterval">
+                                                                <div class="row h-100 align-items-center">
+                                                                    <div class="col">
+                                                                        <i class="fa fa-plus"></i>
+                                                                    </div>
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
                                                 </div>
                                             </div>
+                                            <div class="row">
+                                                <div class="col-sm-12 col-md-4 p-b-15 pb-md-0">
+                                                    <p class="m-b-0 small">Total</p>
+                                                    <h6 class="no-margin bold text-complete">{{data.fixed_currency.short_code}} {{productTotal.toFixed(3)}}</h6>
+                                                </div>
+                                                <div class="col-sm-12 col-md">
+                                                    <button id="add-product" name="add-product" class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
+                                                </div>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-4 p-b-15 pb-md-0">
-                                            <p class="m-b-0 small">Total</p>
-                                            <h6 class="no-margin bold text-complete">{{data.fixed_currency.short_code}} {{productTotal.toFixed(3)}}</h6>
-                                        </div>
-                                        <div class="col-sm-12 col-md">
-                                            <button id="add-product" name="add-product" class="btn btn-sm btn-block btn-complete b-rad-none" @click="addProduct()">Add Product</button>
-                                        </div>
-                                    </div>
-                                    <div class="row" v-if="$store.getters.isAdmin">
+                                    <div class="row" v-if="useUploadCsvPo">
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col p-b-15 pb-md-0">
                                                     <file-input-component :validator="$v.files" v-model="files">
                                                         <template slot="label">
-                                                            <div class="font-heading fs-11 text-primary all-caps">Import Product CSV</div>
+                                                            <div class="font-heading fs-11 text-primary all-caps">Import PURCHASE ORDER CSV</div>
                                                             <div class="font-heading fs-9 all-caps muted text-underline"><a href="/template/import-po-template.xlsx" class="muted" download>Click here to download the template</a></div>
                                                         </template>
                                                     </file-input-component>
@@ -158,10 +167,7 @@
                                 <template slot="button">
                                     <div class="text-center bg-master-lightest padding-20 pointer m-b-10">
                                         <div class="m-b-10">
-                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
-                                                    width="45" height="45"
-                                                    viewBox="0 0 172 172"
-                                                    style=" fill:#000000;"><defs><linearGradient x1="118.25" y1="63.41425" x2="118.25" y2="88.92669" gradientUnits="userSpaceOnUse" id="color-1_Ya7GVcPz6Vqb_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="20.87113" x2="72.5625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-2_Ya7GVcPz6Vqb_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="56.4375" y1="20.87113" x2="56.4375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-3_Ya7GVcPz6Vqb_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="20.87113" x2="45.6875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-4_Ya7GVcPz6Vqb_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="20.87113" x2="69.875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-5_Ya7GVcPz6Vqb_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="80.625" y1="20.87113" x2="80.625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-6_Ya7GVcPz6Vqb_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="91.375" y1="20.87113" x2="91.375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-7_Ya7GVcPz6Vqb_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="20.87113" x2="86" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-8_Ya7GVcPz6Vqb_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="52.40625" y1="20.87113" x2="52.40625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-9_Ya7GVcPz6Vqb_gr9"><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 id="Layer_1"><circle cx="44" cy="30" transform="scale(2.6875,2.6875)" r="4" fill="url(#color-1_Ya7GVcPz6Vqb_gr1)"></circle><rect x="12" y="14" transform="scale(2.6875,2.6875)" width="30" height="2" fill="url(#color-2_Ya7GVcPz6Vqb_gr2)"></rect><path d="M80.625,102.125v-43c0,-2.95625 -2.41875,-5.375 -5.375,-5.375h-37.625c-2.95625,0 -5.375,2.41875 -5.375,5.375v43c0,2.95625 2.41875,5.375 5.375,5.375h37.625c2.95625,0 5.375,-2.41875 5.375,-5.375zM53.75,102.125h-16.125v-10.75h16.125zM53.75,86h-16.125v-10.75h16.125zM53.75,69.875h-16.125v-10.75h16.125zM75.25,102.125h-16.125v-10.75h16.125zM75.25,86h-16.125v-10.75h16.125zM75.25,69.875h-16.125v-10.75h16.125z" fill="url(#color-3_Ya7GVcPz6Vqb_gr3)"></path><rect x="12" y="47" transform="scale(2.6875,2.6875)" width="10" height="2" fill="url(#color-4_Ya7GVcPz6Vqb_gr4)"></rect><rect x="25" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-5_Ya7GVcPz6Vqb_gr5)"></rect><rect x="29" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-6_Ya7GVcPz6Vqb_gr6)"></rect><rect x="33" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-7_Ya7GVcPz6Vqb_gr7)"></rect><path d="M141.3625,73.90625c-1.88125,-6.45 -6.45,-11.825 -12.3625,-14.78125v-34.9375c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-96.75c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v110.1875v2.6875v10.75c0,4.56875 3.49375,8.0625 8.0625,8.0625h96.75c4.56875,0 8.0625,-3.49375 8.0625,-8.0625v-10.75v-22.30625c1.6125,0.5375 3.49375,0.80625 5.375,0.80625c11.825,0 21.5,-9.675 21.5,-21.5c0,-9.1375 -5.9125,-17.2 -14.5125,-20.15625zM137.0625,80.625c0,10.48125 -8.33125,18.8125 -18.8125,18.8125c-10.48125,0 -18.8125,-8.33125 -18.8125,-18.8125c0,-10.48125 8.33125,-18.8125 18.8125,-18.8125c10.48125,0 18.8125,8.33125 18.8125,18.8125zM123.625,147.8125c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-3.225c0.80625,0.26875 1.6125,0.5375 2.6875,0.5375h96.75c1.075,0 1.88125,-0.26875 2.6875,-0.5375zM123.625,134.375v2.6875c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-2.6875v-110.1875c0,-1.6125 1.075,-2.6875 2.6875,-2.6875h96.75c1.6125,0 2.6875,1.075 2.6875,2.6875v32.7875c-1.6125,-0.26875 -3.49375,-0.5375 -5.375,-0.5375c-13.4375,0 -24.1875,10.75 -24.1875,24.1875c0,12.3625 9.40625,22.84375 21.76875,24.1875c1.88125,3.49375 4.56875,6.18125 7.79375,8.0625zM134.375,110.1875c-4.8375,0 -9.1375,-2.15 -12.3625,-5.64375c11.55625,-1.88125 20.425,-11.825 20.425,-23.91875c0,-0.26875 0,-0.26875 0,-0.5375c4.8375,2.95625 8.0625,8.0625 8.0625,13.975c0,8.86875 -7.25625,16.125 -16.125,16.125z" fill="url(#color-8_Ya7GVcPz6Vqb_gr8)"></path><rect x="12" y="43" transform="scale(2.6875,2.6875)" width="15" height="2" fill="url(#color-9_Ya7GVcPz6Vqb_gr9)"></rect></g></g></svg>
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="45" height="45" viewBox="0 0 172 172" style=" fill:#000000;"><defs><linearGradient x1="118.25" y1="63.41425" x2="118.25" y2="88.92669" gradientUnits="userSpaceOnUse" id="color-1_Ya7GVcPz6Vqb_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="72.5625" y1="20.87113" x2="72.5625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-2_Ya7GVcPz6Vqb_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="56.4375" y1="20.87113" x2="56.4375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-3_Ya7GVcPz6Vqb_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="45.6875" y1="20.87113" x2="45.6875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-4_Ya7GVcPz6Vqb_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="20.87113" x2="69.875" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-5_Ya7GVcPz6Vqb_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="80.625" y1="20.87113" x2="80.625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-6_Ya7GVcPz6Vqb_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="91.375" y1="20.87113" x2="91.375" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-7_Ya7GVcPz6Vqb_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="20.87113" x2="86" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-8_Ya7GVcPz6Vqb_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="52.40625" y1="20.87113" x2="52.40625" y2="158.79631" gradientUnits="userSpaceOnUse" id="color-9_Ya7GVcPz6Vqb_gr9"><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 id="Layer_1"><circle cx="44" cy="30" transform="scale(2.6875,2.6875)" r="4" fill="url(#color-1_Ya7GVcPz6Vqb_gr1)"></circle><rect x="12" y="14" transform="scale(2.6875,2.6875)" width="30" height="2" fill="url(#color-2_Ya7GVcPz6Vqb_gr2)"></rect><path d="M80.625,102.125v-43c0,-2.95625 -2.41875,-5.375 -5.375,-5.375h-37.625c-2.95625,0 -5.375,2.41875 -5.375,5.375v43c0,2.95625 2.41875,5.375 5.375,5.375h37.625c2.95625,0 5.375,-2.41875 5.375,-5.375zM53.75,102.125h-16.125v-10.75h16.125zM53.75,86h-16.125v-10.75h16.125zM53.75,69.875h-16.125v-10.75h16.125zM75.25,102.125h-16.125v-10.75h16.125zM75.25,86h-16.125v-10.75h16.125zM75.25,69.875h-16.125v-10.75h16.125z" fill="url(#color-3_Ya7GVcPz6Vqb_gr3)"></path><rect x="12" y="47" transform="scale(2.6875,2.6875)" width="10" height="2" fill="url(#color-4_Ya7GVcPz6Vqb_gr4)"></rect><rect x="25" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-5_Ya7GVcPz6Vqb_gr5)"></rect><rect x="29" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-6_Ya7GVcPz6Vqb_gr6)"></rect><rect x="33" y="47" transform="scale(2.6875,2.6875)" width="2" height="2" fill="url(#color-7_Ya7GVcPz6Vqb_gr7)"></rect><path d="M141.3625,73.90625c-1.88125,-6.45 -6.45,-11.825 -12.3625,-14.78125v-34.9375c0,-4.56875 -3.49375,-8.0625 -8.0625,-8.0625h-96.75c-4.56875,0 -8.0625,3.49375 -8.0625,8.0625v110.1875v2.6875v10.75c0,4.56875 3.49375,8.0625 8.0625,8.0625h96.75c4.56875,0 8.0625,-3.49375 8.0625,-8.0625v-10.75v-22.30625c1.6125,0.5375 3.49375,0.80625 5.375,0.80625c11.825,0 21.5,-9.675 21.5,-21.5c0,-9.1375 -5.9125,-17.2 -14.5125,-20.15625zM137.0625,80.625c0,10.48125 -8.33125,18.8125 -18.8125,18.8125c-10.48125,0 -18.8125,-8.33125 -18.8125,-18.8125c0,-10.48125 8.33125,-18.8125 18.8125,-18.8125c10.48125,0 18.8125,8.33125 18.8125,18.8125zM123.625,147.8125c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-3.225c0.80625,0.26875 1.6125,0.5375 2.6875,0.5375h96.75c1.075,0 1.88125,-0.26875 2.6875,-0.5375zM123.625,134.375v2.6875c0,1.6125 -1.075,2.6875 -2.6875,2.6875h-96.75c-1.6125,0 -2.6875,-1.075 -2.6875,-2.6875v-2.6875v-110.1875c0,-1.6125 1.075,-2.6875 2.6875,-2.6875h96.75c1.6125,0 2.6875,1.075 2.6875,2.6875v32.7875c-1.6125,-0.26875 -3.49375,-0.5375 -5.375,-0.5375c-13.4375,0 -24.1875,10.75 -24.1875,24.1875c0,12.3625 9.40625,22.84375 21.76875,24.1875c1.88125,3.49375 4.56875,6.18125 7.79375,8.0625zM134.375,110.1875c-4.8375,0 -9.1375,-2.15 -12.3625,-5.64375c11.55625,-1.88125 20.425,-11.825 20.425,-23.91875c0,-0.26875 0,-0.26875 0,-0.5375c4.8375,2.95625 8.0625,8.0625 8.0625,13.975c0,8.86875 -7.25625,16.125 -16.125,16.125z" fill="url(#color-8_Ya7GVcPz6Vqb_gr8)"></path><rect x="12" y="43" transform="scale(2.6875,2.6875)" width="15" height="2" fill="url(#color-9_Ya7GVcPz6Vqb_gr9)"></rect></g></g></svg>
                                         </div>
                                         <p class="no-margin fs-12">Proforma Invoice</p>
                                     </div>
@@ -201,6 +207,7 @@
             return {
                 interval:false,
                 submitted: false,
+                useUploadCsvPo: false,
                 product: {
                     stockCode: '',
                     description: '',

From 3bbc4346c43dc4ab66edd77950bf30460d2cfa68 Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Thu, 12 Oct 2023 16:11:34 +0800
Subject: [PATCH 26/66] bulk download white form and supplier filter

---
 .../BulkDownloadSupplierWhiteFormsLogic.php   |  52 ++++++++
 ...lkDownloadSupplierWhiteFormsController.php |  20 ++++
 .../DownloadSupplierWhiteFormComponent.vue    |  73 ++++++++++++
 .../bookings/elements/PaymentComponent.vue    | 112 ++++++++++++++++++
 resources/views/pages/payments.blade.php      |  65 +---------
 routes/web.php                                |   1 +
 6 files changed, 259 insertions(+), 64 deletions(-)
 create mode 100644 app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
 create mode 100644 app/Http/Controllers/Companies/BulkDownloadSupplierWhiteFormsController.php
 create mode 100644 resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
 create mode 100644 resources/assets/vue/components/bookings/elements/PaymentComponent.vue

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
new file mode 100644
index 00000000..bf7ed4b7
--- /dev/null
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Classes\Modules\Companies\ControllersLogic;
+
+use ZipArchive;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Models\Company;
+use App\Models\Group;
+use Carbon\Carbon;
+
+class BulkDownloadSupplierWhiteFormsLogic
+{
+    /**
+     * @param Request $request
+     * @return void
+     * @throws MalformedRequestException
+     */
+    public function execute(Request $request)
+    {
+        $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
+        $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
+
+        $companyReference = Company::find($request->input('supplier'))->reference;
+        $groups = Group::where('issuer', $request->input('supplier'))
+            ->whereDate('created_at', '>=', $startDate)
+            ->whereDate('created_at', '<=', $endDate)
+            ->orderBy('created_at', 'DESC')
+            ->get();
+
+        if (count($groups) > 0) {
+            $zip_file = "currency_vendor_orders_{$request->input('startDate')}_to_{$request->input('endDate')}_{$companyReference}.zip";
+
+            $zip = new ZipArchive();
+            if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+                foreach($groups as $group) {
+                    $document = $group->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->whereNull('deleted_at')->first()->files()->first();
+                    $zip->addFile(Storage::disk('documents')->path($document->file->file_info->original->file), $group->reference . '.pdf');
+                } 
+    
+                $zip->close();
+                while (ob_get_level()) {
+                    ob_end_clean();
+                }
+
+                return response()->download($zip_file);
+            }
+        } 
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Companies/BulkDownloadSupplierWhiteFormsController.php b/app/Http/Controllers/Companies/BulkDownloadSupplierWhiteFormsController.php
new file mode 100644
index 00000000..21984e5f
--- /dev/null
+++ b/app/Http/Controllers/Companies/BulkDownloadSupplierWhiteFormsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Companies;
+
+use App\Classes\Modules\Companies\ControllersLogic\BulkDownloadSupplierWhiteFormsLogic;
+use Illuminate\Http\Request;
+
+class BulkDownloadSupplierWhiteFormsController
+{
+    /**
+     * @param Request $request
+     * @param BulkDownloadSupplierWhiteFormsLogic $logic
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function download(Request $request, BulkDownloadSupplierWhiteFormsLogic $logic) {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
new file mode 100644
index 00000000..34e86cbd
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -0,0 +1,73 @@
+<template>
+    <div class="row m-b-15">
+        <div class="col-12">
+            <div class="row">
+                <div class="col-12">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.supplier">
+                                <label>Supplier</label>
+                                <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="exportSupplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.startDate">
+                                <label class="all-caps">Start Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component :validator="$v.parameters.endDate">
+                                <label class="all-caps">End Date</label>
+                                <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto p-l-3 p-r-3 p-md-0">
+                            <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="bulkDownloadWhiteForm()">
+                                <span>
+                                    Export White Form
+                                </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import { required } from "vuelidate/lib/validators";
+
+export default {
+    data(){
+        return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+                supplier: ''
+            },
+        }
+    },
+    validations: {
+        parameters: {
+            supplier: {
+                required
+            },
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+        }
+    },
+    methods: {
+        bulkDownloadWhiteForm(){
+            window.open(route('suppliers.white_forms') + '?supplier=' + this.parameters.supplier + '&startDate=' + this.parameters.startDate + '&endDate=' + this.parameters.endDate, '_blank');
+        },
+    },
+    mixins: [componentHandler]
+};
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
new file mode 100644
index 00000000..0f4c9a1e
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
@@ -0,0 +1,112 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col-12 col-md-6 p-l-0">
+                    <download-billing-with-dates-component section="paymentsReportSection" ></download-billing-with-dates-component>
+                </div>
+                <div class="col-12 col-md-6">
+                    <div class="row">
+                        <div class="col">
+                            <validation-wrapper-component selectable :validator="$v.filterSupplier">
+                                <label>Supplier</label>
+                                <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="supplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="filterSupplier"></selectable-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-2">
+                            <button type="button" class="btn btn-lg btn-secondary fs-11 h-100 d-flex justify-content-center align-items-center" @click="reset()">Reset</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col bg-white p-t-15 p-b-15">
+                    <div class="row no-margin">
+                        <div class="col-12 col-md-4">
+                            <div class="row m-b-15 p-b-10 b-b b-grey">
+                                <div class="col">
+                                    <small class="all-caps muted fs-10">Complete Payments</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [4]}">
+                                        <template slot="list" slot-scope="{data}">
+                                            <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
+                                        </template>
+                                    </list-component>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-12 col-md-4">
+                            <div class="row m-b-15 p-b-10 b-b b-grey">
+                                <div class="col">
+                                    <small class="all-caps muted fs-10">Complete Currency Orders</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <list-component :key="currencyOrderKey" section="completeTransactionGroupsListSection" :options="{'per_page': 20, 'status': 3, ...this.filterSupplier && {'issuer_in': [this.filterSupplier]}}" :endpoint="route('api.transaction.group.list')">
+                                        <template slot="list" slot-scope="{data}">
+                                            <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
+                                        </template>
+                                    </list-component>
+                                    <!-- <list-component key="2" section="currencyOrdersListSection" :options="{'per_page': 20, 'document_type_in': ['CURRENCY_VENDOR_ORDER'], 'status': 2, 'with_company': true}"  :endpoint="route('api.document.list')">
+                                        <template slot="list" slot-scope="{data}">
+                                            <currency-order-component section="currencyOrdersListSection" :data="data"></currency-order-component>
+                                        </template>
+                                    </list-component> -->
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-12 col-md-4">
+                            <div class="row m-b-15 p-b-10 b-b b-grey">
+                                <div class="col">
+                                    <small class="all-caps muted fs-10">Open Currency Orders</small>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <list-component :key="currencyOrderKey" section="transactionGroupsListSection" :options="{'per_page': 20, 'status_in': [0, 1, 2], ...this.filterSupplier && {'issuer_in': [this.filterSupplier]}}" :endpoint="route('api.transaction.group.list')">
+                                        <template slot="list" slot-scope="{data}">
+                                            <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
+                                        </template>
+                                    </list-component>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row p-t-15">
+                <div class="col-12 p-l-0">
+                    <download-supplier-white-form-component section="paymentsReportSection" ></download-supplier-white-form-component>
+                </div>
+            </div>
+        </div>
+   </div>
+</template>
+
+<script>
+   export default {
+       data(){
+            return {
+                filterSupplier: "",
+                currencyOrderKey: 1,
+            }
+       },
+        validations: {
+            filterSupplier: {}
+        },
+        watch: {
+            filterSupplier() {
+                this.currencyOrderKey += 1;
+            }
+       },
+       methods: {
+            reset() {
+                this.filterSupplier = ""
+            }
+       }
+   }
+</script>
diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 0b18afbc..eb3dee76 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -1,67 +1,4 @@
 @extends('layouts.base_portal')
 @section('inner_content')
-    <div class="row">
-        <div class="col-12 col-md-6 no-padding">
-            <download-billing-with-dates-component section="paymentsReportSection" ></download-billing-with-dates-component>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col bg-white p-t-15 p-b-15">
-            <div class="row no-margin">
-                <div class="col-12 col-md-4">
-                    <div class="row m-b-15 p-b-10 b-b b-grey">
-                        <div class="col">
-                            <small class="all-caps muted fs-10">Complete Payments</small>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [4]}">
-                                <template slot="list" slot-scope="{data}">
-                                    <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
-                                </template>
-                            </list-component>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md-4">
-                    <div class="row m-b-15 p-b-10 b-b b-grey">
-                        <div class="col">
-                            <small class="all-caps muted fs-10">Complete Currency Orders</small>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <list-component key="2" section="completeTransactionGroupsListSection" :options="{'per_page': 20, 'status': 3}" :endpoint="route('api.transaction.group.list')">
-                                <template slot="list" slot-scope="{data}">
-                                    <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
-                                </template>
-                            </list-component>
-                            {{--<list-component key="2" section="currencyOrdersListSection" :options="{'per_page': 20, 'document_type_in': ['CURRENCY_VENDOR_ORDER'], 'status': 2, 'with_company': true}"  :endpoint="route('api.document.list')">--}}
-                                {{--<template slot="list" slot-scope="{data}">--}}
-                                    {{--<currency-order-component section="currencyOrdersListSection" :data="data"></currency-order-component>--}}
-                                {{--</template>--}}
-                            {{--</list-component>--}}
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-md-4">
-                    <div class="row m-b-15 p-b-10 b-b b-grey">
-                        <div class="col">
-                            <small class="all-caps muted fs-10">Open Currency Orders</small>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col">
-                            <list-component key="2" section="transactionGroupsListSection" :options="{'per_page': 20, 'status_in': [0, 1, 2]}" :endpoint="route('api.transaction.group.list')">
-                                <template slot="list" slot-scope="{data}">
-                                    <transaction-group-component section="transactionGroupsListSection" :data="data"></transaction-group-component>
-                                </template>
-                            </list-component>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+    <payment-component></payment-component>
 @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 612fa976..25301635 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,6 +261,7 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
+Route::get('/supplier/white-form/bulk-download', 'Companies\BulkDownloadSupplierWhiteFormsController@download')->name('suppliers.white_forms');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From 5ec7a4a61f523552c38921613b844a83d22ce17f Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 18:10:32 +0800
Subject: [PATCH 27/66] update bulk download white form

---
 .../BulkDownloadSupplierWhiteFormsLogic.php   | 77 ++++++++++++-------
 .../DownloadSupplierWhiteFormComponent.vue    | 10 +--
 .../bookings/elements/PaymentComponent.vue    | 27 ++++---
 routes/api.php                                |  1 +
 routes/web.php                                |  1 -
 5 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
index bf7ed4b7..73f59c58 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
@@ -10,6 +10,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Company;
 use App\Models\Group;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 
 class BulkDownloadSupplierWhiteFormsLogic
 {
@@ -20,33 +21,57 @@ class BulkDownloadSupplierWhiteFormsLogic
      */
     public function execute(Request $request)
     {
-        $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
-        $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
-
-        $companyReference = Company::find($request->input('supplier'))->reference;
-        $groups = Group::where('issuer', $request->input('supplier'))
-            ->whereDate('created_at', '>=', $startDate)
-            ->whereDate('created_at', '<=', $endDate)
-            ->orderBy('created_at', 'DESC')
-            ->get();
-
-        if (count($groups) > 0) {
-            $zip_file = "currency_vendor_orders_{$request->input('startDate')}_to_{$request->input('endDate')}_{$companyReference}.zip";
-
-            $zip = new ZipArchive();
-            if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
-                foreach($groups as $group) {
-                    $document = $group->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->whereNull('deleted_at')->first()->files()->first();
-                    $zip->addFile(Storage::disk('documents')->path($document->file->file_info->original->file), $group->reference . '.pdf');
-                } 
+        try {
+            
+            $startDate = Carbon::createFromFormat('d-m-Y', $request->input('startDate'))->startOfDay();
+            $endDate = Carbon::createFromFormat('d-m-Y', $request->input('endDate'))->endOfDay();
     
-                $zip->close();
-                while (ob_get_level()) {
-                    ob_end_clean();
-                }
+            $companyReference = Company::find($request->input('supplier'))->reference;
+            $groups = Group::where('issuer', $request->input('supplier'))
+                ->whereDate('created_at', '>=', $startDate)
+                ->whereDate('created_at', '<=', $endDate)
+                ->orderBy('created_at', 'DESC')
+                ->get();
+    
+            if (count($groups) > 0) {
 
-                return response()->download($zip_file);
-            }
-        } 
+                $zipDirectory = storage_path('app/bulk_whiteform'); // Update this with the actual directory path
+
+                if (!file_exists($zipDirectory)) {
+                    mkdir($zipDirectory, 0755, true);
+                }
+    
+                $zip_file = "{$zipDirectory}/currency_vendor_orders_{$request->input('startDate')}_to_{$request->input('endDate')}_{$companyReference}.zip";
+    
+                $zip = new ZipArchive();
+                if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
+                    foreach($groups as $group) {
+                        $document = $group->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->whereNull('deleted_at')->first()->files()->first();
+                        $zip->addFile(Storage::disk('documents')->path($document->file->file_info->original->file), $group->reference . '.pdf');
+                    } 
+        
+                    $zip->close();
+                    while (ob_get_level()) {
+                        ob_end_clean();
+                    }
+    
+                    return response()->download($zip_file);
+                }
+            } 
+
+            return response()->json([
+                'status' => 'Failed',
+                'message' => 'No white form found for this supplier in the given date range.',
+            ]);
+
+        } catch (\Exception $e) {
+            // Log the exception for debugging
+            Log::error('Error in BulkDownloadSupplierWhiteFormsLogic: ' . $e->getMessage());
+
+            return response()->json([
+                'status' => 'Failed',
+                'message' => 'An error occurred while processing the request.',
+            ]);
+        }
     }
 }
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
index 34e86cbd..317ac0c3 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -4,19 +4,19 @@
             <div class="row">
                 <div class="col-12">
                     <div class="row m-l-0 m-r-0">
-                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component selectable :validator="$v.parameters.supplier">
                                 <label>Supplier</label>
                                 <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="exportSupplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component :validator="$v.parameters.startDate">
                                 <label class="all-caps">Start Date</label>
                                 <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-3 mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component :validator="$v.parameters.endDate">
                                 <label class="all-caps">End Date</label>
                                 <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
@@ -25,7 +25,7 @@
                         <div class="col-auto p-l-3 p-r-3 p-md-0">
                             <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="bulkDownloadWhiteForm()">
                                 <span>
-                                    Export White Form
+                                    Export
                                 </span>
                             </div>
                         </div>
@@ -65,7 +65,7 @@ export default {
     },
     methods: {
         bulkDownloadWhiteForm(){
-            window.open(route('suppliers.white_forms') + '?supplier=' + this.parameters.supplier + '&startDate=' + this.parameters.startDate + '&endDate=' + this.parameters.endDate, '_blank');
+            this.submit(this.route('api.suppliers.white_forms'), 'post', this.section, false, false);
         },
     },
     mixins: [componentHandler]
diff --git a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
index 0f4c9a1e..d947fe6f 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
@@ -2,19 +2,33 @@
     <div class="row">
         <div class="col">
             <div class="row">
-                <div class="col-12 col-md-6 p-l-0">
+                <div class="col-8 p-l-0">
+                    <small class="all-caps muted fs-10">Export Payment Transactions CSV</small>
                     <download-billing-with-dates-component section="paymentsReportSection" ></download-billing-with-dates-component>
                 </div>
+            </div>
+            <div class="row">
+                <div class="col-8 p-l-0">
+                    <small class="all-caps muted fs-10">Download Zip White Form</small>
+                    <download-supplier-white-form-component section="paymentsReportSection" ></download-supplier-white-form-component>
+                </div>
+            </div>
+            <div class="row">
                 <div class="col-12 col-md-6">
                     <div class="row">
-                        <div class="col">
+                        <div class="col p-l-0">
+                            <small class="all-caps muted fs-10">Filter Supplier</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col padding-0">
                             <validation-wrapper-component selectable :validator="$v.filterSupplier">
                                 <label>Supplier</label>
                                 <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="supplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="filterSupplier"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-2">
-                            <button type="button" class="btn btn-lg btn-secondary fs-11 h-100 d-flex justify-content-center align-items-center" @click="reset()">Reset</button>
+                        <div class="col-2 p-l-0">
+                            <button type="button" class="btn btn-lg btn-complete fs-11 h-100 d-flex justify-content-center align-items-center" @click="reset()">Reset</button>
                         </div>
                     </div>
                 </div>
@@ -78,11 +92,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row p-t-15">
-                <div class="col-12 p-l-0">
-                    <download-supplier-white-form-component section="paymentsReportSection" ></download-supplier-white-form-component>
-                </div>
-            </div>
         </div>
    </div>
 </template>
diff --git a/routes/api.php b/routes/api.php
index 310305d3..8b4bada0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -33,6 +33,7 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         Route::post('/import/upload-import-invoices', 'Imports\ImportStatementInvoiceController@import')->name('import_invoices.upload');
         Route::post('/import/upload-import-receipt', 'Imports\ImportStatementReceiptsController@import')->name('import_receipts.upload');
         Route::post('/customers/invoices', 'Companies\BulkDownloadCustomerInvoicesController@download')->name('customers.invoices');
+        Route::post('/supplier/white-form/bulk-download', 'Companies\BulkDownloadSupplierWhiteFormsController@download')->name('suppliers.white_forms');
 
         require __DIR__ . '/company.php';
 
diff --git a/routes/web.php b/routes/web.php
index 25301635..612fa976 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,7 +261,6 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
-Route::get('/supplier/white-form/bulk-download', 'Companies\BulkDownloadSupplierWhiteFormsController@download')->name('suppliers.white_forms');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From 1eb227a63cf09a119321703807ae4f5ded4c5994 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 18:53:26 +0800
Subject: [PATCH 28/66] show error message for bulk download

---
 .../DownloadSupplierWhiteFormComponent.vue    | 25 +++++++++++++++++++
 .../elements/BulkDownloadInvoiceComponent.vue |  9 +++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
index 317ac0c3..25b29a0b 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -32,6 +32,22 @@
                     </div>
                 </div>
             </div>
+            <div class="row align-items-center justify-content-center bg-white p-t-50 p-b-50 p-l-15 p-r-15 margin-15" v-if="returnData">
+                <div class="col-10">
+                    <div class="row align-items-center justify-content-center  hint-text">
+                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text" /></div>
+                    </div>
+                    <div class="row text-center">
+                        <div class="col">
+                            <div class="row m-t-20">
+                                <div class="col">
+                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Failed'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -43,6 +59,7 @@ import { required } from "vuelidate/lib/validators";
 export default {
     data(){
         return {
+            returnData: null,
             parameters: {
                 startDate: '',
                 endDate: '',
@@ -67,6 +84,14 @@ export default {
         bulkDownloadWhiteForm(){
             this.submit(this.route('api.suppliers.white_forms'), 'post', this.section, false, false);
         },
+        successHandler(response) {
+            this.isLoading = false;
+            if (response.message) {
+                this.returnData = response;
+            } else {
+                this.returnData = null;
+            }
+        },
     },
     mixins: [componentHandler]
 };
diff --git a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
index 0ae4b102..91ac1da7 100644
--- a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
+++ b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
@@ -27,19 +27,16 @@
                 </div>
             </div>
             <loading-component style="height: 100px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
-            <div class="row align-items-center justify-content-center bg-white p-t-50 p-b-50 p-l-15 p-r-15 margin-15"
-                v-if="!isLoading && returnData">
+            <div class="row align-items-center justify-content-center bg-white p-t-50 p-b-50 p-l-15 p-r-15 margin-15" v-if="!isLoading && returnData">
                 <div class="col-10">
                     <div class="row align-items-center justify-content-center  hint-text">
-                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png"
-                                class="w-100 hint-text" /></div>
+                        <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text" /></div>
                     </div>
                     <div class="row text-center">
                         <div class="col">
                             <div class="row m-t-20">
                                 <div class="col">
-                                    <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">{{ returnData.message
-                                    }}</p>
+                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Failed'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
                                 </div>
                             </div>
                         </div>

From caff1ab5d5ce352f765b3a19fa4ac55278892e90 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 18:57:14 +0800
Subject: [PATCH 29/66] show error message for bulk download

---
 .../ControllersLogic/BulkDownloadCustomerInvoicesLogic.php    | 4 ++--
 .../ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php  | 2 +-
 .../bookings/elements/DownloadSupplierWhiteFormComponent.vue  | 2 +-
 .../companies/elements/BulkDownloadInvoiceComponent.vue       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
index f32e786f..41a64ecf 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadCustomerInvoicesLogic.php
@@ -77,7 +77,7 @@ class BulkDownloadCustomerInvoicesLogic
                 return response()->download($zip_file);
             } else {
                 return response()->json([
-                    'status' => 'Failed',
+                    'status' => 'Error',
                     'message' => 'Failed to create the Zip archive.',
                 ]);
             }
@@ -86,7 +86,7 @@ class BulkDownloadCustomerInvoicesLogic
             Log::error('Error in BulkDownloadCustomerInvoicesLogic: ' . $e->getMessage());
 
             return response()->json([
-                'status' => 'Failed',
+                'status' => 'Error',
                 'message' => 'An error occurred while processing the request.',
             ]);
         }
diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
index 73f59c58..0cec8515 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
@@ -69,7 +69,7 @@ class BulkDownloadSupplierWhiteFormsLogic
             Log::error('Error in BulkDownloadSupplierWhiteFormsLogic: ' . $e->getMessage());
 
             return response()->json([
-                'status' => 'Failed',
+                'status' => 'Error',
                 'message' => 'An error occurred while processing the request.',
             ]);
         }
diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
index 25b29a0b..afa2ebc2 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -41,7 +41,7 @@
                         <div class="col">
                             <div class="row m-t-20">
                                 <div class="col">
-                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Failed'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
+                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Error'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
index 91ac1da7..d493fed2 100644
--- a/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
+++ b/resources/assets/vue/components/companies/elements/BulkDownloadInvoiceComponent.vue
@@ -36,7 +36,7 @@
                         <div class="col">
                             <div class="row m-t-20">
                                 <div class="col">
-                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Failed'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
+                                    <p class="all-caps no-margin fs-11" :class="[{'text-danger': returnData.status == 'Error'}]" style="letter-spacing: 2px;">{{ returnData.message }}</p>
                                 </div>
                             </div>
                         </div>

From 47ec38bb96012f3bed930236541739870d49e07c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 19:09:56 +0800
Subject: [PATCH 30/66] delete all bulk download files

---
 .../Commands/DeleteBulkInvoiceFiles.php       | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/app/Console/Commands/DeleteBulkInvoiceFiles.php b/app/Console/Commands/DeleteBulkInvoiceFiles.php
index 52ebf121..a6e8dab1 100644
--- a/app/Console/Commands/DeleteBulkInvoiceFiles.php
+++ b/app/Console/Commands/DeleteBulkInvoiceFiles.php
@@ -8,9 +8,9 @@ use Illuminate\Support\Facades\File;
 
 class DeleteBulkInvoiceFiles extends Command
 {
-    protected $signature = 'delete:bulk-invoice-files';
+    protected $signature = 'delete:bulk-download-files';
 
-    protected $description = 'Delete all files in the storage/app/bulk_invoice directory';
+    protected $description = 'Delete all the bulk download files';
 
     public function __construct()
     {
@@ -19,34 +19,26 @@ class DeleteBulkInvoiceFiles extends Command
 
     public function handle()
     {
-        $start   = new Carbon();
-        $this->logOutput('Process started');
+        $directories = [
+            storage_path('app/bulk_invoice'),
+            storage_path('app/bulk_whiteform'),
+        ];
 
-        $directory = storage_path('app/bulk_invoice');
-
-        if (File::isDirectory($directory)) {
-            File::cleanDirectory($directory);
-            $this->info('All files in the bulk_invoice directory have been deleted.');
-        } else {
-            $this->error('The bulk_invoice directory does not exist.');
+        foreach ($directories as $directory) {
+            $start   = new Carbon();
+            $this->info(Carbon::now() . ' Start cleaning - ' . $directory);
+    
+            if (File::isDirectory($directory)) {
+                File::cleanDirectory($directory);
+                $this->info('All files have been deleted.');
+            } else {
+                $this->info('Directory does not exist.');
+            }
+    
+            $end = new Carbon();
+            $elapsedTime = $start->diff($end)->format('%H:%I:%S');
+    
+            $this->info(Carbon::now() . ' Process ended. ElapsedTime: ' . $elapsedTime);
         }
-
-        $end = new Carbon();
-        $elapsedTime = $start->diff($end)->format('%H:%I:%S');
-
-        $this->logOutput('Process ended. ElapsedTime: ' . $elapsedTime);
-    }
-
-    public function logOutput($text)
-    {
-        if (is_array($text)) {
-            $text = implode(', ', $text);
-        }
-
-        $this->info(Carbon::now() . ' : ' . $text);
-
-        $filePath = storage_path('logs/delete-orders.log');
-        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $text . PHP_EOL;
-        file_put_contents($filePath, $textToAppend, FILE_APPEND);
     }
 }

From 5bd7a6104f9b5573fc8a18551441cc302630480e Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 12 Oct 2023 19:12:52 +0800
Subject: [PATCH 31/66] delete all bulk download files

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 109256cd..d6557046 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -38,7 +38,11 @@ class Kernel extends ConsoleKernel
             ->dailyAt('01:00')
             ->appendOutputTo(storage_path().'/logs/soft-delete-seasonal-segmant-company.log')
             ->withoutOverlapping();
-
+        
+        $schedule->command('delete:bulk-download-files')
+            ->hourly()
+            ->appendOutputTo(storage_path().'/logs/delete-bulk-download-files.log')
+            ->withoutOverlapping();
     }
 
     /**

From 521260d69fd924ad665d4be9933ac3b6dc06127f Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Fri, 13 Oct 2023 08:14:24 +0800
Subject: [PATCH 32/66] code for mapped report

---
 ...sactionOwnerInvoiceOrReceiptRefNotNull.php | 24 +++++++
 .../StatementTransactionMappedComponent.vue   | 72 +++++++++++++++++++
 .../ReportTransactionsMappedComponent.vue     | 67 +++++++++++++++++
 .../bank-statements/index.blade.php           | 10 ++-
 4 files changed, 172 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionOwnerInvoiceOrReceiptRefNotNull.php
 create mode 100644 resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
 create mode 100644 resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerInvoiceOrReceiptRefNotNull.php b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerInvoiceOrReceiptRefNotNull.php
new file mode 100644
index 00000000..f6a23389
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerInvoiceOrReceiptRefNotNull.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionOwnerInvoiceOrReceiptRefNotNull implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) {
+            return $query->where(function ($q) {
+                $q->orWhereNotNull('invoice_reference')->orWhereNotNull('receipt_reference');
+            });
+        });
+    }
+}
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
new file mode 100644
index 00000000..e4186bb6
--- /dev/null
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
@@ -0,0 +1,72 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row p-b-10 b-b b-grey">
+                <div class="col-2">{{ item.posting_date }}</div>
+                <div class="col-2">{{ item.transaction_description_1 + ' - ' + item.transaction_description_2 }}</div>
+                <div class="col-7">
+                    <div class="row">
+                        <div class="col">{{item.owners.approved[0].system}}</div>
+                        <div class="col">{{ typeString(item.owners.approved[0].type) }}</div>
+                        <div class="col"><a :href="item.owners.approved[0].reference_link" target="_blank">{{item.owners.approved[0].reference}}</a></div>
+                        <div class="col">{{item.owners.approved[0].invoice_reference}}</div>
+                        <div class="col">{{item.owners.approved[0].receipt_reference}}</div>
+                    </div>
+                </div>
+
+                <div class="col-1">{{ item.amount }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            stage: {
+                type: Number,
+                default: 0
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            typeString(type){
+                switch(type) {
+                    case 1:
+                        return 'Sales';
+                    case 2:
+                        return 'Wallet Top Up';
+                    case 3:
+                        return 'Wallet Withdrawal';
+                    case 4:
+                        return 'Payment Refund';
+                    case 5:
+                        return 'Supplier Payment';
+                    case 6:
+                        return 'Internal Bank Transfer Out';
+                    case 7:
+                        return 'Internal Bank Transfer In';
+                    case 8:
+                        return 'Salary Payment';
+                    case 9:
+                        return 'Statutory Payment';
+                    case 10:
+                        return 'FPX Charges';
+                    case 11:
+                        return 'FPX Charges Refund';
+                    case 12:
+                        return 'Bank Charges';
+                    case 13:
+                        return 'Credit Card Payment';
+                    case 14:
+                        return 'Non-Operational Payment';
+                }
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
new file mode 100644
index 00000000..e8f99f3a
--- /dev/null
+++ b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
@@ -0,0 +1,67 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row justify-content-center align-items-center m-t-50 m-b-50" v-show="step === 0">
+                        <div class="col-5">
+                            <div class="row text-center">
+                                <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row" v-if="step == 1">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-t-10 m-b-10">
+                                <div class="col">
+                                    <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
+                                        <div class="col-2">Date</div>
+                                        <div class="col-2">Description</div>
+                                        <div class="col-7">
+                                            <div class="row">
+                                                <div class="col">System</div>
+                                                <div class="col">Type</div>
+                                                <div class="col">Reference</div>
+                                                <div class="col">Invoice Reference</div>
+                                                <div class="col">Receipt Reference</div>
+                                            </div>
+                                        </div>
+                                        <div class="col-1">Amount</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <list-component ref="TransactionsMappedList" section="TransactionsMappedSection" :endpoint="route('api.accounting.bank.transaction')" :options="filter">
+                                <template slot="list" slot-scope="{data}">
+                                    <statement-transaction-mapped-component :data="data" :section="section"></statement-transaction-mapped-component>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {
+                step: 0,
+                filter: {},
+            }
+        },
+        methods: {
+            getReportFilter() {
+                this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], statement_transaction_owner_invoice_or_receipt_ref_not_null: true, per_page: 100, order_by: {column: 'posting_date', DESC: true}};
+
+                this.step = 1
+            }
+        },
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/views/pages/accounting/bank-statements/index.blade.php b/resources/views/pages/accounting/bank-statements/index.blade.php
index cb38d912..c70d8f0a 100644
--- a/resources/views/pages/accounting/bank-statements/index.blade.php
+++ b/resources/views/pages/accounting/bank-statements/index.blade.php
@@ -125,7 +125,7 @@
                                     <div class="row justify-content-end">
                                         <div class="col">
                                             <div class="row fs-12 text-center">
-                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="complete">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="ReportMapped">
                                                     <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"
@@ -312,6 +312,14 @@
                                             </list-component>
                                         </div>
                                     </div>
+
+                                    {{-- tab for report & Analysis --}}
+                                    <div class="row tabsContainer tabContent" tab-name="ReportMapped">
+                                        <div class="col">
+                                            <report-transactions-mapped-component></report-transactions-mapped-component>
+                                        </div>
+                                    </div>
+
                                 </div>
                             </div>
                         </div>

From 829ea9ad1773d18eb0432f609f089af9a3c17418 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sun, 15 Oct 2023 22:42:47 +0800
Subject: [PATCH 33/66] enhance import invoice mapping conditions

---
 .../Accounting/BankStatementController.php    |  2 +-
 .../ImportStatementInvoiceController.php      | 10 ++++++--
 .../StatementTransactionsDetailsComponent.vue | 25 +++++++++----------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Accounting/BankStatementController.php b/app/Http/Controllers/Accounting/BankStatementController.php
index ff1324b4..8e5ee138 100644
--- a/app/Http/Controllers/Accounting/BankStatementController.php
+++ b/app/Http/Controllers/Accounting/BankStatementController.php
@@ -129,7 +129,7 @@ class BankStatementController extends Controller
             ->download($statement->date_from->format('Y-m-d') . '_' . $statement->date_to->format('Y-m-d') . '_statement.csv');
     }
 
-    public function fetch(Request $request, ListBankStatementDetailsLogic $logic): JsonResponse
+    public function fetch(Request $request, ListBankStatementTransactionsLogic $logic): JsonResponse
     {
         return $logic->execute($request);
     }
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 2535f870..7ea3454e 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -140,8 +140,14 @@ class ImportStatementInvoiceController
         $transactions = Transaction::where('original_amount', $row['net_total'])->whereRaw("DATE(created_at) = '$date'")
         ->whereHas('receiverCompany', function($q) use($row) {
             $q->where('debtor',$row['debtor_code']);
-        })
-        ->get();
+        })->get();
+
+        if ($transactions && $transactions->count() == 0) {
+            $transactions = Transaction::where(DB::raw('FLOOR(original_amount)'), floor($row['net_total']))->whereRaw("DATE(created_at) = '$date'")
+            ->whereHas('receiverCompany', function($q) use($row) {
+                $q->where('debtor',$row['debtor_code']);
+            })->get();
+        }
 
         if ($transactions && $transactions->count() == 1) {
             foreach ($transactions as $key => $transaction) {
diff --git a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
index a0fb4a67..9ad2162f 100644
--- a/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/StatementTransactionsDetailsComponent.vue
@@ -65,10 +65,12 @@
                         <thead>
                             <tr>
                                 <th>ID</th>
-                                <th>Date</th>
+                                <th>Posting Date</th>
                                 <th>Description 1</th>
-                                <th>Pay For</th>
-                                <th>System References</th>
+                                <th>Description 2</th>
+                                <th>Description 3</th>
+                                <th>Description 4</th>
+                                <th>Description 5</th>
                                 <th>Amount</th>
                                 <th>Action</th>
                             </tr>
@@ -76,11 +78,12 @@
                         <tbody v-show="!isLoading">
                             <tr v-for="item in $store.getters.getListData(section)" :key="item.id">
                                 <td>{{item.id}}</td>
-                                <td>{{item.date}}</td>
-                                <td v-if="item.transaction_description_1 != null">{{item.transaction_description_1 | truncate(30, '...')}}</td>
-                                <td v-if="item.transaction_description_1 == null"></td>
-                                <td>{{item.pay_for}}</td>
-                                <td>{{item.system_references}}</td>
+                                <td>{{item.posting_date}}</td>
+                                <td>{{item.transaction_description_1}}</td>
+                                <td>{{item.transaction_description_2}}</td>
+                                <td>{{item.transaction_description_3}}</td>
+                                <td>{{item.transaction_description_4}}</td>
+                                <td>{{item.transaction_description_5}}</td>
                                 <td>{{item.amount}}</td>
                                 <td>
                                     <a href="#">
@@ -184,11 +187,7 @@ export default {
     },
     created(){
         this.setDecoratorDefault();
-        if (this.statement === 0) {
-            this.filters = { 'per_page': 10, order_by: {column: 'id', DESC: true} };
-        } else {
-            this.filters = { 'per_page': 10, order_by: {column: 'id', DESC: true}, 'has_account_statement_id': this.statement };
-        }
+        this.filters = { 'per_page': 10, order_by: {column: 'id', DESC: true} };
         this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
     },
     methods: {

From f943abcacb751ca1ce6e03e0fe8add697c7d56d7 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Mon, 16 Oct 2023 20:06:01 +0800
Subject: [PATCH 34/66] reduce queue job statement process qty

---
 app/Classes/Jobs/CreateBankStatementTransactionOwners.php | 8 +++++++-
 .../CreateBankStatementTransactionOwnersProcessor.php     | 6 +-----
 .../Controllers/Accounting/BankStatementController.php    | 5 ++++-
 app/Models/StatementTransaction.php                       | 8 ++++++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/Classes/Jobs/CreateBankStatementTransactionOwners.php b/app/Classes/Jobs/CreateBankStatementTransactionOwners.php
index e7797210..caab846f 100644
--- a/app/Classes/Jobs/CreateBankStatementTransactionOwners.php
+++ b/app/Classes/Jobs/CreateBankStatementTransactionOwners.php
@@ -13,9 +13,15 @@ class CreateBankStatementTransactionOwners implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
+    private $transactions;
+
+    public function __construct($transactions) {
+        $this->transactions = $transactions;
+    }
+    
     public function handle()
     {
-        (App()->make(CreateBankStatementTransactionOwnersProcessor::class))->execute();
+        (App()->make(CreateBankStatementTransactionOwnersProcessor::class))->execute($this->transactions);
     }
 
     public function delay($delay)
diff --git a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
index ccc70032..36fc684a 100644
--- a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
+++ b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
@@ -23,11 +23,7 @@ class CreateBankStatementTransactionOwnersProcessor
     /**
      * @return void
      */
-   public function execute() {
-
-       $transactions = StatementTransaction::whereDoesntHave('owners', function($query){
-           return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
-       })->orderBy('posting_date')->get();
+   public function execute($transactions) {
 
 //       $transactions = StatementTransaction::whereDoesntHave('owners')->where('amount', '<', 0)->get();
 
diff --git a/app/Http/Controllers/Accounting/BankStatementController.php b/app/Http/Controllers/Accounting/BankStatementController.php
index 8e5ee138..ac631ece 100644
--- a/app/Http/Controllers/Accounting/BankStatementController.php
+++ b/app/Http/Controllers/Accounting/BankStatementController.php
@@ -22,6 +22,7 @@ use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use DateTime;
+use App\Models\StatementTransaction;
 
 class BankStatementController extends Controller
 {
@@ -88,7 +89,9 @@ class BankStatementController extends Controller
 
     public function rerun()
     {
-        CreateBankStatementTransactionOwners::dispatch();
+        foreach (StatementTransaction::doesntMapStatement()->get()->chunk(30) as $key => $transaction) {
+            CreateBankStatementTransactionOwners::dispatch($transaction);
+        }
         return redirect()->back()->with('success', 'Rerun triggered successfully');
     }
 
diff --git a/app/Models/StatementTransaction.php b/app/Models/StatementTransaction.php
index 80d6759f..eb4bcdc8 100644
--- a/app/Models/StatementTransaction.php
+++ b/app/Models/StatementTransaction.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Staudenmeir\EloquentHasManyDeep\HasRelationships;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
 
 class StatementTransaction extends Model
 {
@@ -47,4 +48,11 @@ class StatementTransaction extends Model
     {
         return $this->hasMany(StatementTransactionOwner::class);
     }
+
+    public function scopeDoesntMapStatement($query)
+    {
+        $query->whereDoesntHave('owners', function($query){
+            return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+        })->orderBy('posting_date');
+    }
 }

From 3dcb64ecd1063f074e6185c6e72969ece78e54c4 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Tue, 17 Oct 2023 16:21:59 +0800
Subject: [PATCH 35/66] fix account number

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

diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 810df954..2fe00625 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -69,6 +69,6 @@
         Please transfer the payment to:<br>
         Bank: Maybank Berhad<br>
         Account Name: CIEF Worldwide Sdn Bhd<br>
-        Account No: 564892103405<br>
+        Account No: 568603010762<br>
     </div>
 @endsection

From 02db4d7d5f916454c802517157b9287931c61e53 Mon Sep 17 00:00:00 2001
From: Jia Sheng Lee <jiasheng224@gmail.com>
Date: Tue, 17 Oct 2023 17:20:17 +0800
Subject: [PATCH 36/66] fix download file name issue, and disable supplier
 selectable when data is fetching

---
 .../BulkDownloadSupplierWhiteFormsLogic.php                 | 5 +++--
 .../elements/DownloadSupplierWhiteFormComponent.vue         | 2 +-
 .../vue/components/bookings/elements/PaymentComponent.vue   | 2 +-
 .../assets/vue/components/general/forms/SelectComponent.vue | 6 +++++-
 .../vue/components/general/forms/SelectableComponent.vue    | 6 +++++-
 resources/assets/vue/general/mixins/request.js              | 4 ++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
index 0cec8515..87f0ad83 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/BulkDownloadSupplierWhiteFormsLogic.php
@@ -42,12 +42,13 @@ class BulkDownloadSupplierWhiteFormsLogic
                 }
     
                 $zip_file = "{$zipDirectory}/currency_vendor_orders_{$request->input('startDate')}_to_{$request->input('endDate')}_{$companyReference}.zip";
-    
+
                 $zip = new ZipArchive();
                 if ($zip->open($zip_file, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) {
                     foreach($groups as $group) {
                         $document = $group->documents()->where('document_type', DocumentType::CURRENCY_VENDOR_ORDER)->whereNull('deleted_at')->first()->files()->first();
-                        $zip->addFile(Storage::disk('documents')->path($document->file->file_info->original->file), $group->reference . '.pdf');
+                        $created_at = $group->created_at->format('Y-m-d');
+                        $zip->addFile(Storage::disk('documents')->path($document->file->file_info->original->file), $created_at . "_" . $group->amount . "_" . $group->reference . '.pdf');
                     } 
         
                     $zip->close();
diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
index afa2ebc2..827557ea 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -7,7 +7,7 @@
                         <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component selectable :validator="$v.parameters.supplier">
                                 <label>Supplier</label>
-                                <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="exportSupplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
+                                <selectable-component :disableOnFetch="true" :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="exportSupplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
                             </validation-wrapper-component>
                         </div>
                         <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
diff --git a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
index d947fe6f..1db46493 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
@@ -24,7 +24,7 @@
                         <div class="col padding-0">
                             <validation-wrapper-component selectable :validator="$v.filterSupplier">
                                 <label>Supplier</label>
-                                <selectable-component :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="supplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="filterSupplier"></selectable-component>
+                                <selectable-component :disableOnFetch="true" :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="supplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="filterSupplier"></selectable-component>
                             </validation-wrapper-component>
                         </div>
                         <div class="col-2 p-l-0">
diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue
index 1f902903..3629cbe0 100644
--- a/resources/assets/vue/components/general/forms/SelectComponent.vue
+++ b/resources/assets/vue/components/general/forms/SelectComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <select class="form-control">
+    <select class="form-control" :disabled="this.options.length === 0 && this.disableOnFetch">
         <option disabled></option>
     </select>
 </template>
@@ -13,6 +13,10 @@
             },
             value: {
                 required: false
+            },
+            disableOnFetch: {
+                type: Boolean,
+                default: false
             }
         },
         mounted(){
diff --git a/resources/assets/vue/components/general/forms/SelectableComponent.vue b/resources/assets/vue/components/general/forms/SelectableComponent.vue
index 95db6af8..d93dc4b5 100644
--- a/resources/assets/vue/components/general/forms/SelectableComponent.vue
+++ b/resources/assets/vue/components/general/forms/SelectableComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <select-component  :options="$store.getters.getSelectableList(section)" :value="value" @input="(val) => {$emit('input', val)}"></select-component>
+    <select-component :disableOnFetch="disableOnFetch" :options="$store.getters.getSelectableList(section)" :value="value" @input="(val) => {$emit('input', val)}"></select-component>
 </template>
 <script>
 
@@ -23,6 +23,10 @@
             valueColumn: {
                 type: String,
                 required: true
+            },
+            disableOnFetch: {
+                type: Boolean,
+                default: false
             }
         },
         created(){
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index 4c3e5929..940ad464 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -14,7 +14,7 @@ export default {
                     success = response.ok;
 
                 if (response.headers.get("content-type") === "application/zip") {
-                    const fileName = response.headers.get('Content-Disposition').split('filename=')[1];
+                    const fileName = response.headers.get('Content-Disposition').split('filename=')[1].replaceAll('"', '');
 
                     response.blob().then(response => {
                         if (!success) {
@@ -27,7 +27,7 @@ export default {
 
                         const link = document.createElement('a');
                         link.href = window.URL.createObjectURL(response);
-                        link.download = fileName;
+                        link.download = fileName.trim();
                         link.click();
                         this.successHandler(response)
                     });

From 18aecc1f715ae24dcf6cb929b2efa6967be4b0c7 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 18 Oct 2023 14:35:04 +0800
Subject: [PATCH 37/66] fix store date conflict between different tabs

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

diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 10f541f4..9d74dce1 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -94,7 +94,7 @@
                                 </div>
                             </div>
 
-                            <list-component ref="bankTransactionsList" section="bankTransactionSection" :endpoint="route('api.accounting.bank.transaction')" :options="this.filter">
+                            <list-component :key="stage" ref="bankTransactionsList" section="bankTransactionSection" :endpoint="route('api.accounting.bank.transaction')" :options="this.filter">
                                 <template slot="list" slot-scope="{data}">
                                     <statement-transaction-component :data="data" :section="section" :stage="stage" :selectAll="selectAll"></statement-transaction-component>
                                 </template>

From 8e67c219a9cb807948625870b4622dc8f584deb7 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Fri, 20 Oct 2023 14:56:35 +0800
Subject: [PATCH 38/66] fix wallet pagination

---
 .../ListWalletTransactionsLogic.php                | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ListWalletTransactionsLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ListWalletTransactionsLogic.php
index 0b70b484..649b3309 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/ListWalletTransactionsLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ListWalletTransactionsLogic.php
@@ -44,7 +44,19 @@ class ListWalletTransactionsLogic extends AbstractControllerLogic
         $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($request->input('filters')));
 
         if (str_contains($request->input('filters'), "owner_id") && $query->count() > 0) {
-            $currentWalletBalance = Wallet::find($query->first()->owner_id)->amount;
+            $wallet_total_incoming = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::TOP_UP, TransactionType::CREDIT_NOTE])
+                ->sum('amount');
+            
+            $wallet_total_outgoing = Transaction::where('owner_type', $query->first()->owner_type)
+                ->where('owner_id', $query->first()->owner_id)
+                ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                ->whereIn('type', [TransactionType::PAYMENT, TransactionType::DEBIT_NOTE])
+                ->sum('amount');
+
+            $currentWalletBalance = $wallet_total_incoming - $wallet_total_outgoing;
             $incoming = Transaction::where('owner_type', $query->first()->owner_type)
                 ->where('owner_id', $query->first()->owner_id)
                 ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])

From 05b5823fe4d9c579bbd84440865a0efb35c67b92 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Mon, 23 Oct 2023 09:20:35 +0800
Subject: [PATCH 39/66] fixing unable mapping records and filtering function in
 Pending Export tab and listing data not same in Pending Export tab with
 export Invoice to autocount and calculate mapped percentage

---
 .../StatementTransactionPostingEnd.php        | 18 +++++
 .../StatementTransactionPostingStart.php      | 18 +++++
 ...ankStatementTransactionOwnersProcessor.php | 49 +++++++------
 .../Services/ExportsInvoiceTransactions.php   | 27 +++----
 app/Models/AccountStatement.php               |  2 +
 ...apped_rate_to_account_statements_table.php | 34 +++++++++
 .../StatementTransactionComponent.vue         |  2 +-
 .../sections/TransactionsMappingComponent.vue | 71 +++++++++++++++++--
 8 files changed, 182 insertions(+), 39 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionPostingEnd.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionPostingStart.php
 create mode 100644 database/migrations/2023_10_22_140339_add_mapped_rate_to_account_statements_table.php

diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionPostingEnd.php b/app/Classes/General/Eloquent/Filters/StatementTransactionPostingEnd.php
new file mode 100644
index 00000000..e837245e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionPostingEnd.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionPostingEnd implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('posting_date', '<=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionPostingStart.php b/app/Classes/General/Eloquent/Filters/StatementTransactionPostingStart.php
new file mode 100644
index 00000000..c3560357
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionPostingStart.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionPostingStart implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('posting_date', '>=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
index 36fc684a..6f7efe5e 100644
--- a/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
+++ b/app/Classes/Modules/Accounting/Processors/CreateBankStatementTransactionOwnersProcessor.php
@@ -28,6 +28,7 @@ class CreateBankStatementTransactionOwnersProcessor
 //       $transactions = StatementTransaction::whereDoesntHave('owners')->where('amount', '<', 0)->get();
 
         foreach ($transactions as $transaction) {
+            $mapped = false;
             $keywords = array_filter(explode(" ", $transaction->transaction_description . " " . $transaction->transaction_description_2));
 
             if($transaction->amount > 0){
@@ -36,7 +37,7 @@ class CreateBankStatementTransactionOwnersProcessor
                 $creditTransactions = $this->getTransactions($transaction->posting_date, $transaction->amount, TransactionType::PAYMENT, Booking::class, PaymentMethodType::WALLET, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED], $keywords);
                 foreach ($creditTransactions as $creditTransaction) {
                     $isArray = is_array($creditTransaction);
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                             'type' => StatementTransactionOwnerType::SALES,
                             'system' => 'EXCHANGE',
                             'owner_type' => Transaction::class,
@@ -45,12 +46,11 @@ class CreateBankStatementTransactionOwnersProcessor
                     ]);
                 }
 
-
                 // Shipping Portal Sales
-                $creditTransactions = $this->getTransactionsFromShippingPortal($transaction->amount, $this->getDateRange($transaction->posting_date, 1), 2, PaymentMethodType::WALLET);
+                $creditTransactions = $this->getTransactionsFromShippingPortal($transaction->amount, $this->getDateRange($transaction->posting_date, 1), [2], PaymentMethodType::WALLET);
                 foreach ($creditTransactions as $creditTransaction) {
                     if($creditTransaction['owner_type'] === Wallet::class) continue;
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::SALES,
                         'system' => 'SHIPPING_PORTAL',
                         'owner_type' => $creditTransaction['owner_type'],
@@ -63,7 +63,7 @@ class CreateBankStatementTransactionOwnersProcessor
                 $creditTransactions = $this->getTransactions($transaction->posting_date, $transaction->amount, TransactionType::TOP_UP, Wallet::class, null, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED], $keywords);
                 foreach ($creditTransactions as $creditTransaction) {
                     $isArray = is_array($creditTransaction);
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                             'type' => StatementTransactionOwnerType::WALLET_TOP_UP,
                             'system' => 'EXCHANGE',
                             'owner_type' => Transaction::class,
@@ -72,9 +72,9 @@ class CreateBankStatementTransactionOwnersProcessor
                     ]);
                 }
 
-                $creditTransactions = $this->getTransactionsFromShippingPortal($transaction->amount, $this->getDateRange($transaction->posting_date, 1), 5, null);
+                $creditTransactions = $this->getTransactionsFromShippingPortal($transaction->amount, $this->getDateRange($transaction->posting_date, 1), [5,15], null);
                 foreach ($creditTransactions as $creditTransaction) {
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::WALLET_TOP_UP,
                         'system' => 'SHIPPING_PORTAL',
                         'owner_type' => $creditTransaction['owner_type'],
@@ -85,7 +85,7 @@ class CreateBankStatementTransactionOwnersProcessor
 
                 // fpx charge refund
                 if($transaction->transaction_description === 'DUITNOW S/CHRG REFUND'){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::FPX_CHARGE_REFUND
                     ]);
                 }
@@ -94,7 +94,7 @@ class CreateBankStatementTransactionOwnersProcessor
 
                 // INTERNAL_BANK_TRANSFER_IN
                 if(str_contains($transaction->transaction_description_2, 'CIEF WORLDWIDE')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::INTERNAL_BANK_TRANSFER_IN
                     ]);
                 }
@@ -119,7 +119,7 @@ class CreateBankStatementTransactionOwnersProcessor
                             ->where('amount', '<=', (($transaction->amount * -1) + 0.01))->whereDate('created_at', '>=', $paymentDateStart)->whereDate('created_at', '<=', $paymentDateEnd)->get();
 
                         foreach ($debitTransactions as $debitTransaction) {
-                            $transaction->owners()->firstOrCreate([
+                            $data = $transaction->owners()->firstOrCreate([
                                 'type' => StatementTransactionOwnerType::SUPPLIER_PAYMENT,
                                 'system' => 'EXCHANGE',
                                 'owner_type' => Group::class,
@@ -135,7 +135,7 @@ class CreateBankStatementTransactionOwnersProcessor
                 $debitTransactions = $this->getTransactions($transaction->posting_date, $transaction->amount, TransactionType::DEBIT_NOTE, Wallet::class, null, [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED], $keywords);
                 foreach ($debitTransactions as $debitTransaction) {
                     $isArray = is_array($creditTransaction);
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::WALLET_WITHDRAWAL,
                         'system' => 'EXCHANGE',
                         'owner_type' => Transaction::class,
@@ -148,50 +148,52 @@ class CreateBankStatementTransactionOwnersProcessor
 
                 // STATUTORY
                 if(str_contains($transaction->transaction_description_2, 'PEMBANGUNAN SUMBER') || str_contains($transaction->transaction_description_2, 'HASIL') || str_contains($transaction->transaction_description_2, 'PERTUBUHAN KESELAMAT') || str_contains($transaction->transaction_description_2, 'KUMPULAN WANG SIMPAN')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::STATUTORY
                     ]);
                 }
 
                 // FPX_CHARGE
                 if($transaction->transaction_description === 'DR DUITNOW S/CHRG' || str_contains($transaction->transaction_description, 'Manual FPX') || str_contains($transaction->transaction_description, 'CMS - DR FPX CHG')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::FPX_CHARGE
                     ]);
                 }
 
                 // BANK_CHARGE
                 if($transaction->transaction_description === 'CMS - DR CORP CHG' || $transaction->transaction_description === 'MONTHLY PROFIT DEBIT'){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::BANK_CHARGE
                     ]);
                 }
 
                 // CREDIT_CARD_PAYMENT
                 if(str_contains($transaction->transaction_description_2, 'VISA CARD')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::CREDIT_CARD_PAYMENT
                     ]);
                 }
 
                 // INTERNAL_BANK_TRANSFER_OUT
                 if(str_contains($transaction->transaction_description_2, 'CIEF WORLDWIDE') || str_contains($transaction->transaction_description_2, 'CIEF WORLWIDE') || str_contains($transaction->transaction_description_2, 'IZYIM GLOBAL')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::INTERNAL_BANK_TRANSFER_OUT
                     ]);
                 }
 
                 // non-operational charges
                 if(str_contains($transaction->transaction_description_2, 'HIRE PURCHASE') || str_contains($transaction->transaction_description_2, 'TENAGA NASIONAL') || str_contains($transaction->transaction_description, 'CABLE CHARGE') || str_contains($transaction->transaction_description_2, 'CTOS DATA SYSTEMS') || str_contains($transaction->transaction_description_2, 'MAXIS')){
-                    $transaction->owners()->firstOrCreate([
+                    $data = $transaction->owners()->firstOrCreate([
                         'type' => StatementTransactionOwnerType::NON_OPERATIONAL
                     ]);
                 }
             }
+            if (isset($data) && $data->wasRecentlyCreated) $mapped = true;
+            $this->updateMappedRate($transaction, $mapped);
         }
-   }
+    }
 
-   private function getTransactions($date, $amount, $type, $ownerType, $paymentMethod, $statuses, $keywords, $model = Transaction::class) {
+    private function getTransactions($date, $amount, $type, $ownerType, $paymentMethod, $statuses, $keywords, $model = Transaction::class) {
         $dateRange = $this->getDateRange($date, 4);    
         if (App::environment(['production'])) {
             $query = $model::whereIn('status', $statuses)
@@ -318,7 +320,7 @@ class CreateBankStatementTransactionOwnersProcessor
         try{
 
             $client = new \GuzzleHttp\Client(['verify' => false]);
-            $response = $client->request('GET', $url.'?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&filters={"order_by":{"column":"id","DESC":true},"status_in":[2]'.$paymentMethodFilter.',"created_after":"'.$dateRange['start_date'].'","created_before":"'.$dateRange['end_date'].'","amount_exceed":'.($amount - 0.01).',"amount_short":'.($amount + 0.01).',"type_in":['.$type.']}');
+            $response = $client->request('GET', $url.'?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&filters={"order_by":{"column":"id","DESC":true},"status_in":[2]'.$paymentMethodFilter.',"created_after":"'.$dateRange['start_date'].'","created_before":"'.$dateRange['end_date'].'","amount_exceed":'.($amount - 0.01).',"amount_short":'.($amount + 0.01).',"type_in":'.json_encode($type).'}');
             $body = $response->getBody();
             $data = json_decode($body, true);
             $payload = $data['payload'];
@@ -345,4 +347,11 @@ class CreateBankStatementTransactionOwnersProcessor
             'end_date' => $nextDay,
         ];
     }
+
+    private function updateMappedRate($transaction, $mapped) {
+        $statement = $transaction->statement;
+        $statement->total_rows = StatementTransaction::where('account_statement_id',$transaction->account_statement_id)->count();
+        $statement->mapped_rows = $mapped ? $statement->mapped_rows+1 : $statement->mapped_rows;
+        $statement->save();
+    }
 }
diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 79ca4380..2ecaada8 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -4,7 +4,6 @@ namespace App\Classes\Modules\Exports\Services;
 
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType;
-use App\Models\StatementTransactionOwner;
 use App\Models\Transaction;
 use Maatwebsite\Excel\Concerns\Exportable;
 use Maatwebsite\Excel\Concerns\FromQuery;
@@ -18,6 +17,8 @@ use App\Classes\Modules\Accounting\Processors\ListShippingPortalTransactions;
 use App\Classes\ValueObjects\Constants\ShippingTransactionType;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\Log;
+use App\Classes\General\Eloquent\ApplyFiltersToQuery;
+use App\Models\StatementTransaction;
 
 class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
 {
@@ -64,10 +65,9 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
      */
     public function query()
     {
-        $data = StatementTransactionOwner::whereNull('invoice_reference')
-            ->whereIn('type', [StatementTransactionOwnerType::SALES, StatementTransactionOwnerType::WALLET_TOP_UP])
-            ->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED]);
-        if ($this->request->has('bankStatementOwnerId')) $data = $data->whereIn('id',json_decode($this->request->input('bankStatementOwnerId')));
+        $data = (new ApplyFiltersToQuery())->execute(StatementTransaction::query(), json_decode($this->request->input('filter'), true));
+        if ($this->request->has('bankStatementTransactionId')) $data = $data->whereIn('id',json_decode($this->request->input('bankStatementTransactionId'), true));
+
         return $data;
     }
 
@@ -78,11 +78,12 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
      */
     public function map($transaction): array
     {
+        $statementTransactionOwner = $transaction->owners()->whereIn('status', [ApprovalStatus::APPROVED])->first();
         $logArray = [
             'counter' => $this->counter,
-            'system' => $transaction->system,
-            'StatementTransactionOwner_id' => $transaction->id,
-            'transaction_table_id' => $transaction->owner_id,
+            'system' => $statementTransactionOwner->system,
+            'StatementTransactionOwner_id' => $statementTransactionOwner->id,
+            'transaction_table_id' => $statementTransactionOwner->owner_id,
         ];
         $this->counter += 1;
         $logArray = json_encode($logArray);
@@ -92,8 +93,8 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
         $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $logArray . PHP_EOL;
         file_put_contents($filePath, $textToAppend, FILE_APPEND);
 
-        if ($transaction->system == 'EXCHANGE') {
-            $row = (App()->make($transaction->owner_type))->where('id', $transaction->owner_id)->first();
+        if ($statementTransactionOwner->system == 'EXCHANGE') {
+            $row = (App()->make($statementTransactionOwner->owner_type))->where('id', $statementTransactionOwner->owner_id)->first();
             $company = $row->type === TransactionType::PAYMENT ? $row->owner->company : $row->owner->owner;
 
             $booking = $row->owner;
@@ -116,15 +117,15 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
             ];
         } else {
             $row = (App()->make(ListShippingPortalTransactions::class))->execute([
-                'id' => $transaction->owner_id,
+                'id' => $statementTransactionOwner->owner_id,
                 'with_company' => true,
             ]);
 
             if (empty($row) || $row[0]['status'] != 'success') {
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Fetch Shipping Transaction Fail ' . json_encode([
-                    'id' => $transaction->owner_id,
+                    'id' => $statementTransactionOwner->owner_id,
                     'with_company' => true,
-                    'StatementTransactionOwner_id' => $transaction->id,
+                    'StatementTransactionOwner_id' => $statementTransactionOwner->id,
                 ]) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
 
diff --git a/app/Models/AccountStatement.php b/app/Models/AccountStatement.php
index d9e53d60..2f5b0e8c 100644
--- a/app/Models/AccountStatement.php
+++ b/app/Models/AccountStatement.php
@@ -16,6 +16,8 @@ class AccountStatement extends Model
         'total_amount',
         'begin_balance',
         'end_balance',
+        'total_rows',
+        'mapped_rows',
     ];
 
     protected $casts = [
diff --git a/database/migrations/2023_10_22_140339_add_mapped_rate_to_account_statements_table.php b/database/migrations/2023_10_22_140339_add_mapped_rate_to_account_statements_table.php
new file mode 100644
index 00000000..f6a8e7e7
--- /dev/null
+++ b/database/migrations/2023_10_22_140339_add_mapped_rate_to_account_statements_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddMappedRateToAccountStatementsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('account_statements', function (Blueprint $table) {
+            $table->integer('total_rows')->unsigned()->default(0)->after('end_balance');
+            $table->integer('mapped_rows')->unsigned()->default(0)->after('end_balance');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('account_statements', function (Blueprint $table) {
+            $table->dropColumn('total_rows');
+            $table->dropColumn('mapped_rows');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 1caef408..b09b9a56 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -126,7 +126,7 @@
 
                 <!-- Pending Export tab for checkbox here -->
                 <div class="col-1" v-if="item.owners.approved.length === 1">
-                    <input type="checkbox" class="request_export_item" v-model="selectAll" :value="item.owners.approved[0].id">
+                    <input type="checkbox" class="request_export_item" v-model="selectAll" :value="item.id">
                 </div>
 
                 <div class="col-1 text-danger" v-if="!item.owners.approved.length">Pending...</div>
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 9d74dce1..4604f2e5 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -74,6 +74,32 @@
                                     </general-confirmation-form-component>
                                 </modal-component>
                             </div>
+
+                            <!-- filter for Pending Export tab -->
+                            <div v-if="stage === 4">
+                                <div class="row pt-3 pb-3">
+                                    <div class="col-5 col-md-3 ">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-5 col-md-3 ">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-2 col-md-auto">
+                                        <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="startMapping(4)">
+                                            <span>
+                                                Search
+                                            </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
                             <div class="row m-t-10 m-b-10">
                                 <div class="col">
                                     <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
@@ -202,6 +228,10 @@ export default {
 
     data(){
         return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+            },
             type: null,
             stage: null,
             exportStage: 0,
@@ -215,6 +245,14 @@ export default {
         }
     },
     validations: {
+        parameters: {
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+        },
         files: {
             // required // todo-new: set required if is pdf section
         }
@@ -227,17 +265,31 @@ export default {
             this.mappedTrue = true;
         },
         exportInvoiceToAutoCount(){
-            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+this.getCheckedStatementOwners()+'&type=invoices', '_blank');
+            const checkedStatementTransactions = this.getCheckedStatementOwners();
+
+            let route = this.route('invoiceTransactions.export')+'?type=invoices&filter='+JSON.stringify(this.filter);
+            if (checkedStatementTransactions) {
+                route += '&bankStatementTransactionId='+checkedStatementTransactions;
+            }
+
+            window.open(route, '_blank');
         },
         exportReceiptToAutoCount(){
-            window.open(this.route('invoiceTransactions.export')+'?bankStatementOwnerId='+this.getCheckedStatementOwners()+'&type=receipts', '_blank');
+            const checkedStatementTransactions = this.getCheckedStatementOwners();
+
+            let route = this.route('invoiceTransactions.export')+'?type=receipts&filter='+JSON.stringify(this.filter);
+            if (checkedStatementTransactions) {
+                route += '&bankStatementTransactionId='+checkedStatementTransactions;
+            }
+
+            window.open(route, '_blank');
         },
         getCheckedStatementOwners() {
-            let bankStatementOwnerId = [];
+            let bankStatementTransactionId = [];
             $('.request_export_item:checked').each(function() {
-                bankStatementOwnerId.push($(this).val());
+                bankStatementTransactionId.push($(this).val());
             });
-            return JSON.stringify(bankStatementOwnerId);
+            return (bankStatementTransactionId.length > 0 ? JSON.stringify(bankStatementTransactionId) : null);
         },
         successHandler(){
             this.step += 1;
@@ -263,6 +315,10 @@ export default {
                         break;
                     case 4:
                         this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+
+                        if (typeof this.parameters.startDate != 'undefined' && this.parameters.startDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};
+
+                        if (typeof this.parameters.endDate != 'undefined' && this.parameters.endDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_end:this.parameters.endDate}};
                         break;
                 }
             }
@@ -280,6 +336,11 @@ export default {
                         break;
                     case 4:
                         this.filter = {max_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [3, 5], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+
+                        if (typeof this.parameters.startDate != 'undefined' && this.parameters.startDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};
+
+                        if (typeof this.parameters.endDate != 'undefined' && this.parameters.endDate != '') this.filter = {...this.filter, ...{statement_transaction_posting_end:this.parameters.endDate}};
+
                         break;
                 }
             }

From bc5a8a91939e3b992a20ff0bb61069ba505bebd4 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 24 Oct 2023 21:21:51 +0800
Subject: [PATCH 40/66] fix bug in function import invoices

---
 .../Imports/ImportStatementInvoiceController.php | 10 ++--------
 app/Models/StatementTransactionOwner.php         |  1 +
 app/Models/Transaction.php                       | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 7ea3454e..73e58e87 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -137,16 +137,10 @@ class ImportStatementInvoiceController
 
     private function mappingExchange(Array $row) {
         $date = $row['date'];
-        $transactions = Transaction::where('original_amount', $row['net_total'])->whereRaw("DATE(created_at) = '$date'")
-        ->whereHas('receiverCompany', function($q) use($row) {
-            $q->where('debtor',$row['debtor_code']);
-        })->get();
+        $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['net_total'])->whereRaw("DATE(posting_date) = '$date'")->get();
 
         if ($transactions && $transactions->count() == 0) {
-            $transactions = Transaction::where(DB::raw('FLOOR(original_amount)'), floor($row['net_total']))->whereRaw("DATE(created_at) = '$date'")
-            ->whereHas('receiverCompany', function($q) use($row) {
-                $q->where('debtor',$row['debtor_code']);
-            })->get();
+            $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['net_total']))->whereRaw("DATE(posting_date) = '$date'")->get();
         }
 
         if ($transactions && $transactions->count() == 1) {
diff --git a/app/Models/StatementTransactionOwner.php b/app/Models/StatementTransactionOwner.php
index fb13f4b4..bd96efff 100644
--- a/app/Models/StatementTransactionOwner.php
+++ b/app/Models/StatementTransactionOwner.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class StatementTransactionOwner extends Model
 {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 631a5fa5..185fdb36 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -221,6 +221,22 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $query->whereIn('status', [ApprovalStatus::APPROVED]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeGetReceiverWithJoinStatementTransactionAndOwner(Builder $query, Array $row) {
+        $query->join('companies',function($q) use ($row) {
+            $q->on('companies.id','=','transactions.receiver');
+            $q->where('debtor',$row['debtor_code']);
+        })
+        ->join('statement_transaction_owners', function ($q) {
+            $q->on('statement_transaction_owners.owner_id','=','transactions.id');
+            $q->where('statement_transaction_owners.owner_type','=',Transaction::class);
+        })
+        ->join('statement_transactions','statement_transactions.id','=','statement_transaction_owners.statement_transaction_id');
+    }
+
     /**
      * @return MorphMany
      */

From 910f190075c82c4e2467abab2318e6236f1365cd Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 25 Oct 2023 18:03:31 +0800
Subject: [PATCH 41/66] fixing the unknown tab to list the transactions of
 is_mapped false and also mapped and status in rejected

---
 .../IsMappedFalseOrMappedButStatusIn.php      | 25 +++++++++++++++++++
 .../sections/TransactionsMappingComponent.vue |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php

diff --git a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
new file mode 100644
index 00000000..8b264ff5
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class IsMappedFalseOrMappedButStatusIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where(function($q) use ($value) {
+            $q->whereDoesntHave('owners');
+            $q->orwhereHas('owners', function($query) use ($value) {
+                $query->whereIn('status', $value);
+            });
+        });
+    }
+
+}
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 4604f2e5..160221bf 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -311,7 +311,7 @@ export default {
                         this.filter = {min_amount: 0, is_mapped: true, is_mapped_with_multiple: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [1], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 3:
-                        this.filter = {min_amount: 0, is_mapped: false, per_page: 100, order_by: {column: 'posting_date', DESC: true}}
+                        this.filter = {min_amount: 0, is_mapped_false_or_mapped_but_status_in: [4], per_page: 100, order_by: {column: 'posting_date', DESC: true}}
                         break;
                     case 4:
                         this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], per_page: 100, order_by: {column: 'posting_date', DESC: true}}

From f47c3c9ecc1e4cfdb81121c85759d88a8ae80431 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Thu, 26 Oct 2023 00:01:10 +0800
Subject: [PATCH 42/66] fixing the unknown tab to list the transactions of
 is_mapped false and also mapped and status in rejected

---
 .../Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php    | 4 +---
 app/Models/StatementTransaction.php                          | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
index 8b264ff5..c0eb9e74 100644
--- a/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
+++ b/app/Classes/General/Eloquent/Filters/IsMappedFalseOrMappedButStatusIn.php
@@ -16,9 +16,7 @@ class IsMappedFalseOrMappedButStatusIn implements Filter
     {
         return $builder->where(function($q) use ($value) {
             $q->whereDoesntHave('owners');
-            $q->orwhereHas('owners', function($query) use ($value) {
-                $query->whereIn('status', $value);
-            });
+            $q->orwhereDoesntHave('owner_status');
         });
     }
 
diff --git a/app/Models/StatementTransaction.php b/app/Models/StatementTransaction.php
index eb4bcdc8..4bba7903 100644
--- a/app/Models/StatementTransaction.php
+++ b/app/Models/StatementTransaction.php
@@ -49,6 +49,11 @@ class StatementTransaction extends Model
         return $this->hasMany(StatementTransactionOwner::class);
     }
 
+    public function owner_status()
+    {
+        return $this->owners()->whereIn('status',[ApprovalStatus::APPROVED,ApprovalStatus::COMPLETED,ApprovalStatus::PENDING_VERIFICATION]);
+    }
+
     public function scopeDoesntMapStatement($query)
     {
         $query->whereDoesntHave('owners', function($query){

From 5b681ac8c05e2f1f1fbd9b2292caaa2982322f26 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sun, 29 Oct 2023 08:44:31 +0800
Subject: [PATCH 43/66] fixing the structure of  export receipt to autocount
 and import receipt to exchange map failed

---
 .../Services/ExportsInvoiceTransactions.php   |  21 +--
 .../Services/ExportsReceiptTransactions.php   | 132 ++++++++++++++++++
 .../ExportCustomersToExcelController.php      |  10 +-
 .../ImportStatementReceiptsController.php     |  11 +-
 .../sections/TransactionsMappingComponent.vue |   5 +-
 routes/web.php                                |   1 +
 6 files changed, 158 insertions(+), 22 deletions(-)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 2ecaada8..796ec19d 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -34,19 +34,12 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
     public function headings(): array
     {
-        $header = [];
-        if ($this->request->input('type') == 'invoices') {
-            $header[] = 'DocNo';
-            $header[] = 'DocDate';
-            $header[] = 'DebtorCode';
-        } else {
-            $header[] = 'OrNo';
-            $header[] = 'OrDate';
-            $header[] = 'CreditorCode';
-        }
-        $header[] = 'Ref';
-        $header[] = ($this->request->input('type') == 'invoices' ? 'DebtorName' : 'CreditorName');
-        $header = array_merge($header, [
+        $header = [
+            'DocNo',
+            'DocDate',
+            'DebtorCode',
+            'Ref',
+            'DebtorName',
             'CurrencyCode',
             'ShipInfo',
             'ItemCode',
@@ -56,7 +49,7 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
             'UnitPrice',
             'AccNo',
             'DeptNo'
-        ]);
+        ];
         return $header;
     }
 
diff --git a/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php b/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php
new file mode 100644
index 00000000..07c5d3c1
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
+use App\Classes\General\Eloquent\ApplyFiltersToQuery;
+use App\Models\StatementTransaction;
+use App\Models\Company;
+
+class ExportsReceiptTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+    private $counter = 1;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        $header = [
+            'DocNo',
+            'DocDate',
+            'DebtorCode',
+            'Description',
+            'DocNo2',
+            'ProjNo',
+            'DeptNo',
+            'CurrencyCode',
+            'ToHomeRate',
+            'ToDebtorRate',
+            'Note',
+            'PaymentMethod',
+            'ChequeNo',
+            'PaymentAmt',
+            'BankCharge',
+            'ToBankRate',
+            'BankChargeTaxType',
+            'BankChargeTaxRefNo',
+            'BankChargeProjNo',
+            'BankChargeDeptNo',
+            'PaymentBy',
+            'FloatDay',
+            'IsRCHQ',
+            'RCHQDate',
+            'KnockOffDocType',
+            'KnockOffDocNo',
+            'KnockOffAmt',
+            '',
+        ];
+        return $header;
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $data = (new ApplyFiltersToQuery())->execute(StatementTransaction::query(), json_decode($this->request->input('filter'), true));
+        if ($this->request->has('bankStatementTransactionId')) $data = $data->whereIn('id',json_decode($this->request->input('bankStatementTransactionId'), true));
+
+        return $data;
+    }
+
+    /**
+     * @param StatementTransaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $statementTransactionOwner = $transaction->owners()->whereIn('status', [ApprovalStatus::APPROVED])->first();
+        $logArray = [
+            'counter' => $this->counter,
+            'system' => $statementTransactionOwner->system,
+            'StatementTransactionOwner_id' => $statementTransactionOwner->id,
+            'transaction_table_id' => $statementTransactionOwner->owner_id,
+        ];
+        $this->counter += 1;
+        $logArray = json_encode($logArray);
+
+        $filePath = storage_path('logs/exports_receipt_transactions.log');
+        $errorFilePath = storage_path('logs/exports_receipt_transactions_error.log');
+        $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' ' . $logArray . PHP_EOL;
+        file_put_contents($filePath, $textToAppend, FILE_APPEND);
+
+        $company = Company::where('name',$transaction->transaction_description_2)->first();
+
+        return [
+            '<<New>>',
+            Carbon::parse($transaction->posting_date)->format('d/m/Y'),
+            ($company ? $company->debtor : null),
+            $transaction->transaction_description,
+            '',
+            '',
+            '',
+            'MYR',
+            1,
+            1,
+            '',
+            'MBB',
+            '',
+            $transaction->amount,
+            '',
+            1,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '0',
+            '',
+            '',
+            'RI',
+            $transaction->transaction_ref,
+            $transaction->amount,
+            '',
+        ];
+    }
+}
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 7dfe0485..733c84fa 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -17,6 +17,7 @@ use Illuminate\Support\Facades\Auth;
 use Maatwebsite\Excel\Excel;
 use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
+use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
 
 class ExportCustomersToExcelController
 {
@@ -61,7 +62,14 @@ class ExportCustomersToExcelController
 
     public function invoiceTransactions(Request $request){
         $exportsTransactions = new ExportsInvoiceTransactions($request);
-        $response = $exportsTransactions->download(($request->input('type') == 'invoices' ? 'invoice-transactions' : 'receipt-transactions').'.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        $response = $exportsTransactions->download('invoice-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
+    public function receiptTransactions(Request $request){
+        $exportsTransactions = new ExportsReceiptTransactions($request);
+        $response = $exportsTransactions->download('receipt-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
         ob_end_clean();
         return $response;
     }
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index 8021e3a9..f3b89db7 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -21,6 +21,7 @@ use App\Models\TransactionMappingLog;
 use App\Classes\ValueObjects\Response\ApiResponseObject;
 use App\Classes\ValueObjects\Constants\HttpStatus;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
 
 class ImportStatementReceiptsController
 {
@@ -78,11 +79,11 @@ class ImportStatementReceiptsController
 
     private function mappingExchange(Array $row) {
         $date = $row['date'];
-        $transactions = Transaction::where('original_amount', $row['local_payment_amount'])->whereRaw("DATE(created_at) = '$date'")
-        ->whereHas('issuerCompany', function($q) use($row) {
-            $q->where('debtor',$row['debtor_code']);
-        })
-        ->get();
+        $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['payment_amount'])->whereRaw("DATE(posting_date) = '$date'")->get();
+
+        if ($transactions && $transactions->count() == 0) {
+            $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['payment_amount']))->whereRaw("DATE(posting_date) = '$date'")->get();
+        }
 
         if ($transactions && $transactions->count() == 1) {
             foreach ($transactions as $key => $transaction) {
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 160221bf..7a677bad 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -267,7 +267,7 @@ export default {
         exportInvoiceToAutoCount(){
             const checkedStatementTransactions = this.getCheckedStatementOwners();
 
-            let route = this.route('invoiceTransactions.export')+'?type=invoices&filter='+JSON.stringify(this.filter);
+            let route = this.route('invoiceTransactions.export')+'?filter='+JSON.stringify(this.filter);
             if (checkedStatementTransactions) {
                 route += '&bankStatementTransactionId='+checkedStatementTransactions;
             }
@@ -277,7 +277,8 @@ export default {
         exportReceiptToAutoCount(){
             const checkedStatementTransactions = this.getCheckedStatementOwners();
 
-            let route = this.route('invoiceTransactions.export')+'?type=receipts&filter='+JSON.stringify(this.filter);
+            this.filter['statement_transaction_owner_type_in'] = [3,4,5,7,13,14];
+            let route = this.route('receiptTransactions.export')+'?filter='+JSON.stringify(this.filter);
             if (checkedStatementTransactions) {
                 route += '&bankStatementTransactionId='+checkedStatementTransactions;
             }
diff --git a/routes/web.php b/routes/web.php
index 1dece5c3..18f8aa86 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,6 +261,7 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
+Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
 Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {

From 5c5f54e03b6256131291cedf79d75e3d5ba0f6cc Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 30 Oct 2023 18:39:19 +0800
Subject: [PATCH 44/66] delete booking / expire the order payment

---
 .../ExpireBookingPaymentControllerLogic.php   | 57 +++++++++++++++++++
 .../ExpireBookingPaymentController.php        | 20 +++++++
 .../BookingDetailsSectionComponent.vue        | 16 ++++++
 routes/booking.php                            |  1 +
 4 files changed, 94 insertions(+)
 create mode 100644 app/Classes/Modules/Bookings/ControllersLogic/ExpireBookingPaymentControllerLogic.php
 create mode 100644 app/Http/Controllers/Bookings/ExpireBookingPaymentController.php

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/ExpireBookingPaymentControllerLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/ExpireBookingPaymentControllerLogic.php
new file mode 100644
index 00000000..8ee2bbfa
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/ExpireBookingPaymentControllerLogic.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ExpireBookingPaymentControllerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Expire Payment',
+            'message' => 'You have successfully expire the Payment'
+        ];
+    }
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /**
+     * DeletePurchaseOrderPdfLogic constructor.
+     * @param FetchesBooking $fetchesBooking
+     */
+    public function __construct(fetchesBooking $fetchesBooking)
+    {
+        $this->fetchesBooking = $fetchesBooking;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $payment = $booking->transactions()
+            ->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+            ->first();
+
+        $payment->status = ApprovalStatus::EXPIRED;
+        $payment->save();
+
+        return $this->response([]);
+    }
+
+}
diff --git a/app/Http/Controllers/Bookings/ExpireBookingPaymentController.php b/app/Http/Controllers/Bookings/ExpireBookingPaymentController.php
new file mode 100644
index 00000000..f09fa38a
--- /dev/null
+++ b/app/Http/Controllers/Bookings/ExpireBookingPaymentController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\ExpireBookingPaymentControllerLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ExpireBookingPaymentController
+{
+    /**
+     * @param Request $request
+     * @param DeleteBookingPaymentControllerLogic $logic
+     * @return JsonResponse
+     */
+    public function expire(Request $request, ExpireBookingPaymentControllerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index a65c2ce8..a2762ce7 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -289,6 +289,22 @@
                                     <regenerate-booking-invoices-component :data="booking" :section="section" class="text-center"></regenerate-booking-invoices-component>
                                 </modal-component>
                             </div>
+                            <div class="row m-t-10" v-if="$store.getters.isSuperAdmin">
+                                <div class="col-sm col-md-auto">
+                                    <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal" data-type="deleteTransfer">Delete Transfer</div>
+                                </div>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" type="deleteTransfer">
+                                    <general-confirmation-form-component
+                                        contentText="Are you sure you want to delete this Order?"
+                                        modalType="delete"
+                                        class="text-center"
+                                        :apiRoute="route('api.booking.payment.expire', booking.id)"
+                                        apiMethod="post"
+                                        :section="section"
+                                    >
+                                    </general-confirmation-form-component>
+                                </modal-component>
+                            </div>
                         </div>
                         <div class="col-12 col-sm-12 col-md-5 mt-3 mt-sm-0">
                             <booking-payment-quotation-component :data="booking" :section="section"></booking-payment-quotation-component>
diff --git a/routes/booking.php b/routes/booking.php
index 81db27b6..119d24fa 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -19,6 +19,7 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
         Route::post('create', 'CreateBookingPaymentController@create')->name('create');
         Route::post('{payment_id}/verification/create', 'CreatePaymentVerificationController@create')->name('verification.create');
         Route::put('/{payment_id}/approval/{status}', 'ApprovePaymentVerificationController@approve')->where('status', 'approve|reject')->name('approval');
+        Route::post('delete', 'ExpireBookingPaymentController@expire')->name('expire');
     });
 
     Route::group(['prefix' => '{id}/refund', 'as' => 'refund.'], function () {

From 4bf32ac28521dd0f36329e7395b6b19cd98c9854 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 1 Nov 2023 13:43:36 +0800
Subject: [PATCH 45/66] fix bug of update status of statement transaction owner
 when update invoice or receipt success, and paginate when next page with
 filtering date in Pending Export tab, and error on export invoive to
 autocount

---
 .../Controllers/Imports/ImportStatementInvoiceController.php | 5 ++++-
 .../Imports/ImportStatementReceiptsController.php            | 5 ++++-
 .../assets/vue/components/general/elements/ListComponent.vue | 1 +
 routes/web.php                                               | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 73e58e87..6cfdec08 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -154,7 +154,10 @@ class ImportStatementInvoiceController
     public function updateTransactionOwnerReference($transaction, String $docNo) {
         $transactionOwner = $transaction->transaction_owner;
         if ($transactionOwner) {
-            $transactionOwner->update(['invoice_reference'=>$docNo]);
+            $transactionOwner->update([
+                'invoice_reference'=>$docNo,
+                'status'=>ApprovalStatus::COMPLETED
+            ]);
             return $transactionOwner->owner_reference;
         }
         return false;
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index f3b89db7..3c919376 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -96,7 +96,10 @@ class ImportStatementReceiptsController
     public function updateTransactionOwnerReference($transaction, String $docNo) {
         $transactionOwner = $transaction->transaction_owner;
         if ($transactionOwner) {
-            $transactionOwner->update(['receipt_reference'=>$docNo]);
+            $transactionOwner->update([
+                'receipt_reference'=>$docNo,
+                'status'=>ApprovalStatus::COMPLETED
+            ]);
             return $transactionOwner->owner_reference;
         }
         return false;
diff --git a/resources/assets/vue/components/general/elements/ListComponent.vue b/resources/assets/vue/components/general/elements/ListComponent.vue
index 50d2fa19..8f54548b 100644
--- a/resources/assets/vue/components/general/elements/ListComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListComponent.vue
@@ -99,6 +99,7 @@
             updateFilters(filters){
                 this.filters = filters;
                 this.setDecoratorDefault();
+                this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
                 this.submit(this.endpoint + '?page=1&filters=' + JSON.stringify(this.filters), 'get', this.section, false, false)
             },
             successHandler(response){
diff --git a/routes/web.php b/routes/web.php
index 18f8aa86..989d3296 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,7 +261,7 @@ Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exp
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
-Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
+Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
 Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {

From db88edabfe8116c4685ea862515d3d1de6377d90 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sat, 4 Nov 2023 10:45:41 +0800
Subject: [PATCH 46/66] fix bug unmapped invoice

---
 .../Services/ExportsInvoiceTransactions.php   | 19 ++++++++++++++++++-
 .../ImportStatementInvoiceController.php      |  9 +--------
 .../ImportStatementReceiptsController.php     |  9 +--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index 796ec19d..a7041b1c 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -127,7 +127,24 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
                 Log::info('Error in Exports Invoice Transactions ' . $this->counter);
 
-                return [];
+                return [
+                    'Transaction Not Found',
+                    $transaction->posting_date->format('m/d/Y H:m'),
+                    $transaction->transaction_description.' - '.$transaction->transaction_description_2,
+                    $statementTransactionOwner->system,
+                    '',
+                    '',
+                    '',
+                    '',
+                    '',
+                    '',
+                    0,
+                    $transaction->amount,
+                    '',
+                    '',
+                    '',
+                    ''
+                ];
             }
 
             $row = $row[0];
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 6cfdec08..8d2b920b 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -55,7 +55,7 @@ class ImportStatementInvoiceController
         foreach ($excelRows as $row) {
             $row['mapped_result_reference'] = null;
             $row['mapped_status'] = 'failed';
-            $row['date'] = $this->changeExcelDate($row['date']);
+            $row['date'] = date('Y-m-d', strtotime($row['date']));
 
             // Shipping Info
             // TOPUP -> map with transaction.bill_no
@@ -162,11 +162,4 @@ class ImportStatementInvoiceController
         }
         return false;
     }
-
-    public function changeExcelDate($date)
-    {
-        $unixTime = (($date - 25569) * 86400);
-        $date = new DateTime("@$unixTime");
-        return $date->format('Y-m-d'); // Change the format to 'Y-m-d'
-    }
 }
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index 3c919376..4006e130 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -53,7 +53,7 @@ class ImportStatementReceiptsController
         foreach ($excelRows as $row) {
             $row['mapped_result_reference'] = null;
             $row['mapped_status'] = 'failed';
-            $row['date'] = $this->changeExcelDate($row['doc_date']);
+            $row['date'] = date('Y-m-d', strtotime($row['doc_date']));
 
             $returnReference = $this->mappingExchange($row);
             if ($returnReference) {
@@ -104,11 +104,4 @@ class ImportStatementReceiptsController
         }
         return false;
     }
-
-    public function changeExcelDate($date)
-    {
-        $unixTime = (($date - 25569) * 86400);
-        $date = new DateTime("@$unixTime");
-        return $date->format('Y-m-d'); // Change the format to 'Y-m-d'
-    }
 }

From 4de027c82f37df52d34615dae11a08e732b3a69a Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 9 Nov 2023 00:24:55 +0800
Subject: [PATCH 47/66] regenerate customer invoice in certain date period

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

diff --git a/routes/web.php b/routes/web.php
index 7325c90b..0efe0616 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -766,3 +766,71 @@ Route::get('/customer/vouchers/{marking}', function ($marking) {
 })->name('customer.reward');
 
 Route::get('transaction/{id}/credit_note/download', 'Transactions\GenerateCreditNotePdfController@download')->name('transaction.credit_note.download');
+
+Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking, $started_at, $ended_at) {
+
+    set_time_limit(14400);
+    $processed_invoice = 1;
+
+    if (is_null($marking) || empty($marking)) {
+        return 'Error - Marking is empty';
+    }
+
+    if (is_null($started_at) || empty($started_at)) {
+        return 'Error - Start Date is empty';
+    }
+
+    if (is_null($ended_at) || empty($ended_at)) {
+        return 'Error - End Date is empty';
+    }
+
+    $company = Company::where('reference', $marking)->first();
+    if (!$company) {
+        return 'Error - Marking not found';
+    }
+    dump('Company Id - ' . $company->id);
+
+    // dd($marking, $started_at, $ended_at);
+
+    $bookings = $company->bookings()
+        ->where('status', ApprovalStatus::COMPLETED)
+        ->whereDate('updated_at', '>=', Carbon::parse($started_at))
+        ->whereDate('updated_at', '<=', Carbon::parse($ended_at))
+        ->orderBy('id')
+        ->chunk(100, function ($bookings) use (&$processed_invoice) {
+            foreach ($bookings as $booking) {
+
+                Log::channel('regenerateInvoice')->info('Counter ' . $processed_invoice);
+                dump('Counter ' . $processed_invoice);
+                $processed_invoice += 1;
+
+                $booking->status = ApprovalStatus::APPROVED;
+                $booking->save();
+
+                $firstInvoice = $booking->transactions()
+                    ->whereIn('type', [TransactionType::INVOICE])
+                    ->withTrashed()
+                    ->orderBy('created_at', 'asc')
+                    ->first();
+        
+                // get the first bill_no
+                $firstBillNo = $firstInvoice->bill_no;
+                if (strpos($firstBillNo, '-deleted') !== false) {
+                    $firstBillNo = substr($firstBillNo, 0, strpos($firstBillNo, '-deleted'));
+                }
+        
+                // update currentInvoice bill_no to '-deleted-'
+                $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
+                $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . (string)(Carbon::now()->timestamp);
+                $currentInvoice->save();
+
+                $booking->transactions()->whereIn('transactions.type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->delete();
+                $booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+
+                (App()->make(CreateInvoiceTransactionWithInvoiceNoProcessor::class))->execute($booking, $firstBillNo);
+                dump('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $firstBillNo . '. Old bill_no - ' . $currentInvoice->bill_no);
+                Log::channel('regenerateInvoice')->info('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $firstBillNo . '. Old bill_no - ' . $currentInvoice->bill_no);
+            }
+        }
+    );
+})->name('invoice.fix.byCustomerMarking');
\ No newline at end of file

From 9b46981593142d4b0ae140bd85eb691ca4adee9f Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 9 Nov 2023 09:43:09 +0800
Subject: [PATCH 48/66] update regenerate documents link

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

diff --git a/routes/web.php b/routes/web.php
index 0efe0616..e2cd97fb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -794,8 +794,8 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
 
     $bookings = $company->bookings()
         ->where('status', ApprovalStatus::COMPLETED)
-        ->whereDate('updated_at', '>=', Carbon::parse($started_at))
-        ->whereDate('updated_at', '<=', Carbon::parse($ended_at))
+        ->whereDate('created_at', '>=', Carbon::parse($started_at))
+        ->whereDate('created_at', '<=', Carbon::parse($ended_at))
         ->orderBy('id')
         ->chunk(100, function ($bookings) use (&$processed_invoice) {
             foreach ($bookings as $booking) {

From fc2bdb4ff0afc230c2814de98021ce19483c6ec8 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 9 Nov 2023 10:07:13 +0800
Subject: [PATCH 49/66] update regenerate invoice

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

diff --git a/routes/web.php b/routes/web.php
index e2cd97fb..447d0d72 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -821,9 +821,17 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
         
                 // update currentInvoice bill_no to '-deleted-'
                 $currentInvoice = $booking->transactions()->where('type', TransactionType::INVOICE)->first();
-                $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . (string)(Carbon::now()->timestamp);
+                $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
                 $currentInvoice->save();
 
+                $transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->get();
+                if ($transactionWithSameBillNo) {
+                    foreach ($transactionWithSameBillNo as $transaction) {
+                        $transaction->bill_no = $transaction->bill_no . "-deleted-" . Str::random(10);
+                        $transaction->save();
+                    }
+                }
+
                 $booking->transactions()->whereIn('transactions.type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->delete();
                 $booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
 

From 6fe1ca3e0e08fe62105ef971763a3090d965f1ab Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Thu, 9 Nov 2023 10:21:04 +0800
Subject: [PATCH 50/66] update regenerate invoice

---
 .../RegenerateInvoiceBookingLogic.php                 | 11 ++++++++++-
 routes/web.php                                        |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
index 6af18568..5d067fd5 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/RegenerateInvoiceBookingLogic.php
@@ -10,13 +10,14 @@ use App\Classes\Modules\Transactions\Services\DeletesTransaction;
 use App\Classes\Modules\Documents\Services\DeletesDocument;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
-
+use Illuminate\Support\Str;
 use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Http\Resources\BookingResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
 use Illuminate\Support\Carbon;
 
 class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
@@ -121,6 +122,14 @@ class RegenerateInvoiceBookingLogic extends AbstractControllerLogic
         $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . (string)(Carbon::now()->timestamp);
         $currentInvoice->save();
 
+        $transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->withTrashed()->get();
+        if ($transactionWithSameBillNo) {
+            foreach ($transactionWithSameBillNo as $transaction) {
+                $transaction->bill_no = $transaction->bill_no . "-deleted-" . Str::random(10);
+                $transaction->save();
+            }
+        }
+
         $transaction = $booking->transactions()->whereIn('type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->get();
         foreach ($transaction as $key => $row) {
             $this->deletesTransaction->execute($row);
diff --git a/routes/web.php b/routes/web.php
index 447d0d72..ead4b3d2 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -802,6 +802,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
 
                 Log::channel('regenerateInvoice')->info('Counter ' . $processed_invoice);
                 dump('Counter ' . $processed_invoice);
+                dump('Marking ' . $booking->marking);
                 $processed_invoice += 1;
 
                 $booking->status = ApprovalStatus::APPROVED;
@@ -824,7 +825,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
                 $currentInvoice->bill_no = $currentInvoice->bill_no ."-deleted-" . Str::random(10);
                 $currentInvoice->save();
 
-                $transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->get();
+                $transactionWithSameBillNo = Transaction::where('bill_no', $firstBillNo)->withTrashed()->get();
                 if ($transactionWithSameBillNo) {
                     foreach ($transactionWithSameBillNo as $transaction) {
                         $transaction->bill_no = $transaction->bill_no . "-deleted-" . Str::random(10);

From d8a4510fc41e51c9480e3ac7ec73b8924c88019c Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sun, 12 Nov 2023 11:49:26 +0800
Subject: [PATCH 51/66] fix bug in import invoices and unknow tabs for status
 not in rejected

---
 .../UpdateBankStatementDetailLogic.php        |   2 +-
 .../ImportStatementInvoiceController.php      | 181 ++++++++++--------
 .../ImportStatementReceiptsController.php     |  65 ++++---
 .../ImportedInvoiceMappedComponent.vue        |  11 ++
 4 files changed, 152 insertions(+), 107 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
index 9f6c28e6..70186ce1 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateBankStatementDetailLogic.php
@@ -157,7 +157,7 @@ class UpdateBankStatementDetailLogic extends AbstractControllerLogic
             'owner_reference' => $owner_reference,
         ];
 
-        return $bankStatementTransaction->owners()->firstOrCreate($ownerData);
+        return $bankStatementTransaction->owners()->where('status','<>',ApprovalStatus::REJECTED)->firstOrCreate($ownerData);
     }
 
     private function editAccountMapped(StatementTransactionOwner $owner){
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 8d2b920b..56eecc7d 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -34,93 +34,111 @@ class ImportStatementInvoiceController
         $this->responseMessage = 'You have successfully imported invoice mapping';
     }
 
-    /**
-     * @param Request $request
-     * @return array
-     * @throws \App\Classes\Exceptions\MalformedRequestException
-     */
-    public function import(Request $request) : JsonResponse
-    {
-        ini_set('memory_limit', '-1'); 
-        $importDate = date('Y-m-d H:i:s');
-        $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
-        $file = json_decode($object->getFiles()[0])->file_info->original->file;
-
-        $import = new GenericImport();
-        Excel::import($import, $file);
-        $excelRows = $import->rows;
-        $excelRows = $excelRows->toArray();
-
-        $data = [];
-        foreach ($excelRows as $row) {
-            $row['mapped_result_reference'] = null;
-            $row['mapped_status'] = 'failed';
-            $row['date'] = date('Y-m-d', strtotime($row['date']));
-
-            // Shipping Info
-            // TOPUP -> map with transaction.bill_no
-            if (str_starts_with($row['shipping_info'], 'TOPUP')) {
-                // find in exchange first, if cannont then find in izyim
-                foreach (['exchange','izyim'] as $system) {
-                    $returnReference = $this->mappingTopUp($row, $system);
-                    if ($returnReference) {
-                        $row['mapped_result_reference'] = $returnReference;
-                        $row['mapped_status'] = 'success';
-                    }
-                }
-            } else {
-                $returnReference = $this->mappingExchange($row);
+    public function mapping($row) {
+        // Shipping Info
+        // TOPUP -> map with transaction.bill_no
+        if (str_starts_with($row['shipping_info'], 'TOPUP')) {
+            // find in exchange first, if cannont then find in izyim
+            foreach (['exchange','izyim'] as $system) {
+                $returnReference = $this->mappingTopUp($row, $system);
                 if ($returnReference) {
                     $row['mapped_result_reference'] = $returnReference;
                     $row['mapped_status'] = 'success';
+                    return $row;
                 }
             }
-
-            TransactionMappingLog::create([
-                'imported_date'=>$importDate,
-                'data'=>$row,
-            ]);
-            array_push($data, $row);
-
-            
-            // if 5 digits -> exchange booking reference 
-            // find transation
-            // find statement_transaction_owners, and fill up the details 
-
-            // if <5 digits, find the transaction id (order number in izyim), find the payment in izyim
-            // find transation
-            // find statement_transaction_owners, and fill up the details 
-
-            // dd([
-            //     'type'                 => $statementTransactionOwnerType,
-            //     'system'               => $system,
-            //     // 'owner_type'           => Transaction::class,
-            //     // todo-new: make sure owner_type is a class
-            //     'owner_type'           => $owner_type,
-            //     'owner_id'             => $owner_id,
-            //     'owner_reference'      => $owner_reference
-            // ]);
-            
-            // $bankStatementTransaction->owners()->firstOrCreate([
-            //     'type'                 => $statementTransactionOwnerType,
-            //     'system'               => $system,
-            //     // 'owner_type'           => Transaction::class,
-            //     // todo-new: make sure owner_type is a class
-            //     'owner_type'           => $owner_type,
-            //     'owner_id'             => $owner_id,
-            //     'owner_reference'      => $owner_reference
-            // ]);
-
-
+        } 
+        
+        $returnReference = $this->mappingExchange($row);
+        if ($returnReference) {
+            $row['mapped_result_reference'] = $returnReference;
+            $row['mapped_status'] = 'success';
+            return $row;
         }
 
-        return $this->response(['data'=>$data,'importedDate'=>$importDate]);
+        // if still unable to map, will try to check the shipping_info without TOPUP
+        foreach (['exchange','izyim'] as $system) {
+            $returnReference = $this->mappingTopUp($row, $system);
+            if ($returnReference) {
+                $row['mapped_result_reference'] = $returnReference;
+                $row['mapped_status'] = 'success';
+            }
+        }
+
+        return $row;
     }
 
-    public function response(?array $data = []) : JsonResponse {
-        return (new ApiResponseObject($this->responseTitle,
-            $this->responseMessage,
-            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    /**
+     * @param Request $request
+     * @return array
+     */
+    public function import(Request $request) : JsonResponse
+    {
+        try {
+            ini_set('memory_limit', '-1'); 
+            $importDate = date('Y-m-d H:i:s');
+            $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
+            $file = json_decode($object->getFiles()[0])->file_info->original->file;
+
+            $import = new GenericImport();
+            Excel::import($import, $file);
+            $excelRows = $import->rows;
+            $excelRows = $excelRows->toArray();
+
+            $data = [];
+            foreach ($excelRows as $row) {
+                $row['mapped_result_reference'] = null;
+                $row['mapped_status'] = 'failed';
+                $row['date'] = in_array(gettype($row['date']), ['integer', 'double']) ? $this->changeExcelDate($row['date']) : date('Y-m-d', strtotime($row['date']));
+
+                $row = $this->mapping($row);
+
+                TransactionMappingLog::create([
+                    'imported_date'=>$importDate,
+                    'data'=>$row,
+                ]);
+                array_push($data, $row);
+
+                
+                // if 5 digits -> exchange booking reference 
+                // find transation
+                // find statement_transaction_owners, and fill up the details 
+
+                // if <5 digits, find the transaction id (order number in izyim), find the payment in izyim
+                // find transation
+                // find statement_transaction_owners, and fill up the details 
+
+                // dd([
+                //     'type'                 => $statementTransactionOwnerType,
+                //     'system'               => $system,
+                //     // 'owner_type'           => Transaction::class,
+                //     // todo-new: make sure owner_type is a class
+                //     'owner_type'           => $owner_type,
+                //     'owner_id'             => $owner_id,
+                //     'owner_reference'      => $owner_reference
+                // ]);
+                
+                // $bankStatementTransaction->owners()->firstOrCreate([
+                //     'type'                 => $statementTransactionOwnerType,
+                //     'system'               => $system,
+                //     // 'owner_type'           => Transaction::class,
+                //     // todo-new: make sure owner_type is a class
+                //     'owner_type'           => $owner_type,
+                //     'owner_id'             => $owner_id,
+                //     'owner_reference'      => $owner_reference
+                // ]);
+
+
+            }
+
+            return $this->response($this->responseTitle, $this->responseMessage, HttpStatus::OK_WITH_MESSAGE, ['data'=>$data,'importedDate'=>$importDate]);
+        }  catch (\Exception $exception){
+            return $this->response('import invoice failed',$exception->getMessage(), ($exception->getCode()? $exception->getCode() : HttpStatus::SERVER_ERROR));
+        }
+    }
+
+    public function response(String $responseTitle, String $responseMessage, int $httpStatus, ?array $data = []) : JsonResponse {
+        return (new ApiResponseObject($responseTitle, $responseMessage, $httpStatus, $data))->handler();
     }
 
     private function mappingTopUp(Array $row, String $system) {
@@ -162,4 +180,11 @@ class ImportStatementInvoiceController
         }
         return false;
     }
+
+    public function changeExcelDate($date)
+    {
+        $unixTime = (($date - 25569) * 86400);
+        $date = new DateTime("@$unixTime");
+        return $date->format('Y-m-d'); // Change the format to 'Y-m-d'
+    }
 }
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index 4006e130..2cafeac0 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -40,41 +40,43 @@ class ImportStatementReceiptsController
      */
     public function import(Request $request)
     {
-        $importDate = date('Y-m-d H:i:s');
-        $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
-        $file = json_decode($object->getFiles()[0])->file_info->original->file;
+        try {
+            $importDate = date('Y-m-d H:i:s');
+            $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports');
+            $file = json_decode($object->getFiles()[0])->file_info->original->file;
 
-        $import = new GenericImport();
-        Excel::import($import, $file);
-        $excelRows = $import->rows;
-        $excelRows = $excelRows->toArray();
+            $import = new GenericImport();
+            Excel::import($import, $file);
+            $excelRows = $import->rows;
+            $excelRows = $excelRows->toArray();
 
-        $data = [];
-        foreach ($excelRows as $row) {
-            $row['mapped_result_reference'] = null;
-            $row['mapped_status'] = 'failed';
-            $row['date'] = date('Y-m-d', strtotime($row['doc_date']));
+            $data = [];
+            foreach ($excelRows as $row) {
+                $row['mapped_result_reference'] = null;
+                $row['mapped_status'] = 'failed';
+                $row['date'] = in_array(gettype($row['doc_date']), ['integer', 'double']) ? $this->changeExcelDate($row['doc_date']) : date('Y-m-d', strtotime($row['doc_date']));
 
-            $returnReference = $this->mappingExchange($row);
-            if ($returnReference) {
-                $row['mapped_result_reference'] = $returnReference;
-                $row['mapped_status'] = 'success';
-            } 
+                $returnReference = $this->mappingExchange($row);
+                if ($returnReference) {
+                    $row['mapped_result_reference'] = $returnReference;
+                    $row['mapped_status'] = 'success';
+                } 
 
-            TransactionMappingLog::create([
-                'imported_date'=>$importDate,
-                'data'=>$row,
-            ]);
-            array_push($data, $row);
+                TransactionMappingLog::create([
+                    'imported_date'=>$importDate,
+                    'data'=>$row,
+                ]);
+                array_push($data, $row);
+            }
+
+            return $this->response($this->responseTitle, $this->responseMessage, HttpStatus::OK_WITH_MESSAGE, ['data'=>$data,'importedDate'=>$importDate]);
+        }  catch (\Exception $exception){
+            return $this->response('import invoice failed',$exception->getMessage(), ($exception->getCode()? $exception->getCode() : HttpStatus::SERVER_ERROR));
         }
-
-        return $this->response(['data'=>$data,'importedDate'=>$importDate]);
     }
 
-    public function response(?array $data = []) : JsonResponse {
-        return (new ApiResponseObject($this->responseTitle,
-            $this->responseMessage,
-            HttpStatus::OK_WITH_MESSAGE, $data))->handler();
+    public function response(String $responseTitle, String $responseMessage, int $httpStatus, ?array $data = []) : JsonResponse {
+        return (new ApiResponseObject($responseTitle, $responseMessage, $httpStatus, $data))->handler();
     }
 
     private function mappingExchange(Array $row) {
@@ -104,4 +106,11 @@ class ImportStatementReceiptsController
         }
         return false;
     }
+
+    public function changeExcelDate($date)
+    {
+        $unixTime = (($date - 25569) * 86400);
+        $date = new DateTime("@$unixTime");
+        return $date->format('Y-m-d'); // Change the format to 'Y-m-d'
+    }
 }
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
index 3e52b70b..9fd29e45 100644
--- a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -8,6 +8,11 @@
             <div class="card">
                 <div class="card-header">
                     <h3>{{ componentTitle }}</h3>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
                     <div class="text-right">
                         <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped">
                             Download Invoices Mapped
@@ -69,6 +74,7 @@
         data() {
             return {
                 isLoading: false,
+                error: '',
                 importedDate: null,
             }
         },
@@ -114,6 +120,11 @@
                 this.isLoading = false;
             },
 
+            errorHandler(error){
+                this.isLoading = false;
+                this.error = error.message;
+            },
+
             downloadInvoiceMapped() {
                 var arrDateTime = this.importedDate.split(" ");
                 const fileName = this.section == 'importInvoiceMapping' ? 'InvoiceMapped' : 'ReceiptMapped';

From f2cc75a89872905d8c703b88b2fbd99f7ffd4894 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Thu, 23 Nov 2023 01:04:38 +0800
Subject: [PATCH 52/66] fix bug for import invoice mapping and export receipts
 to autocount and mapped completed report

---
 .../Filters/WhereHasOwnersAndNotNull.php      | 22 +++++++++++++
 .../Filters/WhereHasOwnersAndNull.php         | 22 +++++++++++++
 .../ImportStatementInvoiceController.php      | 32 ++++++++++---------
 .../BankStatementTransactionResource.php      |  3 +-
 .../StatementTransactionMappedComponent.vue   | 10 +++---
 .../ReportTransactionsMappedComponent.vue     |  2 +-
 .../sections/TransactionsMappingComponent.vue |  3 +-
 7 files changed, 71 insertions(+), 23 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNotNull.php
 create mode 100644 app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNull.php

diff --git a/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNotNull.php b/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNotNull.php
new file mode 100644
index 00000000..b10fd92d
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNotNull.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WhereHasOwnersAndNotNull implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->whereNotNull($value);
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNull.php b/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNull.php
new file mode 100644
index 00000000..a9317771
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/WhereHasOwnersAndNull.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class WhereHasOwnersAndNull implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->whereNull($value);
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 56eecc7d..b6cfd567 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -57,13 +57,13 @@ class ImportStatementInvoiceController
         }
 
         // if still unable to map, will try to check the shipping_info without TOPUP
-        foreach (['exchange','izyim'] as $system) {
-            $returnReference = $this->mappingTopUp($row, $system);
-            if ($returnReference) {
-                $row['mapped_result_reference'] = $returnReference;
-                $row['mapped_status'] = 'success';
-            }
-        }
+        // foreach (['exchange','izyim'] as $system) {
+        //     $returnReference = $this->mappingTopUp($row, $system);
+        //     if ($returnReference) {
+        //         $row['mapped_result_reference'] = $returnReference;
+        //         $row['mapped_status'] = 'success';
+        //     }
+        // }
 
         return $row;
     }
@@ -155,16 +155,18 @@ class ImportStatementInvoiceController
 
     private function mappingExchange(Array $row) {
         $date = $row['date'];
-        $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['net_total'])->whereRaw("DATE(posting_date) = '$date'")->get();
-
-        if ($transactions && $transactions->count() == 0) {
-            $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['net_total']))->whereRaw("DATE(posting_date) = '$date'")->get();
+        $transaction = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('owner_reference', $row['shipping_info'])->first();
+        
+        if ($transaction && $transaction->count() == 0) {
+            $transaction = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['net_total'])->whereRaw("DATE(posting_date) = '$date'")->first();
         }
 
-        if ($transactions && $transactions->count() == 1) {
-            foreach ($transactions as $key => $transaction) {
-                return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
-            }
+        if ($transaction && $transaction->count() == 0) {
+            $transaction = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['net_total']))->whereRaw("DATE(posting_date) = '$date'")->first();
+        }
+
+        if ($transaction && $transaction->count() > 0) {
+            return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
         }
         return false;
     }
diff --git a/app/Http/Resources/BankStatementTransactionResource.php b/app/Http/Resources/BankStatementTransactionResource.php
index 993b8c93..8f5e0193 100644
--- a/app/Http/Resources/BankStatementTransactionResource.php
+++ b/app/Http/Resources/BankStatementTransactionResource.php
@@ -34,7 +34,8 @@ class BankStatementTransactionResource extends JsonResource
             'owners' => [
                 'approved' => BankStatementTransactionOwnerResource::collection($this->owners()->whereIn('status', [ApprovalStatus::APPROVED])->get()),
                 'pending_verification' => BankStatementTransactionOwnerResource::collection($this->owners()->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION])->get()),
-                'rejected' => BankStatementTransactionOwnerResource::collection($this->owners()->whereIn('status', [ApprovalStatus::REJECTED])->get())
+                'rejected' => BankStatementTransactionOwnerResource::collection($this->owners()->whereIn('status', [ApprovalStatus::REJECTED])->get()),
+                'completed' => BankStatementTransactionOwnerResource::collection($this->owners()->whereIn('status', [ApprovalStatus::COMPLETED])->get()),
             ]
         ];
     }
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
index e4186bb6..e37e4f3b 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionMappedComponent.vue
@@ -6,11 +6,11 @@
                 <div class="col-2">{{ item.transaction_description_1 + ' - ' + item.transaction_description_2 }}</div>
                 <div class="col-7">
                     <div class="row">
-                        <div class="col">{{item.owners.approved[0].system}}</div>
-                        <div class="col">{{ typeString(item.owners.approved[0].type) }}</div>
-                        <div class="col"><a :href="item.owners.approved[0].reference_link" target="_blank">{{item.owners.approved[0].reference}}</a></div>
-                        <div class="col">{{item.owners.approved[0].invoice_reference}}</div>
-                        <div class="col">{{item.owners.approved[0].receipt_reference}}</div>
+                        <div class="col">{{item.owners.completed[0].system}}</div>
+                        <div class="col">{{ typeString(item.owners.completed[0].type) }}</div>
+                        <div class="col"><a :href="item.owners.completed[0].reference_link" target="_blank">{{item.owners.completed[0].reference}}</a></div>
+                        <div class="col">{{item.owners.completed[0].invoice_reference}}</div>
+                        <div class="col">{{item.owners.completed[0].receipt_reference}}</div>
                     </div>
                 </div>
 
diff --git a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
index e8f99f3a..e3d4e0d2 100644
--- a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
@@ -57,7 +57,7 @@
         },
         methods: {
             getReportFilter() {
-                this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [2], statement_transaction_owner_invoice_or_receipt_ref_not_null: true, per_page: 100, order_by: {column: 'posting_date', DESC: true}};
+                this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [3], per_page: 100, order_by: {column: 'posting_date', DESC: true}};
 
                 this.step = 1
             }
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index 7a677bad..bb19b908 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -277,7 +277,8 @@ export default {
         exportReceiptToAutoCount(){
             const checkedStatementTransactions = this.getCheckedStatementOwners();
 
-            this.filter['statement_transaction_owner_type_in'] = [3,4,5,7,13,14];
+            this.filter['where_has_owners_and_null'] = 'statement_transaction_owners.receipt_reference';
+            this.filter['where_has_owners_and_not_null'] = 'statement_transaction_owners.invoice_reference';
             let route = this.route('receiptTransactions.export')+'?filter='+JSON.stringify(this.filter);
             if (checkedStatementTransactions) {
                 route += '&bankStatementTransactionId='+checkedStatementTransactions;

From 1c29e45744b497f6cfb781db9232611cc4f9924e Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Sun, 3 Dec 2023 18:58:55 +0800
Subject: [PATCH 53/66] add payment received date in import invoice result and
 fix structure export receipts to autocount

---
 .../ExportsImportedInvoiceMappeds.php         |   4 +-
 .../Services/ExportsReceiptTransactions.php   | 127 +++++++++++++-----
 .../ImportStatementInvoiceController.php      |  14 +-
 .../ImportedInvoiceMappedComponent.vue        |   3 +-
 4 files changed, 112 insertions(+), 36 deletions(-)

diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
index 71363b52..e629675f 100644
--- a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
@@ -39,7 +39,8 @@ class ExportsImportedInvoiceMappeds implements FromQuery, WithHeadings, WithHead
             'Net Total',
             'Cancelled',
             'Mapped Status',
-            'Mapped Reference No'
+            'Mapped Reference No',
+            'MapPayment Received Date'
         ];
     }
 
@@ -72,6 +73,7 @@ class ExportsImportedInvoiceMappeds implements FromQuery, WithHeadings, WithHead
             Arr::get($data,'cancelled'),
             Arr::get($data,'mapped_status'),
             Arr::get($data,'mapped_result_reference'),
+            Arr::get($data,'payment_received_date'),
         ];
     
     }
diff --git a/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php b/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php
index 07c5d3c1..bde46225 100644
--- a/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsReceiptTransactions.php
@@ -15,8 +15,11 @@ use Illuminate\Support\Facades\Log;
 use App\Classes\General\Eloquent\ApplyFiltersToQuery;
 use App\Models\StatementTransaction;
 use App\Models\Company;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Events\AfterSheet;
 
-class ExportsReceiptTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+class ExportsReceiptTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize, WithEvents, WithCustomStartCell
 {
     use Exportable;
 
@@ -28,37 +31,101 @@ class ExportsReceiptTransactions implements FromQuery, WithHeadings, WithHeading
         $this->request = $request;
     }
 
+    public function startCell(): string
+    {
+        return 'A2';
+    }
+
+    public function registerEvents(): array {
+        
+        return [
+            AfterSheet::class => function(AfterSheet $event) {
+                $sheet = $event->sheet;
+
+                $sheet->mergeCells('A1:A1');
+                $sheet->setCellValue('A1', '"');
+
+                $sheet->mergeCells('M1:Y1');
+                $sheet->setCellValue('M1', "Payment Detail Column");
+
+                $sheet->mergeCells('Z1:AB1');
+                $sheet->setCellValue('Z1', "Knock Off Detail");
+                
+                $styleArray = [
+                    'alignment' => [
+                        'horizontal' => \PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER,
+                    ],
+                ];
+                
+                $cellRange = 'A1:AB1';
+                $event->sheet->getDelegate()->getStyle($cellRange)->applyFromArray($styleArray);
+            },
+        ];
+    }
+
     public function headings(): array
     {
         $header = [
-            'DocNo',
-            'DocDate',
-            'DebtorCode',
-            'Description',
-            'DocNo2',
-            'ProjNo',
-            'DeptNo',
-            'CurrencyCode',
-            'ToHomeRate',
-            'ToDebtorRate',
-            'Note',
-            'PaymentMethod',
-            'ChequeNo',
-            'PaymentAmt',
-            'BankCharge',
-            'ToBankRate',
-            'BankChargeTaxType',
-            'BankChargeTaxRefNo',
-            'BankChargeProjNo',
-            'BankChargeDeptNo',
-            'PaymentBy',
-            'FloatDay',
-            'IsRCHQ',
-            'RCHQDate',
-            'KnockOffDocType',
-            'KnockOffDocNo',
-            'KnockOffAmt',
-            '',
+            [
+                ' ',
+                '(20 chars)',
+                '(Date: dd/MM/yyyy)',
+                '(12 chars)',
+                '(40 chars)',
+                '(25 chars)',
+                '(10 chars)',
+                '(10 chars)',
+                '(5 chars)',
+                '(Number, use System Currency Rate Decimal)',
+                '(Number, use System Currency Rate Decimal)',
+                '(Rich Text)',
+                '(20 chars)',
+                '(20 chars)',
+                '(Number, use System Currency Decimal)',
+                '(Number, use System Currency Decimal)',
+                '(Number, use System Currency Rate Decimal)',
+                '(14 chars)',
+                '(30 chars)',
+                '(10 chars)',
+                '(10 chars)',
+                '(20 chars)',
+                '(Integer)',
+                '(Boolean. Indicate T for stock control or F for non stock control)',
+                '(Returned Cheque Date: dd/MM/yyyy)',
+                '(2 chars, RI for Invoice, RD for D/N)',
+                '',
+                '(Number, use System Currency Decimal)',
+            ],
+            [
+                'DocNo',
+                'DocDate',
+                'DebtorCode',
+                'Description',
+                'DocNo2',
+                'ProjNo',
+                'DeptNo',
+                'CurrencyCode',
+                'ToHomeRate',
+                'ToDebtorRate',
+                'Note',
+                'PaymentMethod',
+                'ChequeNo',
+                'PaymentAmt',
+                'BankCharge',
+                'ToBankRate',
+                'BankChargeTaxType',
+                'BankChargeTaxRefNo',
+                'BankChargeProjNo',
+                'BankChargeDeptNo',
+                'PaymentBy',
+                'FloatDay',
+                'IsRCHQ',
+                'RCHQDate',
+                'KnockOffDocType',
+                'KnockOffDocNo',
+                'KnockOffAmt',
+                '',
+            ]
         ];
         return $header;
     }
@@ -102,7 +169,7 @@ class ExportsReceiptTransactions implements FromQuery, WithHeadings, WithHeading
             '<<New>>',
             Carbon::parse($transaction->posting_date)->format('d/m/Y'),
             ($company ? $company->debtor : null),
-            $transaction->transaction_description,
+            'Payment for '.$transaction->transaction_description,
             '',
             '',
             '',
diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index b6cfd567..da42d25f 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -42,16 +42,20 @@ class ImportStatementInvoiceController
             foreach (['exchange','izyim'] as $system) {
                 $returnReference = $this->mappingTopUp($row, $system);
                 if ($returnReference) {
+                    // $row['mapped_result_reference'] = $data['owner_reference'];
+                    // $row['payment_received_date'] = date('Y-m-d', strtotime($data['created_at']));
                     $row['mapped_result_reference'] = $returnReference;
+                    $row['payment_received_date'] = '';
                     $row['mapped_status'] = 'success';
                     return $row;
                 }
             }
         } 
         
-        $returnReference = $this->mappingExchange($row);
+        [$returnReference, $transactionDate] = $this->mappingExchange($row);
         if ($returnReference) {
             $row['mapped_result_reference'] = $returnReference;
+            $row['payment_received_date'] = date('d-m-Y', strtotime($transactionDate));
             $row['mapped_status'] = 'success';
             return $row;
         }
@@ -88,6 +92,7 @@ class ImportStatementInvoiceController
             $data = [];
             foreach ($excelRows as $row) {
                 $row['mapped_result_reference'] = null;
+                $row['payment_received_date'] = null;
                 $row['mapped_status'] = 'failed';
                 $row['date'] = in_array(gettype($row['date']), ['integer', 'double']) ? $this->changeExcelDate($row['date']) : date('Y-m-d', strtotime($row['date']));
 
@@ -144,6 +149,7 @@ class ImportStatementInvoiceController
     private function mappingTopUp(Array $row, String $system) {
         try {
             if ($data = (App()->make(ChecksBillNumber::class))->execute($row['shipping_info'], $system)) {
+                // if ($system == 'izyim' && isset($data['owner_reference'])) return $data;
                 if ($system == 'izyim' && isset($data['owner_reference'])) return $data['owner_reference'];
                 
                 if ($system == 'exchange') return $this->updateTransactionOwnerReference($data, $row['doc_no']);
@@ -168,7 +174,7 @@ class ImportStatementInvoiceController
         if ($transaction && $transaction->count() > 0) {
             return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
         }
-        return false;
+        return [false, false];
     }
 
     public function updateTransactionOwnerReference($transaction, String $docNo) {
@@ -178,9 +184,9 @@ class ImportStatementInvoiceController
                 'invoice_reference'=>$docNo,
                 'status'=>ApprovalStatus::COMPLETED
             ]);
-            return $transactionOwner->owner_reference;
+            return [$transactionOwner->owner_reference, $transaction->created_at];
         }
-        return false;
+        return [false, false];
     }
 
     public function changeExcelDate($date)
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
index 9fd29e45..f10f9181 100644
--- a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -39,6 +39,7 @@
                             <td>{{item.cancelled}}</td>
                             <td>{{item.mapped_status}}</td>
                             <td>{{item.mapped_result_reference}}</td>
+                            <td>{{item.payment_received_date}}</td>
                         </tr>
                     </tbody>
                     </table>
@@ -101,7 +102,7 @@
             },
             appendComponentTableHeader() {
                 if (this.section == 'importInvoiceMapping') {
-                    this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
+                    this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No','Payment Received Date'];
                 } else {
                     this.tableHeaders = ['No','OR No','Date','Creditor Code','Creditor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
                 }

From a1e5d1173999a2bfffad6bf8ba0afa676893f8c4 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 6 Dec 2023 21:52:09 +0800
Subject: [PATCH 54/66] fix bug in import invoice

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

diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index da42d25f..75953f2b 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -40,12 +40,12 @@ class ImportStatementInvoiceController
         if (str_starts_with($row['shipping_info'], 'TOPUP')) {
             // find in exchange first, if cannont then find in izyim
             foreach (['exchange','izyim'] as $system) {
-                $returnReference = $this->mappingTopUp($row, $system);
+                [$returnReference, $transactionDate] = $this->mappingTopUp($row, $system);
                 if ($returnReference) {
                     // $row['mapped_result_reference'] = $data['owner_reference'];
                     // $row['payment_received_date'] = date('Y-m-d', strtotime($data['created_at']));
                     $row['mapped_result_reference'] = $returnReference;
-                    $row['payment_received_date'] = '';
+                    $row['payment_received_date'] = $transactionDate ? date('d-m-Y', strtotime($transactionDate)) : null;
                     $row['mapped_status'] = 'success';
                     return $row;
                 }
@@ -150,7 +150,7 @@ class ImportStatementInvoiceController
         try {
             if ($data = (App()->make(ChecksBillNumber::class))->execute($row['shipping_info'], $system)) {
                 // if ($system == 'izyim' && isset($data['owner_reference'])) return $data;
-                if ($system == 'izyim' && isset($data['owner_reference'])) return $data['owner_reference'];
+                if ($system == 'izyim' && isset($data['owner_reference'])) return [$data['owner_reference'], null];
                 
                 if ($system == 'exchange') return $this->updateTransactionOwnerReference($data, $row['doc_no']);
             }

From f7ba84acf0b3a3e73870601c2cf904c5d597cbf5 Mon Sep 17 00:00:00 2001
From: JiaSheng <jiasheng224@gmail.com>
Date: Thu, 7 Dec 2023 11:05:41 +0800
Subject: [PATCH 55/66] fix customer page booking component transfer type
 alignment issue

---
 .../vue/components/bookings/elements/BookingComponent.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
index 9ff3fe9c..7e675646 100644
--- a/resources/assets/vue/components/bookings/elements/BookingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue
@@ -22,7 +22,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col d-none d-lg-block" v-if="$store.getters.isAdmin">
+                    <div class="col-auto d-none d-lg-block" v-if="$store.getters.isAdmin">
                         <div class="font-heading fs-10 muted all-caps">Marking</div>
                         <div class="font-heading">
                             <a :href="route('customer.profile', item.company.reference)">{{this.item.company.reference}}</a>
@@ -34,7 +34,7 @@
                             <span class="flag-icon" :class="'flag-icon-'+item.convertible_currency.country.short_code.toLowerCase()"></span> {{this.item.convertible_currency.short_code}}
                         </div>
                     </div>
-                    <div class="col-auto d-none d-lg-block">
+                    <div class="col-3 d-none d-lg-block">
                         <div class="font-heading fs-10 muted all-caps">Transfer Type</div>
                         <div class="font-heading fs-12">{{this.item.service.name}}</div>
                     </div>

From 7ab1cd47e54b4af7adc1f4b80a3f769a371f706a Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 12 Dec 2023 16:24:36 +0800
Subject: [PATCH 56/66] change where condition for import receipts

---
 .../GroupApproveStatementTransactionLogic.php |  2 +-
 .../ImportStatementReceiptsController.php     | 69 ++++++++++---------
 .../StatementTransactionComponent.vue         |  4 ++
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
index f9eb9c7b..7ae8a2ae 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/GroupApproveStatementTransactionLogic.php
@@ -62,7 +62,7 @@ class GroupApproveStatementTransactionLogic extends AbstractControllerLogic
         $statementTransactions = $this->listsBankStatementTransactions->execute($filters);
 
         foreach ($statementTransactions as $statementTransaction) {
-            $owners = $statementTransaction->owners;
+            $owners = $statementTransaction->owners()->where('status', ApprovalStatus::PENDING_VERIFICATION)->get();
 
             if (count($owners)) {
                 $this->updatesBankStatementTransactionOwnerStatus->execute($owners->first(), ApprovalStatus::APPROVED);
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index 2cafeac0..a43f2dda 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -2,32 +2,35 @@
 
 namespace App\Http\Controllers\Imports;
 
-use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
-use App\Classes\Modules\Imports\Services\GenericImport;
-use App\Classes\Modules\Segments\DataTransferObjects\SeasonalSegmentObject;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Models\Segment;
-use App\Models\User;
-use Carbon\Carbon;
 use DateTime;
-use Illuminate\Http\Request;
-use Maatwebsite\Excel\Facades\Excel;
-use App\Classes\Modules\Segments\Services\CreatesSeasonalSegment;
-use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
+use Carbon\Carbon;
+use App\Models\User;
 use App\Models\Company;
-use App\Models\SeasonalSegment;
+use App\Models\Segment;
 use App\Models\Transaction;
-use App\Models\TransactionMappingLog;
-use App\Classes\ValueObjects\Response\ApiResponseObject;
-use App\Classes\ValueObjects\Constants\HttpStatus;
+use Illuminate\Http\Request;
+use App\Models\SeasonalSegment;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\DB;
+use Maatwebsite\Excel\Facades\Excel;
+use App\Models\TransactionMappingLog;
+use App\Models\StatementTransactionOwner;
+use App\Classes\ValueObjects\Constants\HttpStatus;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\Modules\Imports\Services\GenericImport;
+use App\Classes\ValueObjects\Response\ApiResponseObject;
+use App\Classes\Modules\Segments\Services\CreatesSeasonalSegment;
+use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Segments\DataTransferObjects\SeasonalSegmentObject;
 
 class ImportStatementReceiptsController
 {
     private $responseTitle;
     private $responseMessage;
 
+    private $removeStr = 'Payment for ';
+
     public function __construct() {
         $this->responseTitle = 'Import Receipt Mapping';
         $this->responseMessage = 'You have successfully imported receipt mapping';
@@ -56,11 +59,13 @@ class ImportStatementReceiptsController
                 $row['mapped_status'] = 'failed';
                 $row['date'] = in_array(gettype($row['doc_date']), ['integer', 'double']) ? $this->changeExcelDate($row['doc_date']) : date('Y-m-d', strtotime($row['doc_date']));
 
-                $returnReference = $this->mappingExchange($row);
-                if ($returnReference) {
-                    $row['mapped_result_reference'] = $returnReference;
-                    $row['mapped_status'] = 'success';
-                } 
+                if ($invRefer = $this->getInvoiceReference($row['description'])) {
+                    $returnReference = $this->mappingExchange($invRefer, $row['doc_no']);
+                    if ($returnReference) {
+                        $row['mapped_result_reference'] = $returnReference;
+                        $row['mapped_status'] = 'success';
+                    } 
+                }
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
@@ -75,28 +80,26 @@ class ImportStatementReceiptsController
         }
     }
 
+    private function getInvoiceReference($invRefer) {
+        $arrStr = explode($this->removeStr, $invRefer);
+        if (isset($arrStr[1])) return $arrStr[1];
+        return null;
+    }
+
     public function response(String $responseTitle, String $responseMessage, int $httpStatus, ?array $data = []) : JsonResponse {
         return (new ApiResponseObject($responseTitle, $responseMessage, $httpStatus, $data))->handler();
     }
 
-    private function mappingExchange(Array $row) {
-        $date = $row['date'];
-        $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['payment_amount'])->whereRaw("DATE(posting_date) = '$date'")->get();
+    private function mappingExchange($invRefer, $docNo) {
+        $transactionOwner = StatementTransactionOwner::where('invoice_reference',$invRefer)->whereNull('receipt_reference')->where('status', ApprovalStatus::COMPLETED)->first();
 
-        if ($transactions && $transactions->count() == 0) {
-            $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['payment_amount']))->whereRaw("DATE(posting_date) = '$date'")->get();
-        }
-
-        if ($transactions && $transactions->count() == 1) {
-            foreach ($transactions as $key => $transaction) {
-                return $this->updateTransactionOwnerReference($transaction, $row['doc_no']);
-            }
+        if ($transactionOwner) {
+            return $this->updateTransactionOwnerReference($transactionOwner, $docNo);
         }
         return false;
     }
 
-    public function updateTransactionOwnerReference($transaction, String $docNo) {
-        $transactionOwner = $transaction->transaction_owner;
+    public function updateTransactionOwnerReference($transactionOwner, String $docNo) {
         if ($transactionOwner) {
             $transactionOwner->update([
                 'receipt_reference'=>$docNo,
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index b09b9a56..0c193871 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -4,6 +4,8 @@
             <div class="row p-b-10 b-b b-grey">
                 <div class="col-2">{{ item.posting_date }}</div>
                 <div class="col-2">{{ item.transaction_description_1 + ' - ' + item.transaction_description_2 }}</div>
+
+                <!-- Mapping Approval tab -->
                 <div class="col-5" v-if="item.owners.pending_verification.length === 1">
                     <div class="row">
                         <div class="col">{{item.owners.pending_verification[0].system}}</div>
@@ -51,6 +53,7 @@
                     </div>
                 </div>
 
+                <!-- Mapping Review tab -->
                 <div class="col-5" v-if="item.owners.pending_verification.length > 1">
                     <div class="row">
                         <div class="col">
@@ -93,6 +96,7 @@
                     </div>
                 </div>
 
+                <!-- unknow tab -->
                 <div class="col-5" v-if="!item.owners.pending_verification.length && !item.owners.approved.length">
                     <div class="row">
                         <div class="col">

From 7aedaa3c174cfd75f2df353abb1e0748fe579a48 Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 13 Dec 2023 13:36:54 +0800
Subject: [PATCH 57/66] show all active services for suppliers when not in
 segment

---
 app/Models/Company.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/Models/Company.php b/app/Models/Company.php
index 8b2e6081..a1416ebb 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -109,7 +109,7 @@ class Company extends AbstractModel implements Documentable
     {
         return $this->hasManyDeep(Transaction::class, [Booking::class], ['company_id',  'owner_id'], ['id', 'id']);
     }
-    
+
     /**
      * @return HasMany
      */
@@ -130,13 +130,25 @@ class Company extends AbstractModel implements Documentable
      * @return Builder
      */
     public function services(): Builder  {
-        return ServiceType::where('status', ApprovalStatus::APPROVED)->whereHas('constants', function($query) {
-            $query->Where(function($query){
-                $query->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->is_active', true);
-            })->orWhere(function($query) {
-                $query->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->where('detail->is_active', true)->whereIn('segment_id', $this->segments->pluck('id'));
+
+        if ($this->type === 3) {
+            return ServiceType::where('status', ApprovalStatus::APPROVED)->whereHas('constants', function($query) {
+                $query->where(function($query) {
+                    $query->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->is_active', true);
+                })->orWhere(function($query) {
+                    $query->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->where('detail->is_active', true);
+                });
             });
-        });
+        } else {
+            // Existing logic for other company types
+            return ServiceType::where('status', ApprovalStatus::APPROVED)->whereHas('constants', function($query) {
+                $query->Where(function($query){
+                    $query->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->is_active', true);
+                })->orWhere(function($query) {
+                    $query->where('reference', SegmentConstants::CUSTOM_SERVICE_TYPE)->where('detail->is_active', true)->whereIn('segment_id', $this->segments->pluck('id'));
+                });
+            });
+        }
     }
 
     public function servicesConfigurations(): Collection {

From 1ddf7923a51cd041986e57799c35737e19b2fbcf Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Wed, 13 Dec 2023 13:38:54 +0800
Subject: [PATCH 58/66] show all active services for suppliers when not in
 segment

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

diff --git a/app/Models/Company.php b/app/Models/Company.php
index a1416ebb..54ae1e23 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -131,7 +131,7 @@ class Company extends AbstractModel implements Documentable
      */
     public function services(): Builder  {
 
-        if ($this->type === 3) {
+        if ($this->business_type === 3) {
             return ServiceType::where('status', ApprovalStatus::APPROVED)->whereHas('constants', function($query) {
                 $query->where(function($query) {
                     $query->where('reference', SegmentConstants::SERVICE_TYPE)->where('detail->is_active', true);

From 5d0052a6714b091d2a3d0472ea561a171970576f Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 27 Dec 2023 13:47:12 +0800
Subject: [PATCH 59/66] add reporting for download history import mapped
 invoice and receipt and with fix bug

---
 .../Eloquent/Filters/GroupByImportedDate.php  |  18 ++
 .../Eloquent/Filters/ImportedDateFrom.php     |  18 ++
 .../Eloquent/Filters/ImportedDateTo.php       |  18 ++
 .../StatementTransactionInvoiceReference.php  |  22 ++
 .../StatementTransactionOwnerReference.php    |  22 ++
 .../StatementTransactionReceiptReference.php  |  22 ++
 ...portedTransactionMappedControllerLogic.php |  49 ++++
 .../Services/ListTransactionMappingLogs.php   |  32 +++
 .../ExportsImportedInvoiceMappeds.php         |   1 -
 .../ExportsImportedReceiptMappeds.php         |  86 +++++++
 ...oryImportedTransactionMappedController.php |  20 ++
 .../ExportCustomersToExcelController.php      |   7 +
 .../ImportStatementInvoiceController.php      |   1 +
 .../ImportStatementReceiptsController.php     |   1 +
 .../TransactionMappingLogResource.php         |  23 ++
 app/Models/TransactionMappingLog.php          |   2 +-
 ...type_to_transaction_mapping_logs_table.php |  40 ++++
 .../elements/HistoryImportedInvoices.vue      |  39 +++
 .../elements/HistoryImportedReceipts.vue      |  39 +++
 .../ImportedInvoiceMappedComponent.vue        |  12 +-
 .../ImportedReceiptMappedComponent.vue        | 138 +++++++++++
 .../ReportTransactionsMappedComponent.vue     | 222 +++++++++++++++++-
 .../sections/TransactionsMappingComponent.vue |  15 +-
 routes/accounting.php                         |   3 +
 routes/web.php                                |   1 +
 25 files changed, 827 insertions(+), 24 deletions(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
 create mode 100644 app/Classes/General/Eloquent/Filters/ImportedDateTo.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
 create mode 100644 app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
 create mode 100644 app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
 create mode 100644 app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
 create mode 100644 app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
 create mode 100644 app/Http/Resources/TransactionMappingLogResource.php
 create mode 100644 database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
 create mode 100644 resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
 create mode 100644 resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
 create mode 100644 resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue

diff --git a/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php b/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
new file mode 100644
index 00000000..25f20fa3
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/GroupByImportedDate.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class GroupByImportedDate implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->groupby('imported_date');
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php b/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
new file mode 100644
index 00000000..140bbb20
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ImportedDateFrom.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ImportedDateFrom implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('imported_date', '>=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ImportedDateTo.php b/app/Classes/General/Eloquent/Filters/ImportedDateTo.php
new file mode 100644
index 00000000..11bd3857
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ImportedDateTo.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ImportedDateTo implements Filter
+{
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereDate('imported_date', '<=', date('Y-m-d',strtotime($value)));
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
new file mode 100644
index 00000000..9e3ba1e9
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionInvoiceReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionInvoiceReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('Invoice_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
new file mode 100644
index 00000000..c0a7beaf
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionOwnerReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionOwnerReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('owner_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php b/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
new file mode 100644
index 00000000..f808f784
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/StatementTransactionReceiptReference.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class StatementTransactionReceiptReference implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereHas('owners', function ($query) use ($value) {
+            return $query->where('receipt_reference', $value);
+        });
+    }
+
+}
diff --git a/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
new file mode 100644
index 00000000..2f96c613
--- /dev/null
+++ b/app/Classes/Modules/Accounting/ControllersLogic/HistoryImportedTransactionMappedControllerLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\ControllersLogic;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Http\Resources\TransactionMappingLogResource;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Accounting\Services\ListTransactionMappingLogs;
+
+
+class HistoryImportedTransactionMappedControllerLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification(): array
+    {
+        return [
+            'title' => 'Retrieved History Imported Invoices',
+            'message' => 'You have successfully retrieved history imported invoices'
+        ];
+    }
+
+    /** @var ListTransactionMappingLogs */
+    private $listTransactionMappingLogs;
+
+    /**
+     * UpdateAnnouncementLogic constructor.
+     * @param ListTransactionMappingLogs $listTransactionMappingLogs
+     */
+    public function __construct(
+        ListTransactionMappingLogs $listTransactionMappingLogs
+    ) {
+        $this->listTransactionMappingLogs = $listTransactionMappingLogs;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request): JsonResponse
+    {
+        $query = $this->listTransactionMappingLogs->execute($this->listTransactionMappingLogs->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(TransactionMappingLogResource::collection($query));
+    }
+}
diff --git a/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php b/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
new file mode 100644
index 00000000..fdeff835
--- /dev/null
+++ b/app/Classes/Modules/Accounting/Services/ListTransactionMappingLogs.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\Services;
+
+use App\Models\TransactionMappingLog;
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractListRecord;
+
+class ListTransactionMappingLogs extends AbstractListRecord
+{
+
+    /** @var TransactionMappingLog */
+    private $repository;
+
+    /**
+     * ListsBankStatementDetails constructor.
+     * @param TransactionMappingLog $repository
+     */
+    public function __construct(TransactionMappingLog $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
index e629675f..ead22543 100644
--- a/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedInvoiceMappeds.php
@@ -59,7 +59,6 @@ class ExportsImportedInvoiceMappeds implements FromQuery, WithHeadings, WithHead
      */
     public function map($transaction): array
     {
-        // dd($transaction);
         $this->count += 1;
         $data = $transaction->data;
         return [
diff --git a/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php b/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
new file mode 100644
index 00000000..efe95fd3
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsImportedReceiptMappeds.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use Carbon\Carbon;
+use Illuminate\Support\Arr;
+use Illuminate\Http\Request;
+use App\Models\TransactionMappingLog;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+
+class ExportsImportedReceiptMappeds implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $dateTime;
+    private $count;
+    private $counter = 1;
+
+    public function __construct(Request $request)
+    {
+        $this->dateTime = $request->input('date').' '.$request->input('time');
+        $this->count = 0;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Check',
+            'Doc No',
+            'Doc Date',
+            'Debtor Code',
+            'Company Name',
+            'Description',
+            'Payment Amount',
+            'Created User',
+            'Curr.',
+            'To Home Rate',
+            'Local Payment Amount',
+            'Cancelled',
+            'Mapped Status',
+            'Mapped Reference No',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        return TransactionMappingLog::where('imported_date', $this->dateTime);
+    }
+
+    /**
+     * @param Transaction $transaction
+     *
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $this->count += 1;
+        $data = $transaction->data;
+        return [
+            $this->count,
+            Arr::get($data,'doc_no'),
+            Arr::get($data,'doc_date'),
+            Arr::get($data,'debtor_code'),
+            Arr::get($data,'company_name'),
+            Arr::get($data,'description'),
+            Arr::get($data,'payment_amount'),
+            Arr::get($data,'created_user'),
+            Arr::get($data,'curr'),
+            Arr::get($data,'to_home_rate'),
+            Arr::get($data,'local_payment_amount'),
+            Arr::get($data,'cancelled'),
+            Arr::get($data,'2nd_doc_no'),
+            Arr::get($data,'mapped_status'),
+            Arr::get($data,'mapped_result_reference'),
+        ];
+    
+    }
+}
diff --git a/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php b/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
new file mode 100644
index 00000000..8b4a2cde
--- /dev/null
+++ b/app/Http/Controllers/Accounting/HistoryImportedTransactionMappedController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Accounting;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use App\Classes\Modules\Accounting\ControllersLogic\HistoryImportedTransactionMappedControllerLogic;
+
+class HistoryImportedTransactionMappedController
+{
+    /**
+     * @param Request $request
+     * @param ApprovePaymentLogic $logic
+     * @return JsonResponse
+     */
+    public function getImported(Request $request, HistoryImportedTransactionMappedControllerLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 733c84fa..0f351c7d 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -18,6 +18,7 @@ use Maatwebsite\Excel\Excel;
 use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
 use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
+use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds;
 
 class ExportCustomersToExcelController
 {
@@ -91,4 +92,10 @@ class ExportCustomersToExcelController
         ob_end_clean();
         return $response;
     }
+
+    public function importedReceiptMapped(ExportsImportedReceiptMappeds $exportsImportedReceiptMappeds, Request $request) {
+        $response = $exportsImportedReceiptMappeds->download($request->input('fileName').'.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/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 75953f2b..e4c35eb5 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -100,6 +100,7 @@ class ImportStatementInvoiceController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'invoices',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);
diff --git a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
index a43f2dda..6c117642 100644
--- a/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
+++ b/app/Http/Controllers/Imports/ImportStatementReceiptsController.php
@@ -69,6 +69,7 @@ class ImportStatementReceiptsController
 
                 TransactionMappingLog::create([
                     'imported_date'=>$importDate,
+                    'type' => 'receipts',
                     'data'=>$row,
                 ]);
                 array_push($data, $row);
diff --git a/app/Http/Resources/TransactionMappingLogResource.php b/app/Http/Resources/TransactionMappingLogResource.php
new file mode 100644
index 00000000..954294f1
--- /dev/null
+++ b/app/Http/Resources/TransactionMappingLogResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TransactionMappingLogResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'imported_date' => $this->imported_date,
+            'type' => $this->type
+        ];
+    }
+}
diff --git a/app/Models/TransactionMappingLog.php b/app/Models/TransactionMappingLog.php
index d6093f39..e9ddab33 100644
--- a/app/Models/TransactionMappingLog.php
+++ b/app/Models/TransactionMappingLog.php
@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class TransactionMappingLog extends Model
 {
-    protected $fillable = ['imported_by','data','imported_date'];
+    protected $fillable = ['imported_by','data','imported_date','type'];
 
     protected $casts = [
         'data' => 'array',
diff --git a/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php b/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
new file mode 100644
index 00000000..3927920a
--- /dev/null
+++ b/database/migrations/2023_12_26_152448_add_type_to_transaction_mapping_logs_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTypeToTransactionMappingLogsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('transaction_mapping_logs', function (Blueprint $table) {
+            $table->string('type',50)->default('invoices')->after('imported_date');
+        });
+
+        foreach (DB::table('transaction_mapping_logs')->get() as $key => $value) {
+            $data = json_decode($value->data);
+            DB::table('transaction_mapping_logs')->where('id',$value->id)->update([
+                'type' => (isset($data->description) ? 'receipts' : 'invoices')
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('transaction_mapping_logs', function (Blueprint $table) {
+            $table->dropColumn('type');
+        });
+    }
+}
diff --git a/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue b/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
new file mode 100644
index 00000000..d3d68cfb
--- /dev/null
+++ b/resources/assets/vue/components/accounting/elements/HistoryImportedInvoices.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row p-b-10 b-b b-grey">
+                <div class="col-2">{{ item.imported_date }}</div>
+                <div class="col-2">                        
+                    <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped(item.imported_date)">
+                            Download Invoices Mapped
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            stage: {
+                type: Number,
+                default: 0
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            downloadInvoiceMapped(importedDate) {
+                var arrDateTime = importedDate.split(" ");
+                const fileName = 'InvoiceMapped';
+                
+                window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue b/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
new file mode 100644
index 00000000..00138fa5
--- /dev/null
+++ b/resources/assets/vue/components/accounting/elements/HistoryImportedReceipts.vue
@@ -0,0 +1,39 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row p-b-10 b-b b-grey">
+                <div class="col-2">{{ item.imported_date }}</div>
+                <div class="col-2">                        
+                    <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped(item.imported_date)">
+                            Download Receipts Mapped
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            stage: {
+                type: Number,
+                default: 0
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        methods: {
+            downloadInvoiceMapped(importedDate) {
+                var arrDateTime = importedDate.split(" ");
+                const fileName = 'ReceiptMapped';
+                
+                window.open(this.route('importedReceiptMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
index f10f9181..185da370 100644
--- a/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ImportedInvoiceMappedComponent.vue
@@ -98,21 +98,17 @@
         },
         methods: {
             appendComponentTitle() {
-                this.componentTitle = this.section == 'importInvoiceMapping' ? 'Imported Invoices Mapped' : 'Imported Receipts Mapped';
+                this.componentTitle = 'Imported Invoices Mapped';
             },
             appendComponentTableHeader() {
-                if (this.section == 'importInvoiceMapping') {
-                    this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No','Payment Received Date'];
-                } else {
-                    this.tableHeaders = ['No','OR No','Date','Creditor Code','Creditor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No'];
-                }
+                this.tableHeaders = ['No','Doc No','Date','Debtor Code','Debtor Name','Shipping Info','Net Total','Cancelled','Mapped Status','Mapped Reference No','Payment Received Date'];
             },
             importInvoice(){
                 this.isLoading = true;
                 this.parameters = {
                     files: this.files
                 };
-                this.submit(this.route('api.'+(this.section == 'importInvoiceMapping' ? 'import_invoices' : 'import_receipts')+'.upload'), 'post', this.section, true, false);
+                this.submit(this.route('api.import_invoices.upload'), 'post', this.section, true, false);
             },
 
             successHandler(response){
@@ -128,7 +124,7 @@
 
             downloadInvoiceMapped() {
                 var arrDateTime = this.importedDate.split(" ");
-                const fileName = this.section == 'importInvoiceMapping' ? 'InvoiceMapped' : 'ReceiptMapped';
+                const fileName = 'importInvoiceMapping';
 
                 window.open(this.route('importedInvoiceMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
             },
diff --git a/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue
new file mode 100644
index 00000000..25db762e
--- /dev/null
+++ b/resources/assets/vue/components/accounting/sections/ImportedReceiptMappedComponent.vue
@@ -0,0 +1,138 @@
+<template>
+    <div class="row h-100 parentContainer">
+        <div class="col-12" style="min-height: 20px;">
+            <loading-component style="height: 20px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+        </div>
+
+        <div class="col-12">
+            <div class="card">
+                <div class="card-header">
+                    <h3>{{ componentTitle }}</h3>
+                    <div class="row m-b-10 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="text-right">
+                        <button class="btn btn-xs btn-outline-success b-rad-none m-r-5" @click="downloadInvoiceMapped">
+                            Download Receipts Mapped
+                        </button>
+                    </div>
+                </div>
+                <!-- /.card-header -->
+                <div class="card-body table-responsive p-0">
+                    <table class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th v-for="item in tableHeaders">{{ item }}</th>
+                        </tr>
+                    </thead>
+                    <tbody v-show="!isLoading">
+                        <tr v-for="(item, index) in $store.getters.getListData(section)">
+                            <td>{{index+1}}</td>
+                            <td>{{item.check }}</td>
+                            <td>{{item.doc_no}}</td>
+                            <td>{{item.doc_date }}}</td>
+                            <td>{{item.debtor_code}}</td>
+                            <td>{{item.company_name}}</td>
+                            <td>{{item.description}}</td>
+                            <td>{{item.payment_amount}}</td>
+                            <td>{{item.created_user}}</td>
+                            <td>{{item.curr}}</td>
+                            <td>{{item.to_home_rate}}</td>
+                            <td>{{item.local_payment_amount}}</td>
+                            <td>{{item.cancelled}}</td>
+                            <td>{{item.mapped_status}}</td>
+                            <td>{{item.mapped_result_reference}}</td>
+                        </tr>
+                    </tbody>
+                    </table>
+                </div>
+                <!-- /.card-body -->
+                <div class="card-footer">
+
+                </div>
+            </div>
+        </div>
+
+        <div class="col-12">
+            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            files: {
+                required: true
+            },
+            type: {
+                type: String,
+                required: true,
+            },
+            section:{
+                type: String,
+                required: true
+            },
+        },
+        data() {
+            return {
+                isLoading: false,
+                error: '',
+                importedDate: null,
+            }
+        },
+        computed: {
+            pendingQueue() {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete, oldValue){
+                if(inComplete){
+                    this.importInvoice();
+                }
+            },
+        },
+        created(){
+            this.appendComponentTitle();
+            this.appendComponentTableHeader();
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            appendComponentTitle() {
+                this.componentTitle = 'Imported Receipts Mapped';
+            },
+            appendComponentTableHeader() {
+                this.tableHeaders = ['Check','Doc No','Doc Date','Debtor Code','Company Name','Description','Payment Amount','Created User','Curr.','To Home Rate','Local Payment Amount','Cancelled','Mapped Status','Mapped Reference No'];
+            },
+            importInvoice(){
+                this.isLoading = true;
+                this.parameters = {
+                    files: this.files
+                };
+                this.submit(this.route('api.import_receipts.upload'), 'post', this.section, true, false);
+            },
+
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.importedDate = response.payload.importedDate;
+                this.isLoading = false;
+            },
+
+            errorHandler(error){
+                this.isLoading = false;
+                this.error = error.message;
+            },
+
+            downloadInvoiceMapped() {
+                var arrDateTime = this.importedDate.split(" ");
+                const fileName = 'ReceiptMapped';
+
+                window.open(this.route('importedReceiptMapped.export')+'?date='+arrDateTime[0]+'&time='+arrDateTime[1]+'&fileName='+fileName, '_blank');
+            },
+        }
+    }
+
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
index e3d4e0d2..86da623c 100644
--- a/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/ReportTransactionsMappedComponent.vue
@@ -3,19 +3,74 @@
         <div class="col">
             <div class="row">
                 <div class="col">
-                    <div class="row justify-content-center align-items-center m-t-50 m-b-50" v-show="step === 0">
-                        <div class="col-5">
-                            <div class="row text-center">
-                                <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                    <div class="justify-content-center align-items-center m-t-50 m-b-50" v-show="step === 0">
+
+                        <div class="row">
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedInvReport()">History Imported Invoices Report</div>
+                                </div>
+                            </div>
+                            <div class="col-3">
+                                <div class="row text-center">
+                                    <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedRecReport()">History Imported Receipts Report</div>
+                                </div>
                             </div>
                         </div>
+
                     </div>
                 </div>
             </div>
-            <div class="row" v-if="step == 1">
+            <div class="row" v-if="step > 0 && report == 'mappedRecords'">
                 <div class="col">
                     <div class="row">
                         <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row mb-3">
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.owner_reference">
+                                        <label class="text-primary">Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.owner_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.invoice_reference">
+                                        <label class="text-primary">Invoice Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.invoice_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-4">
+                                        <validation-wrapper-component :validator="$v.parameters.receipt_reference">
+                                        <label class="text-primary">Receipt Reference</label>
+                                            <input type="text" class="form-control" v-model="parameters.receipt_reference">
+                                        </validation-wrapper-component>
+                                    </div>
+                                </div>
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getReportFilter()">Mapped Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="row m-t-10 m-b-10">
                                 <div class="col">
                                     <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
@@ -35,7 +90,7 @@
                                 </div>
                             </div>
 
-                            <list-component ref="TransactionsMappedList" section="TransactionsMappedSection" :endpoint="route('api.accounting.bank.transaction')" :options="filter">
+                            <list-component :key="step" ref="TransactionsMappedList" section="TransactionsMappedSection" :endpoint="route('api.accounting.bank.transaction')" :options="filter">
                                 <template slot="list" slot-scope="{data}">
                                     <statement-transaction-mapped-component :data="data" :section="section"></statement-transaction-mapped-component>
                                 </template>
@@ -44,22 +99,175 @@
                     </div>
                 </div>
             </div>
+
+            <!-- report for imported Invoices -->
+            <div class="row" v-if="step > 0 && report == 'importedInv'">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedInvReport()">History Imported Invoices Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-10 m-b-10">
+                                <div class="col">
+                                    <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
+                                        <div class="col-2">Date</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <list-component :key="step" ref="HistoryImportedInvList" section="HistoryImportedInvSection" :endpoint="route('api.accounting.history.imported')" :options="filter">
+                                <template slot="list" slot-scope="{data}">
+                                    <history-imported-invoices :data="data" :section="section"></history-imported-invoices>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!-- report for imported Receipts -->
+            <div class="row" v-if="step > 0 && report == 'importedRec'">
+                <div class="col">
+                    <div class="row">
+                        <div class="col">
+                            <div class="justify-content-center align-items-center m-t-50 m-b-50">
+                                <div class="row">
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.startDate">
+                                            <label class="all-caps">Start Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <validation-wrapper-component :validator="$v.parameters.endDate">
+                                            <label class="all-caps">End Date</label>
+                                            <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
+                                        </validation-wrapper-component>
+                                    </div>
+                                    <div class="col-3">
+                                        <div class="row text-center">
+                                            <div class="col b-a b-grey padding-20 m-r-15 pointer bg-complete text-white" @click="getHistoryImportedRecReport()">History Imported Receipts Report</div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row m-t-10 m-b-10">
+                                <div class="col">
+                                    <div class="row p-t-10 p-b-10 b-b b-grey text-master-light">
+                                        <div class="col-2">Date</div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <list-component :key="step" ref="HistoryImportedRecList" section="HistoryImportedRecSection" :endpoint="route('api.accounting.history.imported')" :options="filter">
+                                <template slot="list" slot-scope="{data}">
+                                    <history-imported-receipts :data="data" :section="section"></history-imported-receipts>
+                                </template>
+                            </list-component>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </template>
 <script>
+    import { required } from "vuelidate/lib/validators";
     export default {
         data() {
             return {
+                parameters: {
+                    startDate: '',
+                    endDate: '',
+                    owner_reference: '',
+                    invoice_reference: '',
+                    receipt_reference: ''
+                },
                 step: 0,
                 filter: {},
+                report: ''
             }
         },
+        validations: {
+            parameters: {
+                startDate: {
+                    required
+                },
+                endDate: {
+                    required
+                },
+                owner_reference: {},
+                invoice_reference: {},
+                receipt_reference: {}
+            },
+        },
+        created(){
+            this.parameters.startDate = this.startDate();
+            this.parameters.endDate = this.endDate();
+        },
         methods: {
+            startDate() {
+                var date = new Date();
+                return '01-'+(date.getMonth() + 1)+'-'+date.getFullYear();
+            },
+            endDate() {
+                var date = new Date();
+                var lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0);
+                return lastDay.getDate()+'-'+(lastDay.getMonth() + 1)+'-'+lastDay.getFullYear();
+            },
             getReportFilter() {
                 this.filter = {min_amount: 0, is_mapped: true, statement_transaction_owner_type_in: [1, 2], statement_transaction_owner_status_in: [3], per_page: 100, order_by: {column: 'posting_date', DESC: true}};
 
-                this.step = 1
+                this.filter = {...this.filter, ...{statement_transaction_posting_start: this.parameters.startDate}};
+                this.filter = {...this.filter, ...{statement_transaction_posting_end:this.parameters.endDate}}
+
+                if (typeof this.parameters.owner_reference != 'undefined' && this.parameters.owner_reference != '') this.filter = {...this.filter, ...{statement_transaction_owner_reference: this.parameters.owner_reference}};
+
+                if (typeof this.parameters.invoice_reference != 'undefined' && this.parameters.invoice_reference != '') this.filter = {...this.filter, ...{statement_transaction_invoice_reference: this.parameters.invoice_reference}};
+
+                if (typeof this.parameters.receipt_reference != 'undefined' && this.parameters.receipt_reference != '') this.filter = {...this.filter, ...{statement_transaction_receipt_reference: this.parameters.receipt_reference}};
+
+                this.step = this.step + 1;
+                this.report = 'mappedRecords';
+            },
+            getHistoryImportedRecReport() {
+                this.filter = {
+                    imported_date_from: this.parameters.startDate,
+                    imported_date_to:this.parameters.endDate,
+                    group_by_imported_date:true,
+                    type:'receipts'
+                };
+                this.step = this.step + 1;
+                this.report = 'importedRec';
+            },
+            getHistoryImportedInvReport() {
+                this.filter = {
+                    imported_date_from: this.parameters.startDate,
+                    imported_date_to:this.parameters.endDate,
+                    group_by_imported_date:true,
+                    type:'invoices'
+                };
+                this.step = this.step + 1;
+                this.report = 'importedInv';
             }
         },
     }
diff --git a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
index bb19b908..f7073783 100644
--- a/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
+++ b/resources/assets/vue/components/accounting/sections/TransactionsMappingComponent.vue
@@ -164,7 +164,7 @@
                             <div class="row">
                                 <div class="col-12">
                                     <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
-                                        <imported-invoice-mapped-component section="importInvoiceMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                        <imported-invoice-mapped-component section="importInvoiceMapping" v-if="invMappedTrue" :files="files"></imported-invoice-mapped-component>
                                     </modal-component>
                                 </div>
                             </div>
@@ -192,7 +192,7 @@
                                     </file-input-component>
                                 </div>
                             </div>
-                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportInvoice" @click="importReceipts">Import Receipts</div>
+                            <div class="btn btn-lg btn-primary m-t-20 requestModal" data-type="ModalImportReceipt" @click="importReceipts">Import Receipts</div>
                             <!-- todo-new: delete later --><br><div class="btn btn-lg btn-primary m-t-20" @click="exportStage++">Nest Step</div>
                             <br>
                             <div class="row">
@@ -202,8 +202,8 @@
                             </div>
                             <div class="row">
                                 <div class="col-12">
-                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportInvoice">
-                                        <imported-invoice-mapped-component section="importReceiptMapping" v-if="mappedTrue" :files="files"></imported-invoice-mapped-component>
+                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="ModalImportReceipt">
+                                        <imported-receipt-mapped-component section="importReceiptMapping" v-if="recMappedTrue" :files="files"></imported-receipt-mapped-component>
                                     </modal-component>
                                 </div>
                             </div>
@@ -240,7 +240,8 @@ export default {
             files: [],
             parameters: {},
             section: 'bankTransactionSection',
-            mappedTrue: false,
+            invMappedTrue: false,
+            recMappedTrue: false,
             selectAll: false,
         }
     },
@@ -259,10 +260,10 @@ export default {
     },
     methods: {
         importInvoice(){
-            this.mappedTrue = true;
+            this.invMappedTrue = true;
         },
         importReceipts(){
-            this.mappedTrue = true;
+            this.recMappedTrue = true;
         },
         exportInvoiceToAutoCount(){
             const checkedStatementTransactions = this.getCheckedStatementOwners();
diff --git a/routes/accounting.php b/routes/accounting.php
index 4fe0a1ad..ddeecb21 100644
--- a/routes/accounting.php
+++ b/routes/accounting.php
@@ -16,4 +16,7 @@ Route::group(['prefix' => 'accounting', 'as' => 'accounting.', 'namespace' => 'A
         Route::post('/owner/group-approve', 'GroupApproveStatementTransactionController@approve')->name('owner.groupApprove');
         Route::post('/{id}/owner/{status}', 'UpdateStatementTransactionStatusController@update')->where('status', 'approve|reject')->name('owner.status.update');
     });
+
+    Route::get('history/imported', 'HistoryImportedTransactionMappedController@getImported')->name('history.imported');
+    
 });
diff --git a/routes/web.php b/routes/web.php
index ead4b3d2..674f8f0e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -263,6 +263,7 @@ Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelContro
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
 Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
 Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
+Route::get('/export/imported-receipt-mapped', 'Exports\ExportCustomersToExcelController@importedReceiptMapped')->name('importedReceiptMapped.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){

From 72a945613affdee69e012a863ecf5f798043c30c Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:32:02 +0800
Subject: [PATCH 60/66] fix po

---
 .../pages/pdfs/purchase_order_table.blade.php |  3 ++-
 routes/web.php                                | 20 +++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 20fac9b8..69083e93 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,11 +15,12 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
+        $currency_id = $transaction->currency_id
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
         @php
-            $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+            $exactUnitPrice = ($currency_id) === 1 : $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
             $displayUnitPrice = round($exactUnitPrice, 2);
             $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
             $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);
diff --git a/routes/web.php b/routes/web.php
index 674f8f0e..bf2892bb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -112,7 +112,7 @@ Route::get('/transfer/{marking}', function ($marking) {
     return view('pages.bookings.profile', ['marking' => $marking]);
 })->name('booking.details');
 
-Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
+Route::get('/transfer/{marking}/latest/{document_type}', function ($marking, $document_type) {
     $booking= Booking::where('marking', $marking)->first();
 
     $purchaseOrder = $booking->transactions()
@@ -126,7 +126,23 @@ Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
 
     $supplier = Company::where('id', $transaction->receiver)->first();
 
-    $lowercaseDocumentType = strtolower(DocumentType::INVOICE);
+    $lowercaseDocumentType = null;
+    switch  ($document_type) {
+        case 'po': 
+            $lowercaseDocumentType = DocumentType::PURCHASE_ORDER;
+            break;
+        case 'do': 
+            $lowercaseDocumentType = DocumentType::DELIVER_ORDER;
+            break;
+        case 'sdo': 
+            $lowercaseDocumentType = DocumentType::SUPPLIER_DELIVER_ORDER;
+            break;
+        default: 
+            $lowercaseDocumentType = DocumentType::INVOICE;
+            break;
+    }
+
+    $lowercaseDocumentType = strtolower($lowercaseDocumentType);
 
     $voucherRedemption = $transaction->voucherRedemption;
 

From 6cac8e6e094470618aea80f93308a7f0b3520554 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:36:47 +0800
Subject: [PATCH 61/66] code update

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

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 69083e93..c570280d 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,7 +15,7 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
-        $currency_id = $transaction->currency_id
+        $currency_id = $transaction->currency_id;
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)

From c599ae5887a98b4724c1081b471515f396369536 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 2 Jan 2024 19:40:38 +0800
Subject: [PATCH 62/66] code update

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

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index c570280d..99b28dd7 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -20,7 +20,7 @@
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)
         @php
-            $exactUnitPrice = ($currency_id) === 1 : $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
+            $exactUnitPrice = ($currency_id) === 1 ? $transaction_detail->price : bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
             $displayUnitPrice = round($exactUnitPrice, 2);
             $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
             $displayedItemTotal = round(bcmul($displayUnitPrice, $transaction_detail->quantity, 7), 2);

From 74c6ca7330bd62ad385c9db3397e6c5745479120 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Wed, 3 Jan 2024 09:08:54 +0800
Subject: [PATCH 63/66] change posting date to invoice date for shipping portal
 when export invoice to autocount

---
 .../General/Services/GuzzleShippingPortal.php | 22 +++++++++++++++++++
 .../Services/ExportsInvoiceTransactions.php   | 11 +++++++---
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 app/Classes/General/Services/GuzzleShippingPortal.php

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
new file mode 100644
index 00000000..d753b260
--- /dev/null
+++ b/app/Classes/General/Services/GuzzleShippingPortal.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\General\Services;
+
+class GuzzleShippingPortal
+{
+    public function execute($route, $requests)
+    {
+        try {
+            $url = 'https://izyim.cief-malaysia.com/public/api/v1/'.$route;
+            $client = new \GuzzleHttp\Client(['verify' => false]);
+            $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&'. $requests);
+            $body = $response->getBody();
+            $data = json_decode($body, true);
+            $payload = $data['payload'];
+            return $payload['data'];
+        } catch (\Exception $exception) {
+            Log::error($exception->getMessage());
+            return [];
+        }
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index a7041b1c..ee07f435 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -19,6 +19,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Eloquent\ApplyFiltersToQuery;
 use App\Models\StatementTransaction;
+use App\Classes\General\Services\GuzzleShippingPortal;
 
 class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
 {
@@ -124,12 +125,11 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
-
-                Log::info('Error in Exports Invoice Transactions ' . $this->counter);
+                $transactionShippingPortal = $this->getFromShippingPortal($statementTransactionOwner->owner_id);
 
                 return [
                     'Transaction Not Found',
-                    $transaction->posting_date->format('m/d/Y H:m'),
+                    (isset($transactionShippingPortal['created_at']) ? Carbon::parse($transactionShippingPortal['created_at'])->format('m/d/Y H:m') : null),
                     $transaction->transaction_description.' - '.$transaction->transaction_description_2,
                     $statementTransactionOwner->system,
                     '',
@@ -167,4 +167,9 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
             ];
         }
     }
+
+    private function getFromShippingPortal($id){
+        $data = (new guzzleShippingPortal)->execute('transactions/mappable/query','filters={"id":'.$id.'}');
+        return (count($data) > 0 ? $data[0] : null);
+    }
 }

From b2dd059fa4e80b9f8f5dae681e6f1089a926b933 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Wed, 3 Jan 2024 10:12:06 +0800
Subject: [PATCH 64/66] update logging for GuzzleShippingPortal

---
 app/Classes/General/Services/GuzzleShippingPortal.php | 3 +++
 config/logging.php                                    | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
index d753b260..2fed1e9a 100644
--- a/app/Classes/General/Services/GuzzleShippingPortal.php
+++ b/app/Classes/General/Services/GuzzleShippingPortal.php
@@ -2,6 +2,8 @@
 
 namespace App\Classes\General\Services;
 
+use Illuminate\Support\Facades\Log;
+
 class GuzzleShippingPortal
 {
     public function execute($route, $requests)
@@ -16,6 +18,7 @@ class GuzzleShippingPortal
             return $payload['data'];
         } catch (\Exception $exception) {
             Log::error($exception->getMessage());
+            Log::channel('guzzleShippingPortal')->debug($exception->getMessage());
             return [];
         }
     }
diff --git a/config/logging.php b/config/logging.php
index fb872693..d0d0a009 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -104,6 +104,10 @@ return [
             'path' => storage_path('logs/regenerateInvoice.log'),
             'level' => 'info',
         ],
+        'guzzleShippingPortal' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
+        ],
     ],
 
 ];

From 24d246d7216f627a6d05f807d6d4afeb2f822cbc Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Fri, 5 Jan 2024 12:06:08 +0800
Subject: [PATCH 65/66] fix the invoice date for IZYIM when export invoice to
 autocount and have reject function in mapping review

---
 .../General/Services/GuzzleShippingPortal.php | 25 -------
 .../UpdateStatementTransactionStatusLogic.php | 49 ++++--------
 .../ListShippingPortalTransactions.php        |  1 +
 .../FetchesBankStatementTransactionOwner.php  | 31 ++++++++
 .../Services/ExportsInvoiceTransactions.php   | 75 +++++++++----------
 .../StatementTransactionComponent.vue         | 19 ++++-
 6 files changed, 98 insertions(+), 102 deletions(-)
 delete mode 100644 app/Classes/General/Services/GuzzleShippingPortal.php
 create mode 100644 app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php

diff --git a/app/Classes/General/Services/GuzzleShippingPortal.php b/app/Classes/General/Services/GuzzleShippingPortal.php
deleted file mode 100644
index 2fed1e9a..00000000
--- a/app/Classes/General/Services/GuzzleShippingPortal.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Classes\General\Services;
-
-use Illuminate\Support\Facades\Log;
-
-class GuzzleShippingPortal
-{
-    public function execute($route, $requests)
-    {
-        try {
-            $url = 'https://izyim.cief-malaysia.com/public/api/v1/'.$route;
-            $client = new \GuzzleHttp\Client(['verify' => false]);
-            $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&'. $requests);
-            $body = $response->getBody();
-            $data = json_decode($body, true);
-            $payload = $data['payload'];
-            return $payload['data'];
-        } catch (\Exception $exception) {
-            Log::error($exception->getMessage());
-            Log::channel('guzzleShippingPortal')->debug($exception->getMessage());
-            return [];
-        }
-    }
-}
diff --git a/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php b/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
index 3a006e9e..b208c2e3 100644
--- a/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
+++ b/app/Classes/Modules/Accounting/ControllersLogic/UpdateStatementTransactionStatusLogic.php
@@ -2,16 +2,14 @@
 
 namespace App\Classes\Modules\Accounting\ControllersLogic;
 
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Accounting\Services\FetchesBankStatementTransaction;
-use App\Http\Resources\BankStatementTransactionResource;
-use App\Classes\Modules\Accounting\Services\UpdatesBankStatementTransactionOwnerStatus;
-use App\Classes\ValueObjects\Constants\ApprovalStatus;
-use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-
+use Illuminate\Http\JsonResponse;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Http\Resources\BankStatementTransactionOwnerResource;
+use App\Classes\ValueObjects\Constants\StatementTransactionOwnerType;
+use App\Classes\Modules\Accounting\Services\FetchesBankStatementTransactionOwner;
+use App\Classes\Modules\Accounting\Services\UpdatesBankStatementTransactionOwnerStatus;
 
 class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
 {
@@ -27,29 +25,23 @@ class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var FetchesBankStatementTransaction */
-    private $fetchesBankStatementTransaction;
+    /** @var FetchesBankStatementTransactionOwner */
+    private $fetchesBankStatementTransactionOwner;
 
     /** @var UpdatesBankStatementTransactionOwnerStatus */
     private $updatesBankStatementTransactionOwnerStatus;
 
-    /** @var UpdatesTransactionStatus */
-    private $updatesTransactionStatus;
-
     /**
      * UpdateAnnouncementLogic constructor.
-     * @param FetchesBankStatementTransaction $fetchesBankStatementTransaction
+     * @param FetchesBankStatementTransactionOwner $fetchesBankStatementTransactionOwner
      * @param UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus
-     * @param UpdatesTransactionStatus $updatesTransactionStatus
      */
     public function __construct(
-        FetchesBankStatementTransaction $fetchesBankStatementTransaction,
-        UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus,
-        UpdatesTransactionStatus $updatesTransactionStatus
+        FetchesBankStatementTransactionOwner $fetchesBankStatementTransactionOwner,
+        UpdatesBankStatementTransactionOwnerStatus $updatesBankStatementTransactionOwnerStatus
     ) {
-        $this->fetchesBankStatementTransaction = $fetchesBankStatementTransaction;
+        $this->fetchesBankStatementTransactionOwner = $fetchesBankStatementTransactionOwner;
         $this->updatesBankStatementTransactionOwnerStatus = $updatesBankStatementTransactionOwnerStatus;
-        $this->updatesTransactionStatus = $updatesTransactionStatus;
     }
 
     /**
@@ -61,21 +53,10 @@ class UpdateStatementTransactionStatusLogic extends AbstractControllerLogic
      */
     public function logic(Request $request): JsonResponse
     {
-        $statementTrasaction = $this->fetchesBankStatementTransaction->execute(['id' => $request->route('id')]);
-
-        $statementTrasactionOwner = $statementTrasaction->owners->first();
+        $statementTrasactionOwner = $this->fetchesBankStatementTransactionOwner->execute(['id' => $request->route('id')]);
 
         $this->updatesBankStatementTransactionOwnerStatus->execute($statementTrasactionOwner, $request->route('status') == 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
 
-        // todo-new: approve payments status, need to check the owner(if system is shipping, need to api with shipping portal)
-        // if ($request->route('status') == 'approve') {
-        //     if ($statementTrasactionOwner->transaction->type === StatementTransactionOwnerType::SALES) {
-        //         if ($statementTrasactionOwner->owner->status === ApprovalStatus::PENDING_VERIFICATION) {
-        //             $this->updatesTransactionStatus->execute($statementTrasactionOwner->owner, ApprovalStatus::APPROVED);
-        //         }
-        //     }
-        // }
-
-        return $this->resourceResponse(new BankStatementTransactionResource($statementTrasaction));
+        return $this->resourceResponse(new BankStatementTransactionOwnerResource($statementTrasactionOwner));
     }
 }
diff --git a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
index f80c3c0e..18ec9c36 100644
--- a/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
+++ b/app/Classes/Modules/Accounting/Processors/ListShippingPortalTransactions.php
@@ -13,6 +13,7 @@ class ListShippingPortalTransactions
     {
         try {
             $url = 'https://izyim.cief-malaysia.com/public/api/v1/transactions/mappable/query/with-details';
+            // $url = 'http://127.0.0.1:8001/public/api/v1/transactions/mappable/query/with-details';
             $client = new \GuzzleHttp\Client(['verify' => false]);
             $response = $client->request('GET', $url . '?api-key=510acd13d8d24375cf038ad626c282565451461a9c2399357e0b65365300787e&filters=' . json_encode($filters));
             $body = $response->getBody();
diff --git a/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php b/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php
new file mode 100644
index 00000000..17c620f5
--- /dev/null
+++ b/app/Classes/Modules/Accounting/Services/FetchesBankStatementTransactionOwner.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Classes\Modules\Accounting\Services;
+
+use App\Models\StatementTransactionOwner;
+use Illuminate\Database\Eloquent\Builder;
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+
+class FetchesBankStatementTransactionOwner extends AbstractFetchRecord
+{
+
+    /** @var StatementTransactionOwner */
+    private $repository;
+
+    /**
+     * FetchesBankStatementDetails constructor.
+     * @param StatementTransactionOwner $repository
+     */
+    public function __construct(StatementTransactionOwner $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
index ee07f435..62a2c13e 100644
--- a/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
+++ b/app/Classes/Modules/Exports/Services/ExportsInvoiceTransactions.php
@@ -19,7 +19,6 @@ use App\Classes\ValueObjects\Constants\TransactionType;
 use Illuminate\Support\Facades\Log;
 use App\Classes\General\Eloquent\ApplyFiltersToQuery;
 use App\Models\StatementTransaction;
-use App\Classes\General\Services\GuzzleShippingPortal;
 
 class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
 {
@@ -109,13 +108,13 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
                 '500-0000',
                 'CIEF'
             ];
-        } else {
+        } elseif ($statementTransactionOwner->owner_id) {
             $row = (App()->make(ListShippingPortalTransactions::class))->execute([
                 'id' => $statementTransactionOwner->owner_id,
                 'with_company' => true,
             ]);
 
-            if (empty($row) || $row[0]['status'] != 'success') {
+            if (!empty($row) && $row[0]['status'] != 'success') {
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Fetch Shipping Transaction Fail ' . json_encode([
                     'id' => $statementTransactionOwner->owner_id,
                     'with_company' => true,
@@ -125,51 +124,45 @@ class ExportsInvoiceTransactions implements FromQuery, WithHeadings, WithHeading
 
                 $textToAppend = Carbon::now()->format('[Y-m-d H:i:s]') . ' Shipping Portal Respnose ' . json_encode($row) . PHP_EOL;
                 file_put_contents($errorFilePath, $textToAppend, FILE_APPEND);
-                $transactionShippingPortal = $this->getFromShippingPortal($statementTransactionOwner->owner_id);
 
                 return [
-                    'Transaction Not Found',
-                    (isset($transactionShippingPortal['created_at']) ? Carbon::parse($transactionShippingPortal['created_at'])->format('m/d/Y H:m') : null),
-                    $transaction->transaction_description.' - '.$transaction->transaction_description_2,
-                    $statementTransactionOwner->system,
+                    '<<New>>',
+                    Carbon::parse($row['created_at'])->format('m/d/Y H:m'),
+                    $row['debtor_code'],
+                    $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['marking'],
                     '',
+                    'MYR',
+                    $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['bill_no'],
+                    $row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
+                    $row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
                     '',
-                    '',
-                    '',
-                    '',
-                    '',
-                    0,
-                    $transaction->amount,
-                    '',
-                    '',
-                    '',
-                    ''
+                    1,
+                    round($row['amount'], 2),
+                    '500-0000',
+                    'CIEF'
                 ];
+
             }
-
-            $row = $row[0];
-
-            return [
-                '<<New>>',
-                Carbon::parse($row['updated_at'])->format('m/d/Y H:m'),
-                $row['debtor_code'],
-                $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['marking'],
-                '',
-                'MYR',
-                $row['type'] === ShippingTransactionType::PAYMENT ? $row['order_reference'] : $row['bill_no'],
-                $row['type'] === ShippingTransactionType::PAYMENT ? '' : 'W1',
-                $row['type'] === ShippingTransactionType::PAYMENT ? 'PLEASE REFER TO THE ATTACHED APPENDIX REF `' . $row['order_reference'] : 'CREDIT SALES',
-                '',
-                1,
-                round($row['amount'], 2),
-                '500-0000',
-                'CIEF'
-            ];
         }
+
+        return [
+            'Transaction Not Found',
+            $transaction->posting_date->format('m/d/Y H:m'),
+            $transaction->transaction_description.' - '.$transaction->transaction_description_2,
+            $statementTransactionOwner->system,
+            '',
+            '',
+            '',
+            '',
+            '',
+            '',
+            0,
+            $transaction->amount,
+            '',
+            '',
+            '',
+            ''
+        ];
     }
 
-    private function getFromShippingPortal($id){
-        $data = (new guzzleShippingPortal)->execute('transactions/mappable/query','filters={"id":'.$id.'}');
-        return (count($data) > 0 ? $data[0] : null);
-    }
 }
diff --git a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
index 0c193871..787f2f37 100644
--- a/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
+++ b/resources/assets/vue/components/accounting/elements/StatementTransactionComponent.vue
@@ -74,7 +74,7 @@
                             <div class="row parentContainer" v-for="owner in item.owners.pending_verification">
                                 <div class="col d-flex justify-content-between">
                                     <a :href="owner.reference_link" target="_blank">{{ owner.reference }}</a>
-                                    <div v-if="stage === 2">
+                                    <div v-if="stage === 2" style="display: flex;">
                                         <button class="btn btn-xs btn-outline-primary b-rad-none m-r-5 requestModal" data-type="approveCorrectMappingTransaction">
                                             <i class="fa fa-check fa-fw"></i>
                                         </button>
@@ -89,6 +89,21 @@
                                             >
                                             </general-confirmation-form-component>
                                         </modal-component>
+
+                                        <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="revertPendingMappingTransaction">
+                                            <i class="fa fa-times fa-fw"></i>
+                                        </button>
+                                        <modal-component class="animate__animated animate__fast animate__fadeIn" type="revertPendingMappingTransaction">
+                                            <general-confirmation-form-component
+                                                contentText="Are you sure you want to reject this mapping?"
+                                                modalType="delete"
+                                                class="text-center"
+                                                :apiRoute="route('api.accounting.statement_transaction.owner.status.update', owner.id, 'reject')"
+                                                apiMethod="post"
+                                                :section="section"
+                                            >
+                                            </general-confirmation-form-component>
+                                        </modal-component>
                                     </div>
                                 </div>
                             </div>
@@ -143,7 +158,7 @@
                             contentText="Are you sure you want to reject this mapping?"
                             modalType="delete"
                             class="text-center"
-                            :apiRoute="route('api.accounting.statement_transaction.owner.status.update', item.id, 'reject')"
+                            :apiRoute="route('api.accounting.statement_transaction.owner.status.update', item.owners.pending_verification[0].id, 'reject')"
                             apiMethod="post"
                             :section="section"
                         >

From 435927ba1919d367d41e6494ec6b651ceaea6f9b Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Mon, 8 Jan 2024 18:07:04 +0800
Subject: [PATCH 66/66] update code fix po

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

diff --git a/resources/views/pages/pdfs/purchase_order_table.blade.php b/resources/views/pages/pdfs/purchase_order_table.blade.php
index 99b28dd7..cc47100e 100644
--- a/resources/views/pages/pdfs/purchase_order_table.blade.php
+++ b/resources/views/pages/pdfs/purchase_order_table.blade.php
@@ -15,7 +15,7 @@
         $subtotal = "0";
         $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
         $displayedSubtotal = 0;
-        $currency_id = $transaction->currency_id;
+        $currency_id = $transaction->owner->fix_currency_id;
     @endphp
 
     @foreach ($po_order_transaction->transactionDetails as $key => $transaction_detail)