Merge pull request #110 from bold-commerce/CHK-6273

CHK-6273 - When building the array of shipping rates, for the selected shipping …
bold-commerce · Nov 1, 2024 · f37f86a · f37f86a
2 parents 28ee37d + 3c31ce8
commit f37f86a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Service/ExpressPay/QuoteConverter.php b/Service/ExpressPay/QuoteConverter.php
@@ -168,14 +168,16 @@ static function (Rate $rate) use (&$usedRateCodes): bool {
 
         if ($hasRequiredAddressData && count($shippingRates) > 0) {
             $convertedQuote['order_data']['shipping_options'] = array_map(
-                static function (Rate $rate) use ($currencyCode): array {
+                static function (Rate $rate) use ($currencyCode, $shippingAddress): array {
+                    $price = ($rate->getCode() === $shippingAddress->getShippingMethod())
+                        ? $shippingAddress->getShippingAmount() : $rate->getPrice();
                     return [
                         'id' => $rate->getCode(),
                         'label' => trim("{$rate->getCarrierTitle()} - {$rate->getMethodTitle()}", ' -'),
                         'type' => 'SHIPPING',
                         'amount' => [
                             'currency_code' => $currencyCode ?? '',
-                            'value' => number_format((float)$rate->getPrice(), 2)
+                            'value' => number_format((float)$price, 2)
                         ]
                     ];
                 },