Skip to content

Commit 52864f5

Browse files
committed
MC-20638: MyAccount :: Order Details :: Shipping Details by Order Number
1 parent be83e05 commit 52864f5

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

app/code/Magento/BundleGraphQl/composer.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"magento/module-quote": "*",
1111
"magento/module-quote-graph-ql": "*",
1212
"magento/module-store": "*",
13+
"magento/module-sales": "*",
14+
"magento/module-sales-graph-ql": "*",
1315
"magento/framework": "*"
1416
},
1517
"license": [

app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Carrier.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private function findCarrierByMethodCode(string $methodCode): ?string
6060
{
6161
$allCarrierMethods = $this->carrierMethods->toOptionArray();
6262

63-
foreach ($allCarrierMethods as $carrierCode => $carrierMethods) {
63+
foreach ($allCarrierMethods as $carrierMethods) {
6464
$carrierLabel = $carrierMethods['label'];
6565
$carrierMethodOptions = $carrierMethods['value'];
6666
if (is_array($carrierMethodOptions)) {

app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Magento\Sales\Api\Data\InvoiceItemInterface;
1717
use Magento\Sales\Api\Data\OrderInterface;
1818
use Magento\Sales\Api\Data\OrderItemInterface;
19-
use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
19+
use Magento\SalesGraphQl\Model\OrderItem\DataProvider as OrderItemProvider;
2020

2121
/**
2222
* Resolver for Invoice Items

app/code/Magento/SalesGraphQl/composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
"magento/module-catalog": "*",
1111
"magento/module-tax": "*",
1212
"magento/module-quote": "*",
13-
"magento/module-graph-ql": "*"
14-
},
15-
"suggest": {
13+
"magento/module-graph-ql": "*",
1614
"magento/module-shipping": "*"
1715
},
1816
"license": [

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/CustomerOrders/OrderShipmentsTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
declare(strict_types=1);
77

8+
namespace Magento\GraphQl\Sales\CustomerOrders;
9+
810
use Magento\Framework\DB\Transaction;
911
use Magento\Framework\Registry;
1012
use Magento\GraphQl\GetCustomerAuthenticationHeader;

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ public function placeOrderWithBundleProduct(array $customerLogin, array $product
8181
/**
8282
* Make GraphQl POST request
8383
*
84-
* @param $query
84+
* @param string $query
8585
* @param array $additionalHeaders
8686
* @return array
8787
*/
88-
private function makeRequest($query, $additionalHeaders = []): array
88+
private function makeRequest(string $query, array $additionalHeaders = []): array
8989
{
9090
$headers = array_merge([$this->getAuthHeader()], $additionalHeaders);
9191
return $this->gqlClient->post($query, [], '', $headers);

dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_simple_shipment.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,3 @@
6868
$track->setCarrierCode('ups');
6969
$track->setTrackNumber('1234567890');
7070
$shipmentTrackRepository->save($track);
71-
72-

dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
$track->setCarrierCode('ups');
4141
$track->setTitle('United Parcel Service');
4242
$track->setTrackNumber('987654321');
43-
$shipOrder->execute($order->getEntityId(), $shipmentItems, false, false, null, [$track]);
43+
$shipOrder->execute($order->getId(), $shipmentItems, false, false, null, [$track]);
4444

4545
//Create second Shipment
4646
$shipmentItems = [];
@@ -53,4 +53,4 @@
5353
$shipmentItems[] = $shipmentItem;
5454
}
5555
}
56-
$shipOrder->execute($order->getEntityId(), $shipmentItems);
56+
$shipOrder->execute($order->getId(), $shipmentItems);

0 commit comments

Comments
 (0)