Correction carriers (#147)

PrestaShopCorp · Feb 15, 2023 · 9caa6d0 · 9caa6d0
1 parent 57de45d
commit 9caa6d0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/DTO/Carrier.php b/src/DTO/Carrier.php
@@ -587,7 +587,8 @@ public function getDelay()
      */
     public function setDelay($delay)
     {
-        $this->delay = $delay;
+        // data come as an array with one element at index 1 !?!
+        $this->delay = $delay[1];
 
         return $this;
     }

diff --git a/src/Provider/CarrierDataProvider.php b/src/Provider/CarrierDataProvider.php
@@ -55,10 +55,11 @@ public function __construct(
     public function getFormattedData($offset, $limit, $langIso)
     {
         $language = new \Language();
-        $currency = new \Currency();
+        $currency = new \Currency((int) $this->configurationRepository->get('PS_CURRENCY_DEFAULT'));
 
+        $langId = $this->languageRepository->getLanguageIdByIsoCode($langIso);
         /** @var array $carriers */
-        $carriers = $this->carrierRepository->getAllCarrierProperties($offset, $limit, $language->id);
+        $carriers = $this->carrierRepository->getAllCarrierProperties($offset, $limit, $langId);
 
         /** @var string $configurationPsWeightUnit */
         $configurationPsWeightUnit = $this->configurationRepository->get('PS_WEIGHT_UNIT');
@@ -83,10 +84,13 @@ public function getFormattedDataIncremental($limit, $langIso, $objectIds)
         }
 
         $language = new \Language();
-        $currency = new \Currency();
+        $currency = new \Currency((int) $this->configurationRepository->get('PS_CURRENCY_DEFAULT'));
+
+        $langId = $this->languageRepository->getLanguageIdByIsoCode($langIso);
+
         $carrierIds = array_column($shippingIncremental, 'id_object');
         /** @var array $carriers */
-        $carriers = $this->carrierRepository->getCarrierProperties($carrierIds, $language->id);
+        $carriers = $this->carrierRepository->getCarrierProperties($carrierIds, $langId);
 
         /** @var string $configurationPsWeightUnit */
         $configurationPsWeightUnit = $this->configurationRepository->get('PS_WEIGHT_UNIT');

diff --git a/src/Provider/CurrencyDataProvider.php b/src/Provider/CurrencyDataProvider.php
@@ -42,8 +42,6 @@ public function getFormattedData($offset, $limit, $langIso)
         }
         $this->currencyDecorator->decorateCurrencies($currencies);
 
-        // echo "FullSync";
-        // var_dump($currencies);
         return array_map(function ($currency) {
             return [
                 'id' => $currency['id_currency'],
@@ -82,9 +80,6 @@ public function getFormattedDataIncremental($limit, $langIso, $objectIds)
         }
         $this->currencyDecorator->decorateCurrencies($currencies);
 
-        // echo "Incremental sync";
-        // var_dump($currencies);
-
         return array_map(function ($currency) {
             return [
                 'id' => $currency['id_currency'],

diff --git a/src/Repository/CarrierRepository.php b/src/Repository/CarrierRepository.php
@@ -151,6 +151,7 @@ public function getCarrierProperties($carrierIds, $langId)
         );
         $query->where('c.id_carrier IN (' . implode(',', array_map('intval', $carrierIds)) . ')');
         $query->where('cs.id_shop = ' . (int) $this->context->shop->id);
+        $query->groupBy('c.id_reference, c.id_carrier HAVING c.id_carrier=(select max(id_carrier) from ps_carrier c2 WHERE c2.id_reference=c.id_reference)');
 
         return $this->db->executeS($query);
     }
@@ -177,7 +178,7 @@ public function getAllCarrierProperties($offset, $limit, $langId)
             'eis.id_object = c.id_carrier AND eis.type = "' . Config::COLLECTION_CARRIERS . '" AND eis.id_shop = cs.id_shop AND eis.lang_iso = cl.id_lang'
         );
         $query->where('cs.id_shop = ' . (int) $this->context->shop->id);
-        $query->orderBy('c.id_carrier');
+        $query->where('deleted=0');
         $query->limit($limit, $offset);
 
         return $this->db->executeS($query);