From eecb351fb38d03e3de188fe4fee245ee98b271dc Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Fri, 23 Aug 2024 16:59:05 +0800
Subject: [PATCH] fix proforma invoice

---
 ...ateProformaInvoiceTransactionProcessor.php | 63 +++++++++++--------
 .../pages/pdfs/proforma_invoice.blade.php     |  5 ++
 2 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
index 1a48fc31..28a34057 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php
@@ -24,6 +24,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Models\Booking;
 use App\Models\Document;
 use Carbon\Carbon;
+use Illuminate\Support\Facades\Log;
 use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
 
 class CreateProformaInvoiceTransactionProcessor
@@ -102,32 +103,44 @@ class CreateProformaInvoiceTransactionProcessor
      */
     public function execute(Booking $booking)
     {
-
         $po_order_transaction = $booking->transactions()
             ->where('type', TransactionType::PURCHASE_ORDER)
             ->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])
             ->first();
 
-        $outstanding = $this->calculatesBookingOutstanding->execute($booking);
-
-        $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $outstanding)), $booking->convertible_currency_id, $booking->service_id,  $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::CASH);
-
-        $configurations = $this->fetchesBookingQuotation->execute($booking->company, $conversionObject);
-
-        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
-
-        $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
-
         $transaction = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
         if (!$transaction) {
-            $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id,
-                $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(),
-                $configurations->getTotal(), $configurations->getForeignTotal(), 1,
-                $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(),
-                $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION, [], isset($billPlzBill) ? $billPlzBill->id : NULL
+            $outstanding = $this->calculatesBookingOutstanding->execute($booking);
+
+            $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $outstanding)), $booking->convertible_currency_id, $booking->service_id, $booking->fix_currency_id === 1 ? 0 : 1, PaymentMethodType::CASH);
+    
+            $configurations = $this->fetchesBookingQuotation->execute($booking->company, $conversionObject);
+    
+            $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+    
+            $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-');
+
+            $object = new TransactionObject(
+                $billNumber,
+                TransactionType::PAYMENT,
+                1,
+                $booking->company->id,
+                $configurations->getConfigurations()->getBankId(),
+                $configurations->getConversionObject()->getPaymentMethod(),
+                $configurations->getTotal(),
+                $configurations->getForeignTotal(),
+                1,
+                $configurations->getConversionObject()->getCurrencyId(),
+                $configurations->getConfigurations()->getRate(),
+                $configurations->getTax(),
+                $configurations->getServiceCharge(),
+                Carbon::now()->addMinutes($paymentAttemptLimit),
+                ApprovalStatus::PENDING_SUBMISSION,
+                [],
+                isset($billPlzBill) ? $billPlzBill->id : NULL
             );
 
             $this->createsTransaction->execute($booking, $object);
@@ -135,10 +148,10 @@ class CreateProformaInvoiceTransactionProcessor
 
         $billNumber = $this->generatesTransactionBillNumber->execute('PROFORMA-');
 
-        $payable_amount = $booking->transactions()->payments()->where(function($query){
-            return $query->where(function($query){
+        $payable_amount = $booking->transactions()->payments()->where(function ($query) {
+            return $query->where(function ($query) {
                 return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString());
-            })->orWhere(function($query){
+            })->orWhere(function ($query) {
                 return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             });
         })->sum('amount');
@@ -148,14 +161,16 @@ class CreateProformaInvoiceTransactionProcessor
             ->where('type', TransactionType::PAYMENT)
             ->first();
 
-        $booking_currency_average_rate = $booking_amount / $booking->transactions()->payments()->where(function($query){
-            return $query->where(function($query){
+        $paymentAmount = $booking->transactions()->payments()->where(function ($query) {
+            return $query->where(function ($query) {
                 return $query->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString());
-            })->orWhere(function($query){
+            })->orWhere(function ($query) {
                 return $query->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
             });
         })->selectRaw('sum(amount - service_charge - tax) as sub_total')->get()->sum('sub_total');
 
+        $booking_currency_average_rate = $booking_amount / $paymentAmount;
+
         $total_service_charge = $booking->transactions()
             ->where('type', TransactionType::PAYMENT)
             ->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::SUSPENDED])
@@ -196,7 +211,7 @@ class CreateProformaInvoiceTransactionProcessor
         $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.proforma_invoice', ['invoice_transaction' => $proforma_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
         $document_object = new DocumentObject(
             DocumentType::PROFORMA_INVOICE,
-            [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
+            [chunk_split('data:application/pdf;base64,' . base64_encode($purchase_order_pdf->output()))],
             '',
             ApprovalStatus::COMPLETED,
             'proforma_invoices'
@@ -205,7 +220,5 @@ class CreateProformaInvoiceTransactionProcessor
         /** @var Document $document */
         $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
         $this->createsFile->execute($document, $document_object);
-
-
     }
 }
diff --git a/resources/views/pages/pdfs/proforma_invoice.blade.php b/resources/views/pages/pdfs/proforma_invoice.blade.php
index da5e8238..6d25b5ba 100644
--- a/resources/views/pages/pdfs/proforma_invoice.blade.php
+++ b/resources/views/pages/pdfs/proforma_invoice.blade.php
@@ -70,6 +70,11 @@
     <br>
     <br>
 
+    <?php
+        $transaction = $invoice_transaction;
+        $voucher_redemption = $voucher_redemption ?? null;
+    ?>
+
     <!-- Invoice Table -->
     @include('pages.pdfs.purchase_order_table')