new setting package

This commit is contained in:
denisdulici
2019-02-22 16:14:13 +03:00
parent 1086eab674
commit 9bfc59549a
10 changed files with 42 additions and 36 deletions

View File

@ -55,10 +55,11 @@ class Companies extends ApiController
*/
public function store(Request $request)
{
$company = Company::create($request->all());
// Clear settings
setting()->forgetAll();
$company = Company::create($request->all());
setting()->setExtraColumns(['company_id' => $company->id]);
// Create settings
setting()->set([
@ -69,11 +70,9 @@ class Companies extends ApiController
'general.default_locale' => $request->get('default_locale', 'en-GB'),
]);
setting()->setExtraColumns(['company_id' => $company->id]);
setting()->save();
return $this->response->created(url('api/companies/'.$company->id));
return $this->response->created(url('api/companies/' . $company->id));
}
/**

View File

@ -63,11 +63,12 @@ class Companies extends Controller
{
$company_id = session('company_id');
setting()->forgetAll();
// Create company
$company = Company::create($request->input());
setting()->forgetAll();
setting()->setExtraColumns(['company_id' => $company->id]);
// Create settings
setting()->set('general.company_name', $request->get('company_name'));
setting()->set('general.company_email', $request->get('company_email'));
@ -85,8 +86,6 @@ class Companies extends Controller
setting()->set('general.default_currency', $request->get('default_currency'));
setting()->set('general.default_locale', session('locale'));
setting()->setExtraColumns(['company_id' => $company->id]);
setting()->save();
setting()->forgetAll();

View File

@ -28,13 +28,13 @@ class Version130 extends Listener
}
// Set new Item Reminder settings
setting()->setExtraColumns(['company_id' => session('company_id')]);
setting(['general.send_item_reminder' => '0']);
setting(['general.schedule_item_stocks' => '3,5,7']);
setting(['general.wizard' => '1']);
setting(['general.invoice_item' => 'settings.invoice.item']);
setting(['general.invoice_price' => 'settings.invoice.price']);
setting(['general.invoice_quantity' => 'settings.invoice.quantity']);
setting()->save();
$this->updatePermissions();

View File

@ -26,6 +26,7 @@ class Version135 extends Listener
}
// Add financial year start to settings
setting()->setExtraColumns(['company_id' => session('company_id')]);
setting(['general.financial_start' => Date::now()->startOfYear()->format('d F')]);
setting()->save();
}

View File

@ -28,6 +28,7 @@ class Version138 extends Listener
// Re-format financial start
$current_setting = setting('general.financial_start', Date::now()->startOfYear()->format('d F'));
setting()->setExtraColumns(['company_id' => session('company_id')]);
setting(['general.financial_start' => Date::parse($current_setting)->format('d-m')]);
setting()->save();
}

View File

@ -214,13 +214,13 @@ class Installer
]);
// Set settings
setting()->setExtraColumns(['company_id' => $company->id]);
setting()->set([
'general.company_name' => $name,
'general.company_email' => $email,
'general.default_currency' => 'USD',
'general.default_locale' => $locale,
]);
setting()->setExtraColumns(['company_id' => $company->id]);
setting()->save();
}