Adjustments.

FrenetGatewaydeFretes · May 18, 2020 · c8e489f · c8e489f
1 parent 3daa90a
commit c8e489f
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 9 deletions.
diff --git a/app/code/community/Frenet/Shipping/Helper/Objects.php b/app/code/community/Frenet/Shipping/Helper/Objects.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Class Frenet_Shipping_Helper_Objects
  */

diff --git a/app/code/community/Frenet/Shipping/Model/Catalog/Product/View/Quote.php b/app/code/community/Frenet/Shipping/Model/Catalog/Product/View/Quote.php
@@ -10,6 +10,8 @@
  *
  * Copyright (c) 2020.
  */
+Frenet_Shipping_Model_DependencyFinder::includeDependency();
+
 use Mage_Catalog_Model_Product as Product;
 use Mage_Shipping_Model_Rate_Request as RateRequest;
 use Frenet_Shipping_Model_Rate_Request_Provider as RateRequestProvider;
@@ -53,10 +55,18 @@ public function __construct()
     public function quoteByProductId($productId, $postcode, $qty = 1, array $options = [])
     {
         try {
+            if (!$postcode) {
+                Mage::throwException('Postcode cannot be empty.');
+            }
+
             /** @var Product $product */
             $product = Mage::getModel('catalog/product')->load($productId);
+
+            if (!$product || !$product->getId()) {
+                Mage::throwException("Product ID '{$productId}' does not exist.");
+            }
         } catch (Exception $exception) {
-            Mage::log('Product ID %s does not exist.', $productId);
+            Mage::log($exception->getMessage());
 
             return [];
         }
@@ -84,7 +94,7 @@ public function quoteByProductSku($sku, $postcode, $qty = 1, array $options = []
     /**
      * @inheritDoc
      */
-    private function quote(Product $product, string $postcode, int $qty = 1, $options = [])
+    private function quote(Product $product, $postcode, $qty = 1, $options = [])
     {
         /** @var RateRequest $rateRequest */
         $rateRequest = $this->rateRequestBuilder->build($product, $postcode, $qty, $options);

diff --git a/app/code/community/Frenet/Shipping/Model/Catalog/Product/View/Rate/Request/Builder.php b/app/code/community/Frenet/Shipping/Model/Catalog/Product/View/Rate/Request/Builder.php
@@ -110,7 +110,7 @@ private function fixQuoteItems(Mage_Sales_Model_Quote $quote)
      *
      * @return float
      */
-    private function getItemRowWeight(QuoteItem $item, $qty) : float
+    private function getItemRowWeight(QuoteItem $item, $qty)
     {
         $this->dimensionsExtractor->setProductByCartItem($item);
         $weight = $this->dimensionsExtractor->getWeight();

diff --git a/app/code/community/Frenet/Shipping/controllers/ProductController.php b/app/code/community/Frenet/Shipping/controllers/ProductController.php
@@ -16,10 +16,10 @@ protected function _construct()
 
     public function quoteAction()
     {
-        $productId = (int) $this->getRequest()->getParam('product');
-        $postcode = (string) $this->getRequest()->getParam('postcode');
-        $qty = (float) $this->getRequest()->getParam('qty');
-        $options = (array) $this->getRequest()->getParams();
+        $productId = (int) $this->getRequest()->getPost('product');
+        $postcode = (string) $this->getRequest()->getPost('postcode');
+        $qty = (float) $this->getRequest()->getPost('qty');
+        $options = (array) $this->getRequest()->getPost();
 
         $this->getResponse()->setHeader('Content-type', 'application/json', true);
 

diff --git a/app/design/frontend/base/default/template/frenet/shipping/catalog/product/view/quote.phtml b/app/design/frontend/base/default/template/frenet/shipping/catalog/product/view/quote.phtml
@@ -49,7 +49,7 @@ $product = $this->getProduct();
                 </div>
             </div>
             <div class="actions">
-                <button type="button" class="button btn-cart">
+                <button type="button" id="frenet-postcode-button" class="button btn-cart">
                     <span><?php echo $this->__('Get Quote')?></span>
                 </button>
             </div>
@@ -91,4 +91,58 @@ $product = $this->getProduct();
             </div>
         </div>
     </div>
+    <script type="text/javascript">
+        var productQuote = Class.create();
+        productQuote.prototype = {
+            initialize: function () {
+                this.url = '/frenet/product/quote';
+                this.postcode = null;
+                this.active = false;
+                this.field = $('frenet-postcode-field');
+                this.button = $('frenet-postcode-button');
+
+                // this.field.observe('change', this.updateRates.bind(this));
+                this.button.observe('click', this.updateRates.bind(this));
+            },
+            updateRates: function () {
+                this.postcode = this.field.value;
+                if (this.postcode) {
+                    // this.loaderStart();
+
+                    new Ajax.Request(this.url, {
+                        method: 'POST',
+                        parameters: $('product_addtocart_form').serialize(),
+                        onSuccess: this.processSuccess.bind(this),
+                        onFailure: this.processFailure.bind(this),
+                        onComplete: this.processAlways.bind(this)
+                    });
+                }
+
+                // if (!this.postcode()) {
+                //     this.reset();
+                // }
+            },
+            processSuccess: function (result) {
+                console.log("RESULT SUCCESS", result);
+                // if (result.error) {
+                //     this.processFailure(result);
+                //     return;
+                // }
+
+                // this.pushRates(result.rates);
+            },
+            processFailure: function (result) {
+                console.log("RESULT FAILURE", result);
+                // this.reset();
+                // this.errorMessage(result.message);
+                // this.error(true);
+            },
+            processAlways: function (result) {
+                console.log("RESULT ALWAYS", result);
+                // this.loaderStop();
+            },
+        }
+
+        var quote = new productQuote();
+    </script>
 <?php endif; ?>