From 766e7f51a291db8e000ea2e2e77f1e6814664a89 Mon Sep 17 00:00:00 2001
From: Ilan Parmentier <ilan.parmentier@artbambou.com>
Date: Tue, 1 Feb 2022 14:19:32 +0100
Subject: [PATCH 1/3] Form validation attributes

---
 .../templates/customer/lookupform.phtml       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/view/frontend/templates/customer/lookupform.phtml b/view/frontend/templates/customer/lookupform.phtml
index 8b41418..36fb0da 100644
--- a/view/frontend/templates/customer/lookupform.phtml
+++ b/view/frontend/templates/customer/lookupform.phtml
@@ -8,7 +8,13 @@
 /**  @var $block MagePal\GuestToCustomer\Block\Customer\LookupForm */
 ?>
 
-<form class="form form-edit-account" action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" method="post" id="form-validate" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" autocomplete="off">
+<form class="form form-edit-account" 
+      action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" 
+      method="post" 
+      id="form-validate" 
+      data-mage-init='{"validation": {}}'
+      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" 
+      autocomplete="off">
     <fieldset class="fieldset info">
         <?= $block->getBlockHtml('formkey') ?>
         <legend class="legend"><span><?= $block->escapeHtml(__('Guest Order Information')) ?></span></legend><br>
@@ -33,6 +39,7 @@
     </fieldset>
 
     <?= $block->getChildHtml('form_additional_info') ?>
+    
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>
@@ -42,14 +49,3 @@
         </div>
     </div>
 </form>
-<script>
-    require([
-        "jquery",
-        "mage/mage"
-    ], function($){
-        var dataForm = $('#form-validate');
-
-        dataForm.mage('validation', {});
-
-    });
-</script>

From 0841e58a624f1b62da7405ca923b2f031916670b Mon Sep 17 00:00:00 2001
From: Ilan Parmentier <ilan.parmentier@artbambou.com>
Date: Tue, 1 Feb 2022 14:33:21 +0100
Subject: [PATCH 2/3] Update lookupform.phtml

---
 .../templates/customer/lookupform.phtml       | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/view/frontend/templates/customer/lookupform.phtml b/view/frontend/templates/customer/lookupform.phtml
index 36fb0da..1bd37b9 100644
--- a/view/frontend/templates/customer/lookupform.phtml
+++ b/view/frontend/templates/customer/lookupform.phtml
@@ -7,39 +7,50 @@
 
 /**  @var $block MagePal\GuestToCustomer\Block\Customer\LookupForm */
 ?>
-
 <form class="form form-edit-account" 
-      action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" 
-      method="post" 
-      id="form-validate" 
-      data-mage-init='{"validation": {}}'
-      data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" 
-      autocomplete="off">
+    action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" 
+    method="post" 
+    id="form-validate" 
+    data-mage-init='{"validation": {}}'
+    data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" 
+    autocomplete="off">
     <fieldset class="fieldset info">
         <?= $block->getBlockHtml('formkey') ?>
         <legend class="legend"><span><?= $block->escapeHtml(__('Guest Order Information')) ?></span></legend><br>
         <div class="field field-order-increment required">
             <label class="label" for="order-increment">
-                <span><?= __('Order Number') ?></span>
+                <span><?= $block->escapeHtml(__('Order Number')) ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="order-increment" name="order_increment" value="" title="Order Number" class="input-text required-entry" data-validate="{required:true}" aria-required="true">
+                <input type="text" 
+                    id="order-increment" 
+                    name="order_increment" 
+                    value="" 
+                    title="<?= $block->escapeHtmlAttr(__('Order Number')) ?>" 
+                    class="input-text required-entry" 
+                    data-validate="{required: true}" 
+                    aria-required="true">
             </div>
         </div>
         <div class="field field-email required">
             <label class="label" for="email">
-                <span><?= __('Email') ?></span>
+                <span><?= $block->escapeHtml(__('Email')) ?></span>
             </label>
 
             <div class="control">
