From 6b2e0af795843e4965865547f75fe8459ccaafde Mon Sep 17 00:00:00 2001 From: Djery-Tom Date: Thu, 17 Dec 2020 09:31:26 +0100 Subject: [PATCH] + Update wallet transaction history fields --- app/Http/Controllers/TransactionController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 9d0534d..4546b11 100755 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -188,8 +188,8 @@ class TransactionController extends Controller { // $transactions = WalletTransaction::where('id_wallet',$id_wallet)->orderBy('date','desc')->limit(10) // ->get(['type' ,DB::raw('\'wallet\' as source'), 'montant' ,'numCarte AS destinataire' , 'date', 'id']); - $transactions = WalletTransaction::where('id_wallet', $id_wallet)->where('canceled' ,'0')->orderBy('date', 'desc')->limit(10) - ->get(['type as operation', 'montant', 'numCarte AS destinataire', 'date', 'id' , 'commission_banque', 'commission_ag', + $transactions = WalletTransaction::where('id_wallet', $id_wallet)->where('canceled', '0')->where('deleted', '0')->orderBy('date', 'desc')->limit(10) + ->get(['type as operation', 'montant', 'numCarte AS destinataire', 'date', 'id', 'commission_banque', 'commission_ag', 'commission_sup', 'commission_hyp']); foreach ($transactions as $trans){ $trans->frais = $trans->commission_banque + $trans->commission_sup + $trans->commission_ag + $trans->commission_hyp;