E-Invoice - API, Sales Invoice Report (update)

This commit is contained in:
Dillon Ngo
2025-10-16 13:22:37 +08:00
parent eae201289f
commit 453f25335a
@@ -7,6 +7,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Models\Booking;
use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundServiceCharge;
use App\Classes\ValueObjects\Constants\KVPKey;
use Illuminate\Http\Resources\Json\JsonResource;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
@@ -75,7 +76,19 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
$formattedDocumentDate = Carbon::parse($documentDate)->format('m/d/Y');
$docNo = '<<New>>';
$firstItem = true;
if($invoiceTransaction){
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($invoiceTransactionKVP){
$docNo = $invoiceTransactionKVP->value;
}
else {
$bookingKVP = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
$docNo = $bookingKVP ? $bookingKVP->value :'<<New>>';
}
}
$transactionDetails = $purchaseOrder->transactionDetails;
foreach ($transactionDetails as $detail) {
$displayUnitPrice = 0;
@@ -89,7 +102,7 @@ class AutocountSalesInvoiceBookingResource extends JsonResource
}
$detail = [
'DocNo' => $firstItem ? '<<New>>' : '',
'DocNo' => $firstItem ? $docNo : '',
'DocDate' => $formattedDocumentDate,
'DebtorCode' => $company->debtor,
'Ref' => $invoiceTransaction->bill_no,