diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index e1cb245..223d69e 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -400,6 +400,10 @@ class Controller extends BaseController return false; } + if (self::usesQuantityTrade($product)) { + return false; + } + if (self::isWeightBasedProductUnit($product['unit'] ?? null)) { return false; } diff --git a/app/Services/AssetSummaryService.php b/app/Services/AssetSummaryService.php index 38fda1b..db7523c 100644 --- a/app/Services/AssetSummaryService.php +++ b/app/Services/AssetSummaryService.php @@ -532,11 +532,16 @@ class AssetSummaryService 'direct_price' => $product->direct_price ?? null, 'group_type' => $product->group_type ?? null, 'amount' => $product->amount ?? null, + 'trade_by_quantity' => $product->trade_by_quantity ?? null, ]; } private function productUnitWeightLabel(Product $product): ?string { + if (!$this->isCountBasedProduct($product)) { + return null; + } + if (!Controller::hasProductUnitWeight($this->productPayload($product))) { return null; }