Skip to content

fix CI #33624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eldy merged 6 commits into from
Mar 26, 2025
Merged

fix CI #33624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fbf010
fix typo
frederic34 Mar 26, 2025
1a4cc80
Update card.php
frederic34 Mar 26, 2025
4ec2535
Update card.php
frederic34 Mar 26, 2025
3cf5cc1
Update card.php
frederic34 Mar 26, 2025
ee3bf81
Update interface_95_modWebhook_WebhookTriggers.class.php
frederic34 Mar 26, 2025
a8c845a
Update interface_95_modWebhook_WebhookTriggers.class.php
frederic34 Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ public function runTrigger($action, $object, User $user, Translate $langs, Conf
$actionarraytmp = explode(",", $tmpobject->trigger_codes);
$actionarray = array();
foreach ($actionarraytmp as $val) {
$actionarray = trim($val);
$actionarray[] = trim($val);
}

// Test on Target status
$testontargetstatus = ($tmpobject->status == Target::STATUS_AUTOMATIC_TRIGGER || ($tmpobject->status == Target::STATUS_MANUAL_TRIGGER && !empty($sendmanualtriggers)));
if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && is_array($actionarray) && in_array($action, $actionarray)) {
if (((!empty($object->context["actiontrigger"]) && in_array($object->context["actiontrigger"], array("sendtrigger", "testsend"))) || $testontargetstatus) && in_array($action, $actionarray)) {
// Build the answer object
$resobject = new stdClass();
$resobject->triggercode = $action;
Expand Down
19 changes: 10 additions & 9 deletions htdocs/salaries/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/* Copyright (C) 2011-2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
* Copyright (C) 2014-2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2025 Nick Fragoulis
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
* Copyright (C) 2015 Charlie BENKE <charlie@patas-monkey.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024-2025 Nick Fragoulis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -129,6 +129,7 @@

$upload_dir = $conf->salaries->multidir_output[$conf->entity];

$error = 0;

/*
* Actions
Expand Down Expand Up @@ -461,7 +462,7 @@

// Action to update one extrafield
if ($action == 'update_extras' && $permissiontoeditextra) {
$object->oldcopy = dol_clone($object, 2);
$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty

$attribute = GETPOST('attribute', 'aZ09');

Expand Down
2 changes: 1 addition & 1 deletion htdocs/stripe/admin/stripe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
if (utf8_check(getDolGlobalString('STRIPE_TEST_SECRET_KEY'))) {
try {
\Stripe\Stripe::setApiKey(getDolGlobalString('STRIPE_LIVE_SECRET_KEY'));
$endpoint = \Stripe\WebhookEndpoint::retrieve(getDolglobalString('STRIPE_LIVE_WEBHOOK_ID'));
$endpoint = \Stripe\WebhookEndpoint::retrieve(getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID'));
$endpoint->enabled_events = $stripearrayofwebhookevents;
if (GETPOST('webhook', 'alpha') == getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID')) {
if (empty(GETPOST('status', 'alpha'))) {
Expand Down
Loading