Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Add .env var for extensions

Browse Source
This commit is contained in:
David Bomba 2024-03-19 10:46:57 +11:00
parent 136c076623
commit 08eb30785d
46 changed files with 188 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Requests/BankIntegration/UploadBankIntegrationRequest.php
View File

@ -33,15 +33,15 @@ class UploadBankIntegrationRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/BankTransaction/UploadBankTransactionRequest.php
View File

@ -33,15 +33,15 @@ class UploadBankTransactionRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -45,18 +45,18 @@ class StoreClientRequest extends Request
$user = auth()->user();
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
/* Ensure we have a client name, and that all emails are unique*/

8
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -44,15 +44,15 @@ class UpdateClientRequest extends Request
$user = auth()->user();
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
} else {
$rules['documents'] = 'bail|sometimes|array';
}

8
app/Http/Requests/Client/UploadClientRequest.php
View File

@ -33,15 +33,15 @@ class UploadClientRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Company/UploadCompanyRequest.php
View File

@ -30,15 +30,15 @@ class UploadCompanyRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

8
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -47,17 +47,17 @@ class StoreCreditRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
/** @var \App\Models\User $user */

8
app/Http/Requests/Credit/UpdateCreditRequest.php
View File

@ -49,17 +49,17 @@ class UpdateCreditRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['number'] = ['bail', 'sometimes', 'nullable', Rule::unique('credits')->where('company_id', $user->company()->id)->ignore($this->credit->id)];

8
app/Http/Requests/Credit/UploadCreditRequest.php
View File

@ -33,15 +33,15 @@ class UploadCreditRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Expense/UploadExpenseRequest.php
View File

@ -33,15 +33,15 @@ class UploadExpenseRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/GroupSetting/UploadGroupSettingRequest.php
View File

@ -30,15 +30,15 @@ class UploadGroupSettingRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

8
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -44,17 +44,17 @@ class StoreInvoiceRequest extends Request
$user = auth()->user();
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['client_id'] = 'bail|required|exists:clients,id,company_id,'.$user->company()->id.',is_deleted,0';

8
app/Http/Requests/Invoice/UpdateInvoiceRequest.php
View File

@ -46,17 +46,17 @@ class UpdateInvoiceRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
// $rules['id'] = new LockedInvoiceRule($this->invoice);

8
app/Http/Requests/Invoice/UploadInvoiceRequest.php
View File

@ -33,15 +33,15 @@ class UploadInvoiceRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -123,17 +123,17 @@ class StorePaymentRequest extends Request
];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

8
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -52,17 +52,17 @@ class UpdatePaymentRequest extends Request
}
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

8
app/Http/Requests/Payment/UploadPaymentRequest.php
View File

@ -33,15 +33,15 @@ class UploadPaymentRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Product/StoreProductRequest.php
View File

@ -32,17 +32,17 @@ class StoreProductRequest extends Request
public function rules()
{
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['cost'] = 'sometimes|numeric';

8
app/Http/Requests/Product/UpdateProductRequest.php
View File

@ -35,17 +35,17 @@ class UpdateProductRequest extends Request
public function rules()
{
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['cost'] = 'numeric';

8
app/Http/Requests/Product/UploadProductRequest.php
View File

@ -32,15 +32,15 @@ class UploadProductRequest extends Request
{
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Project/StoreProjectRequest.php
View File

@ -51,17 +51,17 @@ class StoreProjectRequest extends Request
}
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $this->globalRules($rules);

8
app/Http/Requests/Project/UpdateProjectRequest.php
View File

@ -48,17 +48,17 @@ class UpdateProjectRequest extends Request
$rules['budgeted_hours'] = 'sometimes|numeric';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $this->globalRules($rules);

8
app/Http/Requests/Project/UploadProjectRequest.php
View File

@ -33,15 +33,15 @@ class UploadProjectRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/PurchaseOrder/StorePurchaseOrderRequest.php
View File

@ -54,17 +54,17 @@ class StorePurchaseOrderRequest extends Request
$rules['line_items'] = 'array';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
} else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['status_id'] = 'nullable|integer|in:1,2,3,4,5';

8
app/Http/Requests/PurchaseOrder/UpdatePurchaseOrderRequest.php
View File

@ -56,17 +56,17 @@ class UpdatePurchaseOrderRequest extends Request
$rules['is_amount_discount'] = ['boolean'];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['status_id'] = 'sometimes|integer|in:1,2,3,4,5';

8
app/Http/Requests/PurchaseOrder/UploadPurchaseOrderRequest.php
View File

@ -33,15 +33,15 @@ class UploadPurchaseOrderRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -46,17 +46,17 @@ class StoreQuoteRequest extends Request
$rules['client_id'] = 'required|exists:clients,id,company_id,'.$user->company()->id;
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['number'] = ['nullable', Rule::unique('quotes')->where('company_id', $user->company()->id)];

8
app/Http/Requests/Quote/UpdateQuoteRequest.php
View File

@ -43,17 +43,17 @@ class UpdateQuoteRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}

