Merge pull request #23 from magmodules/release/1.4.1

Release/1.4.1
magmodules · Jan 13, 2021 · 88fa4a0 · 88fa4a0
2 parents d3f8508 + ca9d827
commit 88fa4a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ php:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 
 sudo: false
 

diff --git a/app/code/community/Magmodules/Channableapi/Model/Order.php b/app/code/community/Magmodules/Channableapi/Model/Order.php
@@ -42,6 +42,7 @@ public function importOrder($order, $storeId)
 
         /** @var Mage_Sales_Model_Quote $quote */
         $quote = Mage::getModel('sales/quote')->setStoreId($config['store_id']);
+        $quote->setBaseCurrencyCode($config['currency_code']);
 
         if ($config['import_customers']) {
             $customer = $this->importCustomer($order, $config);
@@ -231,6 +232,7 @@ public function getConfig($storeId)
         $config['channel_orderid'] = Mage::getStoreConfig('channable_api/order/channel_orderid', $storeId);
         $config['lvb_stock'] = Mage::getStoreConfig('channable_api/advanced/lvb_stock', $storeId);
         $config['lvb_ship'] = Mage::getStoreConfig('channable_api/advanced/lvb_stock', $storeId);
+        $config['currency_code'] = Mage::getStoreConfig('currency/options/default', $storeId);
         return $config;
     }
 

diff --git a/app/code/community/Magmodules/Channableapi/etc/config.xml b/app/code/community/Magmodules/Channableapi/etc/config.xml
@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Magmodules_Channableapi>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </Magmodules_Channableapi>
     </modules>
     <global>

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "magmodules/magento1-channable-api",
   "type": "magento-module",
   "description": "Magento 1 Channable integration",
-  "version": "v1.4.0",
+  "version": "v1.4.1",
   "keywords": [
     "magento"
   ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ php: @@
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     sudo: false
@@ Expand Down @@