deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move invoice blades around. Added invoices in credit view
Some checks failed
Create Docker Image / Build Docker Image (x86_64) (push) Failing after 28s
Details
Create Docker Image / Final Docker Image Manifest (push) Has been skipped
Details

Browse Source
This commit is contained in:
Deon George
2024-07-06 19:28:14 +10:00
parent f458bb19c5
commit 844d509834
10 changed files with 93 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Account.php
View File

@@ -281,7 +281,7 @@ class Account extends Model implements IDs
DB::raw('SUM(amount) AS payments'),
DB::raw('SUM(fees_amt) AS payment_fees'),
])
->join('payment_items',['payment_items.payment_id'=>'payments.id'])
->leftjoin('payment_items',['payment_items.payment_id'=>'payments.id'])
->where('payments.active',TRUE)
->where('payment_items.active',TRUE)
->groupBy(['payment_items.invoice_id'])
@@ -299,6 +299,7 @@ class Account extends Model implements IDs
->leftjoin('invoice_item_taxes',['invoice_item_taxes.invoice_item_id'=>'invoice_items.id'])
->rightjoin('invoices',['invoices.id'=>'invoice_items.invoice_id'])
->where('invoice_items.active',TRUE)
->where('invoice_item_taxes.active',TRUE)
->where('invoices.active',TRUE)
->groupBy(['invoice_items.invoice_id']),
),'p')