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/125-css-ui-update' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2026-02-28 21:12:47 +08:00
parent eecae0604e cc4865d296
commit 24912848fc
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsReceivePaymentForBookingReport.php
+12 -3
View File
@@ -80,9 +80,18 @@ class ExportsReceivePaymentForBookingReport implements FromQuery, WithHeadings,
}
if($booking){
$metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($metadata){
$autoCountSalesInvoiceId = $metadata->value;
$invoiceTransaction = $booking->transactions->where('type', TransactionType::INVOICE)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->first();
if($invoiceTransaction){
$invoiceTransactionKVP = $invoiceTransaction->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($invoiceTransactionKVP){
$autoCountSalesInvoiceId = $invoiceTransactionKVP->value;
}
else {
$metadata = $booking->attributesKVP()->where('key', KVPKey::AUTOCOUNT_DOCNO_INVOICE)->first();
if($metadata){
$autoCountSalesInvoiceId = $metadata->value;
}
}
}
}
resources/views/layouts/base.blade.php
+2 -2
View File
@@ -8,7 +8,7 @@
visibility: hidden;
}
</style>
<body class="horizontal-menu horizontal-app-menu bg-master-lightest overflow-hidden">
<body class="horizontal-menu horizontal-app-menu bg-master-lightest">
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-TQKCPCD"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
@@ -20,4 +20,4 @@
@include('vendor/js')
@stack('scripts')
</body>
</html>
</html>