Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

magento/graphql-ce#646: Incorrect name of Selected Shipping Method #647

Merged
merged 2 commits into from
May 2, 2019
Merged

magento/graphql-ce#646: Incorrect name of Selected Shipping Method #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91d8a92
magento/graphql-ce#646: Incorrect name of Selected Shipping Method
atwixfirster Apr 30, 2019
64e76c4
GraphQL-646: Incorrect name of Selected Shipping Method
naydav May 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddress/SelectedShippingMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,26 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
/** @var Address $address */
$address = $value['model'];
$rates = $address->getAllShippingRates();
$carrierTitle = null;
$methodTitle = null;

if (count($rates) > 0) {
list($carrierCode, $methodCode) = explode('_', $address->getShippingMethod(), 2);

/** @var Rate $rate */
$rate = current($rates);
foreach ($rates as $rate) {
if ($rate->getCode() == $address->getShippingMethod()) {
$carrierTitle = $rate->getCarrierTitle();
$methodTitle = $rate->getMethodTitle();
break;
}
}

$data = [
'carrier_code' => $carrierCode,
'method_code' => $methodCode,
'carrier_title' => $rate->getCarrierTitle(),
'method_title' => $rate->getMethodTitle(),
'carrier_title' => $carrierTitle,
'method_title' => $methodTitle,
'amount' => [
'value' => $address->getShippingAmount(),
'currency' => $address->getQuote()->getQuoteCurrencyCode(),
Expand All @@ -54,8 +63,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
$data = [
'carrier_code' => null,
'method_code' => null,
'carrier_title' => null,
'method_title' => null,
'carrier_title' => $carrierTitle,
'method_title' => $methodTitle,
'amount' => null,
'base_amount' => null,
];
Expand Down
2 changes: 2 additions & 0 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Ups/SetUpsShippingMethodsOnCartTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public function testSetUpsShippingMethod(string $methodCode, string $methodTitle
self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);

self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
}

/**
Expand Down Expand Up @@ -171,6 +172,7 @@ public function testSetUpsShippingMethodBasedOnCanadaAddress(string $methodCode,
self::assertEquals(self::CARRIER_TITLE, $shippingAddress['selected_shipping_method']['carrier_title']);

self::assertArrayHasKey('method_title', $shippingAddress['selected_shipping_method']);
self::assertEquals($methodTitle, $shippingAddress['selected_shipping_method']['method_title']);
}

/**
Expand Down