From 34298d3bc5c8b36af1fe5b6b2a0f2a2d21311630 Mon Sep 17 00:00:00 2001
From: adonis <mseddighi99.ms@gmail.com>
Date: Wed, 17 Jun 2026 14:05:44 +0330
Subject: [PATCH] bug fixed

---
 app/Http/Controllers/Controller.php           | 34 +++++++++++++++++--
 .../Customer/CustomerController.php           |  4 +--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index f4c57ea..846b18c 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -430,16 +430,44 @@ class Controller extends BaseController
         return 'گرم';
     }
 
-    /** مطابق ادمین: وزن «دارد» => amount != 1 ؛ «ندارد» => amount = 1 */
+    /** مطابق ادمین: وزن «دارد» => amount > 0 ؛ «ندارد» => amount = 0 */
+    public static function isMeltedTradeGroup(?string $groupType): bool
+    {
+        $group = trim((string) $groupType);
+
+        return in_array($group, ['آبشده', 'کاتد مس'], true);
+    }
+
     public static function hasProductUnitWeight(?array $product): bool
     {
         if (!$product || !isset($product['amount'])) {
             return false;
         }
 
-        $amount = (float) $product['amount'];
+        if (self::isMeltedTradeGroup($product['group_type'] ?? null)) {
+            return false;
+        }
 
-        return $amount > 0 && $amount !== 1.0;
+        return (float) $product['amount'] > 0;
+    }
+
+    /** ضریب قیمت محصول — بدون وزن قطعه همیشه ۱ */
+    public static function productPriceMultiplier($product): float
+    {
+        $payload = is_array($product) ? $product : [
+            'amount' => is_object($product) ? ($product->amount ?? null) : null,
+            'unit' => is_object($product) ? ($product->unit ?? null) : null,
+            'direct_price' => is_object($product) ? ($product->direct_price ?? null) : null,
+            'group_type' => is_object($product) ? ($product->group_type ?? null) : null,
+        ];
+
+        if (!self::hasProductUnitWeight($payload)) {
+            return 1.0;
+        }
+
+        $amount = (float) ($payload['amount'] ?? 0);
+
+        return $amount > 0 ? $amount : 1.0;
     }
 
     public function jibitNcode($nationalCode, $mobile)
diff --git a/app/Http/Controllers/Customer/CustomerController.php b/app/Http/Controllers/Customer/CustomerController.php
index 76a529b..4b67058 100644
--- a/app/Http/Controllers/Customer/CustomerController.php
+++ b/app/Http/Controllers/Customer/CustomerController.php
@@ -102,13 +102,13 @@ class CustomerController extends Controller
                     if (!($walletSingle->product->group_type == "سکه")) {
                         $count_silver += self::productLineWeightToGrams($walletSingle->product, $walletSingle->gold);
                     }
-                    $count_cash_from_silver += ($walletSingle->product->price * $walletSingle->product->amount) * $walletSingle->gold;
+                    $count_cash_from_silver += ($walletSingle->product->price * self::productPriceMultiplier($walletSingle->product)) * $walletSingle->gold;
                     $count_product += $walletSingle->gold;
                 } elseif ($walletSingle->product->metal_id == 3) {
                     if (!($walletSingle->product->group_type == "سکه")) {
                         $count_copper += self::productLineWeightToGrams($walletSingle->product, $walletSingle->gold);
                     }
-                    $count_cash_from_copper += ($walletSingle->product->price * $walletSingle->product->amount) * $walletSingle->gold;
+                    $count_cash_from_copper += ($walletSingle->product->price * self::productPriceMultiplier($walletSingle->product)) * $walletSingle->gold;
                     $count_product += $walletSingle->gold;
                 }
             } else {