From 07e98da626d36b980300b1040a4ecff65985893d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 6 Nov 2018 16:57:27 +0200 Subject: [PATCH] Include expense taxes in vendor summary --- app/Models/Vendor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index c1843c511..d2767fc21 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -338,7 +338,7 @@ class Vendor extends EntityModel public function getTotalExpenses() { return DB::table('expenses') - ->select('expense_currency_id', DB::raw('SUM(amount) as amount')) + ->select('expense_currency_id', DB::raw('sum(expenses.amount + (expenses.amount * expenses.tax_rate1 / 100) + (expenses.amount * expenses.tax_rate2 / 100)) as amount')) ->whereVendorId($this->id) ->whereIsDeleted(false) ->groupBy('expense_currency_id')