[ECP-9017] Migrate to Adyen Web library V6

Block/Checkout/Multishipping/Success.php

@@ -76,6 +76,11 @@ class Success extends \Magento\Multishipping\Block\Checkout\Success
      */
     private $ordersInfo;
 
+    /**
+     * @var
+     */
+    private $billingCountryCode = null;
+
     public function __construct(
         Collection $paymentResponseCollection,
         Data $adyenHelper,
@@ -175,6 +180,7 @@ private function setOrderInfo($orderIds)
                     default:
                         $this->ordersInfo[$order->getEntityId()]['buttonLabel'] = $this->getCompletePaymentLabel();
                 }
+                $this->setBillingCountryCode($order->getBillingAddress()->getCountryId());
             }
         }
     }
@@ -214,4 +220,14 @@ public function setIsAdyenPayment(bool $isAdyenPayment)
     {
         $this->isAdyenPayment = $isAdyenPayment;
     }
+
+    public function setBillingCountryCode(string $countryCode): void
+    {
+        $this->billingCountryCode = $countryCode;
+    }
+
+    public function getBillingCountryCode(): ?string
+    {
+        return $this->billingCountryCode;
+    }
 }

Test/Unit/Block/Checkout/Multishipping/SuccessTest.php

@@ -12,14 +12,17 @@
 namespace Adyen\Payment\Test\Unit\Block\Checkout\Multishipping;
 
 use Adyen\Payment\Block\Checkout\Multishipping\Success;
+use Adyen\Payment\Helper\PaymentMethods;
 use Adyen\Payment\Test\Unit\AbstractAdyenTestCase;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Session\SessionManager;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
+use Magento\Sales\Api\Data\OrderAddressInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
 
 class SuccessTest extends AbstractAdyenTestCase
 {
@@ -29,6 +32,11 @@ class SuccessTest extends AbstractAdyenTestCase
     private $orderRepositoryMock;
     private $searchCriteriaBuilderMock;
     private $orderSearchResultMock;
+    private $orderMock;
+    private $paymentMock;
+    private $paymentMethodHelperMock;
+
+    const ORDER_BILLING_ADDRESS_COUNTRY = 'TR';
 
     protected function setUp(): void
     {
@@ -40,8 +48,22 @@ protected function setUp(): void
         $this->contextMock = $this->createMock(Context::class);
         $this->contextMock->method('getSession')->willReturn($this->sessionMock);
 
+        $this->paymentMock = $this->createMock(Order\Payment::class);
+        $this->paymentMock->method('getMethod')->willReturn('adyen_cc');
+        $this->paymentMock->method('getAdditionalInformation')->willReturn([
+            'resultCode' => 'Authorised'
+        ]);
+
+        $billingAddressMock = $this->createMock(OrderAddressInterface::class);
+        $billingAddressMock->method('getCountryId')->willReturn(self::ORDER_BILLING_ADDRESS_COUNTRY);
+
+        $this->orderMock = $this->createMock(Order::class);
+        $this->orderMock->method('getPayment')->willReturn($this->paymentMock);
+        $this->orderMock->method('getEntityId')->willReturn(1);
+        $this->orderMock->method('getBillingAddress')->willReturn($billingAddressMock);
+
         $this->orderSearchResultMock = $this->createMock(OrderSearchResultInterface::class);
-        $this->orderSearchResultMock->method('getItems')->willReturn([]);
+        $this->orderSearchResultMock->method('getItems')->willReturn([$this->orderMock]);
 
         $this->orderRepositoryMock = $this->createMock(OrderRepositoryInterface::class);
         $this->orderRepositoryMock->method('getList')->willReturn($this->orderSearchResultMock);
@@ -51,6 +73,9 @@ protected function setUp(): void
             $this->createMock(SearchCriteriaInterface::class)
         );
 
+        $this->paymentMethodHelperMock = $this->createMock(PaymentMethods::class);
+        $this->paymentMethodHelperMock->method('isAdyenPayment')->willReturn(true);
+
         $payments = [
             ['result_code' => 'Authorised'],
             ['result_code' => 'IdentifyShopper', 'action' => 'DUMMY_ACTION_OBJECT']
@@ -61,7 +86,8 @@ protected function setUp(): void
             'paymentResponseEntities' => $payments,
             'context' => $this->contextMock,
             'orderRepository' => $this->orderRepositoryMock,
-            'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock
+            'searchCriteriaBuilder' => $this->searchCriteriaBuilderMock,
+            'paymentMethodsHelper' => $this->paymentMethodHelperMock
         ]);
     }
 
@@ -70,4 +96,12 @@ public function testRenderAction()
         $result = $this->successBlock->renderAction();
         $this->assertTrue($result);
     }
+
+    public function testBillingCountryCodeSetterGetter()
+    {
+        $this->assertEquals(
+            self::ORDER_BILLING_ADDRESS_COUNTRY,
+            $this->successBlock->getBillingCountryCode()
+        );
+    }
 }