Merge pull request #113 from Invertus/DGS-293/empty-street-bug-fix

DGS-2893/ label printing fix

CHANGELOG.md

@@ -151,3 +151,6 @@
 ## [3.2.16]
 - Improved performance
 - Added additional validation
+
+## [3.2.17]
+- Label printing after changing shipment product bug fix

dpdbaltics.php

@@ -92,7 +92,7 @@ public function __construct()
         $this->author = 'Invertus';
         $this->tab = 'shipping_logistics';
         $this->description = 'DPD Baltics shipping integration';
-        $this->version = '3.2.16';
+        $this->version = '3.2.17';
         $this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
         $this->need_instance = 0;
         parent::__construct();

src/Factory/ShipmentDataFactory.php

@@ -120,6 +120,7 @@ public function getShipmentDataByIdOrder($orderId)
             $shipmentData->setDpdCountry($dpdPudo->country_code);
             $shipmentData->setSelectedPudoIsoCode($dpdPudo->country_code);
             $shipmentData->setDpdZipCode($address->postcode);
+            $shipmentData->setDpdStreet($dpdPudo->street);
             $shipmentData->setSelectedPudoId($dpdPudo->pudo_id);
         }
 

src/Service/API/ShipmentApiService.php

@@ -108,6 +108,7 @@ public function createShipment($addressId, ShipmentData $shipmentData, $orderId)
             $parcel = $this->parcelShopService->getParcelShopByShopId($shipmentData->getSelectedPudoId());
             $selectedParcel = is_array($parcel) ? reset($parcel) : $parcel;
             $postCode = $selectedParcel->getPCode();
+            $address->address1 = $selectedParcel->getStreet();
         }
 
         // IF prestashop allows, we take selected parcel terminal address in case information is missing in checkout address in specific cases.

src/Service/PudoService.php

@@ -241,7 +241,7 @@ public function searchPudoServices($city, $carrierId, $cartId)
         ];
     }
 
-    public function savePudoOrder($productId, $pudoId, $isoCode, $cartId, $city, $street)
+    public function savePudoOrder($productId, $pudoId, $isoCode, $cartId, $city, $street, $zipCode)
     {
         $pudoOrderId = $this->pudoRepository->getIdByCart($cartId);
         $product = new DPDProduct($productId);
@@ -254,6 +254,7 @@ public function savePudoOrder($productId, $pudoId, $isoCode, $cartId, $city, $st
         $pudoOrder->id_cart = $cartId;
         $pudoOrder->city = $city;
         $pudoOrder->street = $street;
+        $pudoOrder->post_code = $zipCode;
         $pudoOrder->save();
     }
 

src/Service/ShipmentService.php

@@ -415,9 +415,10 @@ public function saveShipment(Order $order, ShipmentData $shipmentData, $print =
             $isoCode = $shipmentData->getSelectedPudoIsoCode();
             $city = $shipmentData->getCity();
             $street = $shipmentData->getDpdStreet();
+            $zipCode = $shipmentData->getDpdZipCode();
 
             try {
-                $this->pudoService->savePudoOrder($productId, $pudoId, $isoCode, $cartId, $city, $street);
+                $this->pudoService->savePudoOrder($productId, $pudoId, $isoCode, $cartId, $city, $street, $zipCode);
             } catch (Exception $e) {
                 $response['message'] = $this->module->l(
                     sprintf('Failed to save pudo order to database Error: %s', $e->getMessage(). 'ID cart: '. $order->id_cart)

views/templates/hook/admin/partials/pudo-info.tpl

@@ -26,12 +26,14 @@
                 <div class="address col-lg-9">
                     {$selectedPudo->getStreet()}
                 </div>
+                <input name="dpd-street" type="hidden" value="{$selectedPudo->getStreet()}">
             </div>
             <div class="form-row row dpd-form-group">
                 <label class="control-label col-lg-3 dpd-no-padding">{l s='Post code: ' mod='dpdbaltics'}</label>
                 <div class="zip-code col-lg-9">
                     {$selectedPudo->getPCode()}
                 </div>
+                <input name="dpd-zip-code" type="hidden" value="{$selectedPudo->getPCode()}">
             </div>
             <div class="form-row row dpd-form-group">
                 <label class="control-label col-lg-3 dpd-no-padding">{l s='City: ' mod='dpdbaltics'}</label>