From 3c572c19095cc368a31a563c40c7d1ea84c4a3e8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Mar 2020 17:24:20 +0100 Subject: [PATCH] Debug multicurrency --- htdocs/admin/multicurrency.php | 5 ++++- htdocs/langs/en_US/multicurrency.lang | 2 ++ htdocs/multicurrency/class/multicurrency.class.php | 10 +++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php index 0c6d3e219b8..a2db56549e3 100644 --- a/htdocs/admin/multicurrency.php +++ b/htdocs/admin/multicurrency.php @@ -148,7 +148,10 @@ elseif ($action == 'setapilayer') } else { - MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID); + $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID); + if ($result > 0) { + setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs"); + } } } diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang index 4dc04ff2622..bfcbd11fb7c 100644 --- a/htdocs/langs/en_US/multicurrency.lang +++ b/htdocs/langs/en_US/multicurrency.lang @@ -18,3 +18,5 @@ MulticurrencyReceived=Received, original currency MulticurrencyRemainderToTake=Remaining amount, original currency MulticurrencyPaymentAmount=Payment amount, original currency AmountToOthercurrency=Amount To (in currency of receiving account) +CurrencyRateSyncSucceed=Currency rate synchronization done successfuly +MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php index d3b589fe88a..3701d3404f0 100644 --- a/htdocs/multicurrency/class/multicurrency.class.php +++ b/htdocs/multicurrency/class/multicurrency.class.php @@ -628,11 +628,11 @@ class MultiCurrency extends CommonObject } /** - * Sync rates from api + * Sync rates from API * * @param string $key Key to use. Come from $conf->global->MULTICURRENCY_APP_ID. * @param int $addifnotfound Add if not found - * @return void + * @return int <0 if KO, >0 if OK */ public static function syncRates($key, $addifnotfound = 0) { @@ -672,11 +672,15 @@ class MultiCurrency extends CommonObject } } } - } + + return 1; + } else { dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING); setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors'); + + return -1; } }