Skip to content
This repository was archived by the owner on Oct 21, 2026. It is now read-only.

Commit c07e6be

Browse files
trashertrasher
committed
Merge branch 'release/2.2.1'
2 parents f2bf07f + 3b1afb0 commit c07e6be

9 files changed

Lines changed: 53 additions & 51 deletions

File tree

‎.github/workflows/ci-linux.yml‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
strategy:
2727
matrix:
28-
php-versions: [ '8.1', '8.4' ]
28+
php-versions: [ '8.2', '8.5' ]
2929
coverage: [none]
3030
fail-fast: false
3131

@@ -83,13 +83,6 @@ jobs:
8383
cd galette-core/galette/plugins/plugin-paypal
8484
../../vendor/bin/twigcs templates/default --severity error --display blocking
8585
86-
- name: Check missing symbols
87-
run: |
88-
cd galette-core/galette/plugins/plugin-paypal
89-
composer require maglnet/composer-require-checker -W
90-
vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
91-
if: matrix.php-versions == '8.4'
92-
9386
- name: PHPStan checks
9487
run: |
9588
cd galette-core/galette/plugins/plugin-paypal
@@ -109,19 +102,19 @@ jobs:
109102
#always tests higher stable php version with lower db version
110103
#enable coverage on higher stable php version with higher postrgesql version
111104
#lower php version
112-
- { php-version: "8.1", db-image: "mysql:5.7", coverage: none, always: false }
113-
- { php-version: "8.1", db-image: "mysql:8.1", coverage: none, always: false }
114-
- { php-version: "8.1", db-image: "mariadb:10.4", coverage: none, always: false }
115-
- { php-version: "8.1", db-image: "mariadb:11", coverage: none, always: false }
116-
- { php-version: "8.1", db-image: "postgres:11", coverage: none, always: false }
117-
- { php-version: "8.1", db-image: "postgres:16", coverage: none, always: false }
105+
- { php-version: "8.2", db-image: "mysql:5.7", coverage: none, always: false }
106+
- { php-version: "8.2", db-image: "mysql:8.1", coverage: none, always: false }
107+
- { php-version: "8.2", db-image: "mariadb:10.4", coverage: none, always: false }
108+
- { php-version: "8.2", db-image: "mariadb:11", coverage: none, always: false }
109+
- { php-version: "8.2", db-image: "postgres:11", coverage: none, always: false }
110+
- { php-version: "8.2", db-image: "postgres:16", coverage: none, always: false }
118111
#higher stable php version
119-
- { php-version: "8.4", db-image: "mysql:5.7", coverage: none, always: true }
120-
- { php-version: "8.4", db-image: "mysql:8.1", coverage: none, always: false }
121-
- { php-version: "8.4", db-image: "mariadb:10.4", coverage: none, always: true }
122-
- { php-version: "8.4", db-image: "mariadb:11", coverage: none, always: false }
123-
- { php-version: "8.4", db-image: "postgres:11", coverage: none, always: true }
124-
- { php-version: "8.4", db-image: "postgres:16", coverage: none, always: true }
112+
- { php-version: "8.5", db-image: "mysql:5.7", coverage: none, always: true }
113+
- { php-version: "8.5", db-image: "mysql:8.1", coverage: none, always: false }
114+
- { php-version: "8.5", db-image: "mariadb:10.4", coverage: none, always: true }
115+
- { php-version: "8.5", db-image: "mariadb:11", coverage: none, always: false }
116+
- { php-version: "8.5", db-image: "postgres:11", coverage: none, always: true }
117+
- { php-version: "8.5", db-image: "postgres:16", coverage: none, always: true }
125118
fail-fast: false
126119

127120
env:

‎ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
* 2025-12-08 - 2.2.1
2+
3+
* 2025-10-09 - 2.2.0
4+
5+
* 2024-10-20 - 2.1.2
6+
7+
* 2024-07-06 - 2.1.1
8+
9+
* 2024-06-07 - 2.1.0
10+
11+
* 2023-12-07 - 2.0.0
12+
113
* 2021-11-29 - 1.10.0
214
- Galette 0.9.6 compatible
315
- Few fixes

