Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Change acknowledgement text and button #5611

Merged
merged 9 commits into from
Nov 22, 2020
Merged

fix: Change acknowledgement text and button #5611

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
be2588a
Acknowledgement Text and Button
Saumyachitransh01 Nov 13, 2020
d17f03c
Internal Links added
Saumyachitransh01 Nov 15, 2020
069962c
Links
Saumyachitransh01 Nov 15, 2020
744b672
Resolving Repetition
Saumyachitransh01 Nov 20, 2020
70cd61a
Update order-form.hbs
Saumyachitransh01 Nov 20, 2020
260e2be
Update order-form.hbs
Saumyachitransh01 Nov 20, 2020
660fb29
Update order-form.hbs
Saumyachitransh01 Nov 20, 2020
5251661
link placeholder
Saumyachitransh01 Nov 22, 2020
934a87a
terms privacy
Saumyachitransh01 Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions app/templates/components/forms/orders/order-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,16 @@
{{t 'Acknowledgement'}}
</h4>
<p>
{{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 '}}
<a href='/terms'>terms of services</a>{{t ' and ' }}<a href='/privacy'>privacy policy</a> {{t ' on this website.'}}
<GetText
@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~}}
Copy link
Member

@iamareebjamal iamareebjamal Nov 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was showing error

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot from 2020-11-22 23-11-10

This one

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to wrap that in string

Copy link
Member Author

@Saumyachitransh01 Saumyachitransh01 Nov 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

</GetText>
</p>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use relative links.

<div class="center aligned">
<button type="submit" class="ui teal submit button">{{if this.isPaidOrder (t "Proceed to Checkout") (t "Order Now") }}</button>
</div>
</div>
</div>
</form>
</form>