Skip to content

Commit

Permalink
bug fixed 01
Browse files Browse the repository at this point in the history
  • Loading branch information
mah-shamim committed May 4, 2024
1 parent 12775a6 commit 2739993
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/Http/Controllers/BankTransferController.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ public function store(StoreBankTransferRequest $request): JsonResponse
throw (new StoreOperationException)->setModel(config('fintech.remit.bank_transfer_model'));
}
$order_data = $bankTransfer->order_data;
$service = Business::service()->find($inputs['service_id']);
$order_data['service_slug'] = $service->service_slug;
$order_data['service_name'] = $service->service_name;
$order_data['purchase_number'] = entry_number($bankTransfer->getKey(), $bankTransfer->sourceCountry->iso3, OrderStatus::Successful->value);
$order_data['service_stat_data'] = Business::serviceStat()->serviceStateData($bankTransfer);
$order_data['user_name'] = $bankTransfer->user->name;
Expand All @@ -146,7 +149,8 @@ public function store(StoreBankTransferRequest $request): JsonResponse
$depositedUpdatedAccount['user_account_data']['available_amount'] = (float) $userUpdatedBalance['current_amount'];

$order_data['previous_amount'] = (float) $depositedAccount->user_account_data['available_amount'];
$order_data['current_amount'] = ((float) $order_data['order_data']['previous_amount'] + (float) $inputs['converted_currency']);
$order_data['current_amount'] = ((float) $order_data['previous_amount'] + (float) $inputs['converted_currency']);

if (! Transaction::userAccount()->update($depositedAccount->getKey(), $depositedUpdatedAccount)) {
throw new Exception(__('User Account Balance does not update', [
'current_status' => $bankTransfer->currentStatus(),
Expand Down
5 changes: 4 additions & 1 deletion src/Http/Controllers/CashPickupController.php
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ public function store(StoreCashPickupRequest $request): JsonResponse

$order_data = $cashPickup->order_data;
$order_data['purchase_number'] = entry_number($cashPickup->getKey(), $cashPickup->sourceCountry->iso3, OrderStatus::Successful->value);
$service = Business::service()->find($inputs['service_id']);
$order_data['service_slug'] = $service->service_slug;
$order_data['service_name'] = $service->service_name;
$order_data['service_stat_data'] = Business::serviceStat()->serviceStateData($cashPickup);
$order_data['user_name'] = $cashPickup->user->name;
$cashPickup->order_data = $order_data;
Expand All @@ -149,7 +152,7 @@ public function store(StoreCashPickupRequest $request): JsonResponse
$depositedUpdatedAccount['user_account_data']['available_amount'] = (float) $userUpdatedBalance['current_amount'];

$order_data['previous_amount'] = (float) $depositedAccount->user_account_data['available_amount'];
$order_data['current_amount'] = ((float) $order_data['order_data']['previous_amount'] + (float) $inputs['converted_currency']);
$order_data['current_amount'] = ((float) $order_data['previous_amount'] + (float) $inputs['converted_currency']);
if (! Transaction::userAccount()->update($depositedAccount->getKey(), $depositedUpdatedAccount)) {
throw new Exception(__('User Account Balance does not update', [
'current_status' => $cashPickup->currentStatus(),
Expand Down
5 changes: 4 additions & 1 deletion src/Http/Controllers/WalletTransferController.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ public function store(StoreWalletTransferRequest $request): JsonResponse
$order_data = $walletTransfer->order_data;
$order_data['purchase_number'] = entry_number($walletTransfer->getKey(), $walletTransfer->sourceCountry->iso3, OrderStatus::Successful->value);
$order_data['service_stat_data'] = Business::serviceStat()->serviceStateData($walletTransfer);
$service = Business::service()->find($inputs['service_id']);
$order_data['service_slug'] = $service->service_slug;
$order_data['service_name'] = $service->service_name;
$order_data['user_name'] = $walletTransfer->user->name;
$walletTransfer->order_data = $order_data;
$userUpdatedBalance = Remit::walletTransfer()->debitTransaction($walletTransfer);
Expand All @@ -149,7 +152,7 @@ public function store(StoreWalletTransferRequest $request): JsonResponse
$depositedUpdatedAccount['user_account_data']['available_amount'] = (float) $userUpdatedBalance['current_amount'];

$order_data['previous_amount'] = (float) $depositedAccount->user_account_data['available_amount'];
$order_data['current_amount'] = ((float) $order_data['order_data']['previous_amount'] + (float) $inputs['converted_currency']);
$order_data['current_amount'] = ((float) $order_data['previous_amount'] + (float) $inputs['converted_currency']);
if (! Transaction::userAccount()->update($depositedAccount->getKey(), $depositedUpdatedAccount)) {
throw new Exception(__('User Account Balance does not update', [
'current_status' => $walletTransfer->currentStatus(),
Expand Down

0 comments on commit 2739993

Please sign in to comment.