Setup pint & run code style fix

This commit is contained in:
gdarko
2024-01-29 04:46:01 -06:00
parent 8de34efd8c
commit 4ab92473e9
406 changed files with 1616 additions and 2026 deletions

View File

@@ -2,8 +2,8 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Rules\Base64Mime;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Rules\Base64Mime;
class AvatarRequest extends FormRequest
{
@@ -29,12 +29,12 @@ class AvatarRequest extends FormRequest
'nullable',
'file',
'mimes:gif,jpg,png',
'max:20000'
'max:20000',
],
'avatar' => [
'nullable',
new Base64Mime(['gif', 'jpg', 'png'])
]
new Base64Mime(['gif', 'jpg', 'png']),
],
];
}
}

View File

@@ -25,15 +25,15 @@ class BulkExchangeRateRequest extends FormRequest
{
return [
'currencies' => [
'required'
'required',
],
'currencies.*.id' => [
'required',
'numeric'
'numeric',
],
'currencies.*.exchange_rate' => [
'required'
]
'required',
],
];
}
}

View File

@@ -29,10 +29,10 @@ class CompaniesRequest extends FormRequest
'name' => [
'required',
Rule::unique('companies'),
'string'
'string',
],
'currency' => [
'required'
'required',
],
'address.name' => [
'nullable',
@@ -68,11 +68,11 @@ class CompaniesRequest extends FormRequest
{
return collect($this->validated())
->only([
'name'
'name',
])
->merge([
'owner_id' => $this->user()->id,
'slug' => Str::slug($this->name)
'slug' => Str::slug($this->name),
])
->toArray();
}

View File

@@ -2,8 +2,8 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Rules\Base64Mime;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Rules\Base64Mime;
class CompanyLogoRequest extends FormRequest
{
@@ -27,8 +27,8 @@ class CompanyLogoRequest extends FormRequest
return [
'company_logo' => [
'nullable',
new Base64Mime(['gif', 'jpg', 'png'])
]
new Base64Mime(['gif', 'jpg', 'png']),
],
];
}
}

View File

@@ -30,7 +30,7 @@ class CompanyRequest extends FormRequest
Rule::unique('companies')->ignore($this->header('company'), 'id'),
],
'slug' => [
'nullable'
'nullable',
],
'address.country_id' => [
'required',
@@ -43,7 +43,7 @@ class CompanyRequest extends FormRequest
return collect($this->validated())
->only([
'name',
'slug'
'slug',
])
->toArray();
}

View File

@@ -26,12 +26,12 @@ class CustomerLoginRequest extends FormRequest
return [
'email' => [
'required',
'string'
'string',
],
'password' => [
'required',
'string'
]
'string',
],
];
}
}

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests\Customer;
use InvoiceShelf\Models\Address;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\Address;
class CustomerProfileRequest extends FormRequest
{
@@ -97,8 +97,8 @@ class CustomerProfileRequest extends FormRequest
'nullable',
'file',
'mimes:gif,jpg,png',
'max:20000'
]
'max:20000',
],
];
}
@@ -106,7 +106,7 @@ class CustomerProfileRequest extends FormRequest
{
return collect($this->shipping)
->merge([
'type' => Address::SHIPPING_TYPE
'type' => Address::SHIPPING_TYPE,
])
->toArray();
}
@@ -115,7 +115,7 @@ class CustomerProfileRequest extends FormRequest
{
return collect($this->billing)
->merge([
'type' => Address::BILLING_TYPE
'type' => Address::BILLING_TYPE,
])
->toArray();
}

View File

@@ -27,7 +27,7 @@ class CustomerEstimateStatusRequest extends FormRequest
'status' => [
'required',
'in:ACCEPTED,REJECTED',
]
],
];
}
}

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\Address;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Arr;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\Address;
class CustomerRequest extends FormRequest
{
@@ -33,7 +33,7 @@ class CustomerRequest extends FormRequest
'email' => [
'email',
'nullable',
Rule::unique('customers')->where('company_id', $this->header('company'))
Rule::unique('customers')->where('company_id', $this->header('company')),
],
'password' => [
'nullable',
@@ -55,7 +55,7 @@ class CustomerRequest extends FormRequest
],
'enable_portal' => [
'boolean'
'boolean',
],
'currency_id' => [
'nullable',
@@ -113,7 +113,7 @@ class CustomerRequest extends FormRequest
],
'shipping.fax' => [
'nullable',
]
],
];
if ($this->isMethod('PUT') && $this->email != null) {
@@ -122,7 +122,7 @@ class CustomerRequest extends FormRequest
'nullable',
Rule::unique('customers')->where('company_id', $this->header('company'))->ignore($this->route('customer')->id),
];
};
}
return $rules;
}
@@ -156,7 +156,7 @@ class CustomerRequest extends FormRequest
{
return collect($this->shipping)
->merge([
'type' => Address::SHIPPING_TYPE
'type' => Address::SHIPPING_TYPE,
])
->toArray();
}
@@ -165,7 +165,7 @@ class CustomerRequest extends FormRequest
{
return collect($this->billing)
->merge([
'type' => Address::BILLING_TYPE
'type' => Address::BILLING_TYPE,
])
->toArray();
}

