Skip to content

Commit 0b1d36e

Browse files
danielrenauddanielrenaud
committed
MC-20638: MyAccount :: Order Details :: Shipping Details by Order Number
- code review
1 parent aab9520 commit 0b1d36e

File tree

9 files changed

+23
-21
lines changed

9 files changed

+23
-21
lines changed

‎app/code/Magento/BundleGraphQl/etc/graphql/di.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@
6565
</argument>
6666
</arguments>
6767
</type>
68-
<type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
68+
<type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
6969
<arguments>
7070
<argument name="productTypeMap" xsi:type="array">
7171
<item name="bundle" xsi:type="string">BundleOrderItem</item>
7272
</argument>
7373
</arguments>
7474
</type>
75-
<type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
75+
<type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
7676
<arguments>
7777
<argument name="productTypeMap" xsi:type="array">
7878
<item name="bundle" xsi:type="string">BundleInvoiceItem</item>
7979
</argument>
8080
</arguments>
8181
</type>
82-
<type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
82+
<type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
8383
<arguments>
8484
<argument name="productTypeMap" xsi:type="array">
8585
<item name="bundle" xsi:type="string">BundleShipmentItem</item>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,25 +124,26 @@ private function getInvoiceItemData(OrderInterface $order, InvoiceItemInterface
124124
'model' => $invoiceItem,
125125
'product_type' => $orderItem['product_type'],
126126
'order_item' => $orderItem,
127-
'discounts' => $this->getDiscountDetails($order, $invoiceItem)
127+
'discounts' => $this->formatDiscountDetails($order, $invoiceItem)
128128
];
129129
}
130130

