Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-02 22:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8922 from turbo124/v5-develop

Browse Source 
v5.7.39
This commit is contained in:
David Bomba 2023-10-31 09:18:32 +11:00 committed by GitHub
commit ae9cf431ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 67 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.38 5.7.39

7
app/DataMapper/Tax/BaseRule.php
View File

@ -216,7 +216,12 @@ class BaseRule implements RuleInterface
$this->invoice->tax_data = $tax_data; $this->invoice->tax_data = $tax_data;
if(\DB::transactionLevel() == 0) { if(\DB::transactionLevel() == 0) {
$this->invoice->saveQuietly();
try {
$this->invoice->saveQuietly();
}catch(\Exception $e) {
}
} }
} }

4
config/ninja.php
View File

@ -15,8 +15,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.38'), 'app_version' => env('APP_VERSION','5.7.39'),
'app_tag' => env('APP_TAG','5.7.38'), 'app_tag' => env('APP_TAG','5.7.39'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),

58
openapi/api-docs.yaml
View File

@ -3164,8 +3164,8 @@ paths:
post: post:
tags: tags:
- expenses - expenses
summary: "Adds a client" summary: "Adds an expense"
description: "Adds an client to a company" description: "Adds a expense to a company"
operationId: storeExpense operationId: storeExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3173,7 +3173,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "Returns the saved client object" description: "Returns the saved expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3197,8 +3197,8 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Shows a client" summary: "Shows a expense"
description: "Displays a client by id" description: "Displays a expense by id"
operationId: showExpense operationId: showExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3237,8 +3237,8 @@ paths:
put: put:
tags: tags:
- expenses - expenses
summary: "Updates a client" summary: "Updates a expense"
description: "Handles the updating of a client by id" description: "Handles the updating of a expense by id"
operationId: updateExpense operationId: updateExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3254,7 +3254,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3277,8 +3277,8 @@ paths:
delete: delete:
tags: tags:
- expenses - expenses
summary: "Deletes a client" summary: "Deletes a expense"
description: "Handles the deletion of a client by id" description: "Handles the deletion of a expense by id"
operationId: deleteExpense operationId: deleteExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3314,7 +3314,7 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Shows a client for editting" summary: "Shows a expense for editing"
description: "Displays a client by id" description: "Displays a client by id"
operationId: editExpense operationId: editExpense
parameters: parameters:
@ -3331,7 +3331,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3355,7 +3355,7 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Gets a new blank client object" summary: "Gets a new blank expense object"
description: "Returns a blank object with default values" description: "Returns a blank object with default values"
operationId: getExpensesCreate operationId: getExpensesCreate
parameters: parameters:
@ -3364,7 +3364,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "A blank client object" description: "A blank expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4661,8 +4661,8 @@ paths:
post: post:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Adds a client" summary: "Adds a recurring expense"
description: "Adds an client to a company" description: "Adds a recurring expense to a company"
operationId: storeRecurringExpense operationId: storeRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4670,7 +4670,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "Returns the saved client object" description: "Returns the saved recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4694,8 +4694,8 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Shows a client" summary: "Shows a recurring expense"
description: "Displays a client by id" description: "Displays a recurring expense by id"
operationId: showRecurringExpense operationId: showRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4734,8 +4734,8 @@ paths:
put: put:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Updates a client" summary: "Updates a recurring expense"
description: "Handles the updating of a client by id" description: "Handles the updating of a recurring expense by id"
operationId: updateRecurringExpense operationId: updateRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4751,7 +4751,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4774,8 +4774,8 @@ paths:
delete: delete:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Deletes a client" summary: "Deletes a recurring expense"
description: "Handles the deletion of a client by id" description: "Handles the deletion of a recurring expense by id"
operationId: deleteRecurringExpense operationId: deleteRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4811,8 +4811,8 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Shows a client for editting" summary: "Shows a recurring expense for editting"
description: "Displays a client by id" description: "Displays a recurring expense by id"
operationId: editRecurringExpense operationId: editRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4828,7 +4828,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4852,7 +4852,7 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Gets a new blank client object" summary: "Gets a new blank recurring expense object"
description: "Returns a blank object with default values" description: "Returns a blank object with default values"
operationId: getRecurringExpensesCreate operationId: getRecurringExpensesCreate
parameters: parameters:
@ -4861,7 +4861,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "A blank client object" description: "A blank recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"

