Skip to content

Stop nesting form elements in the checkout address step #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
boo-code wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Stop nesting form elements in the checkout address step #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions templates/checkout/_partials/address-form.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
<button type="submit" class="btn btn-primary float-xs-right">{l s='Save' d='Shop.Theme.Actions'}</button>
<a class="js-cancel-address cancel-address float-xs-right" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
{else}
<form>
{* WHY: not a <form>. This block is rendered inside the address form, so a nested form here is
dropped by the HTML parser while its </form> closes the address form early. *}
<div class="clearfix">
<button type="submit" class="continue btn btn-primary float-xs-right" name="confirm-addresses" value="1">
{l s='Continue' d='Shop.Theme.Actions'}
</button>
{if $customer.addresses|count > 0}
<a class="js-cancel-address cancel-address float-xs-right" href="{url entity='order' params=['cancelAddress' => {$type}]}">{l s='Cancel' d='Shop.Theme.Actions'}</a>
{/if}
</form>
</div>
{/if}
{/block}
3 changes: 2 additions & 1 deletion templates/checkout/_partials/address-selector-block.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
type="radio"
name="{$name}"
value="{$address.id}"
{if isset($form_id)}form="{$form_id}"{/if}
{if $address.id == $selected}checked{/if}
>
<span></span>
Expand Down Expand Up @@ -66,7 +67,7 @@
{/foreach}
{if $interactive}
<p>
<button class="ps-hidden-by-js form-control-submit center-block" type="submit">{l s='Save' d='Shop.Theme.Actions'}</button>
<button class="ps-hidden-by-js form-control-submit center-block" type="submit"{if isset($form_id)} form="{$form_id}"{/if}>{l s='Save' d='Shop.Theme.Actions'}</button>
</p>
{/if}
{/block}
158 changes: 83 additions & 75 deletions templates/checkout/_partials/steps/addresses.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,113 +25,121 @@
{extends file='checkout/_partials/steps/checkout-step.tpl'}

{block name='step_content'}
{$addresses_form_id = 'checkout-addresses-form'}
<div class="js-address-form">
{* WHY: this step also renders full address <form> elements (checkout/_partials/address-form.tpl).
Wrapping those in this form produced nested <form> tags: the HTML parser drops the inner start
tag and lets the inner </form> close THIS form instead, which orphaned the address selector and
the Continue button that follow it. This form therefore stays empty and its controls are
attached explicitly through the form attribute. *}
<form
id="{$addresses_form_id}"
method="POST"
data-id-address="{$id_address}"
action="{url entity='order' params=['id_address' => $id_address]}"
data-refresh-url="{url entity='order' params=['ajax' => 1, 'action' => 'addressForm']}"
>
></form>

{if $use_same_address}
{if $use_same_address}
<p>
{if $cart.is_virtual}
{l s='The selected address will be used as your personal address (for invoice).' d='Shop.Theme.Checkout'}
{else}
{l s='The selected address will be used both as your personal address (for invoice) and as your delivery address.' d='Shop.Theme.Checkout'}
{/if}
</p>
{else}
<h2 class="h4">{l s='Shipping Address' d='Shop.Theme.Checkout'}</h2>
{/if}

{if $show_delivery_address_form}
<div id="delivery-address">
{render file = 'checkout/_partials/address-form.tpl'
ui = $address_form
use_same_address = $use_same_address
type = "delivery"
form_has_continue_button = $form_has_continue_button
}
</div>
{elseif $customer.addresses|count > 0}
<div id="delivery-addresses" class="address-selector js-address-selector">
{include file = 'checkout/_partials/address-selector-block.tpl'
addresses = $customer.addresses
name = "id_address_delivery"
selected = $id_address_delivery
type = "delivery"
form_id = $addresses_form_id
interactive = !$show_delivery_address_form and !$show_invoice_address_form
}
</div>

{if isset($delivery_address_error)}
<p class="alert alert-danger js-address-error" name="alert-delivery" id="id-failure-address-{$delivery_address_error.id_address}">{$delivery_address_error.exception}</p>
{else}
<p class="alert alert-danger js-address-error" name="alert-delivery" style="display: none">{l s="Your address is incomplete, please update it." d="Shop.Notifications.Error"}</p>
{/if}

<p class="add-address">
<a href="{$new_address_delivery_url}"><i class="material-icons">&#xE145;</i>{l s='add new address' d='Shop.Theme.Actions'}</a>
</p>

{if $use_same_address && !$cart.is_virtual}
<p>
{if $cart.is_virtual}
{l s='The selected address will be used as your personal address (for invoice).' d='Shop.Theme.Checkout'}
{else}
{l s='The selected address will be used both as your personal address (for invoice) and as your delivery address.' d='Shop.Theme.Checkout'}
{/if}
<a data-link-action="different-invoice-address" href="{$use_different_address_url}">
{l s='Billing address differs from shipping address' d='Shop.Theme.Checkout'}
</a>
</p>
{else}
<h2 class="h4">{l s='Shipping Address' d='Shop.Theme.Checkout'}</h2>
{/if}

