From 987d73ee5b7d70b8d11d13e3cb9b0dd60cbffd48 Mon Sep 17 00:00:00 2001 From: SergejSavic Date: Thu, 26 Sep 2024 15:57:11 +0200 Subject: [PATCH 1/5] add Twint payment method --- .../PaymentMethod/PaymentMethods.php | 1 + images/icons/payment/mollie_twint.png | Bin 0 -> 2672 bytes includes/modules/payment/mollie_twint.php | 34 ++++++++++++ lang/dutch/modules/payment/mollie_twint.php | 49 ++++++++++++++++++ lang/english/modules/payment/mollie_twint.php | 49 ++++++++++++++++++ lang/french/modules/payment/mollie_twint.php | 49 ++++++++++++++++++ lang/german/modules/payment/mollie_twint.php | 49 ++++++++++++++++++ 7 files changed, 231 insertions(+) create mode 100644 images/icons/payment/mollie_twint.png create mode 100644 includes/modules/payment/mollie_twint.php create mode 100644 lang/dutch/modules/payment/mollie_twint.php create mode 100644 lang/english/modules/payment/mollie_twint.php create mode 100644 lang/french/modules/payment/mollie_twint.php create mode 100644 lang/german/modules/payment/mollie_twint.php diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php index dc69852d..15f7ca38 100644 --- a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php +++ b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php @@ -23,4 +23,5 @@ class PaymentMethods const Klarna = 'klarna'; const Riverty = 'riverty'; const Trustly = 'trustly'; + const Twint = 'twint'; } diff --git a/images/icons/payment/mollie_twint.png b/images/icons/payment/mollie_twint.png new file mode 100644 index 0000000000000000000000000000000000000000..9a5ed08fb84521ec032c3e6be0f519d43a67987a GIT binary patch literal 2672 zcmZ{mc{J4BAIHBlX6(k;Wf@}$`3=U9teLSkw$KO@C0o&hq48K_EJLJhd7e-ziXuZ~ zmtA7WmS#|9)Q=G=KRmLQsQl?5ZD_g491MK^f3`>9oeeUy@5Y^L#`_4~;N$96s@0Mc!?6yG)Z2>s!(&!uI zb#1gr0_-F7d~z{l8HbLu52MJ)6}-JVMV+(oUe#>0!4=CDtGfq_s)RJ#@|@sG_mdrDQ+a+|XmLZiqr^6(&5 zT|=WaVHaa%W!3MO_|e?R2w5^ZIW=X4mJJ9CyYuZ^sBj;9d6}PHZ=zjH`LRu&{yV+D zzkha4j=rJcoAGgYtM{E4GiM_OTUSW{MK8Np>o3b&Qc^N9Hl}ZGKKeTT=e?4WK6G|i zCUfSIMwUudmH2I2yn2DKsHnc49_~58k4(PnsGh2Z*O)kx%_@W68W@jyVEGt(`k{vO ztqJZ?%n+QR0*$q`HJ6(6!Hq=4sGK`QELv9WfwR7e$?*PibP zTc#DkezLr#rlv1yYxPY{=`xoRdipX%XXfX>U(H>+2~D$9&L2|y_3M|gh={9}&*hb0 zC(<)A1kx?fvMvMrL`UEktb?n!cIv~ zPp{|gTmAvRJc3rH^ar^0f8y1T&Mm|uXsd43)6AKf%YlJZDis>W>Ky%RmEq;(wL1VI z_k+3lJZdinhJ<7t9wzn{r+@3o`{H)3t)v{qa|!E+YY6!0MkdKySuxAyfaTE%A(T&n?Evb%ONR;u=9=? zeD1e)s|M^xZ3`ez?%BIleQq7=_M+_hTn(kDrrhP(1bSt#raUX6EII^-loc*p-5b)| zYeZ5whA)HtI2$zx3+&qj3m*?A0}!rH(WYqqc(%?UR-Q`a(YnT_QJz^jK#WCSx{hPUulB5nzpsJ|;!wP= zUmvn+RY7Be)pY=ma^|%Nsh+4J)2k|Ri11ax0g|rY54HCw&wbP1#`e9iO6i~ZTy}UM zaSKDI*1uNP)q|-j**QIp*Txw?PL3&)*m-SLD8Z$`*8zQ9>HEjzPd=0nhrKRS5I%h71SV$*il zUckuK1gTdjus}3?cr0pIUcE-O05`4rVK@?ZdXP^T?lYH`bRa?085y%O5L8O!PdZTD z`WfxCOOt@RtLbb*nAI2V_F*pArq2AuTY@Xv%+#cAU10Wk_%0yKh!pca3pFW0wBb^1 zX=zv%(+5nzBN4eq)z#h(8G1RzW}Y=u>)sm+npf(fuhs_PqTQ_XJq8O0u`xf)kBWvU zv!AAX?fC0LOF|m$8)mHCr)30@^_scUlJoQsW(CzFT>KBHPKD+DA?kQPqC0KC=Is)D zSju93adX{GV06=rSR*|hA~n}^NeLX%C`YH$QM$TQ3`X?ix{)mk8DU&5Rsh9-#PIN# zX4&#welc;g7P7$UUC2rli?hG~t8dKV8Do|ElQnd7j7&^Sa3B6Ho_+AF0FxX?@gs?~) zxh;Q6^G~{>Zr1PpV7c48)z#GmEvXL-#?0JYUp=a+sp&0e^NHK@0@_&S%V_V-Vnnehty*fLRAA7i%<);(pLo}MnNq*O`Ja@8v2f;W%K?bkrGFLf_p z;#$2cymj>T_4_6#-57GJicYDtRlj2OieR_r1m^5)FIt%ENo+PHFHfv~X6-2Swl)ey z;=EG~3JT&{jemG}ZGm4Wg|^KrWuq*f3C|hCS5A3%#N-VP;ol4nb}lG5d;JI!UlKj1a=Cr*e z(2EI{#jxH9TW+~^oNVJs4!BGXH1UrN#@ZM|f}Xy~Nj(#c(ZA4W6Eyk_ zK7aE6fY9)O;Go!l2AUcode) . '_API_METHOD']; + + return array_values(array_diff($keys, $hidden)); + } + + /** + * @return string + */ + protected function _getDefaultApi() + { + return PaymentMethodConfig::API_METHOD_PAYMENT; + } +} diff --git a/lang/dutch/modules/payment/mollie_twint.php b/lang/dutch/modules/payment/mollie_twint.php new file mode 100644 index 00000000..7f9d388b --- /dev/null +++ b/lang/dutch/modules/payment/mollie_twint.php @@ -0,0 +1,49 @@ +Payment API
Gebruik het Payment API Platform voor de transacties. Lees meer.

Order API
Gebruik het nieuwe Payment API Platform voor de transacties. Lees meer.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE', 'Dagen tot verstrijken'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC', 'Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE', 'Transactiebeschrijving'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC', 'De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).'); diff --git a/lang/english/modules/payment/mollie_twint.php b/lang/english/modules/payment/mollie_twint.php new file mode 100644 index 00000000..b97f7a1f --- /dev/null +++ b/lang/english/modules/payment/mollie_twint.php @@ -0,0 +1,49 @@ +Payment API
Use the Payment API Platform for the transactions. Read more.

Order API
Use the new Order API Platform and get additional insights in the orders. Read more.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC', 'Please upload logo that will be used in checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE', 'Sort order of display in checkout'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE', 'Days To Expire'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC', 'How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE', 'Transaction description'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC', 'The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE', 'Payment surcharge'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).'); diff --git a/lang/french/modules/payment/mollie_twint.php b/lang/french/modules/payment/mollie_twint.php new file mode 100644 index 00000000..8e4fa855 --- /dev/null +++ b/lang/french/modules/payment/mollie_twint.php @@ -0,0 +1,49 @@ +Payment API
Utilisez la plateforme Payment API pour les transactions. Reaad more..

