From 30bc4ccfa710bdacc208a3d8e5843f1ea2d520f2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 13 Jan 2017 21:16:54 +0100 Subject: [PATCH] More date fixes [skip ci] --- app/Support/Steam.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 0f92fc13ca..1761cf0ec6 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -124,7 +124,7 @@ class Steam ->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->groupBy('transaction_journals.date') - ->orderBy('transaction_journals.date','ASC') + ->orderBy('transaction_journals.date', 'ASC') ->whereNull('transaction_journals.deleted_at') ->get(['transaction_journals.date', DB::raw('SUM(transactions.amount) AS modified')]); $currentBalance = $startBalance; @@ -165,6 +165,8 @@ class Steam ->where('transaction_journals.date', '<=', $date->format('Y-m-d')) ->groupBy('transactions.account_id') ->whereIn('transactions.account_id', $ids) + ->orderBy('transaction_journals.date', 'ASC') + ->whereNull('transaction_journals.deleted_at') ->get(['transactions.account_id', DB::raw('sum(transactions.amount) AS aggregate')]); $result = [];