58
openapi/paths.yaml
View File

@ -3140,8 +3140,8 @@ paths:
post: post:
tags: tags:
- expenses - expenses
summary: "Adds a client" summary: "Adds an expense"
description: "Adds an client to a company" description: "Adds a expense to a company"
operationId: storeExpense operationId: storeExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3149,7 +3149,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "Returns the saved client object" description: "Returns the saved expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3173,8 +3173,8 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Shows a client" summary: "Shows a expense"
description: "Displays a client by id" description: "Displays a expense by id"
operationId: showExpense operationId: showExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3213,8 +3213,8 @@ paths:
put: put:
tags: tags:
- expenses - expenses
summary: "Updates a client" summary: "Updates a expense"
description: "Handles the updating of a client by id" description: "Handles the updating of a expense by id"
operationId: updateExpense operationId: updateExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3230,7 +3230,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3253,8 +3253,8 @@ paths:
delete: delete:
tags: tags:
- expenses - expenses
summary: "Deletes a client" summary: "Deletes a expense"
description: "Handles the deletion of a client by id" description: "Handles the deletion of a expense by id"
operationId: deleteExpense operationId: deleteExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -3290,7 +3290,7 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Shows a client for editting" summary: "Shows a expense for editing"
description: "Displays a client by id" description: "Displays a client by id"
operationId: editExpense operationId: editExpense
parameters: parameters:
@ -3307,7 +3307,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -3331,7 +3331,7 @@ paths:
get: get:
tags: tags:
- expenses - expenses
summary: "Gets a new blank client object" summary: "Gets a new blank expense object"
description: "Returns a blank object with default values" description: "Returns a blank object with default values"
operationId: getExpensesCreate operationId: getExpensesCreate
parameters: parameters:
@ -3340,7 +3340,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "A blank client object" description: "A blank expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4637,8 +4637,8 @@ paths:
post: post:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Adds a client" summary: "Adds a recurring expense"
description: "Adds an client to a company" description: "Adds a recurring expense to a company"
operationId: storeRecurringExpense operationId: storeRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4646,7 +4646,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "Returns the saved client object" description: "Returns the saved recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4670,8 +4670,8 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Shows a client" summary: "Shows a recurring expense"
description: "Displays a client by id" description: "Displays a recurring expense by id"
operationId: showRecurringExpense operationId: showRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4710,8 +4710,8 @@ paths:
put: put:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Updates a client" summary: "Updates a recurring expense"
description: "Handles the updating of a client by id" description: "Handles the updating of a recurring expense by id"
operationId: updateRecurringExpense operationId: updateRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4727,7 +4727,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4750,8 +4750,8 @@ paths:
delete: delete:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Deletes a client" summary: "Deletes a recurring expense"
description: "Handles the deletion of a client by id" description: "Handles the deletion of a recurring expense by id"
operationId: deleteRecurringExpense operationId: deleteRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4787,8 +4787,8 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Shows a client for editting" summary: "Shows a recurring expense for editting"
description: "Displays a client by id" description: "Displays a recurring expense by id"
operationId: editRecurringExpense operationId: editRecurringExpense
parameters: parameters:
- $ref: "#/components/parameters/X-API-TOKEN" - $ref: "#/components/parameters/X-API-TOKEN"
@ -4804,7 +4804,7 @@ paths:
example: D2J234DFA example: D2J234DFA
responses: responses:
200: 200:
description: "Returns the client object" description: "Returns the recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"
@ -4828,7 +4828,7 @@ paths:
get: get:
tags: tags:
- recurring_expenses - recurring_expenses
summary: "Gets a new blank client object" summary: "Gets a new blank recurring expense object"
description: "Returns a blank object with default values" description: "Returns a blank object with default values"
operationId: getRecurringExpensesCreate operationId: getRecurringExpensesCreate
parameters: parameters:
@ -4837,7 +4837,7 @@ paths:
- $ref: "#/components/parameters/include" - $ref: "#/components/parameters/include"
responses: responses:
200: 200:
description: "A blank client object" description: "A blank recurring expense object"
headers: headers:
X-MINIMUM-CLIENT-VERSION: X-MINIMUM-CLIENT-VERSION:
$ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION" $ref: "#/components/headers/X-MINIMUM-CLIENT-VERSION"