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

+ Fix bugs on regulations limits

This commit is contained in:
Djery-Tom 2020-09-28 20:04:07 +01:00
parent 5f2d68a7da
commit 0c29f9b0be
2 changed files with 7 additions and 7 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::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 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; $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::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 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; $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'

6
app/Traits/Helper.php
View File

@ -268,11 +268,11 @@ trait Helper
public function refundAllNanoCredit() 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(); $credits = UsersDemandesCredit::where('etat', 'VALIDE')->where('date_remboursement_prevu', '<=', Carbon::today())->get();
foreach ($credits as $demande_credit) { 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; // $refundDate = $demande_credit->date_remboursement_prevu;
// //Compare la date de remboursement prevu à celle d'aujourd'hui // //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(); $walletUser = WalletsUser::where('idUser', $demande_credit->id_user)->firstOrFail();
$this->refundNanoCredit($demande_credit, $user, $walletUser); $this->refundNanoCredit($demande_credit, $user, $walletUser);
\Log::info('Nano credit refunded ' . $demande_credit->id_demande); // \Log::info('Nano credit refunded ' . $demande_credit->id_demande);
// } // }
} }