Merge remote-tracking branch 'origin/2.5-develop' into 2.5-bugfixes-010521

bubasuma · bubasuma · commit b8c403a4eb0f · 2021-01-26T07:09:42.000-06:00
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php b/app/code/Magento/SalesGraphQl/Model/Resolver/OrderTotal.php
@@ -60,7 +60,8 @@ public function resolve(
                 ],
                 'taxes' => $this->getAppliedShippingTaxesDetails($order),
                 'discounts' => $this->getShippingDiscountDetails($order),
-            ]
+            ],
+            'model' => $order
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,8 @@ public function resolve(`
`60`	`60`	`],`
`61`	`61`	`'taxes' => $this->getAppliedShippingTaxesDetails($order),`
`62`	`62`	`'discounts' => $this->getShippingDiscountDetails($order),`
`63`		`- ]`
	`63`	`+ ],`
	`64`	`+ 'model' => $order`
`64`	`65`	`];`
`65`	`66`	`}`
`66`	`67`