View File

@@ -69,7 +69,7 @@ class DatabaseEnvironmentRequest extends FormRequest
],
];
break;
break;
}
}

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\Invoice;
use InvoiceShelf\Rules\RelationNotExist;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\Invoice;
use InvoiceShelf\Rules\RelationNotExist;
class DeleteInvoiceRequest extends FormRequest
{

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\Item;
use InvoiceShelf\Rules\RelationNotExist;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\Item;
use InvoiceShelf\Rules\RelationNotExist;
class DeleteItemsRequest extends FormRequest
{

View File

@@ -2,11 +2,11 @@
namespace InvoiceShelf\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\CompanySetting;
use InvoiceShelf\Models\Customer;
use InvoiceShelf\Models\Estimate;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class EstimatesRequest extends FormRequest
{
@@ -39,10 +39,10 @@ class EstimatesRequest extends FormRequest
],
'estimate_number' => [
'required',
Rule::unique('estimates')->where('company_id', $this->header('company'))
Rule::unique('estimates')->where('company_id', $this->header('company')),
],
'exchange_rate' => [
'nullable'
'nullable',
],
'discount' => [
'required',
@@ -60,7 +60,7 @@ class EstimatesRequest extends FormRequest
'required',
],
'template_name' => [
'required'
'required',
],
'items' => [
'required',
@@ -89,11 +89,11 @@ class EstimatesRequest extends FormRequest
$customer = Customer::find($this->customer_id);
if ($companyCurrency && $customer) {
if ((string)$customer->currency_id !== $companyCurrency) {
if ((string) $customer->currency_id !== $companyCurrency) {
$rules['exchange_rate'] = [
'required',
];
};
}
}
if ($this->isMethod('PUT')) {

View File

@@ -2,8 +2,8 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\CompanySetting;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Models\CompanySetting;
class ExchangeRateLogRequest extends FormRequest
{
@@ -29,8 +29,8 @@ class ExchangeRateLogRequest extends FormRequest
'required',
],
'currency_id' => [
'required'
]
'required',
],
];
}

View File

@@ -25,7 +25,7 @@ class ExchangeRateProviderRequest extends FormRequest
{
$rules = [
'driver' => [
'required'
'required',
],
'key' => [
'required',
@@ -37,11 +37,11 @@ class ExchangeRateProviderRequest extends FormRequest
'nullable',
],
'driver_config' => [
'nullable'
'nullable',
],
'active' => [
'nullable',
'boolean'
'boolean',
],
];
@@ -52,7 +52,7 @@ class ExchangeRateProviderRequest extends FormRequest
{
return collect($this->validated())
->merge([
'company_id' => $this->header('company')
'company_id' => $this->header('company'),
])
->toArray();
}

View File

@@ -37,7 +37,7 @@ class ExpenseCategoryRequest extends FormRequest
{
return collect($this->validated())
->merge([
'company_id' => $this->header('company')
'company_id' => $this->header('company'),
])
->toArray();
}

View File

@@ -2,8 +2,8 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\CompanySetting;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Models\CompanySetting;
class ExpenseRequest extends FormRequest
{
@@ -34,7 +34,7 @@ class ExpenseRequest extends FormRequest
'required',
],
'exchange_rate' => [
'nullable'
'nullable',
],
'payment_method_id' => [
'nullable',
@@ -49,14 +49,14 @@ class ExpenseRequest extends FormRequest
'nullable',
],
'currency_id' => [
'required'
'required',
],
'attachment_receipt' => [
'nullable',
'file',
'mimes:jpg,png,pdf,doc,docx,xls,xlsx,ppt,pptx',
'max:20000'
]
'max:20000',
],
];
if ($companyCurrency && $this->currency_id) {
@@ -64,7 +64,7 @@ class ExpenseRequest extends FormRequest
$rules['exchange_rate'] = [
'required',
];
};
}
}
return $rules;
@@ -82,7 +82,7 @@ class ExpenseRequest extends FormRequest
'company_id' => $this->header('company'),
'exchange_rate' => $exchange_rate,
'base_amount' => $this->amount * $exchange_rate,
'currency_id' => $current_currency
'currency_id' => $current_currency,
])
->toArray();
}

