Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle migrations run before setup

Browse Source
This commit is contained in:
Hillel Coren 2018-01-25 13:12:50 +02:00
parent 52911841ff
commit 840283a0ce
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/AppController.php
View File

@ -122,22 +122,24 @@ class AppController extends BaseController
fwrite($fp, $config); fwrite($fp, $config);
fclose($fp); fclose($fp);
if (Utils::isDatabaseSetup()) { if (! Utils::isDatabaseSetup()) {
return Redirect::to('/login'); // == DB Migrate & Seed == //
$sqlFile = base_path() . '/database/setup.sql';
DB::unprepared(file_get_contents($sqlFile));
} }
// == DB Migrate & Seed == //
$sqlFile = base_path() . '/database/setup.sql';
DB::unprepared(file_get_contents($sqlFile));
Cache::flush(); Cache::flush();
Artisan::call('db:seed', ['--force' => true, '--class' => 'UpdateSeeder']);
Artisan::call('optimize', ['--force' => true]); Artisan::call('optimize', ['--force' => true]);
$firstName = trim(Input::get('first_name')); if (! Account::count()) {
$lastName = trim(Input::get('last_name')); $firstName = trim(Input::get('first_name'));
$email = trim(strtolower(Input::get('email'))); $lastName = trim(Input::get('last_name'));
$password = trim(Input::get('password')); $email = trim(strtolower(Input::get('email')));
$account = $this->accountRepo->create($firstName, $lastName, $email, $password); $password = trim(Input::get('password'));
$user = $account->users()->first(); $account = $this->accountRepo->create($firstName, $lastName, $email, $password);
$user = $account->users()->first();
}
return Redirect::to('/login'); return Redirect::to('/login');
} }

1
resources/lang/en/texts.php
View File

@ -2658,6 +2658,7 @@ $LANG = array(
'auto' => 'Auto', 'auto' => 'Auto',
'tax_amount' => 'Tax Amount', 'tax_amount' => 'Tax Amount',
'tax_paid' => 'Tax Paid', 'tax_paid' => 'Tax Paid',
'none' => 'None',
); );