get customer id from cart not context

magento · Jul 28, 2020 · 986d5b1 · 986d5b1
1 parent afaede9
commit 986d5b1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/HostedPro/SetPaymentMethodOnCart.php
@@ -8,7 +8,6 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\HostedPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -48,7 +47,6 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -57,8 +55,7 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData,
-        ContextInterface $context
+        array $paymentData
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_HOSTEDPRO, $paymentData);
 

diff --git a/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php b/app/code/Magento/PaypalGraphQl/Model/Plugin/Cart/PayflowPro/SetPaymentMethodOnCart.php
@@ -8,7 +8,6 @@
 namespace Magento\PaypalGraphQl\Model\Plugin\Cart\PayflowPro;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Paypal\Model\Config;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
@@ -49,7 +48,6 @@ public function __construct(
      * @param mixed $result
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @return void
      * @throws GraphQlInputException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -58,13 +56,11 @@ public function afterExecute(
         \Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart $subject,
         $result,
         Quote $cart,
-        array $paymentData,
-        ContextInterface $context
+        array $paymentData
     ): void {
         $paymentData = $this->additionalDataProviderPool->getData(Config::METHOD_PAYFLOWPRO, $paymentData);
-
-        if (!$context->getExtensionAttributes()->getIsCustomer()
-            && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
+        $cartCustomerId = (int)$cart->getCustomerId();
+        if ($cartCustomerId === 0 && array_key_exists(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER, $paymentData)) {
             $payment = $cart->getPayment();
             $payment->unsAdditionalInformation(PayflowProSetCcData::IS_ACTIVE_PAYMENT_TOKEN_ENABLER);
             $payment->save();

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -11,15 +11,14 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\PaymentInterface;
 use Magento\Quote\Api\Data\PaymentInterfaceFactory;
 use Magento\Quote\Api\PaymentMethodManagementInterface;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
 
 /**
- * Set payment method for cart
+ * Set payment method on cart
  */
 class SetPaymentMethodOnCart
 {
@@ -58,12 +57,11 @@ public function __construct(
      *
      * @param Quote $cart
      * @param array $paymentData
-     * @param ContextInterface $context
      * @throws GraphQlInputException
      * @throws GraphQlNoSuchEntityException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function execute(Quote $cart, array $paymentData, ContextInterface $context): void
+    public function execute(Quote $cart, array $paymentData): void
     {
         if (!isset($paymentData['code']) || empty($paymentData['code'])) {
             throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/SetPaymentMethodOnCart.php
@@ -68,7 +68,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         $cart = $this->getCartForUser->execute($maskedCartId, $context->getUserId(), $storeId);
         $this->checkCartCheckoutAllowance->execute($cart);
-        $this->setPaymentMethodOnCart->execute($cart, $paymentData, $context);
+        $this->setPaymentMethodOnCart->execute($cart, $paymentData);
 
         return [
             'cart' => [