Merge branch 'hotfix/2.0.8'

Author: Nathan DIAS

CHANGELOG.md

@@ -1,3 +1,8 @@
+2.0.8, 2023-08-24
+- Compatibility with Drupal 10.x.
+- Update list of supported payment means.
+- Update list of supported currencies.
+
 2.0.7, 2023-04-26:
 - Bug fix: Update order balance in case of online refund.
 - Improve module documentation management field.

commerce_payzen/commerce_payzen.info.yml

@@ -6,9 +6,9 @@ dependencies:
   - commerce_payment
 
 # information about project
-version: "8.x-9.x-2.0.7"
+version: "8.x-10.x-2.0.8"
 core: "8.x"
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 project: "commerce_payzen"
 datestamp: "1612773362"
 interface translation project: commerce_payzen

commerce_payzen/src/Includes/Form/Api.php

@@ -212,12 +212,14 @@ public static function getSupportedCardTypes()
             'ACCORD_STORE' => 'Cartes Enseignes Partenaires', 'ACCORD_STORE_SB' => 'Cartes Enseignes Partenaires (sandbox)',
             'ALINEA' => 'Carte myalinea', 'ALINEA_CDX' => 'Carte Cadeau Alinéa', 'ALINEA_CDX_SB' => 'Carte Cadeau Alinéa (sandbox)',
             'ALINEA_SB' => 'Carte myalinea (sandbox)', 'ALIPAY' => 'Alipay', 'ALLOBEBE_CDX' => 'Carte Cadeau Allobébé',
-            'ALLOBEBE_CDX_SB' => 'Carte Cadeau Allobébé (sandbox)', 'APETIZ' => 'Apetiz', 'APPLE_PAY' => 'Apple Pay',
+            'ALLOBEBE_CDX_SB' => 'Carte Cadeau Allobébé (sandbox)', 'ALMA' => 'Alma en 1 fois', 'ALMA_10X' => 'Alma in 10 installments',
+            'ALMA_12X' => 'Alma in 12 installments', 'ALMA_2X' => 'Alma in 2 installments', 'ALMA_3X' => 'Alma in 3 installments',
+            'ALMA_4X' => 'Alma in 4 installments', 'APETIZ' => 'Apetiz', 'APPLE_PAY' => 'Apple Pay',
             'AUCHAN' => 'Carte Auchan', 'AUCHAN_SB' => 'Carte Auchan (sandbox)', 'AURORE-MULTI' => 'Cpay Aurore',
             'BANCONTACT' => 'Bancontact Mistercash', 'BIZUM' => 'Bizum', 'BIZZBEE_CDX' => 'Carte Cadeau Bizzbee',
             'BIZZBEE_CDX_SB' => 'Carte Cadeau Bizzbee (sandbox)', 'BOULANGER' => 'Carte b+',
             'BOULANGER_SB' => 'Carte b+ (sandbox)', 'BRICE_CDX' => 'Carte Cadeau Brice', 'BRICE_CDX_SB' => 'Carte Cadeau Brice (sandbox)',
-            'BUT' => 'But', 'CA_DO_CARTE' => 'CA DO Carte', 'CABAL' => 'Cabal', 'CARNET' => 'Carnet', 'CASINO' => 'Banque Casino',
+            'BUT' => 'But', 'CABAL' => 'Cabal', 'CARNET' => 'Carnet', 'CASINO' => 'Banque Casino', 'CA_DO_CARTE' => 'CA DO Carte',
             'CDGP' => 'Carte Privilège', 'CDISCOUNT' => 'CDiscount', 'CHQ_DEJ' => 'Chèque Déjeuner', 'COF3XCB' => 'Cofinoga 3 fois CB',
             'COF3XCB_SB' => 'Cofinoga 3 fois CB Sandbox', 'COFINOGA' => 'Cofinoga', 'COM_BARRY_CDX' => 'Carte Cadeau Comtesse du Barry',
             'COM_BARRY_CDX_SB' => 'Carte Cadeau Comtesse du Barry (sandbox)', 'CONECS' => 'Conecs', 'CONFORAMA' => 'Conforama',
