From ad1422a9ec9d9ec5a2c7f4b0ab6287addff20d0e Mon Sep 17 00:00:00 2001 From: Boyan Tabakov Date: Tue, 9 Jan 2018 11:22:23 +0200 Subject: [PATCH] Update default mail templates to latest version [skip ci] --- .../booking-request-accepted-html.html | 4 ++++ .../booking-request-accepted-text.txt | 3 +++ ext/mail-templates/money-paid/money-paid-html.html | 5 +++++ ext/mail-templates/money-paid/money-paid-text.txt | 3 +++ .../new-booking-request/new-booking-request-html.html | 7 ++++++- .../new-booking-request/new-booking-request-text.txt | 5 ++++- 6 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ext/mail-templates/booking-request-accepted/booking-request-accepted-html.html b/ext/mail-templates/booking-request-accepted/booking-request-accepted-html.html index 6e0fd8ee..0785ba3f 100644 --- a/ext/mail-templates/booking-request-accepted/booking-request-accepted-html.html +++ b/ext/mail-templates/booking-request-accepted/booking-request-accepted-html.html @@ -26,6 +26,10 @@ {{#each line-items}} {{#contains include-for "customer"}} + {{#eq "day" code}} + {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "day" "days"}} + {{> format-money money=line-total}} + {{/eq}} {{#eq "night" code}} {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "night" "nights"}} {{> format-money money=line-total}} diff --git a/ext/mail-templates/booking-request-accepted/booking-request-accepted-text.txt b/ext/mail-templates/booking-request-accepted/booking-request-accepted-text.txt index 05870011..0ac5afff 100644 --- a/ext/mail-templates/booking-request-accepted/booking-request-accepted-text.txt +++ b/ext/mail-templates/booking-request-accepted/booking-request-accepted-text.txt @@ -17,6 +17,9 @@ We have charged {{> format-money money=payin-total}} from your credit card. Here Payment {{#each line-items~}} {{~#contains include-for "customer"~}} +{{~#eq "day" code~}} +{{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "day" "days"}}: {{> format-money money=line-total}} +{{/eq~}} {{~#eq "night" code~}} {{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "night" "nights"}}: {{> format-money money=line-total}} {{/eq~}} diff --git a/ext/mail-templates/money-paid/money-paid-html.html b/ext/mail-templates/money-paid/money-paid-html.html index 50d5c7a1..09485988 100644 --- a/ext/mail-templates/money-paid/money-paid-html.html +++ b/ext/mail-templates/money-paid/money-paid-html.html @@ -26,6 +26,11 @@ {{#each line-items}} {{#contains include-for "provider"}} + {{#eq "day" code}} + {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "day" "days"}} + {{> format-money money=line-total}} + {{/eq}} + {{#eq "night" code}} {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "night" "nights"}} {{> format-money money=line-total}} diff --git a/ext/mail-templates/money-paid/money-paid-text.txt b/ext/mail-templates/money-paid/money-paid-text.txt index f3cdf1da..3474f345 100644 --- a/ext/mail-templates/money-paid/money-paid-text.txt +++ b/ext/mail-templates/money-paid/money-paid-text.txt @@ -17,6 +17,9 @@ Here's the breakdown. Payment {{#each line-items~}} {{~#contains include-for "provider"~}} +{{~#eq "day" code~}} +{{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "day" "days"}}: {{> format-money money=line-total}} +{{/eq~}} {{~#eq "night" code~}} {{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "night" "nights"}}: {{> format-money money=line-total}} {{/eq~}} diff --git a/ext/mail-templates/new-booking-request/new-booking-request-html.html b/ext/mail-templates/new-booking-request/new-booking-request-html.html index ea1b57d5..3bae62ed 100644 --- a/ext/mail-templates/new-booking-request/new-booking-request-html.html +++ b/ext/mail-templates/new-booking-request/new-booking-request-html.html @@ -24,6 +24,11 @@ {{#each line-items}} {{#contains include-for "provider"}} + {{#eq "day" code}} + {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "day" "days"}} + {{> format-money money=line-total}} + {{/eq}} + {{#eq "night" code}} {{> format-money money=unit-price}} × {{number quantity}} {{inflect quantity "night" "nights"}} {{> format-money money=line-total}} @@ -45,7 +50,7 @@ -

You need to accept the request by {{> format-date date=booking-expires-on}}. Otherwise the request will be expired and you won't get paid. If the booked dates won't work for you, you can also choose to decline the request.

+

You need to accept the request by {{> format-date date=delayed-transition.run-at}}. Otherwise the request will be expired and you won't get paid. If the booked dates won't work for you, you can also choose to decline the request.

Accept or decline the booking

diff --git a/ext/mail-templates/new-booking-request/new-booking-request-text.txt b/ext/mail-templates/new-booking-request/new-booking-request-text.txt index 4690728a..20c9300f 100644 --- a/ext/mail-templates/new-booking-request/new-booking-request-text.txt +++ b/ext/mail-templates/new-booking-request/new-booking-request-text.txt @@ -15,6 +15,9 @@ Good news! {{customer.display-name}} just requested to book {{listing.title}} fr Payment {{#each line-items~}} {{~#contains include-for "provider"~}} +{{~#eq "day" code~}} +{{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "day" "days"}}: {{> format-money money=line-total}} +{{/eq~}} {{~#eq "night" code~}} {{> format-money money=unit-price}} x {{number quantity}} {{inflect quantity "night" "nights"}}: {{> format-money money=line-total}} {{/eq~}} @@ -25,7 +28,7 @@ Payment {{/each~}} You earn: {{> format-money money=payout-total}} -You need to accept the request by {{> format-date date=booking-expires-on}}. Otherwise the request will be expired and you won't get paid. If the booked dates won't work for you, you can also choose to decline the request. +You need to accept the request by {{> format-date date=delayed-transition.run-at}}. Otherwise the request will be expired and you won't get paid. If the booked dates won't work for you, you can also choose to decline the request. Accept or decline the booking: {{marketplace.url}}/sale/{{url-encode id}}/details