diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php index e7c2dc87..c32a30eb 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php @@ -138,7 +138,6 @@ class CreateInvoiceTransactionV2Processor ->where('type', TransactionType::PURCHASE_ORDER) ->complete() ->first(); - if(!$purchaseOrder && $generateEInvoiceRefund){ $purchaseOrder = $booking->transactions() ->where('type', TransactionType::PURCHASE_ORDER) diff --git a/app/Http/Resources/AutocountSalesInvoiceBookingDetailsResource.php b/app/Http/Resources/AutocountSalesInvoiceBookingDetailsResource.php index 647fe915..e4069d2f 100644 --- a/app/Http/Resources/AutocountSalesInvoiceBookingDetailsResource.php +++ b/app/Http/Resources/AutocountSalesInvoiceBookingDetailsResource.php @@ -29,6 +29,7 @@ class AutocountSalesInvoiceBookingDetailsResource extends JsonResource 'UnitPrice' => $this['UnitPrice'], 'SubmitEinvoice' => $this['SubmitEinvoice'], 'ConsolidatedEinvoice' => $this['ConsolidatedEinvoice'], + 'InvoiceStatus' => $this['InvoiceStatus'], ]; } diff --git a/app/Http/Resources/AutocountSalesInvoiceBookingResource.php b/app/Http/Resources/AutocountSalesInvoiceBookingResource.php index 8c134967..83f41170 100644 --- a/app/Http/Resources/AutocountSalesInvoiceBookingResource.php +++ b/app/Http/Resources/AutocountSalesInvoiceBookingResource.php @@ -120,6 +120,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource 'UnitPrice' => $displayUnitPrice ? number_format($displayUnitPrice, 2) : '0', 'SubmitEinvoice' => $firstItem ? 'T' : '', 'ConsolidatedEinvoice' => $firstItem ? ($company->e_invoice ? 'F' : 'T') : '', + 'InvoiceStatus' => (string) $this->invoice_status, ]; $details->push($detail); @@ -149,6 +150,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource 'UnitPrice' => $voucherDiscount ? number_format($voucherDiscount, 2): '0', 'SubmitEinvoice' => '', 'ConsolidatedEinvoice' => '', + 'InvoiceStatus' => (string) $this->invoice_status, ]; $details->push($detail); } @@ -183,6 +185,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource 'UnitPrice' => $serviceCharge ? number_format($serviceCharge, 2) : '0', 'SubmitEinvoice' => '', 'ConsolidatedEinvoice' => '', + 'InvoiceStatus' => (string) $this->invoice_status, ]; $details->push($detail); // Service Charge - Ends @@ -231,6 +234,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource 'UnitPrice' => $adjustment ? number_format($adjustment, 2) : '0', 'SubmitEinvoice' => '', 'ConsolidatedEinvoice' => '', + 'InvoiceStatus' => (string) $this->invoice_status, ]; $details->push($detail); }