Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9291 from turbo124/v5-develop

Browse Source 
Fixes for openapi spec
This commit is contained in:
David Bomba 2024-02-13 14:38:29 +11:00 committed by GitHub
commit a72058525e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
42 changed files with 7568 additions and 7495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Console/Commands/OpenApiYaml.php
View File

@ -79,6 +79,7 @@ class OpenApiYaml extends Command
Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components.yaml'));
Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components/examples.yaml'));
Storage::disk('base')->append('/openapi/api-docs.yaml', file_get_contents($path.'/components/responses.yaml'));
$directory = new DirectoryIterator($path . '/components/responses/');

16
app/Export/CSV/ClientExport.php
View File

@ -225,22 +225,6 @@ class ClientExport extends BaseExport
$entity['client.assigned_user'] = $client->assigned_user ? $client->user->present()->name() : '';
}
// if (in_array('client.country_id', $this->input['report_keys'])) {
// $entity['client.country_id'] = $client->country ? ctrans("texts.country_{$client->country->name}") : '';
// }
// if (in_array('client.shipping_country_id', $this->input['report_keys'])) {
// $entity['client.shipping_country_id'] = $client->shipping_country ? ctrans("texts.country_{$client->shipping_country->name}") : '';
// }
// if (in_array('client.currency_id', $this->input['report_keys'])) {
// $entity['client.currency_id'] = $client->currency() ? $client->currency()->code : $client->company->currency()->code;
// }
// if (in_array('client.industry_id', $this->input['report_keys'])) {
// $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : '';
// }
if (in_array('client.classification', $this->input['report_keys']) && isset($client->classification)) {
$entity['client.classification'] = ctrans("texts.{$client->classification}") ?? '';
}

5
app/Filters/ClientFilters.php
View File

@ -165,6 +165,11 @@ class ClientFilters extends QueryFilters
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if($sort_col[0] == 'number')
{
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

5
app/Filters/CreditFilters.php
View File

@ -146,6 +146,11 @@ class CreditFilters extends QueryFilters
->whereColumn('clients.id', 'credits.client_id'), $dir);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

6
app/Filters/ExpenseFilters.php
View File

@ -172,6 +172,8 @@ class ExpenseFilters extends QueryFilters
return $this->builder;
}
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if ($sort_col[0] == 'client_id' && in_array($sort_col[1], ['asc', 'desc'])) {
return $this->builder
->orderByRaw('ISNULL(client_id), client_id '. $sort_col[1])
@ -194,6 +196,10 @@ class ExpenseFilters extends QueryFilters
->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) {
return $this->builder->orderBy($sort_col[0], $sort_col[1]);
}

7
app/Filters/InvoiceFilters.php
View File

@ -318,11 +318,16 @@ class InvoiceFilters extends QueryFilters
if ($sort_col[0] == 'client_id') {
return $this->builder->orderBy(\App\Models\Client::select('name')
return $this->builder->orderBy(\App\Models\Client::select ('name')
->whereColumn('clients.id', 'invoices.client_id'), $dir);
}
if($sort_col[0] == 'number')
{
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

8
app/Filters/PaymentFilters.php
View File

@ -167,14 +167,18 @@ class PaymentFilters extends QueryFilters
return $this->builder;
}
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if ($sort_col[0] == 'client_id') {
return $this->builder->orderBy(\App\Models\Client::select('name')
->whereColumn('clients.id', 'payments.client_id'), $sort_col[1]);
->whereColumn('clients.id', 'payments.client_id'), $dir);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $sort_col[1]);
return $this->builder->orderBy($sort_col[0], $dir);
}
public function date_range(string $date_range = ''): Builder

21
app/Filters/ProjectFilters.php
View File

