refactor to viewModel and cleanup logic on maxQty

ProxiBlue · Oct 29, 2021 · e54a8cf · e54a8cf
1 parent 27f4831
commit e54a8cf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 12 deletions.
diff --git a/Block/Product/View.php → ViewModel/ProductView.php b/Block/Product/View.php → ViewModel/ProductView.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * (c) Lucas van Staden <[email protected]>
@@ -7,13 +9,31 @@
  * with this source code in the file LICENSE.
  */
 
-namespace ProxiBlue\HyvaQtyInput\Block\Product;
+namespace ProxiBlue\HyvaQtyInput\ViewModel;
 
+use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
 
-class View extends \Magento\Catalog\Block\Product\View
+class ProductView implements ArgumentInterface
 {
     /**
-     * Gets minimal sales quantity
+     * Although depricated, magento core is still using this: Magento\Catalog\Block\Product\AbstractProduct
+     *
+     * @var \Magento\CatalogInventory\Api\StockRegistryInterface
+     */
+    protected $stockRegistry;
+
+    /**
+     * ProductView constructor.
+     *
+     * @param StockRegistryInterface $stockRegistry
+     */
+    public function __construct(StockRegistryInterface $stockRegistry) {
+        $this->stockRegistry = $stockRegistry;
+    }
+
+    /**
+     * Gets max sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
      * @return Integer
@@ -22,10 +42,8 @@ public function getMaxQty($product)
     {
         $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
         $maxSaleQty = $stockItem->getMaxSaleQty();
-        if ($maxSaleQty > 0 && $maxSaleQty < 100000) {
-            $product->addData(['max_sale_qty' => $maxSaleQty]);
-        } else {
-            $maxSaleQty = 100000;
+        if($maxSaleQty == 0) {
+            $maxSaleQty = 10000; // a large default, as for some reason some result to 0, so this is a protection for max qty calculations
         }
         return $maxSaleQty;
     }

diff --git a/view/frontend/layout/catalog_product_view.xml b/view/frontend/layout/catalog_product_view.xml
@@ -14,7 +14,7 @@
     <body>
         <referenceBlock name="product.info.quantity" remove="true"/>
         <referenceBlock name="product.info">
-            <block class="ProxiBlue\HyvaQtyInput\Block\Product\View"
+            <block class="Magento\Catalog\Block\Product\View"
                    as="product.info.quantity"
                    name="product.info.quantity.enhanced"
                    template="ProxiBlue_HyvaQtyInput::product/view/quantity.phtml"

diff --git a/view/frontend/templates/product/view/quantity.phtml b/view/frontend/templates/product/view/quantity.phtml
@@ -12,23 +12,27 @@ declare(strict_types=1);
 use Magento\Catalog\Block\Product\View;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\Escaper;
+use Hyva\Theme\Model\ViewModelRegistry;
 
 /** @var View $block */
 /** @var Escaper $escaper */
+/** @var ViewModelRegistry $viewModels */
+
+$productViewModel = $viewModels->require(\ProxiBlue\HyvaQtyInput\ViewModel\ProductView::class);
 
 /** @var Product $product */
 $product = $block->getProduct();
 $minQty = $block->getMinimalQty($product) * 1;
-$maxQty = $block->getMaxQty($product) * 1;
-$qtyStep = $block->getQtyStep($product) * 1;
+$maxQty = $productViewModel->getMaxQty($product) * 1;
+$qtyStep = $productViewModel->getQtyStep($product) * 1;
 $message = [];
 if ($minQty > 1) {
     $message[] = $escaper->escapeHtml(__('Minimum quantity of %1', $minQty));
 }
 if ($qtyStep > 1) {
     $message[] = $escaper->escapeHtml(__('Quantity increment of %1', $qtyStep));
 }
-if ($product->getData('max_sale_qty') > 0 && $product->getData('max_sale_qty') < 1000) {
+if ($maxQty > 0 && $maxQty < 999) { // we don't want to display message if it is above 1000 as real world usage don't go there - need to be a config option!
     $message[] = $escaper->escapeHtml(__('Maximum quantity of %1', $maxQty));
 }
 ?>