Merge pull request #24 from wuunder/development

fix check parcelshop selection

Author: timoj

CHANGELOG.md

@@ -5,6 +5,11 @@ Please file changes under `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed` o
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ## Unreleased
 
+## [1.3.6](https://github.com/kabisa/wuunder-webshopplugin-shopware/releases/tag/1.3.6)
+
+### Fixed
+- Check for selected parcelshop on cart completion
+
 ## [1.3.5](https://github.com/kabisa/wuunder-webshopplugin-shopware/releases/tag/1.3.5) - 2020-03-10
 
 ### Added

Wuunder/Controllers/Backend/WuunderShipment.php

@@ -14,7 +14,7 @@
 class Shopware_Controllers_Backend_WuunderShipment extends Enlight_Controller_Action implements CSRFWhitelistAware
 {
 
-    private static $WUUNDER_PLUGIN_VERSION = array("product" => "Shopware extension", "version" => array("build" => "1.3.5", "plugin" => "1.0"));
+    private static $WUUNDER_PLUGIN_VERSION = array("product" => "Shopware extension", "version" => array("build" => "1.3.6", "plugin" => "1.0"));
 
     public function getWhitelistedCSRFActions()
     {

Wuunder/Subscriber/RouteSubscriber.php

@@ -61,7 +61,7 @@ public function onSaveShipping(\Enlight_Controller_ActionEventArgs $args)
                 $config = $controller
                     ->get('shopware.plugin.config_reader')
                     ->getByPluginName('Wuunder');
-                $ourDispatch = (int)$config['parcelshop_method']; //TODO Make Dynamic
+                $ourDispatch = (int)$config['parcelshop_method'];
 
                 $basket = Shopware()->Session()->connectGetBasket;
                 $basketId = $basket['content'][0]['id'];
@@ -96,7 +96,10 @@ public function onCheckoutFinish(\Enlight_Event_EventArgs $args)
             $action = $request->getActionName();
             if ($action === 'finish') {
                 $dispatch = Shopware()->Session()['sDispatch'];
-                $ourDispatch = 18; //TODO Make Dynamic
+                $config = $controller
+                    ->get('shopware.plugin.config_reader')
+                    ->getByPluginName('Wuunder');
+                $ourDispatch = (int)$config['parcelshop_method'];
 
                 if ($dispatch == $ourDispatch) {
                     $basket = Shopware()->Session()->connectGetBasket;

Wuunder/plugin.json

@@ -8,9 +8,10 @@
   "license": "proprietary",
   "link": "http:\/\/www.wearewuunder.com",
   "author": "Wuunder",
-  "currentVersion": "1.3.5",
+  "currentVersion": "1.3.6",
   "changelog": {
     "nl": {
+      "1.3.6": "Fixed check for selected parcelshop",
       "1.3.5": "Added support for order inserted via API",
       "1.3.4": "Exception catch order article details",
       "1.3.3": "Support for MultiSafePay 2.1.0",
@@ -32,6 +33,7 @@
       "1.0.0": "Wuunder module"
     },
     "en": {
+      "1.3.6": "Fixed check for selected parcelshop",
       "1.3.5": "Added support for order inserted via API",
       "1.3.4": "Exception catch order article details",
       "1.3.3": "Support for MultiSafePay 2.1.0",
@@ -53,6 +55,7 @@
       "1.0.0": "Wuunder module"
     },
     "de": {
+      "1.3.6": "Fixed check for selected parcelshop",
       "1.3.5": "Added support for order inserted via API",
       "1.3.4": "Exception catch order article details",
       "1.3.3": "Support for MultiSafePay 2.1.0",

Wuunder/plugin.xml

@@ -6,13 +6,18 @@
     <label lang="en">Wuunder shipping module</label>
     <label lang="nl">Wuunder verzendmodule</label>
 
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <copyright>(c) by Wuunder</copyright>
     <license>proprietary</license>
     <link>http://www.wearewuunder.com</link>
     <author>Wuunder</author>
     <compatibility minVersion="5.3.0"/>
 
+    <changelog version="1.3.6">
+        <changes lang="de">Fixed check for selected parcelshop</changes>
+        <changes lang="en">Fixed check for selected parcelshop</changes>
+    </changelog>
+
     <changelog version="1.3.5">
         <changes lang="de">Added support for order inserted via API</changes>
         <changes lang="en">Added support for order inserted via API</changes>