Merge pull request #232 from magmodules/release/1.19.1

Release/1.19.1

.github/workflows/linting.yml

@@ -2,27 +2,6 @@ name: Lint PHP files
 on: [push, pull_request]
 
 jobs:
-  php-71:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/actions-php-lint@7.1
-        with:
-          dir: './'
-
-  php-72:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/actions-php-lint@7.2
-        with:
-          dir: './'
-
-  php-73:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: StephaneBour/actions-php-lint@7.3
-        with:
-          dir: './'
-
   php-74:
     runs-on: ubuntu-latest
     steps:

.github/workflows/setup-upgrade.yml

@@ -6,12 +6,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - PHP_VERSION: php71-fpm
-            MAGENTO_VERSION: 2.3.3
-          - PHP_VERSION: php73-fpm
-            MAGENTO_VERSION: 2.3.7
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.3.7
           - PHP_VERSION: php81-fpm
             MAGENTO_VERSION: 2.4.4
           - PHP_VERSION: php82-fpm

Model/Order/Repository.php

@@ -169,6 +169,12 @@ public function createByDataArray(array $orderData, int $storeId): DataInterface
         if ($channableOrderId) {
             $channableOrder = $this->get((int)$channableOrderId);
             $channableOrder->setAttempts($channableOrder->getAttempts() + 1);
+
+            // Add some non-saved data back to orders array
+            $channableOrder['channable_channel_label'] = $orderData['channable_channel_label'];
+            $channableOrder['shipment_method'] = $orderData['shipment_method'];
+            $channableOrder['shipment_promise'] = $orderData['shipment_promise'];
+            $channableOrder['memo'] = $orderData['memo'];
         } else {
             $orderData['attempts'] = 1;
             $orderData['store_id'] = $storeId;

composer.json

@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-channable",
     "description": "Channable integration for Magento 2",
     "type": "magento2-module",
-    "version": "1.19.0",
+    "version": "1.19.1",
     "license": "BSD-2-Clause",
     "homepage": "https://github.com/magmodules/magento2-channable",
     "require": {

etc/config.xml

@@ -12,7 +12,7 @@
             <general>
                 <enable>0</enable>
                 <limit>250</limit>
-                <version>v1.19.0</version>
+                <version>v1.19.1</version>
             </general>
             <data>
                 <name_attribute>name</name_attribute>