View File

@@ -26,8 +26,8 @@ class GetSettingRequest extends FormRequest
return [
'key' => [
'required',
'string'
]
'string',
],
];
}
}

View File

@@ -2,11 +2,11 @@
namespace InvoiceShelf\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\CompanySetting;
use InvoiceShelf\Models\Customer;
use InvoiceShelf\Models\Invoice;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class InvoicesRequest extends FormRequest
{
@@ -39,10 +39,10 @@ class InvoicesRequest extends FormRequest
],
'invoice_number' => [
'required',
Rule::unique('invoices')->where('company_id', $this->header('company'))
Rule::unique('invoices')->where('company_id', $this->header('company')),
],
'exchange_rate' => [
'nullable'
'nullable',
],
'discount' => [
'required',
@@ -60,7 +60,7 @@ class InvoicesRequest extends FormRequest
'required',
],
'template_name' => [
'required'
'required',
],
'items' => [
'required',
@@ -89,11 +89,11 @@ class InvoicesRequest extends FormRequest
$customer = Customer::find($this->customer_id);
if ($customer && $companyCurrency) {
if ((string)$customer->currency_id !== $companyCurrency) {
if ((string) $customer->currency_id !== $companyCurrency) {
$rules['exchange_rate'] = [
'required',
];
};
}
}
if ($this->isMethod('PUT')) {

View File

@@ -31,7 +31,7 @@ class LoginRequest extends FormRequest
'required',
],
'device_name' => [
'required'
'required',
],
];
}

View File

@@ -26,16 +26,16 @@ class NotesRequest extends FormRequest
{
$rules = [
'type' => [
'required'
'required',
],
'name' => [
'required',
Rule::unique('notes')
->where('company_id', $this->header('company'))
->where('type', $this->type)
->where('type', $this->type),
],
'notes' => [
'required'
'required',
],
];
@@ -45,7 +45,7 @@ class NotesRequest extends FormRequest
Rule::unique('notes')
->ignore($this->route('note')->id)
->where('type', $this->type)
->where('company_id', $this->header('company'))
->where('company_id', $this->header('company')),
];
}
@@ -56,7 +56,7 @@ class NotesRequest extends FormRequest
{
return collect($this->validated())
->merge([
'company_id' => $this->header('company')
'company_id' => $this->header('company'),
])
->toArray();
}

View File

@@ -2,9 +2,9 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\PaymentMethod;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\PaymentMethod;
class PaymentMethodRequest extends FormRequest
{

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\CompanySetting;
use InvoiceShelf\Models\Customer;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\CompanySetting;
use InvoiceShelf\Models\Customer;
class PaymentRequest extends FormRequest
{
@@ -34,14 +34,14 @@ class PaymentRequest extends FormRequest
'required',
],
'exchange_rate' => [
'nullable'
'nullable',
],
'amount' => [
'required',
],
'payment_number' => [
'required',
Rule::unique('payments')->where('company_id', $this->header('company'))
Rule::unique('payments')->where('company_id', $this->header('company')),
],
'invoice_id' => [
'nullable',
@@ -68,11 +68,11 @@ class PaymentRequest extends FormRequest
$customer = Customer::find($this->customer_id);
if ($customer && $companyCurrency) {
if ((string)$customer->currency_id !== $companyCurrency) {
if ((string) $customer->currency_id !== $companyCurrency) {
$rules['exchange_rate'] = [
'required',
];
};
}
}
return $rules;
@@ -91,7 +91,7 @@ class PaymentRequest extends FormRequest
'company_id' => $this->header('company'),
'exchange_rate' => $exchange_rate,
'base_amount' => $this->amount * $exchange_rate,
'currency_id' => $currency
'currency_id' => $currency,
])
->toArray();
}

View File

