From be2588a1f0379d3a25f0f9d5ba47e6fb45cea977 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Fri, 13 Nov 2020 21:20:49 +0530 Subject: [PATCH 1/9] Acknowledgement Text and Button --- .../components/forms/orders/order-form.hbs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 4b2023f847f..88d754dcbb7 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -278,13 +278,23 @@ {{t 'Acknowledgement'}} -

+ {{#if this.isPaidOrder}} +

{{t - 'By clicking "Pay Now", I acknowledge that I have read and that I agree with all the terms of services and privacy policy of Open Event.'}} + 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}}

+ {{else}} +

+ {{t + 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} +

+
+ +
+ {{/if}} From d17f03c307a408720a30362bf5c9eb82cb01bb26 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Sun, 15 Nov 2020 10:28:23 +0530 Subject: [PATCH 2/9] Internal Links added --- app/templates/components/forms/orders/order-form.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 88d754dcbb7..ad97bd4a805 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -281,7 +281,7 @@ {{#if this.isPaidOrder}}

{{t - 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} + 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}}

@@ -289,7 +289,7 @@ {{else}}

{{t - 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} + 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}}

From 069962c26aa0f4881519b5f9ccd8880bb9afe126 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Sun, 15 Nov 2020 11:01:54 +0530 Subject: [PATCH 3/9] Links --- app/templates/components/forms/orders/order-form.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index ad97bd4a805..88d754dcbb7 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -281,7 +281,7 @@ {{#if this.isPaidOrder}}

{{t - 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} + 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}}

@@ -289,7 +289,7 @@ {{else}}

{{t - 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} + 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}}

From 744b672d07b55ac6f1cb9d92bbd66b64cf81e76f Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Fri, 20 Nov 2020 20:20:59 +0530 Subject: [PATCH 4/9] Resolving Repetition --- .../components/forms/orders/order-form.hbs | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 88d754dcbb7..21841e851c5 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -278,23 +278,14 @@ {{t 'Acknowledgement'}} - {{#if this.isPaidOrder}} -

- {{t - 'By clicking "Proceed to Checkout", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} -

-
- -
- {{else}}

- {{t - 'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{ ' on this website.'}} -

+ {{t 'By clicking'}}{{#if this.isPaidOrder}} {{t ' "Proceed to Checkout"'}} {{else}} {{t ' "Order Now"'}}{{/if}} + {{t ', I acknowledge that I have read and that I agree with the '}} + terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}} +

- +
- {{/if}} -
+
From 70cd61a132a56c2fe554260fc27b275f4365797f Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Fri, 20 Nov 2020 21:29:01 +0530 Subject: [PATCH 5/9] Update order-form.hbs Co-authored-by: Areeb Jamal --- app/templates/components/forms/orders/order-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 21841e851c5..cf5ceab36db 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -284,7 +284,7 @@ terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}}

- +
From 260e2be095fec7bcaf8f785296708c5f758a8380 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Fri, 20 Nov 2020 22:34:33 +0530 Subject: [PATCH 6/9] Update order-form.hbs --- app/templates/components/forms/orders/order-form.hbs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index cf5ceab36db..25a2349326e 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -279,10 +279,10 @@ {{t 'Acknowledgement'}}

- {{t 'By clicking'}}{{#if this.isPaidOrder}} {{t ' "Proceed to Checkout"'}} {{else}} {{t ' "Order Now"'}}{{/if}} - {{t ', I acknowledge that I have read and that I agree with the '}} - terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}} -

+ {{t 'By clicking "{{orderState}}", I acknowledge that I have read and that I agree with the ' + orderState=(if this.isPaidOrder (t "Proceed to Checkout") (t "Order Now"))}} + terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}} +

From 660fb294bc105fcc2472cee80c0892788074a145 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Sat, 21 Nov 2020 01:07:49 +0530 Subject: [PATCH 7/9] Update order-form.hbs --- app/templates/components/forms/orders/order-form.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 25a2349326e..8467fa41bef 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -279,8 +279,8 @@ {{t 'Acknowledgement'}}

- {{t 'By clicking "{{orderState}}", I acknowledge that I have read and that I agree with the ' - orderState=(if this.isPaidOrder (t "Proceed to Checkout") (t "Order Now"))}} + {{t 'By clicking "{{orderState}}"' orderState=(if this.isPaidOrder (t "Proceed to Checkout") (t "Order Now"))}} + {{', I acknowledge that I have read and that I agree with the '}} terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}}

From 52516613c32f42ebe507ff4b14f36aaf1e1521ad Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Sun, 22 Nov 2020 22:01:19 +0530 Subject: [PATCH 8/9] link placeholder --- app/templates/components/forms/orders/order-form.hbs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index 8467fa41bef..f50a619bbc6 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -279,13 +279,16 @@ {{t 'Acknowledgement'}}

- {{t 'By clicking "{{orderState}}"' orderState=(if this.isPaidOrder (t "Proceed to Checkout") (t "Order Now"))}} - {{', I acknowledge that I have read and that I agree with the '}} - terms of services{{t ' and ' }}privacy policy {{t ' on this website.'}} + + {{~#if (eq placeholder 'terms')}}terms of services{{~/if~}} + {{~#if (eq placeholder 'privacy')}}privacy policy{{~/if~}} +

- + \ No newline at end of file From 934a87a26bafa49276c2f6803a962f69609a7322 Mon Sep 17 00:00:00 2001 From: Saumya Chitransh Date: Sun, 22 Nov 2020 22:04:11 +0530 Subject: [PATCH 9/9] terms privacy --- app/templates/components/forms/orders/order-form.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/components/forms/orders/order-form.hbs b/app/templates/components/forms/orders/order-form.hbs index f50a619bbc6..2eebda6a58b 100644 --- a/app/templates/components/forms/orders/order-form.hbs +++ b/app/templates/components/forms/orders/order-form.hbs @@ -282,8 +282,8 @@ - {{~#if (eq placeholder 'terms')}}terms of services{{~/if~}} - {{~#if (eq placeholder 'privacy')}}privacy policy{{~/if~}} + {{~#if (eq placeholder 'terms')}}{{t 'terms of services'}}{{~/if~}} + {{~#if (eq placeholder 'privacy')}}{{t 'privacy policy'}}{{~/if~}}