@ -59,21 +59,24 @@ class ProjectFilters extends QueryFilters
public function sort(string $sort = ''): Builder
{
$sort_col = explode('|', $sort);
if ($sort_col[0] == 'client_id') {
return $this->builder->orderBy(\App\Models\Client::select('name')
->whereColumn('clients.id', 'projects.client_id'), $sort_col[1]);
}
if (!is_array($sort_col) || count($sort_col) != 2) {
return $this->builder;
}
if (is_array($sort_col) && in_array($sort_col[1], ['asc','desc'])) {
return $this->builder->orderBy($sort_col[0], $sort_col[1]);
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if ($sort_col[0] == 'client_id') {
return $this->builder->orderBy(\App\Models\Client::select('name')
->whereColumn('clients.id', 'projects.client_id'), $dir);
}
return $this->builder;
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}
/**

4
app/Filters/PurchaseOrderFilters.php
View File

@ -130,6 +130,10 @@ class PurchaseOrderFilters extends QueryFilters
->whereColumn('vendors.id', 'purchase_orders.vendor_id'), $dir);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

4
app/Filters/QuoteFilters.php
View File

@ -155,6 +155,10 @@ class QuoteFilters extends QueryFilters
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
if ($sort_col[0] == 'valid_until') {
$sort_col[0] = 'due_date';
}

6
app/Filters/RecurringExpenseFilters.php
View File

@ -140,6 +140,8 @@ class RecurringExpenseFilters extends QueryFilters
return $this->builder;
}
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if ($sort_col[0] == 'client_id' && in_array($sort_col[1], ['asc', 'desc'])) {
return $this->builder
->orderByRaw('ISNULL(client_id), client_id '. $sort_col[1])
@ -162,6 +164,10 @@ class RecurringExpenseFilters extends QueryFilters
->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) {
return $this->builder->orderBy($sort_col[0], $sort_col[1]);
}

4
app/Filters/TaskFilters.php
View File

@ -143,6 +143,10 @@ class TaskFilters extends QueryFilters
->whereColumn('users.id', 'tasks.user_id'), $dir);
}
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

4
app/Filters/VendorFilters.php
View File

@ -71,6 +71,10 @@ class VendorFilters extends QueryFilters
$dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
if($sort_col[0] == 'number') {
return $this->builder->orderByRaw('ABS(number) ' . $dir);
}
return $this->builder->orderBy($sort_col[0], $dir);
}

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

@ -93,7 +93,7 @@ class StoreClientRequest extends Request
$rules['number'] = ['bail', 'nullable', Rule::unique('clients')->where('company_id', $user->company()->id)];
$rules['id_number'] = ['bail', 'nullable', Rule::unique('clients')->where('company_id', $user->company()->id)];
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,partnership,trust,charity,government,other';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,company,partnership,trust,charity,government,other';
return $rules;
}

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

@ -60,7 +60,7 @@ class UpdateClientRequest extends Request
$rules['size_id'] = 'integer|nullable';
$rules['country_id'] = 'integer|nullable';
$rules['shipping_country_id'] = 'integer|nullable';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,partnership,trust,charity,government,other';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,company,partnership,trust,charity,government,other';
if ($this->id_number) {
$rules['id_number'] = Rule::unique('clients')->where('company_id', $user->company()->id)->ignore($this->client->id);

12
app/Http/Requests/ExpenseCategory/StoreExpenseCategoryRequest.php
View File

@ -11,6 +11,7 @@
namespace App\Http\Requests\ExpenseCategory;
use App\Models\Expense;
use App\Http\Requests\Request;
use App\Models\ExpenseCategory;
@ -23,14 +24,21 @@ class StoreExpenseCategoryRequest extends Request
*/
public function authorize(): bool
{
return auth()->user()->can('create', ExpenseCategory::class);
/** @var \App\Models\User $user */
$user = auth()->user();
return $user->can('create', ExpenseCategory::class) || $user->can('create', Expense::class);
}
public function rules()
{
/** @var \App\Models\User $user */
$user = auth()->user();
$rules = [];
$rules['name'] = 'required|unique:expense_categories,name,null,null,company_id,'.auth()->user()->companyId();
$rules['name'] = 'required|unique:expense_categories,name,null,null,company_id,'.$user->companyId();
return $this->globalRules($rules);
}

12
app/Http/Requests/ExpenseCategory/UpdateExpenseCategoryRequest.php
View File

@ -26,16 +26,24 @@ class UpdateExpenseCategoryRequest extends Request
*/
public function authorize(): bool
{
return auth()->user()->can('edit', $this->expense_category);
/** @var \App\Models\User $user */
$user = auth()->user();
return $user->can('edit', $this->expense_category);
}
public function rules()
{
/** @var \App\Models\User $user */
$user = auth()->user();
$rules = [];
if ($this->input('name')) {
// $rules['name'] = 'unique:expense_categories,name,'.$this->id.',id,company_id,'.$this->expense_category->company_id;
$rules['name'] = Rule::unique('expense_categories')->where('company_id', auth()->user()->company()->id)->ignore($this->expense_category->id);
$rules['name'] = Rule::unique('expense_categories')->where('company_id', $user->company()->id)->ignore($this->expense_category->id);
}
return $rules;

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

@ -198,6 +198,18 @@ class Request extends FormRequest
}
}
if(isset($input['public_notes']))
$input['public_notes'] = str_replace("</sc","<-", $input['public_notes']);
if(isset($input['footer']))
$input['footer'] = str_replace("</sc", "<-", $input['footer']);
if(isset($input['terms']))
$input['terms'] = str_replace("</sc", "<-", $input['terms']);
if(isset($input['private_notes']))
$input['private_notes'] = str_replace("</sc", "<-", $input['private_notes']);
return $input;
}

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

