Auto stash before merge of "master" and "origin/master"

Author: Frankie

Diff for: CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.2.1
+- Improved order management flow for 'PENDING' and 'CANCELLED' payments
+
 ## 2.2.0
 - Change flow for PENDING payments coming from Satispay API
 - 

Diff for: Controller/Redirect/Index.php

@@ -40,12 +40,13 @@ public function execute()
             $this->_redirect('checkout/onepage/success');
             return;
         }
-        if ($satispayPayment->status == 'PENDING') {
+        
+         if ($satispayPayment->status == 'PENDING') {
 
             $satispayCancel = \SatispayGBusiness\Payment::update($paymentId, [
                 'action' => 'CANCEL',
             ]);
-            
+
 
             if ($satispayCancel->status === 'CANCELED') {
                 $order->registerCancellation(__('Payment has been cancelled.'));

Diff for: composer.json

@@ -3,7 +3,7 @@
     "description": "Satispay Magento2 Plugin",
     "type": "magento2-module",
     "license": "MIT",
-    "version": "2.2.0",
+    "version": "2.2.1",
 
     "keywords": [
         "satispay",

Diff for: etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Satispay_Satispay" setup_version="2.2.0">
+  <module name="Satispay_Satispay" setup_version="2.2.1">
     <sequence>
       <module name="Magento_Sales"/>
       <module name="Magento_Payment"/>