Merge pull request #94 from gabriela-lubkowska/master

Fix build in admin and fix extensions overriding

Author: Glancu

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "bitbag/shopware-inpost-plugin",
     "description": "InPost integration for Shopware",
-    "version": "1.2.3",
+    "version": "1.2.4",
     "type": "shopware-platform-plugin",
     "license": "MIT",
     "authors": [

src/Resources/public/administration/css/bit-bag-shopware-in-post-plugin.css

@@ -14,7 +14,7 @@
     {% endif %}
 
     {% if (shipping.id is same as(context.shippingMethod.id)) and technicalName == constant('BitBag\\ShopwareInPostPlugin\\Factory\\ShippingMethodPayloadFactoryInterface::SHIPPING_KEY') %}
-        {% if page.extensions['BitBagShopwareInPostPlugin.inpost.inPostEnvironment'] == constant('BitBag\\ShopwareInPostPlugin\\Api\\WebClientInterface::PRODUCTION_ENVIRONMENT') %}
+        {% if page.extensions[constant('BitBag\\ShopwareInPostPlugin\\Config\\InPostConfigServiceInterface::SYSTEM_CONFIG_PREFIX')]['inPostEnvironment'] == constant('BitBag\\ShopwareInPostPlugin\\Api\\WebClientInterface::PRODUCTION_ENVIRONMENT') %}
             <link rel="stylesheet" href="https://geowidget.inpost.pl/inpost-geowidget.css"/>
             <script src="https://geowidget.inpost.pl/inpost-geowidget.js" defer></script>
         {% else %}
@@ -37,7 +37,7 @@
 
         <div class="data-inpost-plugin-map-container" data-inpost-plugin-map>
             <inpost-geowidget onpoint="afterPointSelected"
-                              token="{{ page.extensions['BitBagShopwareInPostPlugin.inpost.inPostWidgetToken'] }}"
+                              token="{{ page.extensions[constant('BitBag\\ShopwareInPostPlugin\\Config\\InPostConfigServiceInterface::SYSTEM_CONFIG_PREFIX')]['inPostWidgetToken'] }}"
                               language="pl"
                               config="parcelCollect"></inpost-geowidget>
         </div>

src/Resources/public/administration/js/bit-bag-shopware-in-post-plugin.js

@@ -105,9 +105,9 @@ public function checkoutConfirmPageLoaded(CheckoutConfirmPageLoadedEvent $event)
         $salesChannelId = $event->getSalesChannelContext()->getSalesChannelId();
         $configService = $this->inPostConfigService->getInPostApiConfig($salesChannelId);
 
-        $event->getPage()->setExtensions([
-            $systemConfigPrefix . '.inPostWidgetToken' => $configService->getWidgetToken(),
-            $systemConfigPrefix . '.inPostEnvironment' => $configService->getEnvironment(),
+        $event->getPage()->addArrayExtension($systemConfigPrefix, [
+            'inPostWidgetToken' => $configService->getWidgetToken(),
+            'inPostEnvironment' => $configService->getEnvironment(),
         ]);
     }