Skip to content

fix: use dynamic admin URL generation instead of hardcoded path #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: use dynamic admin URL generation instead of hardcoded path #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
435c19f
fix: use dynamic admin URL generation instead of hardcoded path
Oct 15, 2025
9938926
chore: bump module version to 1.7.5
Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Block/Adminhtml/System/Config/InstalledVersion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class InstalledVersion extends Field
{
public const INSTALLED_VERSION = '1.7.4';
public const INSTALLED_VERSION = '1.7.5';

protected function _getElementHtml(AbstractElement $element): string
{
Expand Down
14 changes: 10 additions & 4 deletions Gateway/Config/ConfigProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ class ConfigProvider

public const VAULT_CODE = 'subscribe_pro_vault';

public const ADMIN_ORDER_AMOUNT_URL = '/admin/subscribepro/order/amount/';

/**
* @var \Swarming\SubscribePro\Model\Config\General
*/
Expand Down Expand Up @@ -48,6 +46,11 @@ class ConfigProvider
*/
protected $oauth;

/**
* @var \Magento\Backend\Model\UrlInterface
*/
protected $backendUrl;

/**
* @param \Swarming\SubscribePro\Model\Config\General $generalConfig
* @param Config $gatewayConfig
Expand All @@ -56,6 +59,7 @@ class ConfigProvider
* @param \Swarming\SubscribePro\Platform\Tool\Config $platformConfigTool
* @param \Swarming\SubscribePro\Platform\Tool\Oauth $oauth
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param \Magento\Backend\Model\UrlInterface $backendUrl
*/
public function __construct(
\Swarming\SubscribePro\Model\Config\General $generalConfig,
Expand All @@ -64,7 +68,8 @@ public function __construct(
\Magento\Payment\Model\CcConfigProvider $ccConfigProvider,
\Swarming\SubscribePro\Platform\Tool\Config $platformConfigTool,
\Swarming\SubscribePro\Platform\Tool\Oauth $oauth,
\Magento\Store\Model\StoreManagerInterface $storeManager
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Backend\Model\UrlInterface $backendUrl
) {
$this->generalConfig = $generalConfig;
$this->gatewayConfig = $gatewayConfig;
Expand All @@ -73,6 +78,7 @@ public function __construct(
$this->platformConfigTool = $platformConfigTool;
$this->storeManager = $storeManager;
$this->oauth = $oauth;
$this->backendUrl = $backendUrl;
}

/**
Expand All @@ -98,7 +104,7 @@ public function getConfig($storeId = null)
'isActive' => $this->gatewayConfig->isActive($storeId),
'isThreeDSActive' => $this->gatewayConfig->isThreeDSActive($storeId),
'isWalletAuthorizationActive' => $this->gatewayConfig->isWalletAuthorizationActive($storeId),
'adminOrderAmountUrl' => self::ADMIN_ORDER_AMOUNT_URL,
'adminOrderAmountUrl' => $this->backendUrl->getUrl('subscribepro/order/amount'),
'sessionAccessToken' => $this->oauth->getSessionAccessToken($storeId),
'browserSize' => $this->gatewayConfig->getBrowserSize($storeId),
'acceptHeader' => $this->gatewayConfig->getAcceptHeader($storeId),
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": [
"MIT"
],
"version": "1.7.4",
"version": "1.7.5",
"authors": [
{
"name": "SUBSCRIBE PRO INC",
Expand All @@ -25,7 +25,7 @@
"magento/module-ui": "^101.0.0|^101.1.0|^101.2.0",
"magento/framework": "^101.0.0|^102.0.0|^103.0.0",
"subscribepro/subscribepro-php": "~1.1.6"
},
},
"require-dev": {
"magento/zendframework1": "1.12.16",
"zendframework/zend-stdlib": "~2.4.6",
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="Swarming_SubscribePro" setup_version="1.7.4">
<module name="Swarming_SubscribePro" setup_version="1.7.5">
<sequence>
<module name="Magento_Customer"/>
<module name="Magento_Checkout"/>
Expand Down