Skip to content

Commit

Permalink
fix: using "delivers until tomorrow" for 0 days delivery time
Browse files Browse the repository at this point in the history
  • Loading branch information
@leomp12
leomp12 committed Mar 23, 2024
1 parent 196ecc4 commit 8be3735
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 14 deletions.
3 changes: 2 additions & 1 deletion i18n/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"order_cta": "Order page",
"order_title": "received your order!",
"delivering_today": "will be delivered today",
"delivering_until_tomorrow": "will be delivered until tomorrow",
"order_text": "",
"my_acc": "my account page",
"contact_us": "If you have any questions, please contact us.",
Expand Down Expand Up @@ -127,4 +128,4 @@
"will_mail": "will be sent by email",
"sent_mail": "sent by e-mail",
"soon": "soon"
}
}
1 change: 1 addition & 0 deletions i18n/pt_br.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"pickup_for": "para retirada",
"delivering_in": "será entregue em até",
"delivering_today": "será entregue ainda hoje",
"delivering_until_tomorrow": "será entregue até amanhã",
"working_days": "dias úteis",
"working_day": "dia útil",
"days": "dias",
Expand Down
4 changes: 2 additions & 2 deletions views/authorized.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@ if (order.status_link) {
</font>
</div>
</td>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
4 changes: 2 additions & 2 deletions views/in_production.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if (order.status_link) {
</div>
</td>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
4 changes: 2 additions & 2 deletions views/new_order.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -511,15 +511,15 @@
<% } %>
</strong>
<%= i18n.after_payment %>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
2 changes: 1 addition & 1 deletion views/paid.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
4 changes: 2 additions & 2 deletions views/pending.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@
</font>
</div>
</td>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
4 changes: 2 additions & 2 deletions views/ready_for_shipping.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,15 @@
<%= i18n.will_mail %> <%= i18n.soon %>
</div>
</td>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down
4 changes: 2 additions & 2 deletions views/under_analysis.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@
</font>
</div>
</td>
<% } else if (shipping.delivery_time.days == 0 ) { %>
<% } else if (shipping.delivery_time.days == 0) { %>
<td style="padding:10px 50px 10px 50px;line-height:22px;text-align:inherit;"
height="100%" valign="top" bgcolor="">
<div style="text-align: center;">
<font color="#333333">
<%= i18n.order %>
<a href="<%= (order.status_link) ? order.status_link : `${('https://' + store.domain || store.homepage)}/app/#/order/${order.number}/${order._id}` %>">#<%= order.number %></a>
<strong><%= i18n.delivering_today %></strong>
<strong><%= i18n.delivering_until_tomorrow %></strong>
<%= i18n.on_following_address %>
Expand Down

0 comments on commit 8be3735

Please sign in to comment.