diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index f7d4240719fb..1c9bf0c1cbdf 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -245,8 +245,8 @@ class CompanySettings extends BaseSettings public $hide_paid_to_date = false; //@TODO where? public $embed_documents = false; //@TODO where? - public $all_pages_header = false; //@implemented - public $all_pages_footer = false; //@implemented + public $all_pages_header = false; //@deprecated 31-05-2021 + public $all_pages_footer = false; //@deprecated 31-05-2021 public $pdf_variables = ''; //@implemented public $portal_custom_head = ''; //@TODO @BEN diff --git a/app/Http/Controllers/ImportJsonController.php b/app/Http/Controllers/ImportJsonController.php index 5a95fa23a813..a3ab46344900 100644 --- a/app/Http/Controllers/ImportJsonController.php +++ b/app/Http/Controllers/ImportJsonController.php @@ -11,7 +11,7 @@ namespace App\Http\Controllers; -use App\Http\Requests\Export\StoreExportRequest; +use App\Http\Requests\Import\ImportJsonRequest; use App\Jobs\Company\CompanyExport; use App\Utils\Traits\MakesHash; use Illuminate\Http\Response; @@ -53,7 +53,7 @@ class ImportJsonController extends BaseController * ), * ) */ - public function index(StoreExportRequest $request) + public function index(ImportJsonRequest $request) { // CompanyExport::dispatch(auth()->user()->getCompany(), auth()->user()); diff --git a/app/Http/Requests/Import/ImportJsonRequest.php b/app/Http/Requests/Import/ImportJsonRequest.php new file mode 100644 index 000000000000..732ee2a18880 --- /dev/null +++ b/app/Http/Requests/Import/ImportJsonRequest.php @@ -0,0 +1,39 @@ +user()->isAdmin(); + } + + public function rules() + { + return [ + // 'import_type' => 'required', + // 'files' => 'required_without:hash|array|min:1|max:6', + // 'hash' => 'nullable|string', + // 'column_map' => 'required_with:hash|array', + // 'skip_header' => 'required_with:hash|boolean', + // 'files.*' => 'file|mimes:csv,txt', + ]; + } +}