-                <input type="text" id="email" name="email" value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" title="First Name" class="input-text required-entry" data-validate="{required:true}" aria-required="true" disabled>
+                <input type="email" 
+                    id="email" 
+                    name="email" 
+                    value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" 
+                    title="<?= $block->escapeHtmlAttr(__('Email')) ?>" 
+                    class="input-text" 
+                    disabled>
             </div>
         </div>
     </fieldset>
 
     <?= $block->getChildHtml('form_additional_info') ?>
-    
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>

From 52a0158b6b5169cb7762952f65368c3b24e29686 Mon Sep 17 00:00:00 2001
From: Ilan Parmentier <ilan.parmentier@artbambou.com>
Date: Tue, 1 Feb 2022 15:34:55 +0100
Subject: [PATCH 3/3] Update lookupform.phtml

---
 .../templates/customer/lookupform.phtml       | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/view/frontend/templates/customer/lookupform.phtml b/view/frontend/templates/customer/lookupform.phtml
index 1bd37b9..a819589 100644
--- a/view/frontend/templates/customer/lookupform.phtml
+++ b/view/frontend/templates/customer/lookupform.phtml
@@ -5,21 +5,22 @@
  * https://www.magepal.com | support@magepal.com
  */
 
-/**  @var $block MagePal\GuestToCustomer\Block\Customer\LookupForm */
+/** @var $escaper \Magento\Framework\Escaper */
+/** @var $block MagePal\GuestToCustomer\Block\Customer\LookupForm */
 ?>
 <form class="form form-edit-account" 
-    action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" 
+    action="<?= $escaper->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>" 
     method="post" 
     id="form-validate" 
     data-mage-init='{"validation": {}}'
-    data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>" 
+    data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>" 
     autocomplete="off">
     <fieldset class="fieldset info">
         <?= $block->getBlockHtml('formkey') ?>
-        <legend class="legend"><span><?= $block->escapeHtml(__('Guest Order Information')) ?></span></legend><br>
+        <legend class="legend"><span><?= $escaper->escapeHtml(__('Guest Order Information')) ?></span></legend><br>
         <div class="field field-order-increment required">
             <label class="label" for="order-increment">
-                <span><?= $block->escapeHtml(__('Order Number')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Order Number')) ?></span>
             </label>
 
             <div class="control">
@@ -27,7 +28,7 @@
                     id="order-increment" 
                     name="order_increment" 
                     value="" 
-                    title="<?= $block->escapeHtmlAttr(__('Order Number')) ?>" 
+                    title="<?= $escaper->escapeHtmlAttr(__('Order Number')) ?>" 
                     class="input-text required-entry" 
                     data-validate="{required: true}" 
                     aria-required="true">
@@ -35,15 +36,15 @@
         </div>
         <div class="field field-email required">
             <label class="label" for="email">
-                <span><?= $block->escapeHtml(__('Email')) ?></span>
+                <span><?= $escaper->escapeHtml(__('Email')) ?></span>
             </label>
 
             <div class="control">
                 <input type="email" 
                     id="email" 
                     name="email" 
-                    value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" 
-                    title="<?= $block->escapeHtmlAttr(__('Email')) ?>" 
+                    value="<?= $escaper->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>" 
+                    title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>" 
                     class="input-text" 
                     disabled>
             </div>
@@ -51,12 +52,13 @@
     </fieldset>
 
     <?= $block->getChildHtml('form_additional_info') ?>
+    
     <div class="actions-toolbar">
         <div class="primary">
-            <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>
+            <button type="submit" class="action save primary" title="<?= $escaper->escapeHtmlAttr(__('Save')) ?>"><span><?= $escaper->escapeHtml(__('Save')) ?></span></button>
         </div>
         <div class="secondary">
-            <a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
+            <a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>"><span><?= $escaper->escapeHtml(__('Go back')) ?></span></a>
         </div>
     </div>
 </form>