fixed show true when price is 0

app/Http/Controllers/Single/SingleOrderController.php

@@ -32,6 +32,10 @@ class SingleOrderController extends Controller
     public function store(Request $request)
     {
         $data = $request->all();
+        $data['payment_product_id'] = $this->resolveGoldPaymentProductId($data);
+        if (preg_match('/^gold:\d+$/', (string) ($data['method'] ?? ''))) {
+            $data['method'] = 'gold';
+        }
         $data['is_katod'] = ($data['method'] ?? null) === 'katod';
         if ($data['is_katod']) {
             $data['method'] = 'gold';
@@ -332,22 +336,69 @@ class SingleOrderController extends Controller
         $data['total_fee'] = 0;
         $data['service_charge_price'] = $data['service_charge'] * $data['price_original'];
         $data['wallet'] = $wallet;
-        if ($wallet->gold < $data['total_amount']) {
+
+        $paymentProductId = (int) ($data['payment_product_id'] ?? 0);
+        $paymentWalletInterface = $wallet_interface;
+        $paymentProduct = null;
+        $paymentWallet = $wallet;
+
+        if ($paymentProductId > 0) {
+            $paymentProduct = Product::find($paymentProductId);
+            if (
+                !$paymentProduct
+                || (int) ($paymentProduct->metal_id ?? 0) !== (int) ($data['product']['metal_id'] ?? 0)
+            ) {
+                throw new UnprocessableEntityHttpException('روش پرداخت نامعتبر است.');
+            }
+
+            $paymentWalletInterface = $this->productWalletInterface($paymentProductId);
+            $paymentWallet = $paymentWalletInterface->wallet;
+            if (!$paymentWallet) {
+                throw new UnprocessableEntityHttpException('کیف پول یافت نشد.');
+            }
+        }
+
+        if ((float) $paymentWallet->gold < $data['total_amount']) {
             throw new UnprocessableEntityHttpException($this->insufficientGoldBalanceMessage($data));
         }
         if (!$data['product']['open_buy']) {
             throw new UnprocessableEntityHttpException('خرید این محصول در این لحظه مقدور نمیباشد');
         }
         $data['order'] = $order = Order::create($data);
-        $data['transaction'][] = new TransactionInterface($wallet_interface, $_inp = [
+
+        $paymentSellTitle = $paymentProduct
+            ? self::productSellTitle($paymentProduct->title ?? '')
+            : self::mainMetalSellTitle();
+
+        $paymentTransaction = [
             "number" => $data['number'],
             "gold" => $data['total_amount'],
-            "product_id" => $data["product_id"],
             'expire_at' => now(),
             'active' => true,
             'order_id' => $order->id,
-            'title' => self::mainMetalSellTitle(),
-        ], 12, false, true);
+            'title' => $paymentSellTitle,
+        ];
+
+        if ($paymentProductId > 0) {
+            $paymentTransaction['product_id'] = $paymentProductId;
+            $this->normalizeProductWalletGold($paymentWalletInterface);
+            $data['transaction'][] = new TransactionInterface(
+                $paymentWalletInterface,
+                $paymentTransaction,
+                1,
+                false,
+                false
+            );
+        } else {
+            $data['transaction'][] = new TransactionInterface(
+                $paymentWalletInterface,
+                $paymentTransaction,
+                12,
+                false,
+                true
+            );
+        }
+
         $wallet_interface_product = $this->productWalletInterface((int) $data["product_id"]);
         $this->normalizeProductWalletGold($wallet_interface_product);
         new TransactionInterface($wallet_interface_product, [
@@ -794,6 +845,20 @@ class SingleOrderController extends Controller
         return null;
     }
 
+    private function resolveGoldPaymentProductId(array $data): ?int
+    {
+        if (!empty($data['payment_product_id'])) {
+            return (int) $data['payment_product_id'];
+        }
+
+        $method = (string) ($data['method'] ?? '');
+        if (preg_match('/^gold:(\d+)$/', $method, $matches)) {
+            return (int) $matches[1];
+        }
+
+        return null;
+    }
+
     private function resolveAbshodeProductContext(array $data): array
     {
         $productId = (int) ($data['product_id'] ?? $data['abshode_id'] ?? 0);

app/Services/ProductDisplayPriceService.php

@@ -100,7 +100,7 @@ class ProductDisplayPriceService
             ? $this->resolveLiveBuyPriceWithFallback()
             : $this->resolveStrictLiveBuyPrice();
 
-        if ($unitBuy <= 0 && app(ConfigService::class)->getBool('show_last_price', false)) {
+        if ($unitBuy <= 0 && $useLast) {
             $unitBuy = $this->resolveHistoricalBasePrice();
         }
 
@@ -262,25 +262,11 @@ class ProductDisplayPriceService
     /** @param array<int, array<string, mixed>> $feed */
     private function applyReferenceFeedPrice(Product $product, array $feed, ZaarboxPriceService $zaarbox): void
     {
-        if (Product::hasStoredPriceColumns()) {
-            $stored = (int) ($product->price ?? 0) + (int) ($product->price_profit ?? 0);
-            if ($stored > 0) {
-                $product->setAttribute('price', (int) ($product->price ?? 0));
-                if (Schema::hasColumn($product->getTable(), 'price_profit')) {
-                    $product->setAttribute('price_profit', (int) ($product->price_profit ?? 0));
-                }
-
-                return;
-            }
-        }
-
+        $useLast = $this->productUsesLastPriceIfZero($product);
         $row = $zaarbox->findFeedRow($feed, (string) $product->reading_method);
         if ($row === null) {
-            $useLast = $this->productUsesLastPriceIfZero($product);
             $offset = ProductPriceService::offsetPercent($product);
-            $historical = app(ConfigService::class)->getBool('show_last_price', false)
-                ? $this->resolveHistoricalBasePrice()
-                : 0;
+            $historical = $useLast ? $this->resolveHistoricalBasePrice() : 0;
             $computed = $historical > 0
                 ? ProductPriceService::adjustedTotal($historical, 0, $offset)
                 : 0;
@@ -291,7 +277,7 @@ class ProductDisplayPriceService
 
         $computed = $zaarbox->computeAdjustedProductPrice($product, $row);
         if ($computed <= 0) {
-            if ($this->productUsesLastPriceIfZero($product)) {
+            if ($useLast) {
                 $fallback = $this->resolveLastPriceFallback($product);
                 if ($fallback > 0) {
                     $product->setAttribute('price', $fallback);
@@ -455,10 +441,11 @@ class ProductDisplayPriceService
 
     /**
      * نمایش در اپ کاربر:
-     * • خاموش (show=false در DB) → false
+     * • خاموش (active=false در DB) → false
+     * • خارج از ساعات معامله → false
      * • قیمت نمایشی بعد از enrich → true
-     * • قیمت صفر و show_last_price خاموش → false
-     * • قیمت صفر و show_last_price روشن و fallback موجود → true
+     * • قیمت صفر و use_last_price_if_zero خاموش → false
+     * • قیمت صفر و use_last_price_if_zero روشن و fallback موجود → true
      */
     public function resolveCustomerShow(Product $product): bool
     {
@@ -474,11 +461,10 @@ class ProductDisplayPriceService
             return true;
         }
 
-        if (! app(ConfigService::class)->getBool('show_last_price', false)) {
+        if (! $this->productUsesLastPriceIfZero($product)) {
             return false;
         }
 
-        return $this->resolveLastPriceFallback($product) > 0
-            || $this->resolveHistoricalBasePrice() > 0;
+        return $this->resolveLastPriceFallback($product) > 0;
     }
 }

app/Services/ProductPriceService.php

@@ -51,6 +51,10 @@ class ProductPriceService
             $data['price_profit'] = 0;
         }
 
+        if (\Illuminate\Support\Facades\Schema::hasColumn($product->getTable(), 'show')) {
+            $data['show'] = self::resolveShowAfterPriceSync($product, $adjustedPrice);
+        }
+
         Product::where('id', $product->id)->update($data);
 
         return [
@@ -67,6 +71,19 @@ class ProductPriceService
         ];
     }
 
+    private static function resolveShowAfterPriceSync(Product $product, int $adjustedPrice): bool
+    {
+        if (! ($product->active ?? true)) {
+            return false;
+        }
+
+        if (! app(ConfigService::class)->isProductWithinTradingHours($product)) {
+            return false;
+        }
+
+        return $adjustedPrice > 0;
+    }
+
     /** وقتی فقط درصد در ادمین عوض می‌شود (بدون sync جدید) */
     public static function reapplyOffsetPercent(Product $product, float $newOffsetPercent, ?float $oldOffsetPercent = null): void
     {