Merged in fixbug (pull request #5)

Fix bug: crash on product page
JaJuMa-GmbH · Jan 17, 2023 · 4816e54 · 4816e54
2 parents 54ebcb0 + 7e9de58
commit 4816e54
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/Plugin/Tax/Config/AroundGetShippingTaxClassPlugin.php b/Plugin/Tax/Config/AroundGetShippingTaxClassPlugin.php
@@ -7,6 +7,7 @@
 
 namespace Jajuma\DynamicShippingTax\Plugin\Tax\Config;
 
+use Magento\Quote\Model\QuoteRepository;
 use Magento\Store\Model\Store;
 use Jajuma\DynamicShippingTax\Model\Config;
 use Magento\Tax\Model\Calculation;
@@ -51,21 +52,25 @@ class AroundGetShippingTaxClassPlugin
      */
     protected $session;
 
+    private $quoteRepository;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\ResourceModel\GroupRepository $groupRepository
-     * @param \Magento\Tax\Model\Calculation\Proxy $taxCalculation
+     * @param Calculation $taxCalculation
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param Session $session
+     * @param \Magento\Checkout\Model\Session $session
+     * @param QuoteRepository $quoteRepository
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\ResourceModel\GroupRepository $groupRepository,
         Calculation $taxCalculation,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Checkout\Model\Session $session
+        \Magento\Checkout\Model\Session $session,
+        QuoteRepository $quoteRepository
     )
     {
         $this->scopeConfig = $scopeConfig;
@@ -74,6 +79,7 @@ public function __construct(
         $this->taxCalculation = $taxCalculation;
         $this->storeManager = $storeManager;
         $this->session = $session;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -86,7 +92,7 @@ public function aroundGetShippingTaxClass(\Magento\Tax\Model\Config $subject, \C
     {
         $currentUrl = $this->storeManager->getStore()->getCurrentUrl(false);
 
-        //check step place order page checkout 
+        //check step place order page checkout
 
         if (strpos($currentUrl, 'payment-information') !== false) {
             return $proceed($store);
@@ -99,7 +105,9 @@ public function aroundGetShippingTaxClass(\Magento\Tax\Model\Config $subject, \C
         );
 
         // get all item in cart
-        $quoteItems = $this->session->getQuote()->getAllVisibleItems();
+        $quoteId = $this->session->getQuoteId();
+        $quote = $this->quoteRepository->get($quoteId);
+        $quoteItems = $quote->getAllVisibleItems();
 
         // If not items in cart or dynamic shipping type is default of magento, use default tax class for shipping
         if (count($quoteItems) == 0 || $dynamicShippingType == Config::SHIPPING_TAX_TYPE_DEFAULT) {