From c180a6932d6d17b31ca07f62211e11b41f75e29c Mon Sep 17 00:00:00 2001
From: Bartosz Gorski <bartosz.m.gorski@gmail.com>
Date: Mon, 16 Aug 2021 02:59:44 +0200
Subject: [PATCH] Fixed the customerOrders queries containing sub-resolvers
 requiring 'model'

---
 .../SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php      | 4 ++--
 app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
index 1e9d282d80d94..fcdff88fe2b50 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Invoice/InvoiceItems.php
@@ -113,7 +113,7 @@ private function getInvoiceItemData(OrderInterface $order, InvoiceItemInterface
     {
         $orderItem = $this->orderItemProvider->getOrderItemById((int)$invoiceItem->getOrderItemId());
         return [
-            'id' => base64_encode($invoiceItem->getEntityId()),
+            'id' => \base64_encode((string)$invoiceItem->getEntityId()),
             'product_name' => $invoiceItem->getName(),
             'product_sku' => $invoiceItem->getSku(),
             'product_sale_price' => [
@@ -146,7 +146,7 @@ private function formatDiscountDetails(OrderInterface $associatedOrder, InvoiceI
             $discounts[] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
                 'amount' => [
-                    'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,
+                    'value' => \abs($invoiceItem->getDiscountAmount()) ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
index 25a79fa5d3b6c..a506e9b8ed28e 100644
--- a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
+++ b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -61,6 +61,7 @@ public function resolve(
                 'created_at' => $order->getCreatedAt(),
                 'grand_total' => $order->getGrandTotal(),
                 'status' => $order->getStatus(),
+                'model' => $order
             ];
         }
         return ['items' => $items];