verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2204-dbtest_zone_getEvents
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Bernat Exposito Domenech 2020-05-26 12:08:01 +02:00
parent 41bf237289 14251e5a0c
commit e515e5df7a
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/order/front/catalog/index.html
View File

@ -11,7 +11,7 @@
data="$ctrl.items"> data="$ctrl.items">
</vn-crud-model> </vn-crud-model>
<vn-portal slot="topbar"> <vn-portal slot="topbar">
<vn-searchbar <vn-searchbar vn-id="searchbar"
auto-state="false" auto-state="false"
info="Search by item id or name" info="Search by item id or name"
on-search="$ctrl.onSearch($params)"> on-search="$ctrl.onSearch($params)">

2
modules/order/front/catalog/index.js
View File

@ -206,7 +206,7 @@ class Controller extends Section {
removeItemId() { removeItemId() {
this.itemId = null; this.itemId = null;
this.applyFilters(); this.$.searchbar.doSearch({}, 'bar');
} }
removeItemName() { removeItemName() {

10
print/templates/email/delivery-note-link/locale/en.yml Normal file
View File

@ -0,0 +1,10 @@
subject: Your delivery note
title: "Here is your delivery note!"
dear: Dear client
description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
You can download it by clicking <a href="https://www.verdnatura.es/#!form=ecomerce/ticket&ticket={0}">this link</a>.
copyLink: 'As an alternative, you can copy the following link in your browser:'
poll: If you wish, you can answer our satisfaction survey to
   help us provide better service. Your opinion is very important for us!
help: Any questions that arise, do not hesitate to consult it, <strong>we are here to assist you!</strong>
conclusion: Thanks for your attention!

9
print/templates/email/delivery-note/locale/en.yml Normal file
View File

@ -0,0 +1,9 @@
subject: Your delivery note
title: "Here is your delivery note!"
dear: Dear client
description: The delivery note from the order <strong>{0}</strong> is now available. <br/>
You can download it by clicking on the attachment of this email.
poll: If you wish, you can answer our satisfaction survey to
   help us provide better service. Your opinion is very important for us!
help: Any questions that arise, do not hesitate to consult it, <strong>we are here to assist you!</strong>
conclusion: Thanks for your attention!