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/147-fix-sales-invoice-report-export-error' into vapor/staging

Browse Source
This commit is contained in:
Dillon Ngo
2026-03-31 14:35:31 +08:00
parent 7f60362d79 58de1017d7
commit 05b6f07917
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsSalesInvoiceReport.php
+3
View File
@@ -100,6 +100,9 @@ class ExportsSalesInvoiceReport implements FromQuery, WithHeadings, WithHeadingR
$purchaseOrder = $booking->transactions->where('type', TransactionType::PURCHASE_ORDER)->first(); $purchaseOrder = $booking->transactions->where('type', TransactionType::PURCHASE_ORDER)->first();
$company = $booking->company; $company = $booking->company;
if(!$purchaseOrder){
return $records;
}
$lastPaymentTransaction = $booking->transactions $lastPaymentTransaction = $booking->transactions
->where('type', TransactionType::PAYMENT) ->where('type', TransactionType::PAYMENT)
resources/views/pages/payments.blade.php
+2 -2
View File
@@ -1,4 +1,4 @@
@extends('layouts.base_portal') @extends('layouts.base_portal')
@section('inner_content') @section('inner_content')
<payment-component></payment-component> <payment-component v-if="$store.getters.isAdmin"></payment-component>
@endsection @endsection