9.1.0

mollie · Aug 14, 2019 · e057d8d · e057d8d
1 parent 4a98a16
commit e057d8d
Show file tree

Hide file tree

Showing 220 changed files with 4,797 additions and 1,889 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 .DS_Store
 .idea
 desktop.ini
+php.ini
 /build/coverage
 /build/clover
 /build/logs
 /composer.lock
 /composer.phar
 /vendor
 /*.zip
+/upload/tests/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 # Changelog #
 
+#### Changes in release 9.1.0
+  + Fixed double form post in confirmation template
+  + Fixed bug for rounding differences more than 0.01
+  + Added OAuth support for:
+    + Activate payment methods through module (instead of Mollie dashboard)
+    + See payment status on order info page
+    + Request refund through order info page
+
 #### Changes in release 9.0.6
   + Added Przelewy24 support.
   + Added additional check on order_id in webhook.

diff --git a/admin/controller/extension/payment/mollie_applepay.php b/admin/controller/extension/payment/mollie_applepay.php
@@ -0,0 +1,4 @@
+<?php
+    include_once(__DIR__."/../../payment/mollie_applepay.php");
+    class ControllerExtensionPaymentMollieApplepay extends ControllerPaymentMollieApplepay{}
+?>
diff --git a/admin/controller/payment/mollie/base.php b/admin/controller/payment/mollie/base.php
diff --git a/admin/controller/payment/mollie_applepay.php b/admin/controller/payment/mollie_applepay.php
@@ -0,0 +1,7 @@
+<?php
+require_once(dirname(__FILE__) . "/mollie/base.php");
+
+class ControllerPaymentMollieApplepay extends ControllerPaymentMollieBase
+{
+	const MODULE_NAME = MollieHelper::MODULE_NAME_APPLEPAY;
+}
diff --git a/admin/language/de-de/extension/payment/mollie_applepay.php b/admin/language/de-de/extension/payment/mollie_applepay.php
@@ -0,0 +1,2 @@
+<?php
+    include(__DIR__."/../../payment/mollie_applepay.php");
diff --git a/admin/language/de-de/payment/mollie.php b/admin/language/de-de/payment/mollie.php
@@ -76,14 +76,24 @@
 $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later';
 $_['name_mollie_klarnasliceit']  = 'Klarna Slice It';
 $_['name_mollie_przelewy24']  	 = 'P24';
+$_['name_mollie_applepay']  	 = 'Apple Pay';
 
 // Text
 $_['text_edit']                    = "Mollie bearbeiten";
 $_['text_payment']                 = "Bezahlung";
 $_['text_success']                 = "Erfolg: Die Einstellungen für dieses Modul wurden angepasst!";
 $_['text_missing_api_key']         = "Bitte füllen Sie Ihren API-Schlüssel auf der Registerkarte <a data-toggle='tab' href='#' class='settings'>Einstellungen</a> aus.";
-$_['text_activate_payment_method'] = 'Aktivieren Sie diese Zahlungsart über das <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank">Mollie Dashboard</a>.';
+$_['text_enable_payment_method']   = 'Aktivieren Sie diese Zahlungsart über das <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie Dashboard</a>.';
+$_['text_activate_payment_method'] = 'Im <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank">Mollie Dashboard</a> oder die App unter “Einstellungen” konfigurieren, um es auf dieser Seite zu aktivieren.';
 $_['text_no_status_id']            = "- Status nicht ändern (nicht empfohlen) -";
+$_['text_enable']             = "Aktivieren";
+$_['text_disable']            = "Deaktivieren";
+$_['text_connection_success'] = "Erfolg: Verbindung zu Mollie erfolgreich!";
+$_['text_error'] 			  = "Warnung: Es ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal!";
+$_['text_creditcard_required'] = "Kreditkarte erforderlich";
+$_['text_mollie_api'] = "Mollie API";
+$_['text_mollie_app'] = "Mollie App";
+$_['text_general'] 	  = "Allgemeines";
 
 // Entry
 $_['entry_payment_method']           = "Zahlungsart";
@@ -94,14 +104,21 @@
 $_['entry_show_icons']               = "Icons anzeigen";
 $_['entry_show_order_canceled_page'] = "Meldung bei annullierten Bezahlungen anzeigen";
 $_['entry_geo_zone']                 = "Geo Zone";
+$_['entry_client_id']                = "Client ID";
+$_['entry_client_secret']            = "Client Secret";
+$_['entry_redirect_uri']             = "Redirect URI";
+$_['entry_payment_screen_language']  = "Standardsprache des Zahlungsbildschirms";
 
 // Help
-$_['help_view_profile']             = 'Sie können Ihren API Key auf <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">Ihren Mollie-Webseiten-Profilen finden</a>.';
+$_['help_view_profile']             = 'Sie können Ihren API Key auf <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank" class="alert-link">Ihren Mollie-Webseiten-Profilen finden</a>.';
 $_['help_status']                   = "Das Modul aktivieren";
 $_['help_api_key']                  = "Geben Sie hier den <code>api_key</code> des Webseiten-Profils ein, das Sie verwenden wollen. Der API Key beginnt mit <code>test_</code> oder <code>live_</code>.";
 $_['help_description']              = "Die Beschreibung soll auf der Banküberweisung Ihres Kunden erscheinen und Sie können sie in der Mollie Verwaltung sehen. Sie können maximal 29 Zeichen verwenden. TIPP: Verwenden Sie %, dies wird durch die Auftragsnummer ersetzt werden. Die Auftragsnummer selbst kann auch mehrere Zeichen lang sein!";
 $_['help_show_icons']               = "Icons neben den Zahlungsarten von Mollie auf der Zahlungsseite anzeigen.";
 $_['help_show_order_canceled_page'] = "Eine Meldung für den Kunden anzeigen, wenn eine Zahlung annulliert wurde, bevor der Kunde zurück zum Warenkorb verwiesen wird.";
+$_['help_redirect_uri']				= 'Der Redirect-URI in Ihrem Mollie-Dashboard muss mit diesem URI übereinstimmen.';
+$_['help_mollie_app']				= 'Wenn Sie Ihr Modul als App im Mollie-Dashboard registrieren, werden zusätzliche Funktionen freigeschaltet. Dies ist nicht erforderlich, um Mollie-Zahlungen zu verwenden.';
+$_['help_apple_pay']				= 'Apple Pay benötigt die Aktivierung der Kreditkartenzahlung in Ihrem Webprofil. Bitte schalten Sie zunächst die Kreditkarten Methode frei.';
 
 // Info
 $_['entry_module']          = "Module";
@@ -124,6 +141,7 @@
 $_['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_shipping_status']   = "Versandstatus der Bestellung";
 $_['entry_shipment']       			 = "Sendung erstellen";
@@ -137,3 +155,10 @@
 
 //Button
 $_['button_update'] = "Aktualisieren";
+$_['button_mollie_connect'] = "Connect via Mollie";
+
+//Error log
+$_['text_log_success']	   = 'Erfolg: Sie haben Ihr Fehlerprotokoll erfolgreich gelöscht!';
+$_['text_log_list']        = 'Fehlerliste';
+$_['error_log_warning']	   = 'Warnung: Ihre Fehlerprotokolldatei %s ist %s!';
+$_['button_download']	   = 'Herunterladen';
diff --git a/admin/language/de-de/payment/mollie_applepay.php b/admin/language/de-de/payment/mollie_applepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_applepay'];
diff --git a/admin/language/dutch/extension/payment/mollie_applepay.php b/admin/language/dutch/extension/payment/mollie_applepay.php
@@ -0,0 +1,2 @@
+<?php
+    include(__DIR__."/../../payment/mollie_applepay.php");
diff --git a/admin/language/dutch/payment/mollie.php b/admin/language/dutch/payment/mollie.php
@@ -50,6 +50,7 @@
 $_['text_mollie_klarnapaylater'] = $method_list_logo;
 $_['text_mollie_klarnasliceit']  = $method_list_logo;
 $_['text_mollie_przelewy24']  	 = $method_list_logo;
+$_['text_mollie_applepay']  	 = $method_list_logo;
 
 // Heading
 $_['heading_title']         = "Mollie";
@@ -76,14 +77,24 @@
 $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later';
 $_['name_mollie_klarnasliceit']  = 'Klarna Slice It';
 $_['name_mollie_przelewy24']  	 = 'P24';
+$_['name_mollie_applepay']  	 = 'Apple Pay';
 
 // Text
 $_['text_edit']                    = "Bewerk Mollie";
 $_['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_activate_payment_method'] = 'Activeer deze betaalmethode via het <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank">Mollie-dashboard</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_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";
 
 // Entry
 $_['entry_payment_method']           = "Betaalmethode";
@@ -94,14 +105,21 @@
 $_['entry_show_icons']               = "Toon icoontjes";
 $_['entry_show_order_canceled_page'] = "Toon melding bij geannuleerde betalingen";
 $_['entry_geo_zone']                 = "Geo Zone";
+$_['entry_client_id']                = "Client ID";
+$_['entry_client_secret']            = "Client Secret";
+$_['entry_redirect_uri']             = "Redirect URI";
+$_['entry_payment_screen_language']  = "Standaardtaal betaalscherm";
 
 // Help
-$_['help_view_profile']             = 'U kunt uw API-sleutel vinden bij <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">uw Mollie-websiteprofielen</a>.';
+$_['help_view_profile']             = 'U kunt uw API-sleutel vinden bij <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank" class="alert-link">uw Mollie-websiteprofielen</a>.';
 $_['help_status']                   = "Activeer de module";
 $_['help_api_key']                  = "Voer hier de <code>api_key</code> van het websiteprofiel in dat u wilt gebruiken. De API-sleutel begint met <code>test_</code> of <code>live_</code>.";
 $_['help_description']              = "De omschrijving zal op het bankafschrift van uw klant verschijnen en kunt u terugvinden in het Mollie beheer. U kunt maximaal 29 tekens gebruiken. TIP: Gebruik <code>%</code>, dit zal vervangen worden door het ordernummer. Het ordernummer kan zelf ook meerdere tekens lang zijn!";
 $_['help_show_icons']               = "Toon icoontjes naast de betaalmethodes van Mollie op de betaalpagina.";
 $_['help_show_order_canceled_page'] = "Toon een melding aan de klant als een betaling geannuleerd wordt, alvorens de klant terug naar het winkelmandje te verwijzen.";
+$_['help_redirect_uri']				= 'URI omleiden in uw mollie-dashboard moet overeenkomen met deze URI.';
+$_['help_mollie_app']				= 'Door uw module te registreren als een app op het Mollie-dashboard, ontgrendeld u extra functionaliteiten. Dit is niet vereist om Mollie-betalingen te gebruiken.';
+$_['help_apple_pay']				= 'Voor Apple Pay dient credit card betaling geactiveerd te zijn op uw Mollie profiel. Activeer Credit Cards eerst.';
 
 // Info
 $_['entry_module']          = "Module";
@@ -124,6 +142,7 @@
 $_['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_shipping_status']   = "Status bestelling verzonden";
 $_['entry_shipment']       			 = "Maak verzending";
@@ -137,3 +156,10 @@
 
 //Button
 $_['button_update'] = "Bijwerken";
+$_['button_mollie_connect'] = "Connect via Mollie";
+
+//Error log
+$_['text_log_success']	   = 'Succes: u hebt met succes uw foutenlogboek gewist!';
+$_['text_log_list']        = 'Foutenlijst';
+$_['error_log_warning']	   = 'Waarschuwing: uw foutenlogbestand %s is %s!';
+$_['button_download']	   = 'Download';
diff --git a/admin/language/dutch/payment/mollie_applepay.php b/admin/language/dutch/payment/mollie_applepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_applepay'];
diff --git a/admin/language/en-gb/extension/payment/mollie_applepay.php b/admin/language/en-gb/extension/payment/mollie_applepay.php
@@ -0,0 +1,2 @@
+<?php
+    include(__DIR__."/../../payment/mollie_applepay.php");
diff --git a/admin/language/en-gb/payment/mollie.php b/admin/language/en-gb/payment/mollie.php
@@ -50,6 +50,7 @@
 $_['text_mollie_klarnapaylater'] = $method_list_logo;
 $_['text_mollie_klarnasliceit']  = $method_list_logo;
 $_['text_mollie_przelewy24']  	 = $method_list_logo;
+$_['text_mollie_applepay']  	 = $method_list_logo;
 
 // Heading
 $_['heading_title']           = "Mollie";
@@ -76,14 +77,24 @@
 $_['name_mollie_klarnapaylater'] = 'Klarna Pay Later';
 $_['name_mollie_klarnasliceit']  = 'Klarna Slice It';
 $_['name_mollie_przelewy24']  	 = 'P24';
+$_['name_mollie_applepay']  	 = 'Apple Pay';
 
 // Text
 $_['text_edit']                    = "Edit";
 $_['text_payment']                 = "Payment";
 $_['text_success']                 = "Success: You have successfully modified your Mollie settings!";
 $_['text_missing_api_key']         = "Please fill out your API key in the <a data-toggle='tab' href='#' class='settings'>Settings</a> tab.";
-$_['text_activate_payment_method'] = 'Enable this payment method in your <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank">Mollie dashboard</a>.';
+$_['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_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";
 
 // Entry
 $_['entry_payment_method']           = "Payment method";
@@ -94,14 +105,21 @@
 $_['entry_show_icons']               = "Show icons";
 $_['entry_show_order_canceled_page'] = "Show message if payment is cancelled";
 $_['entry_geo_zone']                 = "Geo Zone";
+$_['entry_client_id']                = "Client ID";
+$_['entry_client_secret']            = "Client Secret";
+$_['entry_redirect_uri']             = "Redirect URI";
+$_['entry_payment_screen_language']  = "Payment screen default language";
 
 // Help
-$_['help_view_profile']             = 'You can find your API key in <a href="https://www.mollie.com/beheer/account/profielen/" target="_blank" class="alert-link">your Mollie website profiles</a>.';
+$_['help_view_profile']             = 'You can find your API key in <a href="https://www.mollie.com/dashboard/settings/profiles/" target="_blank" class="alert-link">your Mollie website profiles</a>.';
 $_['help_status']                   = "Activate the module";
 $_['help_api_key']                  = 'Enter the <code>api_key</code> of the website profile you want to use. The API key starts with <code>test_</code> or <code>live_</code>.';
 $_['help_description']              = 'This description will appear on the bank / card statement of your customer. You may use a maximum of 29 characters. TIP: Use <code>%</code>, this will be replaced by the order id of the payment. Don\'t forget <code>%</code> can be multiple characters long!';
 $_['help_show_icons']               = 'Show icons next to the Mollie payment methods on the checkout page.';
 $_['help_show_order_canceled_page'] = 'Show a message to the customer if a payment is cancelled, before redirecting the customer back to their shopping cart.';
+$_['help_redirect_uri']				= 'Redirect URI in your mollie dashboard must match with this URI.';
+$_['help_mollie_app']				= 'By registering your module as an App on the Mollie dashboard, you will unlock added functionalities. This is not required to use Mollie payments.';
+$_['help_apple_pay']				= 'Apple Pay requires credit card to be enabled on your website profile. Please enable credit card method first.';
 
 // Info
 $_['entry_module']            = "Module";
@@ -124,6 +142,7 @@
 $_['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_shipping_status']   		 = "Order shipped status";
 $_['entry_shipment']       			 = "Create shipment";
@@ -137,3 +156,10 @@
 
 //Button
 $_['button_update'] = "Update";
+$_['button_mollie_connect'] = "Connect via Mollie";
+
+//Error log
+$_['text_log_success']	   = 'Success: You have successfully cleared your mollie log!';
+$_['text_log_list']        = 'Log';
+$_['error_log_warning']	   = 'Warning: Your mollie log file %s is %s!';
+$_['button_download']	   = 'Download';
diff --git a/admin/language/en-gb/payment/mollie_applepay.php b/admin/language/en-gb/payment/mollie_applepay.php
@@ -0,0 +1,4 @@
+<?php
+require(dirname(__FILE__) . "/mollie.php");
+
+$_['heading_title'] .= " &ndash; " . $_['name_mollie_applepay'];
diff --git a/admin/language/en-gb/payment/mollie_eps.php b/admin/language/en-gb/payment/mollie_eps.php
@@ -1,4 +1,4 @@
-
 <?php
 require(dirname(__FILE__) . "/mollie.php");
+
 $_['heading_title'] .= " &ndash; " . $_['name_mollie_eps'];
diff --git a/admin/language/en-gb/payment/mollie_giropay.php b/admin/language/en-gb/payment/mollie_giropay.php
@@ -1,4 +1,4 @@
-
 <?php
 require(dirname(__FILE__) . "/mollie.php");
+
 $_['heading_title'] .= " &ndash; " . $_['name_mollie_giropay'];
diff --git a/admin/language/english/extension/payment/mollie_applepay.php b/admin/language/english/extension/payment/mollie_applepay.php
@@ -0,0 +1,2 @@
+<?php
+    include(__DIR__."/../../payment/mollie_applepay.php");
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?php
		include(__DIR__."/../../payment/mollie_applepay.php");