diff --git a/CHANGELOG.md b/CHANGELOG.md index 91359682..719b1959 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,16 @@ # Changelog # +#### Changes in release 11.2.0 + + Added IN3 Payment Method + + Fixed issue related to currencies decimal places + + Bugfix address validation of zone and postcode + + Removed order total notice when Mollie Payment Fee isn't enabled + + Changed PHP version check in update function + +#### Changes in release 11.1.1 + + Fixed bug related to shipping details + #### 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) diff --git a/admin/controller/extension/payment/mollie_in3.php b/admin/controller/extension/payment/mollie_in3.php new file mode 100644 index 00000000..6c8f95e5 --- /dev/null +++ b/admin/controller/extension/payment/mollie_in3.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/admin/controller/payment/mollie/base.php b/admin/controller/payment/mollie/base.php index 829ec276..b871783f 100644 --- a/admin/controller/payment/mollie/base.php +++ b/admin/controller/payment/mollie/base.php @@ -259,6 +259,23 @@ public function install () { } } } + + // Add voucher category field + if(!$this->db->query("SHOW COLUMNS FROM `" . DB_PREFIX . "product` LIKE 'voucher_category'")->row) { + $this->db->query("ALTER TABLE `" . DB_PREFIX . "product` ADD `voucher_category` VARCHAR(20) NULL"); + } + + // Fix for empty transaction id in old versions + $query = $this->db->query("SELECT * FROM `" .DB_PREFIX. "mollie_payments`"); + if ($query->num_rows) { + foreach ($query->rows as $row) { + if (!$row['transaction_id']) { + $rand_string = substr(str_shuffle(str_repeat($x='0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', ceil(10/strlen($x)) )), 1, 10); + + $this->db->query("UPDATE `" .DB_PREFIX. "mollie_payments` SET transaction_id = '" . $rand_string . "' WHERE order_id = '" . $row['order_id'] . "' AND mollie_order_id = '" . $row['mollie_order_id'] . "'"); + } + } + } } public function enableModFile($keep = '') { @@ -507,6 +524,29 @@ public function cleanUp() { unlink(DIR_SYSTEM.'../vqmod/mods.cache'); } } + + // Remove installer files (if exist) + $languageFiles = glob($adminLanguageDir .'*/extension/payment/_mollie.php'); + foreach($languageFiles as $file) { + if(file_exists($file)) { + unlink($file); + } + } + + $languageFiles = glob($adminLanguageDir .'*/payment/_mollie.php'); + foreach($languageFiles as $file) { + if(file_exists($file)) { + unlink($file); + } + } + + if(file_exists($adminControllerDir . 'extension/payment/_mollie.php')) { + unlink($adminControllerDir . 'extension/payment/_mollie.php'); + } + + if(file_exists($adminControllerDir . 'payment/_mollie.php')) { + unlink($adminControllerDir . 'payment/_mollie.php'); + } } public function delTree($dir) { @@ -953,6 +993,7 @@ public function index () { $data['name_mollie_klarnasliceit'] = $this->language->get('name_mollie_klarnasliceit'); $data['name_mollie_przelewy24'] = $this->language->get('name_mollie_przelewy24'); $data['name_mollie_applepay'] = $this->language->get('name_mollie_applepay'); + $data['name_mollie_in3'] = $this->language->get('name_mollie_in3'); // Deprecated names $data['name_mollie_bitcoin'] = $this->language->get('name_mollie_bitcoin'); $data['name_mollie_mistercash'] = $this->language->get('name_mollie_mistercash'); @@ -1057,11 +1098,19 @@ public function index () { $data['update_url'] = ($this->getUpdateUrl()) ? $this->getUpdateUrl()['updateUrl'] : ''; if (version_compare(phpversion(), MollieHelper::MIN_PHP_VERSION, "<")) { - $data['text_update'] = ($this->getUpdateUrl()) ? sprintf($this->language->get('text_update_message_warning'), $this->getUpdateUrl()['updateVersion'], $this->getUpdateUrl()['updateVersion']) : ''; - $data['module_update'] = false; + $data['error_min_php_version'] = sprintf($this->language->get('error_min_php_version'), MollieHelper::MIN_PHP_VERSION); } else { - $data['text_update'] = ($this->getUpdateUrl()) ? sprintf($this->language->get('text_update_message'), $this->getUpdateUrl()['updateVersion'], $data['update_url'], $this->getUpdateUrl()['updateVersion']) : ''; - $data['module_update'] = true; + $data['error_min_php_version'] = ''; + } + + if ($this->getUpdateUrl()) { + if (version_compare(phpversion(), MollieHelper::NEXT_PHP_VERSION, "<")) { + $data['text_update'] = sprintf($this->language->get('text_update_message_warning'), $this->getUpdateUrl()['updateVersion'], MollieHelper::NEXT_PHP_VERSION, $this->getUpdateUrl()['updateVersion']); + $data['module_update'] = false; + } else { + $data['text_update'] = sprintf($this->language->get('text_update_message'), $this->getUpdateUrl()['updateVersion'], $data['update_url'], $this->getUpdateUrl()['updateVersion']); + $data['module_update'] = true; + } } if (isset($_COOKIE["hide_mollie_update_message_version"]) && ($_COOKIE["hide_mollie_update_message_version"] == $this->getUpdateUrl()['updateVersion'])) { @@ -1082,12 +1131,6 @@ public function index () { $data['currencies'] = $this->model_localisation_currency->getCurrencies(); $data['tax_classes'] = $this->model_localisation_tax_class->getTaxClasses(); - // Check if Mollie Payment Fee order total is enabled - $molliePaymentFee = $this->config->get('total_mollie_payment_fee_status') || $this->config->get('mollie_payment_fee_status'); - if (!$molliePaymentFee) { - $this->session->data['warning_payment_fee'] = $this->language->get('error_mollie_payment_fee'); - } - $this->load->model('tool/image'); if(version_compare(VERSION, '2.0.2.0', '>=')) { @@ -1112,13 +1155,6 @@ public function index () { $data['warning'] = ''; } - if(isset($this->session->data['warning_payment_fee'])) { - $data['warning_payment_fee'] = $this->session->data['warning_payment_fee']; - $this->session->data['warning_payment_fee'] = ''; - } else { - $data['warning_payment_fee'] = ''; - } - if(isset($this->error['warning'])) { $data['error_warning'] = $this->error['warning']; } else { @@ -1537,8 +1573,8 @@ private function getUpdateUrl() { function update() { - // CHeck for PHP version - if (version_compare(phpversion(), MollieHelper::MIN_PHP_VERSION, "<")) { + // Check for PHP version + if (version_compare(phpversion(), MollieHelper::NEXT_PHP_VERSION, "<")) { if (version_compare(VERSION, '2.3', '>=')) { $this->response->redirect($this->url->link('extension/payment/mollie_' . static::MODULE_NAME, $this->token, true)); } elseif (version_compare(VERSION, '2', '>=')) { diff --git a/admin/controller/payment/mollie_in3.php b/admin/controller/payment/mollie_in3.php new file mode 100644 index 00000000..81ed5bf1 --- /dev/null +++ b/admin/controller/payment/mollie_in3.php @@ -0,0 +1,7 @@ +Mollie'; -$_['text_mollie_banktransfer'] = $method_list_logo; -$_['text_mollie_belfius'] = $method_list_logo; -$_['text_mollie_creditcard'] = $method_list_logo; -$_['text_mollie_ideal'] = $method_list_logo; -$_['text_mollie_kbc'] = $method_list_logo; -$_['text_mollie_bancontact'] = $method_list_logo; -$_['text_mollie_paypal'] = $method_list_logo; -$_['text_mollie_paysafecard'] = $method_list_logo; -$_['text_mollie_sofort'] = $method_list_logo; -$_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_eps'] = $method_list_logo; -$_['text_mollie_giropay'] = $method_list_logo; -$_['text_mollie_klarnapaylater'] = $method_list_logo; -$_['text_mollie_klarnapaynow'] = $method_list_logo; -$_['text_mollie_klarnasliceit'] = $method_list_logo; -$_['text_mollie_przelewy24'] = $method_list_logo; -$_['text_mollie_applepay'] = $method_list_logo; -$_['text_mollie_voucher'] = $method_list_logo; +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_kbc'] = $method_list_logo; +$_['text_mollie_bancontact'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; +$_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_eps'] = $method_list_logo; +$_['text_mollie_giropay'] = $method_list_logo; +$_['text_mollie_klarnapaylater'] = $method_list_logo; +$_['text_mollie_klarnapaynow'] = $method_list_logo; +$_['text_mollie_klarnasliceit'] = $method_list_logo; +$_['text_mollie_przelewy24'] = $method_list_logo; +$_['text_mollie_applepay'] = $method_list_logo; +$_['text_mollie_voucher'] = $method_list_logo; +$_['text_mollie_in3'] = $method_list_logo; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['text_mollie_inghomepay'] = $method_list_logo; @@ -65,30 +66,31 @@ $_['title_mail'] = "E-mail"; // Module names -$_['name_mollie_banktransfer'] = "Overboeking"; -$_['name_mollie_belfius'] = "Belfius Direct Net"; -$_['name_mollie_creditcard'] = "Creditcard"; -$_['name_mollie_ideal'] = "iDEAL"; -$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; -$_['name_mollie_bancontact'] = "Bancontact"; -$_['name_mollie_paypal'] = "PayPal"; -$_['name_mollie_paysafecard'] = "paysafecard"; -$_['name_mollie_sofort'] = "SOFORT Banking"; -$_['name_mollie_giftcard'] = 'Giftcard'; -$_['name_mollie_eps'] = 'EPS'; -$_['name_mollie_giropay'] = 'Giropay'; +$_['name_mollie_banktransfer'] = "Overboeking"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; +$_['name_mollie_bancontact'] = "Bancontact"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; +$_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_eps'] = 'EPS'; +$_['name_mollie_giropay'] = 'Giropay'; $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later'; $_['name_mollie_klarnapaynow'] = 'Klarna Pay Now'; $_['name_mollie_klarnasliceit'] = 'Klarna Betaal in 3 delen'; $_['name_mollie_przelewy24'] = 'P24'; $_['name_mollie_applepay'] = 'Apple Pay'; $_['name_mollie_voucher'] = "Voucher"; +$_['name_mollie_in3'] = "IN3"; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['name_mollie_inghomepay'] = 'INGHOMEPAY'; $_['name_mollie_directdebit'] = 'Direct Debit'; -$_['name_mollie_bitcoin'] = "Bitcoin"; -$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; // Text $_['text_edit'] = "Bewerk Mollie"; @@ -97,18 +99,18 @@ $_['text_missing_api_key'] = "Vul uw API-key in bij de Instellingen."; $_['text_activate_payment_method'] = 'Activeer deze betaalmethode via het Mollie-dashboard.'; $_['text_no_status_id'] = "- Status niet wijzigen (niet aanbevolen) -"; -$_['text_enable'] = "Activeren"; -$_['text_disable'] = "Deactiveren"; -$_['text_connection_success'] = "Succes: verbinding met Mollie gelukt!"; -$_['text_error'] = "Waarschuwing: er is iets misgegaan. Probeer het later opnieuw!"; -$_['text_creditcard_required'] = "Credit Card verplicht"; -$_['text_mollie_api'] = "Mollie API"; -$_['text_mollie_app'] = "Mollie App"; -$_['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 bijgewerkte versie (%s) beschikbaar van de Mollie-module. Klik hier om bij te werken. Wil je dit bericht niet meer zien? Klik hier.'; -$_['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 hier.'; +$_['text_enable'] = "Activeren"; +$_['text_disable'] = "Deactiveren"; +$_['text_connection_success'] = "Succes: verbinding met Mollie gelukt!"; +$_['text_error'] = "Waarschuwing: er is iets misgegaan. Probeer het later opnieuw!"; +$_['text_creditcard_required'] = "Credit Card verplicht"; +$_['text_mollie_api'] = "Mollie API"; +$_['text_mollie_app'] = "Mollie App"; +$_['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 nieuwe versie (%s) beschikbaar. Klik hier om bij te werken. Wil je dit bericht niet meer zien? Klik hier.'; +$_['text_update_message_warning'] = 'Mollie: Er is een nieuwe versie (%s) beschikbaar. Werk uw PHP-versie bij naar %s of hoger om de module bij te werken of blijf de huidige versie gebruiken. Wil je dit bericht niet meer zien? Klik hier.'; $_['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"; @@ -198,35 +200,35 @@ $_['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"; -$_['error_name'] = 'Waarschuwing: naam moet tussen 3 en 25 tekens bevatten!'; -$_['error_email'] = 'Waarschuwing: E-mailadres lijkt niet geldig te zijn!'; -$_['error_subject'] = 'Waarschuwing: onderwerp moet 3 tekens lang zijn!'; -$_['error_enquiry'] = 'Waarschuwing: onderzoekstekst moet 25 tekens lang zijn!'; -$_['error_no_api_client'] = 'API client not found.'; -$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; -$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; -$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; -$_['error_order_expiry_days'] = 'Waarschuwing: het is niet mogelijk om Klarna Slice it of Klarna Pay later als methode te gebruiken wanneer de vervaldatum meer dan 28 dagen in de toekomst ligt.'; +$_['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"; +$_['error_name'] = 'Waarschuwing: naam moet tussen 3 en 25 tekens bevatten!'; +$_['error_email'] = 'Waarschuwing: E-mailadres lijkt niet geldig te zijn!'; +$_['error_subject'] = 'Waarschuwing: onderwerp moet 3 tekens lang zijn!'; +$_['error_enquiry'] = 'Waarschuwing: onderzoekstekst moet 25 tekens lang zijn!'; +$_['error_no_api_client'] = 'API client not found.'; +$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; +$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; +$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; +$_['error_order_expiry_days'] = 'Waarschuwing: het is niet mogelijk om Klarna Slice it of Klarna Pay later als methode te gebruiken wanneer de vervaldatum meer dan 28 dagen in de toekomst ligt.'; $_['error_mollie_payment_fee'] = 'Waarschuwing: Mollie Payment Fee ordertotaal is uitgeschakeld!'; +$_['error_min_php_version'] = 'Waarschuwing: deze Mollie-module heeft PHP-versie %s of hoger nodig om te kunnen functioneren. Neem contact op met uw webdeveloper om dit probleem op te lossen!'; // 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"; -$_['entry_refund_status'] = "Status betaling terugbetaling"; +$_['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"; +$_['entry_refund_status'] = "Status betaling terugbetaling"; $_['entry_partial_refund_status'] = "Gedeeltelijke terugbetalingsstatus"; - -$_['entry_shipping_status'] = "Status bestelling verzonden"; -$_['entry_shipment'] = "Maak verzending"; -$_['entry_create_shipment_status'] = "Maak verzending aan na order status"; -$_['help_shipment'] = "Verzending wordt direct na het maken van de bestelling gemaakt. Selecteer 'Nee' om een ​​zending te creëren wanneer de order een specifieke status bereikt en selecteer de bestelstatus van onder."; +$_['entry_shipping_status'] = "Status bestelling verzonden"; +$_['entry_shipment'] = "Maak verzending"; +$_['entry_create_shipment_status'] = "Maak verzending aan na order status"; +$_['help_shipment'] = "Verzending wordt direct na het maken van de bestelling gemaakt. Selecteer 'Nee' om een ​​zending te creëren wanneer de order een specifieke status bereikt en selecteer de bestelstatus van onder."; $_['text_create_shipment_automatically'] = "Maak automatisch een zending bij het maken van de bestelling"; $_['text_create_shipment_on_status'] = "Maak verzending bij het plaatsen van de bestelling naar deze status"; @@ -234,10 +236,10 @@ $_['entry_create_shipment_on_order_complete'] = "Maak verzending bij bestelling compleet"; //Button -$_['button_update'] = "Bijwerken"; +$_['button_update'] = "Bijwerken"; $_['button_mollie_connect'] = "Connect via Mollie"; $_['button_advance_option'] = "Advance Option"; -$_['button_save_close'] = "Opslaan en 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/payment/mollie_in3.php b/admin/language/dutch/payment/mollie_in3.php new file mode 100644 index 00000000..ad025863 --- /dev/null +++ b/admin/language/dutch/payment/mollie_in3.php @@ -0,0 +1,4 @@ +Mollie'; -$_['text_mollie_banktransfer'] = $method_list_logo; -$_['text_mollie_belfius'] = $method_list_logo; -$_['text_mollie_creditcard'] = $method_list_logo; -$_['text_mollie_ideal'] = $method_list_logo; -$_['text_mollie_kbc'] = $method_list_logo; -$_['text_mollie_bancontact'] = $method_list_logo; -$_['text_mollie_paypal'] = $method_list_logo; -$_['text_mollie_paysafecard'] = $method_list_logo; -$_['text_mollie_sofort'] = $method_list_logo; -$_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_eps'] = $method_list_logo; -$_['text_mollie_giropay'] = $method_list_logo; +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_kbc'] = $method_list_logo; +$_['text_mollie_bancontact'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; +$_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_eps'] = $method_list_logo; +$_['text_mollie_giropay'] = $method_list_logo; $_['text_mollie_klarnapaylater'] = $method_list_logo; $_['text_mollie_klarnapaynow'] = $method_list_logo; $_['text_mollie_klarnasliceit'] = $method_list_logo; $_['text_mollie_przelewy24'] = $method_list_logo; $_['text_mollie_applepay'] = $method_list_logo; $_['text_mollie_voucher'] = $method_list_logo; +$_['text_mollie_in3'] = $method_list_logo; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['text_mollie_inghomepay'] = $method_list_logo; @@ -65,30 +66,31 @@ $_['title_mail'] = "Email"; // Module names -$_['name_mollie_banktransfer'] = "Bank transfer"; -$_['name_mollie_belfius'] = "Belfius Direct Net"; -$_['name_mollie_creditcard'] = "Creditcard"; -$_['name_mollie_ideal'] = "iDEAL"; -$_['name_mollie_kbc'] = "KBC/CBC Payment Button"; -$_['name_mollie_bancontact'] = "Bancontact"; -$_['name_mollie_paypal'] = "PayPal"; -$_['name_mollie_paysafecard'] = "paysafecard"; -$_['name_mollie_sofort'] = "SOFORT Banking"; -$_['name_mollie_giftcard'] = 'Giftcard'; -$_['name_mollie_eps'] = 'EPS'; -$_['name_mollie_giropay'] = 'Giropay'; +$_['name_mollie_banktransfer'] = "Bank transfer"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_kbc'] = "KBC/CBC Payment Button"; +$_['name_mollie_bancontact'] = "Bancontact"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; +$_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_eps'] = 'EPS'; +$_['name_mollie_giropay'] = 'Giropay'; $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later'; $_['name_mollie_klarnapaynow'] = 'Klarna Pay Now'; $_['name_mollie_klarnasliceit'] = 'Klarna Slice It'; $_['name_mollie_przelewy24'] = 'P24'; $_['name_mollie_applepay'] = 'Apple Pay'; $_['name_mollie_voucher'] = "Voucher"; +$_['name_mollie_in3'] = "IN3"; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['name_mollie_inghomepay'] = 'INGHOMEPAY'; $_['name_mollie_directdebit'] = 'Direct Debit'; -$_['name_mollie_bitcoin'] = "Bitcoin"; -$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; // Text $_['text_edit'] = "Edit"; @@ -97,18 +99,18 @@ $_['text_missing_api_key'] = "Please fill out your API key in the Settings tab."; $_['text_activate_payment_method'] = 'Enable this payment method in your Mollie dashboard.'; $_['text_no_status_id'] = "- Do not update the order status (not recommended) -"; -$_['text_enable'] = "Enable"; -$_['text_disable'] = "Disable"; -$_['text_connection_success'] = "Success: Connection to Mollie successful!"; -$_['text_error'] = "Warning: Something went wrong. Please try again later!"; -$_['text_creditcard_required'] = "Requires Credit Card"; -$_['text_mollie_api'] = "Mollie API"; -$_['text_mollie_app'] = "Mollie App"; -$_['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 here to update. Do not want to see this message again? Click here.'; -$_['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 here.'; +$_['text_enable'] = "Enable"; +$_['text_disable'] = "Disable"; +$_['text_connection_success'] = "Success: Connection to Mollie successful!"; +$_['text_error'] = "Warning: Something went wrong. Please try again later!"; +$_['text_creditcard_required'] = "Requires Credit Card"; +$_['text_mollie_api'] = "Mollie API"; +$_['text_mollie_app'] = "Mollie App"; +$_['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: A new version (%s) is available. Click here to update. Do not want to see this message again? Click here.'; +$_['text_update_message_warning'] = 'Mollie: A new version (%s) is available. Please update your PHP version to %s or higher to update the module or continue using the current version. Do not want to see this message again? Click here.'; $_['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"; @@ -199,31 +201,31 @@ $_['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"; -$_['error_name'] = 'Warning: Name must be between 3 and 25 characters!'; -$_['error_email'] = 'Warning: E-Mail Address does not appear to be valid!'; -$_['error_subject'] = 'Warning: Subject must be 3 characters long!'; -$_['error_enquiry'] = 'Warning: Enquiry text must be 25 characters long!'; -$_['error_no_api_client'] = 'API client not found.'; -$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; -$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; -$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; -$_['error_order_expiry_days'] = 'Warning: It is not posible to use Klarna Slice it or Klarna Pay later as method when expiry date is more than 28 days in the future.'; +$_['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"; +$_['error_name'] = 'Warning: Name must be between 3 and 25 characters!'; +$_['error_email'] = 'Warning: E-Mail Address does not appear to be valid!'; +$_['error_subject'] = 'Warning: Subject must be 3 characters long!'; +$_['error_enquiry'] = 'Warning: Enquiry text must be 25 characters long!'; +$_['error_no_api_client'] = 'API client not found.'; +$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; +$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; +$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; +$_['error_order_expiry_days'] = 'Warning: It is not posible to use Klarna Slice it or Klarna Pay later as method when expiry date is more than 28 days in the future.'; $_['error_mollie_payment_fee'] = 'Warning: Mollie Payment Fee order total is disabled!'; +$_['error_min_php_version'] = 'Warning: This Mollie module needs PHP version %s or higher to function. Please contact your webdeveloper to fix this issue!'; // 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"; -$_['entry_refund_status'] = "Payment refund status"; -$_['entry_partial_refund_status'] = "Partial Refund 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"; +$_['entry_refund_status'] = "Payment refund status"; +$_['entry_partial_refund_status'] = "Partial Refund Status"; $_['entry_shipping_status'] = "Order shipped status"; $_['entry_shipment'] = "Create shipment"; $_['entry_create_shipment_status'] = "Create shipment after order status"; @@ -235,10 +237,10 @@ $_['entry_create_shipment_on_order_complete'] = "Create shipment upon order complete"; //Button -$_['button_update'] = "Update"; +$_['button_update'] = "Update"; $_['button_mollie_connect'] = "Connect via Mollie"; $_['button_advance_option'] = "Advance Option"; -$_['button_save_close'] = "Save & 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/payment/mollie_in3.php b/admin/language/english/payment/mollie_in3.php new file mode 100644 index 00000000..ad025863 --- /dev/null +++ b/admin/language/english/payment/mollie_in3.php @@ -0,0 +1,4 @@ +Mollie'; -$_['text_mollie_banktransfer'] = $method_list_logo; -$_['text_mollie_belfius'] = $method_list_logo; -$_['text_mollie_creditcard'] = $method_list_logo; -$_['text_mollie_ideal'] = $method_list_logo; -$_['text_mollie_kbc'] = $method_list_logo; -$_['text_mollie_bancontact'] = $method_list_logo; -$_['text_mollie_paypal'] = $method_list_logo; -$_['text_mollie_paysafecard'] = $method_list_logo; -$_['text_mollie_sofort'] = $method_list_logo; -$_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_eps'] = $method_list_logo; -$_['text_mollie_giropay'] = $method_list_logo; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_kbc'] = $method_list_logo; +$_['text_mollie_bancontact'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; +$_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_eps'] = $method_list_logo; +$_['text_mollie_giropay'] = $method_list_logo; $_['text_mollie_klarnapaylater'] = $method_list_logo; $_['text_mollie_klarnapaynow'] = $method_list_logo; $_['text_mollie_klarnasliceit'] = $method_list_logo; $_['text_mollie_przelewy24'] = $method_list_logo; $_['text_mollie_applepay'] = $method_list_logo; $_['text_mollie_voucher'] = $method_list_logo; +$_['text_mollie_in3'] = $method_list_logo; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['text_mollie_inghomepay'] = $method_list_logo; @@ -65,29 +66,30 @@ $_['title_mail'] = "Email"; // Module names -$_['name_mollie_bancontact'] = "Bancontact"; -$_['name_mollie_banktransfer'] = "Virement bancaire"; -$_['name_mollie_belfius'] = "Belfius Direct Net"; -$_['name_mollie_creditcard'] = "Creditcard"; -$_['name_mollie_ideal'] = "iDEAL"; -$_['name_mollie_kbc'] = "Bouton de paiement KBC/CBC"; -$_['name_mollie_paypal'] = "PayPal"; -$_['name_mollie_paysafecard'] = "paysafecard"; -$_['name_mollie_sofort'] = "SOFORT Banking"; -$_['name_mollie_giftcard'] = 'Giftcard'; -$_['name_mollie_eps'] = 'EPS'; -$_['name_mollie_giropay'] = 'Giropay'; +$_['name_mollie_bancontact'] = "Bancontact"; +$_['name_mollie_banktransfer'] = "Virement bancaire"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_kbc'] = "Bouton de paiement KBC/CBC"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; +$_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_eps'] = 'EPS'; +$_['name_mollie_giropay'] = 'Giropay'; $_['name_mollie_klarnapaynow'] = 'Klarna Pay Now'; $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later'; $_['name_mollie_klarnasliceit'] = 'Klarna Slice It'; $_['name_mollie_przelewy24'] = 'P24'; $_['name_mollie_applepay'] = 'Apple Pay'; $_['name_mollie_voucher'] = "Voucher"; +$_['name_mollie_in3'] = "IN3"; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['name_mollie_inghomepay'] = 'INGHOMEPAY'; $_['name_mollie_directdebit'] = 'Direct Debit'; -$_['name_mollie_bitcoin'] = "Bitcoin"; -$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; // Text $_['text_edit'] = "Éditer Mollie"; @@ -106,8 +108,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'] = 'Mollie : une version mise à jour (%s) du module Mollie est disponible. Cliquez ici pour mettre à jour. Vous ne voulez plus voir ce message ? Cliquez sur ici.'; -$_['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 ici.'; +$_['text_update_message'] = 'Mollie : Une nouvelle version (%s) est disponible. Cliquez ici pour mettre à jour. Vous ne voulez plus voir ce message ? Cliquez sur ici.'; +$_['text_update_message_warning'] = 'Mollie : Une nouvelle version (%s) est disponible. Veuillez mettre à jour votre version PHP vers %s 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 ici.'; $_['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"; @@ -197,35 +199,35 @@ $_['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"; -$_['error_name'] = 'Attention: le nom doit comporter entre 3 et 25 caractères!'; -$_['error_email'] = 'Attention: Adresse e-mail ne semble pas être valide!'; -$_['error_subject'] = 'Attention: le sujet doit avoir 3 caractères!'; -$_['error_enquiry'] = 'Attention: le texte de la requête doit comporter 25 caractères!'; -$_['error_no_api_client'] = 'API client not found.'; -$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; -$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; -$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; -$_['error_order_expiry_days'] = 'Attention: il n\'est pas possible d\'utiliser Klarna Slice it ou Klarna Pay plus tard comme méthode lorsque la date d\'expiration est plus de 28 jours dans le futur.'; +$_['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"; +$_['error_name'] = 'Attention: le nom doit comporter entre 3 et 25 caractères!'; +$_['error_email'] = 'Attention: Adresse e-mail ne semble pas être valide!'; +$_['error_subject'] = 'Attention: le sujet doit avoir 3 caractères!'; +$_['error_enquiry'] = 'Attention: le texte de la requête doit comporter 25 caractères!'; +$_['error_no_api_client'] = 'API client not found.'; +$_['error_api_help'] = 'You can ask your hosting provider to help with this.'; +$_['error_comm_failed'] = 'Communicating with Mollie failed:
%s

