Merge pull request #29 from DPDBeNeLux/feature/16402

Updated copyright year and implemented saving labels as file
DPDBeNeLux · Feb 26, 2019 · c7eae4e · c7eae4e
2 parents 228fc81 + 2ca232e
commit c7eae4e
Show file tree

Hide file tree

Showing 83 changed files with 157 additions and 85 deletions.
diff --git a/Block/Adminhtml/Order/PrintShippingList.php b/Block/Adminhtml/Order/PrintShippingList.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/Adminhtml/Shipment/MenuItem.php b/Block/Adminhtml/Shipment/MenuItem.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/Adminhtml/Shipment/PrintLabelModal.php b/Block/Adminhtml/Shipment/PrintLabelModal.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/Adminhtml/Tablerate/Grid.php b/Block/Adminhtml/Tablerate/Grid.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/Adminhtml/TablerateExport.php b/Block/Adminhtml/TablerateExport.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/Adminhtml/TablerateImport.php b/Block/Adminhtml/TablerateImport.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/GoogleMaps.php b/Block/GoogleMaps.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Block/ParcelshopInfo.php b/Block/ParcelshopInfo.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Config/Source/Settings/AccountType.php b/Config/Source/Settings/AccountType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Config/Source/Settings/DaysInWeek.php b/Config/Source/Settings/DaysInWeek.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Config/Source/Settings/Environment.php b/Config/Source/Settings/Environment.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Config/Source/Settings/PrintFormat.php b/Config/Source/Settings/PrintFormat.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Config/Source/Settings/RateType.php b/Config/Source/Settings/RateType.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Order/CreateShipment.php b/Controller/Adminhtml/Order/CreateShipment.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Order/PrintReturnLabel.php b/Controller/Adminhtml/Order/PrintReturnLabel.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Order/printShippingList.php b/Controller/Adminhtml/Order/printShippingList.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Shipping/CreateShipment.php b/Controller/Adminhtml/Shipping/CreateShipment.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Shipping/PrintLabels.php b/Controller/Adminhtml/Shipping/PrintLabels.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Adminhtml/Tablerate/Export.php b/Controller/Adminhtml/Tablerate/Export.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Parcelshops/Index.php b/Controller/Parcelshops/Index.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Controller/Parcelshops/Save.php b/Controller/Parcelshops/Save.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Helper/DPDClient.php b/Helper/DPDClient.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -109,7 +109,7 @@ public function storeOrders($shipmentData, $delisId, $accessToken)
             } elseif (isset($fs->detail->authenticationFault)) {
                 throw new \Exception('[DPD-Shipment] ' . $fs->detail->authenticationFault->errorMessage);
             } else {
-                $this->_logger->info('[DPD-Shipment] OrderNumber: ' . $shipmentData['order']['parcels']['customerReferenceNumber1'] . " - Exception: " . $fs->getMessage());
+                $this->_logger->info('[DPD-Shipment] Exception: ' . $fs->getMessage());
                 throw new \Exception(__('[DPD-Shipment] Unknown error occurred'));
             }
         }

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Helper/Services/AuthenticationService.php b/Helper/Services/AuthenticationService.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Helper/Services/DPDPickupService.php b/Helper/Services/DPDPickupService.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Helper/Services/DPDPredictService.php b/Helper/Services/DPDPredictService.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
  */
 namespace DPDBenelux\Shipping\Helper\Services;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\Helper\AbstractHelper;
 use DPDBenelux\Shipping\Helper\DPDClient;
 use Magento\Sales\Model\Order;
@@ -39,17 +40,33 @@ class DPDPredictService extends AbstractHelper
      */
     private $shipmentLabelsFactory;
 
+    /**
+     * @var DPDClient
+     */
     private $dpdClient;
 
+    /**
+     * @var \Magento\Framework\Filesystem\Io\File
+     */
+    private $filesystem;
+    /**
+     * @var \Magento\Framework\Filesystem\DirectoryList
+     */
+    private $directoryList;
+
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \DPDBenelux\Shipping\Helper\Services\AuthenticationService $authenticationService,
+        \Magento\Framework\Filesystem\Io\File $filesystem,
         DPDClient $DPDClient,
+        \Magento\Framework\Filesystem\DirectoryList $directoryList,
         ShipmentLabelsFactory $shipmentLabelsFactory
     ) {
         $this->authenticationService = $authenticationService;
         $this->shipmentLabelsFactory = $shipmentLabelsFactory;
         $this->dpdClient = $DPDClient;
+        $this->filesystem = $filesystem;
+        $this->directoryList = $directoryList;
         parent::__construct($context);
     }
 
@@ -293,17 +310,42 @@ public function generateLabel(Order $order, $isReturn = false, Order\Shipment $s
         }
         $labelDataSerialized = serialize($labelData);
 
+        $saveLabelAsFile = $this->scopeConfig->isSetFlag('dpdshipping/account_settings/save_label_file');
+        $labelPath = $this->scopeConfig->getValue('dpdshipping/account_settings/label_path');
+
+        if (empty($labelPath)) {
+            $labelPath = $this->directoryList->getRoot() . '/var/dpd_labels/';
+        }
+
+        $labelPath = rtrim($labelPath, '/') . '/';
+
+        $labelName = sprintf('%s-%s.pdf', $order->getIncrementId(), $result->orderResult->shipmentResponses->mpsId);
+
         // Save the label to the database
         $shipmentLabels = $this->shipmentLabelsFactory->create();
         $shipmentLabels->setLabelNumbers($labelDataSerialized);
         $shipmentLabels->setMpsId($result->orderResult->shipmentResponses->mpsId);
         $shipmentLabels->setShipmentId($shipment->getId());
         $shipmentLabels->setShipmentIncrementId($shipment->getIncrementId());
         $shipmentLabels->setOrderId($order->getId());
-        $shipmentLabels->setLabel($result->orderResult->parcellabelsPDF);
+
+        if (!$saveLabelAsFile) {
+            $shipmentLabels->setLabel($result->orderResult->parcellabelsPDF);
+        } else {
+            $shipmentLabels->setLabelPath($labelPath . $labelName);
+        }
+
         $shipmentLabels->setIsReturn($isReturn ? "1" : "0");
         $shipmentLabels->save();
 
+        // Write file to a directory
+        if ($saveLabelAsFile) {
+            if (!file_exists($labelPath)) {
+                mkdir($labelPath, 0755, true);
+            }
+            $this->filesystem->write($labelPath . $labelName, $result->orderResult->parcellabelsPDF);
+        }
+
         return [
             'senderData' => $senderData,
             'parcellabelsPDF' => $result->orderResult->parcellabelsPDF,

diff --git a/Helper/TrackingPopup.php b/Helper/TrackingPopup.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdClassic.php b/Model/Carrier/DpdClassic.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdClassicSaturday.php b/Model/Carrier/DpdClassicSaturday.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdExpress10.php b/Model/Carrier/DpdExpress10.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdExpress12.php b/Model/Carrier/DpdExpress12.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdGuarantee18.php b/Model/Carrier/DpdGuarantee18.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/Model/Carrier/DpdSaturday.php b/Model/Carrier/DpdSaturday.php
@@ -2,7 +2,7 @@
 /**
  * This file is part of the Magento 2 Shipping module of DPD Nederland B.V.
  *
- * Copyright (C) 2018  DPD Nederland B.V.
+ * Copyright (C) 2019  DPD Nederland B.V.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by