@ -73,7 +73,7 @@ class StoreVendorRequest extends Request
}
$rules['language_id'] = 'bail|nullable|sometimes|exists:languages,id';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,company,partnership,trust,charity,government,other';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,company,partnership,trust,charity,government,other';
return $rules;
}
@ -89,6 +89,10 @@ class StoreVendorRequest extends Request
$input['currency_id'] = $user->company()->settings->currency_id;
}
if (isset($input['name'])) {
$input['name'] = strip_tags($input['name']);
}
$input = $this->decodePrimaryKeys($input);
$this->replace($input);

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

@ -74,7 +74,7 @@ class UpdateVendorRequest extends Request
}
$rules['language_id'] = 'bail|nullable|sometimes|exists:languages,id';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,company,partnership,trust,charity,government,other';
$rules['classification'] = 'bail|sometimes|nullable|in:individual,business,company,partnership,trust,charity,government,other';
return $rules;
}
@ -92,8 +92,8 @@ class UpdateVendorRequest extends Request
{
$input = $this->all();
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
if (isset($input['name'])) {
$input['name'] = strip_tags($input['name']);
}
if (array_key_exists('country_id', $input) && is_null($input['country_id'])) {

2
app/Services/Pdf/PdfBuilder.php
View File

@ -1239,7 +1239,7 @@ class PdfBuilder
public function productTable(): array
{
$product_items = collect($this->service->config->entity->line_items)->filter(function ($item) {
return $item->type_id == 1 || $item->type_id == 6 || $item->type_id == 5;
return $item->type_id == 1 || $item->type_id == 6 || $item->type_id == 5 || $item->type_id == 4;
});
if (count($product_items) == 0) {

2
app/Services/PdfMaker/Design.php
View File

@ -441,7 +441,7 @@ class Design extends BaseDesign
public function productTable(): array
{
$product_items = collect($this->entity->line_items)->filter(function ($item) {
return $item->type_id == 1 || $item->type_id == 6 || $item->type_id == 5;
return $item->type_id == 1 || $item->type_id == 6 || $item->type_id == 5 || $item->type_id == 4;
});
if (count($product_items) == 0) {

1
app/Services/Subscription/PaymentLinkService.php
View File

@ -277,7 +277,6 @@ class PaymentLinkService
/**
* @param Invoice $invoice
* @return true
* @throws BindingResolutionException
*/
public function planPaid(Invoice $invoice)
{

6
app/Utils/Traits/CleanLineItems.php
View File

@ -74,6 +74,12 @@ trait CleanLineItems
}
if(isset($item['notes']))
$item['notes'] = str_replace("</", "<-", $item['notes']);
if(isset($item['product_key']))
$item['product_key'] = str_replace("</", "<-", $item['product_key']);
}
if (array_key_exists('id', $item) || array_key_exists('_id', $item)) {

2
lang/en/texts.php
View File

@ -5120,7 +5120,7 @@ $lang = array(
'set_private' => 'Set private',
'individual' => 'Individual',
'business' => 'Business',
'partnership' => 'partnership',
'partnership' => 'Partnership',
'trust' => 'Trust',
'charity' => 'Charity',
'government' => 'Government',

14675
openapi/api-docs.yaml
View File

File diff suppressed because it is too large Load Diff

1
openapi/components.yaml
View File

@ -12,7 +12,6 @@ components:
description: 'The total number of requests in a given time window.'
schema:
type: integer
components:
securitySchemes:
ApiKeyAuth:
type: apiKey

147
openapi/components/examples.yaml
View File

@ -1,72 +1,75 @@
examples:
Client:
- id: Opnel5aKBz
user_id: Ua6Rw4pVbS
assigned_user_id: Ua6Rw4pVbS
company_id: Co7Vn3yLmW
name: "Jim's Housekeeping"
website: https://www.jims-housekeeping.com
private_notes: Client prefers email communication over phone calls
client_hash: asdfkjhk342hjhbfdvmnfb1
industry_id: 5
size_id: 2
address1: 123 Main St
address2: Apt 4B
city: Beverly Hills
state: California
postal_code: 90210
phone: 555-3434-3434
country_id: 1
custom_value1: Email
custom_value2: John Doe
custom_value3: Yes
custom_value4: $50,000
vat_number: VAT123456
id_number: ID123456
number: CL-0001
shipping_address1: 5 Wallaby Way
shipping_address2: Suite 5
shipping_city: Perth
shipping_state: Western Australia
shipping_postal_code: 6110
shipping_country_id: 4
is_deleted: false
balance: 500.00
paid_to_date: 2000.00
credit_balance: 100.00
last_login: 1628686031
created_at: 1617629031
updated_at: 1628445631
group_settings_id: Opnel5aKBz
routing_id: Opnel5aKBz3489-dfkiu-2239-sdsd
is_tax_exempt: false
has_valid_vat_number: false
payment_balance: 100
contacts:
- id: Opnel5aKBz
first_name: John
last_name: Doe
email: jim@gmail.com
phone: 555-3434-3434
send_invoice: true
custom_value1: Email
custom_value2: John Doe
custom_value3: Yes
custom_value4: $50,000
is_primary: true
created_at: 1617629031
updated_at: 1628445631
deleted_at: 1628445631
Meta:
value:
pagination:
total: 1
count: 1
per_page: 20
current_page: 1
total_pages: 1
links:
- first: https://invoicing.co/api/v1/invoices?page=1
- last: https://invoicing.co/api/v1/invoices?page=1
- prev: null
- next: null
#examples:
# Client:
# $ref: '#/components/schemas/Client'
# Client:
# id: Opnel5aKBz
# user_id: Ua6Rw4pVbS
# assigned_user_id: Ua6Rw4pVbS
# company_id: Co7Vn3yLmW
# name: "Jim's Housekeeping"
# website: https://www.jims-housekeeping.com
# private_notes: Client prefers email communication over phone calls
# client_hash: asdfkjhk342hjhbfdvmnfb1
# industry_id: 5
# size_id: 2
# address1: 123 Main St
# address2: Apt 4B
# city: Beverly Hills
# state: California
# postal_code: 90210
# phone: 555-3434-3434
# country_id: 1
# custom_value1: Email
# custom_value2: John Doe
# custom_value3: Yes
# custom_value4: $50,000
# vat_number: VAT123456
# id_number: ID123456
# number: CL-0001
# shipping_address1: 5 Wallaby Way
# shipping_address2: Suite 5
# shipping_city: Perth
# shipping_state: Western Australia
# shipping_postal_code: 6110
# shipping_country_id: 4
# is_deleted: false
# balance: 500.00
# paid_to_date: 2000.00
# credit_balance: 100.00
# last_login: 1628686031
# created_at: 1617629031
# updated_at: 1628445631
# group_settings_id: Opnel5aKBz
# routing_id: Opnel5aKBz3489-dfkiu-2239-sdsd
# is_tax_exempt: false
# has_valid_vat_number: false
# payment_balance: 100
# contacts:
# id: Opnel5aKBz
# first_name: John
# last_name: Doe
# email: jim@gmail.com
# phone: 555-3434-3434
# send_invoice: true
# custom_value1: Email
# custom_value2: John Doe
# custom_value3: Yes
# custom_value4: $50,000
# is_primary: true
# created_at: 1617629031
# updated_at: 1628445631
# deleted_at: 1628445631
# Meta:
# value:
# pagination:
# total: 1
# count: 1
# per_page: 20
# current_page: 1
# total_pages: 1
# links:
# - first: https://invoicing.co/api/v1/invoices?page=1
# - last: https://invoicing.co/api/v1/invoices?page=1
# - prev: null
# - next: null

4
openapi/components/parameters.yaml
View File

@ -139,7 +139,7 @@
description: The number of records to return for each request, default is 20
required: false
schema:
type: int
type: integer
example: 20
page_meta:
name: page
@ -147,7 +147,7 @@
description: The page number to return for this request (when performing pagination), default is 1
required: false
schema:
type: int
type: integer
example: 1
include:
name: include

2
openapi/components/parameters/default_filters.yaml
View File

@ -45,7 +45,7 @@
Filters the entity list by entities that have been deleted.
required: false
schema:
type: booleans
type: boolean
example: ?is_deleted=true
vendor_id:
name: vendor_id

2
openapi/components/schemas/company.yaml
View File

@ -143,7 +143,7 @@
type: boolean
example: true
default_auto_bill:
type: enum
type: string
example: 'always'
description: |
A flag determining whether to auto-bill clients by default

4
openapi/components/schemas/company_user.yaml
View File

@ -7,11 +7,9 @@
settings:
description: 'Settings that are used for the frontend applications to store user preferences / metadata'
type: object
example: 'json object'
react_settings:
description: 'Dedicated settings object for the react web application'
type: object'
example: 'json object'
type: object
is_owner:
description: 'Determines whether the user owns this company'
type: boolean

2
openapi/components/schemas/invoice_request.yaml
View File

@ -101,7 +101,7 @@
type: number
format: float
example: '10.00'
readOnly:
readOnly: true
line_items:
type: array
description: 'An array of objects which define the line items of the invoice'

2
openapi/components/schemas/meta.yaml
View File

@ -31,6 +31,6 @@
example: 1
readOnly: true
links:
type: array
type: object
description: 'The pagination links'
readOnly: true

48
openapi/components/schemas/product_request.yaml
View File

@ -10,99 +10,99 @@
type: string
description: 'The hashed ID of the user assigned to this product.'
example: pR0j3
required: false
project_id:
type: string
description: 'The hashed ID of the project that this product is associated with.'
example: pR0j3
required: false
vendor_id:
type: string
description: 'The hashed ID of the vendor that this product is associated with.'
example: pR0j3
required: false
custom_value1:
type: string
description: 'Custom value field 1.'
example: 'Custom value 1'
required: false
custom_value2:
type: string
description: 'Custom value field 2.'
example: 'Custom value 2'
required: false
custom_value3:
type: string
description: 'Custom value field 3.'
example: 'Custom value 3'
required: false
custom_value4:
type: string
description: 'Custom value field 4.'
example: 'Custom value 4'
required: false
product_key:
type: string
description: 'The product key.'
example: '1234'
required: false
notes:
type: string
description: 'Notes about the product.'
example: 'These are some notes about the product.'
required: false
cost:
type: number
format: double
description: 'The cost of the product.'
example: 10.0
required: false
price:
type: number
format: double
description: 'The price of the product.'
example: 20.0
required: false
quantity:
type: number
format: double
description: 'The quantity of the product.'
example: 5.0
required: false
default: 1
tax_name1:
type: string
description: 'The name of tax 1.'
example: 'Tax 1'
required: false
tax_rate1:
type: number
format: double
description: 'The rate of tax 1.'
example: 10.0
required: false
tax_name2:
type: string
description: 'The name of tax 2.'
example: 'Tax 2'
required: false
tax_rate2:
type: number
format: double
description: 'The rate of tax 2.'
example: 5.0
required: false
tax_name3:
type: string
description: 'The name of tax 3.'
example: 'Tax 3'
required: false
tax_rate3:
type: number
format: double
description: 'The rate of tax 3.'
example: 0.0
required: false
in_stock_quantity:
type: integer
format: int32
@ -114,32 +114,32 @@
The query parameter ?update_in_stock_quantity=true **MUST** be passed if you wish to update this value manually.
default: 0
required: false
stock_notification:
type: boolean
description: Indicates whether stock notifications are enabled for this product
default: true
required: false
stock_notification_threshold:
type: integer
format: int32
description: The minimum quantity threshold for which stock notifications will be triggered
default: 0
required: false
max_quantity:
type: integer
format: int32
description: The maximum quantity that can be ordered for this product
required: false
product_image:
type: string
description: The URL of the product image
format: uri-reference
required: false
tax_id:
type: string
default: '1'
required: false
description: |
The tax category id for this product.'

1
openapi/misc/misc.yaml
View File

@ -36,7 +36,6 @@ tags:
description: |
Endpoint definitions for interacting with vendors.
- name: Purchase Orders
summary: Purchase Orders
description: |
Endpoint definitions for interacting with purchase orders.
- name: expenses

2
openapi/paths.yaml
View File

@ -91,8 +91,6 @@ paths:
summary: "Attempts authentication"
description: "Returns a CompanyUser object on success"
operationId: postLogin
security:
- []
parameters:
- $ref: "#/components/parameters/X-API-SECRET"
- $ref: "#/components/parameters/X-API-TOKEN"

4
openapi/paths/clients.yaml
View File

@ -125,12 +125,12 @@
items:
$ref: '#/components/schemas/Client'
example:
$ref: '#/components/examples/Client'
$ref: '#/components/schemas/Client'
meta:
type: object
$ref: '#/components/schemas/Meta'
example:
$ref: '#/components/examples/Meta'
$ref: '#/components/schemas/Meta'
401:
$ref: '#/components/responses/401'
403:

2
openapi/paths/invoices.yaml
View File

@ -437,7 +437,6 @@
type: object
properties:
action:
required: true
type: string
description: |
The action to be performed, options include:
@ -470,7 +469,6 @@
- `send_email`
Emails an array of invoices. Requires additional properties to be sent. `email_type`
ids:
required: true
type: array
items:
description: "Array of hashed IDs to be bulk 'actioned - ['D2J234DFA','D2J234DFA','D2J234DFA']"

2
resources/views/portal/ninja2020/auth/login.blade.php
View File

@ -21,7 +21,7 @@
@if($account && !$account->isPaid())
<div>
<img src="{{ asset('images/invoiceninja-black-logo-2.png') }}"
class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo">
class="border-b border-gray-100 h-18 pb-4" alt="Invoice Ninja logo" id="company_logo">
</div>
@elseif(isset($company) && !is_null($company))
<div>

4
resources/views/portal/ninja2020/components/html-viewer.blade.php
View File

@ -77,7 +77,7 @@ span {
<td>
<div class="product-information">
<div class="item-details">
<p class="overflow-ellipsis overflow-hidden px-1 mb-2">{!! $product['notes'] !!}</p>
<p class="mt-2">
@if($show_quantity)
@ -170,7 +170,7 @@ span {
</button>
<div id="notes" class="py-10 border-b-2 border-fuschia-600" x-show="show_notes">
{!! html_entity_decode($entity->public_notes) !!}
{!! html_entity_decode(e($entity->public_notes)) !!}
</div>
</div>

5
resources/views/portal/ninja2020/layout/clean.blade.php
View File

@ -98,6 +98,11 @@
@livewireStyles
@if((bool) \App\Utils\Ninja::isSelfHost() && isset($company))
<style>
{!! $company->settings->portal_custom_css !!}
</style>
@endif
<link rel="stylesheet" type="text/css" href="{{ asset('vendor/cookieconsent@3/cookieconsent.min.css') }}" defer>
</head>