From 4d53ce815868e32df6cf3eae8e801e3e5895d92e Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Fri, 17 May 2019 15:20:05 +0700
Subject: [PATCH 1/4] get manage cards url

---
 .../omise-offsite-installment-method.js               | 11 +++++++++++
 view/frontend/web/template/payment/omise-cc-form.html |  1 +
 2 files changed, 12 insertions(+)

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
index 8e2f4983f..e3b27301b 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
@@ -56,6 +56,17 @@ define(
                 return this;
             },
 
+            /**
+             * Get url to manage cards in customer's panel
+             * 
+             * @return {string}
+             */
+            getManageCardsUrl() {
+                return urlBuilder.createUrl(
+                    '/omise/manage/cards',
+                );
+            },
+
             /**
              * Get installment terms
              * 
diff --git a/view/frontend/web/template/payment/omise-cc-form.html b/view/frontend/web/template/payment/omise-cc-form.html
index 3eef479e8..b9ed659cd 100644
--- a/view/frontend/web/template/payment/omise-cc-form.html
+++ b/view/frontend/web/template/payment/omise-cc-form.html
@@ -51,6 +51,7 @@ <h4><!-- ko i18n: 'Select a card you want to proceed' --><!-- /ko --></h4>
                         <input id="chargeWithNewCard" name="payment[omise_card]" type="radio" data-bind="click: chargeWithNewCard.bind($data, $element), checked: omiseCard, value: ''" /> <label for="chargeWithNewCard"><!-- ko i18n: 'Use a new card'--><!-- /ko --></label>
                     </li>
                 </ul>
+                <a href="#">Manage your cards</a>
             <!-- /ko -->
 
             <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}, visible: !isCustomerHasCard()">

From b64280919b5449b914f72eedb9281c93170802ec Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Tue, 21 May 2019 23:10:44 +0700
Subject: [PATCH 2/4] move get manage cards link from installments to credit
 card java script rendering helper

---
 .../view/payment/method-renderer/omise-cc-method.js   | 11 +++++++++++
 .../omise-offsite-installment-method.js               | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
index 9805dbdaa..533daf54c 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
@@ -61,6 +61,17 @@ define(
                 };
             },
 
+            /**
+             * Get url to manage cards in customer's panel
+             * 
+             * @return {string}
+             */
+            getManageCardsUrl() {
+                return urlBuilder.createUrl(
+                    '/omise/manage/cards',
+                );
+            },
+
             /**
              * Get Omise public key
              *
diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
index e3b27301b..8e2f4983f 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-offsite-installment-method.js
@@ -56,17 +56,6 @@ define(
                 return this;
             },
 
-            /**
-             * Get url to manage cards in customer's panel
-             * 
-             * @return {string}
-             */
-            getManageCardsUrl() {
-                return urlBuilder.createUrl(
-                    '/omise/manage/cards',
-                );
-            },
-
             /**
              * Get installment terms
              * 

From d57406d5995534f91c2e4f75b9b0031b89b21a83 Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Wed, 22 May 2019 02:51:32 +0700
Subject: [PATCH 3/4] removed unused function, use baseUrl to create manage
 cards URL, added TH translations

---
 i18n/th_TH.csv                                        |  1 +
 .../view/payment/method-renderer/omise-cc-method.js   | 11 -----------
 view/frontend/web/template/payment/omise-cc-form.html |  4 +++-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/i18n/th_TH.csv b/i18n/th_TH.csv
index c7b52c03c..20f378821 100644
--- a/i18n/th_TH.csv
+++ b/i18n/th_TH.csv
@@ -7,3 +7,4 @@
 "Print", "พิมพ์"
 "Choose your installment terms","เลือกระยะเวลาการผ่อนชำระ"
 "Miminum order value is 3000 THB", "ยอดสั่งซื้อขั้นต่ำ 3000 บาท"
+"Manage your cards", "จัดการบัตร"
diff --git a/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js b/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
index 533daf54c..9805dbdaa 100644
--- a/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
+++ b/view/frontend/web/js/view/payment/method-renderer/omise-cc-method.js
@@ -61,17 +61,6 @@ define(
                 };
             },
 
-            /**
-             * Get url to manage cards in customer's panel
-             * 
-             * @return {string}
-             */
-            getManageCardsUrl() {
-                return urlBuilder.createUrl(
-                    '/omise/manage/cards',
-                );
-            },
-
             /**
              * Get Omise public key
              *
diff --git a/view/frontend/web/template/payment/omise-cc-form.html b/view/frontend/web/template/payment/omise-cc-form.html
index b9ed659cd..7ded6d7c1 100644
--- a/view/frontend/web/template/payment/omise-cc-form.html
+++ b/view/frontend/web/template/payment/omise-cc-form.html
@@ -51,7 +51,9 @@ <h4><!-- ko i18n: 'Select a card you want to proceed' --><!-- /ko --></h4>
                         <input id="chargeWithNewCard" name="payment[omise_card]" type="radio" data-bind="click: chargeWithNewCard.bind($data, $element), checked: omiseCard, value: ''" /> <label for="chargeWithNewCard"><!-- ko i18n: 'Use a new card'--><!-- /ko --></label>
                     </li>
                 </ul>
-                <a href="#">Manage your cards</a>
+                <a data-bind = "attr: { href: checkout.baseUrl + 'omise/cards/listaction' }">
+                    <span data-bind="i18n: 'Manage your cards'"></span>
+                </a>
             <!-- /ko -->
 
             <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'payment_form_' + getCode()}, visible: !isCustomerHasCard()">

From ab34bc3c32ddc18a5f98c7e8b6e7474eac69de76 Mon Sep 17 00:00:00 2001
From: Jacek <jacek.stanusz@gmail.com>
Date: Wed, 22 May 2019 13:25:22 +0700
Subject: [PATCH 4/4] select card to proceed - better text, target _blank of
 link to manage cards

---
 view/frontend/web/template/payment/omise-cc-form.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/frontend/web/template/payment/omise-cc-form.html b/view/frontend/web/template/payment/omise-cc-form.html
index 7ded6d7c1..deb24e1b8 100644
--- a/view/frontend/web/template/payment/omise-cc-form.html
+++ b/view/frontend/web/template/payment/omise-cc-form.html
@@ -36,7 +36,7 @@
                    value: omiseCardToken"/>
 
             <!-- ko if: isCustomerHasCard() -->
-                <h4><!-- ko i18n: 'Select a card you want to proceed' --><!-- /ko --></h4>
+                <h4><!-- ko i18n: 'Select a card to proceed' --><!-- /ko --></h4>
                 <ul style="padding-left: 1.3em; margin-bottom: 2em;">
                     <!-- ko foreach: getCustomerCards() -->
                         <li style="list-style: none; margin-bottom: 2rem;">
@@ -51,7 +51,7 @@ <h4><!-- ko i18n: 'Select a card you want to proceed' --><!-- /ko --></h4>
                         <input id="chargeWithNewCard" name="payment[omise_card]" type="radio" data-bind="click: chargeWithNewCard.bind($data, $element), checked: omiseCard, value: ''" /> <label for="chargeWithNewCard"><!-- ko i18n: 'Use a new card'--><!-- /ko --></label>
                     </li>
                 </ul>
-                <a data-bind = "attr: { href: checkout.baseUrl + 'omise/cards/listaction' }">
+                <a data-bind = "attr: { href: checkout.baseUrl + 'omise/cards/listaction' }" target="_blank">
                     <span data-bind="i18n: 'Manage your cards'"></span>
                 </a>
             <!-- /ko -->