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

fix merge conflicts

Browse Source
This commit is contained in:
Mohit Panjwani
2020-04-20 11:32:44 +05:30
parent 8f0af3dcd6 53860378b9
commit a0a46d306e
3 changed files with 943 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
<?php
namespace Crater\Http\Controllers;
use Illuminate\Http\Request;
@ -122,17 +123,17 @@ class CompanyController extends Controller
$time_zones = TimeZones::get_list();
$fiscal_years = [
['key' => 'january-december' , 'value' => '1-12'],
['key' => 'february-january' , 'value' => '2-1'],
['key' => 'march-february' , 'value' => '3-2'],
['key' => 'april-march' , 'value' => '4-3'],
['key' => 'may-april' , 'value' => '5-4'],
['key' => 'june-may' , 'value' => '6-5'],
['key' => 'july-june' , 'value' => '7-6'],
['key' => 'august-july' , 'value' => '8-7'],
['key' => 'september-august' , 'value' => '9-8'],
['key' => 'january-december', 'value' => '1-12'],
['key' => 'february-january', 'value' => '2-1'],
['key' => 'march-february', 'value' => '3-2'],
['key' => 'april-march', 'value' => '4-3'],
['key' => 'may-april', 'value' => '5-4'],
['key' => 'june-may', 'value' => '6-5'],
['key' => 'july-june', 'value' => '7-6'],
['key' => 'august-july', 'value' => '8-7'],
['key' => 'september-august', 'value' => '9-8'],
['key' => 'october-september', 'value' => '10-9'],
['key' => 'november-october' , 'value' => '11-10'],
['key' => 'november-october', 'value' => '11-10'],
['key' => 'december-november', 'value' => '12-11'],
];
@ -144,13 +145,16 @@ class CompanyController extends Controller
$fiscal_year = CompanySetting::getSetting('fiscal_year', $request->header('company'));
$languages = [ // alphabetical order
["code"=>"pt_BR", "name" => "Brazilian Portuguese"],
["code"=>"en", "name" => "English"],
["code"=>"fr", "name" => "French"],
["code"=>"de", "name" => "German"],
["code"=>"it", "name" => "Italian"],
["code"=>"es", "name" => "Spanish"],
["code"=>"ar", "name" => "العربية"],
["code" => "pt_BR", "name" => "Brazilian Portuguese"],
["code" => "en", "name" => "English"],
["code" => "fr", "name" => "French"],
["code" => "de", "name" => "German"],
["code" => "it", "name" => "Italian"],
["code" => "es", "name" => "Spanish"],
["code" => "ar", "name" => "العربية"],
["code" => "de", "name" => "German"],
["code" => "pt_BR", "name" => "Brazilian Portuguese"],
["code" => "nl", "name" => "Dutch"]
];
return response()->json([
@ -195,7 +199,7 @@ class CompanyController extends Controller
]);
}
public function getCustomizeSetting (Request $request)
public function getCustomizeSetting(Request $request)
{
$invoice_prefix = CompanySetting::getSetting('invoice_prefix', $request->header('company'));
$invoice_auto_generate = CompanySetting::getSetting('invoice_auto_generate', $request->header('company'));
@ -216,7 +220,7 @@ class CompanyController extends Controller
]);
}
public function updateCustomizeSetting (Request $request)
public function updateCustomizeSetting(Request $request)
{
$sets = [];
@ -321,10 +325,10 @@ class CompanyController extends Controller
{
$data = json_decode($request->company_logo);
if($data) {
if ($data) {
$company = Company::find($request->header('company'));
if($company) {
if ($company) {
$company->clearMediaCollection('logo');
$company->addMediaFromBase64($data->data)
@ -348,10 +352,10 @@ class CompanyController extends Controller
{
$data = json_decode($request->admin_avatar);
if($data) {
if ($data) {
$user = auth()->user();
if($user) {
if ($user) {
$user->clearMediaCollection('admin_avatar');
$user->addMediaFromBase64($data->data)