Skip to content

Commit

Permalink
Merge pull request #27 from wuunder/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
TimD90 authored Sep 2, 2020
2 parents 4218569 + 27c0166 commit 1f1b2da
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Please file changes under `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed` o
The format is based on [Keep a Changelog](http://keepachangelog.com/).
## Unreleased

## [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
Expand Down
2 changes: 1 addition & 1 deletion Wuunder/Controllers/Frontend/WuunderParcelshop.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function getParcelshopAddress($id, $apiKey)
if (!$id) {
echo 'empty id???';
} else {
$connector = new \Wuunder\Connector($apiKey);
$connector = new \Wuunder\Connector($apiKey, intval($config['testmode']) === 1);
$connector->setLanguage("NL");
$parcelshopRequest = $connector->getParcelshopById();
$parcelshopConfig = new \Wuunder\Api\Config\ParcelshopConfig();
Expand Down
6 changes: 6 additions & 0 deletions Wuunder/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"license": "proprietary",
"link": "http:\/\/www.wearewuunder.com",
"author": "Wuunder",
"currentVersion": "1.3.9",
"changelog": {
"nl": {
"1.3.9": "Fixed to select correct backend environment when fetching parcelshop info after selection",
"currentVersion": "1.3.8",
"changelog": {
"nl": {
Expand Down Expand Up @@ -35,6 +39,7 @@
"1.0.0": "Wuunder module"
},
"en": {
"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",
"1.3.6": "Fixed check for selected parcelshop",
Expand All @@ -59,6 +64,7 @@
"1.0.0": "Wuunder module"
},
"de": {
"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",
"1.3.6": "Fixed check for selected parcelshop",
Expand Down
7 changes: 6 additions & 1 deletion Wuunder/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@
<label lang="en">Wuunder shipping module</label>
<label lang="nl">Wuunder verzendmodule</label>

<version>1.3.8</version>
<version>1.3.9</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.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>
Expand Down

0 comments on commit 1f1b2da

Please sign in to comment.