131131
/**
132-
* Returns information about an applied discount
132+
* Returns formatted information about an applied discount
133133
*
134134
* @param OrderInterface $associatedOrder
135135
* @param InvoiceItemInterface $invoiceItem
136136
* @return array
137137
*/
138-
private function getDiscountDetails(OrderInterface $associatedOrder, InvoiceItemInterface $invoiceItem) : array
138+
private function formatDiscountDetails(OrderInterface $associatedOrder, InvoiceItemInterface $invoiceItem) : array
139139
{
140-
if ($associatedOrder->getDiscountDescription() === null && $invoiceItem->getDiscountAmount() == 0
140+
if ($associatedOrder->getDiscountDescription() === null
141+
&& $invoiceItem->getDiscountAmount() == 0
141142
&& $associatedOrder->getDiscountAmount() == 0
142143
) {
143144
$discounts = [];
144145
} else {
145-
$discounts [] = [
146+
$discounts[] = [
146147
'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
147148
'amount' => [
148149
'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,

‎app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php renamed to ‎app/code/Magento/SalesGraphQl/Model/TypeResolver/InvoiceItem.php

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

8-
namespace Magento\SalesGraphQl\Model;
8+
namespace Magento\SalesGraphQl\Model\TypeResolver;
99

1010
use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
1111
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1212

1313
/**
1414
* Resolve concrete type for InvoiceItemInterface
1515
*/
16-
class InvoiceItemTypeResolver implements TypeResolverInterface
16+
class InvoiceItem implements TypeResolverInterface
1717
{
1818
/**
1919
* @var array

‎app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php renamed to ‎app/code/Magento/SalesGraphQl/Model/TypeResolver/OrderItem.php

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

8-
namespace Magento\SalesGraphQl\Model;
8+
namespace Magento\SalesGraphQl\Model\TypeResolver;
99

1010
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1111
use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
1212

1313
/**
1414
* Resolve concrete type for OrderItemInterface
1515
*/
16-
class OrderItemTypeResolver implements TypeResolverInterface
16+
class OrderItem implements TypeResolverInterface
1717
{
1818
/**
1919
* @var array

‎app/code/Magento/SalesGraphQl/Model/ShipmentItemTypeResolver.php renamed to ‎app/code/Magento/SalesGraphQl/Model/TypeResolver/ShipmentItem.php

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

8-
namespace Magento\SalesGraphQl\Model;
8+
namespace Magento\SalesGraphQl\Model\TypeResolver;
99

1010
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1111
use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
1212

1313
/**
1414
* Resolve concrete type of ShipmentItemInterface
1515
*/
16-
class ShipmentItemTypeResolver implements TypeResolverInterface
16+
class ShipmentItem implements TypeResolverInterface
1717
{
1818
/**
1919
* @var array

‎app/code/Magento/SalesGraphQl/etc/graphql/di.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
9-
<type name="Magento\SalesGraphQl\Model\OrderItemTypeResolver">
9+
<type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
1010
<arguments>
1111
<argument name="productTypeMap" xsi:type="array">
1212
<item name="default" xsi:type="string">OrderItem</item>
1313
</argument>
1414
</arguments>
1515
</type>
16-
<type name="Magento\SalesGraphQl\Model\InvoiceItemTypeResolver">
16+
<type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
1717
<arguments>
1818
<argument name="productTypeMap" xsi:type="array">
1919
<item name="default" xsi:type="string">InvoiceItem</item>
2020
</argument>
2121
</arguments>
2222
</type>
23-
<type name="Magento\SalesGraphQl\Model\ShipmentItemTypeResolver">
23+
<type name="Magento\SalesGraphQl\Model\TypeResolver\ShipmentItem">
2424
<arguments>
2525
<argument name="productTypeMap" xsi:type="array">
2626
<item name="default" xsi:type="string">ShipmentItem</item>

‎app/code/Magento/SalesGraphQl/etc/schema.graphqls

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ type OrderAddress @doc(description: "OrderAddress contains detailed information
7777
vat_id: String @doc(description: "The customer's Value-added tax (VAT) number (for corporate customers)")
7878
}
7979

80-
interface OrderItemInterface @doc(description: "Order item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\OrderItemTypeResolver") {
80+
interface OrderItemInterface @doc(description: "Order item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\OrderItem") {
8181
id: ID! @doc(description: "The unique identifier of the order item")
8282
product_name: String @doc(description: "The name of the base product")
8383
product_sku: String! @doc(description: "The SKU of the base product")
@@ -129,7 +129,7 @@ type Invoice @doc(description: "Invoice details") {
129129
comments: [CommentItem] @doc(description: "Comments on the invoice")
130130
}
131131

132-
interface InvoiceItemInterface @doc(description: "Invoice item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\InvoiceItemTypeResolver") {
132+
interface InvoiceItemInterface @doc(description: "Invoice item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\InvoiceItem") {
133133
id: ID! @doc(description: "The unique ID of the invoice item")
134134
order_item: OrderItemInterface @doc(description: "Contains details about an individual order item")
135135
product_name: String @doc(description: "The name of the base product")
@@ -174,7 +174,7 @@ type CommentItem @doc(description: "Comment item details") {
174174
message: String! @doc(description: "The text of the message")
175175
}
176176

177-
interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\ShipmentItemTypeResolver"){
177+
interface ShipmentItemInterface @doc(description: "Order shipment item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\ShipmentItem"){
178178
id: ID! @doc(description: "Shipment item unique identifier")
179179
order_item: OrderItemInterface @doc(description: "Associated order item") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\OrderItem")
180180
product_name: String @doc(description: "Name of the base product")

‎dev/tests/integration/testsuite/Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping_rollback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
88

9-
Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_different_types_of_product_rollback.php');
9+
Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

‎dev/tests/integration/testsuite/Magento/Sales/_files/customer_order_with_two_items.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
->setBaseSubtotal(20)
9999
->setBaseShippingAmount(10)
100100
->setBaseGrandTotal(30)
101+
->setBaseCurrencyCode('USD')
101102
->setOrderCurrencyCode('USD')
102103
->setCustomerIsGuest(false)
103104
->setCustomerEmail($customerDataModel->getEmail())

0 commit comments

Comments
 (0)