{if $show_delivery_address_form}
<div id="delivery-address">
{/if}

{if !$use_same_address}

<h2 class="h4">{l s='Your Invoice Address' d='Shop.Theme.Checkout'}</h2>

{if $show_invoice_address_form}
<div id="invoice-address">
{render file = 'checkout/_partials/address-form.tpl'
ui = $address_form
use_same_address = $use_same_address
type = "delivery"
type = "invoice"
form_has_continue_button = $form_has_continue_button
}
</div>
{elseif $customer.addresses|count > 0}
<div id="delivery-addresses" class="address-selector js-address-selector">
{else}
<div id="invoice-addresses" class="address-selector js-address-selector">
{include file = 'checkout/_partials/address-selector-block.tpl'
addresses = $customer.addresses
name = "id_address_delivery"
selected = $id_address_delivery
type = "delivery"
name = "id_address_invoice"
selected = $id_address_invoice
type = "invoice"
form_id = $addresses_form_id
interactive = !$show_delivery_address_form and !$show_invoice_address_form
}
</div>

{if isset($delivery_address_error)}
<p class="alert alert-danger js-address-error" name="alert-delivery" id="id-failure-address-{$delivery_address_error.id_address}">{$delivery_address_error.exception}</p>
{if isset($invoice_address_error)}
<p class="alert alert-danger js-address-error" name="alert-invoice" id="id-failure-address-{$invoice_address_error.id_address}">{$invoice_address_error.exception}</p>
{else}
<p class="alert alert-danger js-address-error" name="alert-delivery" style="display: none">{l s="Your address is incomplete, please update it." d="Shop.Notifications.Error"}</p>
<p class="alert alert-danger js-address-error" name="alert-invoice" style="display: none">{l s="Your address is incomplete, please update it." d="Shop.Notifications.Error"}</p>
{/if}

<p class="add-address">
<a href="{$new_address_delivery_url}"><i class="material-icons">&#xE145;</i>{l s='add new address' d='Shop.Theme.Actions'}</a>
<a href="{$new_address_invoice_url}"><i class="material-icons">&#xE145;</i>{l s='add new address' d='Shop.Theme.Actions'}</a>
</p>

{if $use_same_address && !$cart.is_virtual}
<p>
<a data-link-action="different-invoice-address" href="{$use_different_address_url}">
{l s='Billing address differs from shipping address' d='Shop.Theme.Checkout'}
</a>
</p>
{/if}

{/if}

{if !$use_same_address}

<h2 class="h4">{l s='Your Invoice Address' d='Shop.Theme.Checkout'}</h2>

{if $show_invoice_address_form}
<div id="invoice-address">
{render file = 'checkout/_partials/address-form.tpl'
ui = $address_form
use_same_address = $use_same_address
type = "invoice"
form_has_continue_button = $form_has_continue_button
}
</div>
{else}
<div id="invoice-addresses" class="address-selector js-address-selector">
{include file = 'checkout/_partials/address-selector-block.tpl'
addresses = $customer.addresses
name = "id_address_invoice"
selected = $id_address_invoice
type = "invoice"
interactive = !$show_delivery_address_form and !$show_invoice_address_form
}
</div>

{if isset($invoice_address_error)}
<p class="alert alert-danger js-address-error" name="alert-invoice" id="id-failure-address-{$invoice_address_error.id_address}">{$invoice_address_error.exception}</p>
{else}
<p class="alert alert-danger js-address-error" name="alert-invoice" style="display: none">{l s="Your address is incomplete, please update it." d="Shop.Notifications.Error"}</p>
{/if}
{/if}

<p class="add-address">
<a href="{$new_address_invoice_url}"><i class="material-icons">&#xE145;</i>{l s='add new address' d='Shop.Theme.Actions'}</a>
</p>
{/if}

{/if}

{if !$form_has_continue_button}
<div class="clearfix">
<button type="submit" class="btn btn-primary continue float-xs-right" name="confirm-addresses" value="1">
{l s='Continue' d='Shop.Theme.Actions'}
</button>
<input type="hidden" id="not-valid-addresses" class="js-not-valid-addresses" value="{$not_valid_addresses}">
</div>
{/if}
{if !$form_has_continue_button}
<div class="clearfix">
<button type="submit" class="btn btn-primary continue float-xs-right" name="confirm-addresses" value="1" form="{$addresses_form_id}">
{l s='Continue' d='Shop.Theme.Actions'}
</button>
<input type="hidden" id="not-valid-addresses" class="js-not-valid-addresses" form="{$addresses_form_id}" value="{$not_valid_addresses}">
</div>
{/if}

</form>
{hook h='displayAddressSelectorBottom'}
</div>
{/block}
Loading