fix: Change acknowledgement text and button #5611

Saumyachitransh01 · 2020-11-13T16:04:30Z

Corrected Acknowledgement text and buttons - (Snapshots After correction)

For paid tickets:-

For free tickets:-

Checklist

I have read the Contribution & Best practices Guide.
My branch is up-to-date with the Upstream development branch.
The acceptance, integration, unit tests and linter pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

vercel · 2020-11-13T16:04:35Z

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://vercel.com/eventyay/open-event-frontend/6joccmsu6
✅ Preview: https://open-event-frontend-git-pay.eventyay.vercel.app

sachinchauhan2889 · 2020-11-13T16:14:03Z

app/templates/components/forms/orders/order-form.hbs

        {{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 '}} <a href='https://eventyay.com/terms'>terms of services</a>{{t ' and ' }}<a href='https://eventyay.com/privacy-policy'>privacy policy</a> {{ ' on this website.'}}


you have created external links. create internal links. use terms and privacy-policy route.

codecov · 2020-11-13T16:17:32Z

Codecov Report

Merging #5611 (660fb29) into development (5bbb10c) will increase coverage by 0.32%.
The diff coverage is n/a.

@@               Coverage Diff               @@
##           development    #5611      +/-   ##
===============================================
+ Coverage        23.25%   23.57%   +0.32%     
===============================================
  Files              493      510      +17     
  Lines             5182     5417     +235     
  Branches            38       59      +21     
===============================================
+ Hits              1205     1277      +72     
- Misses            3972     4124     +152     
- Partials             5       16      +11

Impacted Files	Coverage Δ
app/components/footer-main.js	`66.66% <0.00%> (-23.34%)`	⬇️
app/components/tabbed-navigation.js	`33.33% <0.00%> (-20.00%)`	⬇️
app/components/modals/tax-info-modal.js	`11.11% <0.00%> (-11.12%)`	⬇️
app/controllers/index.js	`27.27% <0.00%> (-9.10%)`	⬇️
app/components/forms/user-payment-info-form.js	`20.00% <0.00%> (-8.58%)`	⬇️
app/components/modals/modal-base.js	`22.85% <0.00%> (-2.15%)`	⬇️
app/utils/computed-helpers.js	`19.56% <0.00%> (-1.72%)`	⬇️
app/routes/application.js	`83.78% <0.00%> (-1.59%)`	⬇️
app/components/widgets/forms/image-upload.js	`22.64% <0.00%> (-0.44%)`	⬇️
app/router.js	`100.00% <0.00%> (ø)`
... and 54 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5bbb10c...934a87a. Read the comment docs.

afzal442

Well done.

mariobehling · 2020-11-13T20:57:26Z

app/templates/components/forms/orders/order-form.hbs

+      <p>
+        {{t
+          'By clicking "Order Now", I acknowledge that I have read and that I agree with the '}} <a href='https://eventyay.com/terms'>terms of services</a>{{t ' and ' }}<a href='https://eventyay.com/privacy-policy'>privacy policy</a> {{ ' on this website.'}}
+      </p>


Please use relative links.

maze-runnar · 2020-11-19T08:24:17Z

@Saumyachitransh01 use the following and complete PR

<LinkTo @route="pages" @model="privacy-policy" class="item">
        {{t 'Privacy Policy'}}
  </LinkTo>
<LinkTo @route="pages" @model="terms" class="item">
        {{t 'terms'}}
      </LinkTo>

Saumyachitransh01 · 2020-11-19T09:36:47Z

<LinkTo @route="pages" @model="privacy-policy" class="item">
{{t 'Privacy Policy'}}

<LinkTo @route="pages" @model="terms" class="item">
{{t 'terms'}}

Thank you so much @maze-runnar, but I tried this and it's not responding in browser. Showing 404 not found

iamareebjamal · 2020-11-19T10:12:34Z

Your local server does not have the pages necessary for it

iamareebjamal · 2020-11-19T10:16:41Z

https://gitter.im/fossasia/open-event-frontend?at=5fb645b9d5a5a635f2ce247c

Saumyachitransh01 · 2020-11-19T14:37:45Z

https://gitter.im/fossasia/open-event-frontend?at=5fb645b9d5a5a635f2ce247c

What could be done next?

iamareebjamal · 2020-11-19T15:52:27Z

/privacy /terms

Saumyachitransh01 · 2020-11-20T03:31:32Z

/privacy /terms

It's still showing no routes for both of these

iamareebjamal · 2020-11-20T03:41:13Z

It won't show on your local server.

iamareebjamal · 2020-11-20T04:07:32Z

app/templates/components/forms/orders/order-form.hbs

        {{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 '}} <LinkTo @route='terms'>{{t 'terms of services'}}</LinkTo>{{t ' and ' }}<LinkTo @route='privacy'>{{t 'privacy policy'}}</LinkTo> {{ ' on this website.'}}


You have to use anchor tag, not LinkTo

<a href="{{href-to 'terms'}}"> ?

<a href="/terms">

Saumyachitransh01 · 2020-11-20T09:59:35Z

@iamareebjamal please check now

iamareebjamal · 2020-11-20T10:01:26Z

app/templates/components/forms/orders/order-form.hbs

      <p>
        {{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 "Order Now", I acknowledge that I have read and that I agree with the '}} 
+           <a href='/terms'>terms of services</a>{{t ' and ' }}<a href='/privacy'>privacy policy</a> {{ ' on this website.'}}


Repetition. The only difference is "Proceed to Checkout" and "Order Now"

This is what is asked in the issue.
It's same there too, only difference is Order Now and Proceed to Checkout

I know. There should be no duplication. This can be achieved without that

Would this work?

app/templates/components/forms/orders/order-form.hbs

iamareebjamal · 2020-11-20T15:54:43Z

app/templates/components/forms/orders/order-form.hbs

-        {{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.'}}
-      </p>
+        {{t 'By clicking'}}{{#if this.isPaidOrder}} {{t ' "Proceed to Checkout"'}} {{else}} {{t ' "Order Now"'}}{{/if}} 


Use a single message with placeholders like here https://github.com/Cropster/ember-l10n#singular-translations

Co-authored-by: Areeb Jamal <jamal.areeb@gmail.com>

iamareebjamal · 2020-11-20T17:28:19Z

app/templates/components/forms/orders/order-form.hbs

@@ -279,12 +279,13 @@
        {{t 'Acknowledgement'}}
      </h4>
      <p>
-        {{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.'}}
+        {{t 'By clicking "{{orderState}}", I acknowledge that I have read and that I agree with the ' 


Invalid syntax

Thanks a lot for correcting so many mistakes :)
But it was working perfectly and no console errors either.

iamareebjamal · 2020-11-21T06:55:42Z

app/templates/components/forms/orders/order-form.hbs

-        {{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.'}}
+        {{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 '}} 


The entire message should be one string to make it translatable.

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

Or else it will be separated in multiple different sentences which don't make sense in translation:

By clicking "{{orderState}}" ???

, I acknowledge that I have read and that I agree with the umm?

and space surrounded and?

on this website. what's the context?

When making things translatable by wrapping in t you have to make sure it makes sense to the translator

iamareebjamal · 2020-11-22T17:13:22Z

app/templates/components/forms/orders/order-form.hbs

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


Why not use terms='<a href="/terms">terms of services</a>' and privacy='<a href="/privacy">privacy policy</a>' like in orderState?

Was showing error

You have to wrap that in string

Tried and didn't worked with that too. Browser was showing no link only the text inside quotes

Acknowledgement Text and Button

be2588a

vercel bot deployed to Preview November 13, 2020 16:04 View deployment

sachinchauhan2889 reviewed Nov 13, 2020

View reviewed changes

afzal442 previously approved these changes Nov 13, 2020

View reviewed changes

mariobehling reviewed Nov 13, 2020

View reviewed changes

Internal Links added

d17f03c

Saumyachitransh01 dismissed afzal442’s stale review via d17f03c November 15, 2020 04:58

vercel bot deployed to Preview November 15, 2020 04:59 View deployment

Links

069962c

vercel bot deployed to Preview November 15, 2020 05:32 View deployment

vercel bot deployed to Preview November 20, 2020 03:48 View deployment

iamareebjamal reviewed Nov 20, 2020

View reviewed changes

vercel bot deployed to Preview November 20, 2020 04:29 View deployment

vercel bot deployed to Preview November 20, 2020 06:29 View deployment

iamareebjamal reviewed Nov 20, 2020

View reviewed changes

Resolving Repetition

744b672

Saumyachitransh01 force-pushed the pay branch from 8a1337b to 744b672 Compare November 20, 2020 15:16

vercel bot deployed to Preview November 20, 2020 15:17 View deployment

iamareebjamal reviewed Nov 20, 2020

View reviewed changes

app/templates/components/forms/orders/order-form.hbs Outdated Show resolved Hide resolved

iamareebjamal reviewed Nov 20, 2020

View reviewed changes

Update order-form.hbs

70cd61a

Co-authored-by: Areeb Jamal <jamal.areeb@gmail.com>

vercel bot deployed to Preview November 20, 2020 15:59 View deployment

Update order-form.hbs

260e2be

vercel bot deployed to Preview November 20, 2020 17:04 View deployment

iamareebjamal reviewed Nov 20, 2020

View reviewed changes

Update order-form.hbs

660fb29

vercel bot deployed to Preview November 20, 2020 19:37 View deployment

iamareebjamal reviewed Nov 21, 2020

View reviewed changes

link placeholder

5251661

vercel bot deployed to Preview November 22, 2020 16:33 View deployment

terms privacy

934a87a

vercel bot deployed to Preview November 22, 2020 16:37 View deployment

iamareebjamal reviewed Nov 22, 2020

View reviewed changes

iamareebjamal changed the title ~~Acknowledgement Text and Button~~ fix: Change acknowledgement text and button Nov 22, 2020

auto-label bot added the fix label Nov 22, 2020

iamareebjamal approved these changes Nov 22, 2020

View reviewed changes

iamareebjamal merged commit 4998bec into fossasia:development Nov 22, 2020

Saumyachitransh01 deleted the pay branch November 23, 2020 03:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Change acknowledgement text and button #5611

fix: Change acknowledgement text and button #5611

Saumyachitransh01 commented Nov 13, 2020

vercel bot commented Nov 13, 2020 •

edited

Loading

sachinchauhan2889 Nov 13, 2020

codecov bot commented Nov 13, 2020 •

edited

Loading

afzal442 left a comment

mariobehling Nov 13, 2020

maze-runnar commented Nov 19, 2020 •

edited

Loading

Saumyachitransh01 commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

Saumyachitransh01 commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

Saumyachitransh01 commented Nov 20, 2020 •

edited

Loading

iamareebjamal commented Nov 20, 2020

iamareebjamal Nov 20, 2020

Saumyachitransh01 Nov 20, 2020 •

edited

Loading

iamareebjamal Nov 20, 2020 •

edited

Loading

Saumyachitransh01 commented Nov 20, 2020

iamareebjamal Nov 20, 2020

Saumyachitransh01 Nov 20, 2020

iamareebjamal Nov 20, 2020

Saumyachitransh01 Nov 20, 2020

iamareebjamal Nov 20, 2020

iamareebjamal Nov 20, 2020

iamareebjamal Nov 20, 2020

Saumyachitransh01 Nov 20, 2020

iamareebjamal Nov 21, 2020 •

edited

Loading

iamareebjamal Nov 22, 2020 •

edited

Loading

Saumyachitransh01 Nov 22, 2020

Saumyachitransh01 Nov 22, 2020

iamareebjamal Nov 22, 2020

Saumyachitransh01 Nov 22, 2020 •

edited

Loading

fix: Change acknowledgement text and button #5611

fix: Change acknowledgement text and button #5611

Conversation

Saumyachitransh01 commented Nov 13, 2020

Checklist

vercel bot commented Nov 13, 2020 • edited Loading

Choose a reason for hiding this comment

codecov bot commented Nov 13, 2020 • edited Loading

Codecov Report

afzal442 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maze-runnar commented Nov 19, 2020 • edited Loading

Saumyachitransh01 commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

Saumyachitransh01 commented Nov 19, 2020

iamareebjamal commented Nov 19, 2020

Saumyachitransh01 commented Nov 20, 2020 • edited Loading

iamareebjamal commented Nov 20, 2020

Choose a reason for hiding this comment

Saumyachitransh01 Nov 20, 2020 • edited Loading

Choose a reason for hiding this comment

iamareebjamal Nov 20, 2020 • edited Loading

Choose a reason for hiding this comment

Saumyachitransh01 commented Nov 20, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

iamareebjamal Nov 21, 2020 • edited Loading

Choose a reason for hiding this comment

iamareebjamal Nov 22, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Saumyachitransh01 Nov 22, 2020 • edited Loading

Choose a reason for hiding this comment

vercel bot commented Nov 13, 2020 •

edited

Loading

codecov bot commented Nov 13, 2020 •

edited

Loading

maze-runnar commented Nov 19, 2020 •

edited

Loading

Saumyachitransh01 commented Nov 20, 2020 •

edited

Loading

Saumyachitransh01 Nov 20, 2020 •

edited

Loading

iamareebjamal Nov 20, 2020 •

edited

Loading

iamareebjamal Nov 21, 2020 •

edited

Loading

iamareebjamal Nov 22, 2020 •

edited

Loading

Saumyachitransh01 Nov 22, 2020 •

edited

Loading