Skip to content

Commit d1b73ee

Browse files
authored
Merge pull request #715 from PrestaShop/develop
Release 1.0.1
2 parents f66bc52 + b464100 commit d1b73ee

File tree

4 files changed

+27
-1
lines changed

4 files changed

+27
-1
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
uses: actions/checkout@v2
1818

1919
- name: Cache Node Directory
20-
uses: actions/cache@v2
20+
uses: actions/cache@v4
2121
with:
2222
path: ~/.npm
2323
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

templates/_partials/form-fields.tpl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,26 @@
155155
</div>
156156
{/block}
157157
158+
{elseif $field.type === 'textarea'}
159+
160+
{block name='form_field_item_textarea'}
161+
<textarea
162+
id="field-{$field.name}"
163+
class="form-control"
164+
name="{$field.name}"
165+
{if isset($field.availableValues.placeholder)}placeholder="{$field.availableValues.placeholder}"{/if}
166+
{if $field.maxLength}maxlength="{$field.maxLength}"{/if}
167+
{if $field.required}required{/if}
168+
{if isset($field.availableValues.rows)}rows="{$field.availableValues.rows}"{/if}
169+
{if isset($field.availableValues.cols)}cols="{$field.availableValues.cols}"{/if}
170+
>{$field.value|default}</textarea>
171+
{if isset($field.availableValues.comment)}
172+
<span class="form-text">
173+
{$field.availableValues.comment}
174+
</span>
175+
{/if}
176+
{/block}
177+
158178
{else}
159179
160180
{block name='form_field_item_other'}
@@ -167,6 +187,7 @@
167187
{if $field.autocomplete}autocomplete="{$field.autocomplete}"{/if}
168188
{if isset($field.availableValues.placeholder)}placeholder="{$field.availableValues.placeholder}"{/if}
169189
{if $field.maxLength}maxlength="{$field.maxLength}"{/if}
190+
{if !empty($field.minLength)}minlength="{$field.minLength}"{/if}
170191
aria-label="{$field.name}"
171192
{if $field.required}required{/if}
172193
>

templates/checkout/_partials/cart-detailed-product-line.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
</div>
9393
{/foreach}
9494

95+
{hook h='displayCartExtraProductInfo' product=$product}
96+
9597
<div class="product-line__prices product-line__item">
9698
<div class="product-line__current">
9799
<span class="price">{$product.price}</span>

templates/customer/my-account.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
{/block}
1212

1313
{block name='page_content'}
14+
{block name='display_customer_account_top'}
15+
{hook h='displayCustomerAccountTop'}
16+
{/block}
1417
<div class="{$componentName} row g-3">
1518
<a class="{$componentName}__link col-md-6 col-lg-4" id="identity-link" href="{$urls.pages.identity}">
1619
<span class="link-item">

0 commit comments

Comments
 (0)