@@ -2,10 +2,10 @@
namespace InvoiceShelf\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Models\CompanySetting;
use InvoiceShelf\Models\Customer;
use InvoiceShelf\Models\RecurringInvoice;
use Illuminate\Foundation\Http\FormRequest;
class RecurringInvoiceRequest extends FormRequest
{
@@ -30,17 +30,17 @@ class RecurringInvoiceRequest extends FormRequest
$rules = [
'starts_at' => [
'required'
'required',
],
'send_automatically' => [
'required',
'boolean'
'boolean',
],
'customer_id' => [
'required'
'required',
],
'exchange_rate' => [
'nullable'
'nullable',
],
'discount' => [
'required',
@@ -58,16 +58,16 @@ class RecurringInvoiceRequest extends FormRequest
'required',
],
'status' => [
'required'
'required',
],
'exchange_rate' => [
'nullable'
'nullable',
],
'frequency' => [
'required'
'required',
],
'limit_by' => [
'required'
'required',
],
'limit_count' => [
'required_if:limit_by,COUNT',
@@ -76,24 +76,24 @@ class RecurringInvoiceRequest extends FormRequest
'required_if:limit_by,DATE',
],
'items' => [
'required'
'required',
],
'items.*' => [
'required'
]
'required',
],
];
$customer = Customer::find($this->customer_id);
if ($customer && $companyCurrency) {
if ((string)$customer->currency_id !== $companyCurrency) {
if ((string) $customer->currency_id !== $companyCurrency) {
$rules['exchange_rate'] = [
'required',
];
};
}
}
return $rules;
return $rules;
}
public function getRecurringInvoicePayload()
@@ -114,7 +114,7 @@ class RecurringInvoiceRequest extends FormRequest
'discount_per_item' => CompanySetting::getSetting('discount_per_item', $this->header('company')) ?? 'NO',
'due_amount' => $this->total,
'exchange_rate' => $exchange_rate,
'currency_id' => $currency
'currency_id' => $currency,
])
->toArray();
}

View File

@@ -28,14 +28,14 @@ class RoleRequest extends FormRequest
'name' => [
'required',
'string',
Rule::unique('roles')->where('scope', $this->header('company'))
Rule::unique('roles')->where('scope', $this->header('company')),
],
'abilities' => [
'required'
'required',
],
'abilities.*' => [
'required'
]
'required',
],
];
if ($this->getMethod() == 'PUT') {
@@ -44,7 +44,7 @@ class RoleRequest extends FormRequest
'string',
Rule::unique('roles')
->ignore($this->route('role')->id, 'id')
->where('scope', $this->header('company'))
->where('scope', $this->header('company')),
];
}

View File

@@ -2,9 +2,9 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Models\TaxType;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
use InvoiceShelf\Models\TaxType;
class TaxTypeRequest extends FormRequest
{
@@ -29,8 +29,8 @@ class TaxTypeRequest extends FormRequest
'name' => [
'required',
Rule::unique('tax_types')
->where('type', TaxType::TYPE_GENERAL)
->where('company_id', $this->header('company'))
->where('type', TaxType::TYPE_GENERAL)
->where('company_id', $this->header('company')),
],
'percent' => [
'required',
@@ -52,7 +52,7 @@ class TaxTypeRequest extends FormRequest
Rule::unique('tax_types')
->ignore($this->route('tax_type')->id)
->where('type', TaxType::TYPE_GENERAL)
->where('company_id', $this->header('company'))
->where('company_id', $this->header('company')),
];
}
@@ -64,7 +64,7 @@ class TaxTypeRequest extends FormRequest
return collect($this->validated())
->merge([
'company_id' => $this->header('company'),
'type' => TaxType::TYPE_GENERAL
'type' => TaxType::TYPE_GENERAL,
])
->toArray();
}

View File

@@ -48,7 +48,7 @@ class UnitRequest extends FormRequest
{
return collect($this->validated())
->merge([
'company_id' => $this->header('company')
'company_id' => $this->header('company'),
])
->toArray();
}

View File

@@ -26,12 +26,12 @@ class UnzipUpdateRequest extends FormRequest
return [
'path' => [
'required',
'regex:/^[\.\/\w\-]+$/'
'regex:/^[\.\/\w\-]+$/',
],
'module' => [
'required',
'string'
]
'string',
],
];
}
}

View File

@@ -2,8 +2,8 @@
namespace InvoiceShelf\Http\Requests;
use InvoiceShelf\Rules\Base64Mime;
use Illuminate\Foundation\Http\FormRequest;
use InvoiceShelf\Rules\Base64Mime;
class UploadExpenseReceiptRequest extends FormRequest
{
@@ -27,8 +27,8 @@ class UploadExpenseReceiptRequest extends FormRequest
return [
'attachment_receipt' => [
'nullable',
new Base64Mime(['gif', 'jpg', 'png'])
]
new Base64Mime(['gif', 'jpg', 'png']),
],
];
}
}

View File

@@ -28,13 +28,13 @@ class UploadModuleRequest extends FormRequest
'required',
'file',
'mimes:zip',
'max:20000'
'max:20000',
],
'module' => [
'required',
'string',
'max:100'
]
'max:100',
],
];
}
}