1.1.2

Author: dpdplugin

classes/DpdLabelGenerator.php

@@ -25,6 +25,7 @@
 use Order;
 use Address;
 use Country;
+use Currency;
 use DbQuery;
 use Product;
 use LinkCore;
@@ -74,6 +75,15 @@ public function __construct()
         ]));
         $this->dpdClient = $clientBuilder->buildAuthenticatedByPassword($username, $password);
 
+        $this->dpdClient->getAuthentication()->setJwtToken(
+            Configuration::get('dpdconnect_jwt_token') ?: null
+        );
+
+        $this->dpdClient->getAuthentication()->setTokenUpdateCallback(function ($jwtToken) {
+            Configuration::updateValue('dpdconnect_jwt_token', $jwtToken);
+            $this->dpdClient->getAuthentication()->setJwtToken($jwtToken);
+        });
+
         $this->dpdError = new DpdError();
         $this->dpdParcelPredict = new DpdParcelPredict();
     }
@@ -225,6 +235,8 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
                 'phoneNumber' => Configuration::get('PS_SHOP_PHONE'),
                 'email' => Configuration::get('dpdconnect_email'),
                 'commercialAddress' => true,
+                'vatnumber' => (Configuration::get('dpdconnect_vatnumber') === null) ? 'null' : Configuration::get('dpdconnect_vatnumber'),
+                'eorinumber' => (Configuration::get('dpdconnect_eorinumber') === null) ? 'null' : Configuration::get('dpdconnect_eorinumber'),
             ],
             'receiver' => [
                 'name1' =>  $fullName,
@@ -234,12 +246,13 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
                 'city' => $address->city,
                 'phoneNumber' => $phone,
                 'commercialAddress' => false,
-                'vat_number' => Configuration::get('dpdconnect_vatnumber'),
-                'eori_number' => Configuration::get('dpdconnect_eorinumber'),
+                'vatnumber' => (Configuration::get('dpdconnect_vatnumber') === null) ? 'null' : Configuration::get('dpdconnect_vatnumber'),
+                'eorinumber' => (Configuration::get('dpdconnect_eorinumber') === null) ? 'null' : Configuration::get('dpdconnect_eorinumber'),
             ],
             'product' => [
                 'productCode' => $productCode,
                 'saturdayDelivery' => $saturdayDelivery,
+                'homeDelivery' => $this->dpdParcelPredict->checkIfPredictCarrier($orderId) || $this->dpdParcelPredict->checkIfSaturdayCarrier($orderId)
             ],
         ];
 
@@ -276,9 +289,10 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
             array_push($shipment['parcels'], $parcelInfo);
         }
 
+        $currency = new Currency($tempOrder->id_currency);
         $shipment['customs'] = [
             'terms' => 'DAP',
-            'totalCurrency' => 'EUR',
+            'totalCurrency' => $currency->iso_code,
         ];
 
         $totalAmount = 0;
@@ -311,16 +325,19 @@ public function generateShipmentInfo($orderId, $parcelCount, $return)
 
         $shipment['customs']['totalAmount'] = (float) $totalAmount;
 
-        $consignee = [
+        $consignor = [
             'name1' => Configuration::get('dpdconnect_company'),
             'street' => Configuration::get('dpdconnect_street'),
             'postalcode' => Configuration::get('dpdconnect_postalcode'),
             'city' => Configuration::get('dpdconnect_place'),
             'country' => strtoupper(Configuration::get('dpdconnect_country')),
             'commercialAddress' => true,
+            'sprn' => Configuration::get('dpdconnect_spr') ?: '',
+            'vatnumber' => (Configuration::get('dpdconnect_vatnumber') === null) ? 'null' : Configuration::get('dpdconnect_vatnumber'),
+            'eorinumber' => (Configuration::get('dpdconnect_eorinumber') === null) ? 'null' : Configuration::get('dpdconnect_eorinumber'),
         ];
 
-        $consignor = [
+        $consignee = [
             'name1' => $fullName,
             'street' => $street,
             'postalcode' => $address->postcode,

classes/DpdParcelPredict.php

@@ -53,6 +53,15 @@ public function __construct()
         ]));
         $this->dpdClient = $clientBuilder->buildAuthenticatedByPassword($username, $password);
 
+        $this->dpdClient->getAuthentication()->setJwtToken(
+            Configuration::get('dpdconnect_jwt_token') ?: null
+        );
+
+        $this->dpdClient->getAuthentication()->setTokenUpdateCallback(function ($jwtToken) {
+            Configuration::updateValue('dpdconnect_jwt_token', $jwtToken);
+            $this->dpdClient->getAuthentication()->setJwtToken($jwtToken);
+        });
+
         $this->Gmaps = new Gmaps();
     }
 

classes/Gmaps.php

@@ -12,7 +12,7 @@ public function getGeoData($postal_code, $isoCode)
         $gmapsKey = Configuration::get('gmaps_server_key');
 
         $data = urlencode('country:' . $isoCode . '|postal_code:' . $postal_code);
-        $url = "https://maps.googleapis.com/maps/api/geocode/json?key=". $gmapsKey . "&address=". $data . '&sensor=false';
+        $url = "https://maps.googleapis.com/maps/api/geocode/json?key=". $gmapsKey . "&components=". $data . '&sensor=false';
         $source = file_get_contents($url);
 
         $gmapsData = json_decode($source);

dpdconnect.php

@@ -343,8 +343,8 @@ public function getContent()
                 ],
                 [
                     'type' => 'text',
-                    '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'),
+                    'label' => $this->l('HMRC number'),
+                    'hint' => $this->l('Mandatory if the value of the parcel is ≤ £ 135.'),
                     'name' => 'spr',
                     'required' => false
                 ],