kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Remove logging

Browse Source
This commit is contained in:
James Cole
2017-03-18 07:45:40 +01:00
parent e2f3788ff5
commit 97f67912f4
1 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Support/Amount.php
View File

@@ -18,7 +18,6 @@ use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use Illuminate\Support\Collection;
use Log;
use Preferences as Prefs;
/**
@@ -98,7 +97,6 @@ class Amount
// alternative is currency before amount
$format = $pos_a . $pos_b . '%s' . $pos_c . $space . $pos_d . '%v' . $pos_e;
}
Log::debug(sprintf('Final format: "%s"', $format));
return $format;
}
@@ -111,8 +109,6 @@ class Amount
*/
public function format(string $amount, bool $coloured = true): string
{
Log::debug(sprintf('Now in format("%s", %s).', $amount, var_export($coloured, true)));
return $this->formatAnything($this->getDefaultCurrency(), $amount, $coloured);
}
@@ -128,18 +124,11 @@ class Amount
*/
public function formatAnything(TransactionCurrency $format, string $amount, bool $coloured = true): string
{
Log::debug(sprintf('Now in formatAnything($format, "%s",%s)', $amount, var_export($coloured, true)));
Log::debug('Currency $format: ', $format->toArray());
$locale = explode(',', trans('config.locale'));
$locale = array_map('trim', $locale);
Log::debug('Locale is ', $locale);
setlocale(LC_MONETARY, $locale);
$float = round($amount, 12);
$info = localeconv();
Log::debug('Localeconv is', $info);
Log::debug(sprintf('Now calling number_format(%f, %d, "%s", "%s")', $float, $format->decimal_places, $info['mon_decimal_point'], $info['mon_thousands_sep']));
Log::debug(sprintf('Decimal places raw: %s', var_export($format->decimal_places, true)));
$formatted = number_format($float, intval($format->decimal_places), $info['mon_decimal_point'], $info['mon_thousands_sep']);
// some complicated switches to format the amount correctly:
@@ -267,33 +256,23 @@ class Amount
}
/**
* @return \FireflyIII\Models\TransactionCurrency
* @return TransactionCurrency
* @throws FireflyException
*/
public function getDefaultCurrency(): TransactionCurrency
{
Log::debug('Now in getDefaultCurrency()');
$cache = new CacheProperties;
$cache->addProperty('getDefaultCurrency');
if ($cache->has()) {
Log::debug('Return cache value: ', $cache->get()->toArray());
return $cache->get(); // @codeCoverageIgnore
}
Log::debug('getDefaultCurrency() is not in cache.');
$currencyPreference = Prefs::get('currencyPreference', config('firefly.default_currency', 'EUR'));
Log::debug('currencyPreference is', $currencyPreference->toArray());
$currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
$currency = TransactionCurrency::where('code', $currencyPreference->data)->first();
if (is_null($currency)) {
Log::debug('Currency is NULL!');
throw new FireflyException(sprintf('No currency found with code "%s"', $currencyPreference->data));
}
Log::debug('Currency is ', $currency->toArray());
$cache->store($currency);
Log::debug('Return $currency');
return $currency;
}