Merge pull request #6 from Vendic/feature/SWEHY-15

Feature/SWEHY-15
Vendic · Oct 9, 2023 · 48d5213 · 48d5213
2 parents 39abe6f + e152bce
commit 48d5213
Show file tree

Hide file tree

Showing 7 changed files with 133 additions and 4 deletions.
diff --git a/Model/Config.php b/Model/Config.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+/**
+ * @copyright   Copyright (c) Vendic B.V https://vendic.nl/
+ */
+
+namespace Vendic\HyvaCheckoutCreateAccount\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+class Config
+{
+    private const IS_ENABLED = 'hyva_themes_checkout/new_customer/enable';
+    private const SEND_RESET_PASSWORD_MAIL = 'hyva_themes_checkout/new_customer/send_reset_password_mail';
+    private const NEW_PASSWORD_TEMPLATE = 'hyva_themes_checkout/new_customer/create_password_template';
+
+    public function __construct(private ScopeConfigInterface $scopeConfig)
+    {
+    }
+
+    public function isEnabled(): bool
+    {
+        return (bool)$this->scopeConfig->getValue(
+            self::IS_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    public function sendPasswordMailEnabled(): bool
+    {
+        return (bool)$this->scopeConfig->getValue(
+            self::SEND_RESET_PASSWORD_MAIL,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+
+    public function getNewPasswordTemplate(): string
+    {
+        return $this->scopeConfig->getValue(
+            self::NEW_PASSWORD_TEMPLATE,
+            ScopeInterface::SCOPE_STORE
+        );
+    }
+}
diff --git a/Observer/ConvertGuestToCustomer.php b/Observer/ConvertGuestToCustomer.php
@@ -17,6 +17,7 @@
 use Magento\Checkout\Model\Session as CheckoutSession;
 use Psr\Log\LoggerInterface;
 use Vendic\HyvaCheckoutCreateAccount\Magewire\Checkbox;
+use Vendic\HyvaCheckoutCreateAccount\Model\Config;
 
 class ConvertGuestToCustomer implements ObserverInterface
 {
@@ -26,7 +27,8 @@ public function __construct(
         private AccountManagementInterface $accountManagement,
         private StoreManagerInterface $storeManager,
         private CheckoutSession $checkoutSession,
-        private LoggerInterface $logger
+        private LoggerInterface $logger,
+        private Config $newAccountConfig
     ) {
     }
 
@@ -56,7 +58,9 @@ public function execute(Observer $observer): void
             // Ideally we should make this configurable.
             ->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
 
-        $this->sendPasswordResetEmail($customer->getEmail());
+        if ($this->newAccountConfig->sendPasswordMailEnabled()) {
+            $this->sendPasswordResetEmail($customer->getEmail());
+        }
     }
 
     private function createNewCustomerFromQuote(Quote $quote): ?\Magento\Customer\Api\Data\CustomerInterface
@@ -84,7 +88,7 @@ private function sendPasswordResetEmail(string $email): void
         try {
             $this->accountManagement->initiatePasswordReset(
                 $email,
-                AccountManagement::EMAIL_RESET,
+                $this->newAccountConfig->getNewPasswordTemplate(),
                 $this->storeManager->getStore()->getWebsiteId()
             );
         } catch (Exception $e) {

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="hyva_themes_checkout">
+            <include path="Vendic_HyvaCheckoutCreateAccount::system/new_customer.xml"/>
+        </section>
+    </system>
+</config>
diff --git a/etc/adminhtml/system/new_customer.xml b/etc/adminhtml/system/new_customer.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
+    <group id="new_customer"
+       showInDefault="1"
+       showInWebsite="1"
+       showInStore="1"
+       sortOrder="55"
+       translate="label">
+        <label>New Customer</label>
+
+        <field id="enable"
+               type="select"
+               translate="label"
+               showInDefault="1"
+               showInWebsite="1"
+               showInStore="1"
+               canRestore="1">
+            <label>Enable New Customer</label>
+            <comment>Will add a checkbox to checkout for creating a new account.</comment>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        </field>
+
+        <field id="send_reset_password_mail"
+               type="select"
+               translate="label"
+               showInDefault="1"
+               showInWebsite="1"
+               showInStore="1"
+               canRestore="1">
+            <label>Send Reset Password Mail</label>
+            <comment>This will send a reset password mail after creating a new account.</comment>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            <depends>
+                <field id="enable">1</field>
+            </depends>
+        </field>
+
+        <field id="create_password_template"
+               type="select"
+               translate="label"
+               showInDefault="1"
+               showInWebsite="1"
+               showInStore="1"
+               canRestore="1">
+            <label>Create Password Template</label>
+            <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+            <depends>
+                <field id="enable">1</field>
+            </depends>
+        </field>
+
+    </group>
+</include>
diff --git a/etc/config.xml b/etc/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <hyva_themes_checkout>
+            <new_customer>
+                <enable>1</enable>
+                <send_reset_password_mail>1</send_reset_password_mail>
+                <create_password_template>hyva_themes_checkout_new_customer_create_password_template</create_password_template>
+            </new_customer>
+        </hyva_themes_checkout>
+    </default>
+</config>
diff --git a/etc/email_templates.xml b/etc/email_templates.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd">
+    <template id="hyva_themes_checkout_new_customer_create_password_template" label="Create Password" file="password_reset.html" type="html" module="Magento_Customer" area="frontend"/>
+</config>
diff --git a/view/frontend/layout/hyva_checkout_components.xml b/view/frontend/layout/hyva_checkout_components.xml
@@ -4,7 +4,9 @@
     <body>
         <referenceContainer name="checkout.section.quote-actions">
             <container name="create-account.wrapper" htmlTag="div" htmlClass="mt-4">
-                <block name="create-account" template="Vendic_HyvaCheckoutCreateAccount::create-account.phtml">
+                <block name="create-account"
+                       template="Vendic_HyvaCheckoutCreateAccount::create-account.phtml"
+                       ifconfig="hyva_themes_checkout/new_customer/enable">
                     <block name="create-account.checkbox" as="checkbox">
                         <arguments>
                             <argument name="magewire" xsi:type="object">