This commit is contained in:
David Bomba 2019-10-06 19:44:00 +11:00
parent 59abbd04f9
commit cf67589f23
6 changed files with 30 additions and 48 deletions

View File

@ -144,9 +144,6 @@ class CompanySettings extends BaseSettings
public $email_template_reminder1 = '';
public $email_template_reminder2 = '';
public $email_template_reminder3 = '';
public $has_custom_design1 = false;
public $has_custom_design2 = false;
public $has_custom_design3 = false;
public $enable_portal_password = false;
public $show_accept_invoice_terms = false;
public $show_accept_quote_terms = false;
@ -183,9 +180,6 @@ class CompanySettings extends BaseSettings
'country_id' => 'string',
'vat_number' => 'string',
'id_number' => 'string',
'has_custom_design1' => 'bool',
'has_custom_design2' => 'bool',
'has_custom_design3' => 'bool',
'tax_name1' => 'string',
'tax_name2' => 'string',
'tax_name3' => 'string',
@ -296,8 +290,6 @@ class CompanySettings extends BaseSettings
$data->datetime_format_id = (string)config('ninja.i18n.datetime_format_id');
$data->military_time = (bool )config('ninja.i18n.military_time');
$data->date_format_id = (string)config('ninja.i18n.date_format_id');
$data->start_of_week = (int) config('ninja.i18n.start_of_week');
$data->financial_year_start = (int)config('ninja.i18n.financial_year_start');
$data->country_id = (string)config('ninja.i18n.country_id');
$data->translations = (object) [];

View File

@ -9,29 +9,16 @@
* @OA\Property(property="is_owner", type="boolean", example=true, description="Determines whether the user owns this company"),
* @OA\Property(property="is_locked", type="boolean", example=true, description="Determines whether the users access to this company has been locked"),
* @OA\Property(property="updated_at", type="int", example="1231232312321", description="The last time the record was modified"),
* @OA\Property(property="deleted_at", type="int", example="1231232312321", description="Timestamp when the user was archived"),
* )
* @OA\Property(property="deleted_at", type="int", example="12312312321", description="Timestamp when the user was archived"),
* ),
* @OA\Schema(ref="#/components/schema/Company"),
* @OA\Schema(ref="#/components/schema/User"),
* @OA\Schema(ref="#/components/schema/Account"),
* @OA\Schema(ref="#/components/schema/CompanyToken"),
* }
* )
*/
:
type:
properties:
per_page:
type: integer
example: 25
description: 'Used for the default number of items to be displayed in list views'
company:
$ref: '#/components/schemas/Company'
user:
$ref: '#/components/schemas/User'
account:
$ref: '#/components/schemas/Account'
company_token:
$ref: '#/components/schemas/CompanyToken'
/**
*
*/

View File

@ -0,0 +1,20 @@
<?php
/**
* @OA\Header(
* header="X-API-TOKEN",
* description="The API version",
* @OA\Schema( type="number" )
* ),
*
* @OA\Header(
* header="X-RateLimit-Remaining",
* description="The number of requests left for the time window.",
* @OA\Schema( type="integer" )
* ),
*
* @OA\Header(
* header="X-RateLimit-Limit",
* description="The total number of requests in a given time window.",
* @OA\Schema( type="integer" )
* ),
*/

View File

@ -84,23 +84,6 @@
* )
* ),
*
* @OA\Header(
* header="X-API-TOKEN",
* description="The API version",
* @OA\Schema( type="number" )
* ),
*
* @OA\Header(
* header="X-RateLimit-Remaining",
* description="The number of requests left for the time window.",
* @OA\Schema( type="integer" )
* ),
*
* @OA\Header(
* header="X-RateLimit-Limit",
* description="The total number of requests in a given time window.",
* @OA\Schema( type="integer" )
* ),
*/

View File

@ -46,7 +46,7 @@ class StoreClientRequest extends Request
for ($i = 0; $i < count($contacts); $i++) {
//$rules['contacts.' . $i . '.email'] = 'required|email|unique:client_contacts,email,' . isset($contacts[$i]['id']);
$rules['contacts.' . $i . '.email'] = 'email';
$rules['contacts.' . $i . '.email'] = 'nullable|email';
}
}