From daadf941ded7b4086048a0bb5b964d8355880d47 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Mon, 28 Sep 2020 20:14:01 +0100 Subject: [PATCH] + Fix bugs on regulations limits v2 --- app/Http/Controllers/iLinkTransactionController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index d436bbc..4abb491 100755 --- a/app/Http/Controllers/iLinkTransactionController.php +++ b/app/Http/Controllers/iLinkTransactionController.php @@ -1436,9 +1436,9 @@ class iLinkTransactionController extends Controller // Carbon::setWeekStartsAt(Carbon::SUNDAY); // Carbon::setWeekEndsAt(Carbon::SATURDAY); if ($is_id_document_emetteur) - $weekly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(7)])->sum('montant'); + $weekly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today()->subDay(7), Carbon::today()])->sum('montant'); else - $weekly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(7)])->sum('montant'); + $weekly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today()->subDay(7), Carbon::today()])->sum('montant'); $amount_admitted = $regulation->montant_max_hedbo - $weekly_sum; if (($weekly_sum + $montant_transaction) > $regulation->montant_max_hebdo) return $this->errorResponse(trans('errors.weekly_regulations_limits_reached') . '\n' @@ -1447,9 +1447,9 @@ class iLinkTransactionController extends Controller // Total montants mensuel if ($is_id_document_emetteur) - $monthly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(30)])->sum('montant'); + $monthly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today()->subDay(30), Carbon::today()])->sum('montant'); else - $monthly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(30)])->sum('montant'); + $monthly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today()->subDay(30), Carbon::today()])->sum('montant'); $amount_admitted = $regulation->montant_max_mensuel - $monthly_sum; if (($monthly_sum + $montant_transaction) > $regulation->montant_max_mensuel) return $this->errorResponse(trans('errors.monthly_regulations_limits_reached') . '\n'