TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix custom field issue and report issues

Browse Source
This commit is contained in:
radhika587
2021-12-06 12:51:31 +00:00
committed by Mohit Panjwani
parent 7b6a88ad4e
commit 603bf637a7
7 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php
View File

@ -47,7 +47,7 @@ class CustomerSalesReportController extends Controller
foreach ($customers as $customer) {
$customerTotalAmount = 0;
foreach ($customer->invoices as $invoice) {
$customerTotalAmount += $invoice->total;
$customerTotalAmount += $invoice->base_total;
}
$customer->totalAmount = $customerTotalAmount;
$totalAmount += $customerTotalAmount;

2
app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php
View File

@ -34,7 +34,7 @@ class ProfitLossReportController extends Controller
$invoicesAmount = Invoice::whereCompanyId($company->id)
->applyFilters($request->only(['from_date', 'to_date']))
->wherePaidStatus(Invoice::STATUS_PAID)
->sum('total');
->sum('base_total');
$expenseCategories = Expense::with('category')
->whereCompanyId($company->id)