Merge pull request #287 from mollie/11.1.0

11.1.0
mollie · Mar 30, 2022 · 2e054fe · 2e054fe
2 parents e68023c + 2431d6f
commit 2e054fe
Show file tree

Hide file tree

Showing 84 changed files with 3,088 additions and 1,179 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 # Changelog #
 
+#### Changes in release 11.1.0
+  + Updated mollie payment details interface on order page
+  + Removed mollie payment fee options from 'payment' module and added them to 'order total' module (Mollie Payment Fee)
+  + Updated mollie payment fee interface and added more options
+  + Updated mollie api version
+  + Updated module design
+  + Removed mollie connect feature
+  + Bugfix and improvements
+
 #### Changes in release 11.0.1
   + Fixed payment failed status
   + Fixed permission error in admin after fresh install of the module

diff --git a/admin/controller/payment/mollie/base.php b/admin/controller/payment/mollie/base.php
diff --git a/admin/controller/total/mollie_payment_fee.php b/admin/controller/total/mollie_payment_fee.php
@@ -1,11 +1,15 @@
 <?php
+
+require_once(DIR_SYSTEM . "library/mollie/helper.php");
+
 class ControllerTotalMolliePaymentFee extends Controller {
 	protected $error = array();
 
 	// Holds multistore configs
 	protected $data = array();
 	private $token;
 	private $moduleCode;
+	public $mollieHelper;
 
 	public function __construct($registry) {
 		parent::__construct($registry);
@@ -17,6 +21,8 @@ public function __construct($registry) {
 			$this->token = 'token=' . $this->session->data['token'];
 			$this->moduleCode = 'mollie_payment_fee';
 		}
+
+		$this->mollieHelper = new MollieHelper($registry);
 	}
 
 	public function install() {
@@ -39,6 +45,14 @@ public function index () {
 		$this->install();
 		// Load essential models
 		$this->load->model('setting/setting');
+		$this->load->model("localisation/language");
+		$this->load->model("localisation/geo_zone");
+		$this->load->model('localisation/tax_class');
+		if (version_compare(VERSION, '2.1', '>=')) {
+			$this->load->model("customer/customer_group");
+		} else {
+			$this->load->model("sale/customer_group");
+		}
 
 		if (version_compare(VERSION, '2.3', '>=')) {
 	      $this->load->language('extension/total/mollie_payment_fee');
@@ -83,12 +97,27 @@ public function index () {
 		$data['text_enabled']  = $this->language->get('text_enabled');
 		$data['text_disabled'] = $this->language->get('text_disabled');
 		$data['text_edit']     = $this->language->get('text_edit');
+		$data['text_all_zones'] = $this->language->get('text_all_zones');
+		$data['text_select'] = $this->language->get('text_select');
 
 		$data['entry_status']  = $this->language->get('entry_status');
 		$data['entry_sort_order']  = $this->language->get('entry_sort_order');
+		$data['entry_tax_class']  = $this->language->get('entry_tax_class');
+		$data['entry_title']  = $this->language->get('entry_title');
+		$data['entry_payment_method']  = $this->language->get('entry_payment_method');
+		$data['entry_cost']  = $this->language->get('entry_cost');
+		$data['entry_store']  = $this->language->get('entry_store');
+		$data['entry_customer_group']  = $this->language->get('entry_customer_group');
+		$data['entry_geo_zone']  = $this->language->get('entry_geo_zone');
+		$data['entry_priority']  = $this->language->get('entry_priority');
+
+		$data['tab_general']  = $this->language->get('tab_general');
+		$data['tab_charge']  = $this->language->get('tab_charge');
 
 		$data['button_save'] = $this->language->get('button_save');
 		$data['button_cancel'] = $this->language->get('button_cancel');
+		$data['button_add_charge'] = $this->language->get('button_add_charge');
+		$data['button_remove_charge'] = $this->language->get('button_remove_charge');
 
    		$data['breadcrumbs'][] = array(
 	       	'text'      => $this->language->get('text_extension'),
@@ -106,6 +135,23 @@ public function index () {
 
 		$data['cancel'] = $extension_link;
         $data['code']   = $this->moduleCode;
+        $data['payment_methods']   = $this->mollieHelper->MODULE_NAMES;
+        $data['stores']   = $this->getStores();
+		$data['geo_zones']			= $this->model_localisation_geo_zone->getGeoZones();
+		$data['tax_classes']        = $this->model_localisation_tax_class->getTaxClasses();
+		$data['languages']			= $this->model_localisation_language->getLanguages();
+		foreach ($data['languages'] as &$language) {
+	      if (version_compare(VERSION, '2.2', '>=')) {
+	        $language['image'] = 'language/'.$language['code'].'/'.$language['code'].'.png';
+	      } else {
+	        $language['image'] = 'view/image/flags/'. $language['image'];
+	      }
+	    }
+		if (version_compare(VERSION, '2.1', '>=')) {
+			$data['customer_groups'] = $this->model_customer_customer_group->getCustomerGroups();
+		} else {
+			$data['customer_groups'] = $this->model_sale_customer_group->getCustomerGroups();
+		}
 
 		if(isset($this->error['warning'])) {
 			$data['error_warning'] = $this->error['warning'];
@@ -125,6 +171,20 @@ public function index () {
 			$data['mollie_payment_fee_sort_order'] = $this->config->get($this->moduleCode . '_sort_order');
 		}
 
+		if (isset($this->request->post[$this->moduleCode . '_tax_class_id'])) {
+			$data['mollie_payment_fee_tax_class_id'] = $this->request->post[$this->moduleCode . '_tax_class_id'];
+		} else {
+			$data['mollie_payment_fee_tax_class_id'] = $this->config->get($this->moduleCode . '_tax_class_id');
+		}
+
+		if (isset($this->request->post[$this->moduleCode . '_charge'])) {
+			$data['mollie_payment_fee_charge'] = $this->request->post[$this->moduleCode . '_charge'];
+		} elseif ($this->config->get($this->moduleCode . '_charge')) {
+			$data['mollie_payment_fee_charge'] = $this->config->get($this->moduleCode . '_charge');
+		} else {
+			$data['mollie_payment_fee_charge'] = array();;
+		}
+
 		if (version_compare(VERSION, '2', '>=')) {
 			$data['header'] = $this->load->controller('common/header');
 			$data['column_left'] = $this->load->controller('common/column_left');
@@ -157,4 +217,24 @@ private function validate () {
 
 		return !$this->error;
 	}
+
+	private function getStores() {
+		$this->load->model('setting/store');
+		$stores = array();
+		$stores[0] = array(
+			'store_id' => 0,
+			'name'     => $this->config->get('config_name')
+		);
+
+		$_stores = $this->model_setting_store->getStores();
+
+		foreach ($_stores as $store) {
+			$stores[$store['store_id']] = array(
+				'store_id' => $store['store_id'],
+				'name'     => $store['name']
+			);
+		}
+
+		return $stores;
+	}
 }
diff --git a/admin/language/dutch/payment/mollie.php b/admin/language/dutch/payment/mollie.php
@@ -79,7 +79,7 @@
 $_['name_mollie_giropay']       = 'Giropay';
 $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later';
 $_['name_mollie_klarnapaynow']   = 'Klarna Pay Now';
-$_['name_mollie_klarnasliceit']  = 'Klarna Slice It';
+$_['name_mollie_klarnasliceit']  = 'Klarna Betaal in 3 delen';
 $_['name_mollie_przelewy24']  	 = 'P24';
 $_['name_mollie_applepay']  	 = 'Apple Pay';
 $_['name_mollie_voucher']        = "Voucher";
@@ -95,8 +95,7 @@
 $_['text_payment']                 = "Betaling";
 $_['text_success']                 = "Gelukt: de instellingen voor de module zijn aangepast!";
 $_['text_missing_api_key']         = "Vul uw API-key in bij de <a data-toggle='tab' href='#' class='settings'>Instellingen</a>.";
-$_['text_enable_payment_method']   = 'Activeer deze betaalmethode via het <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie-dashboard</a>.';
-$_['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.';
+$_['text_activate_payment_method'] = 'Activeer deze betaalmethode via het <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie-dashboard</a>.';
 $_['text_no_status_id']            = "- Status niet wijzigen (niet aanbevolen) -";
 $_['text_enable']             = "Activeren";
 $_['text_disable']            = "Deactiveren";
@@ -108,7 +107,8 @@
 $_['text_general'] 	  = "Algemeen";
 $_['text_enquiry'] 	  = "Hoe kunnen we u helpen?";
 $_['text_enquiry_success'] 	  = "Succes: Uw aanvraag is ingediend. We nemen zo snel mogelijk contact met u op.";
-$_['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.";
+$_['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>.';
+$_['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>.';
 $_['text_update_success']          = "Succes: Mollie module is geüpdatet naar versie %s.";
 $_['text_default_currency']        = "Gebruikte valuta in de winkel";
 $_['text_custom_css']              = "Custom CSS For Mollie Components";
@@ -237,7 +237,7 @@
 $_['button_update'] = "Bijwerken";
 $_['button_mollie_connect'] = "Connect via Mollie";
 $_['button_advance_option'] = "Advance Option";
-$_['button_close'] = "Sluiten";
+$_['button_save_close'] = "Opslaan en sluiten";
 
 //Error log
 $_['text_log_success']	   = 'Succes: u hebt met succes uw foutenlogboek gewist!';

diff --git a/admin/language/dutch/total/mollie_payment_fee.php b/admin/language/dutch/total/mollie_payment_fee.php
@@ -9,9 +9,25 @@
 $_['text_enable']             = "Activeren";
 $_['text_disable']            = "Deactiveren";
 
+// Tab
+$_['tab_general']            = "Algemeen";
+$_['tab_charge']             = "Kosten";
+
 // Entry
 $_['entry_status']	 		= "Status";
 $_['entry_sort_order']      = "Sorteervolgorde";
+$_['entry_tax_class']       = "Tax Class";
+$_['entry_title']           = "Titel";
+$_['entry_payment_method']  = "Betaalmethode";
+$_['entry_cost']            = "Kosten / vergoeding (voorbeeld: 5, 5%)";
+$_['entry_store']           = "Winkel";
+$_['entry_customer_group']  = "Klantengroep";
+$_['entry_geo_zone']        = "Geo Zone";
+$_['entry_priority']        = "Prioriteit";
+
+// Button
+$_['button_add_charge']        = "Add Charge";
+$_['button_remove_charge']     = "Remove Charge";
 
 // Error
 $_['error_permission']      = "Waarschuwing: U heeft geen toestemming om de module aan te passen.";
diff --git a/admin/language/english/payment/mollie.php b/admin/language/english/payment/mollie.php
@@ -95,8 +95,7 @@
 $_['text_payment']                 = "Payment";
 $_['text_success']                 = "Success: You have successfully modified your Mollie settings!";
 $_['text_missing_api_key']         = "Please fill out your API key in the <a data-toggle='tab' href='#' class='settings'>Settings</a> tab.";
-$_['text_enable_payment_method'] = 'Enable this payment method in your <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
-$_['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.';
+$_['text_activate_payment_method'] = 'Enable this payment method in your <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie dashboard</a>.';
 $_['text_no_status_id']            = "- Do not update the order status (not recommended) -";
 $_['text_enable']             = "Enable";
 $_['text_disable']            = "Disable";
@@ -108,7 +107,8 @@
 $_['text_general'] 	  = "General";
 $_['text_enquiry'] 	  = "How can we help you?";
 $_['text_enquiry_success'] 	  = "Success: Your enquiry has been submitted. We'll get back to you soon. Thank you!";
-$_['text_update_message']          = "Mollie: There is an updated version (%s) available of the Mollie module. Click <a href='%s'>here</a> to update.";
+$_['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>.';
+$_['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>.';
 $_['text_update_success']          = "Success: Mollie module has been updated to version %s.";
 $_['text_default_currency']        = "Currency used in the store";
 $_['text_custom_css']              = "Custom CSS For Mollie Components";
@@ -238,7 +238,7 @@
 $_['button_update'] = "Update";
 $_['button_mollie_connect'] = "Connect via Mollie";
 $_['button_advance_option'] = "Advance Option";
-$_['button_close'] = "Close";
+$_['button_save_close'] = "Save & Close";
 
 //Error log
 $_['text_log_success']	   = 'Success: You have successfully cleared your mollie log!';

diff --git a/admin/language/english/total/mollie_payment_fee.php b/admin/language/english/total/mollie_payment_fee.php
@@ -9,9 +9,25 @@
 $_['text_enable']             = "Enable";
 $_['text_disable']            = "Disable";
 
+// Tab
+$_['tab_general']            = "General";
+$_['tab_charge']             = "Charges";
+
 // Entry
 $_['entry_status']	 		= "Status";
 $_['entry_sort_order']      = "Sort Order";
+$_['entry_tax_class']       = "Tax Class";
+$_['entry_title']           = "Title";
+$_['entry_payment_method']  = "Payment Method";
+$_['entry_cost']            = "Cost / Fee (Ex: 5, 5%)";
+$_['entry_store']           = "Store";
+$_['entry_customer_group']  = "Customer Group";
+$_['entry_geo_zone']        = "Geo Zone";
+$_['entry_priority']        = "Priority";
+
+// Button
+$_['button_add_charge']        = "Add Charge";
+$_['button_remove_charge']     = "Remove Charge";
 
 // Error
 $_['error_permission']      = "Warning: You don't have permission to modify the Mollie module.";
diff --git a/admin/language/french/payment/mollie.php b/admin/language/french/payment/mollie.php
@@ -94,8 +94,7 @@
 $_['text_payment']                  = "Paiement";
 $_['text_success']                  = "Succès: Vous avez réussi à modifier les paramètres Mollie!";
 $_['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>.";
-$_['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>.';
-$_['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.';
+$_['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>.';
 $_['text_no_status_id']             = '- Ne pas mettre à jour le statut (non recommandé) -';
 $_['text_enable']                   = "Activer";
 $_['text_disable']                  = "Désactiver";
@@ -107,7 +106,8 @@
 $_['text_general'] 	                = "Général";
 $_['text_enquiry'] 	                = "Comment pouvons-nous vous aider?";
 $_['text_enquiry_success'] 	        = "Succès: Votre demande a été soumise. Nous reviendrons vers vous bientôt. Je vous remercie!";
-$_['text_update_message']           = "Une nouvelle version (%s) du module Mollie est disponible. Cliquez <a href='%s'>ici</a> pour mettre à jour.";
+$_['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>.';
+$_['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>.';
 $_['text_update_success']          = "Succès: le module Mollie a été mis à jour vers la version %s.";
 $_['text_default_currency']        = "Devise utilisée dans le magasin";
 $_['text_custom_css']              = "Custom CSS For Mollie Components";
@@ -236,7 +236,7 @@
 $_['button_update']         = "Mettre à jour";
 $_['button_mollie_connect'] = "Connect via Mollie";
 $_['button_advance_option'] = "Advance Option";
-$_['button_close'] = "Fermer";
+$_['button_save_close'] = "Sauvegarder et fermer";
 
 //Error log
 $_['text_log_success']	   = 'Succès: vous avez effacé avec succès votre journal des erreurs!';

diff --git a/admin/language/french/total/mollie_payment_fee.php b/admin/language/french/total/mollie_payment_fee.php
@@ -9,9 +9,25 @@
 $_['text_enable']             = "Activer";
 $_['text_disable']            = "Désactiver";
 
+// Tab
+$_['tab_general']            = "Général";
+$_['tab_charge']             = "Des charges";
+
 // Entry
 $_['entry_status']	 		= "Status";
 $_['entry_sort_order']      = "Ordre de triage";
+$_['entry_tax_class']       = "Tax Class";
+$_['entry_title']           = "Titre";
+$_['entry_payment_method']  = "Mode de paiement";
+$_['entry_cost']            = "Coût / Frais (Ex: 5, 5%)";
+$_['entry_store']           = "Boutique";
+$_['entry_customer_group']  = "Groupe de clients";
+$_['entry_geo_zone']        = "Zone géographique";
+$_['entry_priority']        = "Priorité";
+
+// Button
+$_['button_add_charge']        = "Add Charge";
+$_['button_remove_charge']     = "Remove Charge";
 
 // Error
 $_['error_permission']      = "Attention: Vous n'avez pas l'autorisation de modifier les méthodes de paiement Mollie.";