Order API
Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. Read more."); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout"); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout."); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs"); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE', "Jours d'expiration"); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC', "Combien de jours avant l'expiration des commandes pour cette méthode? Laissez vide pour utiliser l'expiration par défaut (28 jours)"); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE', 'Description de la transaction'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC', 'La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE', 'Majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).'); diff --git a/lang/german/modules/payment/mollie_twint.php b/lang/german/modules/payment/mollie_twint.php new file mode 100644 index 00000000..7189cb1d --- /dev/null +++ b/lang/german/modules/payment/mollie_twint.php @@ -0,0 +1,49 @@ +Payment API
Verwenden Sie für Transaktionen die Payment API Plattform. Mehr.

Order API
Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. Mehr.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_TITLE', 'Tage bis zum Ablauf'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_ORDER_EXPIRES_DESC', 'Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_TITLE', 'Transaktion Beschreibung'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_TRANSACTION_DESCRIPTION_DESC', 'Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.'); + +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_TWINT_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).'); From 2b489749590e5c2704710795cbc4ae8f6b23030a Mon Sep 17 00:00:00 2001 From: SergejSavic Date: Fri, 27 Sep 2024 11:25:26 +0200 Subject: [PATCH 2/5] add Alma payment method --- .../Factory/CustomFieldsProviderFactory.php | 5 ++ .../Providers/AlmaCustomFieldsProvider.php | 54 ++++++++++++++++++ .../Mollie/Components/Mappers/OrderMapper.php | 1 + .../src/BusinessLogic/Http/DTO/Payment.php | 29 ++++++++++ .../Http/OrgToken/ProxyDataProvider.php | 16 ++++++ .../Model/PaymentMethodConfig.php | 3 +- .../PaymentMethod/PaymentMethods.php | 1 + images/icons/payment/mollie_alma.png | Bin 0 -> 2456 bytes includes/modules/payment/mollie_alma.php | 32 +++++++++++ lang/dutch/modules/payment/mollie_alma.php | 49 ++++++++++++++++ lang/english/modules/payment/mollie_alma.php | 49 ++++++++++++++++ lang/french/modules/payment/mollie_alma.php | 49 ++++++++++++++++ lang/german/modules/payment/mollie_alma.php | 49 ++++++++++++++++ 13 files changed, 336 insertions(+), 1 deletion(-) create mode 100644 GXModules/Mollie/Mollie/Components/CustomFields/Providers/AlmaCustomFieldsProvider.php create mode 100644 images/icons/payment/mollie_alma.png create mode 100644 includes/modules/payment/mollie_alma.php create mode 100644 lang/dutch/modules/payment/mollie_alma.php create mode 100644 lang/english/modules/payment/mollie_alma.php create mode 100644 lang/french/modules/payment/mollie_alma.php create mode 100644 lang/german/modules/payment/mollie_alma.php diff --git a/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php b/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php index 6af4da24..e5481efd 100644 --- a/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php +++ b/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php @@ -2,6 +2,7 @@ namespace Mollie\Gambio\CustomFields\Factory; +use Mollie\Gambio\CustomFields\Providers\AlmaCustomFieldsProvider; use Mollie\Gambio\CustomFields\Providers\CreditCardCustomFieldsProvider; use Mollie\Gambio\CustomFields\Providers\CustomFieldsProvider; use Mollie\Gambio\CustomFields\Providers\IssuerListSupportedCustomFieldsProvider; @@ -29,6 +30,10 @@ public static function getProvider($methodKey) return new KlarnaCustomFieldsProvider($methodKey); } + if (strpos($methodKey, 'mollie_alma') !== false) { + return new AlmaCustomFieldsProvider($methodKey); + } + if (strpos($methodKey, 'mollie_billie') !== false) { return new BillieCustomFieldsProvider($methodKey); } diff --git a/GXModules/Mollie/Mollie/Components/CustomFields/Providers/AlmaCustomFieldsProvider.php b/GXModules/Mollie/Mollie/Components/CustomFields/Providers/AlmaCustomFieldsProvider.php new file mode 100644 index 00000000..f3918b41 --- /dev/null +++ b/GXModules/Mollie/Mollie/Components/CustomFields/Providers/AlmaCustomFieldsProvider.php @@ -0,0 +1,54 @@ +renderLogoEdit() . + $this->renderMultiLangEdit() . + $this->renderApiEdit() . + $this->renderCountryZonesEdit() . + $this->renderSurchargeTypeSelection() . + $this->renderSurchargeEditFields(); + } + + /** + * @inheritDoc + * + * @return string + * @throws \Exception + */ + public function renderCustomOverviewFields() + { + return $this->renderLogoOverview() . + $this->renderMultiLangFieldsOverview() . + $this->renderApiOverview() . + $this->renderCountryZonesOverview(). + $this->renderSurchargeTypeOverview() . + $this->renderSurchargeFieldsOverview(); + } + + /** + * @return string + */ + protected function renderApiEdit() + { + return ''; + } + + /** + * @return string + */ + protected function renderDaysToExpireOverview() + { + return ''; + } +} diff --git a/GXModules/Mollie/Mollie/Components/Mappers/OrderMapper.php b/GXModules/Mollie/Mollie/Components/Mappers/OrderMapper.php index 9edfefd8..5764575f 100644 --- a/GXModules/Mollie/Mollie/Components/Mappers/OrderMapper.php +++ b/GXModules/Mollie/Mollie/Components/Mappers/OrderMapper.php @@ -116,6 +116,7 @@ public function getPayment($orderId) $email = $sourceOrder->getCustomerEmail(); $phone = $sourceOrder->getCustomerTelephone(); $payment->setShippingAddress($this->getAddressData($sourceOrder->getDeliveryAddress(), $email, $phone)); + $payment->setBillingAddress($this->getAddressData($sourceOrder->getBillingAddress(), $email, $phone)); $daysToExpire = $this->getDaysToExpirePayment($sourceOrder->getPaymentType()->getPaymentClass()); if (!empty($daysToExpire)) { diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php index 69c345ad..9cd6edfb 100644 --- a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php +++ b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/DTO/Payment.php @@ -68,6 +68,10 @@ class Payment extends BaseDto * @var Address */ protected $shippingAddress; + /** + * @var Address + */ + protected $billingAddress; /** * @var array */ @@ -134,10 +138,15 @@ public static function fromArray(array $raw) $result->expiresAt = \DateTime::createFromFormat(DATE_ATOM, static::getValue($raw, 'expiresAt')); $shippingAddress = static::getValue($raw, 'shippingAddress', array()); + $billingAddress = static::getValue($raw, 'billingAddress', array()); if (!empty($shippingAddress)) { $result->shippingAddress = Address::fromArray($shippingAddress); } + if (!empty($billingAddress)) { + $result->billingAddress = Address::fromArray($billingAddress); + } + foreach ((array)static::getValue($raw, '_links', array()) as $linkKey => $linkData) { $result->links[$linkKey] = Link::fromArray((array)$linkData); } @@ -200,6 +209,10 @@ public function toArray() $result['shippingAddress'] = $this->shippingAddress->toArray(); } + if ($this->billingAddress) { + $result['billingAddress'] = $this->billingAddress->toArray(); + } + return $result; } @@ -428,6 +441,22 @@ public function setShippingAddress($shippingAddress) $this->shippingAddress = $shippingAddress; } + /** + * @return Address + */ + public function getBillingAddress() + { + return $this->billingAddress; + } + + /** + * @param Address $billingAddress + */ + public function setBillingAddress($billingAddress) + { + $this->billingAddress = $billingAddress; + } + /** * @return array */ diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/OrgToken/ProxyDataProvider.php b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/OrgToken/ProxyDataProvider.php index 4342a3d3..9ec0102f 100644 --- a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/OrgToken/ProxyDataProvider.php +++ b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/Http/OrgToken/ProxyDataProvider.php @@ -58,6 +58,8 @@ public function transformPayment(Payment $payment) ); $shippingAddress = $payment->getShippingAddress(); + $billingAddress = $payment->getBillingAddress(); + if ($shippingAddress && $method === PaymentMethods::PayPal) { $result['shippingAddress'] = array( 'streetAndNumber' => $shippingAddress->getStreetAndNumber(), @@ -69,6 +71,20 @@ public function transformPayment(Payment $payment) ); } + if ($billingAddress && $method === PaymentMethods::Alma) { + $result['billingAddress'] = array( + 'streetAndNumber' => $billingAddress->getStreetAndNumber(), + 'streetAdditional' => $billingAddress->getStreetAdditional(), + 'city' => $billingAddress->getCity(), + 'region' => $billingAddress->getRegion(), + 'postalCode' => $billingAddress->getPostalCode(), + 'country' => $billingAddress->getCountry(), + 'givenName' => $billingAddress->getGivenName(), + 'familyName' => $billingAddress->getFamilyName(), + 'email' => $billingAddress->getEmail() ?: null + ); + } + $result = array_merge($result, $this->getCommonPaymentParameters($payment)); return $result; diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/Model/PaymentMethodConfig.php b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/Model/PaymentMethodConfig.php index 76e1c496..1a4f7aef 100644 --- a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/Model/PaymentMethodConfig.php +++ b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/Model/PaymentMethodConfig.php @@ -54,7 +54,8 @@ class PaymentMethodConfig extends Entity PaymentMethods::Klarna => self::API_METHOD_ORDERS, PaymentMethods::Vouchers => self::API_METHOD_ORDERS, PaymentMethods::Billie => self::API_METHOD_ORDERS, - PaymentMethods::Riverty => self::API_METHOD_ORDERS + PaymentMethods::Riverty => self::API_METHOD_ORDERS, + PaymentMethods::Alma => self::API_METHOD_PAYMENT ); /** diff --git a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php index dc69852d..5578068b 100644 --- a/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php +++ b/GXModules/Mollie/Mollie/vendor/mollie/integration-core/src/BusinessLogic/PaymentMethod/PaymentMethods.php @@ -23,4 +23,5 @@ class PaymentMethods const Klarna = 'klarna'; const Riverty = 'riverty'; const Trustly = 'trustly'; + const Alma = 'alma'; } diff --git a/images/icons/payment/mollie_alma.png b/images/icons/payment/mollie_alma.png new file mode 100644 index 0000000000000000000000000000000000000000..30b2634c200aafa5a6b70fa7e4e257f5ea505394 GIT binary patch literal 2456 zcmZ{mX*Amj7smgx3JuX#lp?WInIb7g1rrjscjU+q*PH9)0C+t$m{*`p7VZ~bI-lcInO=6^PF=(-E^l5jz}3582|u~ z6tca`z7qEvFAdwDW#?is`-1f+yHEijMh5^`w*g>#-(oEQKm;BDmS_M#xC;PEVMR^O zmir5s-#JHnK=R+>wp8ZrJ8&k2N`fySj>3(xkqLha0YEy6VsGOX{7zUno_%yoA%(Ab z^F!-_-@Q)dmeaK_+v>k1gElolRt(gv4sjZrKl3)XCPLdwOt#CIWw*D4I}5$La>4TV zICCIrQ*qImzU|-g`M>65@rq%(fJH_u@AHGUNwPu~u>iCqfXe1gx%l4j|dEq1@1PAWt>%;%n&YI%zsb7GKQmUQNkrUF@XIZ=x( zh1j#+@_`(r=vHe4)nY4gnwNvHSL#LX;J7_hTr6DJf)LlzjL!HSt2+yN3i8ndI0NU{ ziCmKYHV=^yzZGutO1RYOIn2U0{m98GCGm^&BV`1b`Y3hHvFO z+$p%o?nOhcky9E5&}>%=cE5`BIB2_Xs_)oA1beo3Z{{p8ILJJWh`7J!IqB&F#SA0*;TE+G^ zsT#t16B?2Vwg??56FxDgZCUpaTMsmrC)9(|m05#sR+zIUy0y6Ny)c&P#)|O*)rSOc zS=_o72y|T3n2XRI3+YpQY10hYALD(rYy2J?b)7WNmA^9<>_3p**?R>RXE7E<|EMK$ zMZ+I@Y43TW__DfP^Jh&e+0(F5LWgoK=yC$g&PwpZIXU&+kSUVCA+i6xBQ zU%rPqXeX8EO}$O>WjKVSSXp>XJvHaN45YaHT2?af4JvI4%1nHD#^qOyxf_iFu>q^c zL{rojarRQjKX>FivTSzH-0!n^ZpLPJGv5)G?{gkI0=EVByt4MapXAe&xbF!sOKJ>6 znkZQybL2|b5g$|jqn&^QLU8cNP~;(<`;B#Ho^_L}7FHL&>fSF(f#j@~fqc1oU>0YL3 z6u)q(VzjlJ>Bv}9BRQUDs>E+wJ zC(Y0fFsq)-%AS|_V(23_Hiq7$NSb+UXaAU9)!29$s&@8Yl1*BNzf>+O;7>w}^FR5U1s6i!7?gNmIZ=#Z zJ5{AVMf!>xESJ|}mS&R=qHPBb{HT$a+E%!=p)hypc>a={MHg7E&>fW1);l1=lC{R$ zigGCdawv-S5EETb(#|t(#hV(|Wf|);q++xs@W-Y7$~k4jwxw1?#@?Y_5$}1kIMsBu zGHan|!iKklF#oY1h(H_IdSeh(=hcv97T!(HDs~5){#YE|!MsMM+El~^bu4(-~E|t`W~S! zek#-PeCxJsjJRn|9C~y_RP9>fUomN0`WMN9S|Lig{Yh&vOG>3hSw`8nNH}v$>h4q4 zbENpS<669Y+?r}!?9mp9!S*H(ic=s~M+)>wj#|N^WkN_d>7oz5;ZaDRi{D$UZ>vpx zh5jPw_5nOTu;E3kG_evYA6mY_PnwVS1a@;AO_i1Dt&-xCooGRMnb8BT6aG`J|kX&i;C^uF`1AG?+Cg-HB8kKnp(Cd5e&5t21iW7 z9JCg0`2PJ^=$cJURlE!IOizsaPjXUhoLtNwgy66qCn?8TG@O)gT$_a z!3FEQ8`al3DA~I&$YL2fZ5oiTqq=;0zj4w&@NuvWrC|5{mF55@b*9pX+tZef19Rn` zso6-t^{+xOLfm)X+WQGRuzy30)e-H1jx?oplI=7`V8B%t3*)aE1vw(8VV^x52R{)# zIC*|IQ^Hk3e@6P-Cg#MiJ<4X45S4BYN?<(Mm_MXeLGZ-#9@lB3FqKKiU!dM?ND`(> zcRj%av|&5PhwZ|m76Ahr=u2dU;wZ6~2qPy0vCBp;t<0OJH83U%k%srHB1Ha}#<2wa)+)(gk~-EiLgs-=0w4 literal 0 HcmV?d00001 diff --git a/includes/modules/payment/mollie_alma.php b/includes/modules/payment/mollie_alma.php new file mode 100644 index 00000000..b1969393 --- /dev/null +++ b/includes/modules/payment/mollie_alma.php @@ -0,0 +1,32 @@ +code) . '_API_METHOD']; + return array_values(array_diff($keys, $hidden)); + } + + /** + * @return string + */ + protected function _getDefaultApi() + { + return PaymentMethodConfig::API_METHOD_PAYMENT; + } +} diff --git a/lang/dutch/modules/payment/mollie_alma.php b/lang/dutch/modules/payment/mollie_alma.php new file mode 100644 index 00000000..b96fda25 --- /dev/null +++ b/lang/dutch/modules/payment/mollie_alma.php @@ -0,0 +1,49 @@ +Payment API
Gebruik het Payment API Platform voor de transacties. Lees meer.

