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

Merge pull request #927 from denisdulici/master

Browse Source 
Removed enabled column from reports
This commit is contained in:
Denis Duliçi 2019-11-19 14:08:35 +03:00 committed by GitHub
commit 6842e10e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 66 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/Api/Common/Reports.php
View File

@ -62,32 +62,6 @@ class Reports extends ApiController
return $this->item($report->fresh(), new Transformer());
}
/**
* Enable the specified resource in storage.
*
* @param Report $report
* @return \Dingo\Api\Http\Response
*/
public function enable(Report $report)
{
$report = $this->dispatch(new UpdateReport($report, request()->merge(['enabled' => 1])));
return $this->item($report->fresh(), new Transformer());
}
/**
* Disable the specified resource in storage.
*
* @param Report $report
* @return \Dingo\Api\Http\Response
*/
public function disable(Report $report)
{
$report = $this->dispatch(new UpdateReport($report, request()->merge(['enabled' => 0])));
return $this->item($report->fresh(), new Transformer());
}
/**
* Remove the specified resource from storage.
*

36
app/Http/Controllers/Common/Reports.php
View File

@ -153,42 +153,6 @@ class Reports extends Controller
return response()->json($response);
}
/**
* Enable the specified resource.
*
* @param Report $report
*
* @return Response
*/
public function enable(Report $report)
{
$response = $this->ajaxDispatch(new UpdateReport($report, request()->merge(['enabled' => 1])));
if ($response['success']) {
$response['message'] = trans('messages.success.enabled', ['type' => $report->name]);
}
return response()->json($response);
}
/**
* Disable the specified resource.
*
* @param Report $report
*
* @return Response
*/
public function disable(Report $report)
{
$response = $this->ajaxDispatch(new UpdateReport($report, request()->merge(['enabled' => 0])));
if ($response['success']) {
$response['message'] = trans('messages.success.disabled', ['type' => $report->name]);
}
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*

1
app/Http/Requests/Common/Report.php
View File

@ -22,7 +22,6 @@ class Report extends FormRequest
'period' => 'required|string',
'basis' => 'required|string',
'chart' => 'required|string',
'enabled' => 'integer|boolean',
];
}
}

31
app/Listeners/Update/V20/Version201.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace App\Listeners\Update\V13;
use App\Events\Install\UpdateFinished as Event;
use App\Listeners\Update\Listener;
use Artisan;
class Version201 extends Listener
{
const ALIAS = 'core';
const VERSION = '2.0.1';
/**
* Handle the event.
*
* @param $event
* @return void
*/
public function handle(Event $event)
{
// Check if should listen
if (!$this->check($event)) {
return;
}
// Update database
Artisan::call('migrate', ['--force' => true]);
}
}

2
app/Models/Common/Report.php
View File

@ -14,5 +14,5 @@ class Report extends Model
*
* @var array
*/
protected $fillable = ['company_id', 'name', 'description', 'class', 'group', 'period', 'basis', 'chart', 'enabled'];
protected $fillable = ['company_id', 'name', 'description', 'class', 'group', 'period', 'basis', 'chart'];
}

1
app/Providers/Event.php
View File

@ -36,6 +36,7 @@ class Event extends Provider
'App\Listeners\Update\V13\Version1313',
'App\Listeners\Update\V13\Version1316',
'App\Listeners\Update\V20\Version200',
'App\Listeners\Update\V20\Version201',
],
'Illuminate\Auth\Events\Login' => [
'App\Listeners\Auth\Login',

1
app/Transformers/Common/Report.php
View File

@ -24,7 +24,6 @@ class Report extends TransformerAbstract
'period' => $model->period,
'basis' => $model->basis,
'graph' => $model->graph,
'enabled' => $model->enabled,
'created_at' => $model->created_at ? $model->created_at->toIso8601String() : '',
'updated_at' => $model->updated_at ? $model->updated_at->toIso8601String() : '',
];

3
app/Utilities/Reports.php
View File

@ -53,9 +53,6 @@ class Reports
{
return [
'category' => trans_choice('general.categories', 1),
'account' => trans_choice('general.accounts', 1),
'customer' => trans_choice('general.customers', 1),
'vendor' => trans_choice('general.vendors', 1),
];
}

32
database/migrations/2019_11_19_000000_drop_enabled_column_reports_table.php Normal file
View File

@ -0,0 +1,32 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class DropEnabledColumnReportsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('reports', function (Blueprint $table) {
$table->dropColumn('enabled');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('reports', function (Blueprint $table) {
$table->boolean('enabled');
});
}
}

5
database/seeds/Reports.php
View File

@ -36,7 +36,6 @@ class Reports extends Seeder
'period' => 'monthly',
'basis' => 'accrual',
'chart' => 'line',
'enabled' => 1,
],
[
'company_id' => $company_id,
@ -47,7 +46,6 @@ class Reports extends Seeder
'period' => 'monthly',
'basis' => 'accrual',
'chart' => 'line',
'enabled' => 1,
],
[
'company_id' => $company_id,
@ -58,7 +56,6 @@ class Reports extends Seeder
'period' => 'monthly',
'basis' => 'accrual',
'chart' => 'line',
'enabled' => 1,
],
[
'company_id' => $company_id,
@ -69,7 +66,6 @@ class Reports extends Seeder
'period' => 'quarterly',
'basis' => 'accrual',
'chart' => '0',
'enabled' => 1,
],
[
'company_id' => $company_id,
@ -80,7 +76,6 @@ class Reports extends Seeder
'period' => 'quarterly',
'basis' => 'accrual',
'chart' => '0',
'enabled' => 1,
],
];

2
resources/views/common/reports/create.blade.php
View File

@ -29,8 +29,6 @@
{{ Form::selectGroup('basis', trans('general.basis'), 'file', $basises, 'accrual') }}
{{ Form::selectGroup('chart', trans_choice('general.charts', 1), 'chart-pie', $charts, 'line') }}
{{ Form::radioGroup('enabled', trans('general.enabled')) }}
</div>
</div>

4
resources/views/common/reports/edit.blade.php
View File

@ -30,8 +30,6 @@
{{ Form::selectGroup('basis', trans('general.basis'), 'file', $basises, $report->basis) }}
{{ Form::selectGroup('chart', trans_choice('general.charts', 1), 'chart-pie', $charts, $report->chart) }}
{{ Form::radioGroup('enabled', trans('general.enabled')) }}
</div>
</div>
@ -46,7 +44,7 @@
@push('scripts_start')
<script type="text/javascript">
var class =
var class = '';
</script>
<script src="{{ asset('public/js/common/reports.js?v=' . version('short')) }}"></script>

2
routes/admin.php
View File

@ -35,8 +35,6 @@ Route::group(['prefix' => 'common'], function () {
Route::get('reports/{report}/print', 'Common\Reports@print')->name('reports.print');
Route::get('reports/{report}/export', 'Common\Reports@export')->name('reports.export');
Route::get('reports/{report}/enable', 'Common\Reports@enable')->name('reports.enable');
Route::get('reports/{report}/disable', 'Common\Reports@disable')->name('reports.disable');
Route::get('reports/groups', 'Common\Reports@groups')->name('reports.groups');
Route::resource('reports', 'Common\Reports');
});