fix: mailbox works with kilo setting on php 8.1 (#744)

myparcelnl · Feb 2, 2023 · 721259a · 721259a
1 parent 8d33bd9
commit 721259a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/Model/Sales/Repository/PackageRepository.php b/Model/Sales/Repository/PackageRepository.php
@@ -144,8 +144,20 @@ public function setMailboxSettings(string $carrierPath = self::XML_PATH_POSTNL_S
 
         $this->setMailboxActive('1' === $settings['active']);
         if (true === $this->isMailboxActive()) {
-            $weight = str_replace(',', '.', $settings['weight']);
-            $this->setMaxMailboxWeight($weight ?: self::DEFAULT_MAXIMUM_MAILBOX_WEIGHT);
+            $weight = abs((float) str_replace(',', '.', $settings['weight'] ?? ''));
+            $unit   = $this->getGeneralConfig('print/weight_indication');
+
+            if ('kilo' === $unit) {
+                $epsilon = 0.00001;
+                $default = self::DEFAULT_MAXIMUM_MAILBOX_WEIGHT / 1000.0;
+                if ($weight < $epsilon) {
+                    $weight = $default;
+                }
+                $this->setMaxMailboxWeight($weight);
+            } else {
+                $weight = (int)$weight;
+                $this->setMaxMailboxWeight($weight ?: self::DEFAULT_MAXIMUM_MAILBOX_WEIGHT);
+            }
 
             $pickupMailbox = (bool) $this->getConfigValue("{$carrierPath}mailbox/pickup_mailbox");
             $this->setPickupMailboxActive($pickupMailbox);