Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 00:44:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2021-05-31 08:17:42 +10:00
parent 0f63113181
commit 6dc3668ff6
3 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -245,8 +245,8 @@ class CompanySettings extends BaseSettings
public $hide_paid_to_date = false; //@TODO where? public $hide_paid_to_date = false; //@TODO where?
public $embed_documents = false; //@TODO where? public $embed_documents = false; //@TODO where?
public $all_pages_header = false; //@implemented public $all_pages_header = false; //@deprecated 31-05-2021
public $all_pages_footer = false; //@implemented public $all_pages_footer = false; //@deprecated 31-05-2021
public $pdf_variables = ''; //@implemented public $pdf_variables = ''; //@implemented
public $portal_custom_head = ''; //@TODO @BEN public $portal_custom_head = ''; //@TODO @BEN

4
app/Http/Controllers/ImportJsonController.php
View File

@ -11,7 +11,7 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Http\Requests\Export\StoreExportRequest; use App\Http\Requests\Import\ImportJsonRequest;
use App\Jobs\Company\CompanyExport; use App\Jobs\Company\CompanyExport;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Http\Response; 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()); // CompanyExport::dispatch(auth()->user()->getCompany(), auth()->user());

39
app/Http/Requests/Import/ImportJsonRequest.php Normal file
View File

@ -0,0 +1,39 @@
<?php
/**
* Invoice Ninja (https://invoiceninja.com).
*
* @link https://github.com/invoiceninja/invoiceninja source repository
*
* @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
*
* @license https://opensource.org/licenses/AAL
*/
namespace App\Http\Requests\Import;
use App\Http\Requests\Request;
class ImportJsonRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize() : bool
{
return auth()->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',
];
}
}