Merge pull request #68 from mollie/opencart-3

OpenCart 3.x compatibility
mollie · Aug 3, 2017 · 6fad37b · 6fad37b
2 parents c13ca79 + 06e69ed
commit 6fad37b
Show file tree

Hide file tree

Showing 22 changed files with 1,015 additions and 1,507 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 # Changelog #
 
+#### Changes in release 8.0.0
+  + Convert module to work with OpenCart 3.x.x.x only (soon to be backported).
+  + Addition of geo-zone selection per payment method.
+  + Adjusted admin interface to declutter the view.
+
 #### Changes in release 7.2.0
   + Add helpful method: `getPaymentID()`
   + Double check payment status in callback - uses new `getPaymentID()` method

diff --git a/admin/controller/extension/payment/mollie/base.php b/admin/controller/extension/payment/mollie/base.php
diff --git a/admin/language/dutch/extension/payment/mollie.php b/admin/language/dutch/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']         = "Mollie";
-$_['title_global_options']  = "Opties voor alle Mollie-modules";
+$_['title_global_options']  = "Instellingen";
 $_['title_payment_status']  = "Betaalstatussen";
 $_['title_mod_about']       = "Over deze module";
 $_['footer_text']           = "Betaaldiensten";
@@ -82,6 +82,7 @@
 $_['entry_description']              = "Omschrijving";
 $_['entry_show_icons']               = "Toon icoontjes";
 $_['entry_show_order_canceled_page'] = "Toon melding bij geannuleerde betalingen";
+$_['entry_geo_zone']                 = "Geo Zone";
 
 // Help
 $_['help_view_profile']             = 'U kunt uw API-sleutel vinden bij <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">uw Mollie-websiteprofielen</a>.';

diff --git a/admin/language/en-gb/extension/payment/mollie.php b/admin/language/en-gb/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']           = "Mollie";
-$_['title_global_options']    = "Options for all Mollie modules";
+$_['title_global_options']    = "Settings";
 $_['title_payment_status']    = "Payment statuses";
 $_['title_mod_about']         = "About this module";
 $_['footer_text']             = "Payment services";
@@ -82,6 +82,7 @@
 $_['entry_description']              = "Description";
 $_['entry_show_icons']               = "Show icons";
 $_['entry_show_order_canceled_page'] = "Show message if payment is cancelled";
+$_['entry_geo_zone']                 = "Geo Zone";
 
 // Help
 $_['help_view_profile']             = 'You can find your API key in <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">your Mollie website profiles</a>.';

diff --git a/admin/language/english/extension/payment/mollie.php b/admin/language/english/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']           = "Mollie";
-$_['title_global_options']    = "Options for all Mollie modules";
+$_['title_global_options']    = "Settings";
 $_['title_payment_status']    = "Payment statuses";
 $_['title_mod_about']         = "About this module";
 $_['footer_text']             = "Payment services";
@@ -82,6 +82,7 @@
 $_['entry_description']              = "Description";
 $_['entry_show_icons']               = "Show icons";
 $_['entry_show_order_canceled_page'] = "Show message if payment is cancelled";
+$_['entry_geo_zone']                 = "Geo Zone";
 
 // Help
 $_['help_view_profile']             = 'You can find your API key in <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">your Mollie website profiles</a>.';

diff --git a/admin/language/fr-fr/extension/payment/mollie.php b/admin/language/fr-fr/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']           = "Mollie";
-$_['title_global_options']    = "Pour tous les modules Mollie";
+$_['title_global_options']    = "Paramètres";
 $_['title_payment_status']    = "États de paiement";
 $_['title_mod_about']         = "Sur ce module";
 $_['footer_text']             = "Services paiement";

diff --git a/admin/language/french/extension/payment/mollie.php b/admin/language/french/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']           = "Mollie";
-$_['title_global_options']    = "Pour tous les modules Mollie";
+$_['title_global_options']    = "Paramètres";
 $_['title_payment_status']    = "États de paiement";
 $_['title_mod_about']         = "Sur ce module";
 $_['footer_text']             = "Services paiement";
@@ -82,6 +82,7 @@
 $_['entry_description']              = "Description";
 $_['entry_show_icons']               = "Afficher des icônes";
 $_['entry_show_order_canceled_page'] = "Afficher un message si le paiement est annulé";
+$_['entry_geo_zone']                 = "Geo Zone";
 
 // Help
 $_['help_view_profile']             = 'Vous pouvez trouver votre clé API dans <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">vos profils de site à Mollie</a>.';

diff --git a/admin/language/nl-nl/extension/payment/mollie.php b/admin/language/nl-nl/extension/payment/mollie.php
@@ -47,7 +47,7 @@
 
 // Heading
 $_['heading_title']         = "Mollie";
-$_['title_global_options']  = "Opties voor alle Mollie-modules";
+$_['title_global_options']  = "Instellingen";
 $_['title_payment_status']  = "Betaalstatussen";
 $_['title_mod_about']       = "Over deze module";
 $_['footer_text']           = "Betaaldiensten";