From ffb513af310ccb0de3362f6d40f35d5b7d83ea17 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 20 Jul 2025 05:36:20 +0800
Subject: [PATCH] E-Invoice - Automapping Issues, Sales Invoice Report

---
 .../Services/ExportsSalesInvoiceReport.php    | 145 +++++++++++++++++
 .../Controllers/Exports/ExportController.php  |  27 ++++
 .../bookings/elements/DownloadComponent.vue   | 146 ++++++++++++++++++
 .../bookings/elements/PaymentComponent.vue    |   6 +
 routes/api.php                                |   2 +
 routes/export.php                             |  10 ++
 6 files changed, 336 insertions(+)
 create mode 100644 app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
 create mode 100644 app/Http/Controllers/Exports/ExportController.php
 create mode 100644 resources/assets/vue/components/bookings/elements/DownloadComponent.vue
 create mode 100644 routes/export.php

diff --git a/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
new file mode 100644
index 00000000..46698f59
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Transaction;
+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;
+
+class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'DocNo',
+            'DocDate',
+            'DebtorCode',
+            'Ref',
+            'ShipInfo',
+            'AccNo',
+            'DetailDescription',
+            'FurtherDescription',
+            'Classification',
+            'DeptNo',
+            'Qty',
+            'UnitPrice',
+            'submiteinvoice',
+            'ConsolidatedEinvoice',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $start_date = $this->request->input('startDate', null);
+        if ($start_date) {
+            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+        }
+
+        $end_date = $this->request->input('endDate', null);
+        if ($end_date) {
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+        }
+
+        if (!$start_date) {
+            $start_date = Carbon::now()->subMonths(1)->startOfDay();
+        }
+        if (!$end_date) {
+            $end_date = Carbon::now()->endOfDay();
+        }
+
+        $query = Transaction::query();
+
+        $query->where('type', TransactionType::PAYMENT)->where('payment_method', '!=', PaymentMethodType::WALLET);
+        // $query->where('type', TransactionType::PAYMENT);
+        $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+        $query->whereHas('booking.transactions', function ($query) {
+            $query->where('type', TransactionType::PURCHASE_ORDER)->complete();
+        });
+
+        if($start_date && $end_date) {
+            $query->whereBetween('created_at', [
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+            ]);
+        }
+        elseif($start_date && !$end_date) {
+            $query->where('created_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
+        }
+        elseif(!$start_date && $end_date) {
+            $query->where('created_at', '<=', Carbon::parse($end_date)->format('Y-m-d 23:59:59'));
+        }
+
+        return $query;
+    }
+
+    /**
+     * @param Transaction $transaction
+     * @return array
+     */
+    public function map($transaction): array
+    {
+        $booking = $transaction->owner()->first();
+        $purchaseOrder = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+        //$purchaseOrder = $booking->transactions()->payments()->complete()->first();
+        $company = $booking->company()->first();
+
+        $lastPaymentTransaction = $booking->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->latest()->first();
+        $documentDate = $lastPaymentTransaction->created_at;
+        if(Carbon::parse($booking->updated_at)->isAfter($lastPaymentTransaction->created_at)){
+            $documentDate = $booking->updated_at;
+        }
+        $formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
+
+        $firstItem = true;
+        $records = [];
+
+        $transactionDetails = $purchaseOrder->transactionDetails;
+
+
+        foreach ($transactionDetails as $detail) {
+            $records[] = [
+                $firstItem ? '<<New>>' : '',
+                $formattedDocumentDate,
+                $company->debtor,
+                $booking->marking,
+                $booking->marking,
+                '500-0000',
+                'PRODUCT NAME :',
+                $detail->product_name,
+                '022',
+                'C',
+                $detail->quantity,
+                number_format($detail->price, 2),
+                $firstItem ? 'T' : '',
+                $company->e_invoice ? 'F' : 'T'
+            ];
+
+            if($firstItem) {
+                $firstItem = false;
+            }
+        }
+        return $records;
+    }
+}
diff --git a/app/Http/Controllers/Exports/ExportController.php b/app/Http/Controllers/Exports/ExportController.php
new file mode 100644
index 00000000..f0509093
--- /dev/null
+++ b/app/Http/Controllers/Exports/ExportController.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Controllers\Exports;
+
+
+use App\Classes\Modules\Exports\Services\ExportsSalesInvoiceReport;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Excel;
+use Illuminate\Support\Facades\Storage;
+use App\Classes\General\AWSS3Helper;
+
+class ExportController
+{
+    public function salesInvoices(Request $request){
+        $exportsTransactions = new ExportsSalesInvoiceReport($request);
+        $exportFileName = 'Exchange - Sales Invoice Report.xls';
+        $filesystemDriver = Storage::getDefaultDriver();
+        if($filesystemDriver === 's3'){
+            return response([ 'src' =>  AWSS3Helper::S3Exportable($exportFileName, $exportsTransactions) ]);
+        }
+        else{
+            $response = $exportsTransactions->download($exportFileName, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+            ob_end_clean();
+        }
+        return $response;
+    }
+}
diff --git a/resources/assets/vue/components/bookings/elements/DownloadComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadComponent.vue
new file mode 100644
index 00000000..e5bdeb72
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/DownloadComponent.vue
@@ -0,0 +1,146 @@
+<template>
+    <div class="row m-b-20">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-l-0 m-r-0">
+                        <div class="col-12 col-md 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-12 col-md 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-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.reportType">
+                                <label class="all-caps">Report Type</label>
+                                <select-component :options="options()" v-model="parameters.reportType"></select-component>
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-12 col-md-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" :class="{ disabled: isDownloading }" @click="handleClick">
+                                <span>
+                                    Export
+                                </span>
+                                 <span v-if="isDownloading" class="spinner"></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import componentHandler from "../../../general/mixins/componentHandler";
+import { required } from "vuelidate/lib/validators";
+
+export default {
+    props: {
+        section:{
+            type: String,
+            required: true
+        }
+    },
+    data(){
+        return {
+            parameters: {
+                startDate: '',
+                endDate: '',
+                reportType: '',
+            },
+            isDownloading: false,
+        }
+    },
+    mounted(){
+        switch(this.section) {
+            case 'paymentsReportSection':
+                this.parameters.reportType = 'Sales Invoice Report'
+                break;
+        }
+    },
+    validations: {
+        parameters: {
+            startDate: {
+                required
+            },
+            endDate: {
+                required
+            },
+            reportType: {
+                required
+            },
+        }
+    },
+    methods: {
+        options() {
+            return [
+                'Sales Invoice Report',
+            ];
+        },
+        handleClick(){
+            if (!this.validate()) return;
+
+            const reportType = this.parameters.reportType;
+
+            const routesMap = {
+                'Sales Invoice Report': route('api.export.transaction.sales-invoices'),
+            };
+
+            let url = `${routesMap[reportType]}?startDate=${this.parameters.startDate}&endDate=${this.parameters.endDate}`;
+            this.isDownloading = true;
+            if(window.LARAVEL_VAPOR_ENABLED){
+                this.submit(url, 'get', this.section, false, false);
+            }
+            else{
+                window.open(this.url, '_blank');
+                this.isDownloading = false;
+            }
+        },
+        successHandler(response) {
+            if(window.LARAVEL_VAPOR_ENABLED){
+                if (response.payload !== undefined && response.payload.src) {
+                    window.open(response.payload.src, '_blank');
+                }
+                else if (response.src) {
+                    window.open(response.src, '_blank');
+                }
+            }
+            this.isDownloading = false;
+        },
+        errorHandler(error) {
+            this.isDownloading = false;
+        },
+    },
+    mixins: [componentHandler]
+};
+</script>
+<style scoped>
+    .spinner {
+        border: 2px solid rgba(0, 0, 0, 0.1);
+        border-left-color: #000;
+        border-radius: 50%;
+        width: 20px;
+        height: 20px;
+        animation: spin 1s linear infinite;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+
+    @keyframes spin {
+        0% {
+            transform: translate(-50%, -50%) rotate(0deg);
+        }
+        100% {
+            transform: translate(-50%, -50%) rotate(360deg);
+        }
+    }
+</style>
diff --git a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
index 1f9a606f..c8ecca1c 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue
@@ -1,6 +1,12 @@
 <template>
     <div class="row">
         <div class="col">
+            <div class="row">
+                <div class="col-8 p-l-0">
+                    <small class="all-caps muted fs-10">Export Report (New)</small>
+                    <download-component section="exportDataSection"></download-component>
+                </div>
+            </div>
             <div class="row">
                 <div class="col-8 p-l-0">
                     <small class="all-caps muted fs-10">Export Payment Transactions CSV</small>
diff --git a/routes/api.php b/routes/api.php
index 564f9304..4d097f7c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -74,6 +74,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
 
             require __DIR__ . '/rule.php';
 
+            require __DIR__ . '/export.php';
+
             //        require __DIR__ . '/rate.php';
             //        require __DIR__ . '/receipt.php';
         });
diff --git a/routes/export.php b/routes/export.php
new file mode 100644
index 00000000..80eda805
--- /dev/null
+++ b/routes/export.php
@@ -0,0 +1,10 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+
+Route::group(['prefix' => 'export', 'as' => 'export.', 'namespace' => 'exports'], function () {
+    Route::group(['prefix' => 'transactions', 'as' => 'transaction.'], function () {
+        Route::get('/sales-invoices', 'ExportController@salesInvoices')->name('sales-invoices');
+    });
+});