Merge pull request #27 from webshopapps/M2-35

M2-35 Dim comments always being logged out
shipperhq · Jun 15, 2017 · 8575731 · 8575731
2 parents 18d6dde + 36c7799
commit 8575731
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Helper/Data.php b/src/Helper/Data.php
@@ -235,6 +235,15 @@ public function useDefaultCarrierCodes()
         return $result;
     }
 
+    public function getStoreDimComments()
+    {
+        $result = false;
+        if ($this->getDefaultConfigValue('carriers/shipper/STORE_DIM_COMMENTS')) {
+            $result = true;
+        }
+        return $result;
+    }
+
     public function isCheckout($quote)
     {
 

diff --git a/src/Helper/Package.php b/src/Helper/Package.php
@@ -71,7 +71,7 @@ public function __construct(
         Data $shipperDataHelper,
         CarrierGroup $carrierGroupHelper
     ) {
-    
+
         parent::__construct($context);
         $this->quotePackageFactory = $quotePackageFactory;
         $this->orderPackageFactory = $orderPackageFactory;
@@ -121,6 +121,7 @@ public function saveOrderPackages($order, $shippingAddress)
         $orderId = $order->getId();
         $packagesColl = [];
         $addressDetail = $this->carrierGroupHelper->loadAddressDetailByShippingAddress($shippingAddress->getAddressId());
+        $savePackagesAsOrderComment = $this->shipperDataHelper->getStoreDimComments();
         foreach ($addressDetail as $detail) {
             try {
                 $carrierGroupDetail = $this->shipperDataHelper->decodeShippingDetails(
@@ -164,13 +165,16 @@ public function saveOrderPackages($order, $shippingAddress)
                             $package->save();
                         }
 
-                        if (!empty($packagesColl)) {
+                        if (!empty($packagesColl) && $savePackagesAsOrderComment) {
                             $boxText = $this->shipperDataHelper->getPackageBreakdownText(
                                 $packagesColl,
                                 $carrier_group['name']
                             );
                             $boxText .= __('Transaction ID: ') . $carrier_group['transaction'];
                             $order->addStatusToHistory($order->getStatus(), $boxText, false);
+                        } else {
+                            $boxText = __('Transaction ID: ') . $carrier_group['transaction'];
+                            $order->addStatusToHistory($order->getStatus(), $boxText, false);
                         }
                     }
                 }