v2 first commit

This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions

View File

@ -0,0 +1,31 @@
<?php
namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;
class Login extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'email' => 'required|email',
'password' => 'required',
];
}
}

View File

@ -25,7 +25,7 @@ class Permission extends FormRequest
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->permission->getAttribute('id');
$id = is_numeric($this->permission) ? $this->permission : $this->permission->getAttribute('id');
} else {
$id = null;
}

View File

@ -25,7 +25,7 @@ class Role extends FormRequest
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->role->getAttribute('id');
$id = is_numeric($this->role) ? $this->role : $this->role->getAttribute('id');
} else {
$id = null;
}

View File

@ -23,9 +23,15 @@ class User extends FormRequest
*/
public function rules()
{
$picture = 'nullable';
if ($this->request->get('picture', null)) {
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->user->getAttribute('id');
$id = is_numeric($this->user) ? $this->user : $this->user->getAttribute('id');
$required = '';
} else {
$id = null;
@ -38,7 +44,7 @@ class User extends FormRequest
'password' => $required . 'confirmed',
'companies' => 'required',
'roles' => 'required',
'picture' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'picture' => $picture,
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Banking;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Account extends Request
class Account extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Banking;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Reconciliation extends Request
class Reconciliation extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Banking;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class ReconciliationCalculate extends Request
class ReconciliationCalculate extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -1,11 +1,11 @@
<?php
namespace App\Http\Requests\Expense;
namespace App\Http\Requests\Banking;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
use Date;
class Payment extends Request
class Transaction extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -24,16 +24,24 @@ class Payment extends Request
*/
public function rules()
{
$attachment = 'nullable';
if ($this->request->get('attachment', null)) {
$attachment = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
return [
'type' => 'required|string',
'account_id' => 'required|integer',
'paid_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required|amount',
'currency_code' => 'required|string|currency',
'currency_rate' => 'required',
'vendor_id' => 'nullable|integer',
'document_id' => 'nullable|integer',
'contact_id' => 'nullable|integer',
'category_id' => 'required|integer',
'payment_method' => 'required|string',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'attachment' => $attachment,
];
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Banking;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Transfer extends Request
class Transfer extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -0,0 +1,31 @@
<?php
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
class BulkAction extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'handle' => 'required|string',
'selected' => 'required',
];
}
}

View File

@ -23,12 +23,18 @@ class Company extends FormRequest
*/
public function rules()
{
$logo = 'nullable';
if ($this->request->get('logo', null)) {
$logo = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
return [
'domain' => 'required|string',
'company_name' => 'required|string',
'company_email' => 'required|email',
'company_logo' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'default_currency' => 'required|string',
'name' => 'required|string',
'email' => 'required|email',
'currency' => 'required|string',
'domain' => 'nullable|string',
'logo' => $logo,
];
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Requests\Income;
namespace App\Http\Requests\Common;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Customer extends Request
class Contact extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -23,15 +23,16 @@ class Customer extends Request
*/
public function rules()
{
$email = '';
$required = '';
// Get company id
$type = $this->request->get('type', 'customer');
$company_id = $this->request->get('company_id');
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->customer->getAttribute('id');
$id = is_numeric($this->$type) ? $this->$type : $this->$type->getAttribute('id');
} else {
$id = null;
}
@ -41,13 +42,14 @@ class Customer extends Request
}
if (!empty($this->request->get('email'))) {
$email = 'email|unique:customers,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL';
$email = 'email|unique:contacts,NULL,' . $id . ',id,company_id,' . $company_id . ',type,' . $type . ',deleted_at,NULL';
}
return [
'user_id' => 'nullable|integer',
'type' => 'required|string',
'name' => 'required|string',
'email' => $email,
'user_id' => 'integer|nullable',
'currency_code' => 'required|string|currency',
'password' => $required . 'confirmed',
'enabled' => 'integer|boolean',

View File

@ -0,0 +1,31 @@
<?php
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
class Dashboard extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => 'required|string',
//'enabled' => 'integer|boolean',
];
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Requests\Customer;
namespace App\Http\Requests\Common;
use App\Http\Requests\Request;
use Illuminate\Foundation\Http\FormRequest;
class InvoiceConfirm extends Request
class Import extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -24,7 +24,7 @@ class InvoiceConfirm extends Request
public function rules()
{
return [
'payment_method' => 'required|string',
'import' => 'required|file',
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Common;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Item extends Request
class Item extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -23,26 +23,20 @@ class Item extends Request
*/
public function rules()
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->item->getAttribute('id');
} else {
$id = null;
}
$picture = 'nullable';
// Get company id
$company_id = $this->request->get('company_id');
if ($this->request->get('picture', null)) {
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
return [
'name' => 'required|string',
'sku' => 'required|string|unique:items,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'sale_price' => 'required',
'purchase_price' => 'required',
'quantity' => 'required|integer',
'tax_id' => 'nullable|integer',
'category_id' => 'nullable|integer',
'enabled' => 'integer|boolean',
'picture' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'picture' => $picture,
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Common;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Notification extends Request
class Notification extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -0,0 +1,28 @@
<?php
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
class Report extends FormRequest
{
public function authorize()
{
return true;
}
public function rules()
{
return [
'name' => 'required|string',
'description' => 'required|string',
'class' => 'required|string',
'group' => 'required|string',
'period' => 'required|string',
'basis' => 'required|string',
'chart' => 'required|string',
'enabled' => 'integer|boolean',
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Common;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class TotalItem extends Request
class TotalItem extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -24,19 +24,19 @@ class TotalItem extends Request
public function rules()
{
return [
'item.*.quantity' => 'required',
'item.*.price' => 'required|amount',
'item.*.currency' => 'required|string|currency',
'items.*.quantity' => 'required',
'items.*.price' => 'required|amount',
'items.*.currency' => 'required|string|currency',
];
}
public function messages()
{
return [
'item.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.quantity'))]),
'item.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.price'))]),
'item.*.currency.required' => trans('validation.custom.invalid_currency'),
'item.*.currency.string' => trans('validation.custom.invalid_currency'),
'items.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.quantity'))]),
'items.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.price'))]),
'items.*.currency.required' => trans('validation.custom.invalid_currency'),
'items.*.currency.string' => trans('validation.custom.invalid_currency'),
];
}
}

