Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into c2c-onboarding

2026-08-19 04:23:55 +00:00 · 2023-08-18 13:40:28 +08:00
parent a0cf610a28 00c2672d16
commit 6681af89e1
9 changed files with 140 additions and 117 deletions
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Jobs;
+
+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
+use App\Classes\Modules\Transactions\Processors\GeneratesGroupTransactionsWhiteForm;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class GenerateInvoice implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /** @var Booking */
+    private $booking;
+
+    /**
+     * @param Booking $booking
+     */
+    public function __construct(Booking $booking)
+    {
+        $this->booking = $booking;
+    }
+
+
+    public function handle()
+    {
+        $this->booking->transactions()->whereIn('transactions.type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->delete();
+        $this->booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
+        $this->booking->status = ApprovalStatus::APPROVED;
+        $this->booking->save();
+
+        (App()->make(CreateInvoiceTransactionProcessor::class))->execute($this->booking);
+    }
+}
@@ -55,6 +55,15 @@ class FetchCompanyTransactionStatementLogic extends AbstractControllerLogic
                ->where('owner_type', Wallet::class)
                ->where('type', '!=', TransactionType::PAYMENT);
            })
+            ->orWhere(function ($query) use ($companyId) {
+                $query
+                    ->where('type', TransactionType::INVOICE)
+                    ->where('owner_type', Booking::class)
+                    ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
+                    ->whereHas('booking', function ($query) use ($companyId) {
+                        $query->where('company_id', $companyId);
+                });
+            })
            ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
            ->orderBy('created_at', 'desc')
            ->get();
@@ -31,7 +31,8 @@
        "staudenmeir/eloquent-has-many-deep": "^1.7",
        "timehunter/laravel-google-recaptcha-v3": "~2.5",
        "tymon/jwt-auth": "^1.0",
