diff --git a/app/Http/Controllers/Api/Common/Reports.php b/app/Http/Controllers/Api/Common/Reports.php index 16cb9af7a..9433a2f4e 100644 --- a/app/Http/Controllers/Api/Common/Reports.php +++ b/app/Http/Controllers/Api/Common/Reports.php @@ -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. * diff --git a/app/Http/Controllers/Common/Reports.php b/app/Http/Controllers/Common/Reports.php index 8a9797caa..106e7e715 100644 --- a/app/Http/Controllers/Common/Reports.php +++ b/app/Http/Controllers/Common/Reports.php @@ -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. * diff --git a/app/Http/Requests/Common/Report.php b/app/Http/Requests/Common/Report.php index 4b91cf7d1..0609c666c 100644 --- a/app/Http/Requests/Common/Report.php +++ b/app/Http/Requests/Common/Report.php @@ -22,7 +22,6 @@ class Report extends FormRequest 'period' => 'required|string', 'basis' => 'required|string', 'chart' => 'required|string', - 'enabled' => 'integer|boolean', ]; } } diff --git a/app/Listeners/Update/V20/Version201.php b/app/Listeners/Update/V20/Version201.php new file mode 100644 index 000000000..fc26a226e --- /dev/null +++ b/app/Listeners/Update/V20/Version201.php @@ -0,0 +1,31 @@ +check($event)) { + return; + } + + // Update database + Artisan::call('migrate', ['--force' => true]); + } +} diff --git a/app/Models/Common/Report.php b/app/Models/Common/Report.php index 1f94f8d92..cf09fa477 100644 --- a/app/Models/Common/Report.php +++ b/app/Models/Common/Report.php @@ -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']; } diff --git a/app/Providers/Event.php b/app/Providers/Event.php index 58261a352..e35acdfb6 100644 --- a/app/Providers/Event.php +++ b/app/Providers/Event.php @@ -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', diff --git a/app/Transformers/Common/Report.php b/app/Transformers/Common/Report.php index f9e38d9d0..f3d28ed16 100644 --- a/app/Transformers/Common/Report.php +++ b/app/Transformers/Common/Report.php @@ -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() : '', ]; diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php index 0f13d178f..f4c5fc7ac 100644 --- a/app/Utilities/Reports.php +++ b/app/Utilities/Reports.php @@ -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), ]; } diff --git a/database/migrations/2019_11_19_000000_drop_enabled_column_reports_table.php b/database/migrations/2019_11_19_000000_drop_enabled_column_reports_table.php new file mode 100644 index 000000000..13b4c3b82 --- /dev/null +++ b/database/migrations/2019_11_19_000000_drop_enabled_column_reports_table.php @@ -0,0 +1,32 @@ +dropColumn('enabled'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('reports', function (Blueprint $table) { + $table->boolean('enabled'); + }); + } +} diff --git a/database/seeds/Reports.php b/database/seeds/Reports.php index c1e09e139..4ef3eb015 100644 --- a/database/seeds/Reports.php +++ b/database/seeds/Reports.php @@ -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, ], ]; diff --git a/resources/views/common/reports/create.blade.php b/resources/views/common/reports/create.blade.php index 57ddd4f1e..6c22578b8 100644 --- a/resources/views/common/reports/create.blade.php +++ b/resources/views/common/reports/create.blade.php @@ -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')) }} diff --git a/resources/views/common/reports/edit.blade.php b/resources/views/common/reports/edit.blade.php index e3b392a06..f71355d4f 100644 --- a/resources/views/common/reports/edit.blade.php +++ b/resources/views/common/reports/edit.blade.php @@ -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')) }} @@ -46,7 +44,7 @@ @push('scripts_start') diff --git a/routes/admin.php b/routes/admin.php index 5558121ba..df58fa116 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -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'); });