cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix edit transfer fee bug

Browse Source
This commit is contained in:
JiaSheng
2024-05-08 20:07:06 +08:00
parent 26f8ca87cd
commit b8d741f57c
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupTransferFeeLogic.php
+20 -1
View File
@@ -11,6 +11,7 @@ use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\PaymentMethodType;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Transaction;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -73,7 +74,25 @@ class UpdateGroupTransferFeeLogic extends AbstractControllerLogic
$fee, $fee, $group->original_currency_id, $group->original_currency_id,
1, 0, 0, null, ApprovalStatus::APPROVED);
$this->createsTransaction->execute($group, $object);
$model = new Transaction();
$model->bill_no = $object->getBillNo();
$model->type = $object->getTransactionType();
$model->issuer = $object->getIssuer();
$model->receiver = $object->getReceiver();
$model->recipient_bank_account_id = $object->getRecipientBankAccountId();
$model->payment_method = $object->getPaymentMethod();
$model->amount = $object->getAmount();
$model->original_amount = $object->getOriginalAmount();
$model->currency_id = $object->getCurrencyId();
$model->original_currency_id = $object->getOriginalCurrencyId();
$model->currency_rate = $object->getCurrencyRate();
$model->tax = $object->getTax();
$model->service_charge = $object->getServiceCharge();
$model->expires_on = $object->getExpiresOn();
$model->status = $object->getStatus();
$model->payment_reference = $object->getPaymentReference();
$group->morphTransactions()->save($model);
}
return $this->resourceResponse(new GroupResource($group));
app/Classes/Modules/Transactions/Services/CreatesTransaction.php
+1 -6
View File
@@ -5,7 +5,6 @@ namespace App\Classes\Modules\Transactions\Services;
use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
use App\Classes\General\Interfaces\Transactionable;
use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
use App\Models\Group;
use App\Models\Transaction;
class CreatesTransaction extends AbstractUpdateRelationshipRecord
@@ -16,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Transactionable|Group $transactionable, TransactionObject $object) {
public function execute(Transactionable $transactionable, TransactionObject $object) {
$model = new Transaction();
$model->bill_no = $object->getBillNo();
$model->type = $object->getTransactionType();
@@ -35,10 +34,6 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord
$model->status = $object->getStatus();
$model->payment_reference = $object->getPaymentReference();
if ($transactionable instanceof Group) {
return $this->handler($transactionable->morphTransactions(), $model);
}
return $this->handler($transactionable->transactions(), $model);
}
resources/assets/vue/components/bookings/elements/EditTransferFeeFormComponent.vue
+1 -1
View File
@@ -60,7 +60,7 @@
return {
error: '',
parameters: {
fee: (Math.round((this.transfer_fee + Number.EPSILON) * 10000) / 10000).toFixed(5)
fee: (Math.round((this.transfer_fee + Number.EPSILON) * 100) / 100).toFixed(2)
},
}
},