-        "webklex/laravel-pdfmerger": "^1.3"
+        "webklex/laravel-pdfmerger": "^1.3",
+      "ext-bcmath": "*"
    },
    "require-dev": {
        "facade/ignition": "^2.3.6",
@@ -24,7 +24,8 @@
                                <div class="col-2 fs-12">{{item.created_at}}</div>
                                <div class="col-3 fs-12">{{ convertTransactionType(item.type) }} {{ item.payment_reference ? ' - ' + item.payment_reference : '' }} <a target=”_blank” v-if="[9,11].includes(item.type) " :href="route('transaction.credit_note.download', item.id)"><i class="fa fa-download fs-11 m-l-5 text-secondary hover-primary"></i></a></div>
                                <div class="col fs-12"><a :href="route('booking.details', item.booking_marking)">{{item.booking_marking}}</a></div>
-                                <div class="col-2 text-success text-center">{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
+                                <div class="col-2 text-success text-center" v-if="parseFloat(item.type) !== 2">{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
+                                <div class="col-2 text-success text-center"  v-if="parseFloat(item.type) === 2">{{(Math.round(((parseFloat(item.amount) / parseFloat(item.currency_rate) + parseFloat(item.service_charge)) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
                                <div class="col-2 text-danger text-center">{{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}</div>
                                <div class="col-2 text-right">{{remainingBalance(index)}}</div>
                            </div>  
@@ -104,7 +105,11 @@ export default {
            if(this.transaction){
                let transactions = this.transaction.slice().reverse();
                transactions.slice(0, transactions.length - index).map(function(transaction) {
-                    [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+                    if (transaction.type === 2) {
+                        tempBalance += (transaction.amount / transaction.currency_rate + transaction.service_charge);
+                    } else {
+                        [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+                    }
                    return tempBalance
                }, 0);
            }
@@ -149,4 +149,4 @@
@yield('inner_content')
 </body>

-</html>
+</html>
@@ -33,7 +33,8 @@
                <div class="number">EDO: {{ $transaction->bill_no }}</div>

                <div class="ref">REF: {{ $transaction->booking->marking }}</div>
-                <div class="date">Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->created_at }}</div>
+                <div class="date">Date: {{
+                    $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->created_at }}</div>
                <div>&nbsp;</div>
            </td>
        <tr>
@@ -82,8 +83,8 @@
        </thead>
        <tbody>
        @php
-            $subtotal = calculateDoSubtotal($po_order_transaction, $transaction->currency_rate);
-            $voucherDiscount = getDoVoucherDiscount($voucher_redemption);
+            $subtotal = "0";
+            $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
            $displayedSubtotal = 0;
        @endphp

@@ -93,6 +94,7 @@
                $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
                $displayedItemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 2);
                $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
+                $subtotal = bcadd($subtotal, $displayedItemTotal, 2);
            @endphp
            <tr>
                <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -110,7 +112,6 @@
        </tbody>
        <tfoot>
        @php
-            $voucherDiscount = getDoVoucherDiscount($voucher_redemption);
            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5); // Use bcsub to subtract
        @endphp
        <tr class="subtotal">
@@ -148,7 +149,7 @@
        <tr>
            <td colspan="4"></td>
            <td class="right middle">Adjustment</td>
-            <td class="right middle">{{ roundUpDo($discrepancy,2)  }}</td>
+            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
        </tr>
        <tr>
            <td colspan="4"></td>
@@ -167,28 +168,4 @@
            </tr>
        </table>
    </htmlpagefooter>
-    @php
-        function calculateDoSubtotal($po_order_transaction, $currencyRate) {
-            $subtotal = "0";
-            foreach ($po_order_transaction->transactionDetails as $transaction_detail) {
-                $unitPrice = bcdiv((string)$transaction_detail->price, (string)$currencyRate, 5);
-                $itemTotal = bcmul($unitPrice, (string)$transaction_detail->quantity, 5);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-            }
-            return $subtotal;
-        }
-
-        function getDoVoucherDiscount($voucher_redemption) {
-            return $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
-        }
-        function roundUpDo($number, $decimals) {
-        $factor = pow(10, $decimals);
-        if ($number > 0) {
-            return ceil($number * $factor) / $factor;
-        } else {
-            return floor($number * $factor) / $factor;
-        }
-    }
-
-    @endphp
@endsection
@@ -72,17 +72,18 @@
        </thead>
        <tbody>
        @php
-            $subtotal = calculateSubtotal($po_order_transaction, $transaction->currency_rate);
-            $voucherDiscount = getVoucherDiscount($voucher_redemption);
+            $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, 5);
+                $exactUnitPrice = bcdiv($transaction_detail->price, $transaction->currency_rate, 7);
                $itemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 5);
                $displayedItemTotal = bcmul($exactUnitPrice, $transaction_detail->quantity, 2);
                $displayedSubtotal = bcadd($displayedSubtotal, $displayedItemTotal, 2);
+                $subtotal = bcadd($subtotal, $itemTotal, 5);
            @endphp
            <tr>
                <td width="5%" class="center top">{{ $key + 1 }}</td>
@@ -100,8 +101,7 @@
        </tbody>
        <tfoot>
        @php
-            $voucherDiscount = getVoucherDiscount($voucher_redemption);
-            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5); // Use bcsub to subtract
+            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5);
        @endphp
        <tr class="subtotal">
            <td colspan="4"></td>
@@ -130,15 +130,15 @@
            </tr>
        @endif
        @php
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
+            $displayedTotal = bcadd(bcadd(bcadd($subtotal, $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);
-            $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5); // Keep precision
+            $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">{{ roundUp($discrepancy,2)  }}</td>
+            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
        </tr>
        <tr>
            <td colspan="4"></td>
@@ -160,28 +160,4 @@
        Account Name: CIEF Worldwide Sdn Bhd<br>
        Account No: 564892103405<br>
    </div>
-    @php
-        function calculateSubtotal($po_order_transaction, $currencyRate) {
-            $subtotal = "0";
-            foreach ($po_order_transaction->transactionDetails as $transaction_detail) {
-                $unitPrice = bcdiv((string)$transaction_detail->price, (string)$currencyRate, 5);
-                $itemTotal = bcmul($unitPrice, (string)$transaction_detail->quantity, 5);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-            }
-            return $subtotal;
-        }
-
-        function getVoucherDiscount($voucher_redemption) {
-            return $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
-        }
-        function roundUp($number, $decimals) {
-        $factor = pow(10, $decimals);
-        if ($number > 0) {
-            return ceil($number * $factor) / $factor;
-        } else {
-            return floor($number * $factor) / $factor;
-        }
-    }
-
-    @endphp
@endsection
@@ -24,9 +24,9 @@
    <table class="buyer-seller">
        <tr>
            <td width="50%" class="top">
-            <span class="buyer-seller-title">
-                Buyer
-            </span>
+                <span class="buyer-seller-title">
+                    Buyer
+                </span>
                <br>

                <div class="buyer-company">
@@ -34,34 +34,34 @@
                </div>

                <span class="buyer-company">
-                {{ $supplier->name }}
-            </span>
+                    {{ $supplier->name }}
+                </span>
                <span class="reg">
-                {{-- {{ $supplier }} --}}
-            </span>
+                    {{-- {{ $supplier }} --}}
+                </span>
                <br>
                <span class="address">
-                @php
-                    $billingAddress = $supplier->addresses()->where('billing', '=', true)->first();
-                @endphp
+                    @php
+                        $billingAddress = $supplier->addresses()->where('billing', '=', true)->first();
+                    @endphp
                    {{ $billingAddress->street_one }}
                    {{ $billingAddress->street_two }}
                    {{ $billingAddress->state()->first()->name }}
                    {{ $billingAddress->district()->first()->name }}
-            </span>
+                </span>
                <br>
                <span class="contact-no">
-                Phone: {{ $supplier->contacts()->first()->phone }}
-            </span>
+                    Phone: {{ $supplier->contacts()->first()->phone }}
+                </span>
            </td>
            <td width="50%" class="top">
-            <span class="buyer-seller-title">
-                Seller
-            </span>
+                <span class="buyer-seller-title">
+                    Seller
+                </span>
                <br>
                <span class="buyer-company">
-                CIEF Worldwide Sdn Bhd (1134596-M)
-            </span>
+                    CIEF Worldwide Sdn Bhd (1134596-M)
+                </span>
                <div class="address">
                    No. 72-3, Jalan Jalil 1,<br>
                    The Earth Bukit Jalil,<br>
@@ -90,8 +90,7 @@
        </thead>
        <tbody>
        @php
-            $subtotal = calculatePoSubtotal($po_order_transaction, $transaction->currency_rate);
-            $voucherDiscount = getPoVoucherDiscount($voucher_redemption);
+            $subtotal = "0";
            $displayedSubtotal = 0;
        @endphp

@@ -118,8 +117,13 @@
        </tbody>
        <tfoot>
        @php
-            $voucherDiscount = getPoVoucherDiscount($voucher_redemption);
+            $voucherDiscount = $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
            $subtotalWithDiscount = bcsub($subtotal, $voucherDiscount, 5); // Use bcsub to subtract
+            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
+            $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
+            $discrepancy = bcsub($displayedTotal, $expectedTotal, 5);
+            $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5); // Keep precision
+            $subtotal = bcadd($subtotal, $displayedItemTotal, 2);
        @endphp
        <tr class="subtotal">
            <td colspan="4"></td>
@@ -147,16 +151,11 @@
                <td class="right">{{ number_format($transaction->tax, 2) }}</td>
            </tr>
        @endif
-        @php
-            $displayedTotal = bcadd(bcadd(bcadd($displayedSubtotal, $transaction->service_charge, 2), $transaction->tax, 2), $voucherDiscount, 2);
-            $expectedTotal = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5);
-            $discrepancy = bcsub($displayedTotal, $expectedTotal, 5);
-            $total = bcadd(bcadd(bcadd($subtotal, $transaction->service_charge, 5), $transaction->tax, 5), $voucherDiscount, 5); // Keep precision
-        @endphp
+
        <tr>
            <td colspan="4"></td>
            <td class="right middle">Adjustment</td>
-            <td class="right middle">{{ roundUpPo($discrepancy,2)  }}</td>
+            <td class="right middle">{{number_format($discrepancy, 5)}}</td>
        </tr>
        <tr>
            <td colspan="4"></td>
@@ -175,28 +174,4 @@
            </tr>
        </table>
    </htmlpagefooter>
-    @php
-        function calculatePoSubtotal($po_order_transaction, $currencyRate) {
-            $subtotal = "0";
-            foreach ($po_order_transaction->transactionDetails as $transaction_detail) {
-                $unitPrice = bcdiv((string)$transaction_detail->price, (string)$currencyRate, 5);
-                $itemTotal = bcmul($unitPrice, (string)$transaction_detail->quantity, 5);
-                $subtotal = bcadd($subtotal, $itemTotal, 5);
-            }
-            return $subtotal;
-        }
-
-        function getPoVoucherDiscount($voucher_redemption) {
-            return $voucher_redemption ? bcmul((string)$voucher_redemption->value, "-1", 2) : "0";
-        }
-        function roundUpPo($number, $decimals) {
-        $factor = pow(10, $decimals);
-        if ($number > 0) {
-            return ceil($number * $factor) / $factor;
-        } else {
-            return floor($number * $factor) / $factor;
-        }
-    }
-
-    @endphp
@endsection
@@ -1,5 +1,6 @@
 <?php

+use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
 use App\Http\Controllers\Accounting\BankStatementController;
 use Carbon\Carbon;
 use App\Models\User;
@@ -109,6 +110,27 @@ Route::get('/transfer/{marking}', function ($marking) {
    return view('pages.bookings.profile', ['marking' => $marking]);
 })->name('booking.details');

+Route::get('/transfer/{marking}/latest-invoice', function ($marking) {
+    $booking= Booking::where('marking', $marking)->first();
+
+    $purchaseOrder = $booking->transactions()
+    ->where('type', TransactionType::PURCHASE_ORDER)
+    ->complete()
+    ->first();
+
+    $transaction = $booking->transactions()
+    ->where('type', TransactionType::PAYMENT)
+    ->latest()->get()[0];
+    
+    $supplier = Company::where('id', $transaction->receiver)->first();
+
+    $lowercaseDocumentType = strtolower(DocumentType::INVOICE);
+
+    $voucherRedemption = $transaction->voucherRedemption;
+
+    return view('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption]);
+})->name('booking.details.latest_invoice');
+
 Route::get('/transfer/merge/{marking}', function ($marking) {
    return view('pages.bookings.merge', ['marking' => $marking]);
 })->name('booking.merge');
@@ -462,6 +484,21 @@ Route::get('/payments/manual', function(){



+Route::get('/invoice/fix', function(){
+
+    set_time_limit(1800);
+    $bookings = Booking::where('status', ApprovalStatus::COMPLETED)->whereDate('updated_at', '>=', Carbon::parse('01-01-2023'))->get();
+
+    foreach($bookings as $booking){
+        $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();
+        $booking->status = ApprovalStatus::APPROVED;
+        $booking->save();
+
+        (App()->make(CreateInvoiceTransactionProcessor::class))->execute($booking);
+    }
+})->name('invoice.fix');
+
 Route::get('/1688/fix/{reference}', function($reference){

    $booking = Booking::where('marking', $reference)->first();