From 5605275032bc35e23c0024ac2c25209d322d2942 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Wed, 24 Feb 2021 16:43:22 +0100
Subject: [PATCH 01/37] Define brand configuration service and implement it for
 Packlink

PLCR24-7
---
 composer.json                                 |   6 +-
 .../Packlink/PacklinkConfigurationService.php | 149 ++++++++++++++++++
 .../Brand/BrandConfigurationService.php       |  26 +++
 .../Brand/DTO/BrandConfiguration.php          |  99 ++++++++++++
 .../Brands/Packlink/BaseTestWithServices.php  |  23 +++
 .../PacklinkConfigurationServiceTest.php      |  26 +++
 6 files changed, 327 insertions(+), 2 deletions(-)
 create mode 100644 src/Brands/Packlink/PacklinkConfigurationService.php
 create mode 100644 src/BusinessLogic/Brand/BrandConfigurationService.php
 create mode 100644 src/BusinessLogic/Brand/DTO/BrandConfiguration.php
 create mode 100644 tests/Brands/Packlink/BaseTestWithServices.php
 create mode 100644 tests/Brands/Packlink/PacklinkConfigurationServiceTest.php

diff --git a/composer.json b/composer.json
index 6142cf94..b7c42ab4 100755
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,15 @@
     "autoload": {
         "psr-4": {
             "Logeecom\\Infrastructure\\": "src/Infrastructure",
-            "Packlink\\BusinessLogic\\": "src/BusinessLogic"
+            "Packlink\\BusinessLogic\\": "src/BusinessLogic",
+            "Packlink\\Brands\\": "src/Brands"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "Logeecom\\Tests\\Infrastructure\\": "tests/Infrastructure",
-            "Logeecom\\Tests\\BusinessLogic\\": "tests/BusinessLogic"
+            "Logeecom\\Tests\\BusinessLogic\\": "tests/BusinessLogic",
+            "Logeecom\\Tests\\Brands\\": "tests/Brands"
         }
     },
     "require-dev": {
diff --git a/src/Brands/Packlink/PacklinkConfigurationService.php b/src/Brands/Packlink/PacklinkConfigurationService.php
new file mode 100644
index 00000000..4b6f390a
--- /dev/null
+++ b/src/Brands/Packlink/PacklinkConfigurationService.php
@@ -0,0 +1,149 @@
+<?php
+
+
+namespace Packlink\Brands\Packlink;
+
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+use Packlink\BusinessLogic\Brand\DTO\BrandConfiguration;
+
+/**
+ * Class PacklinkConfigurationService
+ *
+ * @package Packlink\Brands\Packlink
+ */
+class PacklinkConfigurationService implements BrandConfigurationService
+{
+    /**
+     * Allowed values for platform countries.
+     *
+     * @var string[]
+     */
+    protected static $supportedPlatformCountries = array(
+        'ES',
+        'DE',
+        'FR',
+        'IT',
+        'UN',
+    );
+    /**
+     * List of supported registration countries.
+     *
+     * @var array
+     */
+    protected static $supportedRegistrationCountries = array(
+        'ES' => array(
+            'code' => 'ES',
+            'postal_code' => '28001',
+        ),
+        'DE' => array(
+            'code' => 'DE',
+            'postal_code' => '10115',
+        ),
+        'FR' => array(
+            'code' => 'FR',
+            'postal_code' => '75001',
+        ),
+        'IT' => array(
+            'code' => 'IT',
+            'postal_code' => '00118',
+        ),
+        'AT' => array(
+            'code' => 'AT',
+            'postal_code' => '1010',
+        ),
+        'NL' => array(
+            'code' => 'NL',
+            'postal_code' => '1011',
+        ),
+        'BE' => array(
+            'code' => 'BE',
+            'postal_code' => '1000',
+        ),
+        'PT' => array(
+            'code' => 'PT',
+            'postal_code' => '1000-017',
+        ),
+        'TR' => array(
+            'code' => 'TR',
+            'postal_code' => '06010',
+        ),
+        'IE' => array(
+            'code' => 'IE',
+            'postal_code' => 'D1',
+        ),
+        'GB' => array(
+            'code' => 'GB',
+            'postal_code' => 'E1 6AN',
+        ),
+        'HU' => array(
+            'code' => 'HU',
+            'postal_code' => '1014',
+        ),
+    );
+    /**
+     * List of countries available only for warehouse selection.
+     *
+     * @var array
+     */
+    protected static $additionalWarehouseCountries = array(
+        'PL' => array(
+            'code' => 'PL',
+            'postal_code' => '00-694',
+        ),
+        'CH' => array(
+            'code' => 'CH',
+            'postal_code' => '3000',
+        ),
+        'LU' => array(
+            'code' => 'LU',
+            'postal_code' => '1009',
+        ),
+        'AR' => array(
+            'code' => 'AR',
+            'postal_code' => 'C1258 AAA',
+        ),
+        'US' => array(
+            'code' => 'US',
+            'postal_code' => '01223',
+        ),
+        'BO' => array(
+            'code' => 'BO',
+            'postal_code' => 'La Paz',
+        ),
+        'MX' => array(
+            'code' => 'MX',
+            'postal_code' => '21900',
+        ),
+        'CL' => array(
+            'code' => 'CL',
+            'postal_code' => '7500599',
+        ),
+        'CZ' => array(
+            'code' => 'CZ',
+            'postal_code' => '186 00',
+        ),
+        'SE' => array(
+            'code' => 'SE',
+            'postal_code' => '103 16',
+        ),
+    );
+
+    /**
+     * @inheritDoc
+     */
+    public function get()
+    {
+        $brandConfiguration = new BrandConfiguration();
+
+        $brandConfiguration->platformCode = 'PRO';
+        $brandConfiguration->shippingServiceSource = 'PRO';
+        $brandConfiguration->platformCountries = static::$supportedPlatformCountries;
+        $brandConfiguration->registrationCountries = static::$supportedRegistrationCountries;
+        $brandConfiguration->warehouseCountries = array_merge(
+            static::$supportedRegistrationCountries,
+            static::$additionalWarehouseCountries
+        );
+
+        return $brandConfiguration;
+    }
+}
diff --git a/src/BusinessLogic/Brand/BrandConfigurationService.php b/src/BusinessLogic/Brand/BrandConfigurationService.php
new file mode 100644
index 00000000..a5f4b049
--- /dev/null
+++ b/src/BusinessLogic/Brand/BrandConfigurationService.php
@@ -0,0 +1,26 @@
+<?php
+
+
+namespace Packlink\BusinessLogic\Brand;
+
+use Packlink\BusinessLogic\Brand\DTO\BrandConfiguration;
+
+/**
+ * Interface BrandConfigurationService
+ *
+ * @package Packlink\BusinessLogic\Brand
+ */
+interface BrandConfigurationService
+{
+    /**
+     * Fully qualified name of this class.
+     */
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     * Retrieves BrandConfiguration.
+     *
+     * @return BrandConfiguration
+     */
+    public function get();
+}
diff --git a/src/BusinessLogic/Brand/DTO/BrandConfiguration.php b/src/BusinessLogic/Brand/DTO/BrandConfiguration.php
new file mode 100644
index 00000000..4098f862
--- /dev/null
+++ b/src/BusinessLogic/Brand/DTO/BrandConfiguration.php
@@ -0,0 +1,99 @@
+<?php
+
+
+namespace Packlink\BusinessLogic\Brand\DTO;
+
+use Logeecom\Infrastructure\Data\DataTransferObject;
+
+/**
+ * Class BrandConfiguration
+ *
+ * @package Packlink\BusinessLogic\Brand\DTO
+ */
+class BrandConfiguration extends DataTransferObject
+{
+    /**
+     * Fully qualified name of this class.
+     */
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     * Platform code.
+     *
+     * @var string
+     */
+    public $platformCode;
+    /**
+     * Shipping service source.
+     *
+     * @var string
+     */
+    public $shippingServiceSource;
+    /**
+     * Platform countries.
+     *
+     * @var array
+     */
+    public $platformCountries;
+    /**
+     * Registration countries.
+     *
+     * @var array
+     */
+    public $registrationCountries;
+    /**
+     * List of available warehouse countries.
+     *
+     * @var array
+     */
+    public $warehouseCountries;
+
+    /**
+     * @inheritDoc
+     */
+    public function toArray()
+    {
+        return array(
+            'platform_code' => $this->platformCode,
+            'shipping_service_source' => $this->shippingServiceSource,
+            'platform_countries' => $this->platformCountries,
+            'registration_countries' => $this->registrationCountries,
+            'warehouse_countries' => $this->warehouseCountries,
+        );
+    }
+
+    /**
+     * Creates BrandConfiguration object from array.
+     *
+     * @param array $data
+     *
+     * @return BrandConfiguration
+     */
+    public static function fromArray(array $data)
+    {
+        $result = new static();
+
+        $result->platformCode = $data['platform_code'];
+        $result->shippingServiceSource = $data['shipping_service_source'];
+
+        if (isset($data['platform_countries']) && is_array($data['platform_countries'])) {
+            $result->platformCountries = $data['platform_countries'];
+        } else {
+            $result->platformCountries = array();
+        }
+
+        if (isset($data['registration_countries']) && is_array($data['registration_countries'])) {
+            $result->registrationCountries = $data['registration_countries'];
+        } else {
+            $result->registrationCountries = array();
+        }
+
+        if (isset($data['warehouse_countries']) && is_array($data['warehouse_countries'])) {
+            $result->warehouseCountries = $data['warehouse_countries'];
+        } else {
+            $result->warehouseCountries = array();
+        }
+
+        return $result;
+    }
+}
diff --git a/tests/Brands/Packlink/BaseTestWithServices.php b/tests/Brands/Packlink/BaseTestWithServices.php
new file mode 100644
index 00000000..2baff49b
--- /dev/null
+++ b/tests/Brands/Packlink/BaseTestWithServices.php
@@ -0,0 +1,23 @@
+<?php
+
+
+namespace Logeecom\Tests\Brands\Packlink;
+
+
+use Logeecom\Tests\Infrastructure\Common\TestServiceRegister;
+use Packlink\Brands\Packlink\PacklinkConfigurationService;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+
+class BaseTestWithServices extends \Logeecom\Tests\BusinessLogic\Common\BaseTestWithServices
+{
+    protected function setUp()
+    {
+        parent::setUp();
+
+        TestServiceRegister::registerService(
+            BrandConfigurationService::CLASS_NAME,
+            function () {
+                return new PacklinkConfigurationService();
+            });
+    }
+}
\ No newline at end of file
diff --git a/tests/Brands/Packlink/PacklinkConfigurationServiceTest.php b/tests/Brands/Packlink/PacklinkConfigurationServiceTest.php
new file mode 100644
index 00000000..eb093909
--- /dev/null
+++ b/tests/Brands/Packlink/PacklinkConfigurationServiceTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Logeecom\Tests\Brands\Packlink;
+
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+
+/**
+ * Class PacklinkConfigurationServiceTest
+ *
+ * @package Logeecom\Tests\Brands\Packlink
+ */
+class PacklinkConfigurationServiceTest extends BaseTestWithServices
+{
+    public function testGet()
+    {
+        $service = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+
+        $brandConfiguration = $service->get();
+        $this->assertEquals('PRO', $brandConfiguration->platformCode);
+        $this->assertEquals('PRO', $brandConfiguration->shippingServiceSource);
+        $this->assertCount(5, $brandConfiguration->platformCountries);
+        $this->assertEquals('ES', $brandConfiguration->registrationCountries['ES']['code']);
+        $this->assertEquals('28001', $brandConfiguration->warehouseCountries['ES']['postal_code']);
+    }
+}
\ No newline at end of file

From 586662fe39eba1f0b3c1030f62ff6ad23587c1c3 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 26 Feb 2021 09:41:14 +0100
Subject: [PATCH 02/37] Refactor ShippingServiceSearch to eliminate a hardcoded
 source

PLCR24-8
---
 src/BusinessLogic/Http/DTO/ShippingServiceSearch.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php b/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
index af9fc645..a3fd16f4 100644
--- a/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
+++ b/src/BusinessLogic/Http/DTO/ShippingServiceSearch.php
@@ -3,6 +3,8 @@
 namespace Packlink\BusinessLogic\Http\DTO;
 
 use Logeecom\Infrastructure\Data\DataTransferObject;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 
 /**
  * This class holds search parameters that are used when searching for services
@@ -82,12 +84,16 @@ public function __construct(
      */
     public function toArray()
     {
+        /** @var BrandConfigurationService $brandConfigurationService */
+        $brandConfigurationService = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        $brand = $brandConfigurationService->get();
+
         $data = array(
             'from[country]' => $this->fromCountry,
             'from[zip]' => $this->fromZip,
             'to[country]' => $this->toCountry,
             'to[zip]' => $this->toZip,
-            'source' => 'PRO',
+            'source' => $brand->shippingServiceSource,
         );
 
         if ($this->serviceId) {

From 398045931b61a5e623e4fb235bd4d0c0475ee363 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 26 Feb 2021 11:12:32 +0100
Subject: [PATCH 03/37] Refactor code to eliminate hardcoded platform code

PLCR24-9
---
 src/BusinessLogic/Http/DTO/Draft.php          | 15 ++++++++++++++-
 src/BusinessLogic/Http/Proxy.php              | 19 +++++++++++++++++--
 .../Registration/RegistrationRequest.php      | 19 ++++++++++++++++---
 .../Common/BaseTestWithServices.php           |  9 +++++++++
 .../RegistrationRequestDtoTest.php            | 13 +++++++++++--
 .../Registration/RegistrationServiceTest.php  |  7 ++++++-
 6 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/src/BusinessLogic/Http/DTO/Draft.php b/src/BusinessLogic/Http/DTO/Draft.php
index c2593af7..30988f96 100644
--- a/src/BusinessLogic/Http/DTO/Draft.php
+++ b/src/BusinessLogic/Http/DTO/Draft.php
@@ -3,6 +3,8 @@
 namespace Packlink\BusinessLogic\Http\DTO;
 
 use Logeecom\Infrastructure\Data\DataTransferObject;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Http\DTO\Draft\AdditionalData;
 use Packlink\BusinessLogic\Http\DTO\Draft\Address;
 use Packlink\BusinessLogic\Http\DTO\Draft\DraftPrice;
@@ -31,7 +33,7 @@ class Draft extends DataTransferObject
      *
      * @var string
      */
-    public $platform = 'PRO';
+    public $platform;
     /**
      * Unique platform country identifier.
      *
@@ -148,6 +150,17 @@ class Draft extends DataTransferObject
      */
     public $price;
 
+    /**
+     * Draft constructor.
+     */
+    public function __construct()
+    {
+        /** @var BrandConfigurationService $service */
+        $service = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+
+        $this->platform = $service->get()->platformCode;
+    }
+
     /**
      * Transforms DTO to its array format suitable for http client.
      *
diff --git a/src/BusinessLogic/Http/Proxy.php b/src/BusinessLogic/Http/Proxy.php
index c59904a5..77188b6c 100644
--- a/src/BusinessLogic/Http/Proxy.php
+++ b/src/BusinessLogic/Http/Proxy.php
@@ -8,6 +8,8 @@
 use Logeecom\Infrastructure\Http\HttpClient;
 use Logeecom\Infrastructure\Http\HttpResponse;
 use Logeecom\Infrastructure\Logger\Logger;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\Http\DTO\Analytics;
@@ -199,9 +201,11 @@ public function getLocations($serviceId, $countryCode, $postalCode)
      */
     public function searchLocations($platformCountry, $postalZone, $query)
     {
+        $brand = $this->getBrandConfigurationService()->get();
+
         $url = 'locations/postalcodes?' . http_build_query(
                 array(
-                    'platform' => 'PRO',
+                    'platform' => $brand->platformCode,
                     'platform_country' => $platformCountry,
                     'postalzone' => $postalZone,
                     'q' => $query,
@@ -245,9 +249,11 @@ public function getPostalCodes($countryCode, $zipCode)
      */
     public function getPostalZones($countryCode, $lang = 'en')
     {
+        $brand = $this->getBrandConfigurationService()->get();
+
         $url = 'locations/postalzones/destinations?' . http_build_query(
                 array(
-                    'platform' => 'PRO',
+                    'platform' => $brand->platformCode,
                     'platform_country' => $countryCode,
                     'language' => $lang,
                 )
@@ -552,4 +558,13 @@ private function getRequestHeaders()
             'Ecommerce-Version' => 'X-Ecommerce-Version: ' . $this->configService->getECommerceVersion(),
         );
     }
+
+    /**
+     * @return BrandConfigurationService
+     */
+    private function getBrandConfigurationService()
+    {
+        /** @noinspection PhpIncompatibleReturnTypeInspection */
+        return ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+    }
 }
diff --git a/src/BusinessLogic/Registration/RegistrationRequest.php b/src/BusinessLogic/Registration/RegistrationRequest.php
index 779ace9f..d0cc5a0f 100644
--- a/src/BusinessLogic/Registration/RegistrationRequest.php
+++ b/src/BusinessLogic/Registration/RegistrationRequest.php
@@ -2,6 +2,8 @@
 
 namespace Packlink\BusinessLogic\Registration;
 
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\FrontDto;
 use Packlink\BusinessLogic\DTO\ValidationError;
 use Packlink\BusinessLogic\Language\Translator;
@@ -54,7 +56,7 @@ class RegistrationRequest extends FrontDto
      */
     public $language;
     /**
-     * Platform (only supported platform is "PRO").
+     * Platform.
      *
      * @var string
      */
@@ -257,12 +259,23 @@ protected static function doValidate(array $payload, array &$validationErrors)
             static::setInvalidFieldError('source', $validationErrors, Translator::translate('validation.invalidUrl'));
         }
 
-        if (!empty($payload['platform']) && $payload['platform'] !== 'PRO') {
+        $brand = static::getBrandConfigurationService()->get();
+
+        if (!empty($payload['platform']) && $payload['platform'] !== $brand->platformCode) {
             static::setInvalidFieldError(
                 'platform',
                 $validationErrors,
-                Translator::translate('validation.invalidFieldValue', array('PRO'))
+                Translator::translate('validation.invalidFieldValue', array($brand->platformCode))
             );
         }
     }
+
+    /**
+     * @return BrandConfigurationService
+     */
+    private static function getBrandConfigurationService()
+    {
+        /** @noinspection PhpIncompatibleReturnTypeInspection */
+        return ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+    }
 }
diff --git a/tests/BusinessLogic/Common/BaseTestWithServices.php b/tests/BusinessLogic/Common/BaseTestWithServices.php
index e469e3da..a609e93e 100644
--- a/tests/BusinessLogic/Common/BaseTestWithServices.php
+++ b/tests/BusinessLogic/Common/BaseTestWithServices.php
@@ -17,6 +17,8 @@
 use Logeecom\Tests\Infrastructure\Common\TestComponents\TaskExecution\TestTaskRunnerWakeupService;
 use Logeecom\Tests\Infrastructure\Common\TestComponents\TestHttpClient;
 use Logeecom\Tests\Infrastructure\Common\TestServiceRegister;
+use Packlink\Brands\Packlink\PacklinkConfigurationService;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Country\Country;
 use Packlink\BusinessLogic\Country\CountryService;
 use Packlink\BusinessLogic\Country\RegistrationCountry;
@@ -121,6 +123,13 @@ function () {
             }
         );
 
+        TestServiceRegister::registerService(
+            BrandConfigurationService::CLASS_NAME,
+            function () {
+                return new PacklinkConfigurationService();
+            }
+        );
+
         TestRepositoryRegistry::registerRepository(QueueItem::CLASS_NAME, MemoryQueueItemRepository::THIS_CLASS_NAME);
 
         TestFrontDtoFactory::register(Warehouse::CLASS_KEY, TestWarehouse::CLASS_NAME);
diff --git a/tests/BusinessLogic/Registration/RegistrationRequestDtoTest.php b/tests/BusinessLogic/Registration/RegistrationRequestDtoTest.php
index 2f17f4ce..417159df 100644
--- a/tests/BusinessLogic/Registration/RegistrationRequestDtoTest.php
+++ b/tests/BusinessLogic/Registration/RegistrationRequestDtoTest.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Registration;
 
 use Logeecom\Tests\BusinessLogic\Dto\BaseDtoTest;
+use Logeecom\Tests\Infrastructure\Common\TestServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\Exceptions\FrontDtoValidationException;
 use Packlink\BusinessLogic\Registration\RegistrationRequest;
 
@@ -19,12 +21,15 @@ class RegistrationRequestDtoTest extends BaseDtoTest
     public function testValidRegistrationRequest()
     {
         $request = RegistrationRequest::fromArray($this->getRequest());
+        /** @var BrandConfigurationService $brandConfigurationService */
+        $brandConfigurationService = TestServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        $brand = $brandConfigurationService->get();
 
         self::assertEquals('john.doe@example.com', $request->email);
         self::assertEquals('test1234', $request->password);
         self::assertEquals('(024) 418 52 52', $request->phone);
         self::assertEquals('1 - 10', $request->estimatedDeliveryVolume);
-        self::assertEquals('PRO', $request->platform);
+        self::assertEquals($brand->platformCode, $request->platform);
         self::assertEquals('de_DE', $request->language);
         self::assertEquals('UN', $request->platformCountry);
         self::assertEquals('http://example.com', $request->source);
@@ -144,12 +149,16 @@ function ($error) {
      */
     private function getRequest()
     {
+        /** @var BrandConfigurationService $brandConfigurationService */
+        $brandConfigurationService = TestServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        $brand = $brandConfigurationService->get();
+
         return array(
             'email' => 'john.doe@example.com',
             'password' => 'test1234',
             'phone' => '(024) 418 52 52',
             'estimated_delivery_volume' => '1 - 10',
-            'platform' => 'PRO',
+            'platform' => $brand->platformCode,
             'language' => 'de_DE',
             'platform_country' => 'UN',
             'policies' => array(
diff --git a/tests/BusinessLogic/Registration/RegistrationServiceTest.php b/tests/BusinessLogic/Registration/RegistrationServiceTest.php
index 940821a5..ea265af3 100644
--- a/tests/BusinessLogic/Registration/RegistrationServiceTest.php
+++ b/tests/BusinessLogic/Registration/RegistrationServiceTest.php
@@ -6,6 +6,7 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Logeecom\Tests\BusinessLogic\Common\BaseTestWithServices;
 use Logeecom\Tests\Infrastructure\Common\TestServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Registration\Exceptions\UnableToRegisterAccountException;
 use Packlink\BusinessLogic\Registration\RegistrationRequest;
 use Packlink\BusinessLogic\Registration\RegistrationService;
@@ -105,13 +106,17 @@ function () {
      */
     private function getRequest()
     {
+        /** @var BrandConfigurationService $brandConfigurationService */
+        $brandConfigurationService = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        $brand = $brandConfigurationService->get();
+
         return RegistrationRequest::fromArray(
             array(
                 'email' => 'john.doe@example.com',
                 'password' => 'test1234',
                 'phone' => '(024) 418 52 52',
                 'estimated_delivery_volume' => '1 - 10',
-                'platform' => 'PRO',
+                'platform' => $brand->platformCode,
                 'language' => 'de_DE',
                 'platform_country' => 'UN',
                 'policies' => array(

From 96b17f5cc61f4d8bf3b06d691e323462031feacf Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 26 Feb 2021 14:26:39 +0100
Subject: [PATCH 04/37] Refactor Registration to eliminate hardcoded platform
 country code

PLCR24-10
---
 .../Controllers/RegistrationController.php    | 23 +++++++++++++++++++
 .../Resources/js/RegisterController.js        | 10 ++++----
 .../Resources/js/RegisterModalController.js   |  2 +-
 src/DemoUI/composer.json                      |  3 ++-
 .../RegistrationControllerTest.php            |  3 ++-
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 40715e61..c617f118 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -4,6 +4,7 @@
 
 use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
 use Packlink\BusinessLogic\Registration\RegistrationRequest;
@@ -20,6 +21,10 @@ class RegistrationController
      * @var Configuration
      */
     protected $configService;
+    /**
+     * @var BrandConfigurationService
+     */
+    protected $brandConfigurationService;
     /**
      * List of terms and conditions URLs for different country codes.
      *
@@ -74,6 +79,8 @@ public function getRegisterData($country)
         $registrationInfoService = ServiceRegister::getService(RegistrationInfoService::CLASS_NAME);
         $registrationData = $registrationInfoService->getRegistrationInfoData();
 
+        $brand = $this->getBrandConfigurationService()->get();
+
         return array(
             'context' => $this->getConfigService()->getContext(),
             'email' => $registrationData->getEmail(),
@@ -83,6 +90,8 @@ public function getRegisterData($country)
                 self::$termsAndConditionsUrls[$country] : self::$termsAndConditionsUrls[self::DEFAULT_COUNTRY],
             'privacyPolicyUrl' => !empty(self::$privacyPolicyUrls[$country]) ?
                 self::$privacyPolicyUrls[$country] : self::$privacyPolicyUrls[self::DEFAULT_COUNTRY],
+            'platform_country' => in_array($country, $brand->platformCountries, true) ?
+                $country : $brand->platformCountries[0],
         );
     }
 
@@ -151,6 +160,20 @@ protected function getConfigService()
         return $this->configService;
     }
 
+    /**
+     * Returns an instance of brand configuration service.
+     *
+     * @return BrandConfigurationService
+     */
+    protected function getBrandConfigurationService()
+    {
+        if ($this->brandConfigurationService === null) {
+            $this->brandConfigurationService = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        }
+
+        return $this->brandConfigurationService;
+    }
+
     /**
      * Returns shop language in format which Packlink expects.
      *
diff --git a/src/BusinessLogic/Resources/js/RegisterController.js b/src/BusinessLogic/Resources/js/RegisterController.js
index 7ae525f5..4da6b48a 100644
--- a/src/BusinessLogic/Resources/js/RegisterController.js
+++ b/src/BusinessLogic/Resources/js/RegisterController.js
@@ -42,9 +42,6 @@ if (!window.Packlink) {
 
             templateService.getComponent('pl-go-to-login', registerPage).addEventListener('click', goToLogin);
 
-            templateService.getComponent('pl-register-platform-country', registerPage).value =
-                additionalConfig.hasOwnProperty('platform_country') ? additionalConfig.platform_country : 'ES';
-
             initInputField('pl-register-email');
             initInputField('pl-register-password');
             initInputField('pl-register-phone');
@@ -60,17 +57,20 @@ if (!window.Packlink) {
          *  phone: string,
          *  source: string,
          *  termsAndConditionsUrl: string,
-         *  privacyPolicyUrl: string
+         *  privacyPolicyUrl: string,
+         *  platform_country: string
          *  }} response
          */
         const populateInitialValues = (response) => {
             const emailInput = templateService.getComponent('pl-register-email'),
                 phoneInput = templateService.getComponent('pl-register-phone'),
-                sourceInput = templateService.getComponent('pl-register-source');
+                sourceInput = templateService.getComponent('pl-register-source'),
+                platformCountry = templateService.getComponent('pl-register-platform-country');
 
             emailInput.value = response.email;
             phoneInput.value = response.phone;
             sourceInput.value = response.source;
+            platformCountry.value = response.platform_country;
 
             let termsAndConditionsLabel = templateService.getComponent('pl-register-terms-and-conditions-label'),
                 termsTranslation = translationService.translate(
diff --git a/src/BusinessLogic/Resources/js/RegisterModalController.js b/src/BusinessLogic/Resources/js/RegisterModalController.js
index 6fec3cfe..c3d13fef 100644
--- a/src/BusinessLogic/Resources/js/RegisterModalController.js
+++ b/src/BusinessLogic/Resources/js/RegisterModalController.js
@@ -73,7 +73,7 @@ if (!window.Packlink) {
          */
         const handleCountrySelected = (country) => {
             modal.close();
-            Packlink.state.goToState('register', {country: country.code, platform_country: country.platform_country});
+            Packlink.state.goToState('register', {country: country.code});
         };
 
         /**
diff --git a/src/DemoUI/composer.json b/src/DemoUI/composer.json
index cbfaddbc..880ec775 100755
--- a/src/DemoUI/composer.json
+++ b/src/DemoUI/composer.json
@@ -12,7 +12,8 @@
       "Logeecom\\Tests\\": "../../tests",
       "Packlink\\BusinessLogic\\": "../BusinessLogic",
       "Packlink\\DemoUI\\Lib\\": "Lib",
-      "Packlink\\DemoUI\\": "src"
+      "Packlink\\DemoUI\\": "src",
+      "Packlink\\Brands\\": "../Brands"
     }
   },
   "scripts": {
diff --git a/tests/BusinessLogic/Controllers/RegistrationControllerTest.php b/tests/BusinessLogic/Controllers/RegistrationControllerTest.php
index ea006927..c317feb9 100644
--- a/tests/BusinessLogic/Controllers/RegistrationControllerTest.php
+++ b/tests/BusinessLogic/Controllers/RegistrationControllerTest.php
@@ -44,10 +44,11 @@ function () {
 
     public function testGetRegisterData()
     {
-        $data = $this->registrationController->getRegisterData('ES');
+        $data = $this->registrationController->getRegisterData('FR');
 
         $this->assertEquals('test@test.com', $data['email']);
         $this->assertEquals('1111111111111', $data['phone']);
         $this->assertEquals('localhost:7000', $data['source']);
+        $this->assertEquals('FR', $data['platform_country']);
     }
 }

From fe48e34490f49e5aa7e80f28edcd20eec12151fa Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 26 Feb 2021 15:07:04 +0100
Subject: [PATCH 05/37] Remove obsolete registration link and platform country
 from CountryService

PLCR24-11
---
 src/BusinessLogic/BootstrapComponent.php      |  2 -
 src/BusinessLogic/Country/CountryService.php  | 38 +-------
 .../Country/RegistrationCountry.php           | 96 -------------------
 .../Resources/js/RegisterModalController.js   |  4 +-
 .../Common/BaseTestWithServices.php           |  2 -
 .../Dto/TestRegistrationCountry.php           | 27 ------
 .../Country/CountryServiceTest.php            |  4 -
 .../Country/RegistrationCountryDtoTest.php    | 70 --------------
 8 files changed, 3 insertions(+), 240 deletions(-)
 delete mode 100644 src/BusinessLogic/Country/RegistrationCountry.php
 delete mode 100644 tests/BusinessLogic/Common/TestComponents/Dto/TestRegistrationCountry.php
 delete mode 100644 tests/BusinessLogic/Country/RegistrationCountryDtoTest.php

diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 4fb94eaa..12deb1c0 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -12,7 +12,6 @@
 use Packlink\BusinessLogic\Controllers\ShippingMethodController;
 use Packlink\BusinessLogic\Country\Country;
 use Packlink\BusinessLogic\Country\CountryService;
-use Packlink\BusinessLogic\Country\RegistrationCountry;
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\DTO\ValidationError;
@@ -217,7 +216,6 @@ protected static function initDtoRegistry()
         FrontDtoFactory::register(ParcelInfo::CLASS_KEY, ParcelInfo::CLASS_NAME);
         FrontDtoFactory::register(DashboardStatus::CLASS_KEY, DashboardStatus::CLASS_NAME);
         FrontDtoFactory::register(Country::CLASS_KEY, Country::CLASS_NAME);
-        FrontDtoFactory::register(RegistrationCountry::CLASS_KEY, RegistrationCountry::CLASS_NAME);
         FrontDtoFactory::register(RegistrationRequest::CLASS_KEY, RegistrationRequest::CLASS_NAME);
         FrontDtoFactory::register(RegistrationLegalPolicy::CLASS_KEY, RegistrationLegalPolicy::CLASS_NAME);
         FrontDtoFactory::register(ShippingPricePolicy::CLASS_KEY, ShippingPricePolicy::CLASS_NAME);
diff --git a/src/BusinessLogic/Country/CountryService.php b/src/BusinessLogic/Country/CountryService.php
index 1f7166d2..5ed84c5e 100644
--- a/src/BusinessLogic/Country/CountryService.php
+++ b/src/BusinessLogic/Country/CountryService.php
@@ -2,9 +2,7 @@
 
 namespace Packlink\BusinessLogic\Country;
 
-use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\BaseService;
-use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\Language\Translator;
 
@@ -41,85 +39,61 @@ class CountryService extends BaseService
             'name' => 'Spain',
             'code' => 'ES',
             'postal_code' => '28001',
-            'registration_link' => 'https://auth.packlink.com/es-ES/{integration}/registro',
-            'platform_country' => 'ES',
         ),
         'DE' => array(
             'name' => 'Germany',
             'code' => 'DE',
             'postal_code' => '10115',
-            'registration_link' => 'https://auth.packlink.com/de-DE/{integration}/registrieren',
-            'platform_country' => 'DE',
         ),
         'FR' => array(
             'name' => 'France',
             'code' => 'FR',
             'postal_code' => '75001',
-            'registration_link' => 'https://auth.packlink.com/fr-FR/{integration}/inscription',
-            'platform_country' => 'FR',
         ),
         'IT' => array(
             'name' => 'Italy',
             'code' => 'IT',
             'postal_code' => '00118',
-            'registration_link' => 'https://auth.packlink.com/it-IT/{integration}/registro',
-            'platform_country' => 'IT',
         ),
         'AT' => array(
             'name' => 'Austria',
             'code' => 'AT',
             'postal_code' => '1010',
-            'registration_link' => 'https://auth.packlink.com/de-DE/{integration}/registrieren',
-            'platform_country' => 'UN',
         ),
         'NL' => array(
             'name' => 'Netherlands',
             'code' => 'NL',
             'postal_code' => '1011',
-            'registration_link' => 'https://auth.packlink.com/nl-NL/{integration}/registrieren',
-            'platform_country' => 'UN',
         ),
         'BE' => array(
             'name' => 'Belgium',
             'code' => 'BE',
             'postal_code' => '1000',
-            'registration_link' => 'https://auth.packlink.com/nl-NL/{integration}/registrieren',
-            'platform_country' => 'UN',
         ),
         'PT' => array(
             'name' => 'Portugal',
             'code' => 'PT',
             'postal_code' => '1000-017',
-            'registration_link' => 'https://auth.packlink.com/pt-PT/{integration}/registo',
-            'platform_country' => 'UN',
         ),
         'TR' => array(
             'name' => 'Turkey',
             'code' => 'TR',
             'postal_code' => '06010',
-            'registration_link' => 'https://auth.packlink.com/tr-TR/{integration}/kayıt-yap',
-            'platform_country' => 'UN',
         ),
         'IE' => array(
             'name' => 'Ireland',
             'code' => 'IE',
             'postal_code' => 'D1',
-            'registration_link' => 'https://auth.packlink.com/en-GB/{integration}/register',
-            'platform_country' => 'UN',
         ),
         'GB' => array(
             'name' => 'United Kingdom',
             'code' => 'GB',
             'postal_code' => 'E1 6AN',
-            'registration_link' => 'https://auth.packlink.com/en-GB/{integration}/register?platform_country=UN',
-            'platform_country' => 'UN',
         ),
         'HU' => array(
             'name' => 'Hungary',
             'code' => 'HU',
             'postal_code' => '1014',
-            'registration_link' => 'https://auth.packlink.com/hu-HU/{integration}/regisztracio?platform_country=UN',
-            'platform_country' => 'UN',
         ),
     );
 
@@ -140,7 +114,7 @@ public function isBaseCountry($countryCode)
      *
      * @param bool $associative Indicates whether the result should be an associative array.
      *
-     * @return RegistrationCountry[]
+     * @return Country[]
      *
      * @noinspection PhpUnhandledExceptionInspection
      * @noinspection PhpDocMissingThrowsInspection
@@ -148,18 +122,10 @@ public function isBaseCountry($countryCode)
     public function getSupportedCountries($associative = true)
     {
         $countries = array();
-        $configuration = ServiceRegister::getService(Configuration::CLASS_NAME);
 
         foreach (static::$supportedCountries as $country) {
-            $integration = strtolower($configuration->getIntegrationName());
-            $country['registration_link'] = str_replace(
-                    '{integration}',
-                    $integration,
-                    $country['registration_link']
-                ) . '?platform=PRO&platform_country=' . $country['platform_country'];
-
             $country['name'] = Translator::translate('countries.' . $country['code']);
-            $countries[$country['code']] = FrontDtoFactory::get(RegistrationCountry::CLASS_KEY, $country);
+            $countries[$country['code']] = FrontDtoFactory::get(Country::CLASS_KEY, $country);
         }
 
         return $associative ? $countries : array_values($countries);
diff --git a/src/BusinessLogic/Country/RegistrationCountry.php b/src/BusinessLogic/Country/RegistrationCountry.php
deleted file mode 100644
index 8a5495e0..00000000
--- a/src/BusinessLogic/Country/RegistrationCountry.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Packlink\BusinessLogic\Country;
-
-use Packlink\BusinessLogic\DTO\Exceptions\FrontDtoValidationException;
-
-/**
- * Class RegistrationCountry
- *
- * @package Packlink\BusinessLogic\Country
- */
-class RegistrationCountry extends Country
-{
-    /**
-     * Fully qualified name of this class.
-     */
-    const CLASS_NAME = __CLASS__;
-    /**
-     * Unique class key.
-     */
-    const CLASS_KEY = 'registration_country';
-
-    /**
-     * Registration link for the country.
-     *
-     * @var string
-     */
-    public $registrationLink;
-    /**
-     * 2-letter platform country code.
-     *
-     * @var string
-     */
-    public $platformCountry;
-
-    /**
-     * Fields for this DTO.
-     *
-     * @var array
-     */
-    protected static $fields = array(
-        'name',
-        'code',
-        'postal_code',
-        'registration_link',
-        'platform_country',
-    );
-    /**
-     * Required fields for DTO to be valid.
-     *
-     * @var array
-     */
-    protected static $requiredFields = array(
-        'name',
-        'code',
-        'postal_code',
-        'registration_link',
-        'platform_country',
-    );
-
-    /**
-     * Transforms raw array data to its DTO.
-     *
-     * @param array $raw Raw array data.
-     *
-     * @return static Transformed DTO object.
-     *
-     * @throws FrontDtoValidationException
-     */
-    public static function fromArray(array $raw)
-    {
-        /** @var static $instance */
-        $instance = parent::fromArray($raw);
-
-        $instance->registrationLink = static::getDataValue($raw, 'registration_link');
-        $instance->platformCountry = static::getDataValue($raw, 'platform_country');
-
-        return $instance;
-    }
-
-    /**
-     * Transforms DTO to its array format.
-     *
-     * @return array DTO in array format.
-     */
-    public function toArray()
-    {
-        return array_merge(
-            parent::toArray(),
-            array(
-                'registration_link' => $this->registrationLink,
-                'platform_country' => $this->platformCountry,
-            )
-        );
-    }
-}
diff --git a/src/BusinessLogic/Resources/js/RegisterModalController.js b/src/BusinessLogic/Resources/js/RegisterModalController.js
index c3d13fef..92e1a095 100644
--- a/src/BusinessLogic/Resources/js/RegisterModalController.js
+++ b/src/BusinessLogic/Resources/js/RegisterModalController.js
@@ -10,9 +10,7 @@ if (!window.Packlink) {
      * @typedef {{
      *  name: string,
      *  code: string,
-     *  postal_code: string,
-     *  registration_link: string,
-     *  platform_country: string
+     *  postal_code: string
      * }} Country
      */
 
diff --git a/tests/BusinessLogic/Common/BaseTestWithServices.php b/tests/BusinessLogic/Common/BaseTestWithServices.php
index a609e93e..eed38e65 100644
--- a/tests/BusinessLogic/Common/BaseTestWithServices.php
+++ b/tests/BusinessLogic/Common/BaseTestWithServices.php
@@ -21,7 +21,6 @@
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Country\Country;
 use Packlink\BusinessLogic\Country\CountryService;
-use Packlink\BusinessLogic\Country\RegistrationCountry;
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
 use Packlink\BusinessLogic\DTO\ValidationError;
 use Packlink\BusinessLogic\Http\DTO\ParcelInfo;
@@ -136,7 +135,6 @@ function () {
         TestFrontDtoFactory::register(ParcelInfo::CLASS_KEY, ParcelInfo::CLASS_NAME);
         TestFrontDtoFactory::register(ValidationError::CLASS_KEY, ValidationError::CLASS_NAME);
         TestFrontDtoFactory::register(Country::CLASS_KEY, Country::CLASS_NAME);
-        TestFrontDtoFactory::register(RegistrationCountry::CLASS_KEY, RegistrationCountry::CLASS_NAME);
     }
 
     protected function tearDown()
diff --git a/tests/BusinessLogic/Common/TestComponents/Dto/TestRegistrationCountry.php b/tests/BusinessLogic/Common/TestComponents/Dto/TestRegistrationCountry.php
deleted file mode 100644
index 1c049f0a..00000000
--- a/tests/BusinessLogic/Common/TestComponents/Dto/TestRegistrationCountry.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace Logeecom\Tests\BusinessLogic\Common\TestComponents\Dto;
-
-use Packlink\BusinessLogic\Country\RegistrationCountry;
-
-/**
- * Class TestRegistrationCountry
- *
- * @package BusinessLogic\Common\TestComponents\Dto
- */
-class TestRegistrationCountry extends RegistrationCountry
-{
-    /**
-     * Fully qualified name of this class.
-     */
-    const CLASS_NAME = __CLASS__;
-
-    public function __construct()
-    {
-        $this->name = 'Cuba';
-        $this->code = 'CU';
-        $this->postalCode = '10400';
-        $this->registrationLink = 'https://pro.packlink.com/register';
-        $this->platformCountry = 'UN';
-    }
-}
diff --git a/tests/BusinessLogic/Country/CountryServiceTest.php b/tests/BusinessLogic/Country/CountryServiceTest.php
index 66414f23..c99b973e 100644
--- a/tests/BusinessLogic/Country/CountryServiceTest.php
+++ b/tests/BusinessLogic/Country/CountryServiceTest.php
@@ -26,9 +26,5 @@ public function testGetSupportedCountries()
         $this->assertEquals('Spain', $countries['ES']->name);
         $this->assertEquals('ES', $countries['ES']->code);
         $this->assertEquals('28001', $countries['ES']->postalCode);
-        $this->assertEquals(
-            'https://auth.packlink.com/es-ES/test-system/registro?platform=PRO&platform_country=ES',
-            $countries['ES']->registrationLink
-        );
     }
 }
diff --git a/tests/BusinessLogic/Country/RegistrationCountryDtoTest.php b/tests/BusinessLogic/Country/RegistrationCountryDtoTest.php
deleted file mode 100644
index 2854db06..00000000
--- a/tests/BusinessLogic/Country/RegistrationCountryDtoTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace BusinessLogic\Country;
-
-use Logeecom\Tests\BusinessLogic\Common\TestComponents\Dto\TestRegistrationCountry;
-use Logeecom\Tests\BusinessLogic\Common\TestComponents\Dto\TestFrontDtoFactory;
-use Logeecom\Tests\BusinessLogic\Dto\BaseDtoTest;
-use Packlink\BusinessLogic\Country\RegistrationCountry;
-
-/**
- * Class RegistrationCountryDtoTest
- *
- * @package BusinessLogic\Country
- */
-class RegistrationCountryDtoTest extends BaseDtoTest
-{
-    /**
-     * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoFactoryRegistrationException
-     * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoNotRegisteredException
-     */
-    public function testFromArray()
-    {
-        TestFrontDtoFactory::register(RegistrationCountry::CLASS_KEY, RegistrationCountry::CLASS_NAME);
-
-        $data = array(
-            'de' => array(
-                'name' => 'Germany',
-                'code' => 'DE',
-                'postal_code' => '10115',
-                'registration_link' => 'https://pro.packlink.de/registrieren',
-                'platform_country' => 'DE',
-            ),
-            'nl' => array(
-                'name' => 'Netherlands',
-                'code' => 'NL',
-                'postal_code' => '1011',
-                'registration_link' => 'https://pro.packlink.com/register',
-                'platform_country' => 'UN',
-            ),
-        );
-
-        /** @var RegistrationCountry[] $countries */
-        $countries = TestFrontDtoFactory::getFromBatch(RegistrationCountry::CLASS_KEY, $data);
-        $this->assertCount(2, $countries);
-
-        $this->assertEquals('Germany', $countries['de']->name);
-        $this->assertEquals('DE', $countries['de']->code);
-        $this->assertEquals('10115', $countries['de']->postalCode);
-        $this->assertEquals('https://pro.packlink.de/registrieren', $countries['de']->registrationLink);
-        $this->assertEquals('DE', $countries['de']->platformCountry);
-
-        $this->assertEquals('Netherlands', $countries['nl']->name);
-        $this->assertEquals('NL', $countries['nl']->code);
-        $this->assertEquals('1011', $countries['nl']->postalCode);
-        $this->assertEquals('https://pro.packlink.com/register', $countries['nl']->registrationLink);
-        $this->assertEquals('UN', $countries['nl']->platformCountry);
-    }
-
-    public function testToArray()
-    {
-        $country = new TestRegistrationCountry();
-
-        $data = $country->toArray();
-        $this->assertArrayHasKey('name', $data);
-        $this->assertArrayHasKey('code', $data);
-        $this->assertArrayHasKey('postal_code', $data);
-        $this->assertArrayHasKey('registration_link', $data);
-        $this->assertArrayHasKey('platform_country', $data);
-    }
-}

From 3ab46190aeab4877b5ff1647e7461ce4a39973e6 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 1 Mar 2021 10:18:24 +0100
Subject: [PATCH 06/37] Refactor login/registration validation to check country
 code

PLCR24-12
---
 ...ormCountryNotSupportedByBrandException.php | 16 ++++++++++
 .../Controllers/RegistrationController.php    |  5 +++-
 .../Registration/RegistrationRequest.php      |  6 ++--
 src/BusinessLogic/User/UserAccountService.php | 30 +++++++++++++++++++
 .../ApiResponses/userUnsupportedCountry.json  | 27 +++++++++++++++++
 .../User/UserAccountLoginTest.php             | 25 ++++++++++++++--
 6 files changed, 103 insertions(+), 6 deletions(-)
 create mode 100644 src/BusinessLogic/Brand/Exceptions/PlatformCountryNotSupportedByBrandException.php
 create mode 100644 tests/BusinessLogic/Common/ApiResponses/userUnsupportedCountry.json

diff --git a/src/BusinessLogic/Brand/Exceptions/PlatformCountryNotSupportedByBrandException.php b/src/BusinessLogic/Brand/Exceptions/PlatformCountryNotSupportedByBrandException.php
new file mode 100644
index 00000000..e3447abc
--- /dev/null
+++ b/src/BusinessLogic/Brand/Exceptions/PlatformCountryNotSupportedByBrandException.php
@@ -0,0 +1,16 @@
+<?php
+
+
+namespace Packlink\BusinessLogic\Brand\Exceptions;
+
+use Logeecom\Infrastructure\Exceptions\BaseException;
+
+/**
+ * Class PlatformCountryNotSupportedByBrandException
+ *
+ * @package Packlink\BusinessLogic\Brand\Exceptions
+ */
+class PlatformCountryNotSupportedByBrandException extends BaseException
+{
+
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index c617f118..2761f987 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -106,10 +106,13 @@ public function getRegisterData($country)
      * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoNotRegisteredException
      * @throws \Packlink\BusinessLogic\DTO\Exceptions\FrontDtoValidationException
      * @throws \Packlink\BusinessLogic\Registration\Exceptions\UnableToRegisterAccountException
+     * @throws \Packlink\BusinessLogic\Brand\Exceptions\PlatformCountryNotSupportedByBrandException
      */
     public function register(array $payload)
     {
-        $payload['platform'] = 'PRO';
+        $brand = $this->getBrandConfigurationService()->get();
+
+        $payload['platform'] = $brand->platformCode;
         $payload['language'] = $this->getLanguage();
 
         if (isset($payload['source'])) {
diff --git a/src/BusinessLogic/Registration/RegistrationRequest.php b/src/BusinessLogic/Registration/RegistrationRequest.php
index d0cc5a0f..9805e1cd 100644
--- a/src/BusinessLogic/Registration/RegistrationRequest.php
+++ b/src/BusinessLogic/Registration/RegistrationRequest.php
@@ -211,6 +211,8 @@ protected static function doValidate(array $payload, array &$validationErrors)
     {
         parent::doValidate($payload, $validationErrors);
 
+        $brand = static::getBrandConfigurationService()->get();
+
         if (!empty($payload['email']) && !DtoValidator::isEmailValid($payload['email'])) {
             static::setInvalidFieldError('email', $validationErrors, Translator::translate('validation.invalidEmail'));
         }
@@ -246,7 +248,7 @@ protected static function doValidate(array $payload, array &$validationErrors)
         }
 
         if (!empty($payload['platform_country'])
-            && !in_array($payload['platform_country'], static::$supportedPlatformCountries, true)
+            && !in_array($payload['platform_country'], $brand->platformCountries, true)
         ) {
             static::setInvalidFieldError(
                 'platform_country',
@@ -259,8 +261,6 @@ protected static function doValidate(array $payload, array &$validationErrors)
             static::setInvalidFieldError('source', $validationErrors, Translator::translate('validation.invalidUrl'));
         }
 
-        $brand = static::getBrandConfigurationService()->get();
-
         if (!empty($payload['platform']) && $payload['platform'] !== $brand->platformCode) {
             static::setInvalidFieldError(
                 'platform',
diff --git a/src/BusinessLogic/User/UserAccountService.php b/src/BusinessLogic/User/UserAccountService.php
index d5f92237..60173890 100644
--- a/src/BusinessLogic/User/UserAccountService.php
+++ b/src/BusinessLogic/User/UserAccountService.php
@@ -9,6 +9,8 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Logeecom\Infrastructure\TaskExecution\QueueService;
 use Packlink\BusinessLogic\BaseService;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+use Packlink\BusinessLogic\Brand\Exceptions\PlatformCountryNotSupportedByBrandException;
 use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
 use Packlink\BusinessLogic\Http\DTO\Analytics;
@@ -47,6 +49,12 @@ class UserAccountService extends BaseService
      * @var Proxy
      */
     private $proxy;
+    /**
+     * BrandConfigurationService instance.
+     *
+     * @var BrandConfigurationService
+     */
+    private $brandConfigurationService;
 
     /**
      * Validates provided API key and initializes user's data.
@@ -57,6 +65,7 @@ class UserAccountService extends BaseService
      *
      * @throws \Logeecom\Infrastructure\ORM\Exceptions\RepositoryNotRegisteredException
      * @throws \Logeecom\Infrastructure\TaskExecution\Exceptions\QueueStorageUnavailableException
+     * @throws PlatformCountryNotSupportedByBrandException
      */
     public function login($apiKey)
     {
@@ -159,9 +168,16 @@ public function setWarehouseInfo($force)
      * @throws \Logeecom\Infrastructure\Http\Exceptions\HttpCommunicationException
      * @throws \Logeecom\Infrastructure\Http\Exceptions\HttpRequestException
      * @throws \Logeecom\Infrastructure\TaskExecution\Exceptions\QueueStorageUnavailableException
+     * @throws PlatformCountryNotSupportedByBrandException
      */
     protected function initializeUser(User $user)
     {
+        $brand = $this->getBrandConfigurationService()->get();
+
+        if (!in_array($user->country, $brand->platformCountries, true)) {
+            throw new PlatformCountryNotSupportedByBrandException('Platform country not supported by brand!');
+        }
+
         $this->getConfigService()->setUserInfo($user);
         $defaultQueueName = $this->getConfigService()->getDefaultQueueName();
 
@@ -268,4 +284,18 @@ protected function getConfigService()
 
         return $this->configuration;
     }
+
+    /**
+     * Returns an instance of brand configuration service.
+     *
+     * @return BrandConfigurationService
+     */
+    protected function getBrandConfigurationService()
+    {
+        if ($this->brandConfigurationService === null) {
+            $this->brandConfigurationService = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        }
+
+        return $this->brandConfigurationService;
+    }
 }
diff --git a/tests/BusinessLogic/Common/ApiResponses/userUnsupportedCountry.json b/tests/BusinessLogic/Common/ApiResponses/userUnsupportedCountry.json
new file mode 100644
index 00000000..4b0f3cc8
--- /dev/null
+++ b/tests/BusinessLogic/Common/ApiResponses/userUnsupportedCountry.json
@@ -0,0 +1,27 @@
+{
+  "active": true,
+  "name": "first name",
+  "surname": "last name",
+  "company_name": "my company",
+  "email": "email@address.com",
+  "address": null,
+  "address2": null,
+  "city": null,
+  "state": null,
+  "platform_country": "AT",
+  "location": null,
+  "postal_code": null,
+  "phone": "+38163645336",
+  "debtor": false,
+  "estimated_deliveries_volume": "11 - 50",
+  "tax_id": null,
+  "marketplaces": [],
+  "ecommerces": [],
+  "created_at": 1544009477294,
+  "updated_at": 1544009477388,
+  "customer_type": "OTHERS",
+  "deregistration_date": null,
+  "direct_debit_requested": false,
+  "deferred_payment_blocked": false,
+  "referral": null
+}
\ No newline at end of file
diff --git a/tests/BusinessLogic/User/UserAccountLoginTest.php b/tests/BusinessLogic/User/UserAccountLoginTest.php
index 8229c6e9..f1d006e7 100644
--- a/tests/BusinessLogic/User/UserAccountLoginTest.php
+++ b/tests/BusinessLogic/User/UserAccountLoginTest.php
@@ -2,6 +2,7 @@
 
 namespace Logeecom\Tests\BusinessLogic\User;
 
+use Logeecom\Infrastructure\Exceptions\BaseException;
 use Logeecom\Infrastructure\Http\HttpResponse;
 use Logeecom\Infrastructure\ORM\RepositoryRegistry;
 use Logeecom\Infrastructure\TaskExecution\Interfaces\TaskRunnerWakeup;
@@ -150,6 +151,23 @@ public function testLogin()
         $this->assertEmpty($expectedSchedules);
     }
 
+    /**
+     * Test user login when platform country is not supported.
+     */
+    public function testLoginNotSupportedCountry()
+    {
+        $exceptionThrown = false;
+        $this->httpClient->setMockResponses($this->getMockResponses(true, true, false));
+
+        try {
+            $this->assertTrue($this->userAccountService->login('GoodApiKey'));
+        } catch (BaseException $e) {
+            $exceptionThrown = true;
+        }
+
+        $this->assertTrue($exceptionThrown);
+    }
+
     /**
      * Tests user login and user initialization
      *
@@ -200,14 +218,17 @@ public function testLoginNoWarehouse()
      *
      * @param bool $parcel If parcel info should be set.
      * @param bool $warehouse If warehouse info should be set.
+     * @param bool $supportedCountry If response with supported or unsupported country should be set.
      *
      * @return HttpResponse[] Array of Http responses.
      */
-    private function getMockResponses($parcel = true, $warehouse = true)
+    private function getMockResponses($parcel = true, $warehouse = true, $supportedCountry = true)
     {
         return array(
             new HttpResponse(
-                200, array(), file_get_contents(__DIR__ . '/../Common/ApiResponses/user.json')
+                200, array(), $supportedCountry ?
+                    file_get_contents(__DIR__ . '/../Common/ApiResponses/user.json') :
+                    file_get_contents(__DIR__ . '/../Common/ApiResponses/userUnsupportedCountry.json')
             ),
             new HttpResponse(
                 200, array(), $parcel ? file_get_contents(__DIR__ . '/../Common/ApiResponses/parcels.json') : ''

From 28be84806d1a5e54201613884afcc4c0cbf011b6 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 1 Mar 2021 10:48:34 +0100
Subject: [PATCH 07/37] Replace hardcoded registration and warehouse countries

PLCR24-13
---
 src/BusinessLogic/Country/CountryService.php  | 90 +++++--------------
 .../Country/WarehouseCountryService.php       | 63 +------------
 2 files changed, 27 insertions(+), 126 deletions(-)

diff --git a/src/BusinessLogic/Country/CountryService.php b/src/BusinessLogic/Country/CountryService.php
index 5ed84c5e..2da96846 100644
--- a/src/BusinessLogic/Country/CountryService.php
+++ b/src/BusinessLogic/Country/CountryService.php
@@ -2,7 +2,9 @@
 
 namespace Packlink\BusinessLogic\Country;
 
+use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\BaseService;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\Language\Translator;
 
@@ -24,78 +26,17 @@ class CountryService extends BaseService
      */
     protected static $instance;
     /**
-     * List of four default countries.
+     * BrandConfigurationService instance.
      *
-     * @var array
+     * @var BrandConfigurationService
      */
-    protected static $baseCountries = array('ES', 'DE', 'FR', 'IT');
+    protected $brandConfigurationService;
     /**
-     * List of supported countries.
+     * List of four default countries.
      *
      * @var array
      */
-    protected static $supportedCountries = array(
-        'ES' => array(
-            'name' => 'Spain',
-            'code' => 'ES',
-            'postal_code' => '28001',
-        ),
-        'DE' => array(
-            'name' => 'Germany',
-            'code' => 'DE',
-            'postal_code' => '10115',
-        ),
-        'FR' => array(
-            'name' => 'France',
-            'code' => 'FR',
-            'postal_code' => '75001',
-        ),
-        'IT' => array(
-            'name' => 'Italy',
-            'code' => 'IT',
-            'postal_code' => '00118',
-        ),
-        'AT' => array(
-            'name' => 'Austria',
-            'code' => 'AT',
-            'postal_code' => '1010',
-        ),
-        'NL' => array(
-            'name' => 'Netherlands',
-            'code' => 'NL',
-            'postal_code' => '1011',
-        ),
-        'BE' => array(
-            'name' => 'Belgium',
-            'code' => 'BE',
-            'postal_code' => '1000',
-        ),
-        'PT' => array(
-            'name' => 'Portugal',
-            'code' => 'PT',
-            'postal_code' => '1000-017',
-        ),
-        'TR' => array(
-            'name' => 'Turkey',
-            'code' => 'TR',
-            'postal_code' => '06010',
-        ),
-        'IE' => array(
-            'name' => 'Ireland',
-            'code' => 'IE',
-            'postal_code' => 'D1',
-        ),
-        'GB' => array(
-            'name' => 'United Kingdom',
-            'code' => 'GB',
-            'postal_code' => 'E1 6AN',
-        ),
-        'HU' => array(
-            'name' => 'Hungary',
-            'code' => 'HU',
-            'postal_code' => '1014',
-        ),
-    );
+    protected static $baseCountries = array('ES', 'DE', 'FR', 'IT');
 
     /**
      * Checks if given country is one of the four base countries ('ES', 'DE', 'FR', 'IT').
@@ -122,12 +63,27 @@ public function isBaseCountry($countryCode)
     public function getSupportedCountries($associative = true)
     {
         $countries = array();
+        $brand = $this->getBrandConfigurationService()->get();
 
-        foreach (static::$supportedCountries as $country) {
+        foreach ($brand->registrationCountries as $country) {
             $country['name'] = Translator::translate('countries.' . $country['code']);
             $countries[$country['code']] = FrontDtoFactory::get(Country::CLASS_KEY, $country);
         }
 
         return $associative ? $countries : array_values($countries);
     }
+
+    /**
+     * Gets BrandConfigurationService.
+     *
+     * @return BrandConfigurationService
+     */
+    protected function getBrandConfigurationService()
+    {
+        if ($this->brandConfigurationService === null) {
+            $this->brandConfigurationService = ServiceRegister::getService(BrandConfigurationService::CLASS_NAME);
+        }
+
+        return $this->brandConfigurationService;
+    }
 }
diff --git a/src/BusinessLogic/Country/WarehouseCountryService.php b/src/BusinessLogic/Country/WarehouseCountryService.php
index 6cd1435a..1a7c6a1c 100644
--- a/src/BusinessLogic/Country/WarehouseCountryService.php
+++ b/src/BusinessLogic/Country/WarehouseCountryService.php
@@ -22,63 +22,6 @@ class WarehouseCountryService extends CountryService
      * @var static
      */
     protected static $instance;
-    /**
-     * List of countries available only for warehouse selection.
-     *
-     * @var array
-     */
-    protected static $additionalWarehouseCountries = array(
-        'PL' => array(
-            'name' => 'Poland',
-            'code' => 'PL',
-            'postal_code' => '00-694',
-        ),
-        'CH' => array(
-            'name' => 'Switzerland',
-            'code' => 'CH',
-            'postal_code' => '3000',
-        ),
-        'LU' => array(
-            'name' => 'Luxembourg',
-            'code' => 'LU',
-            'postal_code' => '1009',
-        ),
-        'AR' => array(
-            'name' => 'Argentina',
-            'code' => 'AR',
-            'postal_code' => 'C1258 AAA',
-        ),
-        'US' => array(
-            'name' => 'United States',
-            'code' => 'US',
-            'postal_code' => '01223',
-        ),
-        'BO' => array(
-            'name' => 'Bolivia',
-            'code' => 'BO',
-            'postal_code' => 'La Paz',
-        ),
-        'MX' => array(
-            'name' => 'Mexico',
-            'code' => 'MX',
-            'postal_code' => '21900',
-        ),
-        'CL' => array(
-            'name' => 'Chile',
-            'code' => 'CL',
-            'postal_code' => '7500599',
-        ),
-        'CZ' => array(
-            'name' => 'Czech Republic',
-            'code' => 'CZ',
-            'postal_code' => '186 00',
-        ),
-        'SE' => array(
-            'name' => 'Sweden',
-            'code' => 'SE',
-            'postal_code' => '103 16',
-        ),
-    );
 
     /**
      * Returns a list of supported country DTOs.
@@ -92,7 +35,7 @@ class WarehouseCountryService extends CountryService
      */
     public function getSupportedCountries($associative = true)
     {
-        $countries = array_merge(static::$supportedCountries, static::$additionalWarehouseCountries);
+        $countries = $this->getBrandConfigurationService()->get()->warehouseCountries;
 
         foreach ($countries as $country) {
             $country['name'] = Translator::translate('countries.' . $country['code']);
@@ -111,6 +54,8 @@ public function getSupportedCountries($associative = true)
      */
     public function isCountrySupported($isoCode)
     {
-        return array_key_exists($isoCode, array_merge(static::$supportedCountries, static::$additionalWarehouseCountries));
+        $countries = $this->getBrandConfigurationService()->get()->warehouseCountries;
+
+        return array_key_exists($isoCode, $countries);
     }
 }

From 91e5aef6f0be9e494f154f4c85109a4002e953f5 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Thu, 4 Mar 2021 13:14:50 +0100
Subject: [PATCH 08/37] Replace hardcoded registration and warehouse countries

Code review fixes.

PLCR24-13
---
 CHANGELOG.md                                  | 18 +++++++++++++
 src/BusinessLogic/Country/CountryService.php  | 27 ++++++++++++++++---
 .../Country/WarehouseCountryService.php       |  8 ++----
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb6a8481..1429441d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,24 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - Added additional ISO codes to the postal code transformer.
 - Added missing carrier logos for Italy and Spain.
 
+**BREAKING CHANGES**
+Whitelabel project changes:
+
+## Added
+- Added BrandConfigurationService.
+- Added PacklinkConfigurationService.
+
+### Changed
+- Removed hardcoded source value from ShippingServiceSearch.
+- Removed hardcoded platform code from Proxy, Draft and RegistrationRequest.
+- Removed platform country code from RegisterModalController.js.
+- Added platform_country to RegistrationController:getRegisterData response.
+- RegisterController.js function populateInitialValues() populates platform_country.
+- Registration link and platform country removed from CountryService::$supportedCountries.
+- Removed Packlink\BusinessLogic\Country\RegistrationCountry.
+- Added validation for platform country in RegistrationRequest::doValidate and UserAccountService::initializeUser.
+- Removed $supportedCountries from CountryService and WarehouseCountryService.
+
 ## [3.1.0](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.0.6...v3.1.0) - 2020-12-11
 ### Added
 - Added postal code transformer service that transforms postal code into supported postal code format for some countries.
diff --git a/src/BusinessLogic/Country/CountryService.php b/src/BusinessLogic/Country/CountryService.php
index 2da96846..b5ae8016 100644
--- a/src/BusinessLogic/Country/CountryService.php
+++ b/src/BusinessLogic/Country/CountryService.php
@@ -5,6 +5,8 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\BaseService;
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+use Packlink\BusinessLogic\DTO\Exceptions\FrontDtoNotRegisteredException;
+use Packlink\BusinessLogic\DTO\Exceptions\FrontDtoValidationException;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\Language\Translator;
 
@@ -62,15 +64,32 @@ public function isBaseCountry($countryCode)
      */
     public function getSupportedCountries($associative = true)
     {
-        $countries = array();
         $brand = $this->getBrandConfigurationService()->get();
+        $countries = $this->formatCountries($brand->registrationCountries);
 
-        foreach ($brand->registrationCountries as $country) {
+        return $associative ? $countries : array_values($countries);
+    }
+
+    /**
+     * Formats country DTOs.
+     *
+     * @param $countries
+     *
+     * @return Country[]
+     *
+     * @throws FrontDtoNotRegisteredException
+     * @throws FrontDtoValidationException
+     */
+    protected function formatCountries($countries)
+    {
+        $formattedCountries = array();
+
+        foreach ($countries as $country) {
             $country['name'] = Translator::translate('countries.' . $country['code']);
-            $countries[$country['code']] = FrontDtoFactory::get(Country::CLASS_KEY, $country);
+            $formattedCountries[$country['code']] = FrontDtoFactory::get(Country::CLASS_KEY, $country);
         }
 
-        return $associative ? $countries : array_values($countries);
+        return $formattedCountries;
     }
 
     /**
diff --git a/src/BusinessLogic/Country/WarehouseCountryService.php b/src/BusinessLogic/Country/WarehouseCountryService.php
index 1a7c6a1c..e71f25ec 100644
--- a/src/BusinessLogic/Country/WarehouseCountryService.php
+++ b/src/BusinessLogic/Country/WarehouseCountryService.php
@@ -36,13 +36,9 @@ class WarehouseCountryService extends CountryService
     public function getSupportedCountries($associative = true)
     {
         $countries = $this->getBrandConfigurationService()->get()->warehouseCountries;
+        $formattedCountries = $this->formatCountries($countries);
 
-        foreach ($countries as $country) {
-            $country['name'] = Translator::translate('countries.' . $country['code']);
-            $countries[$country['code']] = FrontDtoFactory::get(Country::CLASS_KEY, $country);
-        }
-
-        return $associative ? $countries : array_values($countries);
+        return $associative ? $formattedCountries : array_values($formattedCountries);
     }
 
     /**

From aba277297565429a5a0d9a2300ca01a25e382c50 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Thu, 4 Mar 2021 14:31:30 +0100
Subject: [PATCH 09/37] Transform DemoUI to be white label compatible

PLCR24-14
---
 src/DemoUI/.gitignore                              |  8 ++++----
 src/DemoUI/Lib/Composer.php                        |  2 +-
 src/DemoUI/index.php                               | 10 ++++++++++
 src/DemoUI/run.sh                                  | 10 +++++++++-
 src/DemoUI/src/Services/Integration/UrlService.php |  6 ++++--
 src/DemoUI/src/Views/{ => PRO}/index.php           |  4 ++--
 src/DemoUI/src/Views/{ => PRO}/resources/.gitkeep  |  0
 7 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 src/DemoUI/index.php
 rename src/DemoUI/src/Views/{ => PRO}/index.php (99%)
 rename src/DemoUI/src/Views/{ => PRO}/resources/.gitkeep (100%)

diff --git a/src/DemoUI/.gitignore b/src/DemoUI/.gitignore
index 92a15be4..5bdadde1 100644
--- a/src/DemoUI/.gitignore
+++ b/src/DemoUI/.gitignore
@@ -1,6 +1,6 @@
 # Custom content
 vendor
-src/Views/resources/js/
-src/Views/resources/images/
-src/Views/resources/css/location/
-src/Views/resources/css/*
+src/Views/PRO/resources/js/
+src/Views/PRO/resources/images/
+src/Views/PRO/resources/css/location/
+src/Views/PRO/resources/css/*
diff --git a/src/DemoUI/Lib/Composer.php b/src/DemoUI/Lib/Composer.php
index e93b10c3..0ef75b08 100644
--- a/src/DemoUI/Lib/Composer.php
+++ b/src/DemoUI/Lib/Composer.php
@@ -9,7 +9,7 @@ class Composer
     public static function postUpdate()
     {
         $fromBase = __DIR__ . '/../../BusinessLogic/Resources/';
-        $toBase = __DIR__ . '/../src/Views/resources/';
+        $toBase = __DIR__ . '/../src/Views/PRO/resources/';
 
         $map = array(
             $fromBase . 'js' => $toBase . 'js',
diff --git a/src/DemoUI/index.php b/src/DemoUI/index.php
new file mode 100644
index 00000000..07ef4980
--- /dev/null
+++ b/src/DemoUI/index.php
@@ -0,0 +1,10 @@
+<?php
+
+use Packlink\DemoUI\Bootstrap;
+
+require_once __DIR__ . "/vendor/autoload.php";
+
+Bootstrap::init();
+
+$brandPlatformCode = getenv('PL_PLATFORM');
+require_once __DIR__ . "/src/Views/" . $brandPlatformCode . "/index.php";
\ No newline at end of file
diff --git a/src/DemoUI/run.sh b/src/DemoUI/run.sh
index 15003c1c..43bae29e 100644
--- a/src/DemoUI/run.sh
+++ b/src/DemoUI/run.sh
@@ -2,6 +2,14 @@
 
 composer install
 
-xdg-open http://localhost:7000/Views/index.php
+PL_PLATFORM="$1"
+
+if [ "$PL_PLATFORM" = "" ]; then
+  PL_PLATFORM = "PRO"
+fi
+
+export PL_PLATFORM
+
+xdg-open http://localhost:7000/Views/$PL_PLATFORM/index.php
 
 cd $PWD/src && php -S localhost:7000
\ No newline at end of file
diff --git a/src/DemoUI/src/Services/Integration/UrlService.php b/src/DemoUI/src/Services/Integration/UrlService.php
index a7fe56a7..c96f2c3f 100644
--- a/src/DemoUI/src/Services/Integration/UrlService.php
+++ b/src/DemoUI/src/Services/Integration/UrlService.php
@@ -30,8 +30,9 @@ public static function getEndpointUrl($controllerName, $action)
     public static function getResourceUrl($filePath = '')
     {
         $schema = empty($_SERVER['HTTPS']) ? 'http' : 'https';
+        $brandPlatformCode = getenv('PL_PLATFORM');
 
-        return "{$schema}://{$_SERVER['HTTP_HOST']}/Views/resources" . ($filePath ? '/' . $filePath : '');
+        return "{$schema}://{$_SERVER['HTTP_HOST']}/Views/$brandPlatformCode/resources" . ($filePath ? '/' . $filePath : '');
     }
 
     /**
@@ -42,7 +43,8 @@ public static function getResourceUrl($filePath = '')
     public static function getHomepage()
     {
         $schema = empty($_SERVER['HTTPS']) ? 'http' : 'https';
+        $brandPlatformCode = getenv('PL_PLATFORM');
 
-        return "{$schema}://{$_SERVER['HTTP_HOST']}/Views/index.php";
+        return "{$schema}://{$_SERVER['HTTP_HOST']}/Views/$brandPlatformCode/index.php";
     }
 }
diff --git a/src/DemoUI/src/Views/index.php b/src/DemoUI/src/Views/PRO/index.php
similarity index 99%
rename from src/DemoUI/src/Views/index.php
rename to src/DemoUI/src/Views/PRO/index.php
index 46c6dbbb..35c2dffb 100644
--- a/src/DemoUI/src/Views/index.php
+++ b/src/DemoUI/src/Views/PRO/index.php
@@ -3,7 +3,7 @@
 use Logeecom\Infrastructure\Configuration\Configuration;
 use Packlink\DemoUI\Services\Integration\UrlService;
 
-require_once __DIR__ . '/../../vendor/autoload.php';
+require_once __DIR__ . '/../../../vendor/autoload.php';
 
 Configuration::setCurrentLanguage('en');
 $lang = Configuration::getCurrentLanguage() ?: 'en';
@@ -139,7 +139,7 @@ function getUrl($controller, $action)
 
 <script>
     <?php
-    $baseResourcesPath = __DIR__ . '/../../../BusinessLogic/Resources/';
+    $baseResourcesPath = __DIR__ . '/../../../../BusinessLogic/Resources/';
     ?>
     document.addEventListener(
         'DOMContentLoaded',
diff --git a/src/DemoUI/src/Views/resources/.gitkeep b/src/DemoUI/src/Views/PRO/resources/.gitkeep
similarity index 100%
rename from src/DemoUI/src/Views/resources/.gitkeep
rename to src/DemoUI/src/Views/PRO/resources/.gitkeep

From 6839a30ffcb5b47a440a0acef07a8a7a64940e9a Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Thu, 4 Mar 2021 16:07:21 +0100
Subject: [PATCH 10/37] Add Acme DemoUI brand

PLCR24-15
---
 src/DemoUI/.gitignore                         |   4 +
 src/DemoUI/src/Bootstrap.php                  |  27 ++
 .../Brands/Acme/AcmeConfigurationService.php  |  85 +++++
 src/DemoUI/src/Views/ACME/index.php           | 323 ++++++++++++++++++
 src/DemoUI/src/Views/ACME/resources/.gitkeep  |   0
 5 files changed, 439 insertions(+)
 create mode 100644 src/DemoUI/src/Brands/Acme/AcmeConfigurationService.php
 create mode 100644 src/DemoUI/src/Views/ACME/index.php
 create mode 100644 src/DemoUI/src/Views/ACME/resources/.gitkeep

diff --git a/src/DemoUI/.gitignore b/src/DemoUI/.gitignore
index 5bdadde1..840e4a6e 100644
--- a/src/DemoUI/.gitignore
+++ b/src/DemoUI/.gitignore
@@ -4,3 +4,7 @@ src/Views/PRO/resources/js/
 src/Views/PRO/resources/images/
 src/Views/PRO/resources/css/location/
 src/Views/PRO/resources/css/*
+src/Views/ACME/resources/js/
+src/Views/ACME/resources/images/
+src/Views/ACME/resources/css/location/
+src/Views/ACME/resources/css/*
\ No newline at end of file
diff --git a/src/DemoUI/src/Bootstrap.php b/src/DemoUI/src/Bootstrap.php
index fc89976c..c2dde899 100644
--- a/src/DemoUI/src/Bootstrap.php
+++ b/src/DemoUI/src/Bootstrap.php
@@ -17,7 +17,9 @@
 use Logeecom\Infrastructure\TaskExecution\QueueItem;
 use Logeecom\Tests\Infrastructure\Common\TestComponents\ORM\MemoryQueueItemRepository;
 use Logeecom\Tests\Infrastructure\Common\TestComponents\TestRegistrationInfoService;
+use Packlink\Brands\Packlink\PacklinkConfigurationService;
 use Packlink\BusinessLogic\BootstrapComponent;
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\Order\Interfaces\ShopOrderService as ShopOrderServiceInterface;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
@@ -27,6 +29,7 @@
 use Packlink\BusinessLogic\ShippingMethod\Interfaces\ShopShippingMethodService;
 use Packlink\BusinessLogic\ShippingMethod\Models\ShippingMethod;
 use Packlink\BusinessLogic\User\UserAccountService;
+use Packlink\DemoUI\Brands\Acme\AcmeConfigurationService;
 use Packlink\DemoUI\Repository\SessionRepository;
 use Packlink\DemoUI\Services\BusinessLogic\CarrierService;
 use Packlink\DemoUI\Services\BusinessLogic\ConfigurationService;
@@ -112,6 +115,7 @@ protected static function initServices()
         parent::initServices();
 
         static::$instance->initInstanceServices();
+        static::$instance->initBrandService();
     }
 
     /**
@@ -197,4 +201,27 @@ function () use ($instance) {
             }
         );
     }
+
+    protected function initBrandService()
+    {
+        $brandPlatformCode = getenv('PL_PLATFORM');
+
+        switch ($brandPlatformCode) {
+            case 'PRO':
+                ServiceRegister::registerService(
+                    BrandConfigurationService::CLASS_NAME,
+                    function () {
+                        return new PacklinkConfigurationService();
+                    }
+                );
+                break;
+            case 'ACME':
+                ServiceRegister::registerService(
+                    BrandConfigurationService::CLASS_NAME,
+                    function () {
+                        return new AcmeConfigurationService();
+                    }
+                );
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/AcmeConfigurationService.php b/src/DemoUI/src/Brands/Acme/AcmeConfigurationService.php
new file mode 100644
index 00000000..ffbb46a4
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/AcmeConfigurationService.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Packlink\DemoUI\Brands\Acme;
+
+use Packlink\BusinessLogic\Brand\BrandConfigurationService;
+use Packlink\BusinessLogic\Brand\DTO\BrandConfiguration;
+
+/**
+ * Class AcmeConfigurationService
+ *
+ * @package Packlink\DemoUI\Brands\Acme
+ */
+class AcmeConfigurationService implements BrandConfigurationService
+{
+
+    /**
+     * Allowed values for platform countries.
+     *
+     * @var string[]
+     */
+    protected static $supportedPlatformCountries = array(
+        'ES',
+        'DE',
+        'FR',
+        'IT',
+        'UN',
+    );
+    /**
+     * List of supported registration countries.
+     *
+     * @var array
+     */
+    protected static $supportedRegistrationCountries = array(
+        'ES' => array(
+            'code' => 'ES',
+            'postal_code' => '28001',
+        ),
+        'DE' => array(
+            'code' => 'DE',
+            'postal_code' => '10115',
+        ),
+        'FR' => array(
+            'code' => 'FR',
+            'postal_code' => '75001',
+        ),
+        'IT' => array(
+            'code' => 'IT',
+            'postal_code' => '00118',
+        ),
+    );
+    /**
+     * List of countries available only for warehouse selection.
+     *
+     * @var array
+     */
+    protected static $additionalWarehouseCountries = array(
+        'PL' => array(
+            'code' => 'PL',
+            'postal_code' => '00-694',
+        ),
+        'CH' => array(
+            'code' => 'CH',
+            'postal_code' => '3000',
+        ),
+    );
+
+    /**
+     * @inheritDoc
+     */
+    public function get()
+    {
+        $brandConfiguration = new BrandConfiguration();
+
+        $brandConfiguration->platformCode = 'PRO';
+        $brandConfiguration->shippingServiceSource = 'PRO';
+        $brandConfiguration->platformCountries = static::$supportedPlatformCountries;
+        $brandConfiguration->registrationCountries = static::$supportedRegistrationCountries;
+        $brandConfiguration->warehouseCountries = array_merge(
+            static::$supportedRegistrationCountries,
+            static::$additionalWarehouseCountries
+        );
+
+        return $brandConfiguration;
+    }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
new file mode 100644
index 00000000..35c2dffb
--- /dev/null
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -0,0 +1,323 @@
+<?php
+
+use Logeecom\Infrastructure\Configuration\Configuration;
+use Packlink\DemoUI\Services\Integration\UrlService;
+
+require_once __DIR__ . '/../../../vendor/autoload.php';
+
+Configuration::setCurrentLanguage('en');
+$lang = Configuration::getCurrentLanguage() ?: 'en';
+
+function getUrl($controller, $action)
+{
+    echo UrlService::getEndpointUrl($controller, $action);
+}
+
+?>
+<!DOCTYPE html>
+<html lang="<?php
+echo $lang ?>">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Demo UI</title>
+    <link rel="icon" href="data:;base64,iVBORwOKGO="/>
+    <link rel="stylesheet" type="text/css" href="./resources/css/app.css"/>
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Outlined"
+          rel="stylesheet">
+    <style>
+        /*This is just for the demo page and should not be used in any integration*/
+        html, body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            background-color: #e6e6e6;
+            box-sizing: border-box;
+        }
+
+        body {
+            display: flex;
+            padding: 20px;
+        }
+
+        @media (max-width: 768px) {
+            body {
+                padding: 0;
+            }
+
+            aside {
+                display: none;
+            }
+        }
+    </style>
+</head>
+<body>
+<aside style="width: 250px">
+    <a id="logout" href="<?php
+    getUrl('Login', 'logout') ?>">Logout</a>
+</aside>
+
+<!-- This is a main placeholder that should be used in all integrations -->
+<div id="pl-page">
+    <header id="pl-main-header">
+        <div class="pl-main-logo">
+            <img src="https://cdn.packlink.com/apps/giger/logos/packlink-pro.svg" alt="logo">
+        </div>
+        <div class="pl-header-holder" id="pl-header-section"></div>
+    </header>
+
+    <main id="pl-main-page-holder"></main>
+
+    <div class="pl-spinner pl-hidden" id="pl-spinner">
+        <div></div>
+    </div>
+
+    <template id="pl-alert">
+        <div class="pl-alert-wrapper">
+            <div class="pl-alert">
+                <span class="pl-alert-text"></span>
+                <i class="material-icons">close</i>
+            </div>
+        </div>
+    </template>
+
+    <template id="pl-modal">
+        <div id="pl-modal-mask" class="pl-modal-mask pl-hidden">
+            <div class="pl-modal">
+                <div class="pl-modal-close-button">
+                    <i class="material-icons">close</i>
+                </div>
+                <div class="pl-modal-title">
+
+                </div>
+                <div class="pl-modal-body">
+
+                </div>
+                <div class="pl-modal-footer">
+                </div>
+            </div>
+        </div>
+    </template>
+
+    <template id="pl-error-template">
+        <div class="pl-error-message" data-pl-element="error">
+        </div>
+    </template>
+</div>
+
+<script src="./resources/js/AjaxService.js"></script>
+<script src="./resources/js/TranslationService.js"></script>
+<script src="./resources/js/ModalService.js"></script>
+<script src="./resources/js/TemplateService.js"></script>
+<script src="./resources/js/UtilityService.js"></script>
+<script src="./resources/js/ValidationService.js"></script>
+<script src="./resources/js/GridResizerService.js"></script>
+<script src="./resources/js/ResponseService.js"></script>
+<script src="./resources/js/StateController.js"></script>
+<script src="./resources/js/PageControllerFactory.js"></script>
+
+<script src="./resources/js/LoginController.js"></script>
+<script src="./resources/js/RegisterModalController.js"></script>
+<script src="./resources/js/RegisterController.js"></script>
+
+<script src="./resources/js/OnboardingStateController.js"></script>
+<script src="./resources/js/OnboardingWelcomeController.js"></script>
+<script src="./resources/js/OnboardingOverviewController.js"></script>
+<script src="./resources/js/DefaultParcelController.js"></script>
+<script src="./resources/js/DefaultWarehouseController.js"></script>
+
+<script src="./resources/js/ConfigurationController.js"></script>
+<script src="./resources/js/SystemInfoController.js"></script>
+<script src="./resources/js/OrderStatusMappingController.js"></script>
+
+<script src="./resources/js/MyShippingServicesController.js"></script>
+<script src="./resources/js/PickShippingServiceController.js"></script>
+<script src="./resources/js/ShippingServicesRenderer.js"></script>
+<script src="./resources/js/EditServiceController.js"></script>
+<script src="./resources/js/ServiceCountriesModalController.js"></script>
+<script src="./resources/js/PricePolicyController.js"></script>
+<script src="./resources/js/StateUUIDService.js"></script>
+
+<script>
+    <?php
+    $baseResourcesPath = __DIR__ . '/../../../../BusinessLogic/Resources/';
+    ?>
+    document.addEventListener(
+        'DOMContentLoaded',
+        () => {
+            Packlink.translations = {
+                default: <?php echo file_get_contents($baseResourcesPath . 'lang/en.json') ?>,
+                current: <?php $langFile = $baseResourcesPath . 'lang/' . $lang . '.json';
+                echo file_exists($langFile) ? file_get_contents($langFile) : ''
+                ?>,
+            };
+
+            const pageConfiguration = {
+                'login': {
+                    submit: "<?php getUrl('Login', 'login') ?>",
+                    listOfCountriesUrl: "<?php getUrl('Country', 'get') ?>",
+                    logoPath: "<?php echo UrlService::getResourceUrl('images/flags') ?>"
+                },
+                'register': {
+                    getRegistrationData: "<?php getUrl('Registration', 'get') ?>",
+                    submit: "<?php getUrl('Registration', 'post') ?>"
+                },
+                'onboarding-state': {
+                    getState: "<?php getUrl('Onboarding', 'getCurrentState') ?>"
+                },
+                'onboarding-welcome': {},
+                'onboarding-overview': {
+                    defaultParcelGet: "<?php getUrl('DefaultParcel', 'getDefaultParcel') ?>",
+                    defaultWarehouseGet: "<?php getUrl('DefaultWarehouse', 'getDefaultWarehouse') ?>"
+                },
+                'default-parcel': {
+                    getUrl: "<?php getUrl('DefaultParcel', 'getDefaultParcel') ?>",
+                    submitUrl: "<?php getUrl('DefaultParcel', 'setDefaultParcel') ?>"
+                },
+                'default-warehouse': {
+                    getUrl: "<?php getUrl('DefaultWarehouse', 'getDefaultWarehouse') ?>",
+                    getSupportedCountriesUrl: "<?php getUrl('DefaultWarehouse', 'getSupportedCountries') ?>",
+                    submitUrl: "<?php getUrl('DefaultWarehouse', 'setDefaultWarehouse') ?>",
+                    searchPostalCodesUrl: "<?php getUrl('DefaultWarehouse', 'searchPostalCodes') ?>"
+                },
+                'configuration': {
+                    getDataUrl: "<?php getUrl('Configuration', 'getData')?>"
+                },
+                'system-info': {
+                    getStatusUrl: "<?php getUrl('Debug', 'getStatus') ?>",
+                    setStatusUrl: "<?php getUrl('Debug', 'setStatus') ?>"
+                },
+                'order-status-mapping': {
+                    getMappingAndStatusesUrl: "<?php getUrl('OrderStatusMapping', 'getMappingAndStatuses') ?>",
+                    setUrl: "<?php getUrl('OrderStatusMapping', 'setMappings') ?>"
+                },
+                'my-shipping-services': {
+                    getServicesUrl: "<?php getUrl('ShippingMethods', 'getActive') ?>",
+                    deleteServiceUrl: "<?php getUrl('ShippingMethods', 'deactivate') ?>",
+                },
+                'pick-shipping-service': {
+                    getServicesUrl: "<?php getUrl('ShippingMethods', 'getInactive') ?>",
+                    getActiveServicesUrl: "<?php getUrl('ShippingMethods', 'getActive') ?>",
+                    getTaskStatusUrl: "<?php getUrl('ShippingMethods', 'getTaskStatus') ?>",
+                    startAutoConfigureUrl: "<?php getUrl('AutoConfigure', 'start') ?>",
+                    disableCarriersUrl: "<?php getUrl('ShippingMethods', 'deactivate') ?>"
+                },
+                'edit-service': {
+                    getServiceUrl: "<?php getUrl('ShippingMethods', 'getService') ?>",
+                    saveServiceUrl: "<?php getUrl('ShippingMethods', 'save') ?>",
+                    getTaxClassesUrl: "<?php getUrl('ShippingMethods', 'getTaxClasses') ?>",
+                    getCountriesListUrl: "<?php getUrl('Country', 'getShippingCountries') ?>",
+                    hasTaxConfiguration: true,
+                    hasCountryConfiguration: true,
+                    canDisplayCarrierLogos: true
+                }
+            };
+
+            Packlink.state = new Packlink.StateController(
+                {
+                    baseResourcesUrl: "<?php echo UrlService::getResourceUrl() ?>",
+                    stateUrl: "<?php getUrl('ModuleState', 'getCurrentState') ?>",
+                    pageConfiguration: pageConfiguration,
+                    templates: {
+                        'pl-login-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/login.html')
+                            ) ?>
+                        },
+                        'pl-register-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/register.html')
+                            ) ?>
+                        },
+                        'pl-register-modal': <?php echo json_encode(
+                            file_get_contents($baseResourcesPath . 'templates/register-modal.html')
+                        ) ?>,
+                        'pl-onboarding-welcome-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/onboarding-welcome.html')
+                            ) ?>
+                        },
+                        'pl-onboarding-overview-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/onboarding-overview.html')
+                            ) ?>
+                        },
+                        'pl-default-parcel-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/default-parcel.html')
+                            ) ?>
+                        },
+                        'pl-default-warehouse-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/default-warehouse.html')
+                            ) ?>
+                        },
+                        'pl-configuration-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/configuration.html')
+                            ) ?>,
+                            'pl-header-section': ''
+                        },
+                        'pl-order-status-mapping-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/order-status-mapping.html')
+                            ) ?>,
+                            'pl-header-section': ''
+                        },
+                        'pl-system-info-modal': <?php echo json_encode(
+                            file_get_contents($baseResourcesPath . 'templates/system-info-modal.html')
+                        ) ?>,
+                        'pl-my-shipping-services-page': {
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/my-shipping-services.html')
+                            ) ?>,
+                            'pl-header-section': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/shipping-services-header.html')
+                            ) ?>,
+                            'pl-shipping-services-table': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/shipping-services-table.html')
+                            ) ?>,
+                            'pl-shipping-services-list': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/shipping-services-list.html')
+                            ) ?>
+                        },
+                        'pl-disable-carriers-modal': <?php echo json_encode(
+                            file_get_contents($baseResourcesPath . 'templates/disable-carriers-modal.html')
+                        ) ?>,
+                        'pl-pick-service-page': {
+                            'pl-header-section': '',
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/pick-shipping-services.html')
+                            ) ?>,
+                            'pl-shipping-services-table': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/shipping-services-table.html')
+                            ) ?>,
+                            'pl-shipping-services-list': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/shipping-services-list.html')
+                            ) ?>
+                        },
+                        'pl-edit-service-page': {
+                            'pl-header-section': '',
+                            'pl-main-page-holder': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/edit-shipping-service.html')
+                            ) ?>,
+                            'pl-pricing-policies': <?php echo json_encode(
+                                file_get_contents($baseResourcesPath . 'templates/pricing-policies-list.html')
+                            ) ?>
+                        },
+                        'pl-pricing-policy-modal': <?php echo json_encode(
+                            file_get_contents($baseResourcesPath . 'templates/pricing-policy-modal.html')
+                        ) ?>,
+                        'pl-countries-selection-modal': <?php echo json_encode(
+                            file_get_contents($baseResourcesPath . 'templates/countries-selection-modal.html')
+                        ) ?>,
+                    }
+                }
+            );
+
+            Packlink.state.display();
+        },
+        false
+    );
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/DemoUI/src/Views/ACME/resources/.gitkeep b/src/DemoUI/src/Views/ACME/resources/.gitkeep
new file mode 100644
index 00000000..e69de29b

From e3b57424ee162b717ba1bae3174009ba441d6fa8 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 12 Mar 2021 13:33:33 +0100
Subject: [PATCH 11/37] Implement hierarchical content extending of key/value
 files

PLCR24-16
---
 CHANGELOG.md                                  |  7 +-
 .../FileResolver/FileResolverService.php      | 77 ++++++++++++++++
 .../FileResolver/FileResolverServiceTest.php  | 92 +++++++++++++++++++
 .../FileResolver/Translations/en.json         |  4 +
 .../FileResolver/Translations/fr.json         |  6 ++
 5 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 src/BusinessLogic/FileResolver/FileResolverService.php
 create mode 100644 tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
 create mode 100644 tests/BusinessLogic/FileResolver/Translations/en.json
 create mode 100644 tests/BusinessLogic/FileResolver/Translations/fr.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1429441d..63d5f25e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,11 +11,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 **BREAKING CHANGES**
 Whitelabel project changes:
 
-## Added
-- Added BrandConfigurationService.
+### Added
+- Added BrandConfigurationService. Integration should register PacklinkConfigurationService instance for Packlink brand or adequate implementation for other brand(s) during the bootstraping.
 - Added PacklinkConfigurationService.
+- Added FileResolverService. Integration should initialize FileResolverService with an array of folders where source files should be searched for.
 
 ### Changed
+
+Following changes will work properly once BrandConfigurationService is registered in Bootstrap:
 - Removed hardcoded source value from ShippingServiceSearch.
 - Removed hardcoded platform code from Proxy, Draft and RegistrationRequest.
 - Removed platform country code from RegisterModalController.js.
diff --git a/src/BusinessLogic/FileResolver/FileResolverService.php b/src/BusinessLogic/FileResolver/FileResolverService.php
new file mode 100644
index 00000000..f582bd66
--- /dev/null
+++ b/src/BusinessLogic/FileResolver/FileResolverService.php
@@ -0,0 +1,77 @@
+<?php
+
+
+namespace Packlink\BusinessLogic\FileResolver;
+
+/**
+ * Class FileResolverService
+ *
+ * @package Packlink\BusinessLogic\FileResolver
+ */
+class FileResolverService
+{
+    /**
+     * Array of folders where the source files should be searched for.
+     *
+     * @var array
+     */
+    protected $folders;
+
+    /**
+     * FileResolverService constructor.
+     *
+     * @param $folders
+     */
+    public function __construct($folders)
+    {
+        $this->folders = $folders;
+    }
+
+    /**
+     * Returns merged content of the requested source file.
+     *
+     * @param string $sourceFile
+     *
+     * @return array
+     */
+    public function getContent($sourceFile)
+    {
+        $content = array();
+
+        foreach ($this->folders as $folder) {
+            $filePath = $folder . '/' . $sourceFile . '.json';
+
+            if (!file_exists($filePath)) {
+                continue;
+            }
+
+            $serializedJson = file_get_contents($filePath);
+
+            if ($serializedJson) {
+                $content[] = json_decode($serializedJson, true);
+            }
+        }
+
+        return $content === array() ? $content : call_user_func_array('array_merge', $content);
+    }
+
+    /**
+     * Adds new folder to the folders array.
+     *
+     * @param string $folder
+     */
+    public function addFolder($folder)
+    {
+        $this->folders[] = $folder;
+    }
+
+    /**
+     * Gets folders array.
+     *
+     * @return array
+     */
+    public function getFolders()
+    {
+        return $this->folders;
+    }
+}
diff --git a/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php b/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
new file mode 100644
index 00000000..c1682af5
--- /dev/null
+++ b/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
@@ -0,0 +1,92 @@
+<?php
+
+
+namespace Logeecom\Tests\BusinessLogic\FileResolver;
+
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class FileResolverServiceTest
+ *
+ * @package Logeecom\Tests\BusinessLogic\FileResolver
+ */
+class FileResolverServiceTest extends TestCase
+{
+    private static $englishValues = array(
+        'testKey' => 'testValueEn 2',
+        'testKey1' => 'testValueEn1',
+        'testKey2' => 'testValueEn2'
+    );
+    private static $frenchValues = array(
+        'testKey' => 'testValueFr',
+        'namespace' => array(
+            'nestedKeyWithPlaceholder' => 'Nested key fr.'
+        )
+    );
+
+    /**
+     * @var FileResolverService
+     */
+    private $fileResolverService;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->fileResolverService = new FileResolverService(
+            array(
+                __DIR__ . '/../Language/Translations',
+                __DIR__ . '/Translations'
+            )
+        );
+    }
+
+    /**
+     * Tests getContent function when files exist.
+     */
+    public function testGetContentFilesExist()
+    {
+        $content = $this->fileResolverService->getContent('en');
+
+        $this->assertEquals(static::$englishValues, $content);
+    }
+
+    /**
+     * Tests getContent function when files do not exist.
+     */
+    public function testGetContentFilesDoNotExist()
+    {
+        $content = $this->fileResolverService->getContent('rs');
+
+        $this->assertEquals(array(), $content);
+    }
+
+    /**
+     * Tests getContent function when one file exists and the other one does not exist.
+     */
+    public function testGetContentOneFileDoesNotExist()
+    {
+        $content = $this->fileResolverService->getContent('fr');
+
+        $this->assertEquals(static::$frenchValues, $content);
+    }
+
+    /**
+     * Test addFolder function.
+     */
+    public function testAddFolder()
+    {
+        $this->fileResolverService->addFolder(__DIR__);
+
+        $folders = $this->fileResolverService->getFolders();
+
+        $this->assertEquals(
+            array(
+                __DIR__ . '/../Language/Translations',
+                __DIR__ . '/Translations',
+                __DIR__
+            ),
+            $folders);
+    }
+}
\ No newline at end of file
diff --git a/tests/BusinessLogic/FileResolver/Translations/en.json b/tests/BusinessLogic/FileResolver/Translations/en.json
new file mode 100644
index 00000000..39e741a8
--- /dev/null
+++ b/tests/BusinessLogic/FileResolver/Translations/en.json
@@ -0,0 +1,4 @@
+{
+  "testKey": "testValueEn 2",
+  "testKey2": "testValueEn2"
+}
\ No newline at end of file
diff --git a/tests/BusinessLogic/FileResolver/Translations/fr.json b/tests/BusinessLogic/FileResolver/Translations/fr.json
new file mode 100644
index 00000000..30887213
--- /dev/null
+++ b/tests/BusinessLogic/FileResolver/Translations/fr.json
@@ -0,0 +1,6 @@
+{
+  "testKey": "testValueFr",
+  "namespace": {
+    "nestedKeyWithPlaceholder": "Nested key fr."
+  }
+}
\ No newline at end of file

From 8e0307f46f920d07f9dba3ccde7e22c05e9253b2 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 12 Mar 2021 14:47:27 +0100
Subject: [PATCH 12/37] Transform DemoUI to be white label compatible

PLCR24-14
---
 src/DemoUI/run.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/DemoUI/run.sh b/src/DemoUI/run.sh
index 43bae29e..1cbbc41d 100644
--- a/src/DemoUI/run.sh
+++ b/src/DemoUI/run.sh
@@ -2,11 +2,7 @@
 
 composer install
 
-PL_PLATFORM="$1"
-
-if [ "$PL_PLATFORM" = "" ]; then
-  PL_PLATFORM = "PRO"
-fi
+PL_PLATFORM="${1:-"PRO"}"
 
 export PL_PLATFORM
 

From bcb0125bfa367a96af6bca9b28ee710e79a4d1bb Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 12 Mar 2021 14:54:43 +0100
Subject: [PATCH 13/37] Add Acme DemoUI brand

PLCR24-15
---
 src/DemoUI/Lib/Composer.php | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/DemoUI/Lib/Composer.php b/src/DemoUI/Lib/Composer.php
index 0ef75b08..1d31bcdb 100644
--- a/src/DemoUI/Lib/Composer.php
+++ b/src/DemoUI/Lib/Composer.php
@@ -9,14 +9,29 @@ class Composer
     public static function postUpdate()
     {
         $fromBase = __DIR__ . '/../../BusinessLogic/Resources/';
-        $toBase = __DIR__ . '/../src/Views/PRO/resources/';
+        $toBasePacklink = __DIR__ . '/../src/Views/PRO/resources/';
+        $toBaseAcme = __DIR__ . '/../src/Views/ACME/resources/';
 
-        $map = array(
-            $fromBase . 'js' => $toBase . 'js',
-            $fromBase . 'css' => $toBase . 'css',
-            $fromBase . 'images' => $toBase . 'images',
-        );
+        static::copy(array(
+            $fromBase . 'js' => $toBasePacklink . 'js',
+            $fromBase . 'css' => $toBasePacklink . 'css',
+            $fromBase . 'images' => $toBasePacklink . 'images',
+        ));
 
+        static::copy( array(
+            $fromBase . 'js' => $toBaseAcme . 'js',
+            $fromBase . 'css' => $toBaseAcme . 'css',
+            $fromBase . 'images' => $toBaseAcme . 'images',
+        ));
+    }
+
+    /**
+     * Copies directories according to data provided by $map parameter.
+     *
+     * @param array $map
+     */
+    private static function copy($map)
+    {
         foreach ($map as $from => $to) {
             self::copyDirectory($from, $to);
         }

From b9ba64e94b44f9a8b352c69ca834b3e369c197c4 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Fri, 12 Mar 2021 16:16:26 +0100
Subject: [PATCH 14/37] Refactor TranslationService to use hierarchical content
 extending

PLCR24-17
---
 CHANGELOG.md                                  |  6 ++
 src/BusinessLogic/BootstrapComponent.php      | 21 ++++-
 .../Controllers/RegistrationController.php    |  2 +-
 .../FileResolver/FileResolverService.php      |  4 +
 ...nslationService.php => CountryService.php} | 76 +++++++++--------
 ...nslationService.php => CountryService.php} | 16 +++-
 src/BusinessLogic/Language/Translator.php     |  4 +-
 .../Resources/{lang => countries}/de.json     |  0
 .../Resources/{lang => countries}/en.json     |  0
 .../Resources/{lang => countries}/es.json     |  0
 .../Resources/{lang => countries}/fr.json     |  0
 .../Resources/{lang => countries}/fromCSV.php |  2 +-
 .../Resources/{lang => countries}/it.json     |  0
 .../Resources/{lang => countries}/toCSV.php   |  0
 .../{lang => countries}/translations.csv      |  0
 src/BusinessLogic/Utility/UrlService.php      |  2 +-
 src/DemoUI/src/Controllers/Index.php          |  2 +-
 src/DemoUI/src/Views/ACME/index.php           |  8 +-
 src/DemoUI/src/Views/PRO/index.php            |  8 +-
 .../Configuration/Configuration.php           |  8 +-
 .../Common/BaseTestWithServices.php           | 21 ++++-
 ...tionService.php => TestCountryService.php} |  8 +-
 .../Language/TranslationServiceTest.php       | 82 +++++++++++++++----
 23 files changed, 183 insertions(+), 87 deletions(-)
 rename src/BusinessLogic/Language/{TranslationService.php => CountryService.php} (57%)
 rename src/BusinessLogic/Language/Interfaces/{TranslationService.php => CountryService.php} (73%)
 rename src/BusinessLogic/Resources/{lang => countries}/de.json (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/en.json (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/es.json (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/fr.json (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/fromCSV.php (96%)
 rename src/BusinessLogic/Resources/{lang => countries}/it.json (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/toCSV.php (100%)
 rename src/BusinessLogic/Resources/{lang => countries}/translations.csv (100%)
 rename tests/BusinessLogic/Language/{TestTranslationService.php => TestCountryService.php} (51%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63d5f25e..44913c8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,15 @@ Whitelabel project changes:
 - Added BrandConfigurationService. Integration should register PacklinkConfigurationService instance for Packlink brand or adequate implementation for other brand(s) during the bootstraping.
 - Added PacklinkConfigurationService.
 - Added FileResolverService. Integration should initialize FileResolverService with an array of folders where source files should be searched for.
+- Added new method getTranslations to \Packlink\BusinessLogic\Language\TranslationService (service renamed to CountryService).
 
 ### Changed
 
+- \Packlink\BusinessLogic\Language\TranslationService renamed to CountryService.
+- TranslationService::translate renamed to CountryService::getText.
+- Files from Resources/lang moved to Resources/countries. In integration, change path to translations to fit new folder names in core.
+- Configuration::getCurrentLanguage and Configuration::setCurrentLanguage changed to Configuration::getUICountryCode and Configuration::setUICountryCode.
+
 Following changes will work properly once BrandConfigurationService is registered in Bootstrap:
 - Removed hardcoded source value from ShippingServiceSearch.
 - Removed hardcoded platform code from Proxy, Draft and RegistrationRequest.
diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 12deb1c0..41a696f1 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -15,10 +15,11 @@
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
 use Packlink\BusinessLogic\DTO\ValidationError;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\BusinessLogic\Http\DTO\ParcelInfo;
 use Packlink\BusinessLogic\Http\Proxy;
-use Packlink\BusinessLogic\Language\Interfaces\TranslationService as TranslationServiceInterface;
-use Packlink\BusinessLogic\Language\TranslationService;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService as TranslationServiceInterface;
+use Packlink\BusinessLogic\Language\CountryService as CountryTranslationService;
 use Packlink\BusinessLogic\Location\LocationService;
 use Packlink\BusinessLogic\Order\OrderService;
 use Packlink\BusinessLogic\OrderShipmentDetails\OrderShipmentDetailsService;
@@ -169,10 +170,24 @@ function () {
             }
         );
 
+        ServiceRegister::registerService(
+            FileResolverService::CLASS_NAME,
+            function () {
+                return new FileResolverService(
+                    array(
+                        __DIR__ . '/Resources/countries',
+                    )
+                );
+            }
+        );
+
         ServiceRegister::registerService(
             TranslationServiceInterface::CLASS_NAME,
             function () {
-                return new TranslationService();
+                /** @var FileResolverService $fileResolverService */
+                $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
+
+                return new CountryTranslationService($fileResolverService);
             }
         );
 
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 2761f987..25650485 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -192,7 +192,7 @@ private function getLanguage()
             'it' => 'it_IT',
         );
 
-        $locale = Configuration::getCurrentLanguage();
+        $locale = Configuration::getUICountryCode();
         $language = 'en_GB';
 
         if (array_key_exists($locale, $supportedLanguages)) {
diff --git a/src/BusinessLogic/FileResolver/FileResolverService.php b/src/BusinessLogic/FileResolver/FileResolverService.php
index f582bd66..a85b4d1e 100644
--- a/src/BusinessLogic/FileResolver/FileResolverService.php
+++ b/src/BusinessLogic/FileResolver/FileResolverService.php
@@ -10,6 +10,10 @@
  */
 class FileResolverService
 {
+    /**
+     * Class name.
+     */
+    const CLASS_NAME = __CLASS__;
     /**
      * Array of folders where the source files should be searched for.
      *
diff --git a/src/BusinessLogic/Language/TranslationService.php b/src/BusinessLogic/Language/CountryService.php
similarity index 57%
rename from src/BusinessLogic/Language/TranslationService.php
rename to src/BusinessLogic/Language/CountryService.php
index a78efbf4..1d93cee8 100644
--- a/src/BusinessLogic/Language/TranslationService.php
+++ b/src/BusinessLogic/Language/CountryService.php
@@ -2,17 +2,16 @@
 
 namespace Packlink\BusinessLogic\Language;
 
-use Exception;
 use Logeecom\Infrastructure\Configuration\Configuration;
-use Logeecom\Infrastructure\Logger\Logger;
-use Packlink\BusinessLogic\Language\Interfaces\TranslationService as BaseService;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService as BaseService;
 
 /**
- * Class TranslationService.
+ * Class CountryService
  *
  * @package Packlink\BusinessLogic\Language
  */
-class TranslationService implements BaseService
+class CountryService implements BaseService
 {
     /**
      * Default language.
@@ -27,9 +26,9 @@ class TranslationService implements BaseService
     protected static $translations = array();
 
     /**
-     * @var string $translationsFileBasePath
+     * @var FileResolverService
      */
-    protected $translationsFileBasePath;
+    protected $fileResolverService;
 
     /**
      * @var string
@@ -39,15 +38,11 @@ class TranslationService implements BaseService
     /**
      * TranslationService constructor.
      *
-     * @param string|null $translationsFileBasePath
+     * @param FileResolverService $fileResolverService
      */
-    public function __construct($translationsFileBasePath = null)
+    public function __construct(FileResolverService $fileResolverService)
     {
-        $this->translationsFileBasePath = $translationsFileBasePath;
-
-        if (empty($this->translationsFileBasePath)) {
-            $this->translationsFileBasePath = __DIR__ . '/../Resources/lang';
-        }
+        $this->fileResolverService = $fileResolverService;
     }
 
     /**
@@ -64,9 +59,9 @@ public function __construct($translationsFileBasePath = null)
      *
      * @return string A translated string if translation is found; otherwise, the input key.
      */
-    public function translate($key, array $arguments = array())
+    public function getText($key, array $arguments = array())
     {
-        $this->currentLanguage = Configuration::getCurrentLanguage() ?: static::DEFAULT_LANG;
+        $this->currentLanguage = Configuration::getUICountryCode() ?: static::DEFAULT_LANG;
 
         if (empty(static::$translations[$this->currentLanguage])) {
             $this->initializeTranslations();
@@ -85,43 +80,48 @@ public function translate($key, array $arguments = array())
         return vsprintf($result, $arguments);
     }
 
+    /**
+     * Fetches translations for a specific country (provided by $countryCode parameter)
+     * and default country.
+     *
+     * @param string $countryCode
+     *
+     * @return array
+     */
+    public function getTranslations($countryCode)
+    {
+        $translations[$countryCode] = $this->fileResolverService->getContent($countryCode);
+        $translations[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
+
+        return $translations;
+    }
+
     /**
      * Initializes the translations from a file to in-memory map.
      */
     protected function initializeTranslations()
     {
         $languageLowerCase = strtolower($this->currentLanguage);
-        $this->translationsFileBasePath = rtrim($this->translationsFileBasePath, '/') . '/';
-        $translationFilePath = "{$this->translationsFileBasePath}{$languageLowerCase}.json";
-        $this->initializeLanguage($translationFilePath, $this->currentLanguage);
+        $this->initializeLanguage($languageLowerCase);
         $this->initializeFallbackLanguage();
     }
 
     /**
      * Initializes the language to translations dictionary.
      *
-     * @param $translationFilePath
      * @param $language
      */
-    protected function initializeLanguage($translationFilePath, $language)
+    protected function initializeLanguage($language)
     {
-        try {
-            $serializedJson = file_get_contents($translationFilePath);
-        } catch (Exception $ex) {
-            $serializedJson = false;
-            Logger::logWarning($ex->getMessage());
-        }
+        $translations = $this->fileResolverService->getContent($language);
 
-        if ($serializedJson !== false) {
-            $translations = json_decode($serializedJson, true);
-            foreach ($translations as $groupKey => $group) {
-                if (is_array($group)) {
-                    foreach ($group as $key => $value) {
-                        static::$translations[$language][$groupKey . '.' . $key] = $value;
-                    }
-                } else {
-                    static::$translations[$language][$groupKey] = $group;
+        foreach ($translations as $groupKey => $group) {
+            if (is_array($group)) {
+                foreach ($group as $key => $value) {
+                    static::$translations[$language][$groupKey . '.' . $key] = $value;
                 }
+            } else {
+                static::$translations[$language][$groupKey] = $group;
             }
         }
     }
@@ -132,9 +132,7 @@ protected function initializeLanguage($translationFilePath, $language)
     protected function initializeFallbackLanguage()
     {
         if (strtolower($this->currentLanguage) !== static::DEFAULT_LANG) {
-            $defaultLang = static::DEFAULT_LANG;
-            $translationFilePath = "{$this->translationsFileBasePath}{$defaultLang}.json";
-            $this->initializeLanguage($translationFilePath, static::DEFAULT_LANG);
+            $this->initializeLanguage(static::DEFAULT_LANG);
         }
     }
 
diff --git a/src/BusinessLogic/Language/Interfaces/TranslationService.php b/src/BusinessLogic/Language/Interfaces/CountryService.php
similarity index 73%
rename from src/BusinessLogic/Language/Interfaces/TranslationService.php
rename to src/BusinessLogic/Language/Interfaces/CountryService.php
index 8dcae2ab..2ccd96d8 100644
--- a/src/BusinessLogic/Language/Interfaces/TranslationService.php
+++ b/src/BusinessLogic/Language/Interfaces/CountryService.php
@@ -3,11 +3,11 @@
 namespace Packlink\BusinessLogic\Language\Interfaces;
 
 /**
- * Interface TranslationService
+ * Interface CountryService
  *
  * @package Packlink\BusinessLogic\Language\Interfaces
  */
-interface TranslationService
+interface CountryService
 {
     /**
      * Class name.
@@ -28,5 +28,15 @@ interface TranslationService
      *
      * @return string A translated string if translation is found; otherwise, the input key.
      */
-    public function translate($key, array $arguments = array());
+    public function getText($key, array $arguments = array());
+
+    /**
+     * Fetches translations for a specific country (provided by $countryCode parameter)
+     * and default country.
+     *
+     * @param string $countryCode
+     *
+     * @return array
+     */
+    public function getTranslations($countryCode);
 }
diff --git a/src/BusinessLogic/Language/Translator.php b/src/BusinessLogic/Language/Translator.php
index 152add01..a5fc4f3b 100644
--- a/src/BusinessLogic/Language/Translator.php
+++ b/src/BusinessLogic/Language/Translator.php
@@ -3,7 +3,7 @@
 namespace Packlink\BusinessLogic\Language;
 
 use Logeecom\Infrastructure\ServiceRegister;
-use Packlink\BusinessLogic\Language\Interfaces\TranslationService as TranslationServiceInterface;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService as TranslationServiceInterface;
 
 /**
  * Class Translator.
@@ -27,7 +27,7 @@ class Translator
      */
     public static function translate($key, array $arguments = array())
     {
-        return static::getTranslationService()->translate($key, $arguments);
+        return static::getTranslationService()->getText($key, $arguments);
     }
 
     /**
diff --git a/src/BusinessLogic/Resources/lang/de.json b/src/BusinessLogic/Resources/countries/de.json
similarity index 100%
rename from src/BusinessLogic/Resources/lang/de.json
rename to src/BusinessLogic/Resources/countries/de.json
diff --git a/src/BusinessLogic/Resources/lang/en.json b/src/BusinessLogic/Resources/countries/en.json
similarity index 100%
rename from src/BusinessLogic/Resources/lang/en.json
rename to src/BusinessLogic/Resources/countries/en.json
diff --git a/src/BusinessLogic/Resources/lang/es.json b/src/BusinessLogic/Resources/countries/es.json
similarity index 100%
rename from src/BusinessLogic/Resources/lang/es.json
rename to src/BusinessLogic/Resources/countries/es.json
diff --git a/src/BusinessLogic/Resources/lang/fr.json b/src/BusinessLogic/Resources/countries/fr.json
similarity index 100%
rename from src/BusinessLogic/Resources/lang/fr.json
rename to src/BusinessLogic/Resources/countries/fr.json
diff --git a/src/BusinessLogic/Resources/lang/fromCSV.php b/src/BusinessLogic/Resources/countries/fromCSV.php
similarity index 96%
rename from src/BusinessLogic/Resources/lang/fromCSV.php
rename to src/BusinessLogic/Resources/countries/fromCSV.php
index 5968a5d9..cb62008e 100644
--- a/src/BusinessLogic/Resources/lang/fromCSV.php
+++ b/src/BusinessLogic/Resources/countries/fromCSV.php
@@ -35,7 +35,7 @@ function fromCsv()
 function exportJson($lang, $data)
 {
     file_put_contents(
-        __DIR__ . "/$lang.json",
+        __DIR__ . "/fromCSV.php",
         str_replace(
             '    ',
             '  ',
diff --git a/src/BusinessLogic/Resources/lang/it.json b/src/BusinessLogic/Resources/countries/it.json
similarity index 100%
rename from src/BusinessLogic/Resources/lang/it.json
rename to src/BusinessLogic/Resources/countries/it.json
diff --git a/src/BusinessLogic/Resources/lang/toCSV.php b/src/BusinessLogic/Resources/countries/toCSV.php
similarity index 100%
rename from src/BusinessLogic/Resources/lang/toCSV.php
rename to src/BusinessLogic/Resources/countries/toCSV.php
diff --git a/src/BusinessLogic/Resources/lang/translations.csv b/src/BusinessLogic/Resources/countries/translations.csv
similarity index 100%
rename from src/BusinessLogic/Resources/lang/translations.csv
rename to src/BusinessLogic/Resources/countries/translations.csv
diff --git a/src/BusinessLogic/Utility/UrlService.php b/src/BusinessLogic/Utility/UrlService.php
index f5a19214..89d6d19c 100644
--- a/src/BusinessLogic/Utility/UrlService.php
+++ b/src/BusinessLogic/Utility/UrlService.php
@@ -24,7 +24,7 @@ public static function getUrlLocaleKey()
         /** @var \Packlink\BusinessLogic\Configuration $configService */
         $configService = ServiceRegister::getService(Configuration::CLASS_NAME);
         $userInfo = $configService->getUserInfo();
-        $currentLang = $configService::getCurrentLanguage();
+        $currentLang = $configService::getUICountryCode();
 
         if ($userInfo !== null && in_array($userInfo->country, array('ES', 'DE', 'FR', 'IT'), true)) {
             $locale = $userInfo->country;
diff --git a/src/DemoUI/src/Controllers/Index.php b/src/DemoUI/src/Controllers/Index.php
index 8fd2ad2c..b5463872 100644
--- a/src/DemoUI/src/Controllers/Index.php
+++ b/src/DemoUI/src/Controllers/Index.php
@@ -11,6 +11,6 @@
 session_start();
 
 Bootstrap::init();
-Configuration::setCurrentLanguage('en');
+Configuration::setUICountryCode('en');
 $routingController = new ResolverController();
 $routingController->handleAction();
\ No newline at end of file
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
index 35c2dffb..92d60cef 100644
--- a/src/DemoUI/src/Views/ACME/index.php
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -5,8 +5,8 @@
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 
-Configuration::setCurrentLanguage('en');
-$lang = Configuration::getCurrentLanguage() ?: 'en';
+Configuration::setUICountryCode('en');
+$lang = Configuration::getUICountryCode() ?: 'en';
 
 function getUrl($controller, $action)
 {
@@ -145,8 +145,8 @@ function getUrl($controller, $action)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php echo file_get_contents($baseResourcesPath . 'lang/en.json') ?>,
-                current: <?php $langFile = $baseResourcesPath . 'lang/' . $lang . '.json';
+                default: <?php echo file_get_contents($baseResourcesPath . 'countries/en.json') ?>,
+                current: <?php $langFile = $baseResourcesPath . 'countries/' . $lang . '.json';
                 echo file_exists($langFile) ? file_get_contents($langFile) : ''
                 ?>,
             };
diff --git a/src/DemoUI/src/Views/PRO/index.php b/src/DemoUI/src/Views/PRO/index.php
index 35c2dffb..92d60cef 100644
--- a/src/DemoUI/src/Views/PRO/index.php
+++ b/src/DemoUI/src/Views/PRO/index.php
@@ -5,8 +5,8 @@
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 
-Configuration::setCurrentLanguage('en');
-$lang = Configuration::getCurrentLanguage() ?: 'en';
+Configuration::setUICountryCode('en');
+$lang = Configuration::getUICountryCode() ?: 'en';
 
 function getUrl($controller, $action)
 {
@@ -145,8 +145,8 @@ function getUrl($controller, $action)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php echo file_get_contents($baseResourcesPath . 'lang/en.json') ?>,
-                current: <?php $langFile = $baseResourcesPath . 'lang/' . $lang . '.json';
+                default: <?php echo file_get_contents($baseResourcesPath . 'countries/en.json') ?>,
+                current: <?php $langFile = $baseResourcesPath . 'countries/' . $lang . '.json';
                 echo file_exists($langFile) ? file_get_contents($langFile) : ''
                 ?>,
             };
diff --git a/src/Infrastructure/Configuration/Configuration.php b/src/Infrastructure/Configuration/Configuration.php
index 63951b06..dc9de5d9 100644
--- a/src/Infrastructure/Configuration/Configuration.php
+++ b/src/Infrastructure/Configuration/Configuration.php
@@ -63,21 +63,21 @@ abstract class Configuration extends Singleton
     protected $repository;
 
     /**
-     * Retrieves current language.
+     * Retrieves current UI country code.
      *
      * @return string
      */
-    public static function getCurrentLanguage()
+    public static function getUICountryCode()
     {
         return self::$currentLanguage;
     }
 
     /**
-     * Sets current language.
+     * Sets current UI country code.
      *
      * @param string $currentLanguage
      */
-    public static function setCurrentLanguage($currentLanguage)
+    public static function setUICountryCode($currentLanguage)
     {
         self::$currentLanguage = $currentLanguage;
     }
diff --git a/tests/BusinessLogic/Common/BaseTestWithServices.php b/tests/BusinessLogic/Common/BaseTestWithServices.php
index eed38e65..dc4e7eff 100644
--- a/tests/BusinessLogic/Common/BaseTestWithServices.php
+++ b/tests/BusinessLogic/Common/BaseTestWithServices.php
@@ -4,6 +4,7 @@
 
 use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\Http\HttpClient;
+use Logeecom\Infrastructure\ServiceRegister;
 use Logeecom\Infrastructure\TaskExecution\Interfaces\TaskRunnerWakeup;
 use Logeecom\Infrastructure\TaskExecution\QueueItem;
 use Logeecom\Infrastructure\TaskExecution\QueueService;
@@ -23,9 +24,10 @@
 use Packlink\BusinessLogic\Country\CountryService;
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
 use Packlink\BusinessLogic\DTO\ValidationError;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\BusinessLogic\Http\DTO\ParcelInfo;
 use Packlink\BusinessLogic\Http\Proxy;
-use Packlink\BusinessLogic\Language\TranslationService;
+use Packlink\BusinessLogic\Language\CountryService as CountryTranslationService;
 use Packlink\BusinessLogic\Warehouse\Warehouse;
 use Packlink\BusinessLogic\Warehouse\WarehouseService;
 
@@ -116,9 +118,22 @@ function () use ($wakeupService) {
         );
 
         TestServiceRegister::registerService(
-            \Packlink\BusinessLogic\Language\Interfaces\TranslationService::CLASS_NAME,
+            FileResolverService::CLASS_NAME,
             function () {
-                return new TranslationService();
+                return new FileResolverService(
+                    array(
+                        __DIR__ . '/../../../src/BusinessLogic/Resources/countries'
+                    )
+                );
+            }
+        );
+
+        TestServiceRegister::registerService(
+            \Packlink\BusinessLogic\Language\Interfaces\CountryService::CLASS_NAME,
+            function () {
+                $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
+
+                return new CountryTranslationService($fileResolverService);
             }
         );
 
diff --git a/tests/BusinessLogic/Language/TestTranslationService.php b/tests/BusinessLogic/Language/TestCountryService.php
similarity index 51%
rename from tests/BusinessLogic/Language/TestTranslationService.php
rename to tests/BusinessLogic/Language/TestCountryService.php
index ad26bc6a..ecd6578a 100644
--- a/tests/BusinessLogic/Language/TestTranslationService.php
+++ b/tests/BusinessLogic/Language/TestCountryService.php
@@ -2,18 +2,18 @@
 
 namespace Logeecom\Tests\BusinessLogic\Language;
 
-use Packlink\BusinessLogic\Language\TranslationService;
+use Packlink\BusinessLogic\Language\CountryService;
 
 /**
  * Class TestTranslationService.
  *
  * @package BusinessLogic\Language
  */
-class TestTranslationService extends TranslationService
+class TestCountryService extends CountryService
 {
-    public function __construct($translationsFileBasePath = null)
+    public function __construct($fileResolverService)
     {
-        parent::__construct($translationsFileBasePath);
+        parent::__construct($fileResolverService);
 
         // reset translations for each instance.
         static::$translations = array();
diff --git a/tests/BusinessLogic/Language/TranslationServiceTest.php b/tests/BusinessLogic/Language/TranslationServiceTest.php
index 4c6e7ff1..26b1044d 100644
--- a/tests/BusinessLogic/Language/TranslationServiceTest.php
+++ b/tests/BusinessLogic/Language/TranslationServiceTest.php
@@ -9,6 +9,7 @@
 use Logeecom\Tests\Infrastructure\Common\TestComponents\Utility\TestTimeProvider;
 use Logeecom\Tests\Infrastructure\Common\TestServiceRegister;
 use Packlink\BusinessLogic\Configuration;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -18,6 +19,27 @@
  */
 class TranslationServiceTest extends TestCase
 {
+    private static $englishValues = array(
+        'rs' => array(),
+        'en' => array(
+            'testKey' => 'testValueEn 2',
+            'testKey1' => 'testValueEn1',
+            'testKey2' => 'testValueEn2'
+        )
+    );
+    private static $englishAndFrenchValues = array(
+        'fr' => array(
+            'testKey' => 'testValueFr',
+            'namespace' => array(
+                'nestedKeyWithPlaceholder' => 'Nested key fr.'
+            )
+        ),
+        'en' => array(
+            'testKey' => 'testValueEn 2',
+            'testKey1' => 'testValueEn1',
+            'testKey2' => 'testValueEn2'
+        ),
+    );
     private $translationService;
 
     /**
@@ -28,11 +50,17 @@ public function setUp()
     {
         parent::setUp();
 
-        $baseFilePath = __DIR__ . '/Translations/';
-        $this->translationService = new TestTranslationService($baseFilePath);
+        $fileResolverService = new FileResolverService(
+            array(
+                __DIR__ . '/Translations',
+                __DIR__ . '/../FileResolver/Translations',
+            )
+        );
+
+        $this->translationService = new TestCountryService($fileResolverService);
 
         $configuration = new TestShopConfiguration();
-        Configuration::setCurrentLanguage('de');
+        Configuration::setUICountryCode('de');
 
         new TestServiceRegister(
             array(
@@ -44,12 +72,12 @@ public function setUp()
     }
 
     /**
-     * Tests translation function when current language is not set in config service.
+     * Tests getText function when current language is not set in config service.
      */
     public function testTranslateCurrentLanguageNotSet()
     {
         $configuration = new TestShopConfiguration();
-        Configuration::setCurrentLanguage(null);
+        Configuration::setUICountryCode(null);
         $logger = new TestShopLogger();
         $timeProvider = new TestTimeProvider();
 
@@ -67,18 +95,18 @@ public function testTranslateCurrentLanguageNotSet()
             )
         );
 
-        $translation = $this->translationService->translate('testKey');
+        $translation = $this->translationService->getText('testKey');
 
         $this->assertStringStartsWith('testValueEn', $translation);
     }
 
     /**
-     * Tests translation function when non existing key is tried to be translated for not supported language.
+     * Tests getText function when non existing key is tried to be translated for not supported language.
      */
     public function testTranslateNotSupportedLanguage()
     {
         $configuration = new TestShopConfiguration();
-        Configuration::setCurrentLanguage('rs');
+        Configuration::setUICountryCode('rs');
         $logger = new TestShopLogger();
         $timeProvider = new TestTimeProvider();
 
@@ -96,53 +124,73 @@ public function testTranslateNotSupportedLanguage()
             )
         );
 
-        $translation = $this->translationService->translate('testKey');
+        $translation = $this->translationService->getText('testKey');
 
         $this->assertStringStartsWith('testValueEn', $translation);
     }
 
     /**
-     * Tests translation function when non existing key is tried to be translated.
+     * Tests getText function when non existing key is tried to be translated.
      */
     public function testTranslateNonExistingKey()
     {
         $nonExistingKey = 'noKey';
-        $translation = $this->translationService->translate($nonExistingKey);
+        $translation = $this->translationService->getText($nonExistingKey);
 
         $this->assertEquals($nonExistingKey, $translation);
     }
 
     /**
-     * Tests translation function when non existing key in current language is tried to be translated. Key exists in the
+     * Tests getText function when non existing key in current language is tried to be translated. Key exists in the
      * fallback language.
      */
     public function testTranslateFallbackToEnglish()
     {
         $key = 'testKey1';
-        $translation = $this->translationService->translate($key);
+        $translation = $this->translationService->getText($key);
 
         $this->assertEquals('testValueEn1', $translation);
     }
 
     /**
-     * Tests translation function when non existing key is tried to be translated.
+     * Tests getText function when non existing key is tried to be translated.
      */
     public function testTranslateToGerman()
     {
         $key = 'testKey';
-        $translation = $this->translationService->translate($key);
+        $translation = $this->translationService->getText($key);
 
         $this->assertEquals('testValueDe', $translation);
     }
 
     /**
-     * Tests translation function with existing nested key with placeholders.
+     * Tests getText function with existing nested key with placeholders.
      */
     public function testTranslateToGermanNestedKeyWithPlaceholders()
     {
         $key = 'namespace.nestedKeyWithPlaceholder';
-        $translation = $this->translationService->translate($key, array(1, 2));
+        $translation = $this->translationService->getText($key, array(1, 2));
 
         $this->assertEquals('Test1 1, test2 2.', $translation);
     }
+
+    /**
+     * Tests getTranslation function with existing language.
+     */
+    public function testGetTranslations()
+    {
+        $translations = $this->translationService->getTranslations('fr');
+
+        $this->assertEquals(static::$englishAndFrenchValues, $translations);
+    }
+
+    /**
+     * Tests getTranslation function with non existing language.
+     */
+    public function testGetTranslationsWithNonExistingLanguage()
+    {
+        $translations = $this->translationService->getTranslations('rs');
+
+        $this->assertEquals(static::$englishValues, $translations);
+    }
 }

From c88492e9b241773948445a23b4a81d5f6c981021 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 15 Mar 2021 15:32:49 +0100
Subject: [PATCH 15/37] Replace links generation logic with new CountryService
 usage

PLCR24-18
---
 .../Controllers/ConfigurationController.php   | 24 +++----
 .../Controllers/RegistrationController.php    | 62 ++++++-------------
 src/BusinessLogic/Country/CountryService.php  | 18 ------
 .../OrderShipmentDetailsService.php           | 13 ++--
 src/BusinessLogic/Resources/countries/at.json |  6 ++
 src/BusinessLogic/Resources/countries/be.json |  6 ++
 src/BusinessLogic/Resources/countries/de.json | 10 ++-
 src/BusinessLogic/Resources/countries/en.json | 10 ++-
 src/BusinessLogic/Resources/countries/es.json | 10 ++-
 src/BusinessLogic/Resources/countries/fr.json | 10 ++-
 src/BusinessLogic/Resources/countries/gb.json |  6 ++
 src/BusinessLogic/Resources/countries/hu.json |  6 ++
 src/BusinessLogic/Resources/countries/ie.json |  6 ++
 src/BusinessLogic/Resources/countries/it.json | 10 ++-
 src/BusinessLogic/Resources/countries/nl.json |  6 ++
 src/BusinessLogic/Resources/countries/pt.json |  6 ++
 src/BusinessLogic/Resources/countries/tr.json |  6 ++
 .../Resources/templates/configuration.html    |  2 +-
 src/BusinessLogic/Utility/UrlService.php      |  4 +-
 .../Country/CountryServiceTest.php            |  2 +
 .../Country/WarehouseCountryServiceTest.php   |  2 +
 21 files changed, 128 insertions(+), 97 deletions(-)
 create mode 100644 src/BusinessLogic/Resources/countries/at.json
 create mode 100644 src/BusinessLogic/Resources/countries/be.json
 create mode 100644 src/BusinessLogic/Resources/countries/gb.json
 create mode 100644 src/BusinessLogic/Resources/countries/hu.json
 create mode 100644 src/BusinessLogic/Resources/countries/ie.json
 create mode 100644 src/BusinessLogic/Resources/countries/nl.json
 create mode 100644 src/BusinessLogic/Resources/countries/pt.json
 create mode 100644 src/BusinessLogic/Resources/countries/tr.json

diff --git a/src/BusinessLogic/Controllers/ConfigurationController.php b/src/BusinessLogic/Controllers/ConfigurationController.php
index 97266643..0ced1430 100644
--- a/src/BusinessLogic/Controllers/ConfigurationController.php
+++ b/src/BusinessLogic/Controllers/ConfigurationController.php
@@ -2,6 +2,9 @@
 
 namespace Packlink\BusinessLogic\Controllers;
 
+use Logeecom\Infrastructure\Configuration\Configuration;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService;
 use Packlink\BusinessLogic\Utility\UrlService;
 
 /**
@@ -11,30 +14,17 @@
  */
 class ConfigurationController
 {
-    /**
-     * List of help URLs for different country codes.
-     *
-     * @var array
-     */
-    private static $helpUrls = array(
-        'EN' => 'https://support-pro.packlink.com/hc/en-gb',
-        'ES' => 'https://support-pro.packlink.com/hc/es-es',
-        'DE' => 'https://support-pro.packlink.com/hc/de',
-        'FR' => 'https://support-pro.packlink.com/hc/fr-fr',
-        'IT' => 'https://support-pro.packlink.com/hc/it',
-    );
-
     /**
      * @return mixed|string
      */
     public function getHelpLink()
     {
         $lang = UrlService::getUrlLocaleKey();
+        Configuration::setUICountryCode(strtolower($lang));
 
-        if (!array_key_exists($lang, static::$helpUrls)) {
-            $lang = 'EN';
-        }
+        /** @var CountryService $countryService */
+        $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        return static::$helpUrls[$lang];
+        return $countryService->getText('configuration.helpUrl');
     }
 }
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 25650485..2bfed281 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -6,6 +6,7 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
 use Packlink\BusinessLogic\Registration\RegistrationRequest;
 use Packlink\BusinessLogic\Registration\RegistrationService;
@@ -26,45 +27,9 @@ class RegistrationController
      */
     protected $brandConfigurationService;
     /**
-     * List of terms and conditions URLs for different country codes.
-     *
-     * @var array
-     */
-    private static $termsAndConditionsUrls = array(
-        'EN' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011480',
-        'ES' => 'https://pro.packlink.es/terminos-y-condiciones/',
-        'DE' => 'https://pro.packlink.de/agb/',
-        'FR' => 'https://pro.packlink.fr/conditions-generales/',
-        'IT' => 'https://pro.packlink.it/termini-condizioni/',
-        'AT' => 'https://support-pro.packlink.com/hc/de/articles/360010011480',
-        'NL' => 'https://support-pro.packlink.com/hc/nl/articles/360010011480',
-        'BE' => 'https://support-pro.packlink.com/hc/nl/articles/360010011480',
-        'PT' => 'https://support-pro.packlink.com/hc/pt/articles/360010011480',
-        'TR' => 'https://support-pro.packlink.com/hc/tr/articles/360010011480',
-        'IE' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011480',
-        'GB' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011480',
-        'HU' => 'https://support-pro.packlink.com/hc/hu/articles/360010011480',
-    );
-    /**
-     * List of terms and conditions URLs for different country codes.
-     *
-     * @var array
+     * @var CountryService
      */
-    private static $privacyPolicyUrls = array(
-        'EN' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011560',
-        'ES' => 'https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%C3%ADtica-de-Privacidad',
-        'DE' => 'https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%C3%A4rung-der-Packlink-Shipping-S-L-',
-        'FR' => 'https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%C3%A9',
-        'IT' => 'https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy',
-        'AT' => 'https://support-pro.packlink.com/hc/de/articles/360010011480',
-        'NL' => 'https://support-pro.packlink.com/hc/nl/articles/360010011560',
-        'BE' => 'https://support-pro.packlink.com/hc/nl/articles/360010011560',
-        'PT' => 'https://support-pro.packlink.com/hc/pt/articles/360010011560',
-        'TR' => 'https://support-pro.packlink.com/hc/tr/articles/360010011560',
-        'IE' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011560',
-        'GB' => 'https://support-pro.packlink.com/hc/en-gb/articles/360010011560',
-        'HU' => 'https://support-pro.packlink.com/hc/hu/articles/360010011560',
-    );
+    protected $countryService;
 
     /**
      * Gets the data needed for a registration page.
@@ -75,6 +40,7 @@ class RegistrationController
      */
     public function getRegisterData($country)
     {
+        Configuration::setUICountryCode(strtolower($country));
         /** @var RegistrationInfoService $registrationInfoService */
         $registrationInfoService = ServiceRegister::getService(RegistrationInfoService::CLASS_NAME);
         $registrationData = $registrationInfoService->getRegistrationInfoData();
@@ -86,10 +52,8 @@ public function getRegisterData($country)
             'email' => $registrationData->getEmail(),
             'phone' => $registrationData->getPhone(),
             'source' => $registrationData->getSource(),
-            'termsAndConditionsUrl' => !empty(self::$termsAndConditionsUrls[$country]) ?
-                self::$termsAndConditionsUrls[$country] : self::$termsAndConditionsUrls[self::DEFAULT_COUNTRY],
-            'privacyPolicyUrl' => !empty(self::$privacyPolicyUrls[$country]) ?
-                self::$privacyPolicyUrls[$country] : self::$privacyPolicyUrls[self::DEFAULT_COUNTRY],
+            'termsAndConditionsUrl' => $this->getCountryService()->getText('register.termsAndConditionsUrl'),
+            'privacyPolicyUrl' => $this->getCountryService()->getText('register.privacyPolicyUrl'),
             'platform_country' => in_array($country, $brand->platformCountries, true) ?
                 $country : $brand->platformCountries[0],
         );
@@ -177,6 +141,20 @@ protected function getBrandConfigurationService()
         return $this->brandConfigurationService;
     }
 
+    /**
+     * Returns an instance of country service.
+     *
+     * @return CountryService
+     */
+    protected function getCountryService()
+    {
+        if ($this->countryService === null) {
+            $this->countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
+        }
+
+        return $this->countryService;
+    }
+
     /**
      * Returns shop language in format which Packlink expects.
      *
diff --git a/src/BusinessLogic/Country/CountryService.php b/src/BusinessLogic/Country/CountryService.php
index b5ae8016..c921c044 100644
--- a/src/BusinessLogic/Country/CountryService.php
+++ b/src/BusinessLogic/Country/CountryService.php
@@ -33,24 +33,6 @@ class CountryService extends BaseService
      * @var BrandConfigurationService
      */
     protected $brandConfigurationService;
-    /**
-     * List of four default countries.
-     *
-     * @var array
-     */
-    protected static $baseCountries = array('ES', 'DE', 'FR', 'IT');
-
-    /**
-     * Checks if given country is one of the four base countries ('ES', 'DE', 'FR', 'IT').
-     *
-     * @param string $countryCode Country ISO-2 code.
-     *
-     * @return bool
-     */
-    public function isBaseCountry($countryCode)
-    {
-        return in_array(strtoupper($countryCode), static::$baseCountries, true);
-    }
 
     /**
      * Returns a list of supported country DTOs.
diff --git a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
index 2f6fe1ac..9813d748 100644
--- a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
+++ b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
@@ -5,8 +5,8 @@
 use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\BaseService;
-use Packlink\BusinessLogic\Country\CountryService;
 use Packlink\BusinessLogic\Http\DTO\ShipmentLabel;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService;
 use Packlink\BusinessLogic\OrderShipmentDetails\Exceptions\OrderShipmentDetailsNotFound;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\ShippingMethod\Utility\ShipmentStatus;
@@ -273,14 +273,13 @@ protected function getDraftShipmentUrl($reference)
         $configService = ServiceRegister::getService(Configuration::CLASS_NAME);
         $userInfo = $configService->getUserInfo();
 
+        if($userInfo) {
+            Configuration::setUICountryCode(strtolower($userInfo->country));
+        }
+
         /** @var CountryService $countryService */
         $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        $userDomain = 'com';
-        if ($userInfo !== null && $countryService->isBaseCountry($userInfo->country)) {
-            $userDomain = strtolower($userInfo->country);
-        }
-
-        return "https://pro.packlink.$userDomain/private/shipments/$reference";
+        return  $countryService->getText('orderListAndDetails.shipmentUrl') . $reference;
     }
 }
diff --git a/src/BusinessLogic/Resources/countries/at.json b/src/BusinessLogic/Resources/countries/at.json
new file mode 100644
index 00000000..80e17cfc
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/at.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/be.json b/src/BusinessLogic/Resources/countries/be.json
new file mode 100644
index 00000000..07d4b919
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/be.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/de.json b/src/BusinessLogic/Resources/countries/de.json
index c63762cb..c0c77ea8 100644
--- a/src/BusinessLogic/Resources/countries/de.json
+++ b/src/BusinessLogic/Resources/countries/de.json
@@ -89,6 +89,8 @@
     "monthlyShipmentVolume": "Wie hoch ist Ihr monatliches Sendungsaufkommen?",
     "phone": "Telefonnummer",
     "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
     "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden",
     "submit": "Registrieren",
     "chooseYourCountry": "Wählen Sie Ihr Land aus",
@@ -151,7 +153,10 @@
     "parcel": "Standardpaket",
     "help": "Hilfe",
     "contactUs": "Kontaktieren Sie uns:",
-    "systemInfo": "Systeminformationen"
+    "systemInfo": "Systeminformationen",
+    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "Systeminfodatei <br>und debug mode",
@@ -288,7 +293,8 @@
     "bulkFailCreateFail": "Die Datei der Versandetiketten konnte nicht erstellt werden",
     "draftOrderDelayed": "Die Erstellung des Entwurfs verzögert sich",
     "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink"
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Dieser Versanddienst unterstützt die Zustellung an vordefinierte Abgabestellen. Bitte wählen Sie den für Sie günstigsten Ort aus, indem Sie auf \"Abgabestelle auswählen\" klicken.",
diff --git a/src/BusinessLogic/Resources/countries/en.json b/src/BusinessLogic/Resources/countries/en.json
index 5cc5d3bb..4e4a0459 100644
--- a/src/BusinessLogic/Resources/countries/en.json
+++ b/src/BusinessLogic/Resources/countries/en.json
@@ -89,6 +89,8 @@
     "monthlyShipmentVolume": "What is your monthly shipment volume?",
     "phone": "Phone number",
     "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
     "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail",
     "submit": "Register",
     "chooseYourCountry": "Choose your country",
@@ -151,7 +153,10 @@
     "parcel": "Default parcel",
     "help": "Help",
     "contactUs": "Contact us at:",
-    "systemInfo": "System information"
+    "systemInfo": "System information",
+    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -288,7 +293,8 @@
     "bulkFailCreateFail": "Unable to create bulk labels file",
     "draftOrderDelayed": "Creation of the draft is delayed",
     "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink"
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "This shipping service supports delivery to pre-defined drop-off locations. Please choose location that suits you the most by clicking on the \"Select drop-off location\" button.",
diff --git a/src/BusinessLogic/Resources/countries/es.json b/src/BusinessLogic/Resources/countries/es.json
index d914a7ba..4ebe1a1a 100644
--- a/src/BusinessLogic/Resources/countries/es.json
+++ b/src/BusinessLogic/Resources/countries/es.json
@@ -89,6 +89,8 @@
     "monthlyShipmentVolume": "¿Cuántos envíos sueles hacer al mes?",
     "phone": "Teléfono",
     "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
     "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico",
     "submit": "Regístrate",
     "chooseYourCountry": "Elige tu país",
@@ -151,7 +153,10 @@
     "parcel": "Paquete predeterminado",
     "help": "Ayuda",
     "contactUs": "Contáctanos:",
-    "systemInfo": "Información del sistema"
+    "systemInfo": "Información del sistema",
+    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -288,7 +293,8 @@
     "bulkFailCreateFail": "No se puede crear el archivo de etiquetas masivas",
     "draftOrderDelayed": "La creación del borrador se ha retrasado",
     "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink"
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Este servicio de envío admite la entrega a ubicaciones de entrega predefinidas. Elige la ubicación que más te convenga haciendo clic en el botón \"Seleccionar ubicación de entrega\"..",
diff --git a/src/BusinessLogic/Resources/countries/fr.json b/src/BusinessLogic/Resources/countries/fr.json
index 123550f2..c7a7906a 100644
--- a/src/BusinessLogic/Resources/countries/fr.json
+++ b/src/BusinessLogic/Resources/countries/fr.json
@@ -89,6 +89,8 @@
     "monthlyShipmentVolume": "Combien d’envois faites-vous généralement par mois?",
     "phone": "Numéro de téléphone",
     "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
     "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel",
     "submit": "S'inscrire",
     "chooseYourCountry": "Sélectionnez votre pays",
@@ -151,7 +153,10 @@
     "parcel": "Colis par défaut",
     "help": "Aide",
     "contactUs": "Contactez-nous:",
-    "systemInfo": "Informations du système"
+    "systemInfo": "Informations du système",
+    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "Fichier d’informations du système <br>et mode débogage",
@@ -288,7 +293,8 @@
     "bulkFailCreateFail": "Création d'un dossier d'étiquettes en masse impossible.",
     "draftOrderDelayed": "La création du brouillon a été retardée",
     "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink"
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Ce service de transport soutient la livraison vers des lieux de dépôts prédéfinis. Veuillez choisir la localisation qui vous convient le mieux en cliquant sur le bouton \"Sélectionner le lieu de dépôt\"",
diff --git a/src/BusinessLogic/Resources/countries/gb.json b/src/BusinessLogic/Resources/countries/gb.json
new file mode 100644
index 00000000..0f805ad4
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/gb.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/hu.json b/src/BusinessLogic/Resources/countries/hu.json
new file mode 100644
index 00000000..82f12c8c
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/hu.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/ie.json b/src/BusinessLogic/Resources/countries/ie.json
new file mode 100644
index 00000000..0f805ad4
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/ie.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/it.json b/src/BusinessLogic/Resources/countries/it.json
index 32edd36f..e10440f8 100644
--- a/src/BusinessLogic/Resources/countries/it.json
+++ b/src/BusinessLogic/Resources/countries/it.json
@@ -89,6 +89,8 @@
     "monthlyShipmentVolume": "Quante spedizioni fai solitamente al mese?",
     "phone": "Numero di telefono",
     "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
     "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email",
     "submit": "Registrati",
     "chooseYourCountry": "Scegli il paese",
@@ -151,7 +153,10 @@
     "parcel": "Pacco predefinito",
     "help": "Aiuto",
     "contactUs": "Contattaci:",
-    "systemInfo": "Informazioni del sistema"
+    "systemInfo": "Informazioni del sistema",
+    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "File di informazioni del sistema <br>e modalità debug",
@@ -288,7 +293,8 @@
     "bulkFailCreateFail": "Impossibile creare il file di etichette in blocco",
     "draftOrderDelayed": "La creazione della bozza è stata ritardata",
     "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink"
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Questo servizio di spedizione supporta la consegna a punti corriere predefiniti. Scegli la località più adatta a te, facendo clic sul pulsante \"Seleziona punto corriere\".",
diff --git a/src/BusinessLogic/Resources/countries/nl.json b/src/BusinessLogic/Resources/countries/nl.json
new file mode 100644
index 00000000..07d4b919
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/nl.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/pt.json b/src/BusinessLogic/Resources/countries/pt.json
new file mode 100644
index 00000000..a4a65b0f
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/pt.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/tr.json b/src/BusinessLogic/Resources/countries/tr.json
new file mode 100644
index 00000000..ea17d41a
--- /dev/null
+++ b/src/BusinessLogic/Resources/countries/tr.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/templates/configuration.html b/src/BusinessLogic/Resources/templates/configuration.html
index 0c7ef492..00657bb3 100644
--- a/src/BusinessLogic/Resources/templates/configuration.html
+++ b/src/BusinessLogic/Resources/templates/configuration.html
@@ -49,7 +49,7 @@ <h1>{$configuration.menu}</h1>
     <div class="pl-footer">
         <div class="pl-row-orientation">
             <span>{$configuration.contactUs}</span>
-            &nbsp;<a href="mailto::business@packlink.com" rel="nofollow" target="_blank">business@packlink.com</a>
+            &nbsp;<a href="{$configuration.contactUrlMail}" rel="nofollow" target="_blank">{$configuration.contactUrl}</a>
         </div>
         <div class="pl-row-orientation">
             <span id="pl-version-number"></span>
diff --git a/src/BusinessLogic/Utility/UrlService.php b/src/BusinessLogic/Utility/UrlService.php
index 89d6d19c..1d990ddd 100644
--- a/src/BusinessLogic/Utility/UrlService.php
+++ b/src/BusinessLogic/Utility/UrlService.php
@@ -26,9 +26,9 @@ public static function getUrlLocaleKey()
         $userInfo = $configService->getUserInfo();
         $currentLang = $configService::getUICountryCode();
 
-        if ($userInfo !== null && in_array($userInfo->country, array('ES', 'DE', 'FR', 'IT'), true)) {
+        if ($userInfo !== null) {
             $locale = $userInfo->country;
-        } elseif (in_array(strtoupper($currentLang), array('ES', 'DE', 'FR', 'IT'), true)) {
+        } elseif ($currentLang) {
             $locale = strtoupper($currentLang);
         }
 
diff --git a/tests/BusinessLogic/Country/CountryServiceTest.php b/tests/BusinessLogic/Country/CountryServiceTest.php
index c99b973e..4406d113 100644
--- a/tests/BusinessLogic/Country/CountryServiceTest.php
+++ b/tests/BusinessLogic/Country/CountryServiceTest.php
@@ -2,6 +2,7 @@
 
 namespace Logeecom\Tests\BusinessLogic\Country;
 
+use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
 use Logeecom\Tests\BusinessLogic\Common\BaseTestWithServices;
 use Packlink\BusinessLogic\Country\CountryService;
@@ -15,6 +16,7 @@ class CountryServiceTest extends BaseTestWithServices
 {
     public function testGetSupportedCountries()
     {
+        Configuration::setUICountryCode('en');
         /** @var CountryService $service */
         $service = ServiceRegister::getService(CountryService::CLASS_NAME);
 
diff --git a/tests/BusinessLogic/Country/WarehouseCountryServiceTest.php b/tests/BusinessLogic/Country/WarehouseCountryServiceTest.php
index fb9cda5e..6dc44507 100644
--- a/tests/BusinessLogic/Country/WarehouseCountryServiceTest.php
+++ b/tests/BusinessLogic/Country/WarehouseCountryServiceTest.php
@@ -2,6 +2,7 @@
 
 namespace BusinessLogic\Country;
 
+use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
 use Logeecom\Tests\BusinessLogic\Common\BaseTestWithServices;
 use Packlink\BusinessLogic\Country\WarehouseCountryService;
@@ -15,6 +16,7 @@ class WarehouseCountryServiceTest extends BaseTestWithServices
 {
     public function testGetSupportedCountries()
     {
+        Configuration::setUICountryCode('en');
         /** @var WarehouseCountryService $service */
         $service = ServiceRegister::getService(WarehouseCountryService::CLASS_NAME);
 

From 9266539cafbb6cd606b789cd04937285943b8969 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 16 Mar 2021 10:24:44 +0100
Subject: [PATCH 16/37] Extract Packlink brand label overrides

PLCR24-19
---
 .../Packlink}/Resources/countries/at.json     |  0
 .../Packlink}/Resources/countries/be.json     |  0
 .../Packlink/Resources/countries/de.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/en.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/es.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/fr.json      | 57 +++++++++++++++++++
 .../Packlink}/Resources/countries/gb.json     |  0
 .../Packlink}/Resources/countries/hu.json     |  0
 .../Packlink}/Resources/countries/ie.json     |  0
 .../Packlink/Resources/countries/it.json      | 57 +++++++++++++++++++
 .../Packlink}/Resources/countries/nl.json     |  0
 .../Packlink}/Resources/countries/pt.json     |  0
 .../Packlink}/Resources/countries/tr.json     |  0
 src/BusinessLogic/BootstrapComponent.php      |  1 +
 src/BusinessLogic/Resources/countries/de.json | 41 +------------
 src/BusinessLogic/Resources/countries/en.json | 41 +------------
 src/BusinessLogic/Resources/countries/es.json | 41 +------------
 src/BusinessLogic/Resources/countries/fr.json | 41 +------------
 src/BusinessLogic/Resources/countries/it.json | 41 +------------
 src/DemoUI/src/Bootstrap.php                  | 13 +++++
 src/DemoUI/src/Views/ACME/index.php           | 19 +++++--
 src/DemoUI/src/Views/PRO/index.php            | 19 +++++--
 22 files changed, 339 insertions(+), 203 deletions(-)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/at.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/be.json (100%)
 create mode 100644 src/Brands/Packlink/Resources/countries/de.json
 create mode 100644 src/Brands/Packlink/Resources/countries/en.json
 create mode 100644 src/Brands/Packlink/Resources/countries/es.json
 create mode 100644 src/Brands/Packlink/Resources/countries/fr.json
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/gb.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/hu.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/ie.json (100%)
 create mode 100644 src/Brands/Packlink/Resources/countries/it.json
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/nl.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/pt.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/tr.json (100%)

diff --git a/src/BusinessLogic/Resources/countries/at.json b/src/Brands/Packlink/Resources/countries/at.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/at.json
rename to src/Brands/Packlink/Resources/countries/at.json
diff --git a/src/BusinessLogic/Resources/countries/be.json b/src/Brands/Packlink/Resources/countries/be.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/be.json
rename to src/Brands/Packlink/Resources/countries/be.json
diff --git a/src/Brands/Packlink/Resources/countries/de.json b/src/Brands/Packlink/Resources/countries/de.json
new file mode 100644
index 00000000..7c90e80e
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/de.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
+    "developedAndManaged": "Entwickelt und verwaltet von Packlink"
+  },
+  "login": {
+    "welcome": "Willkommen zu Packlink PRO",
+    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
+  },
+  "register": {
+    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
+    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
+    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
+    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink-Preise",
+    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
+    "packlinkPrice": "Packlink-Preise",
+    "percentagePacklinkPrices": "% der Packlink-Preise",
+    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
+    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink Auftragsentwurf",
+    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
+    "packlinkReferenceNumber": "Packlink Referenznummer",
+    "packlinkShippingPrice": "Packlink Versandpreis",
+    "viewOnPacklink": "Auf Packlink PRO ansehen",
+    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
+    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook von Packlink erhalten"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
+    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
+    "openModule": "PacklinkPRO-Modul öffnen"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/en.json b/src/Brands/Packlink/Resources/countries/en.json
new file mode 100644
index 00000000..d27043f7
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/en.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
+    "developedAndManaged": "Developed and managed by Packlink"
+  },
+  "login": {
+    "welcome": "Welcome to Packlink PRO",
+    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Start enjoying Packlink PRO!",
+    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
+    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
+    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink prices",
+    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
+    "packlinkPrice": "Packlink Price",
+    "percentagePacklinkPrices": "% of Packlink prices",
+    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
+    "usePacklinkRange": "For all other ranges, apply Packlink prices"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink order draft",
+    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
+    "packlinkReferenceNumber": "Packlink reference number",
+    "packlinkShippingPrice": "Packlink shipping price",
+    "viewOnPacklink": "View on Packlink PRO",
+    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
+    "createOrderDraft": "Create order draft in Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook from Packlink received."
+  },
+  "autoTest": {
+    "moduleAutoTest": "PacklinkPRO module auto-test",
+    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
+    "openModule": "Open PacklinkPRO module"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/es.json b/src/Brands/Packlink/Resources/countries/es.json
new file mode 100644
index 00000000..59908297
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/es.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
+    "developedAndManaged": "Desarrollado y gestionado por Packlink"
+  },
+  "login": {
+    "welcome": "Te damos la bienvenida a Packlink PRO",
+    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>"
+  },
+  "register": {
+    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
+    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
+    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
+    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Precios de Packlink",
+    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
+    "packlinkPrice": "Precio Packlink",
+    "percentagePacklinkPrices": "% de los precio de Packlink",
+    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
+    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Borrador del pedido de Packlink",
+    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
+    "packlinkReferenceNumber": "Número de referencia Packlink",
+    "packlinkShippingPrice": "Precio de envío de Packlink",
+    "viewOnPacklink": "Ver en Packlink PRO",
+    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
+    "createOrderDraft": "Crear borrador en Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink recibido"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
+    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
+    "openModule": "Abrir el módulo PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/fr.json b/src/Brands/Packlink/Resources/countries/fr.json
new file mode 100644
index 00000000..afe7b187
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/fr.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
+    "developedAndManaged": "Développé et géré par Packlink"
+  },
+  "login": {
+    "welcome": "Bienvenue sur Packlink PRO",
+    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>."
+  },
+  "register": {
+    "startEnjoying": "Commencez à utiliser Packlink PRO !",
+    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
+    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
+    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prix Packlink",
+    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
+    "packlinkPrice": "Prix Packlink",
+    "percentagePacklinkPrices": "% des prix Packlink",
+    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
+    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Brouillon de commande Packlink",
+    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
+    "packlinkReferenceNumber": "Numéro de référence Packlink",
+    "packlinkShippingPrice": "Prix de livraison Packlink",
+    "viewOnPacklink": "Voir sur Packlink PRO",
+    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
+    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink reçu"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Test automatique du module PacklinkPRO",
+    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
+    "openModule": "Ouvrir le module PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/gb.json b/src/Brands/Packlink/Resources/countries/gb.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/gb.json
rename to src/Brands/Packlink/Resources/countries/gb.json
diff --git a/src/BusinessLogic/Resources/countries/hu.json b/src/Brands/Packlink/Resources/countries/hu.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/hu.json
rename to src/Brands/Packlink/Resources/countries/hu.json
diff --git a/src/BusinessLogic/Resources/countries/ie.json b/src/Brands/Packlink/Resources/countries/ie.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/ie.json
rename to src/Brands/Packlink/Resources/countries/ie.json
diff --git a/src/Brands/Packlink/Resources/countries/it.json b/src/Brands/Packlink/Resources/countries/it.json
new file mode 100644
index 00000000..d1e1973f
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/it.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
+    "developedAndManaged": "Sviluppato e gestito da Packlink"
+  },
+  "login": {
+    "welcome": "Benvenuto a Packlink PRO",
+    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
+    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
+    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
+    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prezzi di Packlink",
+    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
+    "packlinkPrice": "Prezzo di Packlink",
+    "percentagePacklinkPrices": "% dei prezzi di Packlink",
+    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
+    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
+    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
+    "packlinkReferenceNumber": "Numero di ordine Packlink",
+    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
+    "viewOnPacklink": "Vedi su Packlink PRO",
+    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
+    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook di Packlink ricevuto"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
+    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
+    "openModule": "Apri il modulo di PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/nl.json b/src/Brands/Packlink/Resources/countries/nl.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/nl.json
rename to src/Brands/Packlink/Resources/countries/nl.json
diff --git a/src/BusinessLogic/Resources/countries/pt.json b/src/Brands/Packlink/Resources/countries/pt.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/pt.json
rename to src/Brands/Packlink/Resources/countries/pt.json
diff --git a/src/BusinessLogic/Resources/countries/tr.json b/src/Brands/Packlink/Resources/countries/tr.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/tr.json
rename to src/Brands/Packlink/Resources/countries/tr.json
diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 41a696f1..60e2c53f 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -175,6 +175,7 @@ function () {
             function () {
                 return new FileResolverService(
                     array(
+                        __DIR__ . '/../Brands/Packlink/Resources/countries',
                         __DIR__ . '/Resources/countries',
                     )
                 );
diff --git a/src/BusinessLogic/Resources/countries/de.json b/src/BusinessLogic/Resources/countries/de.json
index c0c77ea8..0a06c9b7 100644
--- a/src/BusinessLogic/Resources/countries/de.json
+++ b/src/BusinessLogic/Resources/countries/de.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
-    "developedAndManaged": "Entwickelt und verwaltet von Packlink",
     "generalConditions": "Allgemeine Bedingungen",
     "basicSettings": "Einstellungen",
     "contactUs": "Kontaktieren Sie uns",
@@ -48,8 +43,6 @@
     "apiKey": "API-Schlüssel",
     "apiKeyIncorrect": "Falscher API-Schlüssel",
     "dontHaveAccount": "Sie haben noch keinen Account?",
-    "welcome": "Willkommen zu Packlink PRO",
-    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>.",
     "validateApiKey": "API-Schlüssel bestätigen",
     "chooseYourCountry": "Wählen Sie Ihr Land aus, um mit der Registrierung beginnen zu können",
     "registerMe": "Registrieren"
@@ -83,15 +76,10 @@
     "email": "E-Mail",
     "password": "Passwort",
     "haveAccount": "Haben Sie bereits einen Account?",
-    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
     "registerAccount": "Jetzt registrieren",
     "getToKnowYou": "Wir möchten Sie besser kennenlernen, um uns an Sie anzupassen und Ihnen ein individuelles Angebot zukommen zu lassen",
     "monthlyShipmentVolume": "Wie hoch ist Ihr monatliches Sendungsaufkommen?",
     "phone": "Telefonnummer",
-    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
-    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden",
     "submit": "Registrieren",
     "chooseYourCountry": "Wählen Sie Ihr Land aus",
     "searchCountry": "Land suchen",
@@ -153,10 +141,7 @@
     "parcel": "Standardpaket",
     "help": "Hilfe",
     "contactUs": "Kontaktieren Sie uns:",
-    "systemInfo": "Systeminformationen",
-    "helpUrl": "https://support-pro.packlink.com/hc/de",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Systeminformationen"
   },
   "systemInfo": {
     "title": "Systeminfodatei <br>und debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Bestellstatus",
-    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
-    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO",
     "systemOrderStatus": "<strong>BESTELLSTATUS</strong> von %s",
     "none": "Leer",
     "pending": "Ausstehend",
@@ -216,11 +199,9 @@
     "origin": "Absender",
     "destination": "Empfänger",
     "myPrices": "Meine Preise",
-    "packlinkPrices": "Packlink-Preise",
     "configureService": "Dienst einrichten",
     "showCarrierLogo": "Meinen Kunden das Logo anzeigen",
     "pricePolicy": "Preispolitik",
-    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
     "configurePricePolicy": "Meine Versandkosten einrichten",
     "taxClassTitle": "Wählen Sie Ihre gespeicherte Steuerkategorie",
     "tax": "Steuer",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Gewichts- und Preisklasse: von %s kg bis %s kg und von %s € bis %s €",
     "singlePricePolicy": "Preispolitik %s",
     "pricePolicyExplanation": "2. Wählen Sie eine Preispolitik und richten Sie diese ein.",
-    "packlinkPrice": "Packlink-Preise",
-    "percentagePacklinkPrices": "% der Packlink-Preise",
-    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
     "fixedPrices": "Festpreis",
     "fixedPricesWithData": "Festpreis: %s €",
     "increaseExplanation": "Erhöhen: fügen Sie % zum Preis hinzu. Dies wird dann vom Kunden bezahlt.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Alle ausgewählten Länder",
     "selectCountriesHeader": "Länder, die von Ihrem <br> Versanddienst unterstützt werden",
     "selectCountriesSubheader": "Wählen Sie die Verfügbarkeit von mindestens einem Land aus und fügen Sie <br> beliebig viele hinzu",
-    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise",
     "discardChangesQuestion": "Es gibt nicht gespeicherte Änderungen.<br>Sind Sie sicher, dass Sie zurückgehen und sie verwerfen möchten?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink Auftragsentwurf",
     "printed": "Ausgedruckt",
     "ready": "Bereit",
     "printLabel": "Versandetikett drucken",
     "shipmentLabels": "Versandetiketten",
-    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
     "shipmentDetails": "Versanddetails",
     "disablePopUpBlocker": "Bitte deaktivieren Sie den Popup-Blocker auf dieser Seite, um alle Versandetiketten auf einmal zu öffnen.",
     "date": "Datum",
@@ -279,22 +254,14 @@
     "print": "Drucken",
     "carrierTrackingNumbers": "Trackingnummer des Versandunternehmens",
     "trackIt": "Versand verfolgen",
-    "packlinkReferenceNumber": "Packlink Referenznummer",
-    "packlinkShippingPrice": "Packlink Versandpreis",
-    "viewOnPacklink": "Auf Packlink PRO ansehen",
     "createDraft": "Entwurf erstellen",
-    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
-    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
     "draftCreateFailed": "Der Versuch der Entwurfserstellung ist fehlgeschlagen. Fehler: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Die Bestellung mit der Versandreferenznummer %s existiert nicht im Shop",
     "orderDetailsNotFound": "Bestelldetails nicht gefunden",
     "orderNotExist": "Die Bestellung mit der ID %s existiert nicht im Shop",
     "bulkFailCreateFail": "Die Datei der Versandetiketten konnte nicht erstellt werden",
     "draftOrderDelayed": "Die Erstellung des Entwurfs verzögert sich",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Dieser Versanddienst unterstützt die Zustellung an vordefinierte Abgabestellen. Bitte wählen Sie den für Sie günstigsten Ort aus, indem Sie auf \"Abgabestelle auswählen\" klicken.",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Fehler beim Erstellen der Standardkonfiguration des Task-Runner-Status.",
-    "webhookReceived": "Webhook von Packlink erhalten",
     "couldNotDelete": "Element %s mit ID %s konnte nicht gelöscht werden",
     "entityCannotBeSaved": "Element %s mit ID %s kann nicht gespeichert werden.",
     "entityCannotBeUpdated": "Element %s mit ID %s kann nicht aktualisiert werden.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Zugriff auf Datenbank nicht möglich.",
     "taskCouldNotBeStarted.": "Die Aufgabe konnte nicht gestartet werden.",
-    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
-    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
     "start": "Start",
     "downloadTestLog": "Testprotokoll herunterladen",
-    "openModule": "PacklinkPRO-Modul öffnen",
     "autotestPassedSuccessfully": "Der automatische Test wurde erfolgreich abgeschlossen!",
     "testNotSuccessful": "Der Test wurde nicht erfolgreich abgeschlossen!"
   }
diff --git a/src/BusinessLogic/Resources/countries/en.json b/src/BusinessLogic/Resources/countries/en.json
index 4e4a0459..577bb12e 100644
--- a/src/BusinessLogic/Resources/countries/en.json
+++ b/src/BusinessLogic/Resources/countries/en.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
-    "developedAndManaged": "Developed and managed by Packlink",
     "generalConditions": "General conditions",
     "basicSettings": "Basic settings",
     "contactUs": "Contact us",
@@ -48,8 +43,6 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "API key was incorrect.",
     "dontHaveAccount": "Don't have an account?",
-    "welcome": "Welcome to Packlink PRO",
-    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>.",
     "validateApiKey": "Validate API key",
     "chooseYourCountry": "Choose your country to start the registration process",
     "registerMe": "Register me"
@@ -83,15 +76,10 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Already have an account?",
-    "startEnjoying": "Start enjoying Packlink PRO!",
     "registerAccount": "Register your account",
     "getToKnowYou": "We would like to get to know you better in order to adapt to you and to send you an individual offer",
     "monthlyShipmentVolume": "What is your monthly shipment volume?",
     "phone": "Phone number",
-    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
-    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail",
     "submit": "Register",
     "chooseYourCountry": "Choose your country",
     "searchCountry": "Search country",
@@ -153,10 +141,7 @@
     "parcel": "Default parcel",
     "help": "Help",
     "contactUs": "Contact us at:",
-    "systemInfo": "System information",
-    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "System information"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Order status",
-    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
-    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS",
     "systemOrderStatus": "%s <strong>ORDER STATUS</strong>",
     "none": "None",
     "pending": "Pending",
@@ -216,11 +199,9 @@
     "origin": "Origin",
     "destination": "Destination",
     "myPrices": "My prices",
-    "packlinkPrices": "Packlink prices",
     "configureService": "Set up service",
     "showCarrierLogo": "Show carrier logo to my customers",
     "pricePolicy": "Price policy",
-    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
     "configurePricePolicy": "Set up my shipment prices",
     "taxClassTitle": "Choose your saved tax class",
     "tax": "Tax",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Weight and price range: from %s kg to %s kg and from %s€ to %s€",
     "singlePricePolicy": "Price policy %s",
     "pricePolicyExplanation": "2. Choose a price policy and set it up.",
-    "packlinkPrice": "Packlink Price",
-    "percentagePacklinkPrices": "% of Packlink prices",
-    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
     "fixedPrices": "Fixed price",
     "fixedPricesWithData": "Fixed price: %s€",
     "increaseExplanation": "Increase: add a % to the price, this will be paid by the customer.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "All selected countries",
     "selectCountriesHeader": "Countries supported for your <br> shipping service",
     "selectCountriesSubheader": "Select availability of at least one country and add <br> as many required",
-    "usePacklinkRange": "For all other ranges, apply Packlink prices",
     "discardChangesQuestion": "There are unsaved changes.<br>Are you sure you want to go back and discard them?",
     "atLeastOneCountry": "At least one country must be selected."
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink order draft",
     "printed": "Printed",
     "ready": "Ready",
     "printLabel": "Print label",
     "shipmentLabels": "Shipment Labels",
-    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
     "shipmentDetails": "Shipment details",
     "disablePopUpBlocker": "Please disable pop-up blocker on this page in order to bulk open shipment labels",
     "date": "Date",
@@ -279,22 +254,14 @@
     "print": "Print",
     "carrierTrackingNumbers": "Carrier tracking numbers",
     "trackIt": "Track it!",
-    "packlinkReferenceNumber": "Packlink reference number",
-    "packlinkShippingPrice": "Packlink shipping price",
-    "viewOnPacklink": "View on Packlink PRO",
     "createDraft": "Create Draft",
-    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
-    "createOrderDraft": "Create order draft in Packlink PRO",
     "draftCreateFailed": "Previous attempt to create a draft failed. Error: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Order with shipment reference %s doesn't exist in the shop",
     "orderDetailsNotFound": "Order details not found",
     "orderNotExist": "Order with ID %s doesn't exist in the shop",
     "bulkFailCreateFail": "Unable to create bulk labels file",
     "draftOrderDelayed": "Creation of the draft is delayed",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "This shipping service supports delivery to pre-defined drop-off locations. Please choose location that suits you the most by clicking on the \"Select drop-off location\" button.",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook from Packlink received.",
     "couldNotDelete": "Could not delete entity %s with ID %s",
     "entityCannotBeSaved": "Entity %s with ID %s cannot be saved.",
     "entityCannotBeUpdated": "Entity %s with ID %s cannot be updated.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Database not accessible.",
     "taskCouldNotBeStarted.": "Task could not be started.",
-    "moduleAutoTest": "PacklinkPRO module auto-test",
-    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
     "start": "Start",
     "downloadTestLog": "Download test log",
-    "openModule": "Open PacklinkPRO module",
     "autotestPassedSuccessfully": "Auto-test passed successfully!",
     "testNotSuccessful": "The test did not complete successfully."
   }
diff --git a/src/BusinessLogic/Resources/countries/es.json b/src/BusinessLogic/Resources/countries/es.json
index 4ebe1a1a..c79bf571 100644
--- a/src/BusinessLogic/Resources/countries/es.json
+++ b/src/BusinessLogic/Resources/countries/es.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
-    "developedAndManaged": "Desarrollado y gestionado por Packlink",
     "generalConditions": "Condiciones generales",
     "basicSettings": "Configuración",
     "contactUs": "Contacta con nosotros",
@@ -48,8 +43,6 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "Clave de API incorrecta",
     "dontHaveAccount": "¿No tienes una cuenta?",
-    "welcome": "Te damos la bienvenida a Packlink PRO",
-    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>",
     "validateApiKey": "Validar API key",
     "chooseYourCountry": "Elige tu país para comenzar el registro",
     "registerMe": "Registrarme"
@@ -83,15 +76,10 @@
     "email": "Correo electrónico",
     "password": "Contraseña",
     "haveAccount": "¿Ya tienes una cuenta?",
-    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
     "registerAccount": "Registro",
     "getToKnowYou": "Queremos conocerte mejor para adaptarnos a ti y hacerte una propuesta personalizada.",
     "monthlyShipmentVolume": "¿Cuántos envíos sueles hacer al mes?",
     "phone": "Teléfono",
-    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
-    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico",
     "submit": "Regístrate",
     "chooseYourCountry": "Elige tu país",
     "searchCountry": "Busca el país",
@@ -153,10 +141,7 @@
     "parcel": "Paquete predeterminado",
     "help": "Ayuda",
     "contactUs": "Contáctanos:",
-    "systemInfo": "Información del sistema",
-    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Información del sistema"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Estado de la orden",
-    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
-    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO",
     "systemOrderStatus": "ESTADO DEL <strong>PEDIDO</strong> de %s",
     "none": "Ninguno",
     "pending": "Pendiente",
@@ -216,11 +199,9 @@
     "origin": "Origen",
     "destination": "Destino",
     "myPrices": "Mis precios",
-    "packlinkPrices": "Precios de Packlink",
     "configureService": "Configura el servicio",
     "showCarrierLogo": "Mostrar logo del transportista a mis clientes.",
     "pricePolicy": "Política de precios",
-    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
     "configurePricePolicy": "Configurar mis precios de envío",
     "taxClassTitle": "Elige tu tipo de impuesto guardado",
     "tax": "Impuestos",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Rango de peso y precio: desde %s kg hasta %s kg y desde %s€ hasta %s€",
     "singlePricePolicy": "Política de precio %s",
     "pricePolicyExplanation": "2- Elige una política de precios y configúrala.",
-    "packlinkPrice": "Precio Packlink",
-    "percentagePacklinkPrices": "% de los precio de Packlink",
-    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
     "fixedPrices": "Precio fijo",
     "fixedPricesWithData": "Precio fijo: %s€",
     "increaseExplanation": "Incrementar: añade un % al precio, lo pagará el cliente.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Selecionar todos los países",
     "selectCountriesHeader": "Países permitidos para tu servicio <br> de envío",
     "selectCountriesSubheader": "Selecciona la disponibilidad de al menos un país y <br> añade tantos como necesites",
-    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink",
     "discardChangesQuestion": "Algunos cambios no se han guardado.<br>¿Estás seguro de que quieres volver e ignorar los cambios?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Borrador del pedido de Packlink",
     "printed": "Impreso",
     "ready": "Listo",
     "printLabel": "Imprimir etiquetas",
     "shipmentLabels": "Etiquetas de los envíos",
-    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
     "shipmentDetails": "Detalles del envío",
     "disablePopUpBlocker": "Deshabilita el bloqueador de elementos emergentes en esta página para abrir de forma masiva las etiquetas de envío",
     "date": "Fecha",
@@ -279,22 +254,14 @@
     "print": "Imprimir",
     "carrierTrackingNumbers": "Número de tracking del transportista",
     "trackIt": "Seguimiento",
-    "packlinkReferenceNumber": "Número de referencia Packlink",
-    "packlinkShippingPrice": "Precio de envío de Packlink",
-    "viewOnPacklink": "Ver en Packlink PRO",
     "createDraft": "Crear borrador",
-    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
-    "createOrderDraft": "Crear borrador en Packlink PRO",
     "draftCreateFailed": "El intento anterior de crear un borrador ha fallado. Error: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "El pedido con referencia de envío %s no existe en la tienda",
     "orderDetailsNotFound": "Detalles del pedido no encontrados",
     "orderNotExist": "El pedido con ID %s no existe en la tienda",
     "bulkFailCreateFail": "No se puede crear el archivo de etiquetas masivas",
     "draftOrderDelayed": "La creación del borrador se ha retrasado",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Este servicio de envío admite la entrega a ubicaciones de entrega predefinidas. Elige la ubicación que más te convenga haciendo clic en el botón \"Seleccionar ubicación de entrega\"..",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook de Packlink recibido",
     "couldNotDelete": "No se pudo eliminar la entidad %s con ID %s",
     "entityCannotBeSaved": "La entidad %s con ID %s no se puede guardar.",
     "entityCannotBeUpdated": "La entidad %s con ID %s no se puede actualizar.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "DNo se puede acceder a la base de datos.",
     "taskCouldNotBeStarted.": "No se ha podido iniciar la tarea.",
-    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
-    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
     "start": "Inicio",
     "downloadTestLog": "Descargar el registro de pruebas",
-    "openModule": "Abrir el módulo PacklinkPRO",
     "autotestPassedSuccessfully": "Prueba automática superada con éxito.",
     "testNotSuccessful": "La prueba no se ha completado correctamente."
   }
diff --git a/src/BusinessLogic/Resources/countries/fr.json b/src/BusinessLogic/Resources/countries/fr.json
index c7a7906a..a9584db6 100644
--- a/src/BusinessLogic/Resources/countries/fr.json
+++ b/src/BusinessLogic/Resources/countries/fr.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
-    "developedAndManaged": "Développé et géré par Packlink",
     "generalConditions": "Conditions générales",
     "basicSettings": "Paramètres",
     "contactUs": "Contactez-nous",
@@ -48,8 +43,6 @@
     "apiKey": "Clé API",
     "apiKeyIncorrect": "Clé API incorrecte",
     "dontHaveAccount": "Vous n’avez pas de compte ?",
-    "welcome": "Bienvenue sur Packlink PRO",
-    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>.",
     "validateApiKey": "Valider clé API",
     "chooseYourCountry": "Sélectionnez votre pays pour commencer votre inscription",
     "registerMe": "S’inscrire"
@@ -83,15 +76,10 @@
     "email": "Adresse électronique",
     "password": "Mot de passe",
     "haveAccount": "Vous avez déjà un compte ?",
-    "startEnjoying": "Commencez à utiliser Packlink PRO !",
     "registerAccount": "Enregistrez-vous",
     "getToKnowYou": "Nous souhaitons mieux vous connaître afin de nous adapter à vous et de vous faire une offre sur mesure",
     "monthlyShipmentVolume": "Combien d’envois faites-vous généralement par mois?",
     "phone": "Numéro de téléphone",
-    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
-    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel",
     "submit": "S'inscrire",
     "chooseYourCountry": "Sélectionnez votre pays",
     "searchCountry": "Rechercher un pays",
@@ -153,10 +141,7 @@
     "parcel": "Colis par défaut",
     "help": "Aide",
     "contactUs": "Contactez-nous:",
-    "systemInfo": "Informations du système",
-    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Informations du système"
   },
   "systemInfo": {
     "title": "Fichier d’informations du système <br>et mode débogage",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Statut de la commande",
-    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
-    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO",
     "systemOrderStatus": "STATUT DE LA <strong>COMMANDE</strong> %s",
     "none": "Aucun",
     "pending": "En attente",
@@ -216,11 +199,9 @@
     "origin": "Origine",
     "destination": "Destination",
     "myPrices": "Mes prix",
-    "packlinkPrices": "Prix Packlink",
     "configureService": "Configurer le service",
     "showCarrierLogo": "Montrer le logo du transporteur à mes clients",
     "pricePolicy": "Politique tarifaire",
-    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
     "configurePricePolicy": "Configurer mes frais d’expédition",
     "taxClassTitle": "Sélectionnez votre taux fiscal enregistré",
     "tax": "Taxe",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Fourchette de poids et de prix : de %s kg à %s kg et de %s € à %s €",
     "singlePricePolicy": "Politique tarifaire %s",
     "pricePolicyExplanation": "2. Choisissez une politique tarifaire et configurez-la.",
-    "packlinkPrice": "Prix Packlink",
-    "percentagePacklinkPrices": "% des prix Packlink",
-    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
     "fixedPrices": "Prix fixe",
     "fixedPricesWithData": "Prix fixe : %s €",
     "increaseExplanation": "Augmentation : ajoutez % au prix, c’est le client qui payera.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Tous les pays sélectionnés",
     "selectCountriesHeader": "Pays pris en charge par votre <br> service d’expédition",
     "selectCountriesSubheader": "Sélectionnez la disponibilité d’au moins un pays et ajoutez-en <br> autant que nécessaire",
-    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink",
     "discardChangesQuestion": "Certaines modifications n’ont pas été enregistrées.<br>Êtes-vous sûr de vouloir revenir en arrière et de les ignorer ?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Brouillon de commande Packlink",
     "printed": "Imprimé",
     "ready": "Prêt",
     "printLabel": "Imprimer étiquette",
     "shipmentLabels": "Étiquettes de livraison",
-    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
     "shipmentDetails": "Détails de l'envoi",
     "disablePopUpBlocker": "Veuillez désactiver l'outil de blocage des fenêtres pop-up sur cette page afin d'ouvrir massivement les étiquettes d'envoi.",
     "date": "Date",
@@ -279,22 +254,14 @@
     "print": "Imprimer",
     "carrierTrackingNumbers": "Numéro de tracking du transporteur",
     "trackIt": "Suivez le!",
-    "packlinkReferenceNumber": "Numéro de référence Packlink",
-    "packlinkShippingPrice": "Prix de livraison Packlink",
-    "viewOnPacklink": "Voir sur Packlink PRO",
     "createDraft": "Créer un brouillon",
-    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
-    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
     "draftCreateFailed": "La tentative précédente de création d'un brouillon a échoué. Erreur: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "La commande de livraison sous le référence %s n'existe pas sur le shop.",
     "orderDetailsNotFound": "Détails de commande introuvables",
     "orderNotExist": "La commande sous l'ID %s n'existe pas sur le shop.",
     "bulkFailCreateFail": "Création d'un dossier d'étiquettes en masse impossible.",
     "draftOrderDelayed": "La création du brouillon a été retardée",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Ce service de transport soutient la livraison vers des lieux de dépôts prédéfinis. Veuillez choisir la localisation qui vous convient le mieux en cliquant sur le bouton \"Sélectionner le lieu de dépôt\"",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Erreur lors de la création de la configuration du gestionnaire de tâches par défaut.",
-    "webhookReceived": "Webhook de Packlink reçu",
     "couldNotDelete": "L'entité %s dont l'ID est %s n'a pas pu être supprimée.",
     "entityCannotBeSaved": "L'entité %s dont l'ID est %s n'a pas pu être enregistrée.",
     "entityCannotBeUpdated": "L'entité %s dont l'ID est %s n'a pas pu être mise à jour.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Base de données inaccessible.",
     "taskCouldNotBeStarted.": "La tâche n’a pu être lancée.",
-    "moduleAutoTest": "Test automatique du module PacklinkPRO",
-    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
     "start": "Démarrer",
     "downloadTestLog": "Télécharger le registre de tests",
-    "openModule": "Ouvrir le module PacklinkPRO",
     "autotestPassedSuccessfully": "Test automatique réussi avec succès !",
     "testNotSuccessful": "Le test a échoué."
   }
diff --git a/src/BusinessLogic/Resources/countries/it.json b/src/BusinessLogic/Resources/countries/it.json
index e10440f8..2f8c05e9 100644
--- a/src/BusinessLogic/Resources/countries/it.json
+++ b/src/BusinessLogic/Resources/countries/it.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
-    "developedAndManaged": "Sviluppato e gestito da Packlink",
     "generalConditions": "Condizioni generali",
     "basicSettings": "Configurazione",
     "contactUs": "Contattaci",
@@ -48,8 +43,6 @@
     "apiKey": "API Key",
     "apiKeyIncorrect": "API Key non corretta",
     "dontHaveAccount": "Non hai un account?",
-    "welcome": "Benvenuto a Packlink PRO",
-    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>.",
     "validateApiKey": "Convalida la chiave API",
     "chooseYourCountry": "Per iniziare la registrazione, scegli il tuo paese",
     "registerMe": "Iscriviti"
@@ -83,15 +76,10 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Hai già un account?",
-    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
     "registerAccount": "Registrati",
     "getToKnowYou": "Vogliamo conoscerti meglio per adattarci a te e preparare una proposta personalizzata per te",
     "monthlyShipmentVolume": "Quante spedizioni fai solitamente al mese?",
     "phone": "Numero di telefono",
-    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
-    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email",
     "submit": "Registrati",
     "chooseYourCountry": "Scegli il paese",
     "searchCountry": "Cerca paese",
@@ -153,10 +141,7 @@
     "parcel": "Pacco predefinito",
     "help": "Aiuto",
     "contactUs": "Contattaci:",
-    "systemInfo": "Informazioni del sistema",
-    "helpUrl": "https://support-pro.packlink.com/hc/it",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Informazioni del sistema"
   },
   "systemInfo": {
     "title": "File di informazioni del sistema <br>e modalità debug",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Stato dell’ordine",
-    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
-    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO",
     "systemOrderStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di %s",
     "none": "Nessuno",
     "pending": "In attesa",
@@ -216,11 +199,9 @@
     "origin": "Origine",
     "destination": "Destinazione",
     "myPrices": "I miei prezzi",
-    "packlinkPrices": "Prezzi di Packlink",
     "configureService": "Configura il servizio",
     "showCarrierLogo": "Mostra logo del corriere ai miei clienti",
     "pricePolicy": "Politica dei prezzi",
-    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
     "configurePricePolicy": "Configura i prezzi di spedizione",
     "taxClassTitle": "Scegli la tua aliquota fiscale salvata",
     "tax": "Tassa",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Range di prezzo e di peso: da %s kg a %s kg e da %s€ a %s€",
     "singlePricePolicy": "Politica dei prezzi %s",
     "pricePolicyExplanation": "2. Scegli una politica dei prezzi e configurala.",
-    "packlinkPrice": "Prezzo di Packlink",
-    "percentagePacklinkPrices": "% dei prezzi di Packlink",
-    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
     "fixedPrices": "Prezzo fisso",
     "fixedPricesWithData": "Prezzo fisso: %s€",
     "increaseExplanation": "Incremento sul prezzo: aggiungi una % al prezzo, che sarà pagata dal cliente.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Tutti i paesi selezionati",
     "selectCountriesHeader": "Paesi supportati per il tuo <br> servizio di spedizione",
     "selectCountriesSubheader": "Seleziona la disponibilità di almeno un paese e aggiungi <br> tutti quelli richiesti",
-    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink",
     "discardChangesQuestion": "Alcune modifiche non sono state salvate.<br>Sei sicuro di voler tornare indietro e annullarle?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
     "printed": "Stampato",
     "ready": "Pronto per la spedizione",
     "printLabel": "Stampa etichette",
     "shipmentLabels": "Etichette di spedizione",
-    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
     "shipmentDetails": "Dettagli della spedizione",
     "disablePopUpBlocker": "Disabilita il blocco pop-up su questa pagina per poter aprire le etichette di spedizione insieme",
     "date": "Data",
@@ -279,22 +254,14 @@
     "print": "Stampa",
     "carrierTrackingNumbers": "Numero di tracking del corriere",
     "trackIt": "Traccialo!",
-    "packlinkReferenceNumber": "Numero di ordine Packlink",
-    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
-    "viewOnPacklink": "Vedi su Packlink PRO",
     "createDraft": "Crea bozza",
-    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
-    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
     "draftCreateFailed": "Il precedente tentativo di creare una bozza è fallito. Errore: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "L'ordine con il numero di spedizione %s non esiste nel negozio",
     "orderDetailsNotFound": "Dettagli dell'ordine non trovati",
     "orderNotExist": "L'ordine con ID %s non esiste nel negozio",
     "bulkFailCreateFail": "Impossibile creare il file di etichette in blocco",
     "draftOrderDelayed": "La creazione della bozza è stata ritardata",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Questo servizio di spedizione supporta la consegna a punti corriere predefiniti. Scegli la località più adatta a te, facendo clic sul pulsante \"Seleziona punto corriere\".",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook di Packlink ricevuto",
     "couldNotDelete": "Impossibile eliminare l'entità %s con ID %s",
     "entityCannotBeSaved": "L'entità %s con ID %s non può essere salvata.",
     "entityCannotBeUpdated": "L'entità %s con ID %s non può essere aggiornata.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Database non accessibile.",
     "taskCouldNotBeStarted.": "Non è stato possibile avviare l’attività.",
-    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
-    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
     "start": "Avvia",
     "downloadTestLog": "Scarica il registro test",
-    "openModule": "Apri il modulo di PacklinkPRO",
     "autotestPassedSuccessfully": "L’auto-test è stato superato con successo!",
     "testNotSuccessful": "Il test non è stato completato correttamente."
   }
diff --git a/src/DemoUI/src/Bootstrap.php b/src/DemoUI/src/Bootstrap.php
index c2dde899..f6a4940a 100644
--- a/src/DemoUI/src/Bootstrap.php
+++ b/src/DemoUI/src/Bootstrap.php
@@ -21,6 +21,7 @@
 use Packlink\BusinessLogic\BootstrapComponent;
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Configuration;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\BusinessLogic\Order\Interfaces\ShopOrderService as ShopOrderServiceInterface;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
@@ -200,6 +201,18 @@ function () use ($instance) {
                 return $instance->registrationInfoService;
             }
         );
+
+        ServiceRegister::registerService(
+            FileResolverService::CLASS_NAME,
+            function () {
+                return new FileResolverService(
+                    array(
+                        __DIR__ . '/../../Brands/Packlink/Resources/countries',
+                        __DIR__ . '/../../BusinessLogic/Resources/countries',
+                    )
+                );
+            }
+        );
     }
 
     protected function initBrandService()
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
index 92d60cef..00dc0293 100644
--- a/src/DemoUI/src/Views/ACME/index.php
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -1,6 +1,7 @@
 <?php
 
 use Logeecom\Infrastructure\Configuration\Configuration;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\DemoUI\Services\Integration\UrlService;
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
@@ -13,6 +14,18 @@ function getUrl($controller, $action)
     echo UrlService::getEndpointUrl($controller, $action);
 }
 
+function getTranslations($language)
+{
+    $fileResolver = new FileResolverService(
+        array(
+            __DIR__ . '/../../../../BusinessLogic/Resources/countries',
+            __DIR__ . '/../../../../Brands/Packlink/Resources/countries',
+        )
+    );
+
+    echo json_encode($fileResolver->getContent($language));
+}
+
 ?>
 <!DOCTYPE html>
 <html lang="<?php
@@ -145,10 +158,8 @@ function getUrl($controller, $action)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php echo file_get_contents($baseResourcesPath . 'countries/en.json') ?>,
-                current: <?php $langFile = $baseResourcesPath . 'countries/' . $lang . '.json';
-                echo file_exists($langFile) ? file_get_contents($langFile) : ''
-                ?>,
+                default: <?php getTranslations('en') ?>,
+                current: <?php getTranslations($lang); ?>,
             };
 
             const pageConfiguration = {
diff --git a/src/DemoUI/src/Views/PRO/index.php b/src/DemoUI/src/Views/PRO/index.php
index 92d60cef..00dc0293 100644
--- a/src/DemoUI/src/Views/PRO/index.php
+++ b/src/DemoUI/src/Views/PRO/index.php
@@ -1,6 +1,7 @@
 <?php
 
 use Logeecom\Infrastructure\Configuration\Configuration;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\DemoUI\Services\Integration\UrlService;
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
@@ -13,6 +14,18 @@ function getUrl($controller, $action)
     echo UrlService::getEndpointUrl($controller, $action);
 }
 
+function getTranslations($language)
+{
+    $fileResolver = new FileResolverService(
+        array(
+            __DIR__ . '/../../../../BusinessLogic/Resources/countries',
+            __DIR__ . '/../../../../Brands/Packlink/Resources/countries',
+        )
+    );
+
+    echo json_encode($fileResolver->getContent($language));
+}
+
 ?>
 <!DOCTYPE html>
 <html lang="<?php
@@ -145,10 +158,8 @@ function getUrl($controller, $action)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php echo file_get_contents($baseResourcesPath . 'countries/en.json') ?>,
-                current: <?php $langFile = $baseResourcesPath . 'countries/' . $lang . '.json';
-                echo file_exists($langFile) ? file_get_contents($langFile) : ''
-                ?>,
+                default: <?php getTranslations('en') ?>,
+                current: <?php getTranslations($lang); ?>,
             };
 
             const pageConfiguration = {

From 6dd67e9213f1d4311ea21d6fa3901122bf04881a Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 16 Mar 2021 10:25:29 +0100
Subject: [PATCH 17/37] Revert "Replace links generation logic with new
 CountryService usage"

This reverts commit 54b8919e
---
 .../Packlink/Resources/countries/de.json      | 57 -------------------
 .../Packlink/Resources/countries/en.json      | 57 -------------------
 .../Packlink/Resources/countries/es.json      | 57 -------------------
 .../Packlink/Resources/countries/fr.json      | 57 -------------------
 .../Packlink/Resources/countries/it.json      | 57 -------------------
 src/BusinessLogic/BootstrapComponent.php      |  1 -
 .../Resources/countries/at.json               |  0
 .../Resources/countries/be.json               |  0
 src/BusinessLogic/Resources/countries/de.json | 41 ++++++++++++-
 src/BusinessLogic/Resources/countries/en.json | 41 ++++++++++++-
 src/BusinessLogic/Resources/countries/es.json | 41 ++++++++++++-
 src/BusinessLogic/Resources/countries/fr.json | 41 ++++++++++++-
 .../Resources/countries/gb.json               |  0
 .../Resources/countries/hu.json               |  0
 .../Resources/countries/ie.json               |  0
 src/BusinessLogic/Resources/countries/it.json | 41 ++++++++++++-
 .../Resources/countries/nl.json               |  0
 .../Resources/countries/pt.json               |  0
 .../Resources/countries/tr.json               |  0
 19 files changed, 195 insertions(+), 296 deletions(-)
 delete mode 100644 src/Brands/Packlink/Resources/countries/de.json
 delete mode 100644 src/Brands/Packlink/Resources/countries/en.json
 delete mode 100644 src/Brands/Packlink/Resources/countries/es.json
 delete mode 100644 src/Brands/Packlink/Resources/countries/fr.json
 delete mode 100644 src/Brands/Packlink/Resources/countries/it.json
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/at.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/be.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/gb.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/hu.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/ie.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/nl.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/pt.json (100%)
 rename src/{Brands/Packlink => BusinessLogic}/Resources/countries/tr.json (100%)

diff --git a/src/Brands/Packlink/Resources/countries/de.json b/src/Brands/Packlink/Resources/countries/de.json
deleted file mode 100644
index 7c90e80e..00000000
--- a/src/Brands/Packlink/Resources/countries/de.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
-    "developedAndManaged": "Entwickelt und verwaltet von Packlink"
-  },
-  "login": {
-    "welcome": "Willkommen zu Packlink PRO",
-    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
-  },
-  "register": {
-    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
-    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
-    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
-  },
-  "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/de",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
-  },
-  "orderStatusMapping": {
-    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
-    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO"
-  },
-  "shippingServices": {
-    "packlinkPrices": "Packlink-Preise",
-    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
-    "packlinkPrice": "Packlink-Preise",
-    "percentagePacklinkPrices": "% der Packlink-Preise",
-    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
-    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise"
-  },
-  "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink Auftragsentwurf",
-    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
-    "packlinkReferenceNumber": "Packlink Referenznummer",
-    "packlinkShippingPrice": "Packlink Versandpreis",
-    "viewOnPacklink": "Auf Packlink PRO ansehen",
-    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
-    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
-  },
-  "systemLogMessages": {
-    "webhookReceived": "Webhook von Packlink erhalten"
-  },
-  "autoTest": {
-    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
-    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
-    "openModule": "PacklinkPRO-Modul öffnen"
-  }
-}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/en.json b/src/Brands/Packlink/Resources/countries/en.json
deleted file mode 100644
index d27043f7..00000000
--- a/src/Brands/Packlink/Resources/countries/en.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
-    "developedAndManaged": "Developed and managed by Packlink"
-  },
-  "login": {
-    "welcome": "Welcome to Packlink PRO",
-    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>."
-  },
-  "register": {
-    "startEnjoying": "Start enjoying Packlink PRO!",
-    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
-    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail"
-  },
-  "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
-  },
-  "orderStatusMapping": {
-    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
-    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS"
-  },
-  "shippingServices": {
-    "packlinkPrices": "Packlink prices",
-    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
-    "packlinkPrice": "Packlink Price",
-    "percentagePacklinkPrices": "% of Packlink prices",
-    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
-    "usePacklinkRange": "For all other ranges, apply Packlink prices"
-  },
-  "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink order draft",
-    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
-    "packlinkReferenceNumber": "Packlink reference number",
-    "packlinkShippingPrice": "Packlink shipping price",
-    "viewOnPacklink": "View on Packlink PRO",
-    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
-    "createOrderDraft": "Create order draft in Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
-  },
-  "systemLogMessages": {
-    "webhookReceived": "Webhook from Packlink received."
-  },
-  "autoTest": {
-    "moduleAutoTest": "PacklinkPRO module auto-test",
-    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
-    "openModule": "Open PacklinkPRO module"
-  }
-}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/es.json b/src/Brands/Packlink/Resources/countries/es.json
deleted file mode 100644
index 59908297..00000000
--- a/src/Brands/Packlink/Resources/countries/es.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
-    "developedAndManaged": "Desarrollado y gestionado por Packlink"
-  },
-  "login": {
-    "welcome": "Te damos la bienvenida a Packlink PRO",
-    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>"
-  },
-  "register": {
-    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
-    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
-    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
-  },
-  "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
-  },
-  "orderStatusMapping": {
-    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
-    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO"
-  },
-  "shippingServices": {
-    "packlinkPrices": "Precios de Packlink",
-    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
-    "packlinkPrice": "Precio Packlink",
-    "percentagePacklinkPrices": "% de los precio de Packlink",
-    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
-    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink"
-  },
-  "orderListAndDetails": {
-    "packlinkOrderDraft": "Borrador del pedido de Packlink",
-    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
-    "packlinkReferenceNumber": "Número de referencia Packlink",
-    "packlinkShippingPrice": "Precio de envío de Packlink",
-    "viewOnPacklink": "Ver en Packlink PRO",
-    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
-    "createOrderDraft": "Crear borrador en Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
-  },
-  "systemLogMessages": {
-    "webhookReceived": "Webhook de Packlink recibido"
-  },
-  "autoTest": {
-    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
-    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
-    "openModule": "Abrir el módulo PacklinkPRO"
-  }
-}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/fr.json b/src/Brands/Packlink/Resources/countries/fr.json
deleted file mode 100644
index afe7b187..00000000
--- a/src/Brands/Packlink/Resources/countries/fr.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
-    "developedAndManaged": "Développé et géré par Packlink"
-  },
-  "login": {
-    "welcome": "Bienvenue sur Packlink PRO",
-    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>."
-  },
-  "register": {
-    "startEnjoying": "Commencez à utiliser Packlink PRO !",
-    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
-    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
-  },
-  "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
-  },
-  "orderStatusMapping": {
-    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
-    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO"
-  },
-  "shippingServices": {
-    "packlinkPrices": "Prix Packlink",
-    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
-    "packlinkPrice": "Prix Packlink",
-    "percentagePacklinkPrices": "% des prix Packlink",
-    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
-    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink"
-  },
-  "orderListAndDetails": {
-    "packlinkOrderDraft": "Brouillon de commande Packlink",
-    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
-    "packlinkReferenceNumber": "Numéro de référence Packlink",
-    "packlinkShippingPrice": "Prix de livraison Packlink",
-    "viewOnPacklink": "Voir sur Packlink PRO",
-    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
-    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
-  },
-  "systemLogMessages": {
-    "webhookReceived": "Webhook de Packlink reçu"
-  },
-  "autoTest": {
-    "moduleAutoTest": "Test automatique du module PacklinkPRO",
-    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
-    "openModule": "Ouvrir le module PacklinkPRO"
-  }
-}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/it.json b/src/Brands/Packlink/Resources/countries/it.json
deleted file mode 100644
index d1e1973f..00000000
--- a/src/Brands/Packlink/Resources/countries/it.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
-    "developedAndManaged": "Sviluppato e gestito da Packlink"
-  },
-  "login": {
-    "welcome": "Benvenuto a Packlink PRO",
-    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>."
-  },
-  "register": {
-    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
-    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
-    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email"
-  },
-  "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/it",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
-  },
-  "orderStatusMapping": {
-    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
-    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO"
-  },
-  "shippingServices": {
-    "packlinkPrices": "Prezzi di Packlink",
-    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
-    "packlinkPrice": "Prezzo di Packlink",
-    "percentagePacklinkPrices": "% dei prezzi di Packlink",
-    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
-    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink"
-  },
-  "orderListAndDetails": {
-    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
-    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
-    "packlinkReferenceNumber": "Numero di ordine Packlink",
-    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
-    "viewOnPacklink": "Vedi su Packlink PRO",
-    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
-    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
-  },
-  "systemLogMessages": {
-    "webhookReceived": "Webhook di Packlink ricevuto"
-  },
-  "autoTest": {
-    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
-    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
-    "openModule": "Apri il modulo di PacklinkPRO"
-  }
-}
\ No newline at end of file
diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 60e2c53f..41a696f1 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -175,7 +175,6 @@ function () {
             function () {
                 return new FileResolverService(
                     array(
-                        __DIR__ . '/../Brands/Packlink/Resources/countries',
                         __DIR__ . '/Resources/countries',
                     )
                 );
diff --git a/src/Brands/Packlink/Resources/countries/at.json b/src/BusinessLogic/Resources/countries/at.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/at.json
rename to src/BusinessLogic/Resources/countries/at.json
diff --git a/src/Brands/Packlink/Resources/countries/be.json b/src/BusinessLogic/Resources/countries/be.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/be.json
rename to src/BusinessLogic/Resources/countries/be.json
diff --git a/src/BusinessLogic/Resources/countries/de.json b/src/BusinessLogic/Resources/countries/de.json
index 0a06c9b7..c0c77ea8 100644
--- a/src/BusinessLogic/Resources/countries/de.json
+++ b/src/BusinessLogic/Resources/countries/de.json
@@ -1,5 +1,10 @@
 {
   "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
+    "developedAndManaged": "Entwickelt und verwaltet von Packlink",
     "generalConditions": "Allgemeine Bedingungen",
     "basicSettings": "Einstellungen",
     "contactUs": "Kontaktieren Sie uns",
@@ -43,6 +48,8 @@
     "apiKey": "API-Schlüssel",
     "apiKeyIncorrect": "Falscher API-Schlüssel",
     "dontHaveAccount": "Sie haben noch keinen Account?",
+    "welcome": "Willkommen zu Packlink PRO",
+    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>.",
     "validateApiKey": "API-Schlüssel bestätigen",
     "chooseYourCountry": "Wählen Sie Ihr Land aus, um mit der Registrierung beginnen zu können",
     "registerMe": "Registrieren"
@@ -76,10 +83,15 @@
     "email": "E-Mail",
     "password": "Passwort",
     "haveAccount": "Haben Sie bereits einen Account?",
+    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
     "registerAccount": "Jetzt registrieren",
     "getToKnowYou": "Wir möchten Sie besser kennenlernen, um uns an Sie anzupassen und Ihnen ein individuelles Angebot zukommen zu lassen",
     "monthlyShipmentVolume": "Wie hoch ist Ihr monatliches Sendungsaufkommen?",
     "phone": "Telefonnummer",
+    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
+    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden",
     "submit": "Registrieren",
     "chooseYourCountry": "Wählen Sie Ihr Land aus",
     "searchCountry": "Land suchen",
@@ -141,7 +153,10 @@
     "parcel": "Standardpaket",
     "help": "Hilfe",
     "contactUs": "Kontaktieren Sie uns:",
-    "systemInfo": "Systeminformationen"
+    "systemInfo": "Systeminformationen",
+    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "Systeminfodatei <br>und debug mode",
@@ -150,6 +165,8 @@
   },
   "orderStatusMapping": {
     "title": "Bestellstatus",
+    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
+    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO",
     "systemOrderStatus": "<strong>BESTELLSTATUS</strong> von %s",
     "none": "Leer",
     "pending": "Ausstehend",
@@ -199,9 +216,11 @@
     "origin": "Absender",
     "destination": "Empfänger",
     "myPrices": "Meine Preise",
+    "packlinkPrices": "Packlink-Preise",
     "configureService": "Dienst einrichten",
     "showCarrierLogo": "Meinen Kunden das Logo anzeigen",
     "pricePolicy": "Preispolitik",
+    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
     "configurePricePolicy": "Meine Versandkosten einrichten",
     "taxClassTitle": "Wählen Sie Ihre gespeicherte Steuerkategorie",
     "tax": "Steuer",
@@ -227,6 +246,9 @@
     "weightAndPriceRangeWithData": "Gewichts- und Preisklasse: von %s kg bis %s kg und von %s € bis %s €",
     "singlePricePolicy": "Preispolitik %s",
     "pricePolicyExplanation": "2. Wählen Sie eine Preispolitik und richten Sie diese ein.",
+    "packlinkPrice": "Packlink-Preise",
+    "percentagePacklinkPrices": "% der Packlink-Preise",
+    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
     "fixedPrices": "Festpreis",
     "fixedPricesWithData": "Festpreis: %s €",
     "increaseExplanation": "Erhöhen: fügen Sie % zum Preis hinzu. Dies wird dann vom Kunden bezahlt.",
@@ -238,14 +260,17 @@
     "selectAllCountries": "Alle ausgewählten Länder",
     "selectCountriesHeader": "Länder, die von Ihrem <br> Versanddienst unterstützt werden",
     "selectCountriesSubheader": "Wählen Sie die Verfügbarkeit von mindestens einem Land aus und fügen Sie <br> beliebig viele hinzu",
+    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise",
     "discardChangesQuestion": "Es gibt nicht gespeicherte Änderungen.<br>Sind Sie sicher, dass Sie zurückgehen und sie verwerfen möchten?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink Auftragsentwurf",
     "printed": "Ausgedruckt",
     "ready": "Bereit",
     "printLabel": "Versandetikett drucken",
     "shipmentLabels": "Versandetiketten",
+    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
     "shipmentDetails": "Versanddetails",
     "disablePopUpBlocker": "Bitte deaktivieren Sie den Popup-Blocker auf dieser Seite, um alle Versandetiketten auf einmal zu öffnen.",
     "date": "Datum",
@@ -254,14 +279,22 @@
     "print": "Drucken",
     "carrierTrackingNumbers": "Trackingnummer des Versandunternehmens",
     "trackIt": "Versand verfolgen",
+    "packlinkReferenceNumber": "Packlink Referenznummer",
+    "packlinkShippingPrice": "Packlink Versandpreis",
+    "viewOnPacklink": "Auf Packlink PRO ansehen",
     "createDraft": "Entwurf erstellen",
+    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
+    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
     "draftCreateFailed": "Der Versuch der Entwurfserstellung ist fehlgeschlagen. Fehler: %s",
+    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Die Bestellung mit der Versandreferenznummer %s existiert nicht im Shop",
     "orderDetailsNotFound": "Bestelldetails nicht gefunden",
     "orderNotExist": "Die Bestellung mit der ID %s existiert nicht im Shop",
     "bulkFailCreateFail": "Die Datei der Versandetiketten konnte nicht erstellt werden",
     "draftOrderDelayed": "Die Erstellung des Entwurfs verzögert sich",
-    "completeServicesSetup": "You need to complete the services setup to create order draft."
+    "completeServicesSetup": "You need to complete the services setup to create order draft.",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Dieser Versanddienst unterstützt die Zustellung an vordefinierte Abgabestellen. Bitte wählen Sie den für Sie günstigsten Ort aus, indem Sie auf \"Abgabestelle auswählen\" klicken.",
@@ -304,6 +337,7 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Fehler beim Erstellen der Standardkonfiguration des Task-Runner-Status.",
+    "webhookReceived": "Webhook von Packlink erhalten",
     "couldNotDelete": "Element %s mit ID %s konnte nicht gelöscht werden",
     "entityCannotBeSaved": "Element %s mit ID %s kann nicht gespeichert werden.",
     "entityCannotBeUpdated": "Element %s mit ID %s kann nicht aktualisiert werden.",
@@ -316,8 +350,11 @@
   "autoTest": {
     "dbNotAccessible.": "Zugriff auf Datenbank nicht möglich.",
     "taskCouldNotBeStarted.": "Die Aufgabe konnte nicht gestartet werden.",
+    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
+    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
     "start": "Start",
     "downloadTestLog": "Testprotokoll herunterladen",
+    "openModule": "PacklinkPRO-Modul öffnen",
     "autotestPassedSuccessfully": "Der automatische Test wurde erfolgreich abgeschlossen!",
     "testNotSuccessful": "Der Test wurde nicht erfolgreich abgeschlossen!"
   }
diff --git a/src/BusinessLogic/Resources/countries/en.json b/src/BusinessLogic/Resources/countries/en.json
index 577bb12e..4e4a0459 100644
--- a/src/BusinessLogic/Resources/countries/en.json
+++ b/src/BusinessLogic/Resources/countries/en.json
@@ -1,5 +1,10 @@
 {
   "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
+    "developedAndManaged": "Developed and managed by Packlink",
     "generalConditions": "General conditions",
     "basicSettings": "Basic settings",
     "contactUs": "Contact us",
@@ -43,6 +48,8 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "API key was incorrect.",
     "dontHaveAccount": "Don't have an account?",
+    "welcome": "Welcome to Packlink PRO",
+    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>.",
     "validateApiKey": "Validate API key",
     "chooseYourCountry": "Choose your country to start the registration process",
     "registerMe": "Register me"
@@ -76,10 +83,15 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Already have an account?",
+    "startEnjoying": "Start enjoying Packlink PRO!",
     "registerAccount": "Register your account",
     "getToKnowYou": "We would like to get to know you better in order to adapt to you and to send you an individual offer",
     "monthlyShipmentVolume": "What is your monthly shipment volume?",
     "phone": "Phone number",
+    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
+    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail",
     "submit": "Register",
     "chooseYourCountry": "Choose your country",
     "searchCountry": "Search country",
@@ -141,7 +153,10 @@
     "parcel": "Default parcel",
     "help": "Help",
     "contactUs": "Contact us at:",
-    "systemInfo": "System information"
+    "systemInfo": "System information",
+    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -150,6 +165,8 @@
   },
   "orderStatusMapping": {
     "title": "Order status",
+    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
+    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS",
     "systemOrderStatus": "%s <strong>ORDER STATUS</strong>",
     "none": "None",
     "pending": "Pending",
@@ -199,9 +216,11 @@
     "origin": "Origin",
     "destination": "Destination",
     "myPrices": "My prices",
+    "packlinkPrices": "Packlink prices",
     "configureService": "Set up service",
     "showCarrierLogo": "Show carrier logo to my customers",
     "pricePolicy": "Price policy",
+    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
     "configurePricePolicy": "Set up my shipment prices",
     "taxClassTitle": "Choose your saved tax class",
     "tax": "Tax",
@@ -227,6 +246,9 @@
     "weightAndPriceRangeWithData": "Weight and price range: from %s kg to %s kg and from %s€ to %s€",
     "singlePricePolicy": "Price policy %s",
     "pricePolicyExplanation": "2. Choose a price policy and set it up.",
+    "packlinkPrice": "Packlink Price",
+    "percentagePacklinkPrices": "% of Packlink prices",
+    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
     "fixedPrices": "Fixed price",
     "fixedPricesWithData": "Fixed price: %s€",
     "increaseExplanation": "Increase: add a % to the price, this will be paid by the customer.",
@@ -238,14 +260,17 @@
     "selectAllCountries": "All selected countries",
     "selectCountriesHeader": "Countries supported for your <br> shipping service",
     "selectCountriesSubheader": "Select availability of at least one country and add <br> as many required",
+    "usePacklinkRange": "For all other ranges, apply Packlink prices",
     "discardChangesQuestion": "There are unsaved changes.<br>Are you sure you want to go back and discard them?",
     "atLeastOneCountry": "At least one country must be selected."
   },
   "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink order draft",
     "printed": "Printed",
     "ready": "Ready",
     "printLabel": "Print label",
     "shipmentLabels": "Shipment Labels",
+    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
     "shipmentDetails": "Shipment details",
     "disablePopUpBlocker": "Please disable pop-up blocker on this page in order to bulk open shipment labels",
     "date": "Date",
@@ -254,14 +279,22 @@
     "print": "Print",
     "carrierTrackingNumbers": "Carrier tracking numbers",
     "trackIt": "Track it!",
+    "packlinkReferenceNumber": "Packlink reference number",
+    "packlinkShippingPrice": "Packlink shipping price",
+    "viewOnPacklink": "View on Packlink PRO",
     "createDraft": "Create Draft",
+    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
+    "createOrderDraft": "Create order draft in Packlink PRO",
     "draftCreateFailed": "Previous attempt to create a draft failed. Error: %s",
+    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Order with shipment reference %s doesn't exist in the shop",
     "orderDetailsNotFound": "Order details not found",
     "orderNotExist": "Order with ID %s doesn't exist in the shop",
     "bulkFailCreateFail": "Unable to create bulk labels file",
     "draftOrderDelayed": "Creation of the draft is delayed",
-    "completeServicesSetup": "You need to complete the services setup to create order draft."
+    "completeServicesSetup": "You need to complete the services setup to create order draft.",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "This shipping service supports delivery to pre-defined drop-off locations. Please choose location that suits you the most by clicking on the \"Select drop-off location\" button.",
@@ -304,6 +337,7 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
+    "webhookReceived": "Webhook from Packlink received.",
     "couldNotDelete": "Could not delete entity %s with ID %s",
     "entityCannotBeSaved": "Entity %s with ID %s cannot be saved.",
     "entityCannotBeUpdated": "Entity %s with ID %s cannot be updated.",
@@ -316,8 +350,11 @@
   "autoTest": {
     "dbNotAccessible.": "Database not accessible.",
     "taskCouldNotBeStarted.": "Task could not be started.",
+    "moduleAutoTest": "PacklinkPRO module auto-test",
+    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
     "start": "Start",
     "downloadTestLog": "Download test log",
+    "openModule": "Open PacklinkPRO module",
     "autotestPassedSuccessfully": "Auto-test passed successfully!",
     "testNotSuccessful": "The test did not complete successfully."
   }
diff --git a/src/BusinessLogic/Resources/countries/es.json b/src/BusinessLogic/Resources/countries/es.json
index c79bf571..4ebe1a1a 100644
--- a/src/BusinessLogic/Resources/countries/es.json
+++ b/src/BusinessLogic/Resources/countries/es.json
@@ -1,5 +1,10 @@
 {
   "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
+    "developedAndManaged": "Desarrollado y gestionado por Packlink",
     "generalConditions": "Condiciones generales",
     "basicSettings": "Configuración",
     "contactUs": "Contacta con nosotros",
@@ -43,6 +48,8 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "Clave de API incorrecta",
     "dontHaveAccount": "¿No tienes una cuenta?",
+    "welcome": "Te damos la bienvenida a Packlink PRO",
+    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>",
     "validateApiKey": "Validar API key",
     "chooseYourCountry": "Elige tu país para comenzar el registro",
     "registerMe": "Registrarme"
@@ -76,10 +83,15 @@
     "email": "Correo electrónico",
     "password": "Contraseña",
     "haveAccount": "¿Ya tienes una cuenta?",
+    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
     "registerAccount": "Registro",
     "getToKnowYou": "Queremos conocerte mejor para adaptarnos a ti y hacerte una propuesta personalizada.",
     "monthlyShipmentVolume": "¿Cuántos envíos sueles hacer al mes?",
     "phone": "Teléfono",
+    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
+    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico",
     "submit": "Regístrate",
     "chooseYourCountry": "Elige tu país",
     "searchCountry": "Busca el país",
@@ -141,7 +153,10 @@
     "parcel": "Paquete predeterminado",
     "help": "Ayuda",
     "contactUs": "Contáctanos:",
-    "systemInfo": "Información del sistema"
+    "systemInfo": "Información del sistema",
+    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -150,6 +165,8 @@
   },
   "orderStatusMapping": {
     "title": "Estado de la orden",
+    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
+    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO",
     "systemOrderStatus": "ESTADO DEL <strong>PEDIDO</strong> de %s",
     "none": "Ninguno",
     "pending": "Pendiente",
@@ -199,9 +216,11 @@
     "origin": "Origen",
     "destination": "Destino",
     "myPrices": "Mis precios",
+    "packlinkPrices": "Precios de Packlink",
     "configureService": "Configura el servicio",
     "showCarrierLogo": "Mostrar logo del transportista a mis clientes.",
     "pricePolicy": "Política de precios",
+    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
     "configurePricePolicy": "Configurar mis precios de envío",
     "taxClassTitle": "Elige tu tipo de impuesto guardado",
     "tax": "Impuestos",
@@ -227,6 +246,9 @@
     "weightAndPriceRangeWithData": "Rango de peso y precio: desde %s kg hasta %s kg y desde %s€ hasta %s€",
     "singlePricePolicy": "Política de precio %s",
     "pricePolicyExplanation": "2- Elige una política de precios y configúrala.",
+    "packlinkPrice": "Precio Packlink",
+    "percentagePacklinkPrices": "% de los precio de Packlink",
+    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
     "fixedPrices": "Precio fijo",
     "fixedPricesWithData": "Precio fijo: %s€",
     "increaseExplanation": "Incrementar: añade un % al precio, lo pagará el cliente.",
@@ -238,14 +260,17 @@
     "selectAllCountries": "Selecionar todos los países",
     "selectCountriesHeader": "Países permitidos para tu servicio <br> de envío",
     "selectCountriesSubheader": "Selecciona la disponibilidad de al menos un país y <br> añade tantos como necesites",
+    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink",
     "discardChangesQuestion": "Algunos cambios no se han guardado.<br>¿Estás seguro de que quieres volver e ignorar los cambios?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
+    "packlinkOrderDraft": "Borrador del pedido de Packlink",
     "printed": "Impreso",
     "ready": "Listo",
     "printLabel": "Imprimir etiquetas",
     "shipmentLabels": "Etiquetas de los envíos",
+    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
     "shipmentDetails": "Detalles del envío",
     "disablePopUpBlocker": "Deshabilita el bloqueador de elementos emergentes en esta página para abrir de forma masiva las etiquetas de envío",
     "date": "Fecha",
@@ -254,14 +279,22 @@
     "print": "Imprimir",
     "carrierTrackingNumbers": "Número de tracking del transportista",
     "trackIt": "Seguimiento",
+    "packlinkReferenceNumber": "Número de referencia Packlink",
+    "packlinkShippingPrice": "Precio de envío de Packlink",
+    "viewOnPacklink": "Ver en Packlink PRO",
     "createDraft": "Crear borrador",
+    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
+    "createOrderDraft": "Crear borrador en Packlink PRO",
     "draftCreateFailed": "El intento anterior de crear un borrador ha fallado. Error: %s",
+    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "El pedido con referencia de envío %s no existe en la tienda",
     "orderDetailsNotFound": "Detalles del pedido no encontrados",
     "orderNotExist": "El pedido con ID %s no existe en la tienda",
     "bulkFailCreateFail": "No se puede crear el archivo de etiquetas masivas",
     "draftOrderDelayed": "La creación del borrador se ha retrasado",
-    "completeServicesSetup": "You need to complete the services setup to create order draft."
+    "completeServicesSetup": "You need to complete the services setup to create order draft.",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Este servicio de envío admite la entrega a ubicaciones de entrega predefinidas. Elige la ubicación que más te convenga haciendo clic en el botón \"Seleccionar ubicación de entrega\"..",
@@ -304,6 +337,7 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
+    "webhookReceived": "Webhook de Packlink recibido",
     "couldNotDelete": "No se pudo eliminar la entidad %s con ID %s",
     "entityCannotBeSaved": "La entidad %s con ID %s no se puede guardar.",
     "entityCannotBeUpdated": "La entidad %s con ID %s no se puede actualizar.",
@@ -316,8 +350,11 @@
   "autoTest": {
     "dbNotAccessible.": "DNo se puede acceder a la base de datos.",
     "taskCouldNotBeStarted.": "No se ha podido iniciar la tarea.",
+    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
+    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
     "start": "Inicio",
     "downloadTestLog": "Descargar el registro de pruebas",
+    "openModule": "Abrir el módulo PacklinkPRO",
     "autotestPassedSuccessfully": "Prueba automática superada con éxito.",
     "testNotSuccessful": "La prueba no se ha completado correctamente."
   }
diff --git a/src/BusinessLogic/Resources/countries/fr.json b/src/BusinessLogic/Resources/countries/fr.json
index a9584db6..c7a7906a 100644
--- a/src/BusinessLogic/Resources/countries/fr.json
+++ b/src/BusinessLogic/Resources/countries/fr.json
@@ -1,5 +1,10 @@
 {
   "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
+    "developedAndManaged": "Développé et géré par Packlink",
     "generalConditions": "Conditions générales",
     "basicSettings": "Paramètres",
     "contactUs": "Contactez-nous",
@@ -43,6 +48,8 @@
     "apiKey": "Clé API",
     "apiKeyIncorrect": "Clé API incorrecte",
     "dontHaveAccount": "Vous n’avez pas de compte ?",
+    "welcome": "Bienvenue sur Packlink PRO",
+    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>.",
     "validateApiKey": "Valider clé API",
     "chooseYourCountry": "Sélectionnez votre pays pour commencer votre inscription",
     "registerMe": "S’inscrire"
@@ -76,10 +83,15 @@
     "email": "Adresse électronique",
     "password": "Mot de passe",
     "haveAccount": "Vous avez déjà un compte ?",
+    "startEnjoying": "Commencez à utiliser Packlink PRO !",
     "registerAccount": "Enregistrez-vous",
     "getToKnowYou": "Nous souhaitons mieux vous connaître afin de nous adapter à vous et de vous faire une offre sur mesure",
     "monthlyShipmentVolume": "Combien d’envois faites-vous généralement par mois?",
     "phone": "Numéro de téléphone",
+    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
+    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel",
     "submit": "S'inscrire",
     "chooseYourCountry": "Sélectionnez votre pays",
     "searchCountry": "Rechercher un pays",
@@ -141,7 +153,10 @@
     "parcel": "Colis par défaut",
     "help": "Aide",
     "contactUs": "Contactez-nous:",
-    "systemInfo": "Informations du système"
+    "systemInfo": "Informations du système",
+    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "Fichier d’informations du système <br>et mode débogage",
@@ -150,6 +165,8 @@
   },
   "orderStatusMapping": {
     "title": "Statut de la commande",
+    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
+    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO",
     "systemOrderStatus": "STATUT DE LA <strong>COMMANDE</strong> %s",
     "none": "Aucun",
     "pending": "En attente",
@@ -199,9 +216,11 @@
     "origin": "Origine",
     "destination": "Destination",
     "myPrices": "Mes prix",
+    "packlinkPrices": "Prix Packlink",
     "configureService": "Configurer le service",
     "showCarrierLogo": "Montrer le logo du transporteur à mes clients",
     "pricePolicy": "Politique tarifaire",
+    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
     "configurePricePolicy": "Configurer mes frais d’expédition",
     "taxClassTitle": "Sélectionnez votre taux fiscal enregistré",
     "tax": "Taxe",
@@ -227,6 +246,9 @@
     "weightAndPriceRangeWithData": "Fourchette de poids et de prix : de %s kg à %s kg et de %s € à %s €",
     "singlePricePolicy": "Politique tarifaire %s",
     "pricePolicyExplanation": "2. Choisissez une politique tarifaire et configurez-la.",
+    "packlinkPrice": "Prix Packlink",
+    "percentagePacklinkPrices": "% des prix Packlink",
+    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
     "fixedPrices": "Prix fixe",
     "fixedPricesWithData": "Prix fixe : %s €",
     "increaseExplanation": "Augmentation : ajoutez % au prix, c’est le client qui payera.",
@@ -238,14 +260,17 @@
     "selectAllCountries": "Tous les pays sélectionnés",
     "selectCountriesHeader": "Pays pris en charge par votre <br> service d’expédition",
     "selectCountriesSubheader": "Sélectionnez la disponibilité d’au moins un pays et ajoutez-en <br> autant que nécessaire",
+    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink",
     "discardChangesQuestion": "Certaines modifications n’ont pas été enregistrées.<br>Êtes-vous sûr de vouloir revenir en arrière et de les ignorer ?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
+    "packlinkOrderDraft": "Brouillon de commande Packlink",
     "printed": "Imprimé",
     "ready": "Prêt",
     "printLabel": "Imprimer étiquette",
     "shipmentLabels": "Étiquettes de livraison",
+    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
     "shipmentDetails": "Détails de l'envoi",
     "disablePopUpBlocker": "Veuillez désactiver l'outil de blocage des fenêtres pop-up sur cette page afin d'ouvrir massivement les étiquettes d'envoi.",
     "date": "Date",
@@ -254,14 +279,22 @@
     "print": "Imprimer",
     "carrierTrackingNumbers": "Numéro de tracking du transporteur",
     "trackIt": "Suivez le!",
+    "packlinkReferenceNumber": "Numéro de référence Packlink",
+    "packlinkShippingPrice": "Prix de livraison Packlink",
+    "viewOnPacklink": "Voir sur Packlink PRO",
     "createDraft": "Créer un brouillon",
+    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
+    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
     "draftCreateFailed": "La tentative précédente de création d'un brouillon a échoué. Erreur: %s",
+    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "La commande de livraison sous le référence %s n'existe pas sur le shop.",
     "orderDetailsNotFound": "Détails de commande introuvables",
     "orderNotExist": "La commande sous l'ID %s n'existe pas sur le shop.",
     "bulkFailCreateFail": "Création d'un dossier d'étiquettes en masse impossible.",
     "draftOrderDelayed": "La création du brouillon a été retardée",
-    "completeServicesSetup": "You need to complete the services setup to create order draft."
+    "completeServicesSetup": "You need to complete the services setup to create order draft.",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Ce service de transport soutient la livraison vers des lieux de dépôts prédéfinis. Veuillez choisir la localisation qui vous convient le mieux en cliquant sur le bouton \"Sélectionner le lieu de dépôt\"",
@@ -304,6 +337,7 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Erreur lors de la création de la configuration du gestionnaire de tâches par défaut.",
+    "webhookReceived": "Webhook de Packlink reçu",
     "couldNotDelete": "L'entité %s dont l'ID est %s n'a pas pu être supprimée.",
     "entityCannotBeSaved": "L'entité %s dont l'ID est %s n'a pas pu être enregistrée.",
     "entityCannotBeUpdated": "L'entité %s dont l'ID est %s n'a pas pu être mise à jour.",
@@ -316,8 +350,11 @@
   "autoTest": {
     "dbNotAccessible.": "Base de données inaccessible.",
     "taskCouldNotBeStarted.": "La tâche n’a pu être lancée.",
+    "moduleAutoTest": "Test automatique du module PacklinkPRO",
+    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
     "start": "Démarrer",
     "downloadTestLog": "Télécharger le registre de tests",
+    "openModule": "Ouvrir le module PacklinkPRO",
     "autotestPassedSuccessfully": "Test automatique réussi avec succès !",
     "testNotSuccessful": "Le test a échoué."
   }
diff --git a/src/Brands/Packlink/Resources/countries/gb.json b/src/BusinessLogic/Resources/countries/gb.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/gb.json
rename to src/BusinessLogic/Resources/countries/gb.json
diff --git a/src/Brands/Packlink/Resources/countries/hu.json b/src/BusinessLogic/Resources/countries/hu.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/hu.json
rename to src/BusinessLogic/Resources/countries/hu.json
diff --git a/src/Brands/Packlink/Resources/countries/ie.json b/src/BusinessLogic/Resources/countries/ie.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/ie.json
rename to src/BusinessLogic/Resources/countries/ie.json
diff --git a/src/BusinessLogic/Resources/countries/it.json b/src/BusinessLogic/Resources/countries/it.json
index 2f8c05e9..e10440f8 100644
--- a/src/BusinessLogic/Resources/countries/it.json
+++ b/src/BusinessLogic/Resources/countries/it.json
@@ -1,5 +1,10 @@
 {
   "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
+    "developedAndManaged": "Sviluppato e gestito da Packlink",
     "generalConditions": "Condizioni generali",
     "basicSettings": "Configurazione",
     "contactUs": "Contattaci",
@@ -43,6 +48,8 @@
     "apiKey": "API Key",
     "apiKeyIncorrect": "API Key non corretta",
     "dontHaveAccount": "Non hai un account?",
+    "welcome": "Benvenuto a Packlink PRO",
+    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>.",
     "validateApiKey": "Convalida la chiave API",
     "chooseYourCountry": "Per iniziare la registrazione, scegli il tuo paese",
     "registerMe": "Iscriviti"
@@ -76,10 +83,15 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Hai già un account?",
+    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
     "registerAccount": "Registrati",
     "getToKnowYou": "Vogliamo conoscerti meglio per adattarci a te e preparare una proposta personalizzata per te",
     "monthlyShipmentVolume": "Quante spedizioni fai solitamente al mese?",
     "phone": "Numero di telefono",
+    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
+    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email",
     "submit": "Registrati",
     "chooseYourCountry": "Scegli il paese",
     "searchCountry": "Cerca paese",
@@ -141,7 +153,10 @@
     "parcel": "Pacco predefinito",
     "help": "Aiuto",
     "contactUs": "Contattaci:",
-    "systemInfo": "Informazioni del sistema"
+    "systemInfo": "Informazioni del sistema",
+    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
   },
   "systemInfo": {
     "title": "File di informazioni del sistema <br>e modalità debug",
@@ -150,6 +165,8 @@
   },
   "orderStatusMapping": {
     "title": "Stato dell’ordine",
+    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
+    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO",
     "systemOrderStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di %s",
     "none": "Nessuno",
     "pending": "In attesa",
@@ -199,9 +216,11 @@
     "origin": "Origine",
     "destination": "Destinazione",
     "myPrices": "I miei prezzi",
+    "packlinkPrices": "Prezzi di Packlink",
     "configureService": "Configura il servizio",
     "showCarrierLogo": "Mostra logo del corriere ai miei clienti",
     "pricePolicy": "Politica dei prezzi",
+    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
     "configurePricePolicy": "Configura i prezzi di spedizione",
     "taxClassTitle": "Scegli la tua aliquota fiscale salvata",
     "tax": "Tassa",
@@ -227,6 +246,9 @@
     "weightAndPriceRangeWithData": "Range di prezzo e di peso: da %s kg a %s kg e da %s€ a %s€",
     "singlePricePolicy": "Politica dei prezzi %s",
     "pricePolicyExplanation": "2. Scegli una politica dei prezzi e configurala.",
+    "packlinkPrice": "Prezzo di Packlink",
+    "percentagePacklinkPrices": "% dei prezzi di Packlink",
+    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
     "fixedPrices": "Prezzo fisso",
     "fixedPricesWithData": "Prezzo fisso: %s€",
     "increaseExplanation": "Incremento sul prezzo: aggiungi una % al prezzo, che sarà pagata dal cliente.",
@@ -238,14 +260,17 @@
     "selectAllCountries": "Tutti i paesi selezionati",
     "selectCountriesHeader": "Paesi supportati per il tuo <br> servizio di spedizione",
     "selectCountriesSubheader": "Seleziona la disponibilità di almeno un paese e aggiungi <br> tutti quelli richiesti",
+    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink",
     "discardChangesQuestion": "Alcune modifiche non sono state salvate.<br>Sei sicuro di voler tornare indietro e annullarle?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
+    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
     "printed": "Stampato",
     "ready": "Pronto per la spedizione",
     "printLabel": "Stampa etichette",
     "shipmentLabels": "Etichette di spedizione",
+    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
     "shipmentDetails": "Dettagli della spedizione",
     "disablePopUpBlocker": "Disabilita il blocco pop-up su questa pagina per poter aprire le etichette di spedizione insieme",
     "date": "Data",
@@ -254,14 +279,22 @@
     "print": "Stampa",
     "carrierTrackingNumbers": "Numero di tracking del corriere",
     "trackIt": "Traccialo!",
+    "packlinkReferenceNumber": "Numero di ordine Packlink",
+    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
+    "viewOnPacklink": "Vedi su Packlink PRO",
     "createDraft": "Crea bozza",
+    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
+    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
     "draftCreateFailed": "Il precedente tentativo di creare una bozza è fallito. Errore: %s",
+    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "L'ordine con il numero di spedizione %s non esiste nel negozio",
     "orderDetailsNotFound": "Dettagli dell'ordine non trovati",
     "orderNotExist": "L'ordine con ID %s non esiste nel negozio",
     "bulkFailCreateFail": "Impossibile creare il file di etichette in blocco",
     "draftOrderDelayed": "La creazione della bozza è stata ritardata",
-    "completeServicesSetup": "You need to complete the services setup to create order draft."
+    "completeServicesSetup": "You need to complete the services setup to create order draft.",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Questo servizio di spedizione supporta la consegna a punti corriere predefiniti. Scegli la località più adatta a te, facendo clic sul pulsante \"Seleziona punto corriere\".",
@@ -304,6 +337,7 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
+    "webhookReceived": "Webhook di Packlink ricevuto",
     "couldNotDelete": "Impossibile eliminare l'entità %s con ID %s",
     "entityCannotBeSaved": "L'entità %s con ID %s non può essere salvata.",
     "entityCannotBeUpdated": "L'entità %s con ID %s non può essere aggiornata.",
@@ -316,8 +350,11 @@
   "autoTest": {
     "dbNotAccessible.": "Database non accessibile.",
     "taskCouldNotBeStarted.": "Non è stato possibile avviare l’attività.",
+    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
+    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
     "start": "Avvia",
     "downloadTestLog": "Scarica il registro test",
+    "openModule": "Apri il modulo di PacklinkPRO",
     "autotestPassedSuccessfully": "L’auto-test è stato superato con successo!",
     "testNotSuccessful": "Il test non è stato completato correttamente."
   }
diff --git a/src/Brands/Packlink/Resources/countries/nl.json b/src/BusinessLogic/Resources/countries/nl.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/nl.json
rename to src/BusinessLogic/Resources/countries/nl.json
diff --git a/src/Brands/Packlink/Resources/countries/pt.json b/src/BusinessLogic/Resources/countries/pt.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/pt.json
rename to src/BusinessLogic/Resources/countries/pt.json
diff --git a/src/Brands/Packlink/Resources/countries/tr.json b/src/BusinessLogic/Resources/countries/tr.json
similarity index 100%
rename from src/Brands/Packlink/Resources/countries/tr.json
rename to src/BusinessLogic/Resources/countries/tr.json

From 5f263819a8117eb3e1214e5035e74d2e0eb09dea Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 16 Mar 2021 10:41:01 +0100
Subject: [PATCH 18/37] Revert "Revert "Replace links generation logic with new
 CountryService usage""

This reverts commit 6dd67e92
---
 .../Packlink}/Resources/countries/at.json     |  0
 .../Packlink}/Resources/countries/be.json     |  0
 .../Packlink/Resources/countries/de.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/en.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/es.json      | 57 +++++++++++++++++++
 .../Packlink/Resources/countries/fr.json      | 57 +++++++++++++++++++
 .../Packlink}/Resources/countries/gb.json     |  0
 .../Packlink}/Resources/countries/hu.json     |  0
 .../Packlink}/Resources/countries/ie.json     |  0
 .../Packlink/Resources/countries/it.json      | 57 +++++++++++++++++++
 .../Packlink}/Resources/countries/nl.json     |  0
 .../Packlink}/Resources/countries/pt.json     |  0
 .../Packlink}/Resources/countries/tr.json     |  0
 src/BusinessLogic/BootstrapComponent.php      |  1 +
 src/BusinessLogic/Resources/countries/de.json | 41 +------------
 src/BusinessLogic/Resources/countries/en.json | 41 +------------
 src/BusinessLogic/Resources/countries/es.json | 41 +------------
 src/BusinessLogic/Resources/countries/fr.json | 41 +------------
 src/BusinessLogic/Resources/countries/it.json | 41 +------------
 19 files changed, 296 insertions(+), 195 deletions(-)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/at.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/be.json (100%)
 create mode 100644 src/Brands/Packlink/Resources/countries/de.json
 create mode 100644 src/Brands/Packlink/Resources/countries/en.json
 create mode 100644 src/Brands/Packlink/Resources/countries/es.json
 create mode 100644 src/Brands/Packlink/Resources/countries/fr.json
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/gb.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/hu.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/ie.json (100%)
 create mode 100644 src/Brands/Packlink/Resources/countries/it.json
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/nl.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/pt.json (100%)
 rename src/{BusinessLogic => Brands/Packlink}/Resources/countries/tr.json (100%)

diff --git a/src/BusinessLogic/Resources/countries/at.json b/src/Brands/Packlink/Resources/countries/at.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/at.json
rename to src/Brands/Packlink/Resources/countries/at.json
diff --git a/src/BusinessLogic/Resources/countries/be.json b/src/Brands/Packlink/Resources/countries/be.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/be.json
rename to src/Brands/Packlink/Resources/countries/be.json
diff --git a/src/Brands/Packlink/Resources/countries/de.json b/src/Brands/Packlink/Resources/countries/de.json
new file mode 100644
index 00000000..7c90e80e
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/de.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
+    "developedAndManaged": "Entwickelt und verwaltet von Packlink"
+  },
+  "login": {
+    "welcome": "Willkommen zu Packlink PRO",
+    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
+  },
+  "register": {
+    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
+    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
+    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
+    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink-Preise",
+    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
+    "packlinkPrice": "Packlink-Preise",
+    "percentagePacklinkPrices": "% der Packlink-Preise",
+    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
+    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink Auftragsentwurf",
+    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
+    "packlinkReferenceNumber": "Packlink Referenznummer",
+    "packlinkShippingPrice": "Packlink Versandpreis",
+    "viewOnPacklink": "Auf Packlink PRO ansehen",
+    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
+    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook von Packlink erhalten"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
+    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
+    "openModule": "PacklinkPRO-Modul öffnen"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/en.json b/src/Brands/Packlink/Resources/countries/en.json
new file mode 100644
index 00000000..d27043f7
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/en.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
+    "developedAndManaged": "Developed and managed by Packlink"
+  },
+  "login": {
+    "welcome": "Welcome to Packlink PRO",
+    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Start enjoying Packlink PRO!",
+    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
+    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
+    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink prices",
+    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
+    "packlinkPrice": "Packlink Price",
+    "percentagePacklinkPrices": "% of Packlink prices",
+    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
+    "usePacklinkRange": "For all other ranges, apply Packlink prices"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink order draft",
+    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
+    "packlinkReferenceNumber": "Packlink reference number",
+    "packlinkShippingPrice": "Packlink shipping price",
+    "viewOnPacklink": "View on Packlink PRO",
+    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
+    "createOrderDraft": "Create order draft in Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook from Packlink received."
+  },
+  "autoTest": {
+    "moduleAutoTest": "PacklinkPRO module auto-test",
+    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
+    "openModule": "Open PacklinkPRO module"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/es.json b/src/Brands/Packlink/Resources/countries/es.json
new file mode 100644
index 00000000..59908297
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/es.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
+    "developedAndManaged": "Desarrollado y gestionado por Packlink"
+  },
+  "login": {
+    "welcome": "Te damos la bienvenida a Packlink PRO",
+    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>"
+  },
+  "register": {
+    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
+    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
+    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
+    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Precios de Packlink",
+    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
+    "packlinkPrice": "Precio Packlink",
+    "percentagePacklinkPrices": "% de los precio de Packlink",
+    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
+    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Borrador del pedido de Packlink",
+    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
+    "packlinkReferenceNumber": "Número de referencia Packlink",
+    "packlinkShippingPrice": "Precio de envío de Packlink",
+    "viewOnPacklink": "Ver en Packlink PRO",
+    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
+    "createOrderDraft": "Crear borrador en Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink recibido"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
+    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
+    "openModule": "Abrir el módulo PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/Brands/Packlink/Resources/countries/fr.json b/src/Brands/Packlink/Resources/countries/fr.json
new file mode 100644
index 00000000..afe7b187
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/fr.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
+    "developedAndManaged": "Développé et géré par Packlink"
+  },
+  "login": {
+    "welcome": "Bienvenue sur Packlink PRO",
+    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>."
+  },
+  "register": {
+    "startEnjoying": "Commencez à utiliser Packlink PRO !",
+    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
+    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
+    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prix Packlink",
+    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
+    "packlinkPrice": "Prix Packlink",
+    "percentagePacklinkPrices": "% des prix Packlink",
+    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
+    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Brouillon de commande Packlink",
+    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
+    "packlinkReferenceNumber": "Numéro de référence Packlink",
+    "packlinkShippingPrice": "Prix de livraison Packlink",
+    "viewOnPacklink": "Voir sur Packlink PRO",
+    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
+    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink reçu"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Test automatique du module PacklinkPRO",
+    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
+    "openModule": "Ouvrir le module PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/gb.json b/src/Brands/Packlink/Resources/countries/gb.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/gb.json
rename to src/Brands/Packlink/Resources/countries/gb.json
diff --git a/src/BusinessLogic/Resources/countries/hu.json b/src/Brands/Packlink/Resources/countries/hu.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/hu.json
rename to src/Brands/Packlink/Resources/countries/hu.json
diff --git a/src/BusinessLogic/Resources/countries/ie.json b/src/Brands/Packlink/Resources/countries/ie.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/ie.json
rename to src/Brands/Packlink/Resources/countries/ie.json
diff --git a/src/Brands/Packlink/Resources/countries/it.json b/src/Brands/Packlink/Resources/countries/it.json
new file mode 100644
index 00000000..d1e1973f
--- /dev/null
+++ b/src/Brands/Packlink/Resources/countries/it.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
+    "developedAndManaged": "Sviluppato e gestito da Packlink"
+  },
+  "login": {
+    "welcome": "Benvenuto a Packlink PRO",
+    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
+    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
+    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
+    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prezzi di Packlink",
+    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
+    "packlinkPrice": "Prezzo di Packlink",
+    "percentagePacklinkPrices": "% dei prezzi di Packlink",
+    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
+    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
+    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
+    "packlinkReferenceNumber": "Numero di ordine Packlink",
+    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
+    "viewOnPacklink": "Vedi su Packlink PRO",
+    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
+    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook di Packlink ricevuto"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
+    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
+    "openModule": "Apri il modulo di PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/BusinessLogic/Resources/countries/nl.json b/src/Brands/Packlink/Resources/countries/nl.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/nl.json
rename to src/Brands/Packlink/Resources/countries/nl.json
diff --git a/src/BusinessLogic/Resources/countries/pt.json b/src/Brands/Packlink/Resources/countries/pt.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/pt.json
rename to src/Brands/Packlink/Resources/countries/pt.json
diff --git a/src/BusinessLogic/Resources/countries/tr.json b/src/Brands/Packlink/Resources/countries/tr.json
similarity index 100%
rename from src/BusinessLogic/Resources/countries/tr.json
rename to src/Brands/Packlink/Resources/countries/tr.json
diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 41a696f1..60e2c53f 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -175,6 +175,7 @@ function () {
             function () {
                 return new FileResolverService(
                     array(
+                        __DIR__ . '/../Brands/Packlink/Resources/countries',
                         __DIR__ . '/Resources/countries',
                     )
                 );
diff --git a/src/BusinessLogic/Resources/countries/de.json b/src/BusinessLogic/Resources/countries/de.json
index c0c77ea8..0a06c9b7 100644
--- a/src/BusinessLogic/Resources/countries/de.json
+++ b/src/BusinessLogic/Resources/countries/de.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
-    "developedAndManaged": "Entwickelt und verwaltet von Packlink",
     "generalConditions": "Allgemeine Bedingungen",
     "basicSettings": "Einstellungen",
     "contactUs": "Kontaktieren Sie uns",
@@ -48,8 +43,6 @@
     "apiKey": "API-Schlüssel",
     "apiKeyIncorrect": "Falscher API-Schlüssel",
     "dontHaveAccount": "Sie haben noch keinen Account?",
-    "welcome": "Willkommen zu Packlink PRO",
-    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>.",
     "validateApiKey": "API-Schlüssel bestätigen",
     "chooseYourCountry": "Wählen Sie Ihr Land aus, um mit der Registrierung beginnen zu können",
     "registerMe": "Registrieren"
@@ -83,15 +76,10 @@
     "email": "E-Mail",
     "password": "Passwort",
     "haveAccount": "Haben Sie bereits einen Account?",
-    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
     "registerAccount": "Jetzt registrieren",
     "getToKnowYou": "Wir möchten Sie besser kennenlernen, um uns an Sie anzupassen und Ihnen ein individuelles Angebot zukommen zu lassen",
     "monthlyShipmentVolume": "Wie hoch ist Ihr monatliches Sendungsaufkommen?",
     "phone": "Telefonnummer",
-    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
-    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden",
     "submit": "Registrieren",
     "chooseYourCountry": "Wählen Sie Ihr Land aus",
     "searchCountry": "Land suchen",
@@ -153,10 +141,7 @@
     "parcel": "Standardpaket",
     "help": "Hilfe",
     "contactUs": "Kontaktieren Sie uns:",
-    "systemInfo": "Systeminformationen",
-    "helpUrl": "https://support-pro.packlink.com/hc/de",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Systeminformationen"
   },
   "systemInfo": {
     "title": "Systeminfodatei <br>und debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Bestellstatus",
-    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
-    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO",
     "systemOrderStatus": "<strong>BESTELLSTATUS</strong> von %s",
     "none": "Leer",
     "pending": "Ausstehend",
@@ -216,11 +199,9 @@
     "origin": "Absender",
     "destination": "Empfänger",
     "myPrices": "Meine Preise",
-    "packlinkPrices": "Packlink-Preise",
     "configureService": "Dienst einrichten",
     "showCarrierLogo": "Meinen Kunden das Logo anzeigen",
     "pricePolicy": "Preispolitik",
-    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
     "configurePricePolicy": "Meine Versandkosten einrichten",
     "taxClassTitle": "Wählen Sie Ihre gespeicherte Steuerkategorie",
     "tax": "Steuer",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Gewichts- und Preisklasse: von %s kg bis %s kg und von %s € bis %s €",
     "singlePricePolicy": "Preispolitik %s",
     "pricePolicyExplanation": "2. Wählen Sie eine Preispolitik und richten Sie diese ein.",
-    "packlinkPrice": "Packlink-Preise",
-    "percentagePacklinkPrices": "% der Packlink-Preise",
-    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
     "fixedPrices": "Festpreis",
     "fixedPricesWithData": "Festpreis: %s €",
     "increaseExplanation": "Erhöhen: fügen Sie % zum Preis hinzu. Dies wird dann vom Kunden bezahlt.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Alle ausgewählten Länder",
     "selectCountriesHeader": "Länder, die von Ihrem <br> Versanddienst unterstützt werden",
     "selectCountriesSubheader": "Wählen Sie die Verfügbarkeit von mindestens einem Land aus und fügen Sie <br> beliebig viele hinzu",
-    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise",
     "discardChangesQuestion": "Es gibt nicht gespeicherte Änderungen.<br>Sind Sie sicher, dass Sie zurückgehen und sie verwerfen möchten?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink Auftragsentwurf",
     "printed": "Ausgedruckt",
     "ready": "Bereit",
     "printLabel": "Versandetikett drucken",
     "shipmentLabels": "Versandetiketten",
-    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
     "shipmentDetails": "Versanddetails",
     "disablePopUpBlocker": "Bitte deaktivieren Sie den Popup-Blocker auf dieser Seite, um alle Versandetiketten auf einmal zu öffnen.",
     "date": "Datum",
@@ -279,22 +254,14 @@
     "print": "Drucken",
     "carrierTrackingNumbers": "Trackingnummer des Versandunternehmens",
     "trackIt": "Versand verfolgen",
-    "packlinkReferenceNumber": "Packlink Referenznummer",
-    "packlinkShippingPrice": "Packlink Versandpreis",
-    "viewOnPacklink": "Auf Packlink PRO ansehen",
     "createDraft": "Entwurf erstellen",
-    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
-    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
     "draftCreateFailed": "Der Versuch der Entwurfserstellung ist fehlgeschlagen. Fehler: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Die Bestellung mit der Versandreferenznummer %s existiert nicht im Shop",
     "orderDetailsNotFound": "Bestelldetails nicht gefunden",
     "orderNotExist": "Die Bestellung mit der ID %s existiert nicht im Shop",
     "bulkFailCreateFail": "Die Datei der Versandetiketten konnte nicht erstellt werden",
     "draftOrderDelayed": "Die Erstellung des Entwurfs verzögert sich",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Dieser Versanddienst unterstützt die Zustellung an vordefinierte Abgabestellen. Bitte wählen Sie den für Sie günstigsten Ort aus, indem Sie auf \"Abgabestelle auswählen\" klicken.",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Fehler beim Erstellen der Standardkonfiguration des Task-Runner-Status.",
-    "webhookReceived": "Webhook von Packlink erhalten",
     "couldNotDelete": "Element %s mit ID %s konnte nicht gelöscht werden",
     "entityCannotBeSaved": "Element %s mit ID %s kann nicht gespeichert werden.",
     "entityCannotBeUpdated": "Element %s mit ID %s kann nicht aktualisiert werden.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Zugriff auf Datenbank nicht möglich.",
     "taskCouldNotBeStarted.": "Die Aufgabe konnte nicht gestartet werden.",
-    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
-    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
     "start": "Start",
     "downloadTestLog": "Testprotokoll herunterladen",
-    "openModule": "PacklinkPRO-Modul öffnen",
     "autotestPassedSuccessfully": "Der automatische Test wurde erfolgreich abgeschlossen!",
     "testNotSuccessful": "Der Test wurde nicht erfolgreich abgeschlossen!"
   }
diff --git a/src/BusinessLogic/Resources/countries/en.json b/src/BusinessLogic/Resources/countries/en.json
index 4e4a0459..577bb12e 100644
--- a/src/BusinessLogic/Resources/countries/en.json
+++ b/src/BusinessLogic/Resources/countries/en.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
-    "developedAndManaged": "Developed and managed by Packlink",
     "generalConditions": "General conditions",
     "basicSettings": "Basic settings",
     "contactUs": "Contact us",
@@ -48,8 +43,6 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "API key was incorrect.",
     "dontHaveAccount": "Don't have an account?",
-    "welcome": "Welcome to Packlink PRO",
-    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>.",
     "validateApiKey": "Validate API key",
     "chooseYourCountry": "Choose your country to start the registration process",
     "registerMe": "Register me"
@@ -83,15 +76,10 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Already have an account?",
-    "startEnjoying": "Start enjoying Packlink PRO!",
     "registerAccount": "Register your account",
     "getToKnowYou": "We would like to get to know you better in order to adapt to you and to send you an individual offer",
     "monthlyShipmentVolume": "What is your monthly shipment volume?",
     "phone": "Phone number",
-    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
-    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail",
     "submit": "Register",
     "chooseYourCountry": "Choose your country",
     "searchCountry": "Search country",
@@ -153,10 +141,7 @@
     "parcel": "Default parcel",
     "help": "Help",
     "contactUs": "Contact us at:",
-    "systemInfo": "System information",
-    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "System information"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Order status",
-    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
-    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS",
     "systemOrderStatus": "%s <strong>ORDER STATUS</strong>",
     "none": "None",
     "pending": "Pending",
@@ -216,11 +199,9 @@
     "origin": "Origin",
     "destination": "Destination",
     "myPrices": "My prices",
-    "packlinkPrices": "Packlink prices",
     "configureService": "Set up service",
     "showCarrierLogo": "Show carrier logo to my customers",
     "pricePolicy": "Price policy",
-    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
     "configurePricePolicy": "Set up my shipment prices",
     "taxClassTitle": "Choose your saved tax class",
     "tax": "Tax",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Weight and price range: from %s kg to %s kg and from %s€ to %s€",
     "singlePricePolicy": "Price policy %s",
     "pricePolicyExplanation": "2. Choose a price policy and set it up.",
-    "packlinkPrice": "Packlink Price",
-    "percentagePacklinkPrices": "% of Packlink prices",
-    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
     "fixedPrices": "Fixed price",
     "fixedPricesWithData": "Fixed price: %s€",
     "increaseExplanation": "Increase: add a % to the price, this will be paid by the customer.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "All selected countries",
     "selectCountriesHeader": "Countries supported for your <br> shipping service",
     "selectCountriesSubheader": "Select availability of at least one country and add <br> as many required",
-    "usePacklinkRange": "For all other ranges, apply Packlink prices",
     "discardChangesQuestion": "There are unsaved changes.<br>Are you sure you want to go back and discard them?",
     "atLeastOneCountry": "At least one country must be selected."
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink order draft",
     "printed": "Printed",
     "ready": "Ready",
     "printLabel": "Print label",
     "shipmentLabels": "Shipment Labels",
-    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
     "shipmentDetails": "Shipment details",
     "disablePopUpBlocker": "Please disable pop-up blocker on this page in order to bulk open shipment labels",
     "date": "Date",
@@ -279,22 +254,14 @@
     "print": "Print",
     "carrierTrackingNumbers": "Carrier tracking numbers",
     "trackIt": "Track it!",
-    "packlinkReferenceNumber": "Packlink reference number",
-    "packlinkShippingPrice": "Packlink shipping price",
-    "viewOnPacklink": "View on Packlink PRO",
     "createDraft": "Create Draft",
-    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
-    "createOrderDraft": "Create order draft in Packlink PRO",
     "draftCreateFailed": "Previous attempt to create a draft failed. Error: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "Order with shipment reference %s doesn't exist in the shop",
     "orderDetailsNotFound": "Order details not found",
     "orderNotExist": "Order with ID %s doesn't exist in the shop",
     "bulkFailCreateFail": "Unable to create bulk labels file",
     "draftOrderDelayed": "Creation of the draft is delayed",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "This shipping service supports delivery to pre-defined drop-off locations. Please choose location that suits you the most by clicking on the \"Select drop-off location\" button.",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook from Packlink received.",
     "couldNotDelete": "Could not delete entity %s with ID %s",
     "entityCannotBeSaved": "Entity %s with ID %s cannot be saved.",
     "entityCannotBeUpdated": "Entity %s with ID %s cannot be updated.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Database not accessible.",
     "taskCouldNotBeStarted.": "Task could not be started.",
-    "moduleAutoTest": "PacklinkPRO module auto-test",
-    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
     "start": "Start",
     "downloadTestLog": "Download test log",
-    "openModule": "Open PacklinkPRO module",
     "autotestPassedSuccessfully": "Auto-test passed successfully!",
     "testNotSuccessful": "The test did not complete successfully."
   }
diff --git a/src/BusinessLogic/Resources/countries/es.json b/src/BusinessLogic/Resources/countries/es.json
index 4ebe1a1a..c79bf571 100644
--- a/src/BusinessLogic/Resources/countries/es.json
+++ b/src/BusinessLogic/Resources/countries/es.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
-    "developedAndManaged": "Desarrollado y gestionado por Packlink",
     "generalConditions": "Condiciones generales",
     "basicSettings": "Configuración",
     "contactUs": "Contacta con nosotros",
@@ -48,8 +43,6 @@
     "apiKey": "Api key",
     "apiKeyIncorrect": "Clave de API incorrecta",
     "dontHaveAccount": "¿No tienes una cuenta?",
-    "welcome": "Te damos la bienvenida a Packlink PRO",
-    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>",
     "validateApiKey": "Validar API key",
     "chooseYourCountry": "Elige tu país para comenzar el registro",
     "registerMe": "Registrarme"
@@ -83,15 +76,10 @@
     "email": "Correo electrónico",
     "password": "Contraseña",
     "haveAccount": "¿Ya tienes una cuenta?",
-    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
     "registerAccount": "Registro",
     "getToKnowYou": "Queremos conocerte mejor para adaptarnos a ti y hacerte una propuesta personalizada.",
     "monthlyShipmentVolume": "¿Cuántos envíos sueles hacer al mes?",
     "phone": "Teléfono",
-    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
-    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico",
     "submit": "Regístrate",
     "chooseYourCountry": "Elige tu país",
     "searchCountry": "Busca el país",
@@ -153,10 +141,7 @@
     "parcel": "Paquete predeterminado",
     "help": "Ayuda",
     "contactUs": "Contáctanos:",
-    "systemInfo": "Información del sistema",
-    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Información del sistema"
   },
   "systemInfo": {
     "title": "System information file <br>and debug mode",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Estado de la orden",
-    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
-    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO",
     "systemOrderStatus": "ESTADO DEL <strong>PEDIDO</strong> de %s",
     "none": "Ninguno",
     "pending": "Pendiente",
@@ -216,11 +199,9 @@
     "origin": "Origen",
     "destination": "Destino",
     "myPrices": "Mis precios",
-    "packlinkPrices": "Precios de Packlink",
     "configureService": "Configura el servicio",
     "showCarrierLogo": "Mostrar logo del transportista a mis clientes.",
     "pricePolicy": "Política de precios",
-    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
     "configurePricePolicy": "Configurar mis precios de envío",
     "taxClassTitle": "Elige tu tipo de impuesto guardado",
     "tax": "Impuestos",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Rango de peso y precio: desde %s kg hasta %s kg y desde %s€ hasta %s€",
     "singlePricePolicy": "Política de precio %s",
     "pricePolicyExplanation": "2- Elige una política de precios y configúrala.",
-    "packlinkPrice": "Precio Packlink",
-    "percentagePacklinkPrices": "% de los precio de Packlink",
-    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
     "fixedPrices": "Precio fijo",
     "fixedPricesWithData": "Precio fijo: %s€",
     "increaseExplanation": "Incrementar: añade un % al precio, lo pagará el cliente.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Selecionar todos los países",
     "selectCountriesHeader": "Países permitidos para tu servicio <br> de envío",
     "selectCountriesSubheader": "Selecciona la disponibilidad de al menos un país y <br> añade tantos como necesites",
-    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink",
     "discardChangesQuestion": "Algunos cambios no se han guardado.<br>¿Estás seguro de que quieres volver e ignorar los cambios?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Borrador del pedido de Packlink",
     "printed": "Impreso",
     "ready": "Listo",
     "printLabel": "Imprimir etiquetas",
     "shipmentLabels": "Etiquetas de los envíos",
-    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
     "shipmentDetails": "Detalles del envío",
     "disablePopUpBlocker": "Deshabilita el bloqueador de elementos emergentes en esta página para abrir de forma masiva las etiquetas de envío",
     "date": "Fecha",
@@ -279,22 +254,14 @@
     "print": "Imprimir",
     "carrierTrackingNumbers": "Número de tracking del transportista",
     "trackIt": "Seguimiento",
-    "packlinkReferenceNumber": "Número de referencia Packlink",
-    "packlinkShippingPrice": "Precio de envío de Packlink",
-    "viewOnPacklink": "Ver en Packlink PRO",
     "createDraft": "Crear borrador",
-    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
-    "createOrderDraft": "Crear borrador en Packlink PRO",
     "draftCreateFailed": "El intento anterior de crear un borrador ha fallado. Error: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "El pedido con referencia de envío %s no existe en la tienda",
     "orderDetailsNotFound": "Detalles del pedido no encontrados",
     "orderNotExist": "El pedido con ID %s no existe en la tienda",
     "bulkFailCreateFail": "No se puede crear el archivo de etiquetas masivas",
     "draftOrderDelayed": "La creación del borrador se ha retrasado",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Este servicio de envío admite la entrega a ubicaciones de entrega predefinidas. Elige la ubicación que más te convenga haciendo clic en el botón \"Seleccionar ubicación de entrega\"..",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook de Packlink recibido",
     "couldNotDelete": "No se pudo eliminar la entidad %s con ID %s",
     "entityCannotBeSaved": "La entidad %s con ID %s no se puede guardar.",
     "entityCannotBeUpdated": "La entidad %s con ID %s no se puede actualizar.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "DNo se puede acceder a la base de datos.",
     "taskCouldNotBeStarted.": "No se ha podido iniciar la tarea.",
-    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
-    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
     "start": "Inicio",
     "downloadTestLog": "Descargar el registro de pruebas",
-    "openModule": "Abrir el módulo PacklinkPRO",
     "autotestPassedSuccessfully": "Prueba automática superada con éxito.",
     "testNotSuccessful": "La prueba no se ha completado correctamente."
   }
diff --git a/src/BusinessLogic/Resources/countries/fr.json b/src/BusinessLogic/Resources/countries/fr.json
index c7a7906a..a9584db6 100644
--- a/src/BusinessLogic/Resources/countries/fr.json
+++ b/src/BusinessLogic/Resources/countries/fr.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
-    "developedAndManaged": "Développé et géré par Packlink",
     "generalConditions": "Conditions générales",
     "basicSettings": "Paramètres",
     "contactUs": "Contactez-nous",
@@ -48,8 +43,6 @@
     "apiKey": "Clé API",
     "apiKeyIncorrect": "Clé API incorrecte",
     "dontHaveAccount": "Vous n’avez pas de compte ?",
-    "welcome": "Bienvenue sur Packlink PRO",
-    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>.",
     "validateApiKey": "Valider clé API",
     "chooseYourCountry": "Sélectionnez votre pays pour commencer votre inscription",
     "registerMe": "S’inscrire"
@@ -83,15 +76,10 @@
     "email": "Adresse électronique",
     "password": "Mot de passe",
     "haveAccount": "Vous avez déjà un compte ?",
-    "startEnjoying": "Commencez à utiliser Packlink PRO !",
     "registerAccount": "Enregistrez-vous",
     "getToKnowYou": "Nous souhaitons mieux vous connaître afin de nous adapter à vous et de vous faire une offre sur mesure",
     "monthlyShipmentVolume": "Combien d’envois faites-vous généralement par mois?",
     "phone": "Numéro de téléphone",
-    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
-    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel",
     "submit": "S'inscrire",
     "chooseYourCountry": "Sélectionnez votre pays",
     "searchCountry": "Rechercher un pays",
@@ -153,10 +141,7 @@
     "parcel": "Colis par défaut",
     "help": "Aide",
     "contactUs": "Contactez-nous:",
-    "systemInfo": "Informations du système",
-    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Informations du système"
   },
   "systemInfo": {
     "title": "Fichier d’informations du système <br>et mode débogage",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Statut de la commande",
-    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
-    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO",
     "systemOrderStatus": "STATUT DE LA <strong>COMMANDE</strong> %s",
     "none": "Aucun",
     "pending": "En attente",
@@ -216,11 +199,9 @@
     "origin": "Origine",
     "destination": "Destination",
     "myPrices": "Mes prix",
-    "packlinkPrices": "Prix Packlink",
     "configureService": "Configurer le service",
     "showCarrierLogo": "Montrer le logo du transporteur à mes clients",
     "pricePolicy": "Politique tarifaire",
-    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
     "configurePricePolicy": "Configurer mes frais d’expédition",
     "taxClassTitle": "Sélectionnez votre taux fiscal enregistré",
     "tax": "Taxe",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Fourchette de poids et de prix : de %s kg à %s kg et de %s € à %s €",
     "singlePricePolicy": "Politique tarifaire %s",
     "pricePolicyExplanation": "2. Choisissez une politique tarifaire et configurez-la.",
-    "packlinkPrice": "Prix Packlink",
-    "percentagePacklinkPrices": "% des prix Packlink",
-    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
     "fixedPrices": "Prix fixe",
     "fixedPricesWithData": "Prix fixe : %s €",
     "increaseExplanation": "Augmentation : ajoutez % au prix, c’est le client qui payera.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Tous les pays sélectionnés",
     "selectCountriesHeader": "Pays pris en charge par votre <br> service d’expédition",
     "selectCountriesSubheader": "Sélectionnez la disponibilité d’au moins un pays et ajoutez-en <br> autant que nécessaire",
-    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink",
     "discardChangesQuestion": "Certaines modifications n’ont pas été enregistrées.<br>Êtes-vous sûr de vouloir revenir en arrière et de les ignorer ?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Brouillon de commande Packlink",
     "printed": "Imprimé",
     "ready": "Prêt",
     "printLabel": "Imprimer étiquette",
     "shipmentLabels": "Étiquettes de livraison",
-    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
     "shipmentDetails": "Détails de l'envoi",
     "disablePopUpBlocker": "Veuillez désactiver l'outil de blocage des fenêtres pop-up sur cette page afin d'ouvrir massivement les étiquettes d'envoi.",
     "date": "Date",
@@ -279,22 +254,14 @@
     "print": "Imprimer",
     "carrierTrackingNumbers": "Numéro de tracking du transporteur",
     "trackIt": "Suivez le!",
-    "packlinkReferenceNumber": "Numéro de référence Packlink",
-    "packlinkShippingPrice": "Prix de livraison Packlink",
-    "viewOnPacklink": "Voir sur Packlink PRO",
     "createDraft": "Créer un brouillon",
-    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
-    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
     "draftCreateFailed": "La tentative précédente de création d'un brouillon a échoué. Erreur: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "La commande de livraison sous le référence %s n'existe pas sur le shop.",
     "orderDetailsNotFound": "Détails de commande introuvables",
     "orderNotExist": "La commande sous l'ID %s n'existe pas sur le shop.",
     "bulkFailCreateFail": "Création d'un dossier d'étiquettes en masse impossible.",
     "draftOrderDelayed": "La création du brouillon a été retardée",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Ce service de transport soutient la livraison vers des lieux de dépôts prédéfinis. Veuillez choisir la localisation qui vous convient le mieux en cliquant sur le bouton \"Sélectionner le lieu de dépôt\"",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Erreur lors de la création de la configuration du gestionnaire de tâches par défaut.",
-    "webhookReceived": "Webhook de Packlink reçu",
     "couldNotDelete": "L'entité %s dont l'ID est %s n'a pas pu être supprimée.",
     "entityCannotBeSaved": "L'entité %s dont l'ID est %s n'a pas pu être enregistrée.",
     "entityCannotBeUpdated": "L'entité %s dont l'ID est %s n'a pas pu être mise à jour.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Base de données inaccessible.",
     "taskCouldNotBeStarted.": "La tâche n’a pu être lancée.",
-    "moduleAutoTest": "Test automatique du module PacklinkPRO",
-    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
     "start": "Démarrer",
     "downloadTestLog": "Télécharger le registre de tests",
-    "openModule": "Ouvrir le module PacklinkPRO",
     "autotestPassedSuccessfully": "Test automatique réussi avec succès !",
     "testNotSuccessful": "Le test a échoué."
   }
diff --git a/src/BusinessLogic/Resources/countries/it.json b/src/BusinessLogic/Resources/countries/it.json
index e10440f8..2f8c05e9 100644
--- a/src/BusinessLogic/Resources/countries/it.json
+++ b/src/BusinessLogic/Resources/countries/it.json
@@ -1,10 +1,5 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
-    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
-    "developedAndManaged": "Sviluppato e gestito da Packlink",
     "generalConditions": "Condizioni generali",
     "basicSettings": "Configurazione",
     "contactUs": "Contattaci",
@@ -48,8 +43,6 @@
     "apiKey": "API Key",
     "apiKeyIncorrect": "API Key non corretta",
     "dontHaveAccount": "Non hai un account?",
-    "welcome": "Benvenuto a Packlink PRO",
-    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>.",
     "validateApiKey": "Convalida la chiave API",
     "chooseYourCountry": "Per iniziare la registrazione, scegli il tuo paese",
     "registerMe": "Iscriviti"
@@ -83,15 +76,10 @@
     "email": "Email",
     "password": "Password",
     "haveAccount": "Hai già un account?",
-    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
     "registerAccount": "Registrati",
     "getToKnowYou": "Vogliamo conoscerti meglio per adattarci a te e preparare una proposta personalizzata per te",
     "monthlyShipmentVolume": "Quante spedizioni fai solitamente al mese?",
     "phone": "Numero di telefono",
-    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
-    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email",
     "submit": "Registrati",
     "chooseYourCountry": "Scegli il paese",
     "searchCountry": "Cerca paese",
@@ -153,10 +141,7 @@
     "parcel": "Pacco predefinito",
     "help": "Aiuto",
     "contactUs": "Contattaci:",
-    "systemInfo": "Informazioni del sistema",
-    "helpUrl": "https://support-pro.packlink.com/hc/it",
-    "contactUrl": "business@packlink.com",
-    "contactUrlMail": "mailto::business@packlink.com"
+    "systemInfo": "Informazioni del sistema"
   },
   "systemInfo": {
     "title": "File di informazioni del sistema <br>e modalità debug",
@@ -165,8 +150,6 @@
   },
   "orderStatusMapping": {
     "title": "Stato dell’ordine",
-    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
-    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO",
     "systemOrderStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di %s",
     "none": "Nessuno",
     "pending": "In attesa",
@@ -216,11 +199,9 @@
     "origin": "Origine",
     "destination": "Destinazione",
     "myPrices": "I miei prezzi",
-    "packlinkPrices": "Prezzi di Packlink",
     "configureService": "Configura il servizio",
     "showCarrierLogo": "Mostra logo del corriere ai miei clienti",
     "pricePolicy": "Politica dei prezzi",
-    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
     "configurePricePolicy": "Configura i prezzi di spedizione",
     "taxClassTitle": "Scegli la tua aliquota fiscale salvata",
     "tax": "Tassa",
@@ -246,9 +227,6 @@
     "weightAndPriceRangeWithData": "Range di prezzo e di peso: da %s kg a %s kg e da %s€ a %s€",
     "singlePricePolicy": "Politica dei prezzi %s",
     "pricePolicyExplanation": "2. Scegli una politica dei prezzi e configurala.",
-    "packlinkPrice": "Prezzo di Packlink",
-    "percentagePacklinkPrices": "% dei prezzi di Packlink",
-    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
     "fixedPrices": "Prezzo fisso",
     "fixedPricesWithData": "Prezzo fisso: %s€",
     "increaseExplanation": "Incremento sul prezzo: aggiungi una % al prezzo, che sarà pagata dal cliente.",
@@ -260,17 +238,14 @@
     "selectAllCountries": "Tutti i paesi selezionati",
     "selectCountriesHeader": "Paesi supportati per il tuo <br> servizio di spedizione",
     "selectCountriesSubheader": "Seleziona la disponibilità di almeno un paese e aggiungi <br> tutti quelli richiesti",
-    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink",
     "discardChangesQuestion": "Alcune modifiche non sono state salvate.<br>Sei sicuro di voler tornare indietro e annullarle?",
     "atLeastOneCountry": ""
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
     "printed": "Stampato",
     "ready": "Pronto per la spedizione",
     "printLabel": "Stampa etichette",
     "shipmentLabels": "Etichette di spedizione",
-    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
     "shipmentDetails": "Dettagli della spedizione",
     "disablePopUpBlocker": "Disabilita il blocco pop-up su questa pagina per poter aprire le etichette di spedizione insieme",
     "date": "Data",
@@ -279,22 +254,14 @@
     "print": "Stampa",
     "carrierTrackingNumbers": "Numero di tracking del corriere",
     "trackIt": "Traccialo!",
-    "packlinkReferenceNumber": "Numero di ordine Packlink",
-    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
-    "viewOnPacklink": "Vedi su Packlink PRO",
     "createDraft": "Crea bozza",
-    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
-    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
     "draftCreateFailed": "Il precedente tentativo di creare una bozza è fallito. Errore: %s",
-    "packlinkShipping": "Packlink Shipping",
     "shipmentOrderNotExist": "L'ordine con il numero di spedizione %s non esiste nel negozio",
     "orderDetailsNotFound": "Dettagli dell'ordine non trovati",
     "orderNotExist": "L'ordine con ID %s non esiste nel negozio",
     "bulkFailCreateFail": "Impossibile creare il file di etichette in blocco",
     "draftOrderDelayed": "La creazione della bozza è stata ritardata",
-    "completeServicesSetup": "You need to complete the services setup to create order draft.",
-    "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
+    "completeServicesSetup": "You need to complete the services setup to create order draft."
   },
   "checkoutProcess": {
     "choseDropOffLocation": "Questo servizio di spedizione supporta la consegna a punti corriere predefiniti. Scegli la località più adatta a te, facendo clic sul pulsante \"Seleziona punto corriere\".",
@@ -337,7 +304,6 @@
   },
   "systemLogMessages": {
     "errorCreatingDefaultTask": "Error creating default task runner status configuration.",
-    "webhookReceived": "Webhook di Packlink ricevuto",
     "couldNotDelete": "Impossibile eliminare l'entità %s con ID %s",
     "entityCannotBeSaved": "L'entità %s con ID %s non può essere salvata.",
     "entityCannotBeUpdated": "L'entità %s con ID %s non può essere aggiornata.",
@@ -350,11 +316,8 @@
   "autoTest": {
     "dbNotAccessible.": "Database non accessibile.",
     "taskCouldNotBeStarted.": "Non è stato possibile avviare l’attività.",
-    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
-    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
     "start": "Avvia",
     "downloadTestLog": "Scarica il registro test",
-    "openModule": "Apri il modulo di PacklinkPRO",
     "autotestPassedSuccessfully": "L’auto-test è stato superato con successo!",
     "testNotSuccessful": "Il test non è stato completato correttamente."
   }

From 036f4afeefac76268b437c5b61a923a579cf6b8a Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 16 Mar 2021 11:44:31 +0100
Subject: [PATCH 19/37] Implement hierarchical content extending of key/value
 files

PLCR24-16
---
 .../FileResolver/FileResolverService.php      | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/BusinessLogic/FileResolver/FileResolverService.php b/src/BusinessLogic/FileResolver/FileResolverService.php
index a85b4d1e..68b461e5 100644
--- a/src/BusinessLogic/FileResolver/FileResolverService.php
+++ b/src/BusinessLogic/FileResolver/FileResolverService.php
@@ -56,7 +56,7 @@ public function getContent($sourceFile)
             }
         }
 
-        return $content === array() ? $content : call_user_func_array('array_merge', $content);
+        return $content === array() ? $content : $this->mergeFileContent($content);
     }
 
     /**
@@ -78,4 +78,47 @@ public function getFolders()
     {
         return $this->folders;
     }
+
+    /**
+     * Merges content of source files.
+     *
+     * @param array $content
+     *
+     * @return array
+     */
+    protected function mergeFileContent($content)
+    {
+        $mergedContent = array_shift($content);
+
+        foreach ($content as $fileContent) {
+            $mergedContent = $this->mergeDistinct($mergedContent, $fileContent);
+        }
+
+        return $mergedContent;
+    }
+
+    /**
+     * Performs array merge similar to array_merge_recursive,
+     * but instead of converting values with duplicate keys to arrays,
+     * it overwrites them with the value from the second array.
+     *
+     * @param array $array1
+     * @param array $array2
+     *
+     * @return mixed
+     */
+    protected function mergeDistinct(&$array1, &$array2)
+    {
+        $merged = $array1;
+
+        foreach ($array2 as $key => &$value) {
+            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
+                $merged[$key] = $this->mergeDistinct($merged[$key], $value);
+            } else {
+                $merged[$key] = $value;
+            }
+        }
+
+        return $merged;
+    }
 }

From 2330fb60dc88c5675906208ea8fee87b14ae6d9d Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 16 Mar 2021 14:33:04 +0100
Subject: [PATCH 20/37] Add Acme DemoUI label overrides

PLCR24-20
---
 src/DemoUI/src/Bootstrap.php                  | 51 ++++++++++++-----
 .../Brands/Acme/Resources/countries/at.json   |  6 ++
 .../Brands/Acme/Resources/countries/be.json   |  6 ++
 .../Brands/Acme/Resources/countries/de.json   | 57 +++++++++++++++++++
 .../Brands/Acme/Resources/countries/en.json   | 57 +++++++++++++++++++
 .../Brands/Acme/Resources/countries/es.json   | 57 +++++++++++++++++++
 .../Brands/Acme/Resources/countries/fr.json   | 57 +++++++++++++++++++
 .../Brands/Acme/Resources/countries/gb.json   |  6 ++
 .../Brands/Acme/Resources/countries/hu.json   |  6 ++
 .../Brands/Acme/Resources/countries/ie.json   |  6 ++
 .../Brands/Acme/Resources/countries/it.json   | 57 +++++++++++++++++++
 .../Brands/Acme/Resources/countries/nl.json   |  6 ++
 .../Brands/Acme/Resources/countries/pt.json   |  6 ++
 .../Brands/Acme/Resources/countries/tr.json   |  6 ++
 src/DemoUI/src/Views/ACME/index.php           |  2 +-
 15 files changed, 371 insertions(+), 15 deletions(-)
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/at.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/be.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/de.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/en.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/es.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/it.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
 create mode 100644 src/DemoUI/src/Brands/Acme/Resources/countries/tr.json

diff --git a/src/DemoUI/src/Bootstrap.php b/src/DemoUI/src/Bootstrap.php
index f6a4940a..c45538e3 100644
--- a/src/DemoUI/src/Bootstrap.php
+++ b/src/DemoUI/src/Bootstrap.php
@@ -22,6 +22,7 @@
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use Packlink\BusinessLogic\Language\Interfaces\CountryService;
 use Packlink\BusinessLogic\Order\Interfaces\ShopOrderService as ShopOrderServiceInterface;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
@@ -116,7 +117,7 @@ protected static function initServices()
         parent::initServices();
 
         static::$instance->initInstanceServices();
-        static::$instance->initBrandService();
+        static::$instance->initBrandDependentServices();
     }
 
     /**
@@ -201,21 +202,9 @@ function () use ($instance) {
                 return $instance->registrationInfoService;
             }
         );
-
-        ServiceRegister::registerService(
-            FileResolverService::CLASS_NAME,
-            function () {
-                return new FileResolverService(
-                    array(
-                        __DIR__ . '/../../Brands/Packlink/Resources/countries',
-                        __DIR__ . '/../../BusinessLogic/Resources/countries',
-                    )
-                );
-            }
-        );
     }
 
-    protected function initBrandService()
+    protected function initBrandDependentServices()
     {
         $brandPlatformCode = getenv('PL_PLATFORM');
 
@@ -227,6 +216,18 @@ function () {
                         return new PacklinkConfigurationService();
                     }
                 );
+
+                ServiceRegister::registerService(
+                    FileResolverService::CLASS_NAME,
+                    function () {
+                        return new FileResolverService(
+                            array(
+                                __DIR__ . '/../../BusinessLogic/Resources/countries',
+                                __DIR__ . '/../../Brands/Packlink/Resources/countries',
+                            )
+                        );
+                    }
+                );
                 break;
             case 'ACME':
                 ServiceRegister::registerService(
@@ -235,6 +236,28 @@ function () {
                         return new AcmeConfigurationService();
                     }
                 );
+
+                ServiceRegister::registerService(
+                    FileResolverService::CLASS_NAME,
+                    function () {
+                        return new FileResolverService(
+                            array(
+                                __DIR__ . '/../../BusinessLogic/Resources/countries',
+                                __DIR__ . '/Brands/Acme/Resources/countries',
+                            )
+                        );
+                    }
+                );
         }
+
+        ServiceRegister::registerService(
+            CountryService::CLASS_NAME,
+            function () {
+                /** @var FileResolverService $fileResolverService */
+                $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
+
+                return new \Packlink\BusinessLogic\Language\CountryService($fileResolverService);
+            }
+        );
     }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/at.json b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
new file mode 100644
index 00000000..80e17cfc
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/be.json b/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
new file mode 100644
index 00000000..07d4b919
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/de.json b/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
new file mode 100644
index 00000000..7c90e80e
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
+    "developedAndManaged": "Entwickelt und verwaltet von Packlink"
+  },
+  "login": {
+    "welcome": "Willkommen zu Packlink PRO",
+    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
+  },
+  "register": {
+    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
+    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
+    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
+    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink-Preise",
+    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
+    "packlinkPrice": "Packlink-Preise",
+    "percentagePacklinkPrices": "% der Packlink-Preise",
+    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
+    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink Auftragsentwurf",
+    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
+    "packlinkReferenceNumber": "Packlink Referenznummer",
+    "packlinkShippingPrice": "Packlink Versandpreis",
+    "viewOnPacklink": "Auf Packlink PRO ansehen",
+    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
+    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.de/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook von Packlink erhalten"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
+    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
+    "openModule": "PacklinkPRO-Modul öffnen"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/en.json b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json
new file mode 100644
index 00000000..d27043f7
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
+    "developedAndManaged": "Developed and managed by Packlink"
+  },
+  "login": {
+    "welcome": "Welcome to Packlink PRO",
+    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Start enjoying Packlink PRO!",
+    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
+    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
+    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Packlink prices",
+    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
+    "packlinkPrice": "Packlink Price",
+    "percentagePacklinkPrices": "% of Packlink prices",
+    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
+    "usePacklinkRange": "For all other ranges, apply Packlink prices"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Packlink order draft",
+    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
+    "packlinkReferenceNumber": "Packlink reference number",
+    "packlinkShippingPrice": "Packlink shipping price",
+    "viewOnPacklink": "View on Packlink PRO",
+    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
+    "createOrderDraft": "Create order draft in Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook from Packlink received."
+  },
+  "autoTest": {
+    "moduleAutoTest": "PacklinkPRO module auto-test",
+    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
+    "openModule": "Open PacklinkPRO module"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/es.json b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json
new file mode 100644
index 00000000..59908297
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
+    "developedAndManaged": "Desarrollado y gestionado por Packlink"
+  },
+  "login": {
+    "welcome": "Te damos la bienvenida a Packlink PRO",
+    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>"
+  },
+  "register": {
+    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
+    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
+    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
+    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Precios de Packlink",
+    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
+    "packlinkPrice": "Precio Packlink",
+    "percentagePacklinkPrices": "% de los precio de Packlink",
+    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
+    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Borrador del pedido de Packlink",
+    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
+    "packlinkReferenceNumber": "Número de referencia Packlink",
+    "packlinkShippingPrice": "Precio de envío de Packlink",
+    "viewOnPacklink": "Ver en Packlink PRO",
+    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
+    "createOrderDraft": "Crear borrador en Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.es/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink recibido"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
+    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
+    "openModule": "Abrir el módulo PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
new file mode 100644
index 00000000..afe7b187
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
+    "developedAndManaged": "Développé et géré par Packlink"
+  },
+  "login": {
+    "welcome": "Bienvenue sur Packlink PRO",
+    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>."
+  },
+  "register": {
+    "startEnjoying": "Commencez à utiliser Packlink PRO !",
+    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
+    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
+    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prix Packlink",
+    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
+    "packlinkPrice": "Prix Packlink",
+    "percentagePacklinkPrices": "% des prix Packlink",
+    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
+    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Brouillon de commande Packlink",
+    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
+    "packlinkReferenceNumber": "Numéro de référence Packlink",
+    "packlinkShippingPrice": "Prix de livraison Packlink",
+    "viewOnPacklink": "Voir sur Packlink PRO",
+    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
+    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook de Packlink reçu"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Test automatique du module PacklinkPRO",
+    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
+    "openModule": "Ouvrir le module PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
new file mode 100644
index 00000000..0f805ad4
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
new file mode 100644
index 00000000..82f12c8c
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
new file mode 100644
index 00000000..0f805ad4
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/it.json b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json
new file mode 100644
index 00000000..d1e1973f
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json
@@ -0,0 +1,57 @@
+{
+  "general": {
+    "packlinkPro": "Packlink PRO Shipping",
+    "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
+    "packlinkShipping": "Packlink Shipping S.L.",
+    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
+    "developedAndManaged": "Sviluppato e gestito da Packlink"
+  },
+  "login": {
+    "welcome": "Benvenuto a Packlink PRO",
+    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>."
+  },
+  "register": {
+    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
+    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
+    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
+    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email"
+  },
+  "configuration": {
+    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "contactUrl": "business@packlink.com",
+    "contactUrlMail": "mailto::business@packlink.com"
+  },
+  "orderStatusMapping": {
+    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
+    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO"
+  },
+  "shippingServices": {
+    "packlinkPrices": "Prezzi di Packlink",
+    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
+    "packlinkPrice": "Prezzo di Packlink",
+    "percentagePacklinkPrices": "% dei prezzi di Packlink",
+    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
+    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink"
+  },
+  "orderListAndDetails": {
+    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
+    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
+    "packlinkReferenceNumber": "Numero di ordine Packlink",
+    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
+    "viewOnPacklink": "Vedi su Packlink PRO",
+    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
+    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
+    "packlinkShipping": "Packlink Shipping",
+    "sendWithPacklink": "Send with Packlink",
+    "shipmentUrl": "https://pro.packlink.it/private/shipments/"
+  },
+  "systemLogMessages": {
+    "webhookReceived": "Webhook di Packlink ricevuto"
+  },
+  "autoTest": {
+    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
+    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
+    "openModule": "Apri il modulo di PacklinkPRO"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
new file mode 100644
index 00000000..07d4b919
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
new file mode 100644
index 00000000..a4a65b0f
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json
new file mode 100644
index 00000000..ea17d41a
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json
@@ -0,0 +1,6 @@
+{
+  "register": {
+    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011480",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011560"
+  }
+}
\ No newline at end of file
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
index 00dc0293..f75ff5e5 100644
--- a/src/DemoUI/src/Views/ACME/index.php
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -19,7 +19,7 @@ function getTranslations($language)
     $fileResolver = new FileResolverService(
         array(
             __DIR__ . '/../../../../BusinessLogic/Resources/countries',
-            __DIR__ . '/../../../../Brands/Packlink/Resources/countries',
+            __DIR__ . '/../../Brands/Acme/Resources/countries',
         )
     );
 

From cb69a1ed366899c0ed192d681fa66d5a1eb2dd14 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 29 Mar 2021 11:51:40 +0200
Subject: [PATCH 21/37] Implement hierarchical content extending of key/value
 files

PLCR24-16
---
 .../FileResolver/FileResolverService.php      | 49 ++-----------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/src/BusinessLogic/FileResolver/FileResolverService.php b/src/BusinessLogic/FileResolver/FileResolverService.php
index 68b461e5..c4d88114 100644
--- a/src/BusinessLogic/FileResolver/FileResolverService.php
+++ b/src/BusinessLogic/FileResolver/FileResolverService.php
@@ -52,11 +52,13 @@ public function getContent($sourceFile)
             $serializedJson = file_get_contents($filePath);
 
             if ($serializedJson) {
-                $content[] = json_decode($serializedJson, true);
+                $array = json_decode($serializedJson, true);
+                /** @noinspection SlowArrayOperationsInLoopInspection */
+                $content = array_replace_recursive($content, $array);
             }
         }
 
-        return $content === array() ? $content : $this->mergeFileContent($content);
+        return $content;
     }
 
     /**
@@ -78,47 +80,4 @@ public function getFolders()
     {
         return $this->folders;
     }
-
-    /**
-     * Merges content of source files.
-     *
-     * @param array $content
-     *
-     * @return array
-     */
-    protected function mergeFileContent($content)
-    {
-        $mergedContent = array_shift($content);
-
-        foreach ($content as $fileContent) {
-            $mergedContent = $this->mergeDistinct($mergedContent, $fileContent);
-        }
-
-        return $mergedContent;
-    }
-
-    /**
-     * Performs array merge similar to array_merge_recursive,
-     * but instead of converting values with duplicate keys to arrays,
-     * it overwrites them with the value from the second array.
-     *
-     * @param array $array1
-     * @param array $array2
-     *
-     * @return mixed
-     */
-    protected function mergeDistinct(&$array1, &$array2)
-    {
-        $merged = $array1;
-
-        foreach ($array2 as $key => &$value) {
-            if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
-                $merged[$key] = $this->mergeDistinct($merged[$key], $value);
-            } else {
-                $merged[$key] = $value;
-            }
-        }
-
-        return $merged;
-    }
 }

From 6dfe0951a4d83f4b8e8211e49e3a7873805ea973 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 29 Mar 2021 14:20:12 +0200
Subject: [PATCH 22/37] Refactor TranslationService to use hierarchical content
 extending.

PLCR24-17
---
 CHANGELOG.md                                  |   3 +-
 src/BusinessLogic/BootstrapComponent.php      |   8 +-
 .../Controllers/ConfigurationController.php   |   2 +-
 .../Controllers/RegistrationController.php    |   2 +-
 .../CountryLabels/CountryService.php          | 151 ++++++++++++++++++
 .../Interfaces/CountryService.php             |  42 +++++
 src/BusinessLogic/Language/CountryService.php | 151 ------------------
 .../Language/Interfaces/CountryService.php    |  42 -----
 src/BusinessLogic/Language/Translator.php     |  18 +--
 .../OrderShipmentDetailsService.php           |   2 +-
 src/DemoUI/src/Bootstrap.php                  |   4 +-
 src/DemoUI/src/Views/ACME/index.php           |  23 +--
 src/DemoUI/src/Views/PRO/index.php            |  23 +--
 .../Common/BaseTestWithServices.php           |   7 +-
 .../CountryLabelsServiceTest.php}             |  28 ++--
 .../Labels}/de.json                           |   0
 .../Labels}/en.json                           |   0
 .../TestCountryService.php                    |   8 +-
 .../FileResolver/FileResolverServiceTest.php  |   4 +-
 19 files changed, 263 insertions(+), 255 deletions(-)
 create mode 100644 src/BusinessLogic/CountryLabels/CountryService.php
 create mode 100644 src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
 delete mode 100644 src/BusinessLogic/Language/CountryService.php
 delete mode 100644 src/BusinessLogic/Language/Interfaces/CountryService.php
 rename tests/BusinessLogic/{Language/TranslationServiceTest.php => CountryLabels/CountryLabelsServiceTest.php} (87%)
 rename tests/BusinessLogic/{Language/Translations => CountryLabels/Labels}/de.json (100%)
 rename tests/BusinessLogic/{Language/Translations => CountryLabels/Labels}/en.json (100%)
 rename tests/BusinessLogic/{Language => CountryLabels}/TestCountryService.php (61%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ee7faf3..b76dd3ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,7 @@ Whitelabel project changes:
 - Added BrandConfigurationService. Integration should register PacklinkConfigurationService instance for Packlink brand or adequate implementation for other brand(s) during the bootstraping.
 - Added PacklinkConfigurationService.
 - Added FileResolverService. Integration should initialize FileResolverService with an array of folders where source files should be searched for.
-- Added new method getTranslations to \Packlink\BusinessLogic\Language\TranslationService (service renamed to CountryService).
+- Added new method getLabels to \Packlink\BusinessLogic\CountryLabels\CountryService.
 
 ### Changed
 
@@ -37,6 +37,7 @@ Following changes will work properly once BrandConfigurationService is registere
 - Removed Packlink\BusinessLogic\Country\RegistrationCountry.
 - Added validation for platform country in RegistrationRequest::doValidate and UserAccountService::initializeUser.
 - Removed $supportedCountries from CountryService and WarehouseCountryService.
+- Packlink\BusinessLogic\Language\TranslationService renamed to CountryService and moved to CountryLabels directory.
 
 ## [3.1.0](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.0.6...v3.1.0) - 2020-12-11
 ### Added
diff --git a/src/BusinessLogic/BootstrapComponent.php b/src/BusinessLogic/BootstrapComponent.php
index 60e2c53f..2c9bbb73 100644
--- a/src/BusinessLogic/BootstrapComponent.php
+++ b/src/BusinessLogic/BootstrapComponent.php
@@ -18,8 +18,8 @@
 use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\BusinessLogic\Http\DTO\ParcelInfo;
 use Packlink\BusinessLogic\Http\Proxy;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService as TranslationServiceInterface;
-use Packlink\BusinessLogic\Language\CountryService as CountryTranslationService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService as LabelServiceInterface;
+use Packlink\BusinessLogic\CountryLabels\CountryService as CountryLabelService;
 use Packlink\BusinessLogic\Location\LocationService;
 use Packlink\BusinessLogic\Order\OrderService;
 use Packlink\BusinessLogic\OrderShipmentDetails\OrderShipmentDetailsService;
@@ -183,12 +183,12 @@ function () {
         );
 
         ServiceRegister::registerService(
-            TranslationServiceInterface::CLASS_NAME,
+            LabelServiceInterface::CLASS_NAME,
             function () {
                 /** @var FileResolverService $fileResolverService */
                 $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
 
-                return new CountryTranslationService($fileResolverService);
+                return new CountryLabelService($fileResolverService);
             }
         );
 
diff --git a/src/BusinessLogic/Controllers/ConfigurationController.php b/src/BusinessLogic/Controllers/ConfigurationController.php
index 0ced1430..924e902b 100644
--- a/src/BusinessLogic/Controllers/ConfigurationController.php
+++ b/src/BusinessLogic/Controllers/ConfigurationController.php
@@ -4,7 +4,7 @@
 
 use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
 use Packlink\BusinessLogic\Utility\UrlService;
 
 /**
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index c35d584d..87e9de22 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -6,7 +6,7 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\DTO\FrontDtoFactory;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
 use Packlink\BusinessLogic\Registration\RegistrationRequest;
 use Packlink\BusinessLogic\Registration\RegistrationService;
diff --git a/src/BusinessLogic/CountryLabels/CountryService.php b/src/BusinessLogic/CountryLabels/CountryService.php
new file mode 100644
index 00000000..259425f4
--- /dev/null
+++ b/src/BusinessLogic/CountryLabels/CountryService.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Packlink\BusinessLogic\CountryLabels;
+
+use Logeecom\Infrastructure\Configuration\Configuration;
+use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService as BaseService;
+
+/**
+ * Class CountryService
+ *
+ * @package Packlink\BusinessLogic\Language
+ */
+class CountryService implements BaseService
+{
+    /**
+     * Default language.
+     */
+    const DEFAULT_LANG = 'en';
+
+    /**
+     * Associative array in format:
+     * ['currentLang' => ['labelKey' => 'label']]
+     * @var array
+     */
+    protected static $labels = array();
+
+    /**
+     * @var FileResolverService
+     */
+    protected $fileResolverService;
+
+    /**
+     * @var string
+     */
+    private $currentLanguage;
+
+    /**
+     * CountryService constructor.
+     *
+     * @param FileResolverService $fileResolverService
+     */
+    public function __construct(FileResolverService $fileResolverService)
+    {
+        $this->fileResolverService = $fileResolverService;
+    }
+
+    /**
+     * Gets label for a key in current language.
+     * If the key can not be found for the current language, label fallback
+     * value will be returned (label in English).
+     * If the key is not found in fallback passed key will be returned.
+     *
+     * @param string $key <p>Key of a wanted label. If the key is nested it should be sent separated by '.'.
+     * For example:
+     * File that contains labels has next definition: {"parent": {"child": "childLabel"}}.
+     * The key for a parent is: "parent", the key for a child is: "parent.child"</p>
+     * @param array $arguments A list of arguments.
+     *
+     * @return string Label if label is found; otherwise, the input key.
+     */
+    public function getText($key, array $arguments = array())
+    {
+        $this->currentLanguage = Configuration::getUICountryCode() ?: static::DEFAULT_LANG;
+
+        if (empty(static::$labels[$this->currentLanguage])) {
+            $this->initializeLabels();
+        }
+
+        $result = $this->getLabel($key, $this->currentLanguage);
+
+        if ($result === null) {
+            $result = $this->getLabel($key, static::DEFAULT_LANG);
+        }
+
+        if ($result === null) {
+            $result = $key;
+        }
+
+        return vsprintf($result, $arguments);
+    }
+
+    /**
+     * Fetches labels for a specific country (provided by $countryCode parameter)
+     * and default country.
+     *
+     * @param string $countryCode
+     *
+     * @return array
+     */
+    public function getLabels($countryCode)
+    {
+        $labels[$countryCode] = $this->fileResolverService->getContent($countryCode);
+        $labels[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
+
+        return $labels;
+    }
+
+    /**
+     * Initializes the labels from a file to in-memory map.
+     */
+    protected function initializeLabels()
+    {
+        $languageLowerCase = strtolower($this->currentLanguage);
+        $this->initializeLanguage($languageLowerCase);
+        $this->initializeFallbackLanguage();
+    }
+
+    /**
+     * Initializes the language to labels dictionary.
+     *
+     * @param $language
+     */
+    protected function initializeLanguage($language)
+    {
+        $labels = $this->fileResolverService->getContent($language);
+
+        foreach ($labels as $groupKey => $group) {
+            if (is_array($group)) {
+                foreach ($group as $key => $value) {
+                    static::$labels[$language][$groupKey . '.' . $key] = $value;
+                }
+            } else {
+                static::$labels[$language][$groupKey] = $group;
+            }
+        }
+    }
+
+    /**
+     * Initializes the fallback language.
+     */
+    protected function initializeFallbackLanguage()
+    {
+        if (strtolower($this->currentLanguage) !== static::DEFAULT_LANG) {
+            $this->initializeLanguage(static::DEFAULT_LANG);
+        }
+    }
+
+    /**
+     * Gets the label for given key and language.
+     *
+     * @param string $key The label key.
+     * @param string $language The language.
+     *
+     * @return string|null The label.
+     */
+    protected function getLabel($key, $language)
+    {
+        return isset(static::$labels[$language][$key]) ? static::$labels[$language][$key] : null;
+    }
+}
diff --git a/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
new file mode 100644
index 00000000..b4fdc5b7
--- /dev/null
+++ b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Packlink\BusinessLogic\CountryLabels\Interfaces;
+
+/**
+ * Interface CountryService
+ *
+ * @package Packlink\BusinessLogic\CountryLabels\Interfaces
+ */
+interface CountryService
+{
+    /**
+     * Class name.
+     */
+    const CLASS_NAME = __CLASS__;
+
+    /**
+     * Gets label for a key in current language.
+     * If the key can not be found for the current language, label fallback
+     * value will be returned (label in English).
+     * If the key is not found in fallback passed key will be returned.
+     *
+     * @param string $key <p>Key of a wanted label. If the key is nested it should be sent separated by '.'.
+     * For example:
+     * File that contains labels has next definition: {"parent": {"child": "childLabel"}}.
+     * The key for a parent is: "parent", the key for a child is: "parent.child"</p>
+     * @param array $arguments A list of arguments.
+     *
+     * @return string Label if label is found; otherwise, the input key.
+     */
+    public function getText($key, array $arguments = array());
+
+    /**
+     * Fetches labels for a specific country (provided by $countryCode parameter)
+     * and default country.
+     *
+     * @param string $countryCode
+     *
+     * @return array
+     */
+    public function getLabels($countryCode);
+}
diff --git a/src/BusinessLogic/Language/CountryService.php b/src/BusinessLogic/Language/CountryService.php
deleted file mode 100644
index 1d93cee8..00000000
--- a/src/BusinessLogic/Language/CountryService.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-namespace Packlink\BusinessLogic\Language;
-
-use Logeecom\Infrastructure\Configuration\Configuration;
-use Packlink\BusinessLogic\FileResolver\FileResolverService;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService as BaseService;
-
-/**
- * Class CountryService
- *
- * @package Packlink\BusinessLogic\Language
- */
-class CountryService implements BaseService
-{
-    /**
-     * Default language.
-     */
-    const DEFAULT_LANG = 'en';
-
-    /**
-     * Associative array in format:
-     * ['currentLang' => ['translationKey' => 'translation']]
-     * @var array
-     */
-    protected static $translations = array();
-
-    /**
-     * @var FileResolverService
-     */
-    protected $fileResolverService;
-
-    /**
-     * @var string
-     */
-    private $currentLanguage;
-
-    /**
-     * TranslationService constructor.
-     *
-     * @param FileResolverService $fileResolverService
-     */
-    public function __construct(FileResolverService $fileResolverService)
-    {
-        $this->fileResolverService = $fileResolverService;
-    }
-
-    /**
-     * Translates a key to a value defined for that key for a current language.
-     * If the key can not be found for the current language, translation fallback
-     * value will be returned (translation in English).
-     * If the key is not found in fallback passed key will be returned.
-     *
-     * @param string $key <p>String to be translated. If the key is nested it should be sent separated by '.'.
-     * For example:
-     * Translation file has next definition: {"parent": {"child": "childTranslation"}}.
-     * The key for a parent is: "parent", the key for a child is: "parent.child"</p>
-     * @param array $arguments A list of arguments for translation if needed.
-     *
-     * @return string A translated string if translation is found; otherwise, the input key.
-     */
-    public function getText($key, array $arguments = array())
-    {
-        $this->currentLanguage = Configuration::getUICountryCode() ?: static::DEFAULT_LANG;
-
-        if (empty(static::$translations[$this->currentLanguage])) {
-            $this->initializeTranslations();
-        }
-
-        $result = $this->getTranslation($key, $this->currentLanguage);
-
-        if ($result === null) {
-            $result = $this->getTranslation($key, static::DEFAULT_LANG);
-        }
-
-        if ($result === null) {
-            $result = $key;
-        }
-
-        return vsprintf($result, $arguments);
-    }
-
-    /**
-     * Fetches translations for a specific country (provided by $countryCode parameter)
-     * and default country.
-     *
-     * @param string $countryCode
-     *
-     * @return array
-     */
-    public function getTranslations($countryCode)
-    {
-        $translations[$countryCode] = $this->fileResolverService->getContent($countryCode);
-        $translations[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
-
-        return $translations;
-    }
-
-    /**
-     * Initializes the translations from a file to in-memory map.
-     */
-    protected function initializeTranslations()
-    {
-        $languageLowerCase = strtolower($this->currentLanguage);
-        $this->initializeLanguage($languageLowerCase);
-        $this->initializeFallbackLanguage();
-    }
-
-    /**
-     * Initializes the language to translations dictionary.
-     *
-     * @param $language
-     */
-    protected function initializeLanguage($language)
-    {
-        $translations = $this->fileResolverService->getContent($language);
-
-        foreach ($translations as $groupKey => $group) {
-            if (is_array($group)) {
-                foreach ($group as $key => $value) {
-                    static::$translations[$language][$groupKey . '.' . $key] = $value;
-                }
-            } else {
-                static::$translations[$language][$groupKey] = $group;
-            }
-        }
-    }
-
-    /**
-     * Initializes the fallback language.
-     */
-    protected function initializeFallbackLanguage()
-    {
-        if (strtolower($this->currentLanguage) !== static::DEFAULT_LANG) {
-            $this->initializeLanguage(static::DEFAULT_LANG);
-        }
-    }
-
-    /**
-     * Gets the translation for given key and language.
-     *
-     * @param string $key The translation key.
-     * @param string $language The translation language.
-     *
-     * @return string|null The translation.
-     */
-    protected function getTranslation($key, $language)
-    {
-        return isset(static::$translations[$language][$key]) ? static::$translations[$language][$key] : null;
-    }
-}
diff --git a/src/BusinessLogic/Language/Interfaces/CountryService.php b/src/BusinessLogic/Language/Interfaces/CountryService.php
deleted file mode 100644
index 2ccd96d8..00000000
--- a/src/BusinessLogic/Language/Interfaces/CountryService.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Packlink\BusinessLogic\Language\Interfaces;
-
-/**
- * Interface CountryService
- *
- * @package Packlink\BusinessLogic\Language\Interfaces
- */
-interface CountryService
-{
-    /**
-     * Class name.
-     */
-    const CLASS_NAME = __CLASS__;
-
-    /**
-     * Translates a key to a value defined for that key for a current language.
-     * If the key can not be found for the current language, translation fallback
-     * value will be returned (translation in English).
-     * If the key is not found in fallback passed key will be returned.
-     *
-     * @param string $key <p>String to be translated. If the key is nested it should be sent separated by '.'.
-     * For example:
-     * Translation file has next definition: {"parent": {"child": "childTranslation"}}.
-     * The key for a parent is: "parent", the key for a child is: "parent.child"</p>
-     * @param array $arguments A list of arguments for translation if needed.
-     *
-     * @return string A translated string if translation is found; otherwise, the input key.
-     */
-    public function getText($key, array $arguments = array());
-
-    /**
-     * Fetches translations for a specific country (provided by $countryCode parameter)
-     * and default country.
-     *
-     * @param string $countryCode
-     *
-     * @return array
-     */
-    public function getTranslations($countryCode);
-}
diff --git a/src/BusinessLogic/Language/Translator.php b/src/BusinessLogic/Language/Translator.php
index a5fc4f3b..356c3231 100644
--- a/src/BusinessLogic/Language/Translator.php
+++ b/src/BusinessLogic/Language/Translator.php
@@ -3,7 +3,7 @@
 namespace Packlink\BusinessLogic\Language;
 
 use Logeecom\Infrastructure\ServiceRegister;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService as TranslationServiceInterface;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService as LabelServiceInterface;
 
 /**
  * Class Translator.
@@ -13,9 +13,9 @@
 class Translator
 {
     /**
-     * @var TranslationServiceInterface
+     * @var LabelServiceInterface
      */
-    protected static $translationService;
+    protected static $countryService;
 
     /**
      * Translates provided string.
@@ -27,20 +27,20 @@ class Translator
      */
     public static function translate($key, array $arguments = array())
     {
-        return static::getTranslationService()->getText($key, $arguments);
+        return static::getCountryService()->getText($key, $arguments);
     }
 
     /**
      * Retrieves translation service.
      *
-     * @return TranslationServiceInterface
+     * @return LabelServiceInterface
      */
-    protected static function getTranslationService()
+    protected static function getCountryService()
     {
-        if (static::$translationService === null) {
-            static::$translationService = ServiceRegister::getService(TranslationServiceInterface::CLASS_NAME);
+        if (static::$countryService === null) {
+            static::$countryService = ServiceRegister::getService(LabelServiceInterface::CLASS_NAME);
         }
 
-        return static::$translationService;
+        return static::$countryService;
     }
 }
diff --git a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
index 9813d748..c2d0e94c 100644
--- a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
+++ b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
@@ -6,7 +6,7 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\BaseService;
 use Packlink\BusinessLogic\Http\DTO\ShipmentLabel;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
 use Packlink\BusinessLogic\OrderShipmentDetails\Exceptions\OrderShipmentDetailsNotFound;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\ShippingMethod\Utility\ShipmentStatus;
diff --git a/src/DemoUI/src/Bootstrap.php b/src/DemoUI/src/Bootstrap.php
index c45538e3..02b09c5f 100644
--- a/src/DemoUI/src/Bootstrap.php
+++ b/src/DemoUI/src/Bootstrap.php
@@ -22,7 +22,7 @@
 use Packlink\BusinessLogic\Brand\BrandConfigurationService;
 use Packlink\BusinessLogic\Configuration;
 use Packlink\BusinessLogic\FileResolver\FileResolverService;
-use Packlink\BusinessLogic\Language\Interfaces\CountryService;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
 use Packlink\BusinessLogic\Order\Interfaces\ShopOrderService as ShopOrderServiceInterface;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\Registration\RegistrationInfoService;
@@ -256,7 +256,7 @@ function () {
                 /** @var FileResolverService $fileResolverService */
                 $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
 
-                return new \Packlink\BusinessLogic\Language\CountryService($fileResolverService);
+                return new \Packlink\BusinessLogic\CountryLabels\CountryService($fileResolverService);
             }
         );
     }
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
index f75ff5e5..2b5eb8e3 100644
--- a/src/DemoUI/src/Views/ACME/index.php
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -1,11 +1,15 @@
 <?php
 
 use Logeecom\Infrastructure\Configuration\Configuration;
-use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
+use Packlink\DemoUI\Bootstrap;
 use Packlink\DemoUI\Services\Integration\UrlService;
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 
+Bootstrap::init();
+
 Configuration::setUICountryCode('en');
 $lang = Configuration::getUICountryCode() ?: 'en';
 
@@ -16,14 +20,14 @@ function getUrl($controller, $action)
 
 function getTranslations($language)
 {
-    $fileResolver = new FileResolverService(
-        array(
-            __DIR__ . '/../../../../BusinessLogic/Resources/countries',
-            __DIR__ . '/../../Brands/Acme/Resources/countries',
-        )
-    );
+    /** @var CountryService $countryService */
+    $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
+
+    $labels = $countryService->getLabels($language);
+    $defaultLabels = json_encode($labels['en']);
+    $currentLanguageLabels = json_encode($labels[$language]);
 
-    echo json_encode($fileResolver->getContent($language));
+    echo 'default: ' . $defaultLabels . ', current: ' . $currentLanguageLabels;
 }
 
 ?>
@@ -158,8 +162,7 @@ function getTranslations($language)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php getTranslations('en') ?>,
-                current: <?php getTranslations($lang); ?>,
+                <?php getTranslations($lang); ?>
             };
 
             const pageConfiguration = {
diff --git a/src/DemoUI/src/Views/PRO/index.php b/src/DemoUI/src/Views/PRO/index.php
index 00dc0293..2b5eb8e3 100644
--- a/src/DemoUI/src/Views/PRO/index.php
+++ b/src/DemoUI/src/Views/PRO/index.php
@@ -1,11 +1,15 @@
 <?php
 
 use Logeecom\Infrastructure\Configuration\Configuration;
-use Packlink\BusinessLogic\FileResolver\FileResolverService;
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
+use Packlink\DemoUI\Bootstrap;
 use Packlink\DemoUI\Services\Integration\UrlService;
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 
+Bootstrap::init();
+
 Configuration::setUICountryCode('en');
 $lang = Configuration::getUICountryCode() ?: 'en';
 
@@ -16,14 +20,14 @@ function getUrl($controller, $action)
 
 function getTranslations($language)
 {
-    $fileResolver = new FileResolverService(
-        array(
-            __DIR__ . '/../../../../BusinessLogic/Resources/countries',
-            __DIR__ . '/../../../../Brands/Packlink/Resources/countries',
-        )
-    );
+    /** @var CountryService $countryService */
+    $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
+
+    $labels = $countryService->getLabels($language);
+    $defaultLabels = json_encode($labels['en']);
+    $currentLanguageLabels = json_encode($labels[$language]);
 
-    echo json_encode($fileResolver->getContent($language));
+    echo 'default: ' . $defaultLabels . ', current: ' . $currentLanguageLabels;
 }
 
 ?>
@@ -158,8 +162,7 @@ function getTranslations($language)
         'DOMContentLoaded',
         () => {
             Packlink.translations = {
-                default: <?php getTranslations('en') ?>,
-                current: <?php getTranslations($lang); ?>,
+                <?php getTranslations($lang); ?>
             };
 
             const pageConfiguration = {
diff --git a/tests/BusinessLogic/Common/BaseTestWithServices.php b/tests/BusinessLogic/Common/BaseTestWithServices.php
index dc4e7eff..d2acc212 100644
--- a/tests/BusinessLogic/Common/BaseTestWithServices.php
+++ b/tests/BusinessLogic/Common/BaseTestWithServices.php
@@ -27,7 +27,7 @@
 use Packlink\BusinessLogic\FileResolver\FileResolverService;
 use Packlink\BusinessLogic\Http\DTO\ParcelInfo;
 use Packlink\BusinessLogic\Http\Proxy;
-use Packlink\BusinessLogic\Language\CountryService as CountryTranslationService;
+use Packlink\BusinessLogic\CountryLabels\CountryService as CountryLabelService;
 use Packlink\BusinessLogic\Warehouse\Warehouse;
 use Packlink\BusinessLogic\Warehouse\WarehouseService;
 
@@ -129,11 +129,12 @@ function () {
         );
 
         TestServiceRegister::registerService(
-            \Packlink\BusinessLogic\Language\Interfaces\CountryService::CLASS_NAME,
+            \Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService::CLASS_NAME,
             function () {
                 $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
 
-                return new CountryTranslationService($fileResolverService);
+                /** @noinspection PhpParamsInspection */
+                return new CountryLabelService($fileResolverService);
             }
         );
 
diff --git a/tests/BusinessLogic/Language/TranslationServiceTest.php b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
similarity index 87%
rename from tests/BusinessLogic/Language/TranslationServiceTest.php
rename to tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
index 26b1044d..6c18ebd4 100644
--- a/tests/BusinessLogic/Language/TranslationServiceTest.php
+++ b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Logeecom\Tests\BusinessLogic\Language;
+namespace Logeecom\Tests\BusinessLogic\CountryLabels;
 
 use Logeecom\Infrastructure\Logger\Interfaces\ShopLoggerAdapter;
 use Logeecom\Infrastructure\Utility\TimeProvider;
@@ -13,11 +13,11 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * Class TranslationServiceTest
+ * Class CountryLabelsServiceTest
  *
  * @package BusinessLogic\Language
  */
-class TranslationServiceTest extends TestCase
+class CountryLabelsServiceTest extends TestCase
 {
     private static $englishValues = array(
         'rs' => array(),
@@ -40,7 +40,7 @@ class TranslationServiceTest extends TestCase
             'testKey2' => 'testValueEn2'
         ),
     );
-    private $translationService;
+    private $testCountryService;
 
     /**
      * Sets up the fixture, for example, open a network connection.
@@ -52,12 +52,12 @@ public function setUp()
 
         $fileResolverService = new FileResolverService(
             array(
-                __DIR__ . '/Translations',
+                __DIR__ . '/Labels',
                 __DIR__ . '/../FileResolver/Translations',
             )
         );
 
-        $this->translationService = new TestCountryService($fileResolverService);
+        $this->testCountryService = new TestCountryService($fileResolverService);
 
         $configuration = new TestShopConfiguration();
         Configuration::setUICountryCode('de');
@@ -95,7 +95,7 @@ public function testTranslateCurrentLanguageNotSet()
             )
         );
 
-        $translation = $this->translationService->getText('testKey');
+        $translation = $this->testCountryService->getText('testKey');
 
         $this->assertStringStartsWith('testValueEn', $translation);
     }
@@ -124,7 +124,7 @@ public function testTranslateNotSupportedLanguage()
             )
         );
 
-        $translation = $this->translationService->getText('testKey');
+        $translation = $this->testCountryService->getText('testKey');
 
         $this->assertStringStartsWith('testValueEn', $translation);
     }
@@ -135,7 +135,7 @@ public function testTranslateNotSupportedLanguage()
     public function testTranslateNonExistingKey()
     {
         $nonExistingKey = 'noKey';
-        $translation = $this->translationService->getText($nonExistingKey);
+        $translation = $this->testCountryService->getText($nonExistingKey);
 
         $this->assertEquals($nonExistingKey, $translation);
     }
@@ -147,7 +147,7 @@ public function testTranslateNonExistingKey()
     public function testTranslateFallbackToEnglish()
     {
         $key = 'testKey1';
-        $translation = $this->translationService->getText($key);
+        $translation = $this->testCountryService->getText($key);
 
         $this->assertEquals('testValueEn1', $translation);
     }
@@ -158,7 +158,7 @@ public function testTranslateFallbackToEnglish()
     public function testTranslateToGerman()
     {
         $key = 'testKey';
-        $translation = $this->translationService->getText($key);
+        $translation = $this->testCountryService->getText($key);
 
         $this->assertEquals('testValueDe', $translation);
     }
@@ -169,7 +169,7 @@ public function testTranslateToGerman()
     public function testTranslateToGermanNestedKeyWithPlaceholders()
     {
         $key = 'namespace.nestedKeyWithPlaceholder';
-        $translation = $this->translationService->getText($key, array(1, 2));
+        $translation = $this->testCountryService->getText($key, array(1, 2));
 
         $this->assertEquals('Test1 1, test2 2.', $translation);
     }
@@ -179,7 +179,7 @@ public function testTranslateToGermanNestedKeyWithPlaceholders()
      */
     public function testGetTranslations()
     {
-        $translations = $this->translationService->getTranslations('fr');
+        $translations = $this->testCountryService->getLabels('fr');
 
         $this->assertEquals(static::$englishAndFrenchValues, $translations);
     }
@@ -189,7 +189,7 @@ public function testGetTranslations()
      */
     public function testGetTranslationsWithNonExistingLanguage()
     {
-        $translations = $this->translationService->getTranslations('rs');
+        $translations = $this->testCountryService->getLabels('rs');
 
         $this->assertEquals(static::$englishValues, $translations);
     }
diff --git a/tests/BusinessLogic/Language/Translations/de.json b/tests/BusinessLogic/CountryLabels/Labels/de.json
similarity index 100%
rename from tests/BusinessLogic/Language/Translations/de.json
rename to tests/BusinessLogic/CountryLabels/Labels/de.json
diff --git a/tests/BusinessLogic/Language/Translations/en.json b/tests/BusinessLogic/CountryLabels/Labels/en.json
similarity index 100%
rename from tests/BusinessLogic/Language/Translations/en.json
rename to tests/BusinessLogic/CountryLabels/Labels/en.json
diff --git a/tests/BusinessLogic/Language/TestCountryService.php b/tests/BusinessLogic/CountryLabels/TestCountryService.php
similarity index 61%
rename from tests/BusinessLogic/Language/TestCountryService.php
rename to tests/BusinessLogic/CountryLabels/TestCountryService.php
index ecd6578a..1541cc3a 100644
--- a/tests/BusinessLogic/Language/TestCountryService.php
+++ b/tests/BusinessLogic/CountryLabels/TestCountryService.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Logeecom\Tests\BusinessLogic\Language;
+namespace Logeecom\Tests\BusinessLogic\CountryLabels;
 
-use Packlink\BusinessLogic\Language\CountryService;
+use Packlink\BusinessLogic\CountryLabels\CountryService;
 
 /**
- * Class TestTranslationService.
+ * Class TestCountryService.
  *
  * @package BusinessLogic\Language
  */
@@ -16,6 +16,6 @@ public function __construct($fileResolverService)
         parent::__construct($fileResolverService);
 
         // reset translations for each instance.
-        static::$translations = array();
+        static::$labels = array();
     }
 }
diff --git a/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php b/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
index c1682af5..368f00df 100644
--- a/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
+++ b/tests/BusinessLogic/FileResolver/FileResolverServiceTest.php
@@ -36,7 +36,7 @@ public function setUp()
 
         $this->fileResolverService = new FileResolverService(
             array(
-                __DIR__ . '/../Language/Translations',
+                __DIR__ . '/../CountryLabels/Labels',
                 __DIR__ . '/Translations'
             )
         );
@@ -83,7 +83,7 @@ public function testAddFolder()
 
         $this->assertEquals(
             array(
-                __DIR__ . '/../Language/Translations',
+                __DIR__ . '/../CountryLabels/Labels',
                 __DIR__ . '/Translations',
                 __DIR__
             ),

From f5223cfb7c3f44fbdd4f2fdc80507156288f1bd2 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 29 Mar 2021 15:11:11 +0200
Subject: [PATCH 23/37] Replace links generation logic with new CountryService
 usage

PLCR24-18
---
 .../Controllers/ConfigurationController.php   |  4 +---
 .../Controllers/RegistrationController.php    |  5 ++---
 .../CountryLabels/CountryService.php          | 22 ++++++++++++++-----
 .../Interfaces/CountryService.php             |  3 ++-
 .../OrderShipmentDetailsService.php           |  7 +++---
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/BusinessLogic/Controllers/ConfigurationController.php b/src/BusinessLogic/Controllers/ConfigurationController.php
index 924e902b..7c23f9c5 100644
--- a/src/BusinessLogic/Controllers/ConfigurationController.php
+++ b/src/BusinessLogic/Controllers/ConfigurationController.php
@@ -2,7 +2,6 @@
 
 namespace Packlink\BusinessLogic\Controllers;
 
-use Logeecom\Infrastructure\Configuration\Configuration;
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\CountryLabels\Interfaces\CountryService;
 use Packlink\BusinessLogic\Utility\UrlService;
@@ -20,11 +19,10 @@ class ConfigurationController
     public function getHelpLink()
     {
         $lang = UrlService::getUrlLocaleKey();
-        Configuration::setUICountryCode(strtolower($lang));
 
         /** @var CountryService $countryService */
         $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        return $countryService->getText('configuration.helpUrl');
+        return $countryService->getLabels(strtolower($lang), 'configuration.helpUrl');
     }
 }
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 87e9de22..8f54cc63 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -40,7 +40,6 @@ class RegistrationController
      */
     public function getRegisterData($country)
     {
-        Configuration::setUICountryCode(strtolower($country));
         /** @var RegistrationInfoService $registrationInfoService */
         $registrationInfoService = ServiceRegister::getService(RegistrationInfoService::CLASS_NAME);
         $registrationData = $registrationInfoService->getRegistrationInfoData();
@@ -52,8 +51,8 @@ public function getRegisterData($country)
             'email' => $registrationData->getEmail(),
             'phone' => $registrationData->getPhone(),
             'source' => $registrationData->getSource(),
-            'termsAndConditionsUrl' => $this->getCountryService()->getText('register.termsAndConditionsUrl'),
-            'privacyPolicyUrl' => $this->getCountryService()->getText('register.privacyPolicyUrl'),
+            'termsAndConditionsUrl' => $this->getCountryService()->getLabels(strtolower($country), 'register.termsAndConditionsUrl'),
+            'privacyPolicyUrl' => $this->getCountryService()->getLabels(strtolower($country), 'register.privacyPolicyUrl'),
             'platform_country' => in_array($country, $brand->platformCountries, true) ?
                 $country : $brand->platformCountries[0],
         );
diff --git a/src/BusinessLogic/CountryLabels/CountryService.php b/src/BusinessLogic/CountryLabels/CountryService.php
index 259425f4..7e36191a 100644
--- a/src/BusinessLogic/CountryLabels/CountryService.php
+++ b/src/BusinessLogic/CountryLabels/CountryService.php
@@ -83,17 +83,29 @@ public function getText($key, array $arguments = array())
     /**
      * Fetches labels for a specific country (provided by $countryCode parameter)
      * and default country.
+     * If parameter key is not set, fetches all labels for country.
+     * If parameter key is set, fetches label for specified key.
      *
      * @param string $countryCode
+     * @param string $key
      *
-     * @return array
+     * @return array|string
      */
-    public function getLabels($countryCode)
+    public function getLabels($countryCode, $key = '')
     {
-        $labels[$countryCode] = $this->fileResolverService->getContent($countryCode);
-        $labels[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
+        if (!$key) {
+            $labels[$countryCode] = $this->fileResolverService->getContent($countryCode);
+            $labels[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
 
-        return $labels;
+            return $labels;
+        }
+
+        $uiCountryCode = Configuration::getUICountryCode();
+        Configuration::setUICountryCode($countryCode);
+        $label = $this->getText($key);
+        Configuration::setUICountryCode($uiCountryCode);
+
+        return $label;
     }
 
     /**
diff --git a/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
index b4fdc5b7..32c147a5 100644
--- a/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
+++ b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
@@ -35,8 +35,9 @@ public function getText($key, array $arguments = array());
      * and default country.
      *
      * @param string $countryCode
+     * @param string $key
      *
      * @return array
      */
-    public function getLabels($countryCode);
+    public function getLabels($countryCode, $key = '');
 }
diff --git a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
index c2d0e94c..90a0fede 100644
--- a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
+++ b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
@@ -272,14 +272,15 @@ protected function getDraftShipmentUrl($reference)
         /** @var \Packlink\BusinessLogic\Configuration $configService */
         $configService = ServiceRegister::getService(Configuration::CLASS_NAME);
         $userInfo = $configService->getUserInfo();
+        $countryCode = 'en';
 
-        if($userInfo) {
-            Configuration::setUICountryCode(strtolower($userInfo->country));
+        if ($userInfo) {
+            $countryCode = $userInfo->country;
         }
 
         /** @var CountryService $countryService */
         $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        return  $countryService->getText('orderListAndDetails.shipmentUrl') . $reference;
+        return $countryService->getLabels(strtolower($countryCode), 'orderListAndDetails.shipmentUrl') . $reference;
     }
 }

From bc9e8a482707db286fdd694cdec88f5a48e4cbfe Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 29 Mar 2021 15:39:32 +0200
Subject: [PATCH 24/37] Add Acme DemoUI label overrides

PLCR24-20
---
 .../Brands/Acme/Resources/countries/at.json   |  4 +-
 .../Brands/Acme/Resources/countries/be.json   |  4 +-
 .../Brands/Acme/Resources/countries/de.json   | 66 +++++++++----------
 .../Brands/Acme/Resources/countries/en.json   | 66 +++++++++----------
 .../Brands/Acme/Resources/countries/es.json   | 66 +++++++++----------
 .../Brands/Acme/Resources/countries/fr.json   | 66 +++++++++----------
 .../Brands/Acme/Resources/countries/gb.json   |  4 +-
 .../Brands/Acme/Resources/countries/hu.json   |  4 +-
 .../Brands/Acme/Resources/countries/ie.json   |  4 +-
 .../Brands/Acme/Resources/countries/it.json   | 66 +++++++++----------
 .../Brands/Acme/Resources/countries/nl.json   |  4 +-
 .../Brands/Acme/Resources/countries/pt.json   |  4 +-
 .../Brands/Acme/Resources/countries/tr.json   |  4 +-
 13 files changed, 181 insertions(+), 181 deletions(-)

diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/at.json b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
index 80e17cfc..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011480"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/be.json b/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
index 07d4b919..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/de.json b/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
index 7c90e80e..304e1c8f 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
@@ -1,57 +1,57 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
+    "acme": "ACME Shipping",
     "saveUp": "Sparen Sie bis zu 70% bei Ihren Versandkosten. Keine festen Gebühren, kein Mindestvolumen beim Versand. Verwalten Sie alle Ihre Sendungen auf einer einzigen Plattform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über Packlink PRO.",
-    "developedAndManaged": "Entwickelt und verwaltet von Packlink"
+    "acmeShipping": "ACME Shipping S.L.",
+    "noContract": "Ohne Vertragsbindung – Sofortiger Zugriff auf über 300 Versanddienste in einer einzigen Plattform. Verbinden Sie Ihren Onlineshop und steuern Sie alle Sendungen über ACME.",
+    "developedAndManaged": "Entwickelt und verwaltet von ACME"
   },
   "login": {
-    "welcome": "Willkommen zu Packlink PRO",
-    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„Packlink Pro API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
+    "welcome": "Willkommen zu ACME",
+    "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter <br><strong>„ACME API-Schlüssel“</strong> bei den <strong>„Einstellungen“</strong>."
   },
   "register": {
-    "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
-    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
-    "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
+    "startEnjoying": "Genießen Sie ab jetzt ACME!",
+    "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von ACME</pre>",
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "marketingEmails": "Ich ermächtige ACME Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
   },
   "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/de",
+    "helpUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
     "contactUrl": "business@packlink.com",
     "contactUrlMail": "mailto::business@packlink.com"
   },
   "orderStatusMapping": {
-    "description": "Mit Packlink können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
-    "packlinkProShipmentStatus": "<strong>VERSANDSTATUS</strong> von Packlink PRO"
+    "description": "Mit ACME können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren. <br>Sie können die Informationen jederzeit bearbeiten.",
+    "acmeShipmentStatus": "<strong>VERSANDSTATUS</strong> von ACME"
   },
   "shippingServices": {
-    "packlinkPrices": "Packlink-Preise",
-    "pricePolicyDescription": "Standardmäßig werden <strong>die Packlink Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
-    "packlinkPrice": "Packlink-Preise",
-    "percentagePacklinkPrices": "% der Packlink-Preise",
-    "percentagePacklinkPricesWithData": "% der Packlink-Preise: %s von %s%",
-    "usePacklinkRange": "Für alle anderen Bereiche gelten die Packlink-Preise"
+    "acmePrices": "ACME-Preise",
+    "pricePolicyDescription": "Standardmäßig werden <strong>die ACME Basispreise </strong> eingestellt sein. Sie können diese jedoch weiter unten genauer konfigurieren.",
+    "acmePrice": "ACME-Preise",
+    "percentageacmePrices": "% der ACME-Preise",
+    "percentageacmePricesWithData": "% der ACME-Preise: %s von %s%",
+    "useacmeRange": "Für alle anderen Bereiche gelten die ACME-Preise"
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink Auftragsentwurf",
-    "printShipmentLabels": "Packlink PRO Versandetiketten drucken",
-    "packlinkReferenceNumber": "Packlink Referenznummer",
-    "packlinkShippingPrice": "Packlink Versandpreis",
-    "viewOnPacklink": "Auf Packlink PRO ansehen",
-    "draftIsBeingCreated": "Der Entwurf wird gerade in Packlink PRO erstellt",
-    "createOrderDraft": "Entwurf der Bestellung in Packlink PRO erstellen",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
+    "acmeOrderDraft": "ACME Auftragsentwurf",
+    "printShipmentLabels": "ACME Versandetiketten drucken",
+    "acmeReferenceNumber": "ACME Referenznummer",
+    "acmeShippingPrice": "ACME Versandpreis",
+    "viewOnAcme": "Auf ACME ansehen",
+    "draftIsBeingCreated": "Der Entwurf wird gerade in ACME erstellt",
+    "createOrderDraft": "Entwurf der Bestellung in ACME erstellen",
+    "acmeShipping": "ACME Shipping",
+    "sendWithAcme": "Send with ACME",
     "shipmentUrl": "https://pro.packlink.de/private/shipments/"
   },
   "systemLogMessages": {
-    "webhookReceived": "Webhook von Packlink erhalten"
+    "webhookReceived": "Webhook von ACME erhalten"
   },
   "autoTest": {
-    "moduleAutoTest": "Automatischer Test PacklinkPRO-Modul",
-    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des PacklinkPRO-Moduls testen.",
-    "openModule": "PacklinkPRO-Modul öffnen"
+    "moduleAutoTest": "Automatischer Test ACMEPRO-Modul",
+    "useThisPageTestConfiguration": "Auf dieser Seite können Sie die Systemkonfiguration und die Dienste des ACMEPRO-Moduls testen.",
+    "openModule": "ACMEPRO-Modul öffnen"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/en.json b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json
index d27043f7..4212afa0 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/en.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json
@@ -1,57 +1,57 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
+    "acme": "ACME Shipping",
     "saveUp": "Save up to 70% on your shipping costs. No fixed fees, no minimum shipping volume required. Manage all your shipments in a single platform.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in Packlink PRO.",
-    "developedAndManaged": "Developed and managed by Packlink"
+    "acmeShipping": "ACME Shipping S.L.",
+    "noContract": "No contract needed! More than 300 transport services into a single platform. You can connect all your ecommerce and manage all your shipments in ACME.",
+    "developedAndManaged": "Developed and managed by ACME"
   },
   "login": {
-    "welcome": "Welcome to Packlink PRO",
-    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"Packlink Pro API Key\"</strong> section of the <strong>\"Settings\"</strong>."
+    "welcome": "Welcome to ACME",
+    "connectYourService": "Connect your service using your key. You'll find it in the <br><strong>\"ACME API Key\"</strong> section of the <strong>\"Settings\"</strong>."
   },
   "register": {
-    "startEnjoying": "Start enjoying Packlink PRO!",
-    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of Packlink</pre>",
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560",
-    "marketingEmails": "I authorise Packlink Shipping S.L. to send me commercial communications by e-mail"
+    "startEnjoying": "Start enjoying ACME!",
+    "termsAndConditions": "<pre>I accept the <a href=\"%s\" target=\"_blank\">Terms of Service</a> and the <a href=\"%s\" target=\"_blank\">Privacy Policy</a> of ACME</pre>",
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "marketingEmails": "I authorise ACME Shipping S.L. to send me commercial communications by e-mail"
   },
   "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/en-gb",
+    "helpUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
     "contactUrl": "business@packlink.com",
     "contactUrlMail": "mailto::business@packlink.com"
   },
   "orderStatusMapping": {
-    "description": "With Packlink you can update your %s order status with shipping information. <br>You can edit it at any time.",
-    "packlinkProShipmentStatus": "Packlink PRO <strong>SHIPMENT</strong> STATUS"
+    "description": "With ACME you can update your %s order status with shipping information. <br>You can edit it at any time.",
+    "acmeShipmentStatus": "ACME <strong>SHIPMENT</strong> STATUS"
   },
   "shippingServices": {
-    "packlinkPrices": "Packlink prices",
-    "pricePolicyDescription": "The default <strong>will be Packlink's basic prices.</strong> But you can configure these in a more precise way below.",
-    "packlinkPrice": "Packlink Price",
-    "percentagePacklinkPrices": "% of Packlink prices",
-    "percentagePacklinkPricesWithData": "% of Packlink prices: %s by %s%",
-    "usePacklinkRange": "For all other ranges, apply Packlink prices"
+    "acmePrices": "ACME prices",
+    "pricePolicyDescription": "The default <strong>will be ACME's basic prices.</strong> But you can configure these in a more precise way below.",
+    "acmePrice": "ACME Price",
+    "percentageAcmePrices": "% of ACME prices",
+    "percentageAcmePricesWithData": "% of ACME prices: %s by %s%",
+    "useAcmeRange": "For all other ranges, apply ACME prices"
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Packlink order draft",
-    "printShipmentLabels": "Print Packlink PRO Shipment Labels",
-    "packlinkReferenceNumber": "Packlink reference number",
-    "packlinkShippingPrice": "Packlink shipping price",
-    "viewOnPacklink": "View on Packlink PRO",
-    "draftIsBeingCreated": "Draft is currently being created in Packlink PRO",
-    "createOrderDraft": "Create order draft in Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
+    "acmeOrderDraft": "ACME order draft",
+    "printShipmentLabels": "Print ACME Shipment Labels",
+    "acmeReferenceNumber": "ACME reference number",
+    "acmeShippingPrice": "ACME shipping price",
+    "viewOnAcme": "View on ACME",
+    "draftIsBeingCreated": "Draft is currently being created in ACME",
+    "createOrderDraft": "Create order draft in ACME",
+    "acmeShipping": "ACME Shipping",
+    "sendWithAcme": "Send with ACME",
     "shipmentUrl": "https://pro.packlink.en/private/shipments/"
   },
   "systemLogMessages": {
-    "webhookReceived": "Webhook from Packlink received."
+    "webhookReceived": "Webhook from ACME received."
   },
   "autoTest": {
-    "moduleAutoTest": "PacklinkPRO module auto-test",
-    "useThisPageTestConfiguration": "Use this page to test the system configuration and PacklinkPRO module services.",
-    "openModule": "Open PacklinkPRO module"
+    "moduleAutoTest": "ACME module auto-test",
+    "useThisPageTestConfiguration": "Use this page to test the system configuration and ACME module services.",
+    "openModule": "Open ACME module"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/es.json b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json
index 59908297..251b9f0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/es.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json
@@ -1,57 +1,57 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
+    "acme": "Acme Shipping",
     "saveUp": "Ahorra hasta un 70% en tus gastos de envío. Sin tarifas fijas, sin volumen de envíos mínimo. Gestiona todos tus envíos en una sola plataforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Packlink PRO.",
-    "developedAndManaged": "Desarrollado y gestionado por Packlink"
+    "acmeShipping": "Acme Shipping S.L.",
+    "noContract": "Sin contratos, accede inmediatamente a más de 300 servicios de transporte en una única plataforma. No importa cuantos puntos de venta tengas, todo lo podrás gestionar desde Acme.",
+    "developedAndManaged": "Desarrollado y gestionado por Acme"
   },
   "login": {
-    "welcome": "Te damos la bienvenida a Packlink PRO",
-    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Packlink Pro API Key\"</strong>"
+    "welcome": "Te damos la bienvenida a Acme",
+    "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la <br>sección <strong>\"Configuración\"</strong> apartado <strong>\"Acme API Key\"</strong>"
   },
   "register": {
-    "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
-    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
-    "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
+    "startEnjoying": "¡Empieza a disfrutar de Acme!",
+    "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Acme</pre>",
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "marketingEmails": "Autorizo a Acme Shipping S.L. a enviarme información comercial por correo electrónico"
   },
   "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/es-es",
+    "helpUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
     "contactUrl": "business@packlink.com",
     "contactUrlMail": "mailto::business@packlink.com"
   },
   "orderStatusMapping": {
-    "description": "Con Packlink puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
-    "packlinkProShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Packlink PRO"
+    "description": "Con Acme puedes actualizar el estado de tu pedido de %s con la información de envío. <br>Puedes editarla en cualquier momento.",
+    "acmeShipmentStatus": "ESTADO DEL <strong>ENVÍO</strong> de Acme"
   },
   "shippingServices": {
-    "packlinkPrices": "Precios de Packlink",
-    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Packlink.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
-    "packlinkPrice": "Precio Packlink",
-    "percentagePacklinkPrices": "% de los precio de Packlink",
-    "percentagePacklinkPricesWithData": "% de los precio de Packlink: %s por %s%",
-    "usePacklinkRange": "Para el resto de rangos, aplicar precios Packlink"
+    "acmePrices": "Precios de Acme",
+    "pricePolicyDescription": "Por defecto <strong>serán los precios base de Acme.</strong> Pero puedes configurarlos de manera más precisa a continuación.",
+    "acmePrice": "Precio Acme",
+    "percentageAcmePrices": "% de los precio de Acme",
+    "percentageAcmePricesWithData": "% de los precio de Acme: %s por %s%",
+    "useAcmeRange": "Para el resto de rangos, aplicar precios Acme"
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Borrador del pedido de Packlink",
-    "printShipmentLabels": "Imprimir Packlink PRO etiquetas de los envíos",
-    "packlinkReferenceNumber": "Número de referencia Packlink",
-    "packlinkShippingPrice": "Precio de envío de Packlink",
-    "viewOnPacklink": "Ver en Packlink PRO",
-    "draftIsBeingCreated": "El borrador se está creando actualmente en Packlink PRO",
-    "createOrderDraft": "Crear borrador en Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
+    "acmeOrderDraft": "Borrador del pedido de Acme",
+    "printShipmentLabels": "Imprimir Acme etiquetas de los envíos",
+    "acmeReferenceNumber": "Número de referencia Acme",
+    "acmeShippingPrice": "Precio de envío de Acme",
+    "viewOnAcme": "Ver en Acme",
+    "draftIsBeingCreated": "El borrador se está creando actualmente en Acme",
+    "createOrderDraft": "Crear borrador en Acme",
+    "acmeShipping": "Acme Shipping",
+    "sendWithAcme": "Send with Acme",
     "shipmentUrl": "https://pro.packlink.es/private/shipments/"
   },
   "systemLogMessages": {
-    "webhookReceived": "Webhook de Packlink recibido"
+    "webhookReceived": "Webhook de Acme recibido"
   },
   "autoTest": {
-    "moduleAutoTest": "Prueba automática del módulo PacklinkPRO",
-    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo PacklinkPRO.",
-    "openModule": "Abrir el módulo PacklinkPRO"
+    "moduleAutoTest": "Prueba automática del módulo Acme",
+    "useThisPageTestConfiguration": "Utiliza esta página para probar la configuración del sistema y los servicios del módulo Acme.",
+    "openModule": "Abrir el módulo Acme"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
index afe7b187..75a49f7d 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json
@@ -1,57 +1,57 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
+    "acme": "ACME Shipping",
     "saveUp": "Économisez jusqu'à 70% sur vos coûts de livraison. Sans frais fixes, sans volume minimum requis. Gérez tous vos envois depuis une seule plateforme.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis Packlink PRO.",
-    "developedAndManaged": "Développé et géré par Packlink"
+    "acmeShipping": "ACME Shipping S.L.",
+    "noContract": "Sans engagement, accédez immédiatement à plus de 300 services de transport sur une seule et unique plateforme. Quelque soit le nombre de points de ventes que vous avez, vous pourrez tout gérer depuis ACME.",
+    "developedAndManaged": "Développé et géré par ACME"
   },
   "login": {
-    "welcome": "Bienvenue sur Packlink PRO",
-    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API Packlink Pro »</strong> dans <strong>« Paramètres »</strong>."
+    "welcome": "Bienvenue sur ACME ",
+    "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section <br><strong>« Clé API ACME  »</strong> dans <strong>« Paramètres »</strong>."
   },
   "register": {
-    "startEnjoying": "Commencez à utiliser Packlink PRO !",
-    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
-    "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
+    "startEnjoying": "Commencez à utiliser ACME!",
+    "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de ACME</pre>",
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "marketingEmails": "J’autorise ACME Shipping S.L. à m’envoyer des communications commerciales par courriel"
   },
   "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/fr-fr",
+    "helpUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
     "contactUrl": "business@packlink.com",
     "contactUrlMail": "mailto::business@packlink.com"
   },
   "orderStatusMapping": {
-    "description": "Avec Packlink, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
-    "packlinkProShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> Packlink PRO"
+    "description": "Avec ACME, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition. <br>Vous pourrez les modifier à tout moment.",
+    "acmeShipmentStatus": "STATUT DE <strong>LIVRAISON</strong> ACME "
   },
   "shippingServices": {
-    "packlinkPrices": "Prix Packlink",
-    "pricePolicyDescription": "Les <strong>tarifs de base de Packlink seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
-    "packlinkPrice": "Prix Packlink",
-    "percentagePacklinkPrices": "% des prix Packlink",
-    "percentagePacklinkPricesWithData": "% des prix Packlink : %s de %s%",
-    "usePacklinkRange": "Pour toutes les autres fourchettes, appliquez les prix Packlink"
+    "acmePrices": "Prix ACME",
+    "pricePolicyDescription": "Les <strong>tarifs de base de ACME seront configurés par défaut,</strong> mais vous pourrez les configurer plus en détail ci-dessous.",
+    "acmePrice": "Prix ACME",
+    "percentageAcmePrices": "% des prix ACME",
+    "percentageAcmePricesWithData": "% des prix ACME : %s de %s%",
+    "useAcmeRange": "Pour toutes les autres fourchettes, appliquez les prix ACME"
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Brouillon de commande Packlink",
-    "printShipmentLabels": "Imprimer les étiquettes de livraison Packlink PRO",
-    "packlinkReferenceNumber": "Numéro de référence Packlink",
-    "packlinkShippingPrice": "Prix de livraison Packlink",
-    "viewOnPacklink": "Voir sur Packlink PRO",
-    "draftIsBeingCreated": "Le brouillon est en cours de création sur Packlink PRO",
-    "createOrderDraft": "Créer un brouillon de commande sur Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
+    "acmeOrderDraft": "Brouillon de commande ACME",
+    "printShipmentLabels": "Imprimer les étiquettes de livraison ACME ",
+    "acmeReferenceNumber": "Numéro de référence ACME",
+    "acmeShippingPrice": "Prix de livraison ACME",
+    "viewOnAcme": "Voir sur ACME ",
+    "draftIsBeingCreated": "Le brouillon est en cours de création sur ACME ",
+    "createOrderDraft": "Créer un brouillon de commande sur ACME ",
+    "acmeShipping": "ACME Shipping",
+    "sendWithAcme": "Send with ACME",
     "shipmentUrl": "https://pro.packlink.fr/private/shipments/"
   },
   "systemLogMessages": {
-    "webhookReceived": "Webhook de Packlink reçu"
+    "webhookReceived": "Webhook de ACME reçu"
   },
   "autoTest": {
-    "moduleAutoTest": "Test automatique du module PacklinkPRO",
-    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module PacklinkPRO.",
-    "openModule": "Ouvrir le module PacklinkPRO"
+    "moduleAutoTest": "Test automatique du module ACME",
+    "useThisPageTestConfiguration": "Utilisez cette page pour tester la configuration du système et les services du module ACME.",
+    "openModule": "Ouvrir le module ACME"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
index 0f805ad4..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
index 82f12c8c..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/hu/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
index 0f805ad4..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/en-gb/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/it.json b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json
index d1e1973f..69d81b8a 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/it.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json
@@ -1,57 +1,57 @@
 {
   "general": {
-    "packlinkPro": "Packlink PRO Shipping",
+    "acme": "ACME  Shipping",
     "saveUp": "Risparmia fino a un 70% sui costi di spedizione. Senza costi fissi né volumi minimi di spedizione richiesti. Gestisci tutte le tue spedizioni da un'unica piattaforma.",
-    "packlinkShipping": "Packlink Shipping S.L.",
-    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da Packlink PRO.",
-    "developedAndManaged": "Sviluppato e gestito da Packlink"
+    "acmeShipping": "ACME Shipping S.L.",
+    "noContract": "Senza contratti, accedi suvito a più di 300 servizi di trasporto da un'unica piattaforma. Indipendentemente da quanti punti vendita hai, puoi gestirli tutto da ACME.",
+    "developedAndManaged": "Sviluppato e gestito da ACME"
   },
   "login": {
-    "welcome": "Benvenuto a Packlink PRO",
-    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API Packlink Pro\"</strong> delle <strong>\"Impostazioni\"</strong>."
+    "welcome": "Benvenuto a ACME ",
+    "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione <br><strong>\"Chiave API ACME \"</strong> delle <strong>\"Impostazioni\"</strong>."
   },
   "register": {
-    "startEnjoying": "Inizia a usufruire di Packlink PRO!",
-    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di Packlink</pre>",
-    "termsAndConditionsUrl": "https://pro.packlink.it/termini-condizioni/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/it/articles/360010011560-Politica-di-Privacy",
-    "marketingEmails": "Autorizzo Packlink Shipping S.L. a inviarmi comunicazioni commerciali via email"
+    "startEnjoying": "Inizia a usufruire di ACME !",
+    "termsAndConditions": "<pre>Accetto i <a href=\"%s\" target=\"_blank\">Termini del servizio</a> e l’<a href=\"%s\" target=\"_blank\">Informativa sulla privacy</a> di ACME</pre>",
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "marketingEmails": "Autorizzo ACME Shipping S.L. a inviarmi comunicazioni commerciali via email"
   },
   "configuration": {
-    "helpUrl": "https://support-pro.packlink.com/hc/it",
+    "helpUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
     "contactUrl": "business@packlink.com",
     "contactUrlMail": "mailto::business@packlink.com"
   },
   "orderStatusMapping": {
-    "description": "Con Packlink, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
-    "packlinkProShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di Packlink PRO"
+    "description": "Con ACME, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione. <br>Puoi modificarlo ogni volta che vuoi.",
+    "acmeShipmentStatus": "STATO DELLA <strong>SPEDIZIONE</strong> di ACME "
   },
   "shippingServices": {
-    "packlinkPrices": "Prezzi di Packlink",
-    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di Packlink,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
-    "packlinkPrice": "Prezzo di Packlink",
-    "percentagePacklinkPrices": "% dei prezzi di Packlink",
-    "percentagePacklinkPricesWithData": "% dei prezzi di Packlink: %s del %s%",
-    "usePacklinkRange": "Per tutti gli altri range, applica i prezzi di Packlink"
+    "acmePrices": "Prezzi di ACME",
+    "pricePolicyDescription": "Per impostazione predefinita, <strong>saranno i prezzi di base di ACME,</strong> ma puoi configurarli più dettagliatamente qui di seguito.",
+    "acmePrice": "Prezzo di ACME",
+    "percentageAcmePrices": "% dei prezzi di ACME",
+    "percentageAcmePricesWithData": "% dei prezzi di ACME: %s del %s%",
+    "useAcmeRange": "Per tutti gli altri range, applica i prezzi di ACME"
   },
   "orderListAndDetails": {
-    "packlinkOrderDraft": "Bozza dell'ordine Packlink",
-    "printShipmentLabels": "Stampa etichette di spedizione Packlink PRO",
-    "packlinkReferenceNumber": "Numero di ordine Packlink",
-    "packlinkShippingPrice": "PPrezzo di spedizione Packlink",
-    "viewOnPacklink": "Vedi su Packlink PRO",
-    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su Packlink PRO",
-    "createOrderDraft": "Crea una bozza di ordine su Packlink PRO",
-    "packlinkShipping": "Packlink Shipping",
-    "sendWithPacklink": "Send with Packlink",
+    "acmeOrderDraft": "Bozza dell'ordine ACME",
+    "printShipmentLabels": "Stampa etichette di spedizione ACME ",
+    "acmeReferenceNumber": "Numero di ordine ACME",
+    "acmeShippingPrice": "PPrezzo di spedizione ACME",
+    "viewOnAcme": "Vedi su ACME ",
+    "draftIsBeingCreated": "La bozza è attualmente in fase di creazione su ACME ",
+    "createOrderDraft": "Crea una bozza di ordine su ACME ",
+    "acmeShipping": "ACME Shipping",
+    "sendWithAcme": "Send with ACME",
     "shipmentUrl": "https://pro.packlink.it/private/shipments/"
   },
   "systemLogMessages": {
-    "webhookReceived": "Webhook di Packlink ricevuto"
+    "webhookReceived": "Webhook di ACME ricevuto"
   },
   "autoTest": {
-    "moduleAutoTest": "Auto-test per il modulo di PacklinkPRO",
-    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di PacklinkPRO.",
-    "openModule": "Apri il modulo di PacklinkPRO"
+    "moduleAutoTest": "Auto-test per il modulo di ACME",
+    "useThisPageTestConfiguration": "Usa questa pagina per testare la configurazione del sistema e i servizi del modulo di ACME.",
+    "openModule": "Apri il modulo di ACME"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
index 07d4b919..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/nl/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
index a4a65b0f..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/pt/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file
diff --git a/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json
index ea17d41a..92f82b0c 100644
--- a/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json
@@ -1,6 +1,6 @@
 {
   "register": {
-    "termsAndConditionsUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011480",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/tr/articles/360010011560"
+    "termsAndConditionsUrl": "https://en.wikipedia.org/wiki/Acme_Corporation",
+    "privacyPolicyUrl": "https://en.wikipedia.org/wiki/Acme_Corporation"
   }
 }
\ No newline at end of file

From dc8e02e28f42e4cd33ce713f2fad9f7330f5b409 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Thu, 1 Apr 2021 15:38:30 +0200
Subject: [PATCH 25/37] Brand property added to Schedule entities

PLCR24-29
---
 .../Scheduler/Models/DailySchedule.php        |  2 +-
 .../Scheduler/Models/HourlySchedule.php       |  1 +
 .../Scheduler/Models/Schedule.php             | 28 ++++++++++++++++++-
 .../Scheduler/Models/WeeklySchedule.php       | 13 ++++++++-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/BusinessLogic/Scheduler/Models/DailySchedule.php b/src/BusinessLogic/Scheduler/Models/DailySchedule.php
index 66976288..97e1477e 100644
--- a/src/BusinessLogic/Scheduler/Models/DailySchedule.php
+++ b/src/BusinessLogic/Scheduler/Models/DailySchedule.php
@@ -19,7 +19,7 @@ class DailySchedule extends Schedule
      *
      * @var array
      */
-    protected $fields = array('id', 'queueName', 'minute', 'hour', 'day', 'month', 'daysOfWeek', 'context');
+    protected $fields = array('id', 'queueName', 'minute', 'hour', 'day', 'month', 'daysOfWeek', 'context', 'brand');
     /**
      * Week day numbers, starting from Monday to Sunday.
      *
diff --git a/src/BusinessLogic/Scheduler/Models/HourlySchedule.php b/src/BusinessLogic/Scheduler/Models/HourlySchedule.php
index 52c52342..a6eae0dd 100644
--- a/src/BusinessLogic/Scheduler/Models/HourlySchedule.php
+++ b/src/BusinessLogic/Scheduler/Models/HourlySchedule.php
@@ -33,6 +33,7 @@ class HourlySchedule extends Schedule
         'endMinute',
         'interval',
         'context',
+        'brand',
     );
     /**
      * Start hour of the interval.
diff --git a/src/BusinessLogic/Scheduler/Models/Schedule.php b/src/BusinessLogic/Scheduler/Models/Schedule.php
index 86a78c24..c36b754f 100644
--- a/src/BusinessLogic/Scheduler/Models/Schedule.php
+++ b/src/BusinessLogic/Scheduler/Models/Schedule.php
@@ -33,7 +33,7 @@ class Schedule extends Entity
      *
      * @var array
      */
-    protected $fields = array('id', 'queueName', 'minute', 'hour', 'day', 'month', 'recurring', 'context');
+    protected $fields = array('id', 'queueName', 'minute', 'hour', 'day', 'month', 'recurring', 'context', 'brand');
     /**
      * Queue name where task should be queued to.
      *
@@ -82,6 +82,12 @@ class Schedule extends Entity
      * @var string
      */
     protected $context;
+    /**
+     * Schedule brand.
+     *
+     * @var string
+     */
+    protected $brand;
 
     /**
      * Schedule constructor.
@@ -312,6 +318,26 @@ public function setContext($context)
         $this->context = $context;
     }
 
+    /**
+     * Gets schedule brand.
+     *
+     * @return string
+     */
+    public function getBrand()
+    {
+        return $this->brand;
+    }
+
+    /**
+     * Sets schedule brand.
+     *
+     * @param string $brand
+     */
+    public function setBrand($brand)
+    {
+        $this->brand = $brand;
+    }
+
     /**
      * Calculates next schedule time.
      *
diff --git a/src/BusinessLogic/Scheduler/Models/WeeklySchedule.php b/src/BusinessLogic/Scheduler/Models/WeeklySchedule.php
index 07cfe4f9..8f28c920 100644
--- a/src/BusinessLogic/Scheduler/Models/WeeklySchedule.php
+++ b/src/BusinessLogic/Scheduler/Models/WeeklySchedule.php
@@ -34,7 +34,18 @@ class WeeklySchedule extends Schedule
      *
      * @var array
      */
-    protected $fields = array('id', 'queueName', 'minute', 'hour', 'day', 'month', 'lastWeek', 'weeks', 'context');
+    protected $fields = array(
+        'id',
+        'queueName',
+        'minute',
+        'hour',
+        'day',
+        'month',
+        'lastWeek',
+        'weeks',
+        'context',
+        'brand',
+    );
     /**
      * Last week flag.
      *

From 646b799d9e76e9fc44ef6c1724f6c5d0b426833c Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 12 Apr 2021 11:53:33 +0200
Subject: [PATCH 26/37] Implement hierarchical content extending of key/value
 files

PLCR24-16
---
 src/BusinessLogic/FileResolver/FileResolverService.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/BusinessLogic/FileResolver/FileResolverService.php b/src/BusinessLogic/FileResolver/FileResolverService.php
index c4d88114..06721dda 100644
--- a/src/BusinessLogic/FileResolver/FileResolverService.php
+++ b/src/BusinessLogic/FileResolver/FileResolverService.php
@@ -52,13 +52,11 @@ public function getContent($sourceFile)
             $serializedJson = file_get_contents($filePath);
 
             if ($serializedJson) {
-                $array = json_decode($serializedJson, true);
-                /** @noinspection SlowArrayOperationsInLoopInspection */
-                $content = array_replace_recursive($content, $array);
+                $content[] = json_decode($serializedJson, true);
             }
         }
 
-        return $content;
+        return $content === array() ? $content : call_user_func_array('array_replace_recursive', $content);
     }
 
     /**

From 815ccb3d15fd1bbbeb4f067bcf47dfe042f199a5 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Mon, 12 Apr 2021 12:10:45 +0200
Subject: [PATCH 27/37] Refactor TranslationService to use hierarchical content
 extending

PLCR24-17
---
 .../CountryLabels/CountryService.php          | 32 +++++++++++++------
 .../CountryLabelsServiceTest.php              | 28 +++++++++++++---
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/BusinessLogic/CountryLabels/CountryService.php b/src/BusinessLogic/CountryLabels/CountryService.php
index 7e36191a..25f62535 100644
--- a/src/BusinessLogic/CountryLabels/CountryService.php
+++ b/src/BusinessLogic/CountryLabels/CountryService.php
@@ -63,11 +63,7 @@ public function getText($key, array $arguments = array())
     {
         $this->currentLanguage = Configuration::getUICountryCode() ?: static::DEFAULT_LANG;
 
-        if (empty(static::$labels[$this->currentLanguage])) {
-            $this->initializeLabels();
-        }
-
-        $result = $this->getLabel($key, $this->currentLanguage);
+        $result = $this->getLabelByCurrentLanguage($key);
 
         if ($result === null) {
             $result = $this->getLabel($key, static::DEFAULT_LANG);
@@ -100,10 +96,12 @@ public function getLabels($countryCode, $key = '')
             return $labels;
         }
 
-        $uiCountryCode = Configuration::getUICountryCode();
-        Configuration::setUICountryCode($countryCode);
-        $label = $this->getText($key);
-        Configuration::setUICountryCode($uiCountryCode);
+        $languageBackup = $this->currentLanguage;
+        $this->currentLanguage = $countryCode;
+
+        $label = $this->getLabelByCurrentLanguage($key);
+
+        $this->currentLanguage = $languageBackup;
 
         return $label;
     }
@@ -160,4 +158,20 @@ protected function getLabel($key, $language)
     {
         return isset(static::$labels[$language][$key]) ? static::$labels[$language][$key] : null;
     }
+
+    /**
+     * Gets label by current language.
+     *
+     * @param string $key The label key.
+     *
+     * @return string|null The label.
+     */
+    protected function getLabelByCurrentLanguage($key)
+    {
+        if (empty(static::$labels[$this->currentLanguage])) {
+            $this->initializeLabels();
+        }
+
+        return $this->getLabel($key, $this->currentLanguage);
+    }
 }
diff --git a/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
index 6c18ebd4..8662f11f 100644
--- a/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
+++ b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
@@ -175,9 +175,9 @@ public function testTranslateToGermanNestedKeyWithPlaceholders()
     }
 
     /**
-     * Tests getTranslation function with existing language.
+     * Tests getLabels function without key with existing language.
      */
-    public function testGetTranslations()
+    public function testGetLabels()
     {
         $translations = $this->testCountryService->getLabels('fr');
 
@@ -185,12 +185,32 @@ public function testGetTranslations()
     }
 
     /**
-     * Tests getTranslation function with non existing language.
+     * Tests getLabels function without key with non existing language.
      */
-    public function testGetTranslationsWithNonExistingLanguage()
+    public function testGetLabelsWithNonExistingLanguage()
     {
         $translations = $this->testCountryService->getLabels('rs');
 
         $this->assertEquals(static::$englishValues, $translations);
     }
+
+    /**
+     * Tests getLabels function with existing key with existing language.
+     */
+    public function testGetLabelsWithKey()
+    {
+        $label = $this->testCountryService->getLabels('fr', 'testKey');
+
+        $this->assertEquals('testValueFr', $label);
+    }
+
+    /**
+     * Tests getLabels function with non exiting key.
+     */
+    public function testGetLabelsWithNonExistingKey()
+    {
+        $label = $this->testCountryService->getLabels('fr', 'testKeyNonExisting');
+
+        $this->assertEquals(null, $label);
+    }
 }

From 418d23391690e79e9159e9ecdd89bda4aafde750 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Wed, 14 Apr 2021 10:33:32 +0200
Subject: [PATCH 28/37] Added brand field to QueueItem

PLCR24-32
---
 .../TaskExecution/QueueItem.php               | 29 +++++++++++++++++++
 .../TaskExecution/QueueService.php            |  6 ++--
 .../TaskExecution/QueueItemEntityTest.php     |  1 +
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/Infrastructure/TaskExecution/QueueItem.php b/src/Infrastructure/TaskExecution/QueueItem.php
index 8e0b4297..6f26f31f 100644
--- a/src/Infrastructure/TaskExecution/QueueItem.php
+++ b/src/Infrastructure/TaskExecution/QueueItem.php
@@ -74,6 +74,7 @@ class QueueItem extends Entity
         'queueTime',
         'lastUpdateTime',
         'priority',
+        'brand',
     );
     /**
      * Queue item status.
@@ -177,6 +178,12 @@ class QueueItem extends Entity
      * @var int QueueItem execution priority.
      */
     protected $priority;
+    /**
+     * QueueItem brand.
+     *
+     * @var string
+     */
+    protected $brand;
     /**
      * Instance of time provider.
      *
@@ -697,6 +704,26 @@ public function setPriority($priority)
         $this->priority = $priority;
     }
 
+    /**
+     * Gets queue item brand.
+     *
+     * @return string
+     */
+    public function getBrand()
+    {
+        return $this->brand;
+    }
+
+    /**
+     * Sets queue item brand.
+     *
+     * @param string $brand
+     */
+    public function setBrand($brand)
+    {
+        $this->brand = $brand;
+    }
+
     /**
      * Reconfigures underlying task.
      *
@@ -751,6 +778,7 @@ public function toArray()
         $result['failTime'] = $this->timeProvider->serializeDate($this->failTime);
         $result['earliestStartTime'] = $this->timeProvider->serializeDate($this->earliestStartTime);
         $result['priority'] = $this->getPriority();
+        $result['brand'] = $this->getBrand();
 
         return $result;
     }
@@ -771,6 +799,7 @@ public function inflate(array $data)
         $this->finishTime = $this->timeProvider->deserializeDateString($data['finishTime']);
         $this->failTime = $this->timeProvider->deserializeDateString($data['failTime']);
         $this->earliestStartTime = $this->timeProvider->deserializeDateString($data['earliestStartTime']);
+        $this->brand = $data['brand'];
     }
 
     /**
diff --git a/src/Infrastructure/TaskExecution/QueueService.php b/src/Infrastructure/TaskExecution/QueueService.php
index 6c05fcfd..58cb1b83 100644
--- a/src/Infrastructure/TaskExecution/QueueService.php
+++ b/src/Infrastructure/TaskExecution/QueueService.php
@@ -406,7 +406,7 @@ public function findOldestQueuedItems($limit = 10)
      *
      * @throws \Logeecom\Infrastructure\TaskExecution\Exceptions\QueueStorageUnavailableException
      */
-    private function save(
+    protected function save(
         QueueItem $queueItem,
         array $additionalWhere = array(),
         $reportStateChange = false,
@@ -478,7 +478,7 @@ private function getStorage()
      *
      * @return TimeProvider Time provider instance.
      */
-    private function getTimeProvider()
+    protected function getTimeProvider()
     {
         if ($this->timeProvider === null) {
             $this->timeProvider = ServiceRegister::getService(TimeProvider::CLASS_NAME);
@@ -492,7 +492,7 @@ private function getTimeProvider()
      *
      * @return TaskRunnerWakeup Task runner wakeup instance.
      */
-    private function getTaskRunnerWakeup()
+    protected function getTaskRunnerWakeup()
     {
         if ($this->taskRunnerWakeup === null) {
             $this->taskRunnerWakeup = ServiceRegister::getService(TaskRunnerWakeup::CLASS_NAME);
diff --git a/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php b/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
index 38e0677f..a174e4de 100644
--- a/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
+++ b/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
@@ -145,6 +145,7 @@ public function testFromArrayAndToJSON()
             'queueTime' => $queueTime->format(DATE_ATOM),
             'lastUpdateTime' => $lastUpdateTime->format(DATE_ATOM),
             'priority' => Priority::LOW,
+            'brand' => '',
         );
 
         $entity = QueueItem::fromArray($data);

From 3d383dbc7d1e9fe7beb53dfbc1de83e82a289ff2 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Thu, 15 Apr 2021 14:51:53 +0200
Subject: [PATCH 29/37] Refactor TranslationService to use hierarchical content
 extending

PLCR24-17
---
 .../Controllers/ConfigurationController.php   |  4 +-
 .../Controllers/RegistrationController.php    |  6 +-
 .../CountryLabels/CountryService.php          | 68 +++++++++++--------
 .../Interfaces/CountryService.php             | 12 +++-
 .../OrderShipmentDetailsService.php           |  2 +-
 src/DemoUI/src/Views/ACME/index.php           |  2 +-
 src/DemoUI/src/Views/PRO/index.php            |  2 +-
 .../CountryLabelsServiceTest.php              | 23 ++++---
 8 files changed, 74 insertions(+), 45 deletions(-)

diff --git a/src/BusinessLogic/Controllers/ConfigurationController.php b/src/BusinessLogic/Controllers/ConfigurationController.php
index 7c23f9c5..bf4777b3 100644
--- a/src/BusinessLogic/Controllers/ConfigurationController.php
+++ b/src/BusinessLogic/Controllers/ConfigurationController.php
@@ -14,7 +14,7 @@
 class ConfigurationController
 {
     /**
-     * @return mixed|string
+     * @return string
      */
     public function getHelpLink()
     {
@@ -23,6 +23,6 @@ public function getHelpLink()
         /** @var CountryService $countryService */
         $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        return $countryService->getLabels(strtolower($lang), 'configuration.helpUrl');
+        return $countryService->getLabel(strtolower($lang), 'configuration.helpUrl');
     }
 }
diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 8f54cc63..96f1da32 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -51,8 +51,10 @@ public function getRegisterData($country)
             'email' => $registrationData->getEmail(),
             'phone' => $registrationData->getPhone(),
             'source' => $registrationData->getSource(),
-            'termsAndConditionsUrl' => $this->getCountryService()->getLabels(strtolower($country), 'register.termsAndConditionsUrl'),
-            'privacyPolicyUrl' => $this->getCountryService()->getLabels(strtolower($country), 'register.privacyPolicyUrl'),
+            'termsAndConditionsUrl' => $this->getCountryService()
+                ->getLabel(strtolower($country), 'register.termsAndConditionsUrl', static::DEFAULT_COUNTRY),
+            'privacyPolicyUrl' => $this->getCountryService()
+                ->getLabel(strtolower($country), 'register.privacyPolicyUrl', static::DEFAULT_COUNTRY),
             'platform_country' => in_array($country, $brand->platformCountries, true) ?
                 $country : $brand->platformCountries[0],
         );
diff --git a/src/BusinessLogic/CountryLabels/CountryService.php b/src/BusinessLogic/CountryLabels/CountryService.php
index 25f62535..d72f2116 100644
--- a/src/BusinessLogic/CountryLabels/CountryService.php
+++ b/src/BusinessLogic/CountryLabels/CountryService.php
@@ -63,49 +63,59 @@ public function getText($key, array $arguments = array())
     {
         $this->currentLanguage = Configuration::getUICountryCode() ?: static::DEFAULT_LANG;
 
-        $result = $this->getLabelByCurrentLanguage($key);
-
-        if ($result === null) {
-            $result = $this->getLabel($key, static::DEFAULT_LANG);
-        }
-
-        if ($result === null) {
-            $result = $key;
-        }
+        $result = $this->fetchLabel($key, static::DEFAULT_LANG);
 
         return vsprintf($result, $arguments);
     }
 
     /**
-     * Fetches labels for a specific country (provided by $countryCode parameter)
-     * and default country.
-     * If parameter key is not set, fetches all labels for country.
-     * If parameter key is set, fetches label for specified key.
-     *
-     * @param string $countryCode
-     * @param string $key
-     *
-     * @return array|string
+     * @inheritDoc
      */
-    public function getLabels($countryCode, $key = '')
+    public function getLabel($countryCode, $key, $fallbackCode = self::DEFAULT_LANG)
     {
-        if (!$key) {
-            $labels[$countryCode] = $this->fileResolverService->getContent($countryCode);
-            $labels[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
-
-            return $labels;
-        }
-
         $languageBackup = $this->currentLanguage;
         $this->currentLanguage = $countryCode;
 
-        $label = $this->getLabelByCurrentLanguage($key);
+        $label = $this->fetchLabel($key, $fallbackCode);
 
         $this->currentLanguage = $languageBackup;
 
         return $label;
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getAllLabels($countryCode)
+    {
+        $labels[$countryCode] = $this->fileResolverService->getContent($countryCode);
+        $labels[static::DEFAULT_LANG] = $this->fileResolverService->getContent(static::DEFAULT_LANG);
+
+        return $labels;
+    }
+
+    /**
+     * @param $key
+     * @param $defaultLanguage
+     *
+     * @return string|null
+     */
+    protected function fetchLabel($key, $defaultLanguage)
+    {
+        $result = $this->getLabelByCurrentLanguage($key);
+
+        if ($result === null) {
+            $this->initializeLanguage($defaultLanguage);
+            $result = $this->getLabelByKeyAndLanguage($key, $defaultLanguage);
+        }
+
+        if ($result === null) {
+            $result = $key;
+        }
+
+        return $result;
+    }
+
     /**
      * Initializes the labels from a file to in-memory map.
      */
@@ -154,7 +164,7 @@ protected function initializeFallbackLanguage()
      *
      * @return string|null The label.
      */
-    protected function getLabel($key, $language)
+    protected function getLabelByKeyAndLanguage($key, $language)
     {
         return isset(static::$labels[$language][$key]) ? static::$labels[$language][$key] : null;
     }
@@ -172,6 +182,6 @@ protected function getLabelByCurrentLanguage($key)
             $this->initializeLabels();
         }
 
-        return $this->getLabel($key, $this->currentLanguage);
+        return $this->getLabelByKeyAndLanguage($key, $this->currentLanguage);
     }
 }
diff --git a/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
index 32c147a5..f92ab0ad 100644
--- a/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
+++ b/src/BusinessLogic/CountryLabels/Interfaces/CountryService.php
@@ -36,8 +36,18 @@ public function getText($key, array $arguments = array());
      *
      * @param string $countryCode
      * @param string $key
+     * @param string $fallbackCode
+     *
+     * @return string
+     */
+    public function getLabel($countryCode, $key, $fallbackCode = '');
+
+    /**
+     * Gets all labels for provided country code and default code.
+     *
+     * @param string $countryCode
      *
      * @return array
      */
-    public function getLabels($countryCode, $key = '');
+    public function getAllLabels($countryCode);
 }
diff --git a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
index 90a0fede..52b2dacf 100644
--- a/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
+++ b/src/BusinessLogic/OrderShipmentDetails/OrderShipmentDetailsService.php
@@ -281,6 +281,6 @@ protected function getDraftShipmentUrl($reference)
         /** @var CountryService $countryService */
         $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-        return $countryService->getLabels(strtolower($countryCode), 'orderListAndDetails.shipmentUrl') . $reference;
+        return $countryService->getLabel(strtolower($countryCode), 'orderListAndDetails.shipmentUrl') . $reference;
     }
 }
diff --git a/src/DemoUI/src/Views/ACME/index.php b/src/DemoUI/src/Views/ACME/index.php
index 2b5eb8e3..f5231e01 100644
--- a/src/DemoUI/src/Views/ACME/index.php
+++ b/src/DemoUI/src/Views/ACME/index.php
@@ -23,7 +23,7 @@ function getTranslations($language)
     /** @var CountryService $countryService */
     $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-    $labels = $countryService->getLabels($language);
+    $labels = $countryService->getAllLabels($language);
     $defaultLabels = json_encode($labels['en']);
     $currentLanguageLabels = json_encode($labels[$language]);
 
diff --git a/src/DemoUI/src/Views/PRO/index.php b/src/DemoUI/src/Views/PRO/index.php
index 2b5eb8e3..f5231e01 100644
--- a/src/DemoUI/src/Views/PRO/index.php
+++ b/src/DemoUI/src/Views/PRO/index.php
@@ -23,7 +23,7 @@ function getTranslations($language)
     /** @var CountryService $countryService */
     $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
-    $labels = $countryService->getLabels($language);
+    $labels = $countryService->getAllLabels($language);
     $defaultLabels = json_encode($labels['en']);
     $currentLanguageLabels = json_encode($labels[$language]);
 
diff --git a/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
index 8662f11f..80604aa4 100644
--- a/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
+++ b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
@@ -175,21 +175,21 @@ public function testTranslateToGermanNestedKeyWithPlaceholders()
     }
 
     /**
-     * Tests getLabels function without key with existing language.
+     * Tests getAllLabels.
      */
-    public function testGetLabels()
+    public function testGetAllLabels()
     {
-        $translations = $this->testCountryService->getLabels('fr');
+        $translations = $this->testCountryService->getAllLabels('fr');
 
         $this->assertEquals(static::$englishAndFrenchValues, $translations);
     }
 
     /**
-     * Tests getLabels function without key with non existing language.
+     * Tests getAllLabels with non existing language.
      */
     public function testGetLabelsWithNonExistingLanguage()
     {
-        $translations = $this->testCountryService->getLabels('rs');
+        $translations = $this->testCountryService->getAllLabels('rs');
 
         $this->assertEquals(static::$englishValues, $translations);
     }
@@ -199,7 +199,7 @@ public function testGetLabelsWithNonExistingLanguage()
      */
     public function testGetLabelsWithKey()
     {
-        $label = $this->testCountryService->getLabels('fr', 'testKey');
+        $label = $this->testCountryService->getLabel('fr', 'testKey');
 
         $this->assertEquals('testValueFr', $label);
     }
@@ -209,8 +209,15 @@ public function testGetLabelsWithKey()
      */
     public function testGetLabelsWithNonExistingKey()
     {
-        $label = $this->testCountryService->getLabels('fr', 'testKeyNonExisting');
+        $label = $this->testCountryService->getLabel('fr', 'testKeyNonExisting');
 
-        $this->assertEquals(null, $label);
+        $this->assertEquals('testKeyNonExisting', $label);
+    }
+
+    public function testGetLabelsWithFallbackCountry()
+    {
+        $label = $this->testCountryService->getLabel('en', 'namespace.nestedKeyWithPlaceholder', 'fr');
+
+        $this->assertEquals('Nested key fr.', $label);
     }
 }

From 28b7b55aaf4035da5487988349d3471306f6b323 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 20 Apr 2021 12:46:17 +0200
Subject: [PATCH 30/37] ScheduleCheckTask and ScheduleTickHandler refactored.

PLCR24-29
---
 .../Scheduler/ScheduleCheckTask.php           | 79 ++++++++++-----
 .../Scheduler/ScheduleTickHandler.php         | 99 ++++++++++++++-----
 2 files changed, 126 insertions(+), 52 deletions(-)

diff --git a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
index 9a7bbf0b..88dea075 100644
--- a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
+++ b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
@@ -56,42 +56,19 @@ public function toArray()
      */
     public function execute()
     {
-        /** @var QueueService $queueService */
-        $queueService = ServiceRegister::getService(QueueService::CLASS_NAME);
-
         /** @var Schedule $schedule */
         foreach ($this->getSchedules() as $schedule) {
-            $task = $schedule->getTask();
-            if (!$task) {
-                continue;
-            }
-
             try {
-                $latestTask = $queueService->findLatestByType($task->getType(), $schedule->getContext());
-                if ($latestTask
-                    && $schedule->isRecurring()
-                    && in_array($latestTask->getStatus(), array(QueueItem::QUEUED, QueueItem::IN_PROGRESS), true)
-                ) {
-                    // do not enqueue task if it is already scheduled for execution
-                    continue;
-                }
-
-                $queueService->enqueue($schedule->getQueueName(), $task, $schedule->getContext(), $task->getPriority());
-
-                if ($schedule->isRecurring()) {
-                    $schedule->setNextSchedule();
-                    $this->getRepository()->update($schedule);
-                } else {
-                    $this->getRepository()->delete($schedule);
-                }
+                $this->enqueueScheduledTask($schedule);
+                $this->updateSchedule($schedule);
             } catch (QueueStorageUnavailableException $ex) {
                 Logger::logDebug(
-                    'Failed to enqueue task ' . $task->getType(),
+                    'Failed to enqueue task ' . ($schedule->getTask() ? $schedule->getTask()->getType() : ''),
                     'Core',
                     array(
                         'ExceptionMessage' => $ex->getMessage(),
                         'ExceptionTrace' => $ex->getTraceAsString(),
-                        'TaskData' => Serializer::serialize($task),
+                        'TaskData' => Serializer::serialize($schedule->getTask()),
                     )
                 );
             }
@@ -100,6 +77,54 @@ public function execute()
         $this->reportProgress(100);
     }
 
+    /**
+     * Enqueues scheduled task.
+     *
+     * @param $schedule
+     *
+     * @throws QueueStorageUnavailableException
+     */
+    protected function enqueueScheduledTask($schedule)
+    {
+        /** @var QueueService $queueService */
+        $queueService = ServiceRegister::getService(QueueService::CLASS_NAME);
+
+        $task = $schedule->getTask();
+        if (!$task) {
+            return;
+        }
+
+        $latestTask = $queueService->findLatestByType($task->getType(), $schedule->getContext());
+        if ($latestTask
+            && $schedule->isRecurring()
+            && in_array($latestTask->getStatus(), array(QueueItem::QUEUED, QueueItem::IN_PROGRESS), true)
+        ) {
+            // do not enqueue task if it is already scheduled for execution
+            return;
+        }
+
+        $queueService->enqueue($schedule->getQueueName(), $task, $schedule->getContext(), $task->getPriority());
+    }
+
+    /**
+     * Checks if schedule is recurring.
+     * If it is - updates next schedule time,
+     * if it isn't - deletes schedule.
+     *
+     * @param $schedule
+     *
+     * @throws \Logeecom\Infrastructure\ORM\Exceptions\RepositoryNotRegisteredException
+     */
+    protected function updateSchedule($schedule)
+    {
+        if ($schedule->isRecurring()) {
+            $schedule->setNextSchedule();
+            $this->getRepository()->update($schedule);
+        } else {
+            $this->getRepository()->delete($schedule);
+        }
+    }
+
     /**
      * Returns current date and time
      *
diff --git a/src/BusinessLogic/Scheduler/ScheduleTickHandler.php b/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
index 72925f02..3c5b0dc4 100644
--- a/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
+++ b/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
@@ -17,42 +17,91 @@
  */
 class ScheduleTickHandler
 {
+    /**
+     * @var QueueService
+     */
+    private $queueService;
+    /**
+     * @var Configuration
+     */
+    private $configService;
+
     /**
      * Queues ScheduleCheckTask.
      */
     public function handle()
     {
-        /** @var QueueService $queueService */
-        $queueService = ServiceRegister::getService(QueueService::CLASS_NAME);
-        /** @var Configuration $configService */
-        $configService = ServiceRegister::getService(Configuration::CLASS_NAME);
-        $task = $queueService->findLatestByType('ScheduleCheckTask');
-        $threshold = $configService->getSchedulerTimeThreshold();
+        $task = $this->getQueueService()->findLatestByType('ScheduleCheckTask');
+        $threshold = $this->getConfigService()->getSchedulerTimeThreshold();
+
+        $this->createCheckTask($task, $threshold);
+    }
 
+    /**
+     * Checks if ScheduleCheckTask should be enqueued and
+     * if it should, enqueues it.
+     *
+     * @param $task
+     * @param $threshold
+     */
+    protected function createCheckTask($task, $threshold)
+    {
         if ($task && in_array($task->getStatus(), array(QueueItem::QUEUED, QueueItem::IN_PROGRESS), true)) {
             return;
         }
 
         if ($task === null || $task->getQueueTimestamp() + $threshold < time()) {
-            $task = new ScheduleCheckTask();
-            try {
-                $queueService->enqueue(
-                    $configService->getSchedulerQueueName(),
-                    $task,
-                    $configService->getContext(),
-                    $task->getPriority()
-                );
-            } catch (QueueStorageUnavailableException $ex) {
-                Logger::logDebug(
-                    'Failed to enqueue task ' . $task->getType(),
-                    'Core',
-                    array(
-                        'ExceptionMessage' => $ex->getMessage(),
-                        'ExceptionTrace' => $ex->getTraceAsString(),
-                        'TaskData' => Serializer::serialize($task),
-                    )
-                );
-            }
+            $this->enqueueCheckTask();
+        }
+    }
+
+    /**
+     * Enqueues ScheduleCheckTask.
+     */
+    protected function enqueueCheckTask()
+    {
+        $task = new ScheduleCheckTask();
+        try {
+            $this->getQueueService()->enqueue(
+                $this->getConfigService()->getSchedulerQueueName(),
+                $task,
+                $this->getConfigService()->getContext(),
+                $task->getPriority()
+            );
+        } catch (QueueStorageUnavailableException $ex) {
+            Logger::logDebug(
+                'Failed to enqueue task ' . $task->getType(),
+                'Core',
+                array(
+                    'ExceptionMessage' => $ex->getMessage(),
+                    'ExceptionTrace' => $ex->getTraceAsString(),
+                    'TaskData' => Serializer::serialize($task),
+                )
+            );
+        }
+    }
+
+    /**
+     * @return QueueService
+     */
+    protected function getQueueService()
+    {
+        if ($this->queueService === null) {
+            $this->queueService = ServiceRegister::getService(QueueService::CLASS_NAME);
         }
+
+        return $this->queueService;
+    }
+
+    /**
+     * @return Configuration
+     */
+    protected function getConfigService()
+    {
+        if ($this->configService === null) {
+            $this->configService = ServiceRegister::getService(Configuration::CLASS_NAME);
+        }
+
+        return $this->configService;
     }
 }

From e5d2308d7c2d76b2ffd847f3911499ece31ffc4c Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 20 Apr 2021 16:58:15 +0200
Subject: [PATCH 31/37] ScheduleTickHandler refactored.

PLCR24-29
---
 src/BusinessLogic/Scheduler/ScheduleTickHandler.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/BusinessLogic/Scheduler/ScheduleTickHandler.php b/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
index 3c5b0dc4..5f542c4d 100644
--- a/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
+++ b/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
@@ -60,7 +60,7 @@ protected function createCheckTask($task, $threshold)
      */
     protected function enqueueCheckTask()
     {
-        $task = new ScheduleCheckTask();
+        $task = $this->getScheduleCheckTask();
         try {
             $this->getQueueService()->enqueue(
                 $this->getConfigService()->getSchedulerQueueName(),
@@ -81,6 +81,16 @@ protected function enqueueCheckTask()
         }
     }
 
+    /**
+     * Gets ScheduleCheckTask.
+     *
+     * @return ScheduleCheckTask
+     */
+    protected function getScheduleCheckTask()
+    {
+        return new ScheduleCheckTask();
+    }
+
     /**
      * @return QueueService
      */

From a3c960ca688e75e15f82acafa857ab2a48e16a70 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Wed, 21 Apr 2021 11:01:33 +0200
Subject: [PATCH 32/37] Removed brand field from QueueItem

PLCR24-32
---
 .../TaskExecution/QueueItem.php               | 29 -------------------
 .../TaskExecution/QueueItemEntityTest.php     |  1 -
 2 files changed, 30 deletions(-)

diff --git a/src/Infrastructure/TaskExecution/QueueItem.php b/src/Infrastructure/TaskExecution/QueueItem.php
index 6f26f31f..8e0b4297 100644
--- a/src/Infrastructure/TaskExecution/QueueItem.php
+++ b/src/Infrastructure/TaskExecution/QueueItem.php
@@ -74,7 +74,6 @@ class QueueItem extends Entity
         'queueTime',
         'lastUpdateTime',
         'priority',
-        'brand',
     );
     /**
      * Queue item status.
@@ -178,12 +177,6 @@ class QueueItem extends Entity
      * @var int QueueItem execution priority.
      */
     protected $priority;
-    /**
-     * QueueItem brand.
-     *
-     * @var string
-     */
-    protected $brand;
     /**
      * Instance of time provider.
      *
@@ -704,26 +697,6 @@ public function setPriority($priority)
         $this->priority = $priority;
     }
 
-    /**
-     * Gets queue item brand.
-     *
-     * @return string
-     */
-    public function getBrand()
-    {
-        return $this->brand;
-    }
-
-    /**
-     * Sets queue item brand.
-     *
-     * @param string $brand
-     */
-    public function setBrand($brand)
-    {
-        $this->brand = $brand;
-    }
-
     /**
      * Reconfigures underlying task.
      *
@@ -778,7 +751,6 @@ public function toArray()
         $result['failTime'] = $this->timeProvider->serializeDate($this->failTime);
         $result['earliestStartTime'] = $this->timeProvider->serializeDate($this->earliestStartTime);
         $result['priority'] = $this->getPriority();
-        $result['brand'] = $this->getBrand();
 
         return $result;
     }
@@ -799,7 +771,6 @@ public function inflate(array $data)
         $this->finishTime = $this->timeProvider->deserializeDateString($data['finishTime']);
         $this->failTime = $this->timeProvider->deserializeDateString($data['failTime']);
         $this->earliestStartTime = $this->timeProvider->deserializeDateString($data['earliestStartTime']);
-        $this->brand = $data['brand'];
     }
 
     /**
diff --git a/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php b/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
index a174e4de..38e0677f 100644
--- a/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
+++ b/tests/Infrastructure/TaskExecution/QueueItemEntityTest.php
@@ -145,7 +145,6 @@ public function testFromArrayAndToJSON()
             'queueTime' => $queueTime->format(DATE_ATOM),
             'lastUpdateTime' => $lastUpdateTime->format(DATE_ATOM),
             'priority' => Priority::LOW,
-            'brand' => '',
         );
 
         $entity = QueueItem::fromArray($data);

From 64740a9055d7a72b7e55c6ef16e2db8245b865c6 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 27 Apr 2021 11:55:57 +0200
Subject: [PATCH 33/37] Core library unit tests are failing

PLCR24-47
---
 src/BusinessLogic/Scheduler/ScheduleCheckTask.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
index 88dea075..3f46c58b 100644
--- a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
+++ b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
@@ -60,7 +60,6 @@ public function execute()
         foreach ($this->getSchedules() as $schedule) {
             try {
                 $this->enqueueScheduledTask($schedule);
-                $this->updateSchedule($schedule);
             } catch (QueueStorageUnavailableException $ex) {
                 Logger::logDebug(
                     'Failed to enqueue task ' . ($schedule->getTask() ? $schedule->getTask()->getType() : ''),
@@ -83,6 +82,7 @@ public function execute()
      * @param $schedule
      *
      * @throws QueueStorageUnavailableException
+     * @throws \Logeecom\Infrastructure\ORM\Exceptions\RepositoryNotRegisteredException
      */
     protected function enqueueScheduledTask($schedule)
     {
@@ -104,6 +104,7 @@ protected function enqueueScheduledTask($schedule)
         }
 
         $queueService->enqueue($schedule->getQueueName(), $task, $schedule->getContext(), $task->getPriority());
+        $this->updateSchedule($schedule);
     }
 
     /**

From fef79369d21be5984dc504c20682f6a4f87634d3 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 27 Apr 2021 13:17:17 +0200
Subject: [PATCH 34/37] Wrong shipment label URL

PLCR24-50
---
 src/Brands/Packlink/Resources/countries/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Brands/Packlink/Resources/countries/en.json b/src/Brands/Packlink/Resources/countries/en.json
index d27043f7..260db8b5 100644
--- a/src/Brands/Packlink/Resources/countries/en.json
+++ b/src/Brands/Packlink/Resources/countries/en.json
@@ -44,7 +44,7 @@
     "createOrderDraft": "Create order draft in Packlink PRO",
     "packlinkShipping": "Packlink Shipping",
     "sendWithPacklink": "Send with Packlink",
-    "shipmentUrl": "https://pro.packlink.en/private/shipments/"
+    "shipmentUrl": "https://pro.packlink.com/private/shipments/"
   },
   "systemLogMessages": {
     "webhookReceived": "Webhook from Packlink received."

From b6c25f4f043226f26b977ed8ac3ece370f3dd9e3 Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Tue, 27 Apr 2021 14:20:54 +0200
Subject: [PATCH 35/37] Registration links are invalid

PLCR24-51
---
 src/BusinessLogic/Controllers/RegistrationController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BusinessLogic/Controllers/RegistrationController.php b/src/BusinessLogic/Controllers/RegistrationController.php
index 96f1da32..b4226a49 100644
--- a/src/BusinessLogic/Controllers/RegistrationController.php
+++ b/src/BusinessLogic/Controllers/RegistrationController.php
@@ -17,7 +17,7 @@ class RegistrationController
     /**
      * string
      */
-    const DEFAULT_COUNTRY = 'ES';
+    const DEFAULT_COUNTRY = 'es';
     /**
      * @var Configuration
      */

From d5c099f487630b9628541fa50fae86a8aeb13e0a Mon Sep 17 00:00:00 2001
From: marija <marija.ivic@logeecom.com>
Date: Wed, 28 Apr 2021 14:54:37 +0200
Subject: [PATCH 36/37] Privacy links are wrong

PLCR24-57
---
 src/Brands/Packlink/Resources/countries/de.json | 2 +-
 src/Brands/Packlink/Resources/countries/es.json | 2 +-
 src/Brands/Packlink/Resources/countries/fr.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Brands/Packlink/Resources/countries/de.json b/src/Brands/Packlink/Resources/countries/de.json
index 7c90e80e..c019d902 100644
--- a/src/Brands/Packlink/Resources/countries/de.json
+++ b/src/Brands/Packlink/Resources/countries/de.json
@@ -14,7 +14,7 @@
     "startEnjoying": "Genießen Sie ab jetzt Packlink PRO!",
     "termsAndConditions": "<pre>Ich akzeptiere die <a href=\"%s\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"%s\" target=\"_blank\">Datenschutzerklärung</a> von Packlink</pre>",
     "termsAndConditionsUrl": "https://pro.packlink.de/agb/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerkl%%C3%%A4rung-der-Packlink-Shipping-S-L-",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/de/articles/360010011560-Datenschutzerklarung-der-Packlink-Shipping-S-L-",
     "marketingEmails": "Ich ermächtige Packlink Shipping S.L., mir kommerzielle Mitteilungen per E-Mail zuzusenden"
   },
   "configuration": {
diff --git a/src/Brands/Packlink/Resources/countries/es.json b/src/Brands/Packlink/Resources/countries/es.json
index 59908297..8b7494d3 100644
--- a/src/Brands/Packlink/Resources/countries/es.json
+++ b/src/Brands/Packlink/Resources/countries/es.json
@@ -14,7 +14,7 @@
     "startEnjoying": "¡Empieza a disfrutar de Packlink PRO!",
     "termsAndConditions": "<pre>Acepto los <a href=\"%s\" target=\"_blank\">Términos y condiciones</a> y la <a href=\"%s\" target=\"_blank\">Política de privacidad</a> de Packlink</pre>",
     "termsAndConditionsUrl": "https://pro.packlink.es/terminos-y-condiciones/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Pol%%C3%%ADtica-de-Privacidad",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/es-es/articles/360010011560-Poitica-de-Privacidad",
     "marketingEmails": "Autorizo a Packlink Shipping S.L. a enviarme información comercial por correo electrónico"
   },
   "configuration": {
diff --git a/src/Brands/Packlink/Resources/countries/fr.json b/src/Brands/Packlink/Resources/countries/fr.json
index afe7b187..b7d264c2 100644
--- a/src/Brands/Packlink/Resources/countries/fr.json
+++ b/src/Brands/Packlink/Resources/countries/fr.json
@@ -14,7 +14,7 @@
     "startEnjoying": "Commencez à utiliser Packlink PRO !",
     "termsAndConditions": "<pre>IJ’accepte les <a href=\"%s\" target=\"_blank\">Conditions de service</a> et la <a href=\"%s\" target=\"_blank\">Politique de confidentialité</a> de Packlink</pre>",
     "termsAndConditionsUrl": "https://pro.packlink.fr/conditions-generales/",
-    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialit%%C3%%A9",
+    "privacyPolicyUrl": "https://support-pro.packlink.com/hc/fr-fr/articles/360010011560-Politique-de-confidentialite",
     "marketingEmails": "J’autorise Packlink Shipping S.L. à m’envoyer des communications commerciales par courriel"
   },
   "configuration": {

From 370feeeebd6a0ab9e4005c2797b1ac4fba6a9f83 Mon Sep 17 00:00:00 2001
From: Goran Stamenkovski <goran.stamenkovski@logeecom.com>
Date: Thu, 29 Apr 2021 12:44:36 +0200
Subject: [PATCH 37/37] Release version 3.2.0

ISSUE PLCR24-46
---
 CHANGELOG.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b76dd3ef..ce0e8497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,14 +3,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
-## [3.1.1](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.1.0...v3.1.1) - 2021-03-26
-### Added
-- Added additional ISO codes to the postal code transformer.
-- Added missing carrier logos for Italy and Spain.
-
-### Changed
-- Changed setting the language based on user's platform country instead of current shop language during the registration process.
-
+## [3.2.0](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.1.1...v3.2.0) - 2021-04-29
 **BREAKING CHANGES**
 Whitelabel project changes:
 
@@ -39,6 +32,14 @@ Following changes will work properly once BrandConfigurationService is registere
 - Removed $supportedCountries from CountryService and WarehouseCountryService.
 - Packlink\BusinessLogic\Language\TranslationService renamed to CountryService and moved to CountryLabels directory.
 
+## [3.1.1](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.1.0...v3.1.1) - 2021-03-26
+### Added
+- Added additional ISO codes to the postal code transformer.
+- Added missing carrier logos for Italy and Spain.
+
+### Changed
+- Changed setting the language based on user's platform country instead of current shop language during the registration process.
+
 ## [3.1.0](https://github.com/packlink-dev/ecommerce_module_core/compare/v3.0.6...v3.1.0) - 2020-12-11
 ### Added
 - Added postal code transformer service that transforms postal code into supported postal code format for some countries.