Skip to content

Commit 2e054fe

Browse files
QualityWorksQualityWorks
authored
Merge pull request #287 from mollie/11.1.0
11.1.0
2 parents e68023c + 2431d6f commit 2e054fe

File tree

84 files changed

+3088
-1179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+3088
-1179
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
# Changelog #
44

5+
#### Changes in release 11.1.0
6+
+ Updated mollie payment details interface on order page
7+
+ Removed mollie payment fee options from 'payment' module and added them to 'order total' module (Mollie Payment Fee)
8+
+ Updated mollie payment fee interface and added more options
9+
+ Updated mollie api version
10+
+ Updated module design
11+
+ Removed mollie connect feature
12+
+ Bugfix and improvements
13+
514
#### Changes in release 11.0.1
615
+ Fixed payment failed status
716
+ Fixed permission error in admin after fresh install of the module

‎admin/controller/payment/mollie/base.php‎

Lines changed: 198 additions & 334 deletions
Large diffs are not rendered by default.

‎admin/controller/total/mollie_payment_fee.php‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?php
2+
3+
require_once(DIR_SYSTEM . "library/mollie/helper.php");
4+
25
class ControllerTotalMolliePaymentFee extends Controller {
36
protected $error = array();
47

58
// Holds multistore configs
69
protected $data = array();
710
private $token;
811
private $moduleCode;
12+
public $mollieHelper;
913

1014
public function __construct($registry) {
1115
parent::__construct($registry);
@@ -17,6 +21,8 @@ public function __construct($registry) {
1721
$this->token = 'token=' . $this->session->data['token'];
1822
$this->moduleCode = 'mollie_payment_fee';
1923
}
24+
25+
$this->mollieHelper = new MollieHelper($registry);
2026
}
2127

2228
public function install() {
@@ -39,6 +45,14 @@ public function index () {
3945
$this->install();
4046
// Load essential models
4147
$this->load->model('setting/setting');
48+
$this->load->model("localisation/language");
49+
$this->load->model("localisation/geo_zone");
50+
$this->load->model('localisation/tax_class');
51+
if (version_compare(VERSION, '2.1', '>=')) {
52+
$this->load->model("customer/customer_group");
53+
} else {
54+
$this->load->model("sale/customer_group");
55+
}
4256

4357
if (version_compare(VERSION, '2.3', '>=')) {
4458
$this->load->language('extension/total/mollie_payment_fee');
@@ -83,12 +97,27 @@ public function index () {
8397
$data['text_enabled'] = $this->language->get('text_enabled');
8498
$data['text_disabled'] = $this->language->get('text_disabled');
8599
$data['text_edit'] = $this->language->get('text_edit');
100+
$data['text_all_zones'] = $this->language->get('text_all_zones');
101+
$data['text_select'] = $this->language->get('text_select');
86102

87103
$data['entry_status'] = $this->language->get('entry_status');
88104
$data['entry_sort_order'] = $this->language->get('entry_sort_order');
105+
$data['entry_tax_class'] = $this->language->get('entry_tax_class');
106+
$data['entry_title'] = $this->language->get('entry_title');
107+
$data['entry_payment_method'] = $this->language->get('entry_payment_method');
108+
$data['entry_cost'] = $this->language->get('entry_cost');
109+
$data['entry_store'] = $this->language->get('entry_store');
110+
$data['entry_customer_group'] = $this->language->get('entry_customer_group');
111+
$data['entry_geo_zone'] = $this->language->get('entry_geo_zone');
112+
$data['entry_priority'] = $this->language->get('entry_priority');
113+
114+
$data['tab_general'] = $this->language->get('tab_general');
115+
$data['tab_charge'] = $this->language->get('tab_charge');
89116

90117
$data['button_save'] = $this->language->get('button_save');
91118
$data['button_cancel'] = $this->language->get('button_cancel');
119+
$data['button_add_charge'] = $this->language->get('button_add_charge');
120+
$data['button_remove_charge'] = $this->language->get('button_remove_charge');
92121

93122
$data['breadcrumbs'][] = array(
94123
'text' => $this->language->get('text_extension'),
@@ -106,6 +135,23 @@ public function index () {
106135

107136
$data['cancel'] = $extension_link;
108137
$data['code'] = $this->moduleCode;
138+
$data['payment_methods'] = $this->mollieHelper->MODULE_NAMES;
139+
$data['stores'] = $this->getStores();
140+
$data['geo_zones'] = $this->model_localisation_geo_zone->getGeoZones();
141+
$data['tax_classes'] = $this->model_localisation_tax_class->getTaxClasses();
142+
$data['languages'] = $this->model_localisation_language->getLanguages();
143+
foreach ($data['languages'] as &$language) {
144+
if (version_compare(VERSION, '2.2', '>=')) {
145+
$language['image'] = 'language/'.$language['code'].'/'.$language['code'].'.png';
146+
} else {
147+
$language['image'] = 'view/image/flags/'. $language['image'];
148+
}
149+
}
150+
if (version_compare(VERSION, '2.1', '>=')) {
151+
$data['customer_groups'] = $this->model_customer_customer_group->getCustomerGroups();
152+
} else {
153+
$data['customer_groups'] = $this->model_sale_customer_group->getCustomerGroups();
154+
}
109155

110156
if(isset($this->error['warning'])) {
111157
$data['error_warning'] = $this->error['warning'];
@@ -125,6 +171,20 @@ public function index () {
125171
$data['mollie_payment_fee_sort_order'] = $this->config->get($this->moduleCode . '_sort_order');
126172
}
127173

174+
if (isset($this->request->post[$this->moduleCode . '_tax_class_id'])) {
175+
$data['mollie_payment_fee_tax_class_id'] = $this->request->post[$this->moduleCode . '_tax_class_id'];
176+
} else {
177+
$data['mollie_payment_fee_tax_class_id'] = $this->config->get($this->moduleCode . '_tax_class_id');
178+
}
179+
180+
if (isset($this->request->post[$this->moduleCode . '_charge'])) {
181+
$data['mollie_payment_fee_charge'] = $this->request->post[$this->moduleCode . '_charge'];
182+
} elseif ($this->config->get($this->moduleCode . '_charge')) {
183+
$data['mollie_payment_fee_charge'] = $this->config->get($this->moduleCode . '_charge');
184+
} else {
185+
$data['mollie_payment_fee_charge'] = array();;
186+
}
187+
128188
if (version_compare(VERSION, '2', '>=')) {
129189
$data['header'] = $this->load->controller('common/header');
130190
$data['column_left'] = $this->load->controller('common/column_left');
@@ -157,4 +217,24 @@ private function validate () {
157217

158218
return !$this->error;
159219
}
220+
221+
private function getStores() {
222+
$this->load->model('setting/store');
223+
$stores = array();
224+
$stores[0] = array(
225+
'store_id' => 0,
226+
'name' => $this->config->get('config_name')
227+
);
228+
229+
$_stores = $this->model_setting_store->getStores();
230+
231+
foreach ($_stores as $store) {
232+
$stores[$store['store_id']] = array(
233+
'store_id' => $store['store_id'],
234+
'name' => $store['name']
235+
);
236+
}
237+
238+
return $stores;
239+
}
160240
}

‎admin/language/dutch/payment/mollie.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
$_['name_mollie_giropay'] = 'Giropay';
8080
$_['name_mollie_klarnapaylater'] = 'Klarna Pay Later';
8181
$_['name_mollie_klarnapaynow'] = 'Klarna Pay Now';
82-
$_['name_mollie_klarnasliceit'] = 'Klarna Slice It';
82+
$_['name_mollie_klarnasliceit'] = 'Klarna Betaal in 3 delen';
8383
$_['name_mollie_przelewy24'] = 'P24';
8484
$_['name_mollie_applepay'] = 'Apple Pay';
8585
$_['name_mollie_voucher'] = "Voucher";
@@ -95,8 +95,7 @@
9595
$_['text_payment'] = "Betaling";
9696
$_['text_success'] = "Gelukt: de instellingen voor de module zijn aangepast!";
9797
$_['text_missing_api_key'] = "Vul uw API-key in bij de <a data-toggle='tab' href='#' class='settings'>Instellingen</a>.";
98-
$_['text_enable_payment_method'] = 'Activeer deze betaalmethode via het <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie-dashboard</a>.';
99-
$_['text_activate_payment_method'] = 'Activeer via het <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>, of stel de App in via de instellingen van deze module om deze pagina te activeren.';
98+
$_['text_activate_payment_method'] = 'Activeer deze betaalmethode via het <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie-dashboard</a>.';
10099
$_['text_no_status_id'] = "- Status niet wijzigen (niet aanbevolen) -";
101100
$_['text_enable'] = "Activeren";
102101
$_['text_disable'] = "Deactiveren";
@@ -108,7 +107,8 @@
108107
$_['text_general'] = "Algemeen";
109108
$_['text_enquiry'] = "Hoe kunnen we u helpen?";
110109
$_['text_enquiry_success'] = "Succes: Uw aanvraag is ingediend. We nemen zo snel mogelijk contact met u op.";
111-
$_['text_update_message'] = "Mollie: Er is een geüpdatet versie (%s) van de Mollie module beschikbaar. Klik <a href='%s'>hier</a> om te updaten.";
110+
$_['text_update_message'] = 'Mollie: Er is een bijgewerkte versie (%s) beschikbaar van de Mollie-module. Klik <a href="%s">hier</a> om bij te werken. Wil je dit bericht niet meer zien? Klik <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">hier</a>.';
111+
$_['text_update_message_warning'] = 'Mollie: Er is een bijgewerkte versie (%s) beschikbaar van de Mollie-module. Werk uw PHP-versie bij naar 7.0.0 of hoger om de module bij te werken of blijf de huidige versie gebruiken. Wil je dit bericht niet meer zien? Klik <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">hier</a>.';
112112
$_['text_update_success'] = "Succes: Mollie module is geüpdatet naar versie %s.";
113113
$_['text_default_currency'] = "Gebruikte valuta in de winkel";
114114
$_['text_custom_css'] = "Custom CSS For Mollie Components";
@@ -237,7 +237,7 @@
237237
$_['button_update'] = "Bijwerken";
238238
$_['button_mollie_connect'] = "Connect via Mollie";
239239
$_['button_advance_option'] = "Advance Option";
240-
$_['button_close'] = "Sluiten";
240+
$_['button_save_close'] = "Opslaan en sluiten";
241241

242242
//Error log
243243
$_['text_log_success'] = 'Succes: u hebt met succes uw foutenlogboek gewist!';

‎admin/language/dutch/total/mollie_payment_fee.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,25 @@
99
$_['text_enable'] = "Activeren";
1010
$_['text_disable'] = "Deactiveren";
1111

12+
// Tab
13+
$_['tab_general'] = "Algemeen";
14+
$_['tab_charge'] = "Kosten";
15+
1216
// Entry
1317
$_['entry_status'] = "Status";
1418
$_['entry_sort_order'] = "Sorteervolgorde";
19+
$_['entry_tax_class'] = "Tax Class";
20+
$_['entry_title'] = "Titel";
21+
$_['entry_payment_method'] = "Betaalmethode";
22+
$_['entry_cost'] = "Kosten / vergoeding (voorbeeld: 5, 5%)";
23+
$_['entry_store'] = "Winkel";
24+
$_['entry_customer_group'] = "Klantengroep";
25+
$_['entry_geo_zone'] = "Geo Zone";
26+
$_['entry_priority'] = "Prioriteit";
27+
28+
// Button
29+
$_['button_add_charge'] = "Add Charge";
30+
$_['button_remove_charge'] = "Remove Charge";
1531

1632
// Error
1733
$_['error_permission'] = "Waarschuwing: U heeft geen toestemming om de module aan te passen.";

‎admin/language/english/payment/mollie.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@
9595
$_['text_payment'] = "Payment";
9696
$_['text_success'] = "Success: You have successfully modified your Mollie settings!";
9797
$_['text_missing_api_key'] = "Please fill out your API key in the <a data-toggle='tab' href='#' class='settings'>Settings</a> tab.";
98-
$_['text_enable_payment_method'] = 'Enable this payment method in your <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
99-
$_['text_activate_payment_method'] = 'Enable in <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>, or configure the App in the <a data-toggle=\'tab\' href=\'#\' class=\'settings\'>Settings</a> tab to enable on this page.';
98+
$_['text_activate_payment_method'] = 'Enable this payment method in your <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
10099
$_['text_no_status_id'] = "- Do not update the order status (not recommended) -";
101100
$_['text_enable'] = "Enable";
102101
$_['text_disable'] = "Disable";
@@ -108,7 +107,8 @@
108107
$_['text_general'] = "General";
109108
$_['text_enquiry'] = "How can we help you?";
110109
$_['text_enquiry_success'] = "Success: Your enquiry has been submitted. We'll get back to you soon. Thank you!";
111-
$_['text_update_message'] = "Mollie: There is an updated version (%s) available of the Mollie module. Click <a href='%s'>here</a> to update.";
110+
$_['text_update_message'] = 'Mollie: There is an updated version (%s) available of the Mollie module. Click <a href="%s">here</a> to update. Do not want to see this message again? Click <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">here</a>.';
111+
$_['text_update_message_warning'] = 'Mollie: There is an updated version (%s) available of the Mollie module. Please update your PHP version to 7.0.0 or later to update the module or continue using the current version. Do not want to see this message again? Click <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">here</a>.';
112112
$_['text_update_success'] = "Success: Mollie module has been updated to version %s.";
113113
$_['text_default_currency'] = "Currency used in the store";
114114
$_['text_custom_css'] = "Custom CSS For Mollie Components";
@@ -238,7 +238,7 @@
238238
$_['button_update'] = "Update";
239239
$_['button_mollie_connect'] = "Connect via Mollie";
240240
$_['button_advance_option'] = "Advance Option";
241-
$_['button_close'] = "Close";
241+
$_['button_save_close'] = "Save & Close";
242242

243243
//Error log
244244
$_['text_log_success'] = 'Success: You have successfully cleared your mollie log!';

‎admin/language/english/total/mollie_payment_fee.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,25 @@
99
$_['text_enable'] = "Enable";
1010
$_['text_disable'] = "Disable";
1111

12+
// Tab
13+
$_['tab_general'] = "General";
14+
$_['tab_charge'] = "Charges";
15+
1216
// Entry
1317
$_['entry_status'] = "Status";
1418
$_['entry_sort_order'] = "Sort Order";
19+
$_['entry_tax_class'] = "Tax Class";
20+
$_['entry_title'] = "Title";
21+
$_['entry_payment_method'] = "Payment Method";
22+
$_['entry_cost'] = "Cost / Fee (Ex: 5, 5%)";
23+
$_['entry_store'] = "Store";
24+
$_['entry_customer_group'] = "Customer Group";
25+
$_['entry_geo_zone'] = "Geo Zone";
26+
$_['entry_priority'] = "Priority";
27+
28+
// Button
29+
$_['button_add_charge'] = "Add Charge";
30+
$_['button_remove_charge'] = "Remove Charge";
1531

1632
// Error
1733
$_['error_permission'] = "Warning: You don't have permission to modify the Mollie module.";

‎admin/language/french/payment/mollie.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@
9494
$_['text_payment'] = "Paiement";
9595
$_['text_success'] = "Succès: Vous avez réussi à modifier les paramètres Mollie!";
9696
$_['text_missing_api_key'] = "S'il vous plaît remplir votre clé API dans l'onglet <a data-toggle='tab' href='#' class='settings'>Paramètres</a>.";
97-
$_['text_enable_payment_method'] = 'Activer ce mode de paiement via le <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
98-
$_['text_activate_payment_method'] = 'Activer dans le <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">tableau de bord Mollie<a/> ou configurer l\'application dans l\'onglet "reglages" pour l\'activer sur cette page.';
97+
$_['text_activate_payment_method'] = 'Activer ce mode de paiement via le <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
9998
$_['text_no_status_id'] = '- Ne pas mettre à jour le statut (non recommandé) -';
10099
$_['text_enable'] = "Activer";
101100
$_['text_disable'] = "Désactiver";
@@ -107,7 +106,8 @@
107106
$_['text_general'] = "Général";
108107
$_['text_enquiry'] = "Comment pouvons-nous vous aider?";
109108
$_['text_enquiry_success'] = "Succès: Votre demande a été soumise. Nous reviendrons vers vous bientôt. Je vous remercie!";
110-
$_['text_update_message'] = "Une nouvelle version (%s) du module Mollie est disponible. Cliquez <a href='%s'>ici</a> pour mettre à jour.";
109+
$_['text_update_message'] = 'Mollie : une version mise à jour (%s) du module Mollie est disponible. Cliquez <a href="%s">ici</a> pour mettre à jour. Vous ne voulez plus voir ce message ? Cliquez sur <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">ici</a>.';
110+
$_['text_update_message_warning'] = 'Mollie : une version mise à jour (%s) du module Mollie est disponible. Veuillez mettre à jour votre version PHP vers 7.0.0 ou une version ultérieure pour mettre à jour le module ou continuer à utiliser la version actuelle. Vous ne voulez plus voir ce message ? Cliquez sur <a href="javascript:void(0);" onclick="document.cookie=\'hide_mollie_update_message_version=%s\'; $(this).parent().hide();">ici</a>.';
111111
$_['text_update_success'] = "Succès: le module Mollie a été mis à jour vers la version %s.";
112112
$_['text_default_currency'] = "Devise utilisée dans le magasin";
113113
$_['text_custom_css'] = "Custom CSS For Mollie Components";
@@ -236,7 +236,7 @@
236236
$_['button_update'] = "Mettre à jour";
237237
$_['button_mollie_connect'] = "Connect via Mollie";
238238
$_['button_advance_option'] = "Advance Option";
239-
$_['button_close'] = "Fermer";
239+
$_['button_save_close'] = "Sauvegarder et fermer";
240240

241241
//Error log
242242
$_['text_log_success'] = 'Succès: vous avez effacé avec succès votre journal des erreurs!';

‎admin/language/french/total/mollie_payment_fee.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,25 @@
99
$_['text_enable'] = "Activer";
1010
$_['text_disable'] = "Désactiver";
1111

12+
// Tab
13+
$_['tab_general'] = "Général";
14+
$_['tab_charge'] = "Des charges";
15+
1216
// Entry
1317
$_['entry_status'] = "Status";
1418
$_['entry_sort_order'] = "Ordre de triage";
19+
$_['entry_tax_class'] = "Tax Class";
20+
$_['entry_title'] = "Titre";
21+
$_['entry_payment_method'] = "Mode de paiement";
22+
$_['entry_cost'] = "Coût / Frais (Ex: 5, 5%)";
23+
$_['entry_store'] = "Boutique";
24+
$_['entry_customer_group'] = "Groupe de clients";
25+
$_['entry_geo_zone'] = "Zone géographique";
26+
$_['entry_priority'] = "Priorité";
27+
28+
// Button
29+
$_['button_add_charge'] = "Add Charge";
30+
$_['button_remove_charge'] = "Remove Charge";
1531

1632
// Error
1733
$_['error_permission'] = "Attention: Vous n'avez pas l'autorisation de modifier les méthodes de paiement Mollie.";

0 commit comments

Comments
 (0)