Bugfix: Split shipping carrier and method by a different separator

mollie · May 14, 2024 · 8104eee · 8104eee
1 parent 2a918e4
commit 8104eee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Controller/ApplePay/ShippingMethods.php b/Controller/ApplePay/ShippingMethods.php
@@ -87,7 +87,9 @@ public function execute()
         return $response->setData([
             'shipping_methods' => array_map(function ($method) {
                 return [
-                    'identifier' => $method->getCarrierCode() . '_' . $method->getMethodCode(),
+                    // Magento uses an _ (underscore) to separate the carrier and method, but those can have an
+                    // underscore as well. So separate by a different divider to prevent errors.
+                    'identifier' => $method->getCarrierCode() . '__SPLIT__' . $method->getMethodCode(),
                     'label' => $method->getMethodTitle() . ' - ' . $method->getCarrierTitle(),
                     'amount' => number_format($method->getPriceInclTax() ?: 0.0, 2, '.', ''),
                     'detail' => '',

diff --git a/Service/Magento/ChangeShippingMethodForQuote.php b/Service/Magento/ChangeShippingMethodForQuote.php
@@ -37,7 +37,7 @@ public function execute(AddressInterface $address, string $identifier): void
         $address->setCollectShippingRates(true);
         $address->setShippingMethod($identifier);
 
-        [$carrierCode, $methodCode] = explode('_', $identifier);
+        [$carrierCode, $methodCode] = explode('__SPLIT__', $identifier);
         $shippingInformation = $this->shippingInformationFactory->create([
             'data' => [
                 ShippingInformationInterface::SHIPPING_ADDRESS => $address,