LivraisonParSecteurs : On avance sur la partie front...

local/modules/LivraisonParSecteurs/LivraisonParSecteurs.php

@@ -2,8 +2,10 @@
 
 namespace LivraisonParSecteurs;
 
+use LivraisonParSecteurs\Model\LpsAreaCityQuery;
 use LivraisonParSecteurs\Model\LpsAreaQuery;
 use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Propel;
 use Thelia\Core\Translation\Translator;
 use Thelia\Install\Database;
 use Thelia\Model\AddressQuery;
@@ -43,20 +45,18 @@ class LivraisonParSecteurs extends AbstractDeliveryModule
      */
     public function isValidDelivery(Country $country)
     {
-        // Get current addressId
-        $currentAddressId = $this->getRequest()->request->get('address_id');
+        $isValid = false;
+        $con = Propel::getConnection();
 
-        if (empty($currentAddressId)) {
-            if (null !== $customer = $this->getRequest()->getSession()->getCustomerUser()) {
-                $currentAddressId = AddressQuery::create()
-                    ->filterByCustomer($customer)
-                    ->filterByIsDefault(1)
-                    ->select('ID')
-                    ->findOne();
-            } else {
-                return false;
-            }
+        $currentAddressId = $this->getRequest()->getSession()->getOrder()->getChoosenDeliveryAddress();
+        if (!empty($currentAddressId)) {
+            $zipcode = AddressQuery::create()->filterById($currentAddressId)->findOne($con)->getZipcode();
+
+            if (null !== LpsAreaCityQuery::create()->filterByZipcode($zipcode)->findOne($con))
+                $isValid = true;
         }
+
+        return $isValid;
     }
 
 
@@ -76,7 +76,16 @@ class LivraisonParSecteurs extends AbstractDeliveryModule
             );
         }
 
-        return LpsAreaQuery::create()->findOneByActive(1)->getPrice();
+        $price = 0;
+        $con = Propel::getConnection();
+        $currentAddressId = $this->getRequest()->getSession()->getOrder()->getChoosenDeliveryAddress();
+        if (!empty($currentAddressId)) {
+            $zipcode = AddressQuery::create()->filterById($currentAddressId)->findOne($con)->getZipcode();
+            $areaId = LpsAreaCityQuery::create()->findOneByZipcode($zipcode)->getIdArea();
+            $price = LpsAreaQuery::create()->findOneById($areaId)->getPrice();
+        }
+
+        return $price;
     }
 
     static public function getDayLabel($int)