View File

@ -0,0 +1,28 @@
<?php
namespace App\Http\Requests\Common;
use App\Abstracts\Http\FormRequest;
class Widget extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [];
}
}

View File

@ -2,10 +2,10 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
use Date;
class Bill extends Request
class Bill extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -26,11 +26,17 @@ class Bill extends Request
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->bill->getAttribute('id');
$id = is_numeric($this->bill) ? $this->bill : $this->bill->getAttribute('id');
} else {
$id = null;
}
$attachment = 'nullable';
if ($this->request->get('attachment', null)) {
$attachment = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
// Get company id
$company_id = $this->request->get('company_id');
@ -40,16 +46,16 @@ class Bill extends Request
'billed_at' => 'required|date_format:Y-m-d H:i:s',
'due_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required',
'item.*.name' => 'required|string',
'item.*.quantity' => 'required',
'item.*.price' => 'required|amount',
'item.*.currency' => 'required|string|currency',
'items.*.name' => 'required|string',
'items.*.quantity' => 'required',
'items.*.price' => 'required|amount',
'items.*.currency' => 'required|string|currency',
'currency_code' => 'required|string|currency',
'currency_rate' => 'required',
'vendor_id' => 'required|integer',
'vendor_name' => 'required|string',
'contact_id' => 'required|integer',
'contact_name' => 'required|string',
'category_id' => 'required|integer',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'attachment' => $attachment,
];
}
@ -68,11 +74,11 @@ class Bill extends Request
public function messages()
{
return [
'item.*.name.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('general.name'))]),
'item.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('bills.quantity'))]),
'item.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('bills.price'))]),
'item.*.currency.required' => trans('validation.custom.invalid_currency'),
'item.*.currency.string' => trans('validation.custom.invalid_currency'),
'items.*.name.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('general.name'))]),
'items.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('bills.quantity'))]),
'items.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('bills.price'))]),
'items.*.currency.required' => trans('validation.custom.invalid_currency'),
'items.*.currency.string' => trans('validation.custom.invalid_currency'),
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class BillAddItem extends Request
class BillAddItem extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class BillHistory extends Request
class BillHistory extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class BillItem extends Request
class BillItem extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -1,45 +0,0 @@
<?php
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use Date;
class BillPayment extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'account_id' => 'required|integer',
'paid_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required|amount',
'currency_code' => 'required|string|currency',
'payment_method' => 'required|string',
'attachment' => 'mimes:' . setting('general.file_types', 'pdf,jpeg,jpg,png'),
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class BillTotal extends Request
class BillTotal extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -1,50 +0,0 @@
<?php
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
class Vendor extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$email = '';
// Get company id
$company_id = $this->request->get('company_id');
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->vendor->getAttribute('id');
} else {
$id = null;
}
if (!empty($this->request->get('email'))) {
$email = 'email|unique:vendors,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL';
}
return [
'user_id' => 'nullable|integer',
'name' => 'required|string',
'email' => $email,
'currency_code' => 'required|string|currency',
'enabled' => 'integer|boolean',
];
}
}