Order API
Gebruik het nieuwe Payment API Platform voor de transacties. Lees meer.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC', 'Upload een logo dat zal worden gebruikt bij het afrekenen.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE', 'Sorteer de weergavevolgorde bij de checkout'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC', 'De laagste wordt als eerste weergegeven in het checkout-scherm.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE', 'Dagen tot verstrijken'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC', 'Hoeveel dagen voordat bestellingen voor deze methode verlopen? Laat leeg om de standaard vervaldatum te gebruiken (28 dagen)'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE', 'Transactiebeschrijving'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC', 'De beschrijving die moet worden gebruikt voor de betalingstransactie. Deze variabelen zijn beschikbaar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} en {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE', 'Betalingstoeslag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC', 'Selecteer het type toeslag.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE', 'Betalingstoeslag vast bedrag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een vast bedrag in standaard winkelvaluta.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE', 'Betalingstoeslag percentage'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC', 'Extra kosten die aan de klant worden doorberekend voor betalingstransacties bepaald als een percentage van het subtotaal van de winkelwagen.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE', 'Betalingstoeslag limiet'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC', 'Maximumbedrag van de betalingstoeslag die aan de klant moet worden doorberekend (in standaard winkelvaluta).'); diff --git a/lang/english/modules/payment/mollie_alma.php b/lang/english/modules/payment/mollie_alma.php new file mode 100644 index 00000000..8d154906 --- /dev/null +++ b/lang/english/modules/payment/mollie_alma.php @@ -0,0 +1,49 @@ +Payment API
Use the Payment API Platform for the transactions. Read more.

Order API
Use the new Order API Platform and get additional insights in the orders. Read more.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC', 'Please upload logo that will be used in checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE', 'Sort order of display in checkout'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC', 'Lowest is displayed first in checkout screen.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE', 'Days To Expire'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC', 'How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days)'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE', 'Transaction description'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC', 'The description to be used for payment transaction. These variables are available: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany}, and {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE', 'Payment surcharge'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC', 'Please select a surcharge type.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE', 'Payment surcharge fixed amount'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a fixed amount in default store currency.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE', 'Payment surcharge percentage'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC', 'Extra cost to be charged to the customer for payment transactions defined as a percentage of the cart subtotal.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE', 'Payment surcharge limit'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC', 'Maximum amount of payment surcharge that should be charged to the customer (in default store currency).'); diff --git a/lang/french/modules/payment/mollie_alma.php b/lang/french/modules/payment/mollie_alma.php new file mode 100644 index 00000000..fa9d7181 --- /dev/null +++ b/lang/french/modules/payment/mollie_alma.php @@ -0,0 +1,49 @@ +Payment API
Utilisez la plateforme Payment API pour les transactions. Reaad more..

Order API
Utilisez la nouvelle plateforme Order API et obtenez plus d'informations sur les commandes. Read more."); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC', 'Veuillez charger le logo à utiliser au checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE', "Organiser l'ordre d'affichage du checkout"); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC', "Le plus bas est affiché en premier sur l'écran du checkout."); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE', "Style de la liste d'émetteurs"); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE', "Jours d'expiration"); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC', "Combien de jours avant l'expiration des commandes pour cette méthode? Laissez vide pour utiliser l'expiration par défaut (28 jours)"); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE', 'Description de la transaction'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC', 'La description à utiliser pour la transaction de paiement. Ces variables sont disponibles: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} et {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE', 'Majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC', 'Veuillez sélectionner un type de majoration.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE', 'Montant fixe pour majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un montant fixe dans la devise du magasin par défaut.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE', 'Pourcentage de majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC', 'Coût supplémentaire à facturer au client pour les opérations de paiement défini comme un pourcentage du sous-total du panier.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE', 'Limite de majoration de paiement'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC', 'Montant maximum de la majoration de paiement qui doit être facturée au client (dans la devise du magasin par défaut).'); diff --git a/lang/german/modules/payment/mollie_alma.php b/lang/german/modules/payment/mollie_alma.php new file mode 100644 index 00000000..12b5724e --- /dev/null +++ b/lang/german/modules/payment/mollie_alma.php @@ -0,0 +1,49 @@ +Payment API
Verwenden Sie für Transaktionen die Payment API Plattform. Mehr.