8
app/Http/Requests/Quote/UploadQuoteRequest.php
View File

@ -33,15 +33,15 @@ class UploadQuoteRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/RecurringExpense/StoreRecurringExpenseRequest.php
View File

@ -57,15 +57,15 @@ class StoreRecurringExpenseRequest extends Request
$rules['currency_id'] = 'bail|required|integer|exists:currencies,id';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $this->globalRules($rules);

8
app/Http/Requests/RecurringExpense/UpdateRecurringExpenseRequest.php
View File

@ -49,15 +49,15 @@ class UpdateRecurringExpenseRequest extends Request
$rules['category_id'] = 'bail|nullable|sometimes|exists:expense_categories,id,company_id,'.auth()->user()->company()->id.',is_deleted,0';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $this->globalRules($rules);

8
app/Http/Requests/RecurringExpense/UploadRecurringExpenseRequest.php
View File

@ -30,15 +30,15 @@ class UploadRecurringExpenseRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

8
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -46,17 +46,17 @@ class StoreRecurringInvoiceRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['client_id'] = 'required|exists:clients,id,company_id,'.$user->company()->id;

8
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -45,17 +45,17 @@ class UpdateRecurringInvoiceRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['number'] = ['bail', 'sometimes', Rule::unique('recurring_invoices')->where('company_id', $user->company()->id)->ignore($this->recurring_invoice->id)];

8
app/Http/Requests/RecurringInvoice/UploadRecurringInvoiceRequest.php
View File

@ -33,15 +33,15 @@ class UploadRecurringInvoiceRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
View File

@ -46,15 +46,15 @@ class StoreRecurringQuoteRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['client_id'] = 'required|exists:clients,id,company_id,'.$user->company()->id;

8
app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
View File

@ -38,15 +38,15 @@ class UpdateRecurringQuoteRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
if ($this->number) {

8
app/Http/Requests/RecurringQuote/UploadRecurringQuoteRequest.php
View File

@ -30,15 +30,15 @@ class UploadRecurringQuoteRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $rules;

11
app/Http/Requests/Request.php
View File

@ -20,7 +20,7 @@ class Request extends FormRequest
use MakesHash;
use RuntimeFormRequest;
protected $file_validation = 'sometimes|file|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml,zip,csv,ods,odt,odp|max:100000';
protected $file_validation = 'sometimes|file|max:100000|mimes:png,ai,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx,webp,xml,zip,csv,ods,odt,odp';
/**
* Get the validation rules that apply to the request.
*
@ -31,6 +31,15 @@ class Request extends FormRequest
return [];
}
public function fileValidation()
{
if(config('ninja.upload_extensions'))
return $this->file_validation. ",".config('ninja.upload_extensions');
return $this->file_validation;
}
public function globalRules($rules)
{
$merge_rules = [];

8
app/Http/Requests/Task/StoreTaskRequest.php
View File

@ -79,17 +79,17 @@ class StoreTaskRequest extends Request
}];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}

8
app/Http/Requests/Task/UpdateTaskRequest.php
View File

@ -85,17 +85,17 @@ class UpdateTaskRequest extends Request
}];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
return $this->globalRules($rules);

8
app/Http/Requests/Task/UploadTaskRequest.php
View File

@ -33,15 +33,15 @@ class UploadTaskRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

8
app/Http/Requests/Vendor/StoreVendorRequest.php vendored
View File

@ -61,17 +61,17 @@ class StoreVendorRequest extends Request
$rules['currency_id'] = 'bail|required|exists:currencies,id';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['language_id'] = 'bail|nullable|sometimes|exists:languages,id';

8
app/Http/Requests/Vendor/UpdateVendorRequest.php vendored
View File

@ -62,17 +62,17 @@ class UpdateVendorRequest extends Request
$rules['currency_id'] = 'bail|sometimes|exists:currencies,id';
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}else {
$rules['documents'] = 'bail|sometimes|array';
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['language_id'] = 'bail|nullable|sometimes|exists:languages,id';

8
app/Http/Requests/Vendor/UploadVendorRequest.php vendored
View File

@ -30,15 +30,15 @@ class UploadVendorRequest extends Request
$rules = [];
if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->file_validation;
$rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) {
$rules['documents'] = $this->file_validation;
$rules['documents'] = $this->fileValidation();
}
if ($this->file('file') && is_array($this->file('file'))) {
$rules['file.*'] = $this->file_validation;
$rules['file.*'] = $this->fileValidation();
} elseif ($this->file('file')) {
$rules['file'] = $this->file_validation;
$rules['file'] = $this->fileValidation();
}
$rules['is_public'] = 'sometimes|boolean';

2
config/ninja.php
View File

@ -244,4 +244,6 @@ return [
'public_key' => env('NINJA_PUBLIC_KEY', false),
'private_key' => env('NINJA_PRIVATE_KEY', false),
],
'upload_extensions' => env('ADDITIONAL_UPLOAD_EXTENSIONS', false),
];