From a299e131ce04aed805956eadcbff721a43c8efed Mon Sep 17 00:00:00 2001
From: Simon Gabriel <simon_gabriel@gmx.de>
Date: Thu, 7 Jun 2018 15:58:37 +0200
Subject: [PATCH 1/3] [bugfix] (MAGE2-75) Set BasketApi sandboxmode depending
 on configured mode.

Signed-off-by: Simon Gabriel <simon_gabriel@gmx.de>
---
 Helper/BasketHelper.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Helper/BasketHelper.php b/Helper/BasketHelper.php
index e0c9484a985..909ac5326a4 100755
--- a/Helper/BasketHelper.php
+++ b/Helper/BasketHelper.php
@@ -154,6 +154,9 @@ public function submitQuoteToBasketApi(Quote $quote = null)
             $this->mainConfig->getSecuritySender()
         );
 
+        // set sandboxmode according to configured mode
+        $basketApiRequest->setIsSandboxMode($this->mainConfig->isSandboxModeActive());
+
         // add a new basket via api request by sending the addNewBasket request
         $basketApiResponse = $basketApiRequest->addNewBasket();
 

From 2a954722f889b3f4068ed13ec1182e271b5a47ec Mon Sep 17 00:00:00 2001
From: Simon Gabriel <simon_gabriel@gmx.de>
Date: Thu, 7 Jun 2018 17:19:01 +0200
Subject: [PATCH 2/3] [bugfix] (MAGE2-75) Set BasketApi sandboxmode depending
 on configuration.

Signed-off-by: Simon Gabriel <simon_gabriel@gmx.de>
---
 CHANGELOG.md   | 5 +++++
 etc/module.xml | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438d2984aba..f1cf898123b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017
 
+## 18.6.8
+
+### Fixed
+- An issue which resulted in basked requests always being performed in sandbox mode.
+
 ## 18.6.7
 
 ### Fixed
diff --git a/etc/module.xml b/etc/module.xml
index 17d2c5f8059..aeec89dd788 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="18.6.7" setup_version="18.6.7">
+    <module name="Heidelpay_Gateway" schema_version="18.6.8" setup_version="18.6.8">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />

From 2af7144af53c577b186120f1fde386eef35ace47 Mon Sep 17 00:00:00 2001
From: Simon Gabriel <simon_gabriel@gmx.de>
Date: Mon, 11 Jun 2018 13:12:52 +0200
Subject: [PATCH 3/3] [change] (MAGE2-75) Update version.

Signed-off-by: Simon Gabriel <simon_gabriel@gmx.de>
---
 CHANGELOG.md   | 2 +-
 etc/module.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1cf898123b..ae192d58e34 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017
 
-## 18.6.8
+## 18.6.11
 
 ### Fixed
 - An issue which resulted in basked requests always being performed in sandbox mode.
diff --git a/etc/module.xml b/etc/module.xml
index aeec89dd788..8d8f35086b0 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="18.6.8" setup_version="18.6.8">
+    <module name="Heidelpay_Gateway" schema_version="18.6.11" setup_version="18.6.11">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />