Merge pull request #26 from logeecom/master

Release v1.4.1

Author: IvanaLog

Packlink/Bootstrap/Bootstrap.php

@@ -35,6 +35,7 @@
 use Packlink\Services\BusinessLogic\ShopShippingMethodService as ConcreteShopShippingMethodService;
 use Packlink\BusinessLogic\SystemInformation\SystemInfoService as SystemInfoInterface;
 use Packlink\Services\BusinessLogic\SystemInfoService;
+use Packlink\Services\BusinessLogic\WarehouseCountryService;
 use Packlink\Services\Infrastructure\LoggerService;
 
 class Bootstrap extends BootstrapComponent
@@ -124,6 +125,13 @@ function () {
                 ]);
             }
         );
+
+        ServiceRegister::registerService(
+            \Packlink\BusinessLogic\Country\WarehouseCountryService::CLASS_NAME,
+            function () {
+                return WarehouseCountryService::getInstance();
+            }
+        );
     }
 
     /**

Packlink/Controllers/Backend/PacklinkConfiguration.php

@@ -227,7 +227,9 @@ protected function getUrls()
                     'deactivateShopShippingMethods'
                 ),
                 'getCurrencyDetailsUrl' => Url::getBackendUrl('PacklinkSystemInfoController', 'get'),
-                'systemId' => (string)Shop::getDefaultShop()->getId()
+                'systemId' => (string)Shop::getDefaultShop()->getId(),
+                'enqueue' => Url::getBackendUrl('PacklinkManualRefreshController', 'refresh'),
+                'getTaskStatus' => Url::getBackendUrl('PacklinkManualRefreshController', 'getTaskStatus')
             ],
             'edit-service' => [
                 'getServiceUrl' => $shopUrl . Url::getBackendUrl('PacklinkShippingMethod', 'getShippingMethod'),

Packlink/Controllers/Backend/PacklinkManualRefreshController.php

@@ -0,0 +1,26 @@
+<?php
+
+use Packlink\BusinessLogic\Controllers\ManualRefreshController;
+
+class Shopware_Controllers_Backend_PacklinkManualRefreshController extends Enlight_Controller_Action
+{
+    public function getWhitelistedCSRFActions()
+    {
+        return ['refresh', 'getTaskStatus'];
+    }
+
+
+    public function refreshAction()
+    {
+        $controller = new ManualRefreshController();
+
+        $this->View()->assign(['response' => $controller->enqueueUpdateTask()]);
+    }
+
+    public function getTaskStatusAction()
+    {
+        $controller = new ManualRefreshController();
+
+        $this->View()->assign(['response' => $controller->getTaskStatus()]);
+    }
+}

Packlink/Resources/views/backend/packlink_manual_refresh_controller/get_task_status.tpl

@@ -0,0 +1,5 @@
+{block name="get_task_status"}
+    {if isset($response)}
+        {$response|@json_encode}
+    {/if}
+{/block}

Packlink/Resources/views/backend/packlink_manual_refresh_controller/refresh.tpl

@@ -0,0 +1,5 @@
+{block name="refresh"}
+    {if isset($response)}
+        {$response|@json_encode}
+    {/if}
+{/block}

Packlink/Services/BusinessLogic/WarehouseCountryService.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Packlink\Services\BusinessLogic;
+
+use Doctrine\DBAL\Connection;
+use Packlink\BusinessLogic\Country\WarehouseCountryService as CoreService;
+
+/**
+ * Class WarehouseCountryService
+ *
+ * @package Packlink\Services\BusinessLogic
+ */
+class WarehouseCountryService extends CoreService
+{
+    /**
+     * @param $associative
+     *
+     * @return \Packlink\BusinessLogic\Country\Country[]
+     *
+     * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoNotRegisteredException
+     * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoValidationException
+     */
+    public function getSupportedCountries($associative = true)
+    {
+        $countries = $this->getBrandConfigurationService()->get()->warehouseCountries;
+        /** @var Connection $connection */
+        $connection = Shopware()->Container()->get('dbal_connection');
+        $sql = "SELECT id, countryiso FROM s_core_countries WHERE active = 1";
+        $activeCountries = $connection->fetchAllAssociative($sql);
+        $intersectedCountries = [];
+
+        foreach ($activeCountries as $country) {
+            if (array_key_exists($country['countryiso'], $countries)) {
+                $intersectedCountries[] = $countries[$country['countryiso']];
+            }
+        }
+
+        $result = $this->formatCountries($intersectedCountries);
+
+        return $associative ? $result : array_values($result);
+    }
+}

Packlink/Subscribers/ControllerPath.php

@@ -53,6 +53,7 @@ public static function getSubscribedEvents()
             'Enlight_Controller_Dispatcher_ControllerPath_Frontend_PacklinkLocations' => 'onGetControllerPromotion',
             'Enlight_Controller_Dispatcher_ControllerPath_Frontend_PacklinkDropoff' => 'onGetControllerPromotion',
             'Enlight_Controller_Dispatcher_ControllerPath_Backend_PacklinkSystemInfoController' => 'onGetControllerPromotion',
+            'Enlight_Controller_Dispatcher_ControllerPath_Backend_PacklinkManualRefreshController' => 'onGetControllerPromotion',
         ];
     }
 

Packlink/composer.json

@@ -2,7 +2,7 @@
   "name": "packlink/shopware",
   "description": "Packlink Shipping Shopware plugin",
   "type": "library",
-  "version": "1.3.7",
+  "version": "1.4.1",
   "repositories": [
     {
       "type": "vcs",
@@ -13,7 +13,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": ">=5.6",
-    "packlink/integration-core": "3.3.18",
+    "packlink/integration-core": "3.5.1",
     "ext-json": "*",
     "ext-curl": "*",
     "ext-zip": "*",