View File

@ -2,10 +2,10 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
use Date;
class Invoice extends Request
class Invoice extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -26,13 +26,19 @@ class Invoice extends Request
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->invoice->getAttribute('id');
$id = is_numeric($this->invoice) ? $this->invoice : $this->invoice->getAttribute('id');
} else {
$id = null;
}
$attachment = 'nullable';
if ($this->request->get('attachment', null)) {
$attachment = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
// Get company id
$company_id = $this->request->get('company_id');
$company_id = $this->request->get('company_id', 1);
return [
'invoice_number' => 'required|string|unique:invoices,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
@ -40,16 +46,16 @@ class Invoice extends Request
'invoiced_at' => 'required|date_format:Y-m-d H:i:s',
'due_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required',
'item.*.name' => 'required|string',
'item.*.quantity' => 'required',
'item.*.price' => 'required|amount',
'item.*.currency' => 'required|string|currency',
'items.*.name' => 'required|string',
'items.*.quantity' => 'required',
'items.*.price' => 'required|amount',
'items.*.currency' => 'required|string|currency',
'currency_code' => 'required|string|currency',
'currency_rate' => 'required',
'customer_id' => 'required|integer',
'customer_name' => 'required|string',
'contact_id' => 'required|integer',
'contact_name' => 'required|string',
'category_id' => 'required|integer',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'attachment' => $attachment,
];
}
@ -68,11 +74,11 @@ class Invoice extends Request
public function messages()
{
return [
'item.*.name.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('general.name'))]),
'item.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.quantity'))]),
'item.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.price'))]),
'item.*.currency.required' => trans('validation.custom.invalid_currency'),
'item.*.currency.string' => trans('validation.custom.invalid_currency'),
'items.*.name.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('general.name'))]),
'items.*.quantity.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.quantity'))]),
'items.*.price.required' => trans('validation.required', ['attribute' => mb_strtolower(trans('invoices.price'))]),
'items.*.currency.required' => trans('validation.custom.invalid_currency'),
'items.*.currency.string' => trans('validation.custom.invalid_currency'),
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class InvoiceAddItem extends Request
class InvoiceAddItem extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class InvoiceHistory extends Request
class InvoiceHistory extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class InvoiceItem extends Request
class InvoiceItem extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -1,45 +0,0 @@
<?php
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use Date;
class InvoicePayment extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'account_id' => 'required|integer',
'paid_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required|amount',
'currency_code' => 'required|string|currency',
'payment_method' => 'required|string',
'attachment' => 'mimes:jpeg,jpg,png,pdf',
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class InvoiceTotal extends Request
class InvoiceTotal extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -1,48 +0,0 @@
<?php
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
use Date;
class Revenue extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'account_id' => 'required|integer',
'paid_at' => 'required|date_format:Y-m-d H:i:s',
'amount' => 'required|amount',
'currency_code' => 'required|string|currency',
'currency_rate' => 'required',
'customer_id' => 'nullable|integer',
'category_id' => 'required|integer',
'payment_method' => 'required|string',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];
}
public function withValidator($validator)
{
if ($validator->errors()->count()) {
$paid_at = Date::parse($this->request->get('paid_at'))->format('Y-m-d');
$this->request->set('paid_at', $paid_at);
}
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Install;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Database extends Request
class Database extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Install;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Setting extends Request
class Setting extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,25 +2,23 @@
namespace App\Http\Requests\Module;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
use App\Traits\Modules as RemoteModules;
use Illuminate\Validation\Factory as ValidationFactory;
class Module extends Request
class Module extends FormRequest
{
use RemoteModules;
public function __construct(ValidationFactory $validation)
{
$validation->extend(
'check',
function ($attribute, $value, $parameters) {
return $this->checkToken($value);
},
trans('messages.error.invalid_token')
trans('messages.error.invalid_apikey')
);
}
/**
@ -41,7 +39,7 @@ class Module extends Request
public function rules()
{
return [
'api_token' => 'required|string|check',
'api_key' => 'required|string|check',
];
}
}

View File

@ -0,0 +1,30 @@
<?php
namespace App\Http\Requests\Portal;
use App\Abstracts\Http\FormRequest;
class InvoiceConfirm extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
//'payment_method' => 'required|string',
];
}
}

View File

@ -1,10 +1,10 @@
<?php
namespace App\Http\Requests\Customer;
namespace App\Http\Requests\Portal;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class InvoicePayment extends Request
class InvoicePayment extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -24,7 +24,7 @@ class InvoicePayment extends Request
public function rules()
{
return [
'payment_method' => 'required|string',
//'payment_method' => 'required|string',
];
}
}

View File

@ -1,6 +1,6 @@
<?php
namespace App\Http\Requests\Customer;
namespace App\Http\Requests\Portal;
use Illuminate\Foundation\Http\FormRequest;
@ -23,13 +23,19 @@ class Profile extends FormRequest
*/
public function rules()
{
$id = auth()->user()->getAttribute('id');
$id = user()->getAttribute('id');
$picture = 'nullable';
if ($this->request->get('picture', null)) {
$picture = 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024;
}
return [
'name' => 'required|string',
'email' => 'required|email|unique:users,email,' . $id . ',id,deleted_at,NULL',
'password' => 'confirmed',
'picture' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'picture' => $picture,
];
}
}

View File

@ -1,28 +0,0 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class Request extends FormRequest
{
/**
* Set the company id to the request.
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function getValidatorInstance()
{
// Get request data
$data = $this->all();
// Add active company id
$data['company_id'] = session('company_id');
// Reset the request data
$this->getInputSource()->replace($data);
return parent::getValidatorInstance();
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Setting;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Category extends Request
class Category extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Setting;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Currency extends Request
class Currency extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -25,7 +25,7 @@ class Currency extends Request
{
// Check if store or update
if ($this->getMethod() == 'PATCH') {
$id = $this->currency->getAttribute('id');
$id = is_numeric($this->currency) ? $this->currency : $this->currency->getAttribute('id');
} else {
$id = null;
}

View File

@ -0,0 +1,40 @@
<?php
namespace App\Http\Requests\Setting;
use App\Abstracts\Http\FormRequest;
class Module extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
$rules = [];
$module = module($this->request->get('module_alias'));
if ($module->get('settings')) {
foreach ($module->get('settings') as $field) {
if (isset($field['attributes']['required'])) {
$rules[$field['name']] = $field['attributes']['required'];
}
}
}
return $rules;
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Setting;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Setting extends Request
class Setting extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@ -24,9 +24,9 @@ class Setting extends Request
public function rules()
{
return [
'company_name' => 'required|string',
'company_email' => 'required|email',
'company_logo' => 'mimes:' . setting('general.file_types', 'pdf,jpeg,jpg,png'),
//'company_name' => 'required|string',
//'company_email' => 'required|email',
//'company_logo' => 'mimes:' . config('filesystems.mimes'), 'pdf,jpeg,jpg,png'),
];
}
}

View File

@ -2,9 +2,9 @@
namespace App\Http\Requests\Setting;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
class Tax extends Request
class Tax extends FormRequest
{
/**
* Determine if the user is authorized to make this request.

View File

@ -2,11 +2,11 @@
namespace App\Http\Requests\Wizard;
use App\Http\Requests\Request;
use App\Abstracts\Http\FormRequest;
use App\Traits\Modules as RemoteModules;
use Illuminate\Validation\Factory as ValidationFactory;
class Company extends Request
class Company extends FormRequest
{
use RemoteModules;
@ -17,7 +17,7 @@ class Company extends Request
function ($attribute, $value, $parameters) {
return $this->checkToken($value);
},
trans('messages.error.invalid_token')
trans('messages.error.invalid_apikey')
);
}
@ -39,11 +39,11 @@ class Company extends Request
public function rules()
{
$rules = [
'company_logo' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
'company_logo' => 'mimes:' . config('filesystems.mimes') . '|between:0,' . config('filesystems.max_size') * 1024,
];
if (!setting('general.api_token', false) && !empty($this->request->get('api_token'))) {
$rules['api_token'] = 'string|check';
if (!setting('apps.api_key', false) && !empty($this->request->get('api_key'))) {
$rules['api_key'] = 'string|check';
}
return $rules;