From ffd5bae1abfcef527c17a9528cd233438fa3b16d Mon Sep 17 00:00:00 2001 From: Maikel Date: Tue, 15 Mar 2016 17:37:04 +0100 Subject: [PATCH 1/7] Fix for Opencart 2.2.0.0 Quick fix for new opencart version --- catalog/controller/payment/mollie/base.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/catalog/controller/payment/mollie/base.php b/catalog/controller/payment/mollie/base.php index 55962b32..bf7dd2ef 100755 --- a/catalog/controller/payment/mollie/base.php +++ b/catalog/controller/payment/mollie/base.php @@ -656,8 +656,16 @@ protected function renderTemplate ($template, $data, $common_children = array(), protected function getTemplatePath ($template) { $theme_path = $this->config->get("config_template") . "/template/payment/"; - $default_path = "default/template/payment/"; $possible_paths = array(); + + if ($this->isOpencart22()) + { + $default_path = "payment/"; + } + else + { + $default_path = "default/template/payment/"; + } if ($this->isOpencart2()) { @@ -701,4 +709,9 @@ protected function isOpencart2 () { return version_compare(VERSION, 2, ">="); } + + protected function isOpencart22 () + { + return version_compare(VERSION, 2.2, ">="); + } } From fb155f94eb0a240940a7e11f56535cb87f73c0dc Mon Sep 17 00:00:00 2001 From: Maikel Date: Tue, 15 Mar 2016 17:41:32 +0100 Subject: [PATCH 2/7] Fix for Opencart 2.2.0.0 Quick fix for opencart 2.2.0.0 --- admin/controller/payment/mollie/base.php | 62 +++++++++++++++++++----- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/admin/controller/payment/mollie/base.php b/admin/controller/payment/mollie/base.php index eff970fb..28967bc1 100755 --- a/admin/controller/payment/mollie/base.php +++ b/admin/controller/payment/mollie/base.php @@ -478,26 +478,57 @@ private function validate ($store = 0) protected function checkModuleStatus () { $need_files = array(); - $mod_files = array( - DIR_APPLICATION . "controller/payment/mollie/base.php", - DIR_APPLICATION . "language/english/payment/mollie.php", - DIR_TEMPLATE . "payment/mollie.tpl", - DIR_TEMPLATE . "payment/mollie_2.tpl", - DIR_CATALOG . "controller/payment/mollie-api-client/", - DIR_CATALOG . "controller/payment/mollie/base.php", - DIR_CATALOG . "language/english/payment/mollie.php", - DIR_CATALOG . "model/payment/mollie/base.php", - DIR_CATALOG . "view/theme/default/template/payment/mollie_checkout_form.tpl", - DIR_CATALOG . "view/theme/default/template/payment/mollie_return.tpl", - DIR_CATALOG . "view/theme/default/template/payment/mollie_return_2.tpl", - ); + + if ($this->isOpencart22()) + { + $mod_files = array( + DIR_APPLICATION . "controller/payment/mollie/base.php", + DIR_APPLICATION . "language/en-gb/payment/mollie.php", + DIR_TEMPLATE . "payment/mollie.tpl", + DIR_TEMPLATE . "payment/mollie_2.tpl", + DIR_CATALOG . "controller/payment/mollie-api-client/", + DIR_CATALOG . "controller/payment/mollie/base.php", + DIR_CATALOG . "language/en-gb/payment/mollie.php", + DIR_CATALOG . "model/payment/mollie/base.php", + DIR_CATALOG . "view/theme/default/template/payment/mollie_checkout_form.tpl", + DIR_CATALOG . "view/theme/default/template/payment/mollie_return.tpl", + DIR_CATALOG . "view/theme/default/template/payment/mollie_return_2.tpl", + ); + } + else + { + $mod_files = array( + DIR_APPLICATION . "controller/payment/mollie/base.php", + DIR_APPLICATION . "language/english/payment/mollie.php", + DIR_TEMPLATE . "payment/mollie.tpl", + DIR_TEMPLATE . "payment/mollie_2.tpl", + DIR_CATALOG . "controller/payment/mollie-api-client/", + DIR_CATALOG . "controller/payment/mollie/base.php", + DIR_CATALOG . "language/english/payment/mollie.php", + DIR_CATALOG . "model/payment/mollie/base.php", + DIR_CATALOG . "view/theme/default/template/payment/mollie_checkout_form.tpl", + DIR_CATALOG . "view/theme/default/template/payment/mollie_return.tpl", + DIR_CATALOG . "view/theme/default/template/payment/mollie_return_2.tpl", + ); + } + foreach (MollieHelper::$MODULE_NAMES as $module_name) { + if ($this->isOpencart22()) + { + $mod_files[] = DIR_APPLICATION . "controller/payment/mollie_" . $module_name . ".php"; + $mod_files[] = DIR_APPLICATION . "language/en-gb/payment/mollie_" . $module_name . ".php"; + $mod_files[] = DIR_CATALOG . "controller/payment/mollie_" . $module_name . ".php"; + $mod_files[] = DIR_CATALOG . "model/payment/mollie_" . $module_name . ".php"; + } + else + { $mod_files[] = DIR_APPLICATION . "controller/payment/mollie_" . $module_name . ".php"; $mod_files[] = DIR_APPLICATION . "language/english/payment/mollie_" . $module_name . ".php"; $mod_files[] = DIR_CATALOG . "controller/payment/mollie_" . $module_name . ".php"; $mod_files[] = DIR_CATALOG . "model/payment/mollie_" . $module_name . ".php"; + } } foreach ($mod_files as $file) @@ -651,6 +682,11 @@ protected function isOpencart2 () { return version_compare(VERSION, 2, ">="); } + + protected function isOpencart22 () + { + return version_compare(VERSION, 2.2, ">="); + } /** * Retrieve additional store id's from store table. From 28798214e51a479124ef19214c0c28695df01916 Mon Sep 17 00:00:00 2001 From: Ricardo Jacobs Date: Thu, 17 Mar 2016 09:46:30 +0100 Subject: [PATCH 3/7] Add 2.2 language directories. --- admin/language/en-gb/payment/mollie.php | 112 ++++++++++++++++++ .../en-gb/payment/mollie_banktransfer.php | 4 + .../language/en-gb/payment/mollie_belfius.php | 4 + .../language/en-gb/payment/mollie_bitcoin.php | 4 + .../en-gb/payment/mollie_creditcard.php | 4 + .../en-gb/payment/mollie_directdebit.php | 4 + admin/language/en-gb/payment/mollie_ideal.php | 4 + .../en-gb/payment/mollie_mistercash.php | 4 + .../language/en-gb/payment/mollie_paypal.php | 4 + .../en-gb/payment/mollie_paysafecard.php | 4 + .../language/en-gb/payment/mollie_sofort.php | 4 + admin/language/fr-fr/payment/mollie.php | 112 ++++++++++++++++++ .../fr-fr/payment/mollie_banktransfer.php | 4 + .../language/fr-fr/payment/mollie_belfius.php | 4 + .../language/fr-fr/payment/mollie_bitcoin.php | 4 + .../fr-fr/payment/mollie_creditcard.php | 4 + .../fr-fr/payment/mollie_directdebit.php | 4 + admin/language/fr-fr/payment/mollie_ideal.php | 4 + .../fr-fr/payment/mollie_mistercash.php | 4 + .../language/fr-fr/payment/mollie_paypal.php | 4 + .../fr-fr/payment/mollie_paysafecard.php | 4 + .../language/fr-fr/payment/mollie_sofort.php | 4 + admin/language/nl-nl/payment/mollie.php | 112 ++++++++++++++++++ .../nl-nl/payment/mollie_banktransfer.php | 4 + .../language/nl-nl/payment/mollie_belfius.php | 4 + .../language/nl-nl/payment/mollie_bitcoin.php | 4 + .../nl-nl/payment/mollie_creditcard.php | 4 + .../nl-nl/payment/mollie_directdebit.php | 4 + admin/language/nl-nl/payment/mollie_ideal.php | 4 + .../nl-nl/payment/mollie_mistercash.php | 4 + .../language/nl-nl/payment/mollie_paypal.php | 4 + .../nl-nl/payment/mollie_paysafecard.php | 4 + .../language/nl-nl/payment/mollie_sofort.php | 4 + catalog/language/en-gb/payment/mollie.php | 76 ++++++++++++ catalog/language/fr-fr/payment/mollie.php | 76 ++++++++++++ catalog/language/nl-nl/payment/mollie.php | 76 ++++++++++++ 36 files changed, 684 insertions(+) create mode 100755 admin/language/en-gb/payment/mollie.php create mode 100755 admin/language/en-gb/payment/mollie_banktransfer.php create mode 100644 admin/language/en-gb/payment/mollie_belfius.php create mode 100755 admin/language/en-gb/payment/mollie_bitcoin.php create mode 100755 admin/language/en-gb/payment/mollie_creditcard.php create mode 100755 admin/language/en-gb/payment/mollie_directdebit.php create mode 100755 admin/language/en-gb/payment/mollie_ideal.php create mode 100755 admin/language/en-gb/payment/mollie_mistercash.php create mode 100755 admin/language/en-gb/payment/mollie_paypal.php create mode 100755 admin/language/en-gb/payment/mollie_paysafecard.php create mode 100755 admin/language/en-gb/payment/mollie_sofort.php create mode 100755 admin/language/fr-fr/payment/mollie.php create mode 100755 admin/language/fr-fr/payment/mollie_banktransfer.php create mode 100644 admin/language/fr-fr/payment/mollie_belfius.php create mode 100755 admin/language/fr-fr/payment/mollie_bitcoin.php create mode 100755 admin/language/fr-fr/payment/mollie_creditcard.php create mode 100755 admin/language/fr-fr/payment/mollie_directdebit.php create mode 100755 admin/language/fr-fr/payment/mollie_ideal.php create mode 100755 admin/language/fr-fr/payment/mollie_mistercash.php create mode 100755 admin/language/fr-fr/payment/mollie_paypal.php create mode 100755 admin/language/fr-fr/payment/mollie_paysafecard.php create mode 100755 admin/language/fr-fr/payment/mollie_sofort.php create mode 100755 admin/language/nl-nl/payment/mollie.php create mode 100755 admin/language/nl-nl/payment/mollie_banktransfer.php create mode 100644 admin/language/nl-nl/payment/mollie_belfius.php create mode 100755 admin/language/nl-nl/payment/mollie_bitcoin.php create mode 100755 admin/language/nl-nl/payment/mollie_creditcard.php create mode 100755 admin/language/nl-nl/payment/mollie_directdebit.php create mode 100755 admin/language/nl-nl/payment/mollie_ideal.php create mode 100755 admin/language/nl-nl/payment/mollie_mistercash.php create mode 100755 admin/language/nl-nl/payment/mollie_paypal.php create mode 100755 admin/language/nl-nl/payment/mollie_paysafecard.php create mode 100755 admin/language/nl-nl/payment/mollie_sofort.php create mode 100755 catalog/language/en-gb/payment/mollie.php create mode 100755 catalog/language/fr-fr/payment/mollie.php create mode 100755 catalog/language/nl-nl/payment/mollie.php diff --git a/admin/language/en-gb/payment/mollie.php b/admin/language/en-gb/payment/mollie.php new file mode 100755 index 00000000..63b828b8 --- /dev/null +++ b/admin/language/en-gb/payment/mollie.php @@ -0,0 +1,112 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +// These are called automatically by the Payment modules list - do not change the names +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_bitcoin'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_directdebit'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_mistercash'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; + +// Heading +$_['heading_title'] = "Mollie"; +$_['title_global_options'] = "Options for all Mollie modules"; +$_['title_payment_status'] = "Payment statuses"; +$_['title_mod_about'] = "About this module"; +$_['footer_text'] = "Payment services"; + +// Module names +$_['name_mollie_banktransfer'] = "Bank transfer"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_directdebit'] = "Direct debit"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; + +// Text +$_['text_edit'] = "Edit"; +$_['text_payment'] = "Payment"; +$_['text_success'] = "Success: You have successfully modified your Mollie settings!"; +$_['text_missing_api_key'] = "Please fill out your API key below."; +$_['text_activate_payment_method'] = 'Enable this payment method in your Mollie dashboard.'; +$_['text_no_status_id'] = "- Do not update the order status (not recommended) -"; + +// Entry +$_['entry_payment_method'] = "Payment method"; +$_['entry_activate'] = "Activate"; +$_['entry_sort_order'] = "Sort order"; +$_['entry_status'] = "Status"; +$_['entry_api_key'] = "API key"; +$_['entry_description'] = "Description"; +$_['entry_show_icons'] = "Show icons"; +$_['entry_show_order_canceled_page'] = "Show message if payment is cancelled"; + +// Help +$_['help_view_profile'] = 'You can find your API key in your Mollie website profiles.'; +$_['help_status'] = "Activate the module"; +$_['help_api_key'] = 'Enter the api_key of the website profile you want to use. The API key starts with test_ or live_.'; +$_['help_description'] = 'This description will appear on the bank / card statement of your customer. You may use a maximum of 29 characters. TIP: Use %, this will be replaced by the order id of the payment. Don\'t forget % can be multiple characters long!'; +$_['help_show_icons'] = 'Show icons next to the Mollie payment methods on the checkout page.'; +$_['help_show_order_canceled_page'] = 'Show a message to the customer if a payment is cancelled, before redirecting the customer back to their shopping cart.'; + +// Info +$_['entry_module'] = "Module"; +$_['entry_mod_status'] = "Module status"; +$_['entry_comm_status'] = "Communication status"; +$_['entry_support'] = "Support"; + +$_['entry_version'] = 'Mollie Opencart'; + +// Error +$_['error_permission'] = "Warning: You don't have permission to modify the Mollie payment methods."; +$_['error_api_key'] = "Mollie API key is required!"; +$_['error_api_key_invalid'] = "Invalid API key!"; +$_['error_description'] = "Description is required!"; +$_['error_file_missing'] = "File does not exist"; + +// Status +$_['entry_pending_status'] = "Payment created status"; +$_['entry_failed_status'] = "Payment failed status"; +$_['entry_canceled_status'] = "Payment canceled status"; +$_['entry_expired_status'] = "Payment expired status"; +$_['entry_processing_status'] = "Payment successful status"; diff --git a/admin/language/en-gb/payment/mollie_banktransfer.php b/admin/language/en-gb/payment/mollie_banktransfer.php new file mode 100755 index 00000000..8a40e816 --- /dev/null +++ b/admin/language/en-gb/payment/mollie_banktransfer.php @@ -0,0 +1,4 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +// These are called automatically by the Payment modules list - do not change the names +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_bitcoin'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_directdebit'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_mistercash'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; + +// Heading +$_['heading_title'] = "Mollie"; +$_['title_global_options'] = "Pour tous les modules Mollie"; +$_['title_payment_status'] = "États de paiement"; +$_['title_mod_about'] = "Sur ce module"; +$_['footer_text'] = "Services paiement"; + +// Module names +$_['name_mollie_banktransfer'] = "Virement bancaire"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_directdebit'] = "Débit direct"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; + +// Text +$_['text_edit'] = "Éditer Mollie"; +$_['text_payment'] = "Paiement"; +$_['text_success'] = "Succès: Vous avez réussi à modifier les paramètres Mollie!"; +$_['text_missing_api_key'] = "Remplir votre clé API ci-dessous."; +$_['text_activate_payment_method'] = 'Activer ce mode de paiement via le Mollie dashboard.'; +$_['text_no_status_id'] = '- Ne pas mettre à jour le statut (non recommandé) -'; + +// Entry +$_['entry_payment_method'] = "Procédé de paiement"; +$_['entry_activate'] = "Activate"; +$_['entry_sort_order'] = "Ordre de triage"; +$_['entry_status'] = "État"; +$_['entry_api_key'] = "Clé API"; +$_['entry_description'] = "Description"; +$_['entry_show_icons'] = "Afficher des icônes"; +$_['entry_show_order_canceled_page'] = "Afficher un message si le paiement est annulé"; + +// Help +$_['help_view_profile'] = 'Vous pouvez trouver votre clé API dans vos profils de site à Mollie.'; +$_['help_status'] = "Activer le module"; +$_['help_api_key'] = 'Entrer ici le api_key du profil que vous souhaitez utiliser. Le clé API commence par test_ ou live_.'; +$_['help_description'] = 'Cette description apparaîtra sur le relevé bancaire de votre client. Vous pouvez utiliser un maximum de 29 caractères. ASTUCE: Utilisez le %, il sera remplacé par l\'id de la commande du paiement. N\'oubliez pas que %/code> peut devenir plusieurs caractères!'; +$_['help_show_icons'] = 'Afficher les icônes à côté des méthodes de paiement Mollie sur la page de paiement.'; +$_['help_show_order_canceled_page'] = 'Afficher un message au client si un paiement est annulé, avant de rediriger le client vers leur panier.'; + +// Info +$_['entry_module'] = "Module"; +$_['entry_mod_status'] = "État du module"; +$_['entry_comm_status'] = "État de la communication"; +$_['entry_support'] = "Assistance"; + +$_['entry_version'] = 'MollieOpenCart'; + +// Error +$_['error_permission'] = "Attention: Vous n'avez pas l'autorisation de modifier les méthodes de paiement Mollie."; +$_['error_api_key'] = "La clé API est nécessaire!"; +$_['error_api_key_invalid'] = "La clé API est invalide!"; +$_['error_description'] = "Description est nécessaire!"; +$_['error_file_missing'] = "Fichier ne existe pas"; + +// Status +$_['entry_pending_status'] = "État de paiement attente"; +$_['entry_failed_status'] = "État de paiement échoué"; +$_['entry_canceled_status'] = "État de paiement annulé"; +$_['entry_expired_status'] = "État de paiement expiré"; +$_['entry_processing_status'] = "État de paiement traitement"; diff --git a/admin/language/fr-fr/payment/mollie_banktransfer.php b/admin/language/fr-fr/payment/mollie_banktransfer.php new file mode 100755 index 00000000..8a40e816 --- /dev/null +++ b/admin/language/fr-fr/payment/mollie_banktransfer.php @@ -0,0 +1,4 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +// These are called automatically by the Payment modules list - do not change the names +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_bitcoin'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_directdebit'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_mistercash'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; + +// Heading +$_['heading_title'] = "Mollie"; +$_['title_global_options'] = "Opties voor alle Mollie-modules"; +$_['title_payment_status'] = "Betaalstatussen"; +$_['title_mod_about'] = "Over deze module"; +$_['footer_text'] = "Betaaldiensten"; + +// Module names +$_['name_mollie_banktransfer'] = "Overboeking"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_directdebit'] = "Eenmalige incasso"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; + +// Text +$_['text_edit'] = "Bewerk Mollie"; +$_['text_payment'] = "Betaling"; +$_['text_success'] = "Gelukt: de instellingen voor de module zijn aangepast!"; +$_['text_missing_api_key'] = "Vul hieronder de API-key in."; +$_['text_activate_payment_method'] = 'Activeer deze betaalmethode via het Mollie-dashboard.'; +$_['text_no_status_id'] = "- Status niet wijzigen (niet aanbevolen) -"; + +// Entry +$_['entry_payment_method'] = "Betaalmethode"; +$_['entry_activate'] = "Activeren"; +$_['entry_sort_order'] = "Sorteervolgorde"; +$_['entry_status'] = "Status"; +$_['entry_api_key'] = "API-sleutel"; +$_['entry_description'] = "Omschrijving"; +$_['entry_show_icons'] = "Toon icoontjes"; +$_['entry_show_order_canceled_page'] = "Toon melding bij geannuleerde betalingen"; + +// Help +$_['help_view_profile'] = 'U kunt uw API-sleutel vinden bij uw Mollie-websiteprofielen.'; +$_['help_status'] = "Activeer de module"; +$_['help_api_key'] = "Voer hier de api_key van het websiteprofiel in dat u wilt gebruiken. De API-sleutel begint met test_ of live_."; +$_['help_description'] = "De omschrijving zal op het bankafschrift van uw klant verschijnen en kunt u terugvinden in het Mollie beheer. U kunt maximaal 29 tekens gebruiken. TIP: Gebruik %, dit zal vervangen worden door het ordernummer. Het ordernummer kan zelf ook meerdere tekens lang zijn!"; +$_['help_show_icons'] = "Toon icoontjes naast de betaalmethodes van Mollie op de betaalpagina."; +$_['help_show_order_canceled_page'] = "Toon een melding aan de klant als een betaling geannuleerd wordt, alvorens de klant terug naar het winkelmandje te verwijzen."; + +// Info +$_['entry_module'] = "Module"; +$_['entry_mod_status'] = "Modulestatus"; +$_['entry_comm_status'] = "Communicatiestatus"; +$_['entry_support'] = "Support"; + +$_['entry_version'] = 'Mollie Opencart'; + +// Error +$_['error_permission'] = "Waarschuwing: U heeft geen toestemming om de module aan te passen."; +$_['error_api_key'] = "Mollie API-sleutel is verplicht!"; +$_['error_api_key_invalid'] = "Ongeldige Mollie API-sleutel!"; +$_['error_description'] = "De omschrijving is verplicht!"; +$_['error_file_missing'] = "Bestand bestaat niet"; + +// Status +$_['entry_pending_status'] = "Status betaling aangemaakt"; +$_['entry_failed_status'] = "Status betaling mislukt"; +$_['entry_canceled_status'] = "Status betaling geannuleerd"; +$_['entry_expired_status'] = "Status betaling verlopen"; +$_['entry_processing_status']= "Status betaling succesvol"; diff --git a/admin/language/nl-nl/payment/mollie_banktransfer.php b/admin/language/nl-nl/payment/mollie_banktransfer.php new file mode 100755 index 00000000..8a40e816 --- /dev/null +++ b/admin/language/nl-nl/payment/mollie_banktransfer.php @@ -0,0 +1,4 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +/** + * English language file for iDEAL by Mollie + */ + +// Text +$_['heading_title'] = 'Payment by Mollie'; +$_['ideal_title'] = 'Your payment'; +$_['text_title'] = 'Pay online'; +$_['text_redirected'] = 'The client has been referred to the payment screen'; +$_['text_issuer'] = 'Select your bank'; +$_['button_retry'] = 'Return to checkout page'; + +// Status page: payment failed (e.g. cancelled). +$_['heading_failed'] = 'Your payment has not been completed'; +$_['msg_failed'] = 'Unfortunately your payment has failed. Please click the button below to return to the checkout page and retry setting up a payment.'; + +// Status page: payment pending. +$_['heading_unknown'] = 'Your payment is pending'; +$_['msg_unknown'] = 'Your payment has not been received yet. We will send you a confirmation email the moment the payment is received.'; + +// Status page: API failure. +$_['heading_error'] = 'An error occurred when setting up the payment'; +$_['text_error'] = 'An error occurred when setting up the payment with Mollie. Click the button below to return to the checkout page.'; + +// Response +$_['response_success'] = 'The payment is received'; +$_['response_none'] = 'The payment is not received yet'; +$_['response_cancelled'] = 'The client has canceled the payment'; +$_['response_failed'] = 'Unfortunately something went wrong. Please retry the payment.'; +$_['response_expired'] = 'The payment has expired'; +$_['response_unknown'] = 'An unknown error occurred'; + +// Methods +$_['method_ideal'] = 'iDEAL'; +$_['method_creditcard'] = 'Creditcard'; +$_['method_mistercash'] = 'Mister Cash'; +$_['method_banktransfer'] = 'Bank transfer'; +$_['method_directdebit'] = 'Bank transfer'; +$_['method_belfius'] = 'Belfius Direct Net'; +$_['method_bitcoin'] = 'Bitcoin'; +$_['method_sofort'] = 'SOFORT Banking'; +$_['method_paypal'] = 'PayPal'; +$_['method_paysafecard'] = 'paysafecard'; \ No newline at end of file diff --git a/catalog/language/fr-fr/payment/mollie.php b/catalog/language/fr-fr/payment/mollie.php new file mode 100755 index 00000000..8567b02d --- /dev/null +++ b/catalog/language/fr-fr/payment/mollie.php @@ -0,0 +1,76 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +/** + * English language file for iDEAL by Mollie + */ + +// Text +$_['heading_title'] = 'Paiement par Mollie'; +$_['ideal_title'] = 'Votre paiement'; +$_['text_title'] = 'Payez en ligne'; +$_['text_redirected'] = 'Le client a été renvoyé à l\'écran de paiement'; +$_['text_issuer'] = 'Selectionnez votre banque:'; +$_['button_retry'] = 'Retour à la page de paiement'; + +// Status page: payment failed (e.g. cancelled). +$_['heading_failed'] = 'Votre paiement n\'a pas été achevée'; +$_['msg_failed'] = 'Malheureusement, votre paiement est échoué.'; + +// Status page: payment pending. +$_['heading_unknown'] = 'Votre paiement est en attente'; +$_['msg_unknown'] = 'Votre paiement n\'a pas encore été reçu. Nous vous enverrons un e-mail de confirmation au moment où le paiement est reçu.'; + +// Status page: API failure. +$_['heading_error'] = 'Une erreur s\'est produite lors de la mise en place du paiement'; +$_['text_error'] = 'Une erreur s\'est produite lors de la mise en place du paiement avec Mollie:'; + +// Response +$_['response_success'] = 'Le paiement est reçu'; +$_['response_none'] = 'Le paiement n\'est pas encore reçu'; +$_['response_cancelled'] = 'Le client a annulé le paiement'; +$_['response_failed'] = 'Malheureusement une erreur s\'est produite. S\'il vous plaît réessayer le paiement.'; +$_['response_expired'] = 'Le paiement a expiré'; +$_['response_unknown'] = 'Une erreur inconnue s\'est produite'; + +// Methods +$_['method_ideal'] = 'iDEAL'; +$_['method_creditcard'] = 'Creditcard'; +$_['method_mistercash'] = 'Mister Cash'; +$_['method_banktransfer'] = 'Bank transfer'; +$_['method_directdebit'] = 'Bank transfer'; +$_['method_belfius'] = 'Belfius Direct Net'; +$_['method_bitcoin'] = 'Bitcoin'; +$_['method_sofort'] = 'SOFORT Banking'; +$_['method_paypal'] = 'PayPal'; +$_['method_paysafecard'] = 'paysafecard'; \ No newline at end of file diff --git a/catalog/language/nl-nl/payment/mollie.php b/catalog/language/nl-nl/payment/mollie.php new file mode 100755 index 00000000..ed3b7a1c --- /dev/null +++ b/catalog/language/nl-nl/payment/mollie.php @@ -0,0 +1,76 @@ + + * @copyright Mollie B.V. + * @link https://www.mollie.com + */ + +/** + * Dutch language file for iDEAL by Mollie + */ + +// Text +$_['heading_title'] = 'Betaling via Mollie'; +$_['ideal_title'] = 'Uw betaling'; +$_['text_title'] = 'Online betalen'; +$_['text_redirected'] = 'De klant is doorgestuurd naar het betaalscherm'; +$_['text_issuer'] = 'Kies uw bank'; +$_['button_retry'] = 'Opnieuw proberen af te rekenen'; + +// Status page: payment failed (e.g. cancelled). +$_['heading_failed'] = 'Uw betaling is niet voltooid'; +$_['msg_failed'] = 'Helaas is de betaling mislukt. Klik op onderstaande knop om terug te keren naar het afrekenscherm.'; + +// Status page: payment pending. +$_['heading_unknown'] = 'We wachten nog op uw betaling'; +$_['msg_unknown'] = 'We hebben uw betaling nog niet ontvangen. Wij zullen een bevestigingsmail versturen op het moment dat de betaling binnen is.'; + +// Status page: API failure. +$_['heading_error'] = 'Er is een fout opgetreden bij het opzetten van de betaling'; +$_['text_error'] = 'Er is een fout opgetreden bij het opzetten van de betaling bij Mollie. Klik op onderstaande knop om terug te keren naar het afrekenscherm.'; + +// Response +$_['response_success'] = 'De betaling is ontvangen'; +$_['response_none'] = 'We wachten nog op de betaling. U krijgt een email zodra de status van de betaling bij ons bekend is.'; +$_['response_cancelled'] = 'De klant heeft de betaling geannuleerd'; +$_['response_failed'] = 'De betaling is helaas mislukt. Probeer het alstublieft opnieuw.'; +$_['response_expired'] = 'De betaling is verlopen'; +$_['response_unknown'] = 'Er is een onbekende fout opgetreden'; + +// Methods +$_['method_ideal'] = 'iDEAL'; +$_['method_creditcard'] = 'Creditcard'; +$_['method_mistercash'] = 'Mister Cash'; +$_['method_banktransfer'] = 'Overboeking'; +$_['method_directdebit'] = 'Eenmalige incasso'; +$_['method_belfius'] = 'Belfius Direct Net'; +$_['method_bitcoin'] = 'Bitcoin'; +$_['method_sofort'] = 'SOFORT Banking'; +$_['method_paypal'] = 'PayPal'; +$_['method_paysafecard'] = 'paysafecard'; \ No newline at end of file From 213984fed2cfa94594c9ad313e487a817a0343cb Mon Sep 17 00:00:00 2001 From: Ricardo Jacobs Date: Thu, 17 Mar 2016 09:53:52 +0100 Subject: [PATCH 4/7] Update API client to v1.4.1 --- catalog/controller/payment/mollie-api-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/controller/payment/mollie-api-client b/catalog/controller/payment/mollie-api-client index 731cb387..9aa5e5f3 160000 --- a/catalog/controller/payment/mollie-api-client +++ b/catalog/controller/payment/mollie-api-client @@ -1 +1 @@ -Subproject commit 731cb3874b3f54cad7ab9247fcd556faf8f0fde3 +Subproject commit 9aa5e5f3b3f69cbf73d08abb49654de78169de09 From 70a388f6ae09c9c7edf07624209f15598e49fef8 Mon Sep 17 00:00:00 2001 From: Ricardo Jacobs Date: Thu, 17 Mar 2016 09:54:27 +0100 Subject: [PATCH 5/7] Changed tests to also check OC 2.2 language files. --- .travis.yml | 3 ++- tests/unittests/translationTest.php | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ce0bf27e..979b2866 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: + - "5.6" - "5.5" - "5.4" - "5.3" -script: "phpunit -c tests/phpunit.xml" \ No newline at end of file +script: "phpunit -c tests/phpunit.xml" diff --git a/tests/unittests/translationTest.php b/tests/unittests/translationTest.php index d9dea575..40aff2d7 100755 --- a/tests/unittests/translationTest.php +++ b/tests/unittests/translationTest.php @@ -2,12 +2,19 @@ class TranslationTest extends PHPUnit_Framework_TestCase { - private static $LANGUAGES = array("dutch", "english"); + /** + * @var array + */ + private static $LANGUAGES = array("dutch", "english", "french", "nl-nl", "en-gb", "fr-fr"); - private static $keys = array(); + /** + * @var array + */ + private static $keys = array(); /** - * @param $path + * @param $orig_path + * * @dataProvider dpTranslationPaths */ public function testTranslationFilesHaveIdenticalKeys($orig_path) @@ -19,7 +26,8 @@ public function testTranslationFilesHaveIdenticalKeys($orig_path) foreach (self::$LANGUAGES as $language) { $lang_path = $path . DIRECTORY_SEPARATOR . $language . DIRECTORY_SEPARATOR . "payment" . DIRECTORY_SEPARATOR . "mollie.php"; - $_ = array(); + $_ = array(); + include $lang_path; $keys[$language] = array_keys($_); From 232b703f5fe0c64992018024b7a1ec4e461abc93 Mon Sep 17 00:00:00 2001 From: Ricardo Jacobs Date: Thu, 17 Mar 2016 09:57:07 +0100 Subject: [PATCH 6/7] Updating dev to version 6.3.0 tag. --- catalog/controller/payment/mollie/helper.php | 2 +- changelog.mdown | 3 +++ composer.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/catalog/controller/payment/mollie/helper.php b/catalog/controller/payment/mollie/helper.php index 61283e10..8ca660bb 100755 --- a/catalog/controller/payment/mollie/helper.php +++ b/catalog/controller/payment/mollie/helper.php @@ -1,7 +1,7 @@ Date: Thu, 17 Mar 2016 10:04:01 +0100 Subject: [PATCH 7/7] Added PHP 7.0 to TravisCI. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 979b2866..a1a1217e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: php php: + - "7.0" - "5.6" - "5.5" - "5.4"