@@ -231,7 +233,8 @@ public static function getSupportedCardTypes()
             'ILLICADO' => 'Carte Illicado', 'ILLICADO_SB' => 'Carte Illicado (sandbox)', 'IP_WIRE' => 'Virement SEPA',
             'IP_WIRE_INST' => 'Virement SEPA Instantané', 'JCB' => 'JCB', 'JOUECLUB_CDX' => 'Carte Cadeau Joué Club',
             'JOUECLUB_CDX_SB' => 'Carte Cadeau Joué Club (sandbox)', 'JULES_CDX' => 'Carte Cadeau Jules',
-            'JULES_CDX_SB' => 'Carte Cadeau Jules (sandbox)', 'KLARNA' => 'Klarna', 'LECLERC' => 'Carte Reglo',
+            'JULES_CDX_SB' => 'Carte Cadeau Jules (sandbox)', 'KADEOS_CULTURE' => 'Carte Kadéos Culture',
+            'KADEOS_GIFT' => 'Carte Kadéos Zénith', 'KLARNA' => 'Klarna', 'LECLERC' => 'Carte Reglo',
             'LEROY-MERLIN' => 'Carte Maison Financement', 'LEROY-MERLIN_SB' => 'Carte Maison Financement (sandbox)',
             'MASTERPASS' => 'MasterPass', 'MC_CORDOBESA' => 'Mastercard Cordobesa', 'MULTIBANCO' => 'Multibanco', 'MYBANK' => 'MyBank',
             'NARANJA' => 'Naranja', 'NORAUTO' => 'Carte Norauto option Financement', 'NORAUTO_SB' => 'Carte Norauto option Financement (sandbox)',

commerce_payzen/src/Plugin/Commerce/PaymentGateway/Payzen.php

@@ -229,7 +229,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
             '#type' => 'item',
             '#title' => $this->t('Instant Payment Notification URL'),
             '#description' => '<span class="payzen-ipn-desc">
-                    <img src="' . base_path() . drupal_get_path('module', 'commerce_payzen') . '/images/warn.png">' .
+                    <img src="' . base_path() . $this->payzen_get_path() . '/images/warn.png">' .
                     $this->t('URL to copy into your PayZen Back Office > Settings > Notification rules.') .
                 '</span>',
             '#markup' => $this->getNotifyUrl()->toString()
@@ -753,4 +753,13 @@ private function savePayment($order, $response)
 
         return $state !== 'voided';
     }
+
+    private function payzen_get_path()
+    {
+        if (function_exists('drupal_get_path')) {
+            return drupal_get_path('module', 'commerce_payzen');
+        }
+
+        return \Drupal::service('extension.list.module')->getPath('commerce_payzen');
+    }
 }

commerce_payzen/src/Tools.php

@@ -24,7 +24,7 @@ class Tools
     const GATEWAY_CODE = 'PayZen';
     const GATEWAY_VERSION = 'V2';
     const CMS_IDENTIFIER = 'Drupal_Commerce_2.x';
-    const PLUGIN_VERSION = '2.0.7';
+    const PLUGIN_VERSION = '2.0.8';
     const DOC_PATTERN = '###DOC_PATTERN###';
 
     public static $pluginFeatures = array(

commerce_payzen/translations/payzen.de.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PayZen for Drupal Commerce (8.x-"
-"2.0.7)\n"
+"2.0.8)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-02 14:59+0100\n"
 "PO-Revision-Date: 2021-01-31 15:19+0100\n"

commerce_payzen/translations/payzen.es.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PayZen for Drupal Commerce (8.x-"
-"2.0.7)\n"
+"2.0.8)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-02 15:02+0100\n"
 "PO-Revision-Date: 2021-01-31 15:17+0100\n"

commerce_payzen/translations/payzen.fr.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PayZen for Drupal Commerce (8.x-"
-"2.0.7)\n"
+"2.0.8)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-02 15:05+0100\n"
 "PO-Revision-Date: 2021-01-31 15:16+0100\n"