Skip to content

Commit d8445a3

Browse files
srenonsrenon
committed
Add Hyva support
1 parent d0c57b0 commit d8445a3

5 files changed

+60
-22
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"magepal/magento2-core": ">=1.1.11"
3333
},
3434
"type": "magento2-module",
35-
"version": "1.3.2",
35+
"version": "1.4.0",
3636
"autoload": {
3737
"files": [
3838
"registration.php"

‎view/frontend/layout/customer_guesttocustomer_lookupform.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<css src="MagePal_GuestToCustomer::css/styles.css" />
1313
</head>
1414
<body>
15-
<!--referenceBlock name="page.main.title">
16-
<action method="setPageTitle">
17-
<argument translate="true" name="title" xsi:type="string">Guest Order Information</argument>
18-
</action>
19-
</referenceBlock-->
2015
<referenceContainer name="content">
21-
<block class="MagePal\GuestToCustomer\Block\Customer\LookupForm" name="customer_edit" template="MagePal_GuestToCustomer::customer/lookupform.phtml" cacheable="false">
16+
<block class="MagePal\GuestToCustomer\Block\Customer\LookupForm"
17+
name="customer_edit" template="MagePal_GuestToCustomer::customer/lookupform.phtml" cacheable="false">
2218
<container name="form.additional.info" as="form_additional_info"/>
19+
<container name="content.body.end" as="content_body_end">
20+
<block class="Magento\Framework\View\Element\Template" name="customer_form_validation"
21+
template="MagePal_GuestToCustomer::customer/validation.phtml" cacheable="false" />
22+
</container>
2323
</block>
2424
</referenceContainer>
2525
</body>

‎view/frontend/layout/hyva_customer_guesttocustomer_lookupform.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © MagePal LLC. All rights reserved.
5+
* See COPYING.txt for license details.
6+
* https://www.magepal.com | [email protected]
7+
*/
8+
-->
9+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
10+
<body>
11+
<referenceContainer name="content_body_end">
12+
<referenceBlock name="customer_form_validation" remove="true"/>
13+
</referenceContainer>
14+
<referenceBlock name="customer_edit">
15+
<arguments>
16+
<argument name="is_hyva" xsi:type="boolean">true</argument>
17+
</arguments>
18+
</referenceBlock>
19+
</body>
20+
</page>

‎view/frontend/templates/customer/lookupform.phtml

+24-15
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,25 @@
88
/** @var $block MagePal\GuestToCustomer\Block\Customer\LookupForm */
99
?>
1010

11-
<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">
11+
<form class="form form-edit-account"
12+
action="<?= $block->escapeUrl($block->getUrl('customer/guesttocustomer/lookupformPost')) ?>"
13+
method="post" id="form-validate"
14+
data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"
15+
autocomplete="off" >
1216
<fieldset class="fieldset info">
1317
<?= $block->getBlockHtml('formkey') ?>
14-
<legend class="legend"><span><?= $block->escapeHtml(__('Guest Order Information')) ?></span></legend><br>
18+
<legend class="legend">
19+
<span><?= $block->escapeHtml(__('Guest Order Information')) ?></span>
20+
</legend><br>
1521
<div class="field field-order-increment required">
1622
<label class="label" for="order-increment">
1723
<span><?= __('Order Number') ?></span>
1824
</label>
1925

2026
<div class="control">
21-
<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">
27+
<input type="text" id="order-increment" name="order_increment" value=""
28+
title="Order Number" class="input-text required-entry"
29+
data-validate="{required:true}" aria-required="true" <?= $block->getIsHyva() ? 'required' : '' ?> >
2230
</div>
2331
</div>
2432
<div class="field field-email required">
@@ -27,29 +35,30 @@
2735
</label>
2836

2937
<div class="control">
30-
<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>
38+
<input type="text" id="email" name="email"
39+
value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>"
40+
title="First Name" class="input-text required-entry" data-validate="{required:true}"
41+
aria-required="true" disabled>
3142
</div>
3243
</div>
3344
</fieldset>
3445

3546
<?= $block->getChildHtml('form_additional_info') ?>
47+
3648
<div class="actions-toolbar">
3749
<div class="primary">
38-
<button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"><span><?= $block->escapeHtml(__('Save')) ?></span></button>
50+
<button type="submit" class="action save primary"
51+
title="<?= $block->escapeHtmlAttr(__('Save')) ?>">
52+
<span><?= $block->escapeHtml(__('Save')) ?></span>
53+
</button>
3954
</div>
4055
<div class="secondary">
41-
<a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
56+
<a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
57+
<span><?= $block->escapeHtml(__('Go back')) ?></span>
58+
</a>
4259
</div>
4360
</div>
4461
</form>
45-
<script>
46-
require([
47-
"jquery",
48-
"mage/mage"
49-
], function($){
50-
var dataForm = $('#form-validate');
5162

52-
dataForm.mage('validation', {});
63+
<?= $block->getChildHtml('content_body_end') ?>
5364

54-
});
55-
</script>

‎view/frontend/templates/customer/validation.phtml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<script>
2+
require([
3+
"jquery",
4+
"mage/mage"
5+
], function($){
6+
var dataForm = $('#form-validate');
7+
dataForm.mage('validation', {});
8+
});
9+
</script>

0 commit comments

Comments
 (0)