Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:07:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v2' into v2-repeating-header-and-footer

Browse Source
This commit is contained in:
Benjamin Beganović 2020-08-26 07:53:45 +02:00
commit bba9d7dc44
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/CompanyGateway.php
View File

@ -44,6 +44,7 @@ class CompanyGateway extends BaseModel
'custom_value3', 'custom_value3',
'custom_value4', 'custom_value4',
'token_billing', 'token_billing',
'label',
]; ];
public static $credit_cards = [ public static $credit_cards = [

2
app/Transformers/SystemLogTransformer.php
View File

@ -31,7 +31,7 @@ class SystemLogTransformer extends EntityTransformer
'event_id' => (int) $system_log->event_id, 'event_id' => (int) $system_log->event_id,
'category_id' => (int) $system_log->category_id, 'category_id' => (int) $system_log->category_id,
'type_id' => (int) $system_log->type_id, 'type_id' => (int) $system_log->type_id,
'log' => (string) $system_log->log, 'log' => json_encode($system_log->log),
'updated_at' => (int)$system_log->updated_at, 'updated_at' => (int)$system_log->updated_at,
'created_at' => (int)$system_log->created_at, 'created_at' => (int)$system_log->created_at,
]; ];