lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION

Browse Source
This commit is contained in:
Laurent Destailleur 2019-05-02 13:31:47 +02:00
parent e5777f64f4
commit 5145680279
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/admin/multicurrency.php
View File

@ -249,7 +249,7 @@ if (!empty($conf->global->MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION))
print '<td>'.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize", $urlforapilayer)).'</td>'."\n"; print '<td>'.$form->textwithpicto($langs->trans("CurrencyLayerAccount"), $langs->trans("CurrencyLayerAccount_help_to_synchronize", $urlforapilayer)).'</td>'."\n";
print '<td class="right">'; print '<td class="right">';
print '<textarea id="response" class="hideobject" name="response"></textarea>'; print '<textarea id="response" class="hideobject" name="response"></textarea>';
print $langs->trans("Value").'&nbsp;<input type="button" id="bt_sync" name="bt_sync_apilayer" class="button" value="'.$langs->trans('Synchronize').'" />'; print $langs->trans("Value").'&nbsp;<input type="submit" id="bt_sync" name="bt_sync_apilayer" class="button" value="'.$langs->trans('Synchronize').'" />';
print '<input type="submit" name="modify_apilayer" class="button" value="'.$langs->trans("Modify").'">'; print '<input type="submit" name="modify_apilayer" class="button" value="'.$langs->trans("Modify").'">';
print '</td></tr>'; print '</td></tr>';
@ -328,6 +328,15 @@ foreach ($TCurrency as &$currency)
print '</table>'; print '</table>';
print '</div>'; print '</div>';
print '
<script type="text/javascript">
function getRates()
{
$("#bt_sync").attr("disabled", true);
return true;
}
</script>
';
// End of page // End of page
llxFooter(); llxFooter();

10
htdocs/multicurrency/class/multicurrency.class.php
View File

@ -626,14 +626,18 @@ 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 string $key Key to use. Come from $conf->global->MULTICURRENCY_APP_ID.
* @param int $addifnotfound Add if not found
* @return void * @return void
*/ */
public static function syncRates($key) public static function syncRates($key, $addifnotfound = 0)
{ {
global $conf, $db, $langs; global $conf, $db, $langs;
$urlendpoint = 'http://apilayer.net/api/live?access_key='.$key; $urlendpoint = 'http://apilayer.net/api/live?access_key='.$key;
//$urlendpoint.='&format=1';
$urlendpoint.=(empty($conf->global->MULTICURRENCY_APP_SOURCE) ? '' : '&source='.$conf->global->MULTICURRENCY_APP_SOURCE);
dol_syslog("Call url endpoint ".$urlendpoint); dol_syslog("Call url endpoint ".$urlendpoint);
// TODO Use getURLContent() function instead. // TODO Use getURLContent() function instead.
@ -658,7 +662,7 @@ class MultiCurrency extends CommonObject
{ {
$obj->updateRate($rate); $obj->updateRate($rate);
} }
else elseif ($addifnotfound)
{ {
self::addRateFromDolibarr($code, $rate); self::addRateFromDolibarr($code, $rate);
} }