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

Dropzone form post edited

Browse Source
This commit is contained in:
Burak Civan 2021-05-26 18:31:17 +03:00
parent 7adb8c9663
commit 93ba76e978
5 changed files with 38 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Settings/Settings.php
View File

@ -16,7 +16,7 @@ class Settings extends Controller
{
use DateTime, Uploads;
public $skip_keys = ['company_id', '_method', '_token', '_prefix'];
public $skip_keys = ['company_id', '_method', '_token', '_prefix', 'uploaded_logo'];
public $file_keys = ['company.logo', 'invoice.logo'];
@ -113,10 +113,6 @@ class Settings extends Controller
}
if ($real_key == 'default.locale') {
if (!in_array($value, config('language.allowed'))) {
continue;
}
user()->setAttribute('locale', $value)->save();
}
@ -160,10 +156,10 @@ class Settings extends Controller
Installer::updateEnv(['MAIL_FROM_NAME' => '"' . $value . '"']);
break;
case 'company.email':
Installer::updateEnv(['MAIL_FROM_ADDRESS' => '"' . $value . '"']);
Installer::updateEnv(['MAIL_FROM_ADDRESS' => $value]);
break;
case 'default.locale':
Installer::updateEnv(['APP_LOCALE' => '"' . $value . '"']);
Installer::updateEnv(['APP_LOCALE' => $value]);
break;
case 'schedule.time':
Installer::updateEnv(['APP_SCHEDULE_TIME' => '"' . $value . '"']);

8
app/Http/Controllers/Wizard/Companies.php
View File

@ -50,7 +50,7 @@ class Companies extends Controller
$fields = $request->all();
$skip_keys = ['company_id', '_method', '_token'];
$skip_keys = ['company_id', '_method', '_token', 'uploaded_logo'];
$file_keys = ['company.logo'];
foreach ($fields as $key => $value) {
@ -70,13 +70,13 @@ class Companies extends Controller
$real_key = 'company.' . $key;
}
// Process file uploads
if (in_array($real_key, $file_keys)) {
// Process file uploads
if (in_array($real_key, $file_keys)) {
// Upload attachment
if ($request->file($key)) {
$media = $this->getMedia($request->file($key), 'settings');
$company->attachMedia($media, Str::snake($key));
$company->attachMedia($media, Str::snake($real_key));
$value = $media->id;
}

64
resources/assets/js/views/wizard/Company.vue
View File

@ -70,12 +70,12 @@
</div>
<div class="col-6">
<base-input :label="translations.company.logo">
<akaunting-dropzone-file-upload
ref="dropzoneWizard"
preview-classes="single"
:attachments="logo"
>
</akaunting-dropzone-file-upload>
<akaunting-dropzone-file-upload
ref="dropzoneWizard"
preview-classes="single"
:attachments="logo"
>
</akaunting-dropzone-file-upload>
</base-input>
</div>
</div>
@ -127,52 +127,44 @@ export default {
return {
active: 0,
logo: [],
real_date: ''
};
real_date: "",
};
},
mounted() {
let company_data = this.company;
setTimeout(() => {
if (this.company != undefined) {
let logo_arr = [
{
id: this.company.logo.id,
name:this.company.logo.filename + "." + this.company.logo.extension,
path: this.company.logo.path,
type: this.company.logo.mime_type,
size: this.company.logo.size,
downloadPath: false,
},
];
this.logo.push(logo_arr);
this.real_date = this.company.financial_start;
}
this.dataWatch(company_data);
}, 500);
},
watch: {
company: function (company) {
let logo_arr = [
{
id: company.logo.id,
name: company.logo.filename + "." + company.logo.extension,
path: company.logo.path,
type: company.logo.mime_type,
size: company.logo.size,
downloadPath: false,
},
];
this.logo.push(logo_arr);
this.real_date = company.financial_start;
this.dataWatch(company);
},
},
methods: {
dataWatch(company) {
if(Object.keys(company).length) {
let logo_arr = [
{
id: company.logo.id,
name: company.logo.filename + "." + company.logo.extension,
path: company.logo.path,
type: company.logo.mime_type,
size: company.logo.size,
downloadPath: false,
},
];
this.logo.push(logo_arr);
this.real_date = company.financial_start;
}
},
next() {
if (this.active++ > 2);
this.$router.push("/wizard/currencies");
},
onEditSave() {
this.onEditEvent("PATCH", url + "/wizard/company", "logo", "", "");
this.onEditEvent("PATCH", url + "/wizard/companies", "logo", "", "");
this.$router.push("/wizard/currencies");
},
},

2
routes/wizard.php
View File

@ -12,7 +12,7 @@ Route::group(['as' => 'wizard.'], function () {
Route::get('data', 'Wizard\Data@index')->name('data.index');
Route::get('companies', 'Wizard\Companies@edit')->name('companies.edit');
Route::patch('companies', 'Wizard\Companies@update')->name('companies.update');
Route::patch('companies', 'Wizard\Companies@update')->middleware('dropzone')->name('companies.update');
Route::get('currencies/{currency}/enable', 'Settings\Currencies@enable')->name('currencies.enable');
Route::get('currencies/{currency}/disable', 'Settings\Currencies@disable')->name('currencies.disable');