From 9e56485a34993d01fa936fa5451bab310c9c01d6 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:44:26 +0200 Subject: [PATCH 01/25] Create mollie_inghomepay --- admin/controller/extension/payment/mollie_inghomepay | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 admin/controller/extension/payment/mollie_inghomepay diff --git a/admin/controller/extension/payment/mollie_inghomepay b/admin/controller/extension/payment/mollie_inghomepay new file mode 100644 index 00000000..5a936fb9 --- /dev/null +++ b/admin/controller/extension/payment/mollie_inghomepay @@ -0,0 +1,7 @@ + Date: Tue, 17 Apr 2018 17:47:31 +0200 Subject: [PATCH 02/25] Rename mollie_inghomepay to mollie_inghomepay.php --- .../payment/{mollie_inghomepay => mollie_inghomepay.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename admin/controller/extension/payment/{mollie_inghomepay => mollie_inghomepay.php} (100%) diff --git a/admin/controller/extension/payment/mollie_inghomepay b/admin/controller/extension/payment/mollie_inghomepay.php similarity index 100% rename from admin/controller/extension/payment/mollie_inghomepay rename to admin/controller/extension/payment/mollie_inghomepay.php From 8771cbcb2c89f9a73685207746fbf35df3c53be8 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:49:34 +0200 Subject: [PATCH 03/25] Update mollie.php --- admin/language/dutch/extension/payment/mollie.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/language/dutch/extension/payment/mollie.php b/admin/language/dutch/extension/payment/mollie.php index 13542239..cde404e4 100644 --- a/admin/language/dutch/extension/payment/mollie.php +++ b/admin/language/dutch/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,6 +67,7 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_inghomepay'] = 'ING Home\'Pay'; // Text $_['text_edit'] = "Bewerk Mollie"; From 0c3e43fd0920bf17650a1089016fa98fb41bedb0 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:52:28 +0200 Subject: [PATCH 04/25] Added clean-up check When updating an already installed version of the mollie module, this change will make sure the cleanup is done. --- admin/controller/extension/payment/mollie/base.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/admin/controller/extension/payment/mollie/base.php b/admin/controller/extension/payment/mollie/base.php index 1e555ab9..5bd1cd17 100644 --- a/admin/controller/extension/payment/mollie/base.php +++ b/admin/controller/extension/payment/mollie/base.php @@ -171,6 +171,18 @@ protected function uninstallAllModules () */ public function index () { + // Double-check if clean-up has been done - For upgrades + $adminThemeDir = DIR_APPLICATION . 'view/template/extension/payment/'; + if (MollieHelper::isOpenCart3x() || MollieHelper::isOpenCart2x()) { + if(file_exists($adminThemeDir . 'mollie_1.tpl')) { + $this->cleanUp(); + } + } else { + if(file_exists($adminThemeDir . 'mollie.tpl')) { + $this->cleanUp(); + } + } + // Load essential models $this->load->language("extension/payment/mollie"); $this->load->model("setting/setting"); From 6d1d17c31c0da11c85cbc670475bed131581872e Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:53:34 +0200 Subject: [PATCH 05/25] added ING Home'Pay --- admin/language/en-gb/extension/payment/mollie.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/admin/language/en-gb/extension/payment/mollie.php b/admin/language/en-gb/extension/payment/mollie.php index e8d58912..23f08925 100644 --- a/admin/language/en-gb/extension/payment/mollie.php +++ b/admin/language/en-gb/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,6 +67,8 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_inghomepay'] = 'ING Home\'pay'; + // Text $_['text_edit'] = "Edit"; $_['text_payment'] = "Payment"; From 4738d9560a0e28d12b973de096a4d0f3353c33cb Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:54:08 +0200 Subject: [PATCH 06/25] Create mollie_inghomepay.php --- admin/language/en-gb/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/en-gb/extension/payment/mollie_inghomepay.php diff --git a/admin/language/en-gb/extension/payment/mollie_inghomepay.php b/admin/language/en-gb/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/en-gb/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:54:34 +0200 Subject: [PATCH 07/25] Create mollie_inghomepay.php --- admin/language/dutch/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/dutch/extension/payment/mollie_inghomepay.php diff --git a/admin/language/dutch/extension/payment/mollie_inghomepay.php b/admin/language/dutch/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/dutch/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:54:59 +0200 Subject: [PATCH 08/25] Added ING Home'Pay --- admin/language/dutch/extension/payment/mollie.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/language/dutch/extension/payment/mollie.php b/admin/language/dutch/extension/payment/mollie.php index cde404e4..5413067d 100644 --- a/admin/language/dutch/extension/payment/mollie.php +++ b/admin/language/dutch/extension/payment/mollie.php @@ -45,7 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_inghomepay'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; From 3d577953f439cba3f78eb2bf9e2c2ce205aaeaed Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:55:18 +0200 Subject: [PATCH 09/25] Create mollie_inghomepay.php --- .../language/english/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/english/extension/payment/mollie_inghomepay.php diff --git a/admin/language/english/extension/payment/mollie_inghomepay.php b/admin/language/english/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/english/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:55:55 +0200 Subject: [PATCH 10/25] Create mollie_inghomepay.php --- admin/language/fr-fr/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/fr-fr/extension/payment/mollie_inghomepay.php diff --git a/admin/language/fr-fr/extension/payment/mollie_inghomepay.php b/admin/language/fr-fr/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/fr-fr/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:56:12 +0200 Subject: [PATCH 11/25] Create mollie_inghomepay.php --- admin/language/french/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/french/extension/payment/mollie_inghomepay.php diff --git a/admin/language/french/extension/payment/mollie_inghomepay.php b/admin/language/french/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/french/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:56:37 +0200 Subject: [PATCH 12/25] Create mollie_inghomepay.php --- admin/language/nl-nl/extension/payment/mollie_inghomepay.php | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 admin/language/nl-nl/extension/payment/mollie_inghomepay.php diff --git a/admin/language/nl-nl/extension/payment/mollie_inghomepay.php b/admin/language/nl-nl/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..da0693c8 --- /dev/null +++ b/admin/language/nl-nl/extension/payment/mollie_inghomepay.php @@ -0,0 +1,4 @@ + Date: Tue, 17 Apr 2018 17:57:03 +0200 Subject: [PATCH 13/25] Added ING Home'Pay --- admin/language/nl-nl/extension/payment/mollie.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/language/nl-nl/extension/payment/mollie.php b/admin/language/nl-nl/extension/payment/mollie.php index 13542239..b5ec8954 100644 --- a/admin/language/nl-nl/extension/payment/mollie.php +++ b/admin/language/nl-nl/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,6 +67,7 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_inghomepay'] = 'ING Home\'pay'; // Text $_['text_edit'] = "Bewerk Mollie"; From 18717d41c22eb416d5089324cf7707779f0b237e Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:57:41 +0200 Subject: [PATCH 14/25] Added ING Home'Pay --- admin/language/french/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/language/french/extension/payment/mollie.php b/admin/language/french/extension/payment/mollie.php index e47b4f4b..60565ae2 100644 --- a/admin/language/french/extension/payment/mollie.php +++ b/admin/language/french/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,7 +67,7 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; - +$_['name_mollie_inghomepay'] = 'ING Home\'pay'; // Text $_['text_edit'] = "Éditer Mollie"; From bc2ecec72762b31dcdd44aec07f839e8d4dbe256 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:58:12 +0200 Subject: [PATCH 15/25] Added ING Home'Pay --- admin/language/fr-fr/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/language/fr-fr/extension/payment/mollie.php b/admin/language/fr-fr/extension/payment/mollie.php index e47b4f4b..60565ae2 100644 --- a/admin/language/fr-fr/extension/payment/mollie.php +++ b/admin/language/fr-fr/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,7 +67,7 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; - +$_['name_mollie_inghomepay'] = 'ING Home\'pay'; // Text $_['text_edit'] = "Éditer Mollie"; From 3ce27d6277753fd532d80492940305cc300e7da2 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 17:58:43 +0200 Subject: [PATCH 16/25] Added ING Home'Pay --- admin/language/english/extension/payment/mollie.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin/language/english/extension/payment/mollie.php b/admin/language/english/extension/payment/mollie.php index dc9d1fbf..9bc94042 100644 --- a/admin/language/english/extension/payment/mollie.php +++ b/admin/language/english/extension/payment/mollie.php @@ -45,6 +45,7 @@ $_['text_mollie_paysafecard'] = $method_list_logo; $_['text_mollie_sofort'] = $method_list_logo; $_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_inghomepay'] = $method_list_logo; // Heading $_['heading_title'] = "Mollie"; @@ -66,6 +67,7 @@ $_['name_mollie_paysafecard'] = "paysafecard"; $_['name_mollie_sofort'] = "SOFORT Banking"; $_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_inghomepay'] = 'ING Home\'pay'; // Text $_['text_edit'] = "Edit"; From d868bfd46c5a0ae684b07d8b4d1670579db87cf7 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:00:27 +0200 Subject: [PATCH 17/25] Added ING Home'Pay and version bump --- catalog/controller/extension/payment/mollie/helper.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/catalog/controller/extension/payment/mollie/helper.php b/catalog/controller/extension/payment/mollie/helper.php index e0c58a58..a7620f8d 100644 --- a/catalog/controller/extension/payment/mollie/helper.php +++ b/catalog/controller/extension/payment/mollie/helper.php @@ -1,7 +1,7 @@ Date: Tue, 17 Apr 2018 18:01:11 +0200 Subject: [PATCH 18/25] Create mollie_inghomepay.php --- catalog/controller/extension/payment/mollie_inghomepay.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 catalog/controller/extension/payment/mollie_inghomepay.php diff --git a/catalog/controller/extension/payment/mollie_inghomepay.php b/catalog/controller/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..5a936fb9 --- /dev/null +++ b/catalog/controller/extension/payment/mollie_inghomepay.php @@ -0,0 +1,7 @@ + Date: Tue, 17 Apr 2018 18:02:23 +0200 Subject: [PATCH 19/25] Create mollie_inghomepay.php --- catalog/model/extension/payment/mollie_inghomepay.php | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 catalog/model/extension/payment/mollie_inghomepay.php diff --git a/catalog/model/extension/payment/mollie_inghomepay.php b/catalog/model/extension/payment/mollie_inghomepay.php new file mode 100644 index 00000000..7e6f718b --- /dev/null +++ b/catalog/model/extension/payment/mollie_inghomepay.php @@ -0,0 +1,7 @@ + Date: Tue, 17 Apr 2018 18:03:17 +0200 Subject: [PATCH 20/25] Added ING Home'Pay --- catalog/language/dutch/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/language/dutch/extension/payment/mollie.php b/catalog/language/dutch/extension/payment/mollie.php index 0e8113d3..f730c13e 100644 --- a/catalog/language/dutch/extension/payment/mollie.php +++ b/catalog/language/dutch/extension/payment/mollie.php @@ -77,4 +77,5 @@ $_['method_sofort'] = 'SOFORT Banking'; $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; -$_['method_giftcard'] = 'Giftcard'; \ No newline at end of file +$_['method_giftcard'] = 'Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay'; From 1406ff60f31c93649c4121b84ccf3d3c7001d38a Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:03:43 +0200 Subject: [PATCH 21/25] Added ING Home'Pay --- catalog/language/en-gb/extension/payment/mollie.php | 1 + 1 file changed, 1 insertion(+) diff --git a/catalog/language/en-gb/extension/payment/mollie.php b/catalog/language/en-gb/extension/payment/mollie.php index a6bb11e9..82dbf60c 100644 --- a/catalog/language/en-gb/extension/payment/mollie.php +++ b/catalog/language/en-gb/extension/payment/mollie.php @@ -78,3 +78,4 @@ $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; $_['method_giftcard'] = 'Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay'; From d7d56ff67e19001c65b4e95ac02145e895ba028b Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:04:07 +0200 Subject: [PATCH 22/25] Added ING Home'Pay --- catalog/language/english/extension/payment/mollie.php | 1 + 1 file changed, 1 insertion(+) diff --git a/catalog/language/english/extension/payment/mollie.php b/catalog/language/english/extension/payment/mollie.php index f8c5bdc3..b40801b5 100644 --- a/catalog/language/english/extension/payment/mollie.php +++ b/catalog/language/english/extension/payment/mollie.php @@ -78,3 +78,4 @@ $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; $_['method_giftcard'] = 'Webshop Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay'; From 848a242de97ffd30abf717da057baf9ce362c066 Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:04:29 +0200 Subject: [PATCH 23/25] Added ING Home'Pay --- catalog/language/fr-fr/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/language/fr-fr/extension/payment/mollie.php b/catalog/language/fr-fr/extension/payment/mollie.php index 92467aad..6027c239 100644 --- a/catalog/language/fr-fr/extension/payment/mollie.php +++ b/catalog/language/fr-fr/extension/payment/mollie.php @@ -77,4 +77,5 @@ $_['method_sofort'] = 'SOFORT Banking'; $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; -$_['method_giftcard'] = 'Giftcard'; \ No newline at end of file +$_['method_giftcard'] = 'Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay'; From 28dae7ae650661147b7fcbfe2277b27c066fae7b Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:04:48 +0200 Subject: [PATCH 24/25] Added ING Home'Pay --- catalog/language/french/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/language/french/extension/payment/mollie.php b/catalog/language/french/extension/payment/mollie.php index ab844aad..1bae1bf8 100644 --- a/catalog/language/french/extension/payment/mollie.php +++ b/catalog/language/french/extension/payment/mollie.php @@ -77,4 +77,5 @@ $_['method_sofort'] = 'SOFORT Banking'; $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; -$_['method_giftcard'] = 'Giftcard'; \ No newline at end of file +$_['method_giftcard'] = 'Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay'; From 30614fe300e68fdaa18c5e09d6562488b770ac5a Mon Sep 17 00:00:00 2001 From: Taco Date: Tue, 17 Apr 2018 18:05:09 +0200 Subject: [PATCH 25/25] Added ING Home'Pay --- catalog/language/nl-nl/extension/payment/mollie.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/catalog/language/nl-nl/extension/payment/mollie.php b/catalog/language/nl-nl/extension/payment/mollie.php index c3313058..2ff554b7 100644 --- a/catalog/language/nl-nl/extension/payment/mollie.php +++ b/catalog/language/nl-nl/extension/payment/mollie.php @@ -77,4 +77,5 @@ $_['method_sofort'] = 'SOFORT Banking'; $_['method_paypal'] = 'PayPal'; $_['method_paysafecard'] = 'paysafecard'; -$_['method_giftcard'] = 'Giftcard'; \ No newline at end of file +$_['method_giftcard'] = 'Giftcard'; +$_['method_inghomepay'] = 'ING Home\'Pay';