From 9f247ac6a985b5dd209d7f15b099a8fb32d4bd03 Mon Sep 17 00:00:00 2001 From: Mario Lorenz Date: Tue, 30 Jan 2024 15:26:32 +0100 Subject: [PATCH] Take over from 6.4 branch --- CHANGELOG.md | 4 ++++ extend/Application/Controller/Admin/ModuleConfiguration.php | 1 + metadata.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f6183c..765ff79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.0.2] - 2024-??-?? + +- Fix onBording in OXID-Enterprise-Environment + ## [2.0.1] - 2024-01-16 ### Fixed diff --git a/extend/Application/Controller/Admin/ModuleConfiguration.php b/extend/Application/Controller/Admin/ModuleConfiguration.php index db9ff61..f338513 100644 --- a/extend/Application/Controller/Admin/ModuleConfiguration.php +++ b/extend/Application/Controller/Admin/ModuleConfiguration.php @@ -131,6 +131,7 @@ public function stripeGetConnectUrl($sVarName) $redirectUrl = Registry::getConfig()->getSslShopUrl().'admin/index.php?cl=stripeConnect&fnc=stripeFinishOnBoarding'; $redirectUrl.= '&stoken=' . Registry::getSession()->getSessionChallengeToken(); $redirectUrl.= '&shop_param=' . $sMode; + $redirectUrl.= '&shp=' . Registry::getConfig()->getShopId(); if ($sMode == 'test') { return 'https://dev-osm.oxid-esales.com/stripe-connect?shop_redirect_url=' . rawurlencode($redirectUrl); diff --git a/metadata.php b/metadata.php index b0b8cd8..434af28 100644 --- a/metadata.php +++ b/metadata.php @@ -24,7 +24,7 @@ 'en' => 'This module integrates STRIPE as payment provider in your OXID Shop.', ], 'thumbnail' => 'img/stripe_logo.png', - 'version' => '2.0.1', + 'version' => '2.0.2-rc.1', 'author' => 'OXID eSales AG', 'url' => 'https://www.oxid-esales.com', 'email' => 'info@oxid-esales.com',