From 0c29f9b0be066bf4bbeb42344ba036f49a9fef77 Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Mon, 28 Sep 2020 20:04:07 +0100 Subject: [PATCH] + Fix bugs on regulations limits --- app/Http/Controllers/iLinkTransactionController.php | 8 ++++---- app/Traits/Helper.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/iLinkTransactionController.php b/app/Http/Controllers/iLinkTransactionController.php index 32469cd..d436bbc 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::now()->startOfWeek(), Carbon::now()->endOfWeek()])->sum('montant'); + $weekly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(7)])->sum('montant'); else - $weekly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::now()->startOfWeek(), Carbon::now()->endOfWeek()])->sum('montant'); + $weekly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(7)])->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::now()->startOfMonth(), Carbon::now()->endOfMonth()])->sum('montant'); + $monthly_sum = WalletIlinkTransaction::where('id_document_emetteur', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(30)])->sum('montant'); else - $monthly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth()])->sum('montant'); + $monthly_sum = WalletIlinkTransaction::where('id_wallet_user', $identifiant)->whereBetween('date', [Carbon::today(), Carbon::today()->subDay(30)])->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' diff --git a/app/Traits/Helper.php b/app/Traits/Helper.php index ff510bf..383a420 100644 --- a/app/Traits/Helper.php +++ b/app/Traits/Helper.php @@ -268,11 +268,11 @@ trait Helper public function refundAllNanoCredit() { - \Log::info('cron refund credit --'); +// \Log::info('cron refund credit --'); $credits = UsersDemandesCredit::where('etat', 'VALIDE')->where('date_remboursement_prevu', '<=', Carbon::today())->get(); foreach ($credits as $demande_credit) { - \Log::info('Init credit ' . $demande_credit->id_demande); +// \Log::info('Init credit ' . $demande_credit->id_demande); // $refundDate = $demande_credit->date_remboursement_prevu; // //Compare la date de remboursement prevu à celle d'aujourd'hui @@ -286,7 +286,7 @@ trait Helper $walletUser = WalletsUser::where('idUser', $demande_credit->id_user)->firstOrFail(); $this->refundNanoCredit($demande_credit, $user, $walletUser); - \Log::info('Nano credit refunded ' . $demande_credit->id_demande); +// \Log::info('Nano credit refunded ' . $demande_credit->id_demande); // } }