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

+ Update transactions process

This commit is contained in:
DJERY-TOM 2020-04-24 11:37:13 +01:00
parent 8e18aabfb2
commit e3046e4bee
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/TransactionController.php
View File

@ -47,7 +47,7 @@ class TransactionController extends Controller
$walletHyperviseur = Wallet::findOrFail($wallet_agent_hyp->wallet_id); $walletHyperviseur = Wallet::findOrFail($wallet_agent_hyp->wallet_id);
$data = $request->all(); $data = $request->all();
$data['expiration_date'] = \DateTime::createFromFormat('m/Y',$request->expiration_date); $data['expiration_date'] = \DateTime::createFromFormat('m/y',$request->expiration_date);
$transaction->fill($data); $transaction->fill($data);
$client = new \GuzzleHttp\Client(); $client = new \GuzzleHttp\Client();
@ -85,6 +85,12 @@ class TransactionController extends Controller
$walletAgent->balance_com += $agentCommission; $walletAgent->balance_com += $agentCommission;
$walletSuperviseur->balance_com += $superviseurCommission; $walletSuperviseur->balance_com += $superviseurCommission;
$walletHyperviseur->balance_com += $hyperviseurCommission; $walletHyperviseur->balance_com += $hyperviseurCommission;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->commission_sup = $superviseurCommission;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->commission_hyp = $hyperviseurCommission;
$transaction->commission_ag = $agentCommission;
} }
// }else{ // }else{
@ -123,7 +129,11 @@ class TransactionController extends Controller
$walletSuperviseur->balance_com += $superviseurCommission; $walletSuperviseur->balance_com += $superviseurCommission;
$walletHyperviseur->balance_com += $hyperviseurCommission; $walletHyperviseur->balance_com += $hyperviseurCommission;
$transaction->id_wallet_sup = $walletSuperviseur->id;
$transaction->commission_sup = $superviseurCommission;
$transaction->id_wallet_hyp = $walletHyperviseur->id;
$transaction->commission_hyp = $hyperviseurCommission;
$transaction->commission_ag = $agentCommission;
} }
} }

44
app/Models/WalletTransaction.php
View File

@ -16,15 +16,22 @@ use phpDocumentor\Reflection\Types\Integer;
* @property int $id * @property int $id
* @property float $montant * @property float $montant
* @property string $numCarte * @property string $numCarte
* @property Carbon expiration_date * @property Carbon $expiration_date
* @property string commission_banque * @property float $commission_banque
* @property float $commission_ag
* @property float $commission_sup
* @property float $commission_hyp
* @property string $type * @property string $type
* @property Carbon $date * @property Carbon $date
* @property string $statut * @property string $statut
* @property string $result * @property string $result
* @property int $id_wallet * @property int $id_wallet
* @property int $id_wallet_sup
* @property int $id_wallet_hyp
* *
* @property Wallet $wallet * @property Wallet $wallet
* @property Wallet $wallet_sup
* @property Wallet $wallet_hyp
* *
* @package App\Models * @package App\Models
*/ */
@ -33,10 +40,16 @@ class WalletTransaction extends Model
protected $table = 'wallet_transaction'; protected $table = 'wallet_transaction';
public $timestamps = false; public $timestamps = false;
protected $casts = [ protected $casts = [
'montant' => 'float', 'montant' => 'float',
'id_wallet' => 'int' 'commission_banque' => 'float',
]; 'commission_ag' => 'float',
'commission_sup' => 'float',
'commission_hyp' => 'float',
'id_wallet' => 'int',
'id_wallet_sup' => 'int',
'id_wallet_hyp' => 'int'
];
protected $dates = [ protected $dates = [
'date', 'date',
@ -48,11 +61,16 @@ class WalletTransaction extends Model
'numCarte', 'numCarte',
'expiration_date', 'expiration_date',
'commission_banque', 'commission_banque',
'commission_ag',
'commission_sup',
'commission_hyp',
'type', 'type',
'date', 'date',
'statut', 'statut',
'result', 'result',
'id_wallet' 'id_wallet',
'id_wallet_sup',
'id_wallet_hyp'
]; ];
public function wallet() public function wallet()
@ -60,6 +78,16 @@ class WalletTransaction extends Model
return $this->belongsTo(Wallet::class, 'id_wallet'); return $this->belongsTo(Wallet::class, 'id_wallet');
} }
public function wallet_sup()
{
return $this->belongsTo(Wallet::class, 'id_wallet_sup');
}
public function wallet_hyp()
{
return $this->belongsTo(Wallet::class, 'id_wallet_hyp');
}
// public function getTaxeAttribute($value) // public function getTaxeAttribute($value)
// { // {
// return ucfirst($value); // return ucfirst($value);
@ -76,7 +104,7 @@ class WalletTransaction extends Model
'montant'=> 'required|numeric|min:1', 'montant'=> 'required|numeric|min:1',
'numCarte'=>'required|integer', 'numCarte'=>'required|integer',
'cvv'=>'required|integer|min:100|max:9999', 'cvv'=>'required|integer|min:100|max:9999',
'expiration_date'=>'required|date_format:m/Y|after_or_equal:today', 'expiration_date'=>'required|date_format:m/y|after_or_equal:today',
'type' =>'required|in:credit,debit', 'type' =>'required|in:credit,debit',
'id_wallet' => 'required|integer|min:0' 'id_wallet' => 'required|integer|min:0'
]; ];