Merge pull request #28 from wuunder/development

Development
wuunder · Jan 5, 2021 · b85a405 · b85a405
2 parents 1f1b2da + f36238b
commit b85a405
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,17 @@ Please file changes under `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed` o
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 ## Unreleased
 
+## [1.3.10](https://github.com/kabisa/wuunder-webshopplugin-shopware/releases/tag/1.3.10)
+
+### Fixed
+- Fixed dependency issue for requests and security
+
 ## [1.3.9](https://github.com/kabisa/wuunder-webshopplugin-shopware/releases/tag/1.3.9)
 
 ### Fixed
 - Fixed to select correct backend environment when fetching parcelshop info after selection
+
+
 ## [1.3.8](https://github.com/kabisa/wuunder-webshopplugin-shopware/releases/tag/1.3.8)
 
 ### Fixed

diff --git a/Wuunder/Controllers/Backend/WuunderShipment.php b/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.8", "plugin" => "1.0"));
+    private static $WUUNDER_PLUGIN_VERSION = array("product" => "Shopware extension", "version" => array("build" => "1.3.10", "plugin" => "1.0"));
 
     public function getWhitelistedCSRFActions()
     {
@@ -43,7 +43,7 @@ public function redirectAction()
 
         $headers = [
             'Authorization' => 'Bearer ' . $api_key,
-            'Content-Type' => 'application/json',
+            // 'Content-Type' => 'application/json', // Outcommented because Httpful request Lib adds the content-type on it's own without overwriting previous set headers
         ];
 
         $order_id = $this->Request()->getPost('order_id');

diff --git a/Wuunder/plugin.json b/Wuunder/plugin.json
@@ -8,13 +8,13 @@
   "license": "proprietary",
   "link": "http:\/\/www.wearewuunder.com",
   "author": "Wuunder",
-  "currentVersion": "1.3.9",
+  "currentVersion": "1.3.10",
   "changelog": {
     "nl": {
       "1.3.9": "Fixed to select correct backend environment when fetching parcelshop info after selection",
-  "currentVersion": "1.3.8",
   "changelog": {
     "nl": {
+      "1.3.10": "Fixed dependency issue for requests and security",
       "1.3.8": "Added support for updating shipped status on ordered articles",
       "1.3.7": "Fixed parcelshop id bug",
       "1.3.6": "Fixed check for selected parcelshop",
@@ -39,6 +39,7 @@
       "1.0.0": "Wuunder module"
     },
     "en": {
+      "1.3.10": "Fixed dependency issue for requests and security",
       "1.3.9": "Fixed to select correct backend environment when fetching parcelshop info after selection",
       "1.3.8": "Added support for updating shipped status on ordered articles",
       "1.3.7": "Fixed parcelshop id bug",
@@ -64,6 +65,7 @@
       "1.0.0": "Wuunder module"
     },
     "de": {
+      "1.3.10": "Fixed dependency issue for requests and security",
       "1.3.9": "Fixed to select correct backend environment when fetching parcelshop info after selection",
       "1.3.8": "Added support for updating shipped status on ordered articles",
       "1.3.7": "Fixed parcelshop id bug",

diff --git a/Wuunder/plugin.xml b/Wuunder/plugin.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.4/engine/Shopware/Components/Plugin/schema/plugin.xsd">
+        xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/shopware/shopware/5.6/engine/Shopware/Components/Plugin/schema/plugin.xsd">
 
     <label lang="de">Wuunder versand module</label>
     <label lang="en">Wuunder shipping module</label>
     <label lang="nl">Wuunder verzendmodule</label>
 
-    <version>1.3.9</version>
+    <version>1.3.10</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.10">
+        <changes lang="de">Fixed dependency issue for requests and security</changes>
+        <changes lang="en">Fixed dependency issue for requests and security</changes>
+    </changelog>
+
     <changelog version="1.3.9">
         <changes lang="de">Fixed to select correct backend environment when fetching parcelshop info after selection</changes>
         <changes lang="en">Fixed to select correct backend environment when fetching parcelshop info after selection</changes>
     </changelog>
- 
+
     <changelog version="1.3.8">
         <changes lang="de">Added support for updating shipped status on ordered articles</changes>
         <changes lang="en">Added support for updating shipped status on ordered articles</changes>
@@ -127,4 +132,8 @@
         <changes lang="de">Added plugin.json</changes>
         <changes lang="en">Added plugin.json</changes>
     </changelog>
-</plugin>
+
+    <description lang="de">Wuunder offers a free shipping module for sending &amp; receiving your parcel, pallet and document the most easy way. </description>
+    <description lang="en">Wuunder offers a free shipping module for sending &amp; receiving your parcel, pallet and document the most easy way. </description>
+    <description lang="nl">Wuunder maakt het versturen en ontvangen van je pakket, pallet en document gemakkelijker, voordeliger en persoonlijker.</description>
+</plugin>