Merge remote-tracking branch 'origin/MAGETWO-90801' into 2.3-develop-pr19

Author: svitja

app/code/Magento/Checkout/Block/Registration.php

@@ -91,7 +91,7 @@ public function getEmailAddress()
      */
     public function getCreateAccountUrl()
     {
-        return $this->getUrl('checkout/account/create');
+        return $this->getUrl('checkout/account/delegateCreate');
     }
 
     /**

app/code/Magento/Checkout/Controller/Account/Create.php

@@ -9,6 +9,10 @@
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * @deprecated
+ * @see DelegateCreate
+ */
 class Create extends \Magento\Framework\App\Action\Action
 {
     /**

app/code/Magento/Checkout/Controller/Account/DelegateCreate.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Checkout\Controller\Account;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Action\Context;
+use Magento\Checkout\Model\Session;
+use Magento\Sales\Api\OrderCustomerDelegateInterface;
+
+/**
+ * Redirect guest customer for registration.
+ */
+class DelegateCreate extends Action
+{
+    /**
+     * @var OrderCustomerDelegateInterface
+     */
+    private $delegateService;
+
+    /**
+     * @var Session
+     */
+    private $session;
+
+    /**
+     * @param Context $context
+     * @param OrderCustomerDelegateInterface $customerDelegation
+     * @param Session $session
+     */
+    public function __construct(
+        Context $context,
+        OrderCustomerDelegateInterface $customerDelegation,
+        Session $session
+    ) {
+        parent::__construct($context);
+        $this->delegateService = $customerDelegation;
+        $this->session = $session;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function execute()
+    {
+        /** @var string|null $orderId */
+        $orderId = $this->session->getLastOrderId();
+        if (!$orderId) {
+            return $this->resultRedirectFactory->create()->setPath('/');
+        }
+
+        return $this->delegateService->delegateNew((int)$orderId);
+    }
+}

app/code/Magento/Checkout/view/frontend/web/js/view/registration.js

@@ -38,7 +38,16 @@ define([
         },
 
         /**
-         * Create new user account
+         * @return String
+         */
+        getUrl: function () {
+            return this.registrationUrl;
+        },
+
+        /**
+         * Create new user account.
+         *
+         * @deprecated
          */
         createAccount: function () {
             this.creationStarted(true);

app/code/Magento/Checkout/view/frontend/web/template/registration.html

@@ -11,11 +11,8 @@
     <!-- ko if: isFormVisible -->
     <p data-bind="i18n: 'You can track your order status by creating an account.'"></p>
     <p><span data-bind="i18n: 'Email Address'"></span>: <span data-bind="text: getEmailAddress()"></span></p>
-    <form method="post" data-bind="submit: createAccount">
-        <input type="submit" class="action primary" data-bind="value: $t('Create an Account'), disable: creationStarted" />
+    <form method="get" data-bind="attr: { action: getUrl() }">
+        <input type="submit" class="action primary" data-bind="value: $t('Create an Account')" />
     </form>
-    <!-- /ko -->
-    <!-- ko if: accountCreated -->
-    <p data-bind="i18n: 'A letter with further instructions will be sent to your email.'"></p>
-    <!-- /ko -->
+    <!--/ko-->
 </div>

app/code/Magento/Customer/Api/AccountDelegationInterface.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Api;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Controller\Result\Redirect;
+
+/**
+ * Delegating account actions from outside of customer module.
+ */
+interface AccountDelegationInterface
+{
+    /**
+     * Create redirect to default new account form.
+     *
+     * @param CustomerInterface $customer Pre-filled customer data.
+     * @param array|null $mixedData Add this data to new-customer event
+     * if the new customer is created.
+     *
+     * @return Redirect
+     */
+    public function createRedirectForNew(
+        CustomerInterface $customer,
+        array $mixedData = null
+    ): Redirect;
+}

app/code/Magento/Customer/Model/Delegation/AccountDelegation.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Delegation;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\AccountDelegationInterface;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\RedirectFactory;
+
+/**
+ * {@inheritdoc}
+ */
+class AccountDelegation implements AccountDelegationInterface
+{
+    /**
+     * @var RedirectFactory
+     */
+    private $redirectFactory;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @param RedirectFactory $redirectFactory
+     * @param Storage $storage
+     */
+    public function __construct(
+        RedirectFactory $redirectFactory,
+        Storage $storage
+    ) {
+        $this->redirectFactory = $redirectFactory;
+        $this->storage = $storage;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function createRedirectForNew(
+        CustomerInterface $customer,
+        array $mixedData = null
+    ): Redirect {
+        $this->storage->storeNewOperation($customer, $mixedData);
+
+        return $this->redirectFactory->create()->setPath('customer/account/create');
+    }
+}

app/code/Magento/Customer/Model/Delegation/Data/NewOperation.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\Delegation\Data;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+
+/**
+ * Data required for delegated new-account operation.
+ */
+class NewOperation
+{
+    /**
+     * @var CustomerInterface
+     */
+    private $customer;
+
+    /**
+     * @var array
+     */
+    private $additionalData;
+
+    /**
+     * @param CustomerInterface $customer
+     * @param array $additionalData
+     */
+    public function __construct(
+        CustomerInterface $customer,
+        array $additionalData
+    ) {
+        $this->customer = $customer;
+        $this->additionalData = $additionalData;
+    }
+
+    /**
+     * @return CustomerInterface
+     */
+    public function getCustomer(): CustomerInterface
+    {
+        return $this->customer;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAdditionalData(): array
+    {
+        return $this->additionalData;
+    }
+}