fix order
This commit is contained in:
@@ -80,12 +80,8 @@ class SingleOrderController extends Controller
|
|||||||
$data['all_price'] = $latestPrice;
|
$data['all_price'] = $latestPrice;
|
||||||
$data['price'] = $basePrice;
|
$data['price'] = $basePrice;
|
||||||
$data['price_id'] = $latestPrice?->id;
|
$data['price_id'] = $latestPrice?->id;
|
||||||
$feeServiceCharge = Setting::where('key', 'fee_service_charge_percentage')->first();
|
$data['difference'] = $config->orderSpreadRial();
|
||||||
if (! $feeServiceCharge) {
|
$data['service_charge_percentage'] = $config->orderServiceChargePercentage();
|
||||||
throw new UnprocessableEntityHttpException('تنظیمات کارمزد یافت نشد.');
|
|
||||||
}
|
|
||||||
$data['difference'] = (float) (Setting::where('key', 'fee_single')->value('value') ?? config('fee.single', 0));
|
|
||||||
$data['service_charge_percentage'] = (float) $feeServiceCharge->value;
|
|
||||||
|
|
||||||
$fee_free = Setting::where('key', 'fee_free')->where('is_active', true)->value('value');
|
$fee_free = Setting::where('key', 'fee_free')->where('is_active', true)->value('value');
|
||||||
|
|
||||||
|
|||||||
@@ -110,6 +110,35 @@ class ConfigService
|
|||||||
return $sellFee > 0 ? $sellFee : $feeSingle;
|
return $sellFee > 0 ? $sellFee : $feeSingle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** اختلاف ریالی سفارش — fee_single، بعد fee_cash (legacy)، بعد config/fee.php */
|
||||||
|
public function orderSpreadRial(): float
|
||||||
|
{
|
||||||
|
$feeSingle = $this->getString('fee_single', '');
|
||||||
|
if ($feeSingle !== '') {
|
||||||
|
return (float) $feeSingle;
|
||||||
|
}
|
||||||
|
|
||||||
|
$legacyCash = $this->getString('fee_cash', '');
|
||||||
|
if ($legacyCash !== '') {
|
||||||
|
return (float) $legacyCash;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (float) config('fee.single', 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** درصد کارمزد سفارش — fee_service_charge_percentage، service_charge_percentage، config/fee.php */
|
||||||
|
public function orderServiceChargePercentage(): float
|
||||||
|
{
|
||||||
|
foreach (['fee_service_charge_percentage', 'service_charge_percentage'] as $key) {
|
||||||
|
$raw = $this->getString($key, '');
|
||||||
|
if ($raw !== '') {
|
||||||
|
return (float) $raw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (float) config('fee.service_charge_percentage', 0);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sell / buy / price_last — یک منبع حقیقت برای lastPrice و buildFromDatabase.
|
* sell / buy / price_last — یک منبع حقیقت برای lastPrice و buildFromDatabase.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user