Revert deletion of a function

packlink-dev · Apr 8, 2020 · 74f7d0f · 74f7d0f
1 parent d668fe0
commit 74f7d0f
Show file tree

Hide file tree

Showing 10 changed files with 83 additions and 97 deletions.
diff --git a/Packlink/Controllers/Backend/PacklinkConfiguration.php b/Packlink/Controllers/Backend/PacklinkConfiguration.php
@@ -1,11 +1,12 @@
 <?php
 
+use Logeecom\Infrastructure\ServiceRegister;
+use Packlink\BusinessLogic\Country\CountryService;
 use Packlink\Controllers\Common\CanInstantiateServices;
 
 class Shopware_Controllers_Backend_PacklinkConfiguration extends Enlight_Controller_Action
 {
     use CanInstantiateServices;
-
     /**
      * List of help URLs for different country codes.
      *
@@ -39,9 +40,11 @@ class Shopware_Controllers_Backend_PacklinkConfiguration extends Enlight_Control
     public function indexAction()
     {
         $userInfo = $this->getConfigService()->getUserInfo();
+        /** @var \Packlink\BusinessLogic\Country\CountryService $countryService */
+        $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
 
         $urlKey = 'EN';
-        if ($userInfo && in_array($userInfo->country, ['ES', 'DE', 'FR', 'IT'], true)) {
+        if ($userInfo && $countryService->isBaseCountry($userInfo->country)) {
             $urlKey = $userInfo->country;
         }
 

diff --git a/Packlink/Controllers/Backend/PacklinkDraftDetailsController.php b/Packlink/Controllers/Backend/PacklinkDraftDetailsController.php
@@ -32,7 +32,6 @@ public function indexAction()
             Response::json([], 400);
         }
 
-        /** @noinspection PhpUndefinedVariableInspection */
         $details = [
             'orderCost' => $order->getInvoiceShipping(),
             'cost' => $orderDetails->getShippingCost(),
@@ -53,10 +52,8 @@ public function indexAction()
             $details['trackingUrl'] = $orderDetails->getCarrierTrackingUrl();
         }
 
-        $country = $this->getUserCountry();
-
         if ($details['reference']) {
-            $details['referenceUrl'] = Reference::getUrl($country, $details['reference']);
+            $details['referenceUrl'] = $orderDetails->getShipmentUrl();
         }
 
         try {
@@ -75,7 +72,6 @@ public function indexAction()
             Logger::logWarning("Failed to retrieve dispatch because: {$e->getMessage()}");
         }
 
-        /** @noinspection PhpUndefinedVariableInspection */
         Response::json($details);
     }
 

diff --git a/Packlink/Migrations/Scripts/migration.v.0.9.0.php b/Packlink/Migrations/Scripts/migration.v.0.9.0.php
@@ -5,8 +5,10 @@
 use Logeecom\Infrastructure\ORM\Exceptions\RepositoryNotRegisteredException;
 use Logeecom\Infrastructure\ORM\RepositoryRegistry;
 use Logeecom\Infrastructure\ServiceRegister;
+use Logeecom\Infrastructure\TaskExecution\Exceptions\QueueStorageUnavailableException;
 use Logeecom\Infrastructure\TaskExecution\QueueItem;
 use Logeecom\Infrastructure\TaskExecution\QueueService;
+use Packlink\BusinessLogic\Country\CountryService;
 use Packlink\BusinessLogic\OrderShipmentDetails\Models\OrderShipmentDetails;
 use Packlink\BusinessLogic\Scheduler\Models\HourlySchedule;
 use Packlink\BusinessLogic\Scheduler\Models\Schedule;
@@ -51,6 +53,17 @@
         $orderShipmentDetailsRepository = RepositoryRegistry::getRepository(OrderShipmentDetails::getClassName());
         $orderSendDraftRepository = RepositoryRegistry::getRepository(OrderSendDraftTaskMap::getClassName());
 
