Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 03:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update Company settings, OpenAPI documentation and Company Migration (#3025)

Browse Source 
* Insert generic for client country if not set

* Invoice fixes
This commit is contained in:
David Bomba 2019-10-28 08:36:09 +11:00 committed by GitHub
parent e4b0943db6
commit 0f9aae454b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/OpenAPI/ClientSchema.php
View File

@ -26,6 +26,7 @@
* @OA\Property(property="city", type="string", example="", description="________"), * @OA\Property(property="city", type="string", example="", description="________"),
* @OA\Property(property="state", type="string", example="", description="________"), * @OA\Property(property="state", type="string", example="", description="________"),
* @OA\Property(property="postal_code", type="string", example="", description="________"), * @OA\Property(property="postal_code", type="string", example="", description="________"),
* @OA\Property(property="phone", type="string", example="555-3434-3434", description="The client phone number"),
* @OA\Property(property="country_id", type="string", example="", description="________"), * @OA\Property(property="country_id", type="string", example="", description="________"),
* @OA\Property(property="custom_value1", type="string", example="", description="________"), * @OA\Property(property="custom_value1", type="string", example="", description="________"),
* @OA\Property(property="custom_value2", type="string", example="", description="________"), * @OA\Property(property="custom_value2", type="string", example="", description="________"),

4
app/Transformers/InvoiceTransformer.php
View File

@ -83,8 +83,8 @@ class InvoiceTransformer extends EntityTransformer
{ {
return [ return [
'id' => $this->encodePrimaryKey($invoice->id), 'id' => $this->encodePrimaryKey($invoice->id),
'amount' => (float) $invoice->amount ?: '', 'amount' => (float) $invoice->amount,
'balance' => (float) $invoice->balance ?: '', 'balance' => (float) $invoice->balance,
'client_id' => (string) $this->encodePrimaryKey($invoice->client_id), 'client_id' => (string) $this->encodePrimaryKey($invoice->client_id),
'status_id' => (string) ($invoice->status_id ?: 1), 'status_id' => (string) ($invoice->status_id ?: 1),
'design_id' => (string) ($invoice->design_id ?: 1), 'design_id' => (string) ($invoice->design_id ?: 1),