‎_define.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
'Galette Paypal', //Name
2626
'Paypal integration', //Short description
2727
'Johan Cwiklinski', //Author
28-
'2.2.0', //Version
29-
'1.2.0', //Galette compatible version
28+
'2.2.1', //Version
29+
'1.2.1', //Galette compatible version
3030
'paypal', //routing name and translation domain
31-
'2025-10-09', //Release date
31+
'2025-12-08', //Release date
3232
[ //Permissions needed
3333
'paypal_preferences' => 'staff',
3434
'store_paypal_preferences' => 'staff',

‎lang/it_IT.utf8/LC_MESSAGES/paypal.mo‎

736 Bytes
Binary file not shown.

‎lang/paypal_it_IT.utf8.po‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
# Luca De Filippo <luca.defilippo@translationcommons.org>, 2021.
33
# Lory ~ <dury.lorenzo@gmail.com>, 2021.
44
# Johan Cwiklinski <trasher@x-tnd.be>, 2021, 2022, 2023.
5-
# Marco Ciampa <ciampix@posteo.net>, 2024.
5+
# Marco Ciampa <ciampix@posteo.net>, 2024, 2025.
66
msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
9-
"Report-Msgid-Bugs-To: \n"
9+
"Report-Msgid-Bugs-To: translations@galette.eu\n"
1010
"POT-Creation-Date: 2025-08-07 16:10+0200\n"
11-
"PO-Revision-Date: 2024-06-20 11:09+0000\n"
11+
"PO-Revision-Date: 2025-10-13 09:07+0000\n"
1212
"Last-Translator: Marco Ciampa <ciampix@posteo.net>\n"
13-
"Language-Team: Italian <https://hosted.weblate.org/projects/galette/paypal-"
14-
"plugin/it/>\n"
13+
"Language-Team: Italian <https://hosted.weblate.org/projects/galette/"
14+
"paypal-plugin/it/>\n"
1515
"Language: it_IT\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.6-rc\n"
20+
"X-Generator: Weblate 5.14-dev\n"
2121

2222
#: ../lib/GalettePaypal/Controllers/PaypalController.php:70
2323
msgid "Paypal payment"
@@ -98,20 +98,17 @@ msgstr ""
9898
"dettagli."
9999

100100
#: ../tempcache/paypal_preferences.html.twig:71
101-
#, fuzzy
102-
#| msgid "Paypal preferences"
103101
msgid "Cannot load the preferences"
104-
msgstr "Preferenze Paypal"
102+
msgstr "Impossibile caricare le preferenze"
105103

106104
#: ../tempcache/paypal_preferences.html.twig:77
107-
#, fuzzy
108-
#| msgid "An error occurred saving paypal preferences :("
109105
msgid "An error occured while loading the preferences from the database."
110-
msgstr "Errore durante il salvataggio delle preferenze Paypal :("
106+
msgstr "Errore durante il caricamento delle preferenze dal database."
111107

112108
#: ../tempcache/paypal_preferences.html.twig:81
113109
msgid "Please, check if the plugin's database has been properly initialized."
114110
msgstr ""
111+
"Controllare che il database del plugin sia stato inizializzato correttamente."
115112

116113
#: ../tempcache/paypal_preferences.html.twig:96
117114
msgid "Paypal identifier:"
@@ -128,6 +125,8 @@ msgstr ""
128125
#: ../tempcache/paypal_preferences.html.twig:120
129126
msgid "Amounts can be defined in the contributions types settings."
130127
msgstr ""
128+
"Gli importi possono essere definiti nelle impostazioni dei tipi di "
129+
"contributo."
131130

132131
#: ../tempcache/paypal_preferences.html.twig:184
133132
msgid "Error: no predefined amounts found."
@@ -151,7 +150,7 @@ msgstr "Causale del pagamento:"
151150

152151
#: ../tempcache/paypal_form.html.twig:215
153152
msgid "Pay with paypal"
154-
msgstr ""
153+
msgstr "Paga con Paypal"
155154

156155
#: ../tempcache/paypal_form.html.twig:271
157156
#, php-format
@@ -160,7 +159,7 @@ msgstr "Ritorna al sito di %s per completare la tua iscrizione."
160159

161160
#: ../tempcache/paypal_form.html.twig:310
162161
msgid "You have to select an option"
163-
msgstr ""
162+
msgstr "Bisogna scegliere un'opzione"
164163

165164
#: ../tempcache/paypal_form.html.twig:319
166165
msgid "Please enter an amount."

‎lib/GalettePaypal/Controllers/PaypalController.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,7 @@ public function notify(Request $request, Response $response): Response
434434

435435
//all goes well, we can proceed
436436
if ($real_contrib) {
437-
$store = false;
438-
$valid = $contrib->check($post, [], []);
437+
$valid = $contrib->setNoCheckLogin()->check($post, [], []);
439438
if ($valid !== true) {
440439
Analog::log(
441440
'An error occurred while storing a new contribution from Paypal payment:'
@@ -446,8 +445,7 @@ public function notify(Request $request, Response $response): Response
446445
return $response->withStatus(500, 'Internal error');
447446
}
448447

449-
$store = $contrib->store();
450-
if ($store === true) {
448+
if ($contrib->store()) {
451449
//contribution has been stored :)
452450
Analog::log(
453451
'Paypal payment has been successfully registered as a contribution',

‎lib/GalettePaypal/Paypal.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function store(): bool
153153
]
154154
);
155155

156-
$edit = $this->zdb->execute($update);
156+
$this->zdb->execute($update);
157157

158158
//store inactives
159159
$values = [
@@ -168,7 +168,7 @@ public function store(): bool
168168
]
169169
);
170170

171-
$edit = $this->zdb->execute($update);
171+
$this->zdb->execute($update);
172172

173173
Analog::log(
174174
'[' . get_class($this)
@@ -230,7 +230,7 @@ public function getAllAmounts(): array
230230
/**
231231
* Is the plugin loaded?
232232
*
233-
* @return boolean
233+
* @return bool
234234
*/
235235
public function isLoaded(): bool
236236
{
@@ -240,7 +240,7 @@ public function isLoaded(): bool
240240
/**
241241
* Are amounts loaded?
242242
*
243-
* @return boolean
243+
* @return bool
244244
*/
245245
public function areAmountsLoaded(): bool
246246
{
@@ -280,7 +280,7 @@ public function setPrices(array $ids, array $amounts): void
280280
*
281281
* @param int $id type identifier
282282
*
283-
* @return boolean
283+
* @return bool
284284
*/
285285
public function isInactive(int $id): bool
286286
{

‎lib/GalettePaypal/PaypalHistory.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function add(array|string $action, string $argument = '', string $query =
110110
/**
111111
* Get table's name
112112
*
113-
* @param boolean $prefixed Whether table name should be prefixed
113+
* @param bool $prefixed Whether table name should be prefixed
114114
*
115115
* @return string
116116
*/
@@ -194,7 +194,7 @@ protected function buildOrderClause(): array
194194
*
195195
* @param string $sign Verify sign paypal parameter
196196
*
197-
* @return boolean
197+
* @return bool
198198
*/
199199
public function isProcessed(string $sign): bool
200200
{
@@ -211,9 +211,9 @@ public function isProcessed(string $sign): bool
211211
/**
212212
* Set payment state
213213
*
214-
* @param integer $state State, one of self::STATE_ constants
214+
* @param int $state State, one of self::STATE_ constants
215215
*
216-
* @return boolean
216+
* @return bool
217217
*/
218218
public function setState(int $state): bool
219219
{

‎lib/GalettePaypal/PluginGalettePaypal.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public static function getDashboardsContents(): array
102102
global $preferences;
103103
$contents = [];
104104

105-
if ($preferences->showPublicPages($login)) {
105+
if ($preferences->showPublicPage($login, 'pref_publicpages_visibility_generic')) {
106106
$contents[] = [
107107
'label' => _T("Payment form", "paypal"),
108108
'route' => [

0 commit comments

Comments
 (0)