cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/90-e-invoice-e' into vapor/staging

Browse Source
This commit is contained in:
Dillon Ngo
2026-02-05 16:27:28 +08:00
parent a0299c723a 154b3c6b9f
commit 256d5a63c5
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionV2Processor.php
+2 -3
View File
@@ -162,9 +162,8 @@ class CreateInvoiceTransactionV2Processor
$eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00'));
$bookingCreatedDate = Carbon::parse($booking->created_at);
$eInvoiceRequestedDate = Carbon::parse($supplier->e_invoice_requested_at);
// if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $supplier->e_invoice === 1)
if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $supplier->e_invoice === 1) {
if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && ($bookingCreatedDate->isAfter($eInvoiceRequestedDate) || $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60) && $supplier->e_invoice === 1) {
$eInvoice = true;
}
$kvp = $booking->attributesKVP()->where('key', KVPKey::BOOKING_EINVOICE_ELIGIBLE)->first();
app/Http/Resources/AutocountSalesInvoiceBookingResource.php
+1 -1
View File
@@ -141,7 +141,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
'DebtorCode' => $company->debtor,
'Ref' => $invoiceTransaction ? $invoiceTransaction->bill_no : '',
'ShipInfo' => $this->marking,
'AccNo' => $category === 'Compensation Voucher' ? '1000-000' : '949-2000',
'AccNo' => $category === 'Compensation Voucher' ? '920-0000' : '949-2000',
'DetailDescription' => 'PRODUCT NAME :',
'FurtherDescription' => $voucher->code,
'Classification' => '022',
app/Http/Resources/BookingResource.php
+1 -1
View File
@@ -32,7 +32,7 @@ class BookingResource extends JsonResource
$eInvoiceRequestedDate = Carbon::parse($this->company->e_invoice_requested_at);
// if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->isAfter($eInvoiceRequestedDate) && $this->company->e_invoice === 1) {
if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60 && $this->company->e_invoice === 1) {
if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && ($bookingCreatedDate->isAfter($eInvoiceRequestedDate) || $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 60) && $this->company->e_invoice === 1) {
$eInvoice = true;
}