Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2017-11-27 16:50:14 +02:00
commit cde68a54e0
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Ninja/Transformers/AccountEmailSettingsTransformer.php
View File

@ -43,6 +43,12 @@ class AccountEmailSettingsTransformer extends EntityTransformer
'email_template_reminder1' => $settings->email_template_reminder1,
'email_template_reminder2' => $settings->email_template_reminder2,
'email_template_reminder3' => $settings->email_template_reminder3,
'late_fee1_amount' => $settings->late_fee1_amount,
'late_fee1_percent' => $settings->late_fee1_percent,
'late_fee2_amount' => $settings->late_fee2_amount,
'late_fee2_percent' => $settings->late_fee2_percent,
'late_fee3_amount' => $settings->late_fee3_amount,
'late_fee3_percent' => $settings->late_fee3_percent,
];
}
}

2
app/Ninja/Transformers/ClientTransformer.php
View File

@ -45,6 +45,7 @@ class ClientTransformer extends EntityTransformer
* @SWG\Property(property="shipping_postal_code", type="string", example=10010)
* @SWG\Property(property="shipping_country_id", type="integer", example=840)
* @SWG\Property(property="show_tasks_in_portal", type="boolean", example=false)
* @SWG\Property(property="credit_number_counter", type="integer", example=1)
*/
protected $defaultIncludes = [
'contacts',
@ -151,6 +152,7 @@ class ClientTransformer extends EntityTransformer
'shipping_postal_code' => $client->shipping_postal_code,
'shipping_country_id' => (int) $client->shipping_country_id,
'show_tasks_in_portal' => (bool) $client->show_tasks_in_portal,
'credit_number_counter' => (int) $client->credit_number_counter,
]);
}
}

1
app/Ninja/Transformers/DocumentTransformer.php
View File

@ -28,6 +28,7 @@ class DocumentTransformer extends EntityTransformer
'invoice_id' => $document->invoice_id && $document->invoice ? (int) $document->invoice->public_id : null,
'expense_id' => $document->expense_id && $document->expense ? (int) $document->expense->public_id : null,
'updated_at' => $this->getTimestamp($document->updated_at),
'is_default' => (bool) $document->is_default,
]);
}
}