Please check the following conditions. You can ask your hosting provider to help with this.
Contact info@mollie.nl if this still does not fix your problem.'; +$_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; +$_['error_order_expiry_days'] = 'Attention: il n\'est pas possible d\'utiliser Klarna Slice it ou Klarna Pay plus tard comme méthode lorsque la date d\'expiration est plus de 28 jours dans le futur.'; $_['error_mollie_payment_fee'] = 'Attention: le total de la commande des frais de paiement Mollie est désactivé!'; +$_['error_min_php_version'] = 'Attention : Ce module Mollie nécessite PHP version %s ou supérieure pour fonctionner. Veuillez contacter votre développeur Web pour résoudre ce problème!'; // 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"; -$_['entry_refund_status'] = "État de paiement rembourser"; +$_['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"; +$_['entry_refund_status'] = "État de paiement rembourser"; $_['entry_partial_refund_status'] = "Statut de remboursement partiel"; - -$_['entry_shipping_status'] = "Statut de la commande expédiée"; -$_['entry_shipment'] = "Créer un envoi"; -$_['entry_create_shipment_status'] = "Créer un envoi après le statut de la commande"; -$_['help_shipment'] = "Envoi sera créé juste après la création de la commande. Sélectionnez «Non» pour créer une expédition lorsque la commande atteint un statut spécifique et sélectionnez le statut de la commande ci-dessous."; +$_['entry_shipping_status'] = "Statut de la commande expédiée"; +$_['entry_shipment'] = "Créer un envoi"; +$_['entry_create_shipment_status'] = "Créer un envoi après le statut de la commande"; +$_['help_shipment'] = "Envoi sera créé juste après la création de la commande. Sélectionnez «Non» pour créer une expédition lorsque la commande atteint un statut spécifique et sélectionnez le statut de la commande ci-dessous."; $_['text_create_shipment_automatically'] = "Créer automatiquement l'envoi lors de la création de la commande"; $_['text_create_shipment_on_status'] = "Créer un envoi lors du réglage de la commande à ce statut"; @@ -236,7 +238,7 @@ $_['button_update'] = "Mettre à jour"; $_['button_mollie_connect'] = "Connect via Mollie"; $_['button_advance_option'] = "Advance Option"; -$_['button_save_close'] = "Sauvegarder et 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/payment/mollie_in3.php b/admin/language/french/payment/mollie_in3.php new file mode 100644 index 00000000..ad025863 --- /dev/null +++ b/admin/language/french/payment/mollie_in3.php @@ -0,0 +1,4 @@ +Mollie'; -$_['text_mollie_banktransfer'] = $method_list_logo; -$_['text_mollie_belfius'] = $method_list_logo; -$_['text_mollie_creditcard'] = $method_list_logo; -$_['text_mollie_ideal'] = $method_list_logo; -$_['text_mollie_kbc'] = $method_list_logo; -$_['text_mollie_bancontact'] = $method_list_logo; -$_['text_mollie_paypal'] = $method_list_logo; -$_['text_mollie_paysafecard'] = $method_list_logo; -$_['text_mollie_sofort'] = $method_list_logo; -$_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_eps'] = $method_list_logo; -$_['text_mollie_giropay'] = $method_list_logo; +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_kbc'] = $method_list_logo; +$_['text_mollie_bancontact'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; +$_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_eps'] = $method_list_logo; +$_['text_mollie_giropay'] = $method_list_logo; $_['text_mollie_klarnapaylater'] = $method_list_logo; $_['text_mollie_klarnapaynow'] = $method_list_logo; $_['text_mollie_klarnasliceit'] = $method_list_logo; $_['text_mollie_przelewy24'] = $method_list_logo; $_['text_mollie_applepay'] = $method_list_logo; $_['text_mollie_voucher'] = $method_list_logo; +$_['text_mollie_in3'] = $method_list_logo; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['text_mollie_inghomepay'] = $method_list_logo; @@ -65,29 +66,30 @@ $_['title_mail'] = "Email"; // Module names -$_['name_mollie_bancontact'] = "Bancontact"; -$_['name_mollie_banktransfer'] = "Übertragung"; -$_['name_mollie_belfius'] = "Belfius Direct Net"; -$_['name_mollie_creditcard'] = "Creditcard"; -$_['name_mollie_ideal'] = "iDEAL"; -$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; -$_['name_mollie_paypal'] = "PayPal"; -$_['name_mollie_paysafecard'] = "paysafecard"; -$_['name_mollie_sofort'] = "SOFORT Banking"; -$_['name_mollie_giftcard'] = 'Giftcard'; -$_['name_mollie_eps'] = 'EPS'; -$_['name_mollie_giropay'] = 'Giropay'; +$_['name_mollie_bancontact'] = "Bancontact"; +$_['name_mollie_banktransfer'] = "Übertragung"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; +$_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_eps'] = 'EPS'; +$_['name_mollie_giropay'] = 'Giropay'; $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later'; $_['name_mollie_klarnapaynow'] = 'Klarna Pay Now'; $_['name_mollie_klarnasliceit'] = 'Klarna Slice It'; $_['name_mollie_przelewy24'] = 'P24'; $_['name_mollie_applepay'] = 'Apple Pay'; $_['name_mollie_voucher'] = "Voucher"; +$_['name_mollie_in3'] = "IN3"; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['name_mollie_inghomepay'] = 'INGHOMEPAY'; $_['name_mollie_directdebit'] = 'Direct Debit'; -$_['name_mollie_bitcoin'] = "Bitcoin"; -$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; // Text $_['text_edit'] = "Mollie bearbeiten"; @@ -106,8 +108,8 @@ $_['text_general'] = "Allgemeines"; $_['text_enquiry'] = "Wie können wir Ihnen helfen?"; $_['text_enquiry_success'] = "Erfolg: Ihre Anfrage wurde übermittelt. Wir werden uns umgehend bei Ihnen melden. Danke!"; -$_['text_update_message'] = 'Mollie: Es ist eine aktualisierte Version (%s) des Mollie-Moduls verfügbar. Klicken Sie zum Aktualisieren hier. Möchten Sie diese Nachricht nicht mehr sehen? Klicken Sie auf hier.'; -$_['text_update_message_warning'] = 'Mollie: Es ist eine aktualisierte Version (%s) des Mollie-Moduls verfügbar. Bitte aktualisieren Sie Ihre PHP-Version auf 7.0.0 oder höher, um das Modul zu aktualisieren, oder verwenden Sie weiterhin die aktuelle Version. Möchten Sie diese Nachricht nicht mehr sehen? Klicken Sie auf hier.'; +$_['text_update_message'] = 'Mollie: Eine neue Version (%s) ist verfügbar. Klicken Sie zum Aktualisieren hier. Möchten Sie diese Nachricht nicht mehr sehen? Klicken Sie auf hier.'; +$_['text_update_message_warning'] = 'Mollie: Eine neue Version (%s) ist verfügbar. Bitte aktualisieren Sie Ihre PHP-Version auf %s oder höher, um das Modul zu aktualisieren, oder verwenden Sie weiterhin die aktuelle Version. Möchten Sie diese Nachricht nicht mehr sehen? Klicken Sie auf hier.'; $_['text_update_success'] = "Erfolg: Das Mollie-Modul wurde auf Version %s aktualisiert."; $_['text_default_currency'] = "Im Geschäft verwendete Währung"; $_['text_custom_css'] = "Custom CSS For Mollie Components"; @@ -197,11 +199,11 @@ $_['entry_version'] = 'Mollie Opencart'; // Error -$_['error_permission'] = "Warnung: Sie haben keine Berechtigung, das Modul zu bearbeiten."; -$_['error_api_key'] = "Mollie API Key ist verpflichtend!"; -$_['error_api_key_invalid'] = "Ungültiger Mollie API Key!"; -$_['error_description'] = "Die Beschreibung ist obligatorisch!"; -$_['error_file_missing'] = "Die Datei existiert nicht"; +$_['error_permission'] = "Warnung: Sie haben keine Berechtigung, das Modul zu bearbeiten."; +$_['error_api_key'] = "Mollie API Key ist verpflichtend!"; +$_['error_api_key_invalid'] = "Ungültiger Mollie API Key!"; +$_['error_description'] = "Die Beschreibung ist obligatorisch!"; +$_['error_file_missing'] = "Die Datei existiert nicht"; $_['error_name'] = 'Achtung: Der Name muss zwischen 3 und 25 Zeichen lang sein!'; $_['error_email'] = 'Achtung: E-Mail-Adresse scheint nicht gültig zu sein!'; $_['error_subject'] = 'Achtung: Betreff muss 3 Zeichen lang sein!'; @@ -212,17 +214,17 @@ $_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; $_['error_order_expiry_days'] = 'Warnung: Es ist nicht möglich, Klarna Slice it oder Klarna Pay später als Methode zu verwenden, wenn das Ablaufdatum mehr als 28 Tage in der Zukunft liegt.'; $_['error_mollie_payment_fee'] = 'Warnung: Die Gesamtbestellgebühr für Mollie ist deaktiviert!'; +$_['error_min_php_version'] = 'Warnung: Dieses Mollie-Modul benötigt die PHP-Version %s oder höher, um zu funktionieren. Bitte wenden Sie sich an Ihren Webentwickler, um dieses Problem zu beheben!'; // Status -$_['entry_pending_status'] = "Status Zahlung erstellt"; -$_['entry_failed_status'] = "Status Zahlung fehlgeschlagen"; -$_['entry_canceled_status'] = "Status Zahlung annulliert"; -$_['entry_expired_status'] = "Status Zahlung verstrichen"; -$_['entry_processing_status']= "Status Zahlung erfolgreich"; -$_['entry_refund_status'] = "Status Zahlung rückerstattung"; -$_['entry_partial_refund_status'] = "Teilerstattungsstatus"; - -$_['entry_shipping_status'] = "Versandstatus der Bestellung"; +$_['entry_pending_status'] = "Status Zahlung erstellt"; +$_['entry_failed_status'] = "Status Zahlung fehlgeschlagen"; +$_['entry_canceled_status'] = "Status Zahlung annulliert"; +$_['entry_expired_status'] = "Status Zahlung verstrichen"; +$_['entry_processing_status'] = "Status Zahlung erfolgreich"; +$_['entry_refund_status'] = "Status Zahlung rückerstattung"; +$_['entry_partial_refund_status'] = "Teilerstattungsstatus"; +$_['entry_shipping_status'] = "Versandstatus der Bestellung"; $_['entry_shipment'] = "Sendung erstellen"; $_['entry_create_shipment_status'] = "Erstellen Sie eine Sendung nach dem Bestellstatus"; $_['help_shipment'] = "Versand wird direkt nach dem Erstellen der Bestellung erstellt. Wählen Sie 'Nein', um die Sendung zu erstellen, wenn die Bestellung einen bestimmten Status erreicht, und wählen Sie den Bestellstatus von unten aus."; @@ -233,10 +235,10 @@ $_['entry_create_shipment_on_order_complete'] = "Erstellen Sie den Versand nach Abschluss der Bestellung"; //Button -$_['button_update'] = "Aktualisieren"; +$_['button_update'] = "Aktualisieren"; $_['button_mollie_connect'] = "Connect via Mollie"; $_['button_advance_option'] = "Advance Option"; -$_['button_save_close'] = "Speichern & schließen"; +$_['button_save_close'] = "Speichern & schließen"; //Error log $_['text_log_success'] = 'Erfolg: Sie haben Ihr Fehlerprotokoll erfolgreich gelöscht!'; diff --git a/admin/language/german/payment/mollie_in3.php b/admin/language/german/payment/mollie_in3.php new file mode 100644 index 00000000..ad025863 --- /dev/null +++ b/admin/language/german/payment/mollie_in3.php @@ -0,0 +1,4 @@ +Mollie'; -$_['text_mollie_banktransfer'] = $method_list_logo; -$_['text_mollie_belfius'] = $method_list_logo; -$_['text_mollie_creditcard'] = $method_list_logo; -$_['text_mollie_ideal'] = $method_list_logo; -$_['text_mollie_kbc'] = $method_list_logo; -$_['text_mollie_bancontact'] = $method_list_logo; -$_['text_mollie_paypal'] = $method_list_logo; -$_['text_mollie_paysafecard'] = $method_list_logo; -$_['text_mollie_sofort'] = $method_list_logo; -$_['text_mollie_giftcard'] = $method_list_logo; -$_['text_mollie_eps'] = $method_list_logo; -$_['text_mollie_giropay'] = $method_list_logo; +$method_list_logo = 'Mollie'; +$_['text_mollie_banktransfer'] = $method_list_logo; +$_['text_mollie_belfius'] = $method_list_logo; +$_['text_mollie_creditcard'] = $method_list_logo; +$_['text_mollie_ideal'] = $method_list_logo; +$_['text_mollie_kbc'] = $method_list_logo; +$_['text_mollie_bancontact'] = $method_list_logo; +$_['text_mollie_paypal'] = $method_list_logo; +$_['text_mollie_paysafecard'] = $method_list_logo; +$_['text_mollie_sofort'] = $method_list_logo; +$_['text_mollie_giftcard'] = $method_list_logo; +$_['text_mollie_eps'] = $method_list_logo; +$_['text_mollie_giropay'] = $method_list_logo; $_['text_mollie_klarnapaylater'] = $method_list_logo; $_['text_mollie_klarnapaynow'] = $method_list_logo; $_['text_mollie_klarnasliceit'] = $method_list_logo; $_['text_mollie_przelewy24'] = $method_list_logo; $_['text_mollie_applepay'] = $method_list_logo; $_['text_mollie_voucher'] = $method_list_logo; +$_['text_mollie_in3'] = $method_list_logo; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['text_mollie_inghomepay'] = $method_list_logo; @@ -65,29 +66,30 @@ $_['title_mail'] = "Email"; // Module names -$_['name_mollie_bancontact'] = "Bancontact"; -$_['name_mollie_banktransfer'] = "Transferencia bancaria"; -$_['name_mollie_belfius'] = "Belfius Direct Net"; -$_['name_mollie_creditcard'] = "Creditcard"; -$_['name_mollie_ideal'] = "iDEAL"; -$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; -$_['name_mollie_paypal'] = "PayPal"; -$_['name_mollie_paysafecard'] = "paysafecard"; -$_['name_mollie_sofort'] = "SOFORT Banking"; -$_['name_mollie_giftcard'] = 'Giftcard'; -$_['name_mollie_eps'] = 'EPS'; -$_['name_mollie_giropay'] = 'Giropay'; +$_['name_mollie_bancontact'] = "Bancontact"; +$_['name_mollie_banktransfer'] = "Transferencia bancaria"; +$_['name_mollie_belfius'] = "Belfius Direct Net"; +$_['name_mollie_creditcard'] = "Creditcard"; +$_['name_mollie_ideal'] = "iDEAL"; +$_['name_mollie_kbc'] = "KBC/CBC-Betaalknop"; +$_['name_mollie_paypal'] = "PayPal"; +$_['name_mollie_paysafecard'] = "paysafecard"; +$_['name_mollie_sofort'] = "SOFORT Banking"; +$_['name_mollie_giftcard'] = 'Giftcard'; +$_['name_mollie_eps'] = 'EPS'; +$_['name_mollie_giropay'] = 'Giropay'; $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later'; $_['name_mollie_klarnapaynow'] = 'Klarna Pay Now'; $_['name_mollie_klarnasliceit'] = 'Klarna Slice It'; $_['name_mollie_przelewy24'] = 'P24'; $_['name_mollie_applepay'] = 'Apple Pay'; $_['name_mollie_voucher'] = "Voucher"; +$_['name_mollie_in3'] = "IN3"; //These methods have been removed, it's here only to supress error of undefined variables. We'll remove it later $_['name_mollie_inghomepay'] = 'INGHOMEPAY'; $_['name_mollie_directdebit'] = 'Direct Debit'; -$_['name_mollie_bitcoin'] = "Bitcoin"; -$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; +$_['name_mollie_bitcoin'] = "Bitcoin"; +$_['name_mollie_mistercash'] = "Bancontact/MisterCash"; // Text $_['text_edit'] = "Corregir Mollie"; @@ -106,8 +108,8 @@ $_['text_general'] = "General"; $_['text_enquiry'] = "Como podemos ayudarte?"; $_['text_enquiry_success'] = "Éxito: su consulta ha sido enviada. Nos pondremos en contacto con usted pronto. ¡Gracias!"; -$_['text_update_message'] = 'Mollie: Hay una versión actualizada (%s) disponible del módulo Mollie. Haga clic aquí para actualizar. ¿No quieres volver a ver este mensaje? Haga clic en aquí.'; -$_['text_update_message_warning'] = 'Mollie: Hay una versión actualizada (%s) disponible del módulo Mollie. Actualice su versión de PHP a 7.0.0 o posterior para actualizar el módulo o continuar usando la versión actual. ¿No quieres volver a ver este mensaje? Haga clic en aquí.'; +$_['text_update_message'] = 'Mollie: Una nueva versión (%s) está disponible. Haga clic aquí para actualizar. ¿No quieres volver a ver este mensaje? Haga clic en aquí.'; +$_['text_update_message_warning'] = 'Mollie: Una nueva versión (%s) está disponible. Actualice su versión de PHP a %s o posterior para actualizar el módulo o continuar usando la versión actual. ¿No quieres volver a ver este mensaje? Haga clic en aquí.'; $_['text_update_success'] = "Éxito: el módulo Mollie se ha actualizado a la versión %s."; $_['text_default_currency'] = "Moneda utilizada en la tienda"; $_['text_custom_css'] = "Custom CSS For Mollie Components"; @@ -198,11 +200,11 @@ $_['entry_version'] = 'Mollie Opencart'; // Error -$_['error_permission'] = "Advertencia: no tienes permiso para modificar el módulo."; -$_['error_api_key'] = "¡La clave API de Mollie es obligatoria!"; -$_['error_api_key_invalid'] = "¡Clave inválida de Mollie API!"; -$_['error_description'] = "¡La descripción es obligatoria!"; -$_['error_file_missing'] = "El archivo no existe"; +$_['error_permission'] = "Advertencia: no tienes permiso para modificar el módulo."; +$_['error_api_key'] = "¡La clave API de Mollie es obligatoria!"; +$_['error_api_key_invalid'] = "¡Clave inválida de Mollie API!"; +$_['error_description'] = "¡La descripción es obligatoria!"; +$_['error_file_missing'] = "El archivo no existe"; $_['error_name'] = 'Advertencia: el nombre debe tener entre 3 y 25 caracteres'; $_['error_email'] = 'Advertencia: ¡La dirección de correo electrónico no parece ser válida!'; $_['error_subject'] = 'Advertencia: ¡El asunto debe tener 3 caracteres!'; @@ -213,17 +215,17 @@ $_['error_no_api_key'] = 'No API key provided. Please insert your API key.'; $_['error_order_expiry_days'] = 'Advertencia: No es posible utilizar Klarna Slice it o Klarna Pay más tarde como método cuando la fecha de caducidad es de más de 28 días en el futuro.'; $_['error_mollie_payment_fee'] = 'Advertencia: ¡El total del pedido de la tarifa de pago de Mollie está deshabilitado!'; +$_['error_min_php_version'] = 'Advertencia: este módulo de Mollie necesita la versión de PHP %s o superior para funcionar. Póngase en contacto con su desarrollador web para solucionar este problema.'; // Status -$_['entry_pending_status'] = "¡Clave de API Mollie inválida!"; -$_['entry_failed_status'] = "Estado de pago creado"; -$_['entry_canceled_status'] = "Estado del pago fallido"; -$_['entry_expired_status'] = "Estado del pago cancelado"; -$_['entry_processing_status']= "Estado del pago vencido"; -$_['entry_refund_status'] = "Estado del pago reembolso"; -$_['entry_partial_refund_status'] = "Estado de reembolso parcial"; - -$_['entry_shipping_status'] = "Estado del pedido enviado"; +$_['entry_pending_status'] = "¡Clave de API Mollie inválida!"; +$_['entry_failed_status'] = "Estado de pago creado"; +$_['entry_canceled_status'] = "Estado del pago fallido"; +$_['entry_expired_status'] = "Estado del pago cancelado"; +$_['entry_processing_status'] = "Estado del pago vencido"; +$_['entry_refund_status'] = "Estado del pago reembolso"; +$_['entry_partial_refund_status'] = "Estado de reembolso parcial"; +$_['entry_shipping_status'] = "Estado del pedido enviado"; $_['entry_shipment'] = "Crear envío"; $_['entry_create_shipment_status'] = "Crear envío después del estado del pedido"; $_['help_shipment'] = "El envío se creará justo después de crear el pedido. Seleccione 'No' para crear el envío cuando el pedido llegue a un estado específico y seleccione el estado del pedido a continuación."; @@ -234,10 +236,10 @@ $_['entry_create_shipment_on_order_complete'] = "Crear envío al completar el pedido"; //Button -$_['button_update'] = "Actualizar"; +$_['button_update'] = "Actualizar"; $_['button_mollie_connect'] = "Connect via Mollie"; $_['button_advance_option'] = "Advance Option"; -$_['button_save_close'] = "Guardar cerrar"; +$_['button_save_close'] = "Guardar cerrar"; //Error log $_['text_log_success'] = 'Éxito: ¡Ha borrado con éxito su registro de errores!'; diff --git a/admin/language/spanish/payment/mollie_in3.php b/admin/language/spanish/payment/mollie_in3.php new file mode 100644 index 00000000..ad025863 --- /dev/null +++ b/admin/language/spanish/payment/mollie_in3.php @@ -0,0 +1,4 @@ + - +
- +
-

