fix: allow package type mailbox when postnl is disabled (#850)

myparcelnl · Jun 27, 2024 · c3357eb · c3357eb
1 parent 52bc15f
commit c3357eb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/Model/Checkout/Carrier.php b/Model/Checkout/Carrier.php
@@ -176,8 +176,7 @@ public static function getMethods()
      */
     public function getAllowedMethods()
     {
-        $methods = self::getMethods();
-        return $methods;
+        return self::getMethods();
     }
 
     /**

diff --git a/Model/Quote/Checkout.php b/Model/Quote/Checkout.php
@@ -68,10 +68,6 @@ public function __construct(
         $this->cart     = $cart->getQuote();
         $this->package  = $package;
         $this->currency = $currency;
-
-        $this->package->setMailboxSettings();
-        $this->package->setDigitalStampSettings();
-        $this->package->setPackageSmallSettings();
     }
 
     /**
@@ -375,6 +371,10 @@ public function checkPackageType(string $carrier, ?string $country = null): stri
         $canHaveMailbox      = $consignment->canHavePackageType(AbstractConsignment::PACKAGE_TYPE_MAILBOX_NAME);
         $canHavePackageSmall = $consignment->canHavePackageType(AbstractConsignment::PACKAGE_TYPE_PACKAGE_SMALL_NAME);
 
+        $this->package->setMailboxSettings($carrierPath);
+        $this->package->setDigitalStampSettings($carrierPath);
+        $this->package->setPackageSmallSettings($carrierPath);
+
         if ($canHaveMailbox) {
             if (AbstractConsignment::CC_NL === $country) {
                 $this->package->setMailboxActive($this->helper->getBoolConfig($carrierPath, 'mailbox/active'));

diff --git a/Model/Sales/Repository/PackageRepository.php b/Model/Sales/Repository/PackageRepository.php
@@ -291,7 +291,7 @@ public function setPackageSmallSettings(string $carrierPath = self::XML_PATH_POS
         $settings = $this->getConfigValue("{$carrierPath}package_small");
 
         if (null === $settings || ! array_key_exists('active', $settings)) {
-            $this->_logger->critical("Can't set settings with path: {$carrierPath}digital_stamp");
+            $this->_logger->critical("Can't set settings with path: {$carrierPath}package_small");
 
             return $this;
         }

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -43,6 +43,7 @@ myparcelnl_magento_dhlforyou_settings/delivery/signature, DHL For You delivery w
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient, DHL For You delivery with only recipient
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/signature, DHL For You delivery with only recipient and signature
 myparcelnl_magento_dhlforyou_settings/pickup, DHL For You pickup location
+myparcelnl_magento_dhlforyou_settings/mailbox, DHL For You mailbox
 myparcelnl_magento_dhleuroplus_settings/delivery, DHL Europlus delivery
 myparcelnl_magento_dhlparcelconnect_settings/delivery, DHL Parcel Connect delivery
 myparcelnl_magento_dhlparcelconnect_settings/pickup, DHL Parcel Connect pickup

diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
@@ -48,6 +48,7 @@ myparcelnl_magento_dhlforyou_settings/delivery/signature, Livraison avec signatu
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient, Livraison uniquement au destinataire DHL For You
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/signature, Livraison uniquement au destinataire avec signature DHL For You
 myparcelnl_magento_dhlforyou_settings/pickup, Collecte DHL For You
+myparcelnl_magento_dhlforyou_settings/mailbox, Boîte aux lettres DHL For You
 myparcelnl_magento_dhleuroplus_settings/delivery, Livraison DHL Europlus
 myparcelnl_magento_dhlparcelconnect_settings/delivery, Livraison DHL Parcel Connect
 myparcelnl_magento_dhlparcelconnect_settings/pickup, Collecte DHL Parcel Connect

diff --git a/i18n/nl_NL.csv b/i18n/nl_NL.csv
@@ -46,6 +46,7 @@ myparcelnl_magento_dhlforyou_settings/delivery/signature, DHL For You bezorging
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient, DHL For You bezorging met alleen ontvanger
 myparcelnl_magento_dhlforyou_settings/delivery/only_recipient/signature, DHL For You bezorging met alleen ontvanger en handtekening
 myparcelnl_magento_dhlforyou_settings/pickup, DHL For You afhaallocatie
+myparcelnl_magento_dhlforyou_settings/mailbox, DHL For You brievenbuspakje
 myparcelnl_magento_dhleuroplus_settings/delivery, DHL Europlus bezorging
 myparcelnl_magento_dhlparcelconnect_settings/delivery, DHL Parcel Connect bezorging
 myparcelnl_magento_dhlparcelconnect_settings/pickup, DHL Parcel Connect afhaallocatie