Merge pull request #100 from Paazl/release/1.14.1

Release/1.14.1
Paazl · Mar 7, 2023 · 363205d · 363205d
2 parents 14fc1c3 + 601c0e1
commit 363205d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 15 deletions.
diff --git a/.github/workflows/setup-di-compile.yml b/.github/workflows/setup-di-compile.yml
@@ -1,4 +1,4 @@
-name: Run setup:upgrade and setup:di:compile
+name: Run setup:di:compile
 on: [pull_request]
 
 jobs:
@@ -16,16 +16,19 @@ jobs:
             MAGENTO_VERSION: 2.4.4
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
 
       - name: Start Docker
-        run: PHP_VERSION=${{ matrix.PHP_VERSION }} MAGENTO_VERSION=magento${{ matrix.MAGENTO_VERSION }} docker-compose -f .github/workflows/templates/docker-compose.yml up -d
+        run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
 
       - name: Create branch for Composer and remove version from composer.json
         run: git checkout -b continuous-integration-test-branch && sed -i '/version/d' ./composer.json
 
       - name: Upload the code into the docker container
-        run: docker cp $(pwd) magento-project-community-edition:/data/extensions/ && docker exec magento-project-community-edition composer require paazl/magento2-checkout-widget:dev-continuous-integration-test-branch
+        run: docker cp $(pwd) magento-project-community-edition:/data/extensions/
 
-      - name: Activate the extension and run setup:upgrade and setup:di:compile
-        run: docker exec magento-project-community-edition bash -c "php bin/magento module:enable Paazl_CheckoutWidget && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
+      - name: Install the extension in Magento
+        run: docker exec magento-project-community-edition composer require paazl/magento2-checkout-widget:@dev --no-plugins
+
+      - name: Run setup:di:compile
+        run: docker exec magento-project-community-edition ./retry "php bin/magento setup:di:compile"
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -16,7 +16,7 @@ jobs:
             MAGENTO_VERSION: 2.4.4
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
 
       - name: Start Docker
         run: docker run --detach --name magento-project-community-edition michielgerritsen/magento-project-community-edition:${{ matrix.PHP_VERSION }}-magento${{ matrix.MAGENTO_VERSION }}
@@ -25,10 +25,10 @@ jobs:
         run: git checkout -b continuous-integration-test-branch && sed -i '/version/d' ./composer.json
 
       - name: Upload the code into the docker container
-        run: docker cp $(pwd) magento-project-community-edition:/data/extensions/ && docker exec magento-project-community-edition composer require paazl/magento2-checkout-widget:dev-continuous-integration-test-branch
+        run: docker cp $(pwd) magento-project-community-edition:/data/extensions/ && docker exec magento-project-community-edition composer require paazl/magento2-checkout-widget:@dev --no-plugins
 
       - name: Activate the extension and run setup:upgrade
-        run: docker exec magento-project-community-edition bash -c "php bin/magento module:enable Paazl_CheckoutWidget && php bin/magento setup:upgrade"
+        run: docker exec magento-project-community-edition ./retry "php bin/magento module:enable Paazl_CheckoutWidget && php bin/magento setup:upgrade && php bin/magento setup:di:compile"
 
       - name: Run tests
         run: docker exec magento-project-community-edition bash -c "vendor/bin/phpunit extensions/*/Test/Unit"
diff --git a/Console/Command/OrderSendCommand.php b/Console/Command/OrderSendCommand.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\Area;
 use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -90,10 +91,11 @@ public function getInputList()
     }
 
     /**
-     * @param InputInterface  $input
+     * @param InputInterface $input
      * @param OutputInterface $output
      *
-     * @return int|void|null
+     * @return int
+     * @throws LocalizedException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -119,5 +121,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln("<error>Order ID {$item}: {$e->getMessage()}</error>");
             }
         }
+
+        return Cli::RETURN_SUCCESS;
     }
 }
diff --git a/Model/Api/Converter/Checkout/ToShippingInfo.php b/Model/Api/Converter/Checkout/ToShippingInfo.php
@@ -73,9 +73,18 @@ public function convert($response)
         $info->setIdenfifier($this->arrayManager->get('shippingOption/identifier', $result));
         $info->setPrice(floatval($this->arrayManager->get('shippingOption/rate', $result)));
         $info->setOptionTitle($this->arrayManager->get('shippingOption/name', $result));
-        $info->setPreferredDeliveryDate($this->arrayManager->get('preferredDeliveryDate', $result));
+
+        if (!$prefferedDeliveryDate = $this->arrayManager->get('preferredDeliveryDate', $result)) {
+            $prefferedDeliveryDate = $this->arrayManager->get('shippingOption/deliveryDates/0/deliveryDate', $result);
+        }
+        $info->setPreferredDeliveryDate($prefferedDeliveryDate);
+
         $info->setEstimatedDeliveryRange($this->arrayManager->get('shippingOption/estimatedDeliveryRange', $result));
-        $info->setCarrierPickupDate($this->arrayManager->get('pickupDate', $result));
+
+        if (!$pickupDate = $this->arrayManager->get('pickupDate', $result)) {
+            $pickupDate = $this->arrayManager->get('shippingOption/deliveryDates/0/pickupDate', $result);
+        }
+        $info->setCarrierPickupDate($pickupDate);
 
         if ($info->getType() === DeliveryType::PICKUP) {
             $info->setPickupDate($this->arrayManager->get('pickupDate', $result));

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "paazl/magento2-checkout-widget",
   "description": "Paazl checkoutWidget for Magento 2",
   "type": "magento2-module",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "keywords": [
     "Paazl",
     "Magento 2",

diff --git a/etc/config.xml b/etc/config.xml
@@ -8,7 +8,7 @@
     <default>
         <carriers>
             <paazlshipping>
-                <version>v1.14.0</version>
+                <version>v1.14.1</version>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
                 <price>0</price>