diff --git a/Block/Sales/NewShipmentForm.php b/Block/Sales/NewShipmentForm.php index 4ef9ee05..76224427 100644 --- a/Block/Sales/NewShipmentForm.php +++ b/Block/Sales/NewShipmentForm.php @@ -42,7 +42,7 @@ class NewShipmentForm /** * @var array */ - private $shipmentOptionsExplanation; + private $shipmentOptionsExplanationMap; public function __construct() @@ -58,8 +58,9 @@ public function __construct() AbstractConsignment::SHIPMENT_OPTION_RETURN => __('Return if no answer'), AbstractConsignment::SHIPMENT_OPTION_SAME_DAY_DELIVERY => __('Same day delivery'), ]; - $this->shipmentOptionsExplanation = [ + $this->shipmentOptionsExplanationMap = [ AbstractConsignment::SHIPMENT_OPTION_RECEIPT_CODE => __('Insurance is mandatory and will be set. Other shipment options will be removed.'), + AbstractConsignment::SHIPMENT_OPTION_COLLECT => __('The package will be collected at the location for this webshop. Please make sure you completely filled in the address including the company name in the MyParcel Backoffice. You can do so under ‘Shop settings’ -> ‘Company details’ under the tab ‘Return address’. Verify that you selected the shop corresponding to the API key you are using in your Magento installation.'), ]; } @@ -91,6 +92,6 @@ public function getShipmentOptionsHumanMap(): array */ public function getShipmentOptionsExplanationMap(): array { - return $this->shipmentOptionsExplanation; + return $this->shipmentOptionsExplanationMap; } } diff --git a/composer.json b/composer.json index 62eb5ac6..1d531033 100755 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "type": "magento2-module", "require": { "php": "^7.1 || ^8.0", - "myparcelnl/sdk": "~v7.18", + "myparcelnl/sdk": "~v7.19", "magento/framework": ">=101.0.8 <102 || >=102.0.1" }, "require-dev": { diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv index cf71b3c6..1e73a64b 100644 --- a/i18n/fr_FR.csv +++ b/i18n/fr_FR.csv @@ -171,6 +171,8 @@ Hide sender,Masquer l'expéditeur This will be added to the regular shipping price, Ceci sera ajouté aux frais d'expédition standards If both have been selected this price will be added to the regular shipping price. Leave empty for not using it.,Si les deux éléments sont sélectionnés, ce prix sera ajouté aux frais d'expédition standards. Laissez vide pour ignorer cette option. "To use this optimally, set a weight or 'Fit in mailbox' volume of each product. Regardless, shipments heavier than the weight specified here will not be mailbox.","Pour utiliser cette fonction de manière optimale, spécifiez d'abord le poids ou le volume de vos produits. Les envois plus lourds que le poids spécifié ici ne seront pas considérés comme des envois pour Boîte aux lettres." +"Insurance is mandatory and will be set. Other shipment options will be removed.","L’assurance est obligatoire et sera activée. Les autres options d'envoi seront supprimées." +"The package will be collected at the location for this webshop. Please make sure you completely filled in the address including the company name in the MyParcel Backoffice. You can do so under ‘Shop settings’ -> ‘Company details’ under the tab ‘Return address’. Verify that you selected the shop corresponding to the API key you are using in your Magento installation.","Le colis sera collecté à l’adresse de ce webshop. Assurez-vous que l’adresse est complète, y compris le nom de l’entreprise, dans le backoffice de MyParcel. Vous pouvez le faire sous ‘Shop settings’ -> ‘Company details’ dans l’onglet ‘Adresse de retour’. Vérifiez que vous avez sélectionné la boutique correspondant à la clé API que vous utilisez dans votre installation Magento." This will be added to the regular shipping price,Ceci sera ajouté aux frais d'expédition standards Pickup at PostNL location,Collecte dans un point postnl Pickup active,Collecte active diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv index a7fcf799..03e432ab 100755 --- a/i18n/nl_NL.csv +++ b/i18n/nl_NL.csv @@ -237,6 +237,8 @@ Hide sender,Verberg afzender This will be added to the regular shipping price, Dit zal bij de normale verzendkosten worden opgeteld If both have been selected this price will be added to the regular shipping price. Leave empty for not using it.,Als beide geselecteerd zijn zal deze prijs bij de normale verzendkosten worden opgeteld. Laat leeg om dit niet te gebruiken. "To use this optimally, set a weight or 'Fit in mailbox' volume of each product. Regardless, shipments heavier than the weight specified here will not be mailbox.","Om deze functie optimaal te gebruiken, stel je eerst het gewicht of volume in van jouw producten. Ongeacht deze instelling, zendingen zwaarder dan het hier opgegeven gewicht zullen niet als brievenbuspakket worden verzonden." +"Insurance is mandatory and will be set. Other shipment options will be removed.","Verzekering is verplicht en zal worden ingesteld. Andere verzendopties worden verwijderd." +"The package will be collected at the location for this webshop. Please make sure you completely filled in the address including the company name in the MyParcel Backoffice. You can do so under ‘Shop settings’ -> ‘Company details’ under the tab ‘Return address’. Verify that you selected the shop corresponding to the API key you are using in your Magento installation.","Het pakket zal worden opgehaald bij de locatie voor deze webshop. Zorg ervoor dat je het adres volledig hebt ingevuld, inclusief de bedrijfsnaam, in de MyParcel Backoffice. Dit kan onder ‘Shopinstellingen’ -> ‘Bedrijfsgegevens’ onder het tabblad ‘Retouradres’. Controleer of je de winkel hebt geselecteerd die overeenkomt met de API-sleutel die je gebruikt in jouw Magento-installatie." This will be added to the regular shipping price,Dit zal bij de normale verzendkosten worden opgeteld Pickup at PostNL location,Ophalen bij een PostNL locatie Pickup active,Ophalen actief