@@ -175,7 +174,7 @@
- disabled="disabled"> diff --git a/admin/view/template/payment/mollie.tpl b/admin/view/template/payment/mollie.tpl index 67faae43..c99afcd7 100644 --- a/admin/view/template/payment/mollie.tpl +++ b/admin/view/template/payment/mollie.tpl @@ -56,8 +56,8 @@
- -
+ +
@@ -185,7 +185,7 @@
- disabled="disabled"> diff --git a/catalog/controller/extension/payment/mollie_in3.php b/catalog/controller/extension/payment/mollie_in3.php new file mode 100644 index 00000000..3bb66296 --- /dev/null +++ b/catalog/controller/extension/payment/mollie_in3.php @@ -0,0 +1,5 @@ +getOpenCartOrder($order_id); // Set template data. - if (in_array($method, ['klarnapaylater', 'klarnasliceit', 'klarnapaynow', 'voucher']) || ($this->config->get($this->mollieHelper->getModuleCode() . "_" . $method . "_api_to_use") == 'orders_api')) { + if (in_array($method, ['klarnapaylater', 'klarnasliceit', 'klarnapaynow', 'voucher', 'in3']) || ($this->config->get($this->mollieHelper->getModuleCode() . "_" . $method . "_api_to_use") == 'orders_api')) { $data['action'] = $this->url->link("payment/mollie_" . static::MODULE_NAME . "/order", '', 'SSL'); } else { $data['action'] = $this->url->link("payment/mollie_" . static::MODULE_NAME . "/payment", '', 'SSL'); @@ -302,10 +302,8 @@ public function index() } protected function convertCurrency($amount) { - $this->load->model("localisation/currency"); - $currencies = $this->model_localisation_currency->getCurrencies(); - $convertedAmount = $amount * $currencies[$this->getCurrency()]['value']; - + $convertedAmount = $this->currency->format($amount, $this->getCurrency(), false, false); + return $convertedAmount; } @@ -318,6 +316,8 @@ public function addressCheck($order) { $valid = true; $field = ''; + $noPostCode = ["AE", "AN", "AO", "AW", "BF", "BI", "BJ", "BO", "BS", "BV", "BW", "BZ", "CD", "CF", "CG", "CI", "CK", "CM", "DJ", "DM", "ER", "FJ", "GA", "GD", "GH", "GM", "GN", "GQ", "GY", "HK", "JM", "KE", "KI", "KM", "KN", "KP", "LC", "ML", "MO", "MR", "MS", "MU", "MW", "NA", "NR", "NU", "PA", "QA", "RW", "SB", "SC", "SL", "SO", "SR", "ST", "SY", "TF", "TK", "TL", "TO", "TT", "TV", "UG", "VU", "YE", "ZM", "ZW"]; + if (empty($order['payment_firstname'])) { $valid = false; $field = 'Billing Firstname'; @@ -331,32 +331,32 @@ public function addressCheck($order) { $valid = false; $field = 'Billing City'; } elseif (empty($order['payment_postcode'])) { - $valid = false; - $field = 'Billing Postcode'; - } elseif (empty($order['payment_zone'])) { - $valid = false; - $field = 'Billing Zone'; - } - - if (empty($order['shipping_firstname'])) { - $valid = false; - $field = 'Shipping Firstname'; - } elseif (empty($order['shipping_lastname'])) { - $valid = false; - $field = 'Shipping Lastname'; - } elseif (empty($order['shipping_address_1'])) { - $valid = false; - $field = 'Shipping Street'; - } elseif (empty($order['shipping_city'])) { - $valid = false; - $field = 'Shipping City'; - } elseif (empty($order['shipping_postcode'])) { - $valid = false; - $field = 'Shipping Postcode'; - } elseif (empty($order['shipping_zone'])) { - $valid = false; - $field = 'Shipping Zone'; + if (!in_array($order['payment_iso_code_2'], $noPostCode)) { + $valid = false; + $field = 'Billing Postcode'; + } } + + if (isset($this->session->data['shipping_address'])) { + if (empty($order['shipping_firstname'])) { + $valid = false; + $field = 'Shipping Firstname'; + } elseif (empty($order['shipping_lastname'])) { + $valid = false; + $field = 'Shipping Lastname'; + } elseif (empty($order['shipping_address_1'])) { + $valid = false; + $field = 'Shipping Street'; + } elseif (empty($order['shipping_city'])) { + $valid = false; + $field = 'Shipping City'; + } elseif (empty($order['shipping_postcode'])) { + if (!in_array($order['shipping_iso_code_2'], $noPostCode)) { + $valid = false; + $field = 'Shipping Postcode'; + } + } + } if (!$valid) { $this->writeToMollieLog("Mollie Payment Error: Mollie payment require payment and shipping address details. Empty required field: " . $field); @@ -493,16 +493,31 @@ public function order() } $vatAmount = $total * ( $vatRate / (100 + $vatRate)); - $lines[] = array( - 'type' => 'physical', - 'name' => $this->formatText($orderProduct['name']), - 'quantity' => $qty, - 'unitPrice' => ["currency" => $currency, "value" => (string)$this->numberFormat($this->convertCurrency($price + $tax))], - 'totalAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($total)], - 'vatRate' => (string)$this->numberFormat($vatRate), - 'vatAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($vatAmount)], - 'metadata' => array("order_product_id" => $orderProduct['order_product_id']) - ); + + if (!empty($productDetails['voucher_category'])) { + $lines[] = array( + 'type' => 'physical', + 'category' => (string)$productDetails['voucher_category'], + 'name' => $this->formatText($orderProduct['name']), + 'quantity' => $qty, + 'unitPrice' => ["currency" => $currency, "value" => (string)$this->numberFormat($this->convertCurrency($price + $tax))], + 'totalAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($total)], + 'vatRate' => (string)$this->numberFormat($vatRate), + 'vatAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($vatAmount)], + 'metadata' => array("order_product_id" => $orderProduct['order_product_id']) + ); + } else { + $lines[] = array( + 'type' => 'physical', + 'name' => $this->formatText($orderProduct['name']), + 'quantity' => $qty, + 'unitPrice' => ["currency" => $currency, "value" => (string)$this->numberFormat($this->convertCurrency($price + $tax))], + 'totalAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($total)], + 'vatRate' => (string)$this->numberFormat($vatRate), + 'vatAmount' => ["currency" => $currency, "value" => (string)$this->numberFormat($vatAmount)], + 'metadata' => array("order_product_id" => $orderProduct['order_product_id']) + ); + } } //Check for shipping fee @@ -821,21 +836,23 @@ public function order() "postalCode" => $this->formatText($order['payment_postcode']), "country" => $this->formatText($order['payment_iso_code_2']) ]; - - if (!empty($order['shipping_firstname']) || !empty($order['shipping_lastname'])) { - $data["shippingAddress"] = [ - "givenName" => $this->formatText($order['shipping_firstname']), - "familyName" => $this->formatText($order['shipping_lastname']), - "email" => $this->formatText($order['email']), - "streetAndNumber" => $this->formatText($order['shipping_address_1'] . ' ' . $order['shipping_address_2']), - "city" => $this->formatText($order['shipping_city']), - "region" => $this->formatText($order['shipping_zone']), - "postalCode" => $this->formatText($order['shipping_postcode']), - "country" => $this->formatText($order['shipping_iso_code_2']) - ]; - } else { - $data["shippingAddress"] = $data["billingAddress"]; - } + + if (isset($this->session->data['shipping_address'])) { + if (!empty($order['shipping_firstname']) || !empty($order['shipping_lastname'])) { + $data["shippingAddress"] = [ + "givenName" => $this->formatText($order['shipping_firstname']), + "familyName" => $this->formatText($order['shipping_lastname']), + "email" => $this->formatText($order['email']), + "streetAndNumber" => $this->formatText($order['shipping_address_1'] . ' ' . $order['shipping_address_2']), + "city" => $this->formatText($order['shipping_city']), + "region" => $this->formatText($order['shipping_zone']), + "postalCode" => $this->formatText($order['shipping_postcode']), + "country" => $this->formatText($order['shipping_iso_code_2']) + ]; + } else { + $data["shippingAddress"] = $data["billingAddress"]; + } + } if (strstr(isset($this->session->data['language']) ? $this->session->data['language'] : $this->config->get('config_language'), '-')) { list ($language, $country) = explode('-', isset($this->session->data['language']) ? $this->session->data['language'] : $this->config->get('config_language')); @@ -999,18 +1016,20 @@ public function payment() "postalCode" => $this->formatText($order['payment_postcode']), "country" => $this->formatText($order['payment_iso_code_2']) ]; - - if (!empty($order['shipping_firstname']) || !empty($order['shipping_lastname'])) { - $data["shippingAddress"] = [ - "streetAndNumber" => $this->formatText($order['shipping_address_1'] . ' ' . $order['shipping_address_2']), - "city" => $this->formatText($order['shipping_city']), - "region" => $this->formatText($order['shipping_zone']), - "postalCode" => $this->formatText($order['shipping_postcode']), - "country" => $this->formatText($order['shipping_iso_code_2']) - ]; - } else { - $data["shippingAddress"] = $data["billingAddress"]; - } + + if (isset($this->session->data['shipping_address'])) { + if (!empty($order['shipping_firstname']) || !empty($order['shipping_lastname'])) { + $data["shippingAddress"] = [ + "streetAndNumber" => $this->formatText($order['shipping_address_1'] . ' ' . $order['shipping_address_2']), + "city" => $this->formatText($order['shipping_city']), + "region" => $this->formatText($order['shipping_zone']), + "postalCode" => $this->formatText($order['shipping_postcode']), + "country" => $this->formatText($order['shipping_iso_code_2']) + ]; + } else { + $data["shippingAddress"] = $data["billingAddress"]; + } + } if (strstr(isset($this->session->data['language']) ? $this->session->data['language'] : $this->config->get('config_language'), '-')) { list ($language, $country) = explode('-', isset($this->session->data['language']) ? $this->session->data['language'] : $this->config->get('config_language')); diff --git a/catalog/controller/payment/mollie_in3.php b/catalog/controller/payment/mollie_in3.php new file mode 100644 index 00000000..c8b0596f --- /dev/null +++ b/catalog/controller/payment/mollie_in3.php @@ -0,0 +1,20 @@ +load->language("payment/mollie"); $this->load->model('localisation/country'); $this->load->model('tool/image'); @@ -164,6 +169,23 @@ public function getMethod($address, $total) } } + // Check if Vouchers are available + if(static::MODULE_NAME == 'voucher') { + $this->load->model('catalog/product'); + + $voucherStatus = false; + foreach ($this->cart->getProducts() as $cart_product) { + $productDetails = $this->model_catalog_product->getProduct($cart_product['product_id']); + if (!empty($productDetails['voucher_category'])) { + $voucherStatus = true; + } + } + + if (!$voucherStatus) { + return NULL; + } + } + try { $payment_method = $this->getAPIClient()->methods->get(static::MODULE_NAME); diff --git a/catalog/model/payment/mollie_in3.php b/catalog/model/payment/mollie_in3.php new file mode 100644 index 00000000..a57cb594 --- /dev/null +++ b/catalog/model/payment/mollie_in3.php @@ -0,0 +1,7 @@ + Quality Works - Mollie mollie - 3.0.1 + 3.1.0 Quality Works @@ -47,6 +47,11 @@ $data['payment_status'] = $molliePayment->status; $data['paymentMethod'] = $molliePayment->method; + // Voucher amount cannot be refunded + if ($molliePayment->method == 'voucher') { + $data['showRefundButton'] = false; + } + // Check for refunds and settlements if($molliePayment->hasRefunds()) { $data['payment_status'] = 'refunded'; @@ -475,6 +480,11 @@ $this->data['payment_status'] = $molliePayment->status; $this->data['paymentMethod'] = $molliePayment->method; + // Voucher amount cannot be refunded + if ($molliePayment->method == 'voucher') { + $this->data['showRefundButton'] = false; + } + // Check for refunds and settlements if($molliePayment->hasRefunds()) { $this->data['payment_status'] = 'refunded'; @@ -2066,4 +2076,248 @@ $('#button-partial-refund').on('click', function() { + + + + request->post['product_store']))]]> + + =')) { + $data['entry_voucher_category'] = $this->language->get('entry_voucher_category'); + $data['help_voucher_category'] = $this->language->get('help_voucher_category'); + + $data['voucher_categories'] = ['meal', 'eco', 'gift']; + + if (isset($this->request->post['voucher_category'])) { + $data['voucher_category'] = $this->request->post['voucher_category']; + } elseif (!empty($product_info)) { + $data['voucher_category'] = $product_info['voucher_category']; + } else { + $data['voucher_category'] = ''; + } + } else { + $this->data['entry_voucher_category'] = $this->language->get('entry_voucher_category'); + $this->data['help_voucher_category'] = $this->language->get('help_voucher_category'); + + $this->data['voucher_categories'] = ['meal', 'eco', 'gift']; + + if (isset($this->request->post['voucher_category'])) { + $this->data['voucher_category'] = $this->request->post['voucher_category']; + } elseif (!empty($product_info)) { + $this->data['voucher_category'] = $product_info['voucher_category']; + } else { + $this->data['voucher_category'] = ''; + } + } + ]]> + + + + + + + + db->query("UPDATE " . DB_PREFIX . "product SET voucher_category = '" . $this->db->escape($data['voucher_category']) . "' WHERE product_id = '" . (int)$product_id . "'"); + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + +
+ +
+
+ ]]> + + + + + + ]]> + + + +
+ +
+
+ ]]> + + + + + + ]]> + + +
+ + + ]]> + + + + + + + + + + + + row['image'],]]> + + $query->row['voucher_category'],]]> + + + + diff --git a/vqmod/xml/mollie.xml_ b/vqmod/xml/mollie.xml_ index fa2dc546..3633ad82 100644 --- a/vqmod/xml/mollie.xml_ +++ b/vqmod/xml/mollie.xml_ @@ -1,6 +1,6 @@ Quality Works - Mollie - 3.0.1 + 3.1.0 2.3.0 Quality Works @@ -45,6 +45,11 @@ $molliePayment = $this->getAPIClient($order_info['store_id'])->payments->get($molliePaymentDetails['transaction_id']); $data['payment_status'] = $molliePayment->status; $data['paymentMethod'] = $molliePayment->method; + + // Voucher amount cannot be refunded + if ($molliePayment->method == 'voucher') { + $data['showRefundButton'] = false; + } // Check for refunds and settlements if($molliePayment->hasRefunds()) { @@ -473,6 +478,11 @@ $molliePayment = $this->getAPIClient($order_info['store_id'])->payments->get($molliePaymentDetails['transaction_id']); $this->data['payment_status'] = $molliePayment->status; $this->data['paymentMethod'] = $molliePayment->method; + + // Voucher amount cannot be refunded + if ($molliePayment->method == 'voucher') { + $this->data['showRefundButton'] = false; + } // Check for refunds and settlements if($molliePayment->hasRefunds()) { @@ -2145,4 +2155,249 @@ $('#button-partial-refund').on('click', function() { + + + + request->post['product_store']))]]> + + =')) { + $data['entry_voucher_category'] = $this->language->get('entry_voucher_category'); + $data['help_voucher_category'] = $this->language->get('help_voucher_category'); + + $data['voucher_categories'] = ['meal', 'eco', 'gift']; + + if (isset($this->request->post['voucher_category'])) { + $data['voucher_category'] = $this->request->post['voucher_category']; + } elseif (!empty($product_info)) { + $data['voucher_category'] = $product_info['voucher_category']; + } else { + $data['voucher_category'] = ''; + } + } else { + $this->data['entry_voucher_category'] = $this->language->get('entry_voucher_category'); + $this->data['help_voucher_category'] = $this->language->get('help_voucher_category'); + + $this->data['voucher_categories'] = ['meal', 'eco', 'gift']; + + if (isset($this->request->post['voucher_category'])) { + $this->data['voucher_category'] = $this->request->post['voucher_category']; + } elseif (!empty($product_info)) { + $this->data['voucher_category'] = $product_info['voucher_category']; + } else { + $this->data['voucher_category'] = ''; + } + } + ]]> + + + + + + + + db->query("UPDATE " . DB_PREFIX . "product SET voucher_category = '" . $this->db->escape($data['voucher_category']) . "' WHERE product_id = '" . (int)$product_id . "'"); + } + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]]> + + + +
+ +
+
+ ]]> + + + + + + ]]> + + + +
+ +
+
+ ]]> + + + + + + ]]> + + +
+ + + ]]> + + + + + + + + + + + + row['image'],]]> + + $query->row['voucher_category'],]]> + + + +