From ebcd8f1667a3eb46af8a895e06f90bccd063ac7a Mon Sep 17 00:00:00 2001 From: Jack Dinh Date: Mon, 16 Jul 2018 10:55:46 +1000 Subject: [PATCH 1/2] feat(payments): PAYMENTS-3143 Add Payment Methods to Account - new page called Payment Methods under Account - visibility of page to be controlled server side --- lang/en.json | 3 +++ templates/components/account/navigation.html | 10 ++++++++++ templates/pages/account/payment-methods.html | 7 +++++++ 3 files changed, 20 insertions(+) mode change 100644 => 100755 lang/en.json mode change 100644 => 100755 templates/components/account/navigation.html create mode 100644 templates/pages/account/payment-methods.html diff --git a/lang/en.json b/lang/en.json old mode 100644 new mode 100755 index ed6e7f1425..6dcfab5be1 --- a/lang/en.json +++ b/lang/en.json @@ -354,6 +354,9 @@ "remaining": "remaining" } }, + "payment_method": { + "heading": "Payment Methods" + }, "returns": { "heading": "Returns", "error_no_qty": "Please select one or more items to return.", diff --git a/templates/components/account/navigation.html b/templates/components/account/navigation.html old mode 100644 new mode 100755 index 8894310e54..99dfd78503 --- a/templates/components/account/navigation.html +++ b/templates/components/account/navigation.html @@ -53,5 +53,15 @@ {{lang 'account.nav.settings'}} {{/if}} + + {{#if settings.show_payment_methods}} + {{#if account_page '===' 'payment_methods'}} + + {{else}} + + {{/if}} + {{/if}} diff --git a/templates/pages/account/payment-methods.html b/templates/pages/account/payment-methods.html new file mode 100644 index 0000000000..d17f806721 --- /dev/null +++ b/templates/pages/account/payment-methods.html @@ -0,0 +1,7 @@ +{{#partial "page"}} + {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} +

{{lang 'account.payment_method.heading' }}

+ {{> components/account/navigation account_page='payment_methods'}} +{{/partial}} +{{> layout/base}} + From 7e8accf368ad3491f4b24e8fdc634ac75aea54d4 Mon Sep 17 00:00:00 2001 From: Jack Dinh Date: Mon, 6 Aug 2018 11:18:46 +1000 Subject: [PATCH 2/2] feat(payments): PAYMENTS-3143 Add translations for Payment Methods titles --- lang/en.json | 3 ++- templates/components/account/navigation.html | 4 ++-- templates/pages/account/payment-methods.html | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lang/en.json b/lang/en.json index 6dcfab5be1..8e97b77482 100755 --- a/lang/en.json +++ b/lang/en.json @@ -273,7 +273,8 @@ "wishlists": "Wish Lists ({num_wishlists})", "recently_viewed": "Recently Viewed", "settings": "Account Settings", - "addresses": "Addresses" + "addresses": "Addresses", + "payment_methods": "Payment Methods" }, "mobile_nav": { "messages": "Messages", diff --git a/templates/components/account/navigation.html b/templates/components/account/navigation.html index 99dfd78503..0c93e544c8 100755 --- a/templates/components/account/navigation.html +++ b/templates/components/account/navigation.html @@ -56,10 +56,10 @@ {{#if settings.show_payment_methods}} {{#if account_page '===' 'payment_methods'}} - + {{else}} {{/if}} {{/if}} diff --git a/templates/pages/account/payment-methods.html b/templates/pages/account/payment-methods.html index d17f806721..141595dff0 100644 --- a/templates/pages/account/payment-methods.html +++ b/templates/pages/account/payment-methods.html @@ -1,5 +1,5 @@ {{#partial "page"}} - {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}} + {{> components/common/breadcrumbs breadcrumbs=breadcrumbs}}

{{lang 'account.payment_method.heading' }}

{{> components/account/navigation account_page='payment_methods'}} {{/partial}}