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

Merge pull request #909 from mehmetcoban/master

Browse Source 
Fixed category deleting and color picker
This commit is contained in:
Mehmet Çoban 2019-11-17 16:35:09 +03:00 committed by GitHub
commit e3ea0e3ef5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50179 additions and 3417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Jobs/Setting/DeleteCategory.php
View File

@ -3,6 +3,7 @@
namespace App\Jobs\Setting;
use App\Abstracts\Job;
use App\Models\Setting\Category;
class DeleteCategory extends Job
{

53593
public/js/settings/categories.js vendored
View File

File diff suppressed because one or more lines are too long

2
resources/views/settings/categories/edit.blade.php
View File

@ -33,7 +33,7 @@
<div class="input-group input-group-merge" id="category-color-picker">
<div class="input-group-prepend">
<span class="input-group-text">
<el-color-picker v-model="color" size="small" :predefine="predefineColors" @change="onChangeColor"></el-color-picker>
<el-color-picker v-model="color" size="mini" :predefine="predefineColors" @change="onChangeColor"></el-color-picker>
</span>
</div>
{!! Form::text('color', $category->color, ['@input' => 'onChangeColorInput', 'id' => 'color', 'class' => 'form-control color-hex', 'required' => 'required']) !!}