shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #224

Browse Source
This commit is contained in:
denisdulici
2018-02-20 18:24:17 +03:00
parent 366a3052d3
commit 01c91b2391
6 changed files with 115 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Middleware/LoadCurrencies.php
View File

@ -2,8 +2,7 @@
namespace App\Http\Middleware;
use Akaunting\Money\Currency;
use App\Models\Setting\Currency as Model;
use App\Utilities\Overrider;
use Closure;
class LoadCurrencies
@ -23,22 +22,7 @@ class LoadCurrencies
return $next($request);
}
$currencies = Model::all();
foreach ($currencies as $currency) {
if (!isset($currency->precision)) {
continue;
}
config(['money.' . $currency->code . '.precision' => $currency->precision]);
config(['money.' . $currency->code . '.symbol' => $currency->symbol]);
config(['money.' . $currency->code . '.symbol_first' => $currency->symbol_first]);
config(['money.' . $currency->code . '.decimal_mark' => $currency->decimal_mark]);
config(['money.' . $currency->code . '.thousands_separator' => $currency->thousands_separator]);
}
// Set currencies with new settings
Currency::setCurrencies(config('money'));
Overrider::load('currencies');
return $next($request);
}

35
app/Http/Middleware/LoadSettings.php
View File

@ -2,6 +2,7 @@
namespace App\Http\Middleware;
use App\Utilities\Overrider;
use Closure;
class LoadSettings
@ -21,39 +22,7 @@ class LoadSettings
return $next($request);
}
// Set the active company settings
setting()->setExtraColumns(['company_id' => $company_id]);
setting()->load(true);
// Timezone
config(['app.timezone' => setting('general.timezone', 'UTC')]);
// Email
$email_protocol = setting('general.email_protocol', 'mail');
config(['mail.driver' => $email_protocol]);
config(['mail.from.name' => setting('general.company_name')]);
config(['mail.from.address' => setting('general.company_email')]);
if ($email_protocol == 'sendmail') {
config(['mail.sendmail' => setting('general.email_sendmail_path')]);
} elseif ($email_protocol == 'smtp') {
config(['mail.host' => setting('general.email_smtp_host')]);
config(['mail.port' => setting('general.email_smtp_port')]);
config(['mail.username' => setting('general.email_smtp_username')]);
config(['mail.password' => setting('general.email_smtp_password')]);
config(['mail.encryption' => setting('general.email_smtp_encryption')]);
}
// Session
config(['session.driver' => setting('general.session_handler', 'file')]);
config(['session.lifetime' => setting('general.session_lifetime', '30')]);
// Locale
if (session('locale') == '') {
//App::setLocale(setting('general.default_language'));
//Session::put('locale', setting('general.default_language'));
config(['app.locale' => setting('general.default_locale')]);
}
Overrider::load('settings');
return $next($request);
}