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.
*
diff --git a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
index 9a7bbf0b..3f46c58b 100644
--- a/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
+++ b/src/BusinessLogic/Scheduler/ScheduleCheckTask.php
@@ -56,42 +56,18 @@ 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);
} 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 +76,56 @@ public function execute()
$this->reportProgress(100);
}
+ /**
+ * Enqueues scheduled task.
+ *
+ * @param $schedule
+ *
+ * @throws QueueStorageUnavailableException
+ * @throws \Logeecom\Infrastructure\ORM\Exceptions\RepositoryNotRegisteredException
+ */
+ 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());
+ $this->updateSchedule($schedule);
+ }
+
+ /**
+ * 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..5f542c4d 100644
--- a/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
+++ b/src/BusinessLogic/Scheduler/ScheduleTickHandler.php
@@ -17,42 +17,101 @@
*/
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 = $this->getScheduleCheckTask();
+ 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),
+ )
+ );
+ }
+ }
+
+ /**
+ * Gets ScheduleCheckTask.
+ *
+ * @return ScheduleCheckTask
+ */
+ protected function getScheduleCheckTask()
+ {
+ return new ScheduleCheckTask();
+ }
+
+ /**
+ * @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;
+ }
}
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/src/BusinessLogic/Utility/UrlService.php b/src/BusinessLogic/Utility/UrlService.php
index f5a19214..1d990ddd 100644
--- a/src/BusinessLogic/Utility/UrlService.php
+++ b/src/BusinessLogic/Utility/UrlService.php
@@ -24,11 +24,11 @@ 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)) {
+ 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/src/DemoUI/.gitignore b/src/DemoUI/.gitignore
index 92a15be4..840e4a6e 100644
--- a/src/DemoUI/.gitignore
+++ b/src/DemoUI/.gitignore
@@ -1,6 +1,10 @@
# 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/*
+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/Lib/Composer.php b/src/DemoUI/Lib/Composer.php
index e93b10c3..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/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);
}
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/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 @@
+initInstanceServices();
+ static::$instance->initBrandDependentServices();
}
/**
@@ -197,4 +203,61 @@ function () use ($instance) {
}
);
}
+
+ protected function initBrandDependentServices()
+ {
+ $brandPlatformCode = getenv('PL_PLATFORM');
+
+ switch ($brandPlatformCode) {
+ case 'PRO':
+ ServiceRegister::registerService(
+ BrandConfigurationService::CLASS_NAME,
+ 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(
+ BrandConfigurationService::CLASS_NAME,
+ 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\CountryLabels\CountryService($fileResolverService);
+ }
+ );
+ }
}
\ 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 @@
+ 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/Brands/Acme/Resources/countries/at.json b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
new file mode 100644
index 00000000..92f82b0c
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/at.json
@@ -0,0 +1,6 @@
+{
+ "register": {
+ "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
new file mode 100644
index 00000000..92f82b0c
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/be.json
@@ -0,0 +1,6 @@
+{
+ "register": {
+ "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
new file mode 100644
index 00000000..304e1c8f
--- /dev/null
+++ b/src/DemoUI/src/Brands/Acme/Resources/countries/de.json
@@ -0,0 +1,57 @@
+{
+ "general": {
+ "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.",
+ "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 ACME",
+ "connectYourService": "Verbinden Sie Ihren Dienst, indem Sie Ihren API-Schlüssel verwenden. Sie finden ihn unter
„ACME API-Schlüssel“ bei den „Einstellungen“." + }, + "register": { + "startEnjoying": "Genießen Sie ab jetzt ACME!", + "termsAndConditions": "
Sie können die Informationen jederzeit bearbeiten.", + "acmeShipmentStatus": "VERSANDSTATUS von ACME" + }, + "shippingServices": { + "acmePrices": "ACME-Preise", + "pricePolicyDescription": "Standardmäßig werden die ACME Basispreise 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": { + "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 ACME erhalten" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..4212afa0 --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME", + "connectYourService": "Connect your service using your key. You'll find it in the
\"ACME API Key\" section of the \"Settings\"." + }, + "register": { + "startEnjoying": "Start enjoying ACME!", + "termsAndConditions": "
You can edit it at any time.", + "acmeShipmentStatus": "ACME SHIPMENT STATUS" + }, + "shippingServices": { + "acmePrices": "ACME prices", + "pricePolicyDescription": "The default will be ACME's basic prices. 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": { + "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 ACME received." + }, + "autoTest": { + "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 new file mode 100644 index 00000000..251b9f0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 Acme", + "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la
sección \"Configuración\" apartado \"Acme API Key\"" + }, + "register": { + "startEnjoying": "¡Empieza a disfrutar de Acme!", + "termsAndConditions": "
Puedes editarla en cualquier momento.", + "acmeShipmentStatus": "ESTADO DEL ENVÍO de Acme" + }, + "shippingServices": { + "acmePrices": "Precios de Acme", + "pricePolicyDescription": "Por defecto serán los precios base de Acme. 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": { + "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 Acme recibido" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..75a49f7d --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME ", + "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section
« Clé API ACME » dans « Paramètres »." + }, + "register": { + "startEnjoying": "Commencez à utiliser ACME!", + "termsAndConditions": "
Vous pourrez les modifier à tout moment.", + "acmeShipmentStatus": "STATUT DE LIVRAISON ACME " + }, + "shippingServices": { + "acmePrices": "Prix ACME", + "pricePolicyDescription": "Les tarifs de base de ACME seront configurés par défaut, 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": { + "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 ACME reçu" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..69d81b8a --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME ", + "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione
\"Chiave API ACME \" delle \"Impostazioni\"." + }, + "register": { + "startEnjoying": "Inizia a usufruire di ACME !", + "termsAndConditions": "
Puoi modificarlo ogni volta che vuoi.", + "acmeShipmentStatus": "STATO DELLA SPEDIZIONE di ACME " + }, + "shippingServices": { + "acmePrices": "Prezzi di ACME", + "pricePolicyDescription": "Per impostazione predefinita, saranno i prezzi di base di ACME, 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": { + "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 ACME ricevuto" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json @@ -0,0 +1,6 @@ +{ + "register": { + "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/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/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/ACME/index.php similarity index 94% rename from src/DemoUI/src/Views/index.php rename to src/DemoUI/src/Views/ACME/index.php index 46c6dbbb..f5231e01 100644 --- a/src/DemoUI/src/Views/index.php +++ b/src/DemoUI/src/Views/ACME/index.php @@ -1,18 +1,35 @@ getAllLabels($language); + $defaultLabels = json_encode($labels['en']); + $currentLanguageLabels = json_encode($labels[$language]); + + echo 'default: ' . $defaultLabels . ', current: ' . $currentLanguageLabels; +} + ?> "> + + +Demo UI
+
+
+
+
+
+
+
+
+
+
„ACME API-Schlüssel“ bei den „Einstellungen“." + }, + "register": { + "startEnjoying": "Genießen Sie ab jetzt ACME!", + "termsAndConditions": "
Ich akzeptiere die Nutzungsbedingungen und die Datenschutzerklärung von ACME", + "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://en.wikipedia.org/wiki/Acme_Corporation", + "contactUrl": "business@packlink.com", + "contactUrlMail": "mailto::business@packlink.com" + }, + "orderStatusMapping": { + "description": "Mit ACME können Sie Ihren %s Bestellstatus mit Versandinformationen aktualisieren.
Sie können die Informationen jederzeit bearbeiten.", + "acmeShipmentStatus": "VERSANDSTATUS von ACME" + }, + "shippingServices": { + "acmePrices": "ACME-Preise", + "pricePolicyDescription": "Standardmäßig werden die ACME Basispreise 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": { + "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 ACME erhalten" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..4212afa0 --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/en.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME", + "connectYourService": "Connect your service using your key. You'll find it in the
\"ACME API Key\" section of the \"Settings\"." + }, + "register": { + "startEnjoying": "Start enjoying ACME!", + "termsAndConditions": "
I accept the Terms of Service and the Privacy Policy of ACME", + "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://en.wikipedia.org/wiki/Acme_Corporation", + "contactUrl": "business@packlink.com", + "contactUrlMail": "mailto::business@packlink.com" + }, + "orderStatusMapping": { + "description": "With ACME you can update your %s order status with shipping information.
You can edit it at any time.", + "acmeShipmentStatus": "ACME SHIPMENT STATUS" + }, + "shippingServices": { + "acmePrices": "ACME prices", + "pricePolicyDescription": "The default will be ACME's basic prices. 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": { + "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 ACME received." + }, + "autoTest": { + "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 new file mode 100644 index 00000000..251b9f0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/es.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 Acme", + "connectYourService": "Conecta tu servicio mediante tu clave. La encontrarás en la
sección \"Configuración\" apartado \"Acme API Key\"" + }, + "register": { + "startEnjoying": "¡Empieza a disfrutar de Acme!", + "termsAndConditions": "
Acepto los Términos y condiciones y la Política de privacidad de Acme", + "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://en.wikipedia.org/wiki/Acme_Corporation", + "contactUrl": "business@packlink.com", + "contactUrlMail": "mailto::business@packlink.com" + }, + "orderStatusMapping": { + "description": "Con Acme puedes actualizar el estado de tu pedido de %s con la información de envío.
Puedes editarla en cualquier momento.", + "acmeShipmentStatus": "ESTADO DEL ENVÍO de Acme" + }, + "shippingServices": { + "acmePrices": "Precios de Acme", + "pricePolicyDescription": "Por defecto serán los precios base de Acme. 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": { + "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 Acme recibido" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..75a49f7d --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/fr.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME ", + "connectYourService": "Connectez votre service en utilisant votre clé. Vous la trouverez dans la section
« Clé API ACME » dans « Paramètres »." + }, + "register": { + "startEnjoying": "Commencez à utiliser ACME!", + "termsAndConditions": "
IJ’accepte les Conditions de service et la Politique de confidentialité de ACME", + "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://en.wikipedia.org/wiki/Acme_Corporation", + "contactUrl": "business@packlink.com", + "contactUrlMail": "mailto::business@packlink.com" + }, + "orderStatusMapping": { + "description": "Avec ACME, vous pouvez mettre à jour le statut de votre commande %s avec les informations d’expédition.
Vous pourrez les modifier à tout moment.", + "acmeShipmentStatus": "STATUT DE LIVRAISON ACME " + }, + "shippingServices": { + "acmePrices": "Prix ACME", + "pricePolicyDescription": "Les tarifs de base de ACME seront configurés par défaut, 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": { + "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 ACME reçu" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/gb.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/hu.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/ie.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..69d81b8a --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/it.json @@ -0,0 +1,57 @@ +{ + "general": { + "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.", + "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 ACME ", + "connectYourService": "Usa la chiave per collegare il tuo servizio. La troverai nella sezione
\"Chiave API ACME \" delle \"Impostazioni\"." + }, + "register": { + "startEnjoying": "Inizia a usufruire di ACME !", + "termsAndConditions": "
Accetto i Termini del servizio e l’Informativa sulla privacy di ACME", + "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://en.wikipedia.org/wiki/Acme_Corporation", + "contactUrl": "business@packlink.com", + "contactUrlMail": "mailto::business@packlink.com" + }, + "orderStatusMapping": { + "description": "Con ACME, puoi aggiornare lo stato dell’ordine %s con i dati della spedizione.
Puoi modificarlo ogni volta che vuoi.", + "acmeShipmentStatus": "STATO DELLA SPEDIZIONE di ACME " + }, + "shippingServices": { + "acmePrices": "Prezzi di ACME", + "pricePolicyDescription": "Per impostazione predefinita, saranno i prezzi di base di ACME, 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": { + "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 ACME ricevuto" + }, + "autoTest": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/nl.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/pt.json @@ -0,0 +1,6 @@ +{ + "register": { + "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 new file mode 100644 index 00000000..92f82b0c --- /dev/null +++ b/src/DemoUI/src/Brands/Acme/Resources/countries/tr.json @@ -0,0 +1,6 @@ +{ + "register": { + "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/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/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/ACME/index.php similarity index 94% rename from src/DemoUI/src/Views/index.php rename to src/DemoUI/src/Views/ACME/index.php index 46c6dbbb..f5231e01 100644 --- a/src/DemoUI/src/Views/index.php +++ b/src/DemoUI/src/Views/ACME/index.php @@ -1,18 +1,35 @@ getAllLabels($language); + $defaultLabels = json_encode($labels['en']); + $currentLanguageLabels = json_encode($labels[$language]); + + echo 'default: ' . $defaultLabels . ', current: ' . $currentLanguageLabels; +} + ?> "> + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/DemoUI/src/Views/PRO/resources/.gitkeep b/src/DemoUI/src/Views/PRO/resources/.gitkeep
new file mode 100644
index 00000000..e69de29b
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/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/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 @@
+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
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/Common/BaseTestWithServices.php b/tests/BusinessLogic/Common/BaseTestWithServices.php
index e469e3da..d2acc212 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;
@@ -17,14 +18,16 @@
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;
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\CountryLabels\CountryService as CountryLabelService;
use Packlink\BusinessLogic\Warehouse\Warehouse;
use Packlink\BusinessLogic\Warehouse\WarehouseService;
@@ -115,9 +118,30 @@ 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\CountryLabels\Interfaces\CountryService::CLASS_NAME,
+ function () {
+ $fileResolverService = ServiceRegister::getService(FileResolverService::CLASS_NAME);
+
+ /** @noinspection PhpParamsInspection */
+ return new CountryLabelService($fileResolverService);
+ }
+ );
+
+ TestServiceRegister::registerService(
+ BrandConfigurationService::CLASS_NAME,
+ function () {
+ return new PacklinkConfigurationService();
}
);
@@ -127,7 +151,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 @@
-name = 'Cuba';
- $this->code = 'CU';
- $this->postalCode = '10400';
- $this->registrationLink = 'https://pro.packlink.com/register';
- $this->platformCountry = 'UN';
- }
-}
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']);
}
}
diff --git a/tests/BusinessLogic/Country/CountryServiceTest.php b/tests/BusinessLogic/Country/CountryServiceTest.php
index 66414f23..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);
@@ -26,9 +28,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 @@
- 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);
- }
-}
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);
diff --git a/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
new file mode 100644
index 00000000..80604aa4
--- /dev/null
+++ b/tests/BusinessLogic/CountryLabels/CountryLabelsServiceTest.php
@@ -0,0 +1,223 @@
+ 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 $testCountryService;
+
+ /**
+ * Sets up the fixture, for example, open a network connection.
+ * This method is called before a test is executed.
+ */
+ public function setUp()
+ {
+ parent::setUp();
+
+ $fileResolverService = new FileResolverService(
+ array(
+ __DIR__ . '/Labels',
+ __DIR__ . '/../FileResolver/Translations',
+ )
+ );
+
+ $this->testCountryService = new TestCountryService($fileResolverService);
+
+ $configuration = new TestShopConfiguration();
+ Configuration::setUICountryCode('de');
+
+ new TestServiceRegister(
+ array(
+ Configuration::CLASS_NAME => function () use ($configuration) {
+ return $configuration;
+ }
+ )
+ );
+ }
+
+ /**
+ * Tests getText function when current language is not set in config service.
+ */
+ public function testTranslateCurrentLanguageNotSet()
+ {
+ $configuration = new TestShopConfiguration();
+ Configuration::setUICountryCode(null);
+ $logger = new TestShopLogger();
+ $timeProvider = new TestTimeProvider();
+
+ new TestServiceRegister(
+ array(
+ Configuration::CLASS_NAME => function () use ($configuration) {
+ return $configuration;
+ },
+ TimeProvider::CLASS_NAME => function () use ($timeProvider) {
+ return $timeProvider;
+ },
+ ShopLoggerAdapter::CLASS_NAME => function () use ($logger) {
+ return $logger;
+ }
+ )
+ );
+
+ $translation = $this->testCountryService->getText('testKey');
+
+ $this->assertStringStartsWith('testValueEn', $translation);
+ }
+
+ /**
+ * Tests getText function when non existing key is tried to be translated for not supported language.
+ */
+ public function testTranslateNotSupportedLanguage()
+ {
+ $configuration = new TestShopConfiguration();
+ Configuration::setUICountryCode('rs');
+ $logger = new TestShopLogger();
+ $timeProvider = new TestTimeProvider();
+
+ new TestServiceRegister(
+ array(
+ Configuration::CLASS_NAME => function () use ($configuration) {
+ return $configuration;
+ },
+ TimeProvider::CLASS_NAME => function () use ($timeProvider) {
+ return $timeProvider;
+ },
+ ShopLoggerAdapter::CLASS_NAME => function () use ($logger) {
+ return $logger;
+ }
+ )
+ );
+
+ $translation = $this->testCountryService->getText('testKey');
+
+ $this->assertStringStartsWith('testValueEn', $translation);
+ }
+
+ /**
+ * Tests getText function when non existing key is tried to be translated.
+ */
+ public function testTranslateNonExistingKey()
+ {
+ $nonExistingKey = 'noKey';
+ $translation = $this->testCountryService->getText($nonExistingKey);
+
+ $this->assertEquals($nonExistingKey, $translation);
+ }
+
+ /**
+ * 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->testCountryService->getText($key);
+
+ $this->assertEquals('testValueEn1', $translation);
+ }
+
+ /**
+ * Tests getText function when non existing key is tried to be translated.
+ */
+ public function testTranslateToGerman()
+ {
+ $key = 'testKey';
+ $translation = $this->testCountryService->getText($key);
+
+ $this->assertEquals('testValueDe', $translation);
+ }
+
+ /**
+ * Tests getText function with existing nested key with placeholders.
+ */
+ public function testTranslateToGermanNestedKeyWithPlaceholders()
+ {
+ $key = 'namespace.nestedKeyWithPlaceholder';
+ $translation = $this->testCountryService->getText($key, array(1, 2));
+
+ $this->assertEquals('Test1 1, test2 2.', $translation);
+ }
+
+ /**
+ * Tests getAllLabels.
+ */
+ public function testGetAllLabels()
+ {
+ $translations = $this->testCountryService->getAllLabels('fr');
+
+ $this->assertEquals(static::$englishAndFrenchValues, $translations);
+ }
+
+ /**
+ * Tests getAllLabels with non existing language.
+ */
+ public function testGetLabelsWithNonExistingLanguage()
+ {
+ $translations = $this->testCountryService->getAllLabels('rs');
+
+ $this->assertEquals(static::$englishValues, $translations);
+ }
+
+ /**
+ * Tests getLabels function with existing key with existing language.
+ */
+ public function testGetLabelsWithKey()
+ {
+ $label = $this->testCountryService->getLabel('fr', 'testKey');
+
+ $this->assertEquals('testValueFr', $label);
+ }
+
+ /**
+ * Tests getLabels function with non exiting key.
+ */
+ public function testGetLabelsWithNonExistingKey()
+ {
+ $label = $this->testCountryService->getLabel('fr', 'testKeyNonExisting');
+
+ $this->assertEquals('testKeyNonExisting', $label);
+ }
+
+ public function testGetLabelsWithFallbackCountry()
+ {
+ $label = $this->testCountryService->getLabel('en', 'namespace.nestedKeyWithPlaceholder', 'fr');
+
+ $this->assertEquals('Nested key fr.', $label);
+ }
+}
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/CountryLabels/TestCountryService.php b/tests/BusinessLogic/CountryLabels/TestCountryService.php
new file mode 100644
index 00000000..1541cc3a
--- /dev/null
+++ b/tests/BusinessLogic/CountryLabels/TestCountryService.php
@@ -0,0 +1,21 @@
+ '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__ . '/../CountryLabels/Labels',
+ __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__ . '/../CountryLabels/Labels',
+ __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
diff --git a/tests/BusinessLogic/Language/TestTranslationService.php b/tests/BusinessLogic/Language/TestTranslationService.php
deleted file mode 100644
index ad26bc6a..00000000
--- a/tests/BusinessLogic/Language/TestTranslationService.php
+++ /dev/null
@@ -1,21 +0,0 @@
-translationService = new TestTranslationService($baseFilePath);
-
- $configuration = new TestShopConfiguration();
- Configuration::setCurrentLanguage('de');
-
- new TestServiceRegister(
- array(
- Configuration::CLASS_NAME => function () use ($configuration) {
- return $configuration;
- }
- )
- );
- }
-
- /**
- * Tests translation function when current language is not set in config service.
- */
- public function testTranslateCurrentLanguageNotSet()
- {
- $configuration = new TestShopConfiguration();
- Configuration::setCurrentLanguage(null);
- $logger = new TestShopLogger();
- $timeProvider = new TestTimeProvider();
-
- new TestServiceRegister(
- array(
- Configuration::CLASS_NAME => function () use ($configuration) {
- return $configuration;
- },
- TimeProvider::CLASS_NAME => function () use ($timeProvider) {
- return $timeProvider;
- },
- ShopLoggerAdapter::CLASS_NAME => function () use ($logger) {
- return $logger;
- }
- )
- );
-
- $translation = $this->translationService->translate('testKey');
-
- $this->assertStringStartsWith('testValueEn', $translation);
- }
-
- /**
- * Tests translation function when non existing key is tried to be translated for not supported language.
- */
- public function testTranslateNotSupportedLanguage()
- {
- $configuration = new TestShopConfiguration();
- Configuration::setCurrentLanguage('rs');
- $logger = new TestShopLogger();
- $timeProvider = new TestTimeProvider();
-
- new TestServiceRegister(
- array(
- Configuration::CLASS_NAME => function () use ($configuration) {
- return $configuration;
- },
- TimeProvider::CLASS_NAME => function () use ($timeProvider) {
- return $timeProvider;
- },
- ShopLoggerAdapter::CLASS_NAME => function () use ($logger) {
- return $logger;
- }
- )
- );
-
- $translation = $this->translationService->translate('testKey');
-
- $this->assertStringStartsWith('testValueEn', $translation);
- }
-
- /**
- * Tests translation function when non existing key is tried to be translated.
- */
- public function testTranslateNonExistingKey()
- {
- $nonExistingKey = 'noKey';
- $translation = $this->translationService->translate($nonExistingKey);
-
- $this->assertEquals($nonExistingKey, $translation);
- }
-
- /**
- * Tests translation 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);
-
- $this->assertEquals('testValueEn1', $translation);
- }
-
- /**
- * Tests translation function when non existing key is tried to be translated.
- */
- public function testTranslateToGerman()
- {
- $key = 'testKey';
- $translation = $this->translationService->translate($key);
-
- $this->assertEquals('testValueDe', $translation);
- }
-
- /**
- * Tests translation function with existing nested key with placeholders.
- */
- public function testTranslateToGermanNestedKeyWithPlaceholders()
- {
- $key = 'namespace.nestedKeyWithPlaceholder';
- $translation = $this->translationService->translate($key, array(1, 2));
-
- $this->assertEquals('Test1 1, test2 2.', $translation);
- }
-}
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(
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') : ''
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+