adminnistrateur
/
walletservice
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

+ Fix bugs on regulations limits v2

This commit is contained in:
Djery-Tom 2020-09-28 20:14:01 +01:00
parent 0c29f9b0be
commit daadf941de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/iLinkTransactionController.php
View File

@ -1436,9 +1436,9 @@ class iLinkTransactionController extends Controller
// Carbon::setWeekStartsAt(Carbon::SUNDAY); // Carbon::setWeekStartsAt(Carbon::SUNDAY);
// Carbon::setWeekEndsAt(Carbon::SATURDAY); // Carbon::setWeekEndsAt(Carbon::SATURDAY);
if ($is_id_document_emetteur) 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 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; $amount_admitted = $regulation->montant_max_hedbo - $weekly_sum;
if (($weekly_sum + $montant_transaction) > $regulation->montant_max_hebdo) if (($weekly_sum + $montant_transaction) > $regulation->montant_max_hebdo)
return $this->errorResponse(trans('errors.weekly_regulations_limits_reached') . '\n' return $this->errorResponse(trans('errors.weekly_regulations_limits_reached') . '\n'
@ -1447,9 +1447,9 @@ class iLinkTransactionController extends Controller
// Total montants mensuel // Total montants mensuel
if ($is_id_document_emetteur) 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 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; $amount_admitted = $regulation->montant_max_mensuel - $monthly_sum;
if (($monthly_sum + $montant_transaction) > $regulation->montant_max_mensuel) if (($monthly_sum + $montant_transaction) > $regulation->montant_max_mensuel)
return $this->errorResponse(trans('errors.monthly_regulations_limits_reached') . '\n' return $this->errorResponse(trans('errors.monthly_regulations_limits_reached') . '\n'