release 4.12.8 (#28)

* Get correct country code setting

* Bump OpenCart version

* Update version

* Remove temporary order id in test mode

README.md

@@ -17,7 +17,7 @@
 
 ## OpenCart - Svea Checkout and Svea payment modules
 
-* Supports OpenCart 3.0.0.0 - 3.0.3.8 (older versions can be found in the branches)
+* Supports OpenCart 3.0.0.0 - 3.0.3.9 (older versions can be found in the branches)
 * Requires PHP 7.3 or higher
 
 Features:

docs/info.json

@@ -1,3 +1,3 @@
 {
-	"module_version": "4.12.7"
+	"module_version": "4.12.8"
 }

src/catalog/controller/extension/svea/payment.php

@@ -89,10 +89,6 @@ public function index()
 
         $order_id = $this->addOrder($order_id, $email);
 
-        if ($this->config->get($this->moduleString . 'sco_test_mode')) {
-            $order_id = hash('crc32', HTTPS_SERVER) . $order_id;
-        }
-
         if ($this->config->get($this->moduleString . 'sco_currency')) {
             $currency = strtoupper($this->session->data[$this->moduleString . 'sco_currency']);
         } else {

src/catalog/controller/extension/svea/shipping.php

@@ -27,9 +27,13 @@ public function index()
 
         $address = array(
             'postcode'   => $postcode,
-            'country_id' => isset($this->session->data[$this->moduleString . 'sco_country_id']) ? strtoupper($this->session->data[$this->moduleString . 'sco_country_id']) : $this->config->get('config_country_id'),
+            'country_id' => isset($this->session->data['svea_checkout']['country_id'])
+                ? strtoupper($this->session->data['svea_checkout']['country_id'])
+                : $this->config->get('config_country_id'),
             'zone_id'    => $this->config->get('config_zone_id'),
-            'iso_code_2' => isset($this->session->data[$this->moduleString . 'sco_country']) ? $this->session->data[$this->moduleString . 'sco_country'] : strtoupper($this->language->get('code')),
+            'iso_code_2' => isset($this->session->data['svea_checkout']['country_code'])
+                ? $this->session->data['svea_checkout']['country_code']
+                : strtoupper($this->language->get('code')),
         );
 
         $json = array();
@@ -44,7 +48,7 @@ public function index()
         }
 
         foreach ($results as $result) {
-            if ($this->config->get($this->shippingString .$result['code'] . '_status')) {
+            if ($this->config->get($this->shippingString . $result['code'] . '_status')) {
                 $this->load->model('extension/shipping/' . $result['code']);
                 $quote = $this->{'model_extension_shipping_' . $result['code']}->getQuote($address);
 

src/svea/version.json

@@ -1,3 +1,3 @@
 {
-	"version": "4.12.7"
+	"version": "4.12.8"
 }