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 create order button not working at dashboard

Browse Source
This commit is contained in:
ahmedsophyudden
2022-06-12 18:23:21 +08:00
parent 1f2628437c
commit 47e287e3ad
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Transactions/Services/CalculatesTransactionServiceCharge.php
+9 -6
View File
@@ -25,15 +25,18 @@ class CalculatesTransactionServiceCharge
* @param SegmentConstant|null $service_charge
* @return float
*/
public function execute(float $amount, float $rate, ?SegmentConstant $service_charge) {
public function execute(float $amount, float $rate, ?SegmentConstant $service_charge)
{
if(!$service_charge) {
if (!$service_charge) {
return 0;
}
$transfer_fee = $this->calculatesTransactionTransferFee->execute(($amount * (1 / $rate)), $service_charge);
return $service_charge->detail->amount->type === 'percentage' ? (($amount + $transfer_fee) * ( (float) $service_charge->detail->amount->value /100) * (1/$rate)) : (float) $service_charge->detail->amount->value;
if (isset($service_charge->detail->amount)) {
return $service_charge->detail->amount->type === 'percentage' ? (($amount + $transfer_fee) * ((float) $service_charge->detail->amount->value / 100) * (1 / $rate)) : (float) $service_charge->detail->amount->value;
} else {
return 0;
}
}
}
}
app/Classes/Modules/Transactions/Services/CalculatesTransactionTransferFee.php
+9 -5
View File
@@ -12,13 +12,17 @@ class CalculatesTransactionTransferFee
* @param SegmentConstant|null $service_charge
* @return float
*/
public function execute(float $amount, ?SegmentConstant $service_charge) {
public function execute(float $amount, ?SegmentConstant $service_charge)
{
if(!$service_charge) {
if (!$service_charge) {
return 0;
}
return $service_charge->detail->transferFee->type === 'percentage' ? $amount * ((float) $service_charge->detail->transferFee->value /100) : (float) $service_charge->detail->transferFee->value;
if (isset($service_charge->detail->transferFee)) {
return $service_charge->detail->transferFee->type === 'percentage' ? $amount * ((float) $service_charge->detail->transferFee->value / 100) : (float) $service_charge->detail->transferFee->value;
} else {
return 0;
}
}
}
}