TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:mohit.panjvani/crater-web

Browse Source
This commit is contained in:
Mohit Panjwani
2019-11-17 11:36:23 +05:30
parent e41c063bf3 858ef44919
commit 0ce75e6a42
11 changed files with 101 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/CompanyController.php
View File

@ -105,13 +105,6 @@ class CompanyController extends Controller
['key' => 'december-november', 'value' => '12-11'],
];
$languages = [
"en" => "English",
"de" => "German",
"fr" => "French",
"es" => "Spanish"
];
$language = CompanySetting::getSetting('language', $request->header('company'));
$carbon_date_format = CompanySetting::getSetting('carbon_date_format', $request->header('company'));
$moment_date_format = CompanySetting::getSetting('moment_date_format', $request->header('company'));
@ -121,7 +114,6 @@ class CompanyController extends Controller
$languages = [
["code"=>"en", "name" => "English"],
["code"=>"de", "name" => "German"],
["code"=>"fr", "name" => "French"],
["code"=>"es", "name" => "Spanish"]
];

13
app/Http/Controllers/ItemsController.php
View File

@ -55,6 +55,7 @@ class ItemsController extends Controller
if ($request->has('taxes')) {
foreach ($request->taxes as $tax) {
$tax['company_id'] = $request->header('company');
$item->taxes()->create($tax);
}
}
@ -75,12 +76,16 @@ class ItemsController extends Controller
$item->price = $request->price;
$item->save();
$oldTaxes = $item->taxes->toArray();
foreach ($oldTaxes as $oldTax) {
Tax::destroy($oldTax['id']);
}
if ($request->has('taxes')) {
foreach ($request->taxes as $tax) {
$item->taxes()->updateOrCreate(
['tax_type_id' => $tax['tax_type_id']],
['amount' => $tax['amount'], 'percent' => $tax['percent'], 'name' => $tax['name']]
);
$tax['company_id'] = $request->header('company');
$item->taxes()->create($tax);
}
}

3
app/Http/Controllers/OnboardingController.php
View File

@ -38,7 +38,8 @@ class OnboardingController extends Controller
$time_zones = TimeZones::get_list();
$languages = [
["code"=>"en", "name" => "English"],
["code"=>"de", "name" => "German"],
["code"=>"fr", "name" => "French"],
["code"=>"es", "name" => "Spanish"]
];
$fiscal_years = [
['key' => 'january-december' , 'value' => '1-12'],