Merge branch 'scandipwa:master' into 4589_confAttr

scandipwa · Jun 1, 2022 · d40c0ed · d40c0ed
2 parents 283bad4 + e6f2df4
commit d40c0ed
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 8 deletions.
diff --git a/src/Model/Resolver/ExpandedOrderResolver.php b/src/Model/Resolver/ExpandedOrderResolver.php
@@ -21,6 +21,7 @@
 use ScandiPWA\QuoteGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Sales\Model\OrderRepository;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Orders data resolver
@@ -42,19 +43,27 @@ class ExpandedOrderResolver implements ResolverInterface
      */
     protected $orderRepository;
 
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    protected $customerRepository;
+
     /**
      * @param CollectionFactoryInterface $collectionFactory
      * @param CheckCustomerAccount $checkCustomerAccount
      * @param OrderRepository $orderRepository
+     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
         CheckCustomerAccount $checkCustomerAccount,
-        OrderRepository $orderRepository
+        OrderRepository $orderRepository,
+        CustomerRepositoryInterface $customerRepository
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->checkCustomerAccount = $checkCustomerAccount;
         $this->orderRepository = $orderRepository;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -76,7 +85,9 @@ public function resolve(
         $orderId = $args['id'];
         $order = $this->orderRepository->get($orderId);
 
-        if ($customerId != $order->getCustomerId()) {
+        $customer = $this->customerRepository->getById($customerId);
+
+        if ($customerId !== $order->getCustomerId() && $customer->getEmail() !== $order->getCustomerEmail()) {
             throw new GraphQlNoSuchEntityException(__('Customer ID is invalid.'));
         }
 

diff --git a/src/Model/Resolver/GetCartForCustomer.php b/src/Model/Resolver/GetCartForCustomer.php
@@ -38,6 +38,7 @@
 use Magento\Downloadable\Model\LinkRepository;
 use Magento\Downloadable\Model\Link;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\Quote\Model\Quote\Validator\MinimumOrderAmount\ValidationMessage;
 
 class GetCartForCustomer extends CartResolver
 {
@@ -71,6 +72,9 @@ class GetCartForCustomer extends CartResolver
     /** @var IsInStorePickupDeliveryAvailableForCartInterface */
     protected $inStorePickupDeliveryAvailableForCart;
 
+    /** @var ValidationMessage */
+    protected $amountValidationMessage;
+
     /**
      * GetCartForCustomer constructor.
      * @param ParamOverriderCustomerId $overriderCustomerId
@@ -85,6 +89,7 @@ class GetCartForCustomer extends CartResolver
      * @param LinkRepository $linkRepository
      * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
      * @param IsInStorePickupDeliveryAvailableForCartInterface $inStorePickupDeliveryAvailableForCart
+     * @param ValidationResultFactory $validationResultFactory
      */
     public function __construct(
         ParamOverriderCustomerId $overriderCustomerId,
@@ -98,7 +103,8 @@ public function __construct(
         Json $serializer,
         LinkRepository $linkRepository,
         QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId,
-        IsInStorePickupDeliveryAvailableForCartInterface $inStorePickupDeliveryAvailableForCart
+        IsInStorePickupDeliveryAvailableForCartInterface $inStorePickupDeliveryAvailableForCart,
+        ValidationMessage $amountValidationMessage
     ) {
         parent::__construct(
             $guestCartRepository,
@@ -115,6 +121,7 @@ public function __construct(
         $this->linkRepository = $linkRepository;
         $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
         $this->inStorePickupDeliveryAvailableForCart = $inStorePickupDeliveryAvailableForCart;
+        $this->amountValidationMessage = $amountValidationMessage;
     }
 
     /**
@@ -267,6 +274,8 @@ public function resolve(
         $shipping_method = $address->getShippingMethod();
         $masked_id = $this->quoteIdToMaskedQuoteId->execute(intval($cart->getId()));
         $isInStorePickupAvailable = $this->inStorePickupDeliveryAvailableForCart->execute((int) $cart->getId());
+        $minimumOrderAmountReached = $cart->validateMinimumAmount();
+        $minimumOrderDescription = $this->amountValidationMessage->getMessage();
 
         return array_merge(
             $cartData,
@@ -284,7 +293,11 @@ public function resolve(
                 'shipping_incl_tax' => $shipping_incl_tax,
                 'shipping_method' => $shipping_method,
                 'shipping_address' => $cart->getShippingAddress(),
-                'is_in_store_pickup_available' => $isInStorePickupAvailable
+                'is_in_store_pickup_available' => $isInStorePickupAvailable,
+                'minimum_order_amount' => [
+                    'minimum_order_amount_reached' => $minimumOrderAmountReached,
+                    'minimum_order_description' => $minimumOrderDescription
+                ]
             ]
         );
     }

diff --git a/src/Model/Resolver/OrderListResolver.php b/src/Model/Resolver/OrderListResolver.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ScandiPWA - Progressive Web App for Magento
  *
@@ -19,6 +20,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
 use ScandiPWA\QuoteGraphQl\Model\Customer\CheckCustomerAccount;
+use Magento\Customer\Api\CustomerRepositoryInterface;
 
 /**
  * Orders data reslover
@@ -28,23 +30,32 @@ class OrderListResolver implements ResolverInterface
     /**
      * @var CollectionFactoryInterface
      */
-    private $collectionFactory;
+    protected $collectionFactory;
 
     /**
      * @var CheckCustomerAccount
      */
-    private $checkCustomerAccount;
+    protected $checkCustomerAccount;
+
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    protected $customerRepository;
 
     /**
      * @param CollectionFactoryInterface $collectionFactory
      * @param CheckCustomerAccount $checkCustomerAccount
+     * @param CustomerRepositoryInterface $customerRepository
      */
     public function __construct(
         CollectionFactoryInterface $collectionFactory,
-        CheckCustomerAccount $checkCustomerAccount
+        CheckCustomerAccount $checkCustomerAccount,
+        CustomerRepositoryInterface $customerRepository
     ) {
         $this->collectionFactory = $collectionFactory;
         $this->checkCustomerAccount = $checkCustomerAccount;
+        $this->customerRepository = $customerRepository;
     }
 
     /**
@@ -63,7 +74,14 @@ public function resolve(
 
         $this->checkCustomerAccount->execute($customerId, $context->getUserType());
 
-        $orders = $this->collectionFactory->create($customerId);
+        $customer = $this->customerRepository->getById($customerId);
+
+        $ordersCollection = $this->collectionFactory->create();
+        $ordersCollection->addFieldToFilter(
+            ['customer_id', 'customer_email'],
+            [['eq' => $customerId], ['eq' => $customer->getEmail()]]
+        );
+        $orders = $ordersCollection->load();
 
         foreach ($orders as $order) {
             $trackNumbers = [];

diff --git a/src/etc/schema.graphqls b/src/etc/schema.graphqls
@@ -205,6 +205,7 @@ interface TotalsObject @typeResolver(class: "\\ScandiPWA\\QuoteGraphQl\\Model\\R
     quote_currency_code: String
     items: [TotalsItem]
     is_in_store_pickup_available: Boolean
+    minimum_order_amount: MinimumOrderAmount
 }
 
 type TotalsItem {
@@ -241,6 +242,11 @@ type SelectedDownloadableLinks {
     id: Int
 }
 
+type MinimumOrderAmount {
+    minimum_order_amount_reached: Boolean
+    minimum_order_description: String
+}
+
 type TotalsSegment {
     code: String
     title: String