From 0d9ca2a0fdddce48fedc8932ad4e44dfb5e3bfe0 Mon Sep 17 00:00:00 2001 From: jayvirsinh_gohil Date: Thu, 14 Nov 2019 18:59:31 +0530 Subject: [PATCH] refactor sales reports --- app/Http/Controllers/ReportController.php | 3 +-- app/InvoiceItem.php | 2 +- app/User.php | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 99887eba..1e49aba9 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -26,8 +26,7 @@ class ReportController extends Controller $query->whereBetween( 'invoice_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] - ) - ->where('paid_status', Invoice::STATUS_PAID); + ); }]) ->customer() ->whereCompany($company->id) diff --git a/app/InvoiceItem.php b/app/InvoiceItem.php index 6d4c3bd8..9b75a507 100644 --- a/app/InvoiceItem.php +++ b/app/InvoiceItem.php @@ -60,7 +60,7 @@ class InvoiceItem extends Model $query->whereBetween( 'invoice_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] - )->where('paid_status', Invoice::STATUS_PAID); + ); }); } diff --git a/app/User.php b/app/User.php index 4951a842..780332f6 100644 --- a/app/User.php +++ b/app/User.php @@ -216,7 +216,7 @@ class User extends Authenticatable implements HasMedia $query->whereBetween( 'invoice_date', [$start->format('Y-m-d'), $end->format('Y-m-d')] - )->where('paid_status', Invoice::STATUS_PAID); + ); }); }