Order API
Verwenden Sie die neue Order API Platform, um mehr Einblicke in die Bestellungen zu erhalten. Mehr.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_TITLE', 'Logo'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_LOGO_DESC', 'Bitte laden Sie ein Logo hoch, das im Checkout angezeigt werden soll.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_TITLE', 'Sortierreihenfolge der Anzeige im Checkout'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SORT_ORDER_DESC', 'Der niedrigste Wert wird im Checkout zuerst angezeigt'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_TITLE', 'Issuer list style'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ISSUER_LIST_DESC', 'Choose the style in which issuer list will be displayed on checkout.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_TITLE', 'Tage bis zum Ablauf'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_ORDER_EXPIRES_DESC', 'Wie viele Tage, bevor Bestellungen für diese Methode abgelaufen sind? Leer lassen, um den Standardablauf zu verwenden (28 Tage)'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_TITLE', 'Transaktion Beschreibung'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_TRANSACTION_DESCRIPTION_DESC', 'Die Beschreibung, die für den Zahlungsvorgang verwendet werden soll. Diese Variablen sind verfügbar: {orderNumber}, {storeName}, {customerFirstname}, {customerLastname}, {customerCompany} und {cartNumber}.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_TITLE', 'Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_TYPE_DESC', 'Wählen Sie einen Zuschlagstyp aus.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_TITLE', 'Fester Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_FIXED_AMOUNT_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als fester Betrag in der Standardwährung des Shops berechnet werden.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_TITLE', 'Anteiliger Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_PERCENTAGE_DESC', 'Zusätzliche Kosten die für Zahlungsvorgänge anfallen und als Anteil am Gesamtwert des Einkaufswagens berechnet werden.'); + +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_TITLE', 'Maximaler Zahlungszuschlag'); +defined('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC') ?: define('MODULE_PAYMENT_MOLLIE_ALMA_SURCHARGE_LIMIT_DESC', 'Maximaler Betrag eines Zahlungszuschlags der berechnet werden kann (in der Standardwährung des Shops).'); From d3b9a8b2526c710395bb790c0d71c995cfcda778 Mon Sep 17 00:00:00 2001 From: SergejSavic Date: Fri, 27 Sep 2024 13:01:00 +0200 Subject: [PATCH 3/5] add ideal 2.0 payment method --- .../Factory/CustomFieldsProviderFactory.php | 2 +- .../Utility/MollieIssuersProvider.php | 7 +++- .../Mollie/Shop/Javascripts/mollie-issuers.js | 39 ++++++++++++++++++- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php b/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php index e5481efd..f12fec60 100644 --- a/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php +++ b/GXModules/Mollie/Mollie/Components/CustomFields/Factory/CustomFieldsProviderFactory.php @@ -46,7 +46,7 @@ public static function getProvider($methodKey) return new CreditCardCustomFieldsProvider($methodKey); } - if (in_array($methodKey, ['mollie_ideal', 'mollie_kbc', 'mollie_giftcard'], true)) { + if (in_array($methodKey, ['mollie_kbc', 'mollie_giftcard'], true)) { return new IssuerListSupportedCustomFieldsProvider($methodKey); } diff --git a/GXModules/Mollie/Mollie/Components/Utility/MollieIssuersProvider.php b/GXModules/Mollie/Mollie/Components/Utility/MollieIssuersProvider.php index f7d48e72..97ddbdd8 100644 --- a/GXModules/Mollie/Mollie/Components/Utility/MollieIssuersProvider.php +++ b/GXModules/Mollie/Mollie/Components/Utility/MollieIssuersProvider.php @@ -106,12 +106,17 @@ private function displayIssuers() private function renderIssuerList() { $template = PathProvider::getShopTemplatePath('mollie_issuer_list.html'); + $issuers = $this->_formatIssuers(); + + if ($this->paymentMethod->getId() === 'ideal') { + $issuers = array(); + } return mollie_render_template( $template, [ 'payment_method' => $this->code, - 'issuers' => $this->_formatIssuers(), + 'issuers' => $issuers, 'list_type' => $this->issuerListType, ] ); diff --git a/GXModules/Mollie/Mollie/Shop/Javascripts/mollie-issuers.js b/GXModules/Mollie/Mollie/Shop/Javascripts/mollie-issuers.js index d06bdd52..5699e052 100644 --- a/GXModules/Mollie/Mollie/Shop/Javascripts/mollie-issuers.js +++ b/GXModules/Mollie/Mollie/Shop/Javascripts/mollie-issuers.js @@ -1,12 +1,40 @@ -(function() { +(function () { document.addEventListener("DOMContentLoaded", function () { let issuerListWrappers = document.querySelectorAll('.mollie-issuer-list-wrapper'); + const paymentMethods = document.querySelectorAll('input[type="radio"]'); + + //switch to iDeal 2.0 without issuers + paymentMethods.forEach(function (method) { + if (method.value.includes('mollie_')) { + if (method.value === 'mollie_ideal') { + if (method.checked) { + hideIdealCheckoutPaymentForm(); + } + method.addEventListener('click', function () { + hideIdealCheckoutPaymentForm(); + }); + } + } + }); + + //in case if ideal is the only available payment method, it won't be shown as radio button but as li element + const issuerMethod = document.querySelector('li.mollie_ideal'); + if (issuerMethod) { + hideIdealCheckoutPaymentForm(); + } + for (let i = 0; i < issuerListWrappers.length; i++) { addIssuerListListeners(issuerListWrappers[i]); } let checkoutForm = document.querySelector('#checkout_payment'); checkoutForm.addEventListener('submit', async event => { + //skip checking issuer selection for iDeal 2.0 payment method + let activeMethod = getActiveMethod(); + if (activeMethod.classList.contains('mollie_ideal')) { + return; + } + if (!isIssuersSelected()) { showIssuerErrorMessage(); event.preventDefault(); @@ -96,5 +124,12 @@ return document.querySelector('.list-group-item.active'); } + function hideIdealCheckoutPaymentForm() { + let checkoutPaymentForm = document.querySelector('.checkout-payment-form'); + if (checkoutPaymentForm) { + checkoutPaymentForm.style.display = 'none'; + } + } + }); -})(); \ No newline at end of file +})(); From 59ba3020b43e4b9753ca472082ab407084bd9b65 Mon Sep 17 00:00:00 2001 From: SergejSavic Date: Fri, 18 Oct 2024 11:19:55 +0200 Subject: [PATCH 4/5] release version 3.0.24 --- GXModules/Mollie/Mollie/composer.json | 2 +- GXModules/Mollie/Mollie/vendor/composer/installed.php | 8 ++++---- README.md | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/GXModules/Mollie/Mollie/composer.json b/GXModules/Mollie/Mollie/composer.json index 4927c74b..8d73a274 100644 --- a/GXModules/Mollie/Mollie/composer.json +++ b/GXModules/Mollie/Mollie/composer.json @@ -1,6 +1,6 @@ { "name": "mollie/gambio", - "version": "3.0.23", + "version": "3.0.24", "require": { "php": ">=5.4", "mollie/integration-core": "1.3.9" diff --git a/GXModules/Mollie/Mollie/vendor/composer/installed.php b/GXModules/Mollie/Mollie/vendor/composer/installed.php index 7875c614..e8c8f246 100644 --- a/GXModules/Mollie/Mollie/vendor/composer/installed.php +++ b/GXModules/Mollie/Mollie/vendor/composer/installed.php @@ -1,7 +1,7 @@ array( - 'pretty_version' => '3.0.23', - 'version' => '3.0.23.0', + 'pretty_version' => '3.0.24', + 'version' => '3.0.24.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,8 +11,8 @@ ), 'versions' => array( 'mollie/gambio' => array( - 'pretty_version' => '3.0.23', - 'version' => '3.0.23.0', + 'pretty_version' => '3.0.24', + 'version' => '3.0.24.0', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/README.md b/README.md index 2209c75a..969f5034 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,11 @@ Read more about the integration configuration on [our Wiki](https://github.com/m # Release notes +*3.0.24* +- Add Twint payment method +- Add Alma payment method +- Change from iDeal 1.0 to iDeal 2.0 payment method + *3.0.23* - Add Billie payment method - Add Klarna One payment method From 4333e9fa997045d59149fa19710b4db801e896fa Mon Sep 17 00:00:00 2001 From: SergejSavic Date: Fri, 18 Oct 2024 11:48:46 +0200 Subject: [PATCH 5/5] update core version to 1.3.10 --- GXModules/Mollie/Mollie/composer.json | 2 +- GXModules/Mollie/Mollie/composer.lock | 12 ++++++------ .../Mollie/Mollie/vendor/composer/installed.json | 12 ++++++------ .../Mollie/Mollie/vendor/composer/installed.php | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/GXModules/Mollie/Mollie/composer.json b/GXModules/Mollie/Mollie/composer.json index 8d73a274..4ab1ae5d 100644 --- a/GXModules/Mollie/Mollie/composer.json +++ b/GXModules/Mollie/Mollie/composer.json @@ -3,7 +3,7 @@ "version": "3.0.24", "require": { "php": ">=5.4", - "mollie/integration-core": "1.3.9" + "mollie/integration-core": "1.3.10" }, "repositories": [ { diff --git a/GXModules/Mollie/Mollie/composer.lock b/GXModules/Mollie/Mollie/composer.lock index 55df547d..e5241b63 100644 --- a/GXModules/Mollie/Mollie/composer.lock +++ b/GXModules/Mollie/Mollie/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8a39701da6a1db7fd55331c9cf3d6e6", + "content-hash": "9d14462c64efd2426d969f7090947022", "packages": [ { "name": "mollie/integration-core", - "version": "1.3.9", + "version": "1.3.10", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "8a07e5e317dfbffeaa552820ee843701a24a8fd5" + "reference": "c651e7ca353219121dbe13cca34fc02393a9cb2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/8a07e5e317dfbffeaa552820ee843701a24a8fd5", - "reference": "8a07e5e317dfbffeaa552820ee843701a24a8fd5", + "url": "https://api.github.com/repos/mollie/orocore/zipball/c651e7ca353219121dbe13cca34fc02393a9cb2c", + "reference": "c651e7ca353219121dbe13cca34fc02393a9cb2c", "shasum": "" }, "require": { @@ -45,7 +45,7 @@ "proprietary" ], "description": "Mollie integrations core library", - "time": "2024-09-16T12:55:55+00:00" + "time": "2024-09-27T09:30:33+00:00" } ], "packages-dev": [], diff --git a/GXModules/Mollie/Mollie/vendor/composer/installed.json b/GXModules/Mollie/Mollie/vendor/composer/installed.json index 6dc978f7..37320055 100644 --- a/GXModules/Mollie/Mollie/vendor/composer/installed.json +++ b/GXModules/Mollie/Mollie/vendor/composer/installed.json @@ -2,17 +2,17 @@ "packages": [ { "name": "mollie/integration-core", - "version": "1.3.9", - "version_normalized": "1.3.9.0", + "version": "1.3.10", + "version_normalized": "1.3.10.0", "source": { "type": "git", "url": "git@github.com:mollie/orocore.git", - "reference": "8a07e5e317dfbffeaa552820ee843701a24a8fd5" + "reference": "c651e7ca353219121dbe13cca34fc02393a9cb2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mollie/orocore/zipball/8a07e5e317dfbffeaa552820ee843701a24a8fd5", - "reference": "8a07e5e317dfbffeaa552820ee843701a24a8fd5", + "url": "https://api.github.com/repos/mollie/orocore/zipball/c651e7ca353219121dbe13cca34fc02393a9cb2c", + "reference": "c651e7ca353219121dbe13cca34fc02393a9cb2c", "shasum": "" }, "require": { @@ -24,7 +24,7 @@ "phpunit/phpunit": "^4.8.35", "symfony/console": "^5.1" }, - "time": "2024-09-16T12:55:55+00:00", + "time": "2024-09-27T09:30:33+00:00", "type": "library", "installation-source": "source", "autoload": { diff --git a/GXModules/Mollie/Mollie/vendor/composer/installed.php b/GXModules/Mollie/Mollie/vendor/composer/installed.php index e8c8f246..25448eae 100644 --- a/GXModules/Mollie/Mollie/vendor/composer/installed.php +++ b/GXModules/Mollie/Mollie/vendor/composer/installed.php @@ -20,12 +20,12 @@ 'dev_requirement' => false, ), 'mollie/integration-core' => array( - 'pretty_version' => '1.3.9', - 'version' => '1.3.9.0', + 'pretty_version' => '1.3.10', + 'version' => '1.3.10.0', 'type' => 'library', 'install_path' => __DIR__ . '/../mollie/integration-core', 'aliases' => array(), - 'reference' => '8a07e5e317dfbffeaa552820ee843701a24a8fd5', + 'reference' => 'c651e7ca353219121dbe13cca34fc02393a9cb2c', 'dev_requirement' => false, ), ),