Changed for Parcelshop

Author: dpdplugin

classes/DpdLabelGenerator.php

@@ -215,7 +215,6 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
 
         $shipment = [
             'orderId' => $orderId,
-            'smallParcelNumber' => Configuration::get('dpdconnect_spr'),
             'sendingDepot' => Configuration::get('dpdconnect_depot'),
             'sender' => [
                 'name1' => Configuration::get('dpdconnect_company'),
@@ -245,19 +244,19 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
         ];
 
         if ($this->dpdParcelPredict->checkIfPredictCarrier($orderId) || $this->dpdParcelPredict->checkIfSaturdayCarrier($orderId)) {
-            $shipment['shipments']['notifications'][] = [
+            $shipment['notifications'][] = [
                 'subject' => 'predict',
-                'channel' => 'email',
+                'channel' => 'EMAIL',
                 'value' => $customer->email,
             ];
         }
 
         if ($this->dpdParcelPredict->checkifParcelCarrier($orderId)) {
             $parcelShopID = $this->dpdParcelPredict->getParcelShopId($orderId);
-            $shipment['shipments']['product']['parcelshopId'] = $parcelShopID;
-            $shipment['shipments']['notifications'][] = [
+            $shipment['product']['parcelshopId'] = $parcelShopID;
+            $shipment['notifications'][] = [
                 'subject' => 'parcelshop',
-                'channel' => 'email',
+                'channel' => 'EMAIL',
                 'value' => $customer->email,
             ];
         }
@@ -327,6 +326,7 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
             'city' => $address->city,
             'country' => $country->iso_code,
             'commercialAddress' => false,
+            'sprn' => Configuration::get('dpdconnect_spr'),
         ];
 
         $shipment['customs']['customsLines'] = $customsLines;

dpdconnect.php

@@ -342,7 +342,8 @@ public function getContent()
                 ],
                 [
                     'type' => 'text',
-                    'label' => $this->l('Small Parcel Reference'),
+                    'label' => $this->l('SPRN'),
+                    'hint' => $this->l('Heeft u een registratienummer van HMRC (douane in UK) beschikbaar, vul deze dan hier in: https://www.gov.uk/guidance/register-for-import-vat-on-parcels-you-sell-to-uk-buyers'),
                     'name' => 'spr',
                     'required' => false
                 ],