Merge branch 'release/2.1.1'

galette · Jul 6, 2024 · 8ea59c5 · 8ea59c5
2 parents fe137b8 + 916674b
commit 8ea59c5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/.composer-require-checker.config.json b/.composer-require-checker.config.json
@@ -38,6 +38,7 @@
     "GALETTE_DOWNLOADS_URI",
     "GALETTE_EXPORTS_PATH",
     "GALETTE_FILES_PATH",
+    "GALETTE_HOSTED",
     "GALETTE_IMPORTS_PATH",
     "GALETTE_LOGS_PATH",
     "GALETTE_MODE",
@@ -58,6 +59,7 @@
     "GALETTE_MARIADB_MIN",
     "GALETTE_PGSQL_MIN",
     "GALETTE_DISPLAY_VERSION",
+    "GALETTE_TESTS",
     "GALETTE_PHP_MIN",
 
     "// Galette db constants (not detected as they are dynamically declared)",
@@ -102,7 +104,8 @@
     "DI\\Attribute\\Inject",
 
     "// Not detected, do not know why.",
-    "Psr\\Http\\Server\\RequestHandlerInterface"
+    "Psr\\Http\\Server\\RequestHandlerInterface",
+    "Install"
   ],
   "scan-files": [
     "*.php",

diff --git a/_define.php b/_define.php
@@ -25,10 +25,10 @@
     'Galette Paypal',       //Name
     'Paypal integration',   //Short description
     'Johan Cwiklinski',     //Author
-    '2.1.0',                //Version
+    '2.1.1',                //Version
     '1.1.0',                //Galette compatible version
     'paypal',               //routing name and translation domain
-    '2024-06-08',           //Release date
+    '2024-07-06',           //Release date
     [   //Permissions needed
         'paypal_preferences'        => 'staff',
         'store_paypal_preferences'  => 'staff',

diff --git a/lang/it_IT.utf8/LC_MESSAGES/paypal.mo b/lang/it_IT.utf8/LC_MESSAGES/paypal.mo
diff --git a/lang/paypal_it_IT.utf8.po b/lang/paypal_it_IT.utf8.po
@@ -2,21 +2,22 @@
 # Luca De Filippo <[email protected]>, 2021.
 # Lory ~ <[email protected]>, 2021.
 # Johan Cwiklinski <[email protected]>, 2021, 2022, 2023.
+# Marco Ciampa <[email protected]>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2024-02-08 22:18+0100\n"
-"PO-Revision-Date: 2023-12-09 18:39+0000\n"
-"Last-Translator: Johan Cwiklinski <[email protected]>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/galette/paypal-"
-"plugin/it/>\n"
+"PO-Revision-Date: 2024-06-20 11:09+0000\n"
+"Last-Translator: Marco Ciampa <[email protected]>\n"
+"Language-Team: Italian <https://hosted.weblate.org/projects/galette/"
+"paypal-plugin/it/>\n"
 "Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.6-rc\n"
 
 #: ../lib/GalettePaypal/Controllers/PaypalController.php:68
 msgid "Paypal payment"
@@ -34,15 +35,15 @@ msgstr ""
 
 #: ../lib/GalettePaypal/Controllers/PaypalController.php:80
 msgid "Our apologies for the annoyance :("
-msgstr ""
+msgstr "Ci scusiamo per l'inconveniente :("
 
 #: ../lib/GalettePaypal/Controllers/PaypalController.php:87
 msgid ""
 "Paypal id has not been defined. Please ask an administrator to add it from "
 "plugin preferences."
 msgstr ""
-"L'ID Paypal non è stato definito. Chiedi a un amministratore di aggiungerlo "
-"dalle preferenze del plugin."
+"L'ID Paypal non è stato definito. Chiedere a un amministratore di "
+"aggiungerlo dalle preferenze del plugin."
 
 #: ../lib/GalettePaypal/Controllers/PaypalController.php:94
 msgid "Predefined amounts cannot be loaded, that is not a critical error."

diff --git a/templates/default/paypal_form.html.twig b/templates/default/paypal_form.html.twig
@@ -22,7 +22,7 @@
 
 {% block content %}
     {% if paypal.isLoaded() and paypal.getId() != null %}
-        <form action="{% if constant('GALETTE_MODE') == 'DEV' %}https://www.sandbox.paypal.com/fr/cgi-bin/webscr{% else %}https://www.paypal.com/cgi-bin/webscr{% endif %}" method="post" id="paypalform" class="ui form">
+        <form action="{% if callstatic('\\Galette\\Core\\Galette', 'isDebugEnabled') %}https://www.sandbox.paypal.com/fr/cgi-bin/webscr{% else %}https://www.paypal.com/cgi-bin/webscr{% endif %}" method="post" id="paypalform" class="ui form">
             <div class="ui top attached accordion-styled header">
                 {% if amounts|length == 0 %}
                     {{ _T("Enter payment reason", "paypal") }}

diff --git a/tests/GalettePaypal/tests/units/Paypal.php b/tests/GalettePaypal/tests/units/Paypal.php
@@ -59,7 +59,7 @@ public function testEmpty(): void
 
         $ctype = new \Galette\Entity\ContributionsTypes($this->zdb);
         $ctype_id = $ctype->getIdByLabel('donation in money');
-        $this->assertSame(
+        $this->assertEquals(
             [
                 $ctype_id => [
                     'name' => 'donation in money',