From aecc24d4dcaa4d169cc902eec7f476e0559a1bc7 Mon Sep 17 00:00:00 2001 From: L3RAZ Date: Fri, 12 Jul 2024 16:16:09 +0300 Subject: [PATCH] Added front office SDK version to env --- ps_checkout.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/ps_checkout.php b/ps_checkout.php index ad4ba42cc..aefffb4bd 100755 --- a/ps_checkout.php +++ b/ps_checkout.php @@ -1102,12 +1102,23 @@ public function hookActionFrontControllerSetMedia() /** @var \PrestaShop\Module\PrestashopCheckout\Environment\Env $env */ $env = $this->getService(\PrestaShop\Module\PrestashopCheckout\Environment\Env::class); - $foSDkUrl = $env->getEnv('CHECKOUT_FO_SDK_URL'); + $foSdkUrl = $env->getEnv('CHECKOUT_FO_SDK_URL'); + if (substr($foSdkUrl, -3) !== '.js') { + $foSdkVersion = $env->getEnv('CHECKOUT_FO_SDK_VERSION'); + if (empty($foSdkVersion)) { + /** @var \PrestaShop\Module\PrestashopCheckout\Version\Version $version */ + $version = $this->getService('ps_checkout.module.version'); + $majorModuleVersion = explode('.', $version->getSemVersion())[0]; + $foSdkVersion = "$majorModuleVersion.X.X"; + } + + $foSdkUrl = $foSdkUrl . $foSdkVersion . '/sdk/ps_checkout-fo-sdk.js'; + } if (method_exists($this->context->controller, 'registerJavascript')) { $this->context->controller->registerJavascript( $this->name . 'Front', - $foSDkUrl, + $foSdkUrl, [ 'position' => 'bottom', 'priority' => 201, @@ -1115,7 +1126,7 @@ public function hookActionFrontControllerSetMedia() ] ); } else { - $this->context->controller->addJS($foSDkUrl, false); + $this->context->controller->addJS($foSdkUrl, false); } }