+        /** @var CountryService $countryService */
+        $countryService = ServiceRegister::getService(CountryService::CLASS_NAME);
+
+        $userInfo = $configuration->getUserInfo();
+        $userDomain = 'com';
+        if ($userInfo && $countryService->isBaseCountry($userInfo->country)) {
+            $userDomain = strtolower($userInfo->country);
+        }
+
+        $baseShipmentUrl = "https://pro.packlink.$userDomain/private/shipments/";
+
         /** @var BaseEntity $entity */
         foreach ($entities as $entity) {
             $orderShipmentData = json_decode($entity->getData(), true);
@@ -63,6 +76,7 @@
             unset($orderShipmentData['taskId']);
             $orderShipmentDetails = OrderShipmentDetails::fromArray($orderShipmentData);
             $orderShipmentDetails->setOrderId((string)$orderShipmentData['orderId']);
+            $orderShipmentDetails->setShipmentUrl($baseShipmentUrl . $orderShipmentDetails->getReference());
             $orderShipmentDetailsRepository->update($orderShipmentDetails);
         }
     }
@@ -73,7 +87,7 @@
 
     Logger::logInfo('Migration successful');
 } catch (RepositoryNotRegisteredException $e) {
-} catch (\Logeecom\Infrastructure\TaskExecution\Exceptions\QueueStorageUnavailableException $e) {
+} catch (QueueStorageUnavailableException $e) {
     Logger::logError("V0.9.0 update script failed because: {$e->getMessage()}");
 
     return false;

diff --git a/Packlink/Resources/views/backend/_resources/css/location/locationPicker.css b/Packlink/Resources/views/backend/_resources/css/location/locationPicker.css
@@ -142,6 +142,7 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    text-indent: 0 !important;
 }
 
 .lp-input-wrapper > .input > input:focus + .label,

diff --git a/Packlink/Subscribers/OrderListHandler.php b/Packlink/Subscribers/OrderListHandler.php
@@ -8,7 +8,6 @@
 use Logeecom\Infrastructure\ServiceRegister;
 use Packlink\BusinessLogic\Order\OrderService;
 use Packlink\BusinessLogic\OrderShipmentDetails\OrderShipmentDetailsService;
-use Packlink\Utilities\Reference;
 
 class OrderListHandler implements SubscriberInterface
 {
@@ -45,7 +44,6 @@ public function extendOrderList(Enlight_Hook_HookArgs $args)
             return;
         }
 
-        $userCountry = $this->getUserCountry();
         $return = $args->getReturn();
 
         /** @var \Packlink\BusinessLogic\OrderShipmentDetails\OrderShipmentDetailsService $orderShipmentDetailsService */
@@ -54,11 +52,7 @@ public function extendOrderList(Enlight_Hook_HookArgs $args)
         foreach ($return['data'] as $index => $order) {
             $orderDetails = $orderShipmentDetailsService->getDetailsByOrderId((string)$order['id']);
             if ($orderDetails !== null && $orderDetails->getReference()) {
-                $return['data'][$index]['plReferenceUrl'] = Reference::getUrl(
-                    $userCountry,
-                    $orderDetails->getReference()
-                );
-
+                $return['data'][$index]['plReferenceUrl'] = $orderDetails->getShipmentUrl();
                 $return['data'][$index]['plIsDeleted'] = $orderDetails->isDeleted();
 
                 $orderService = $this->getOrderService();

diff --git a/Packlink/Utilities/Reference.php b/Packlink/Utilities/Reference.php
diff --git a/Packlink/composer.json b/Packlink/composer.json
@@ -13,7 +13,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": ">=5.6",
-    "packlink/integration-core": "2.0.1",
+    "packlink/integration-core": "2.0.*",
     "ext-json": "*",
     "ext-curl": "*",
     "ext-zip": "*",

diff --git a/Packlink/composer.lock b/Packlink/composer.lock
diff --git a/PluginInstallation/0.9.0/Packlink.zip b/PluginInstallation/0.9.0/Packlink.zip
diff --git a/PluginInstallation/0.9.0/Release notes 0.9.0.txt b/PluginInstallation/0.9.0/Release notes 0.9.0.txt
@@ -0,0 +1,3 @@
+- Updated to the Packlink Integrations Core v2.0.0 (system improvements and code optimization).
+- Added task cleanup.
+- Packlink now supports more countries.