Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-11 15:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5459 from turbo124/master

Browse Source 
Migration fixes.
This commit is contained in:
David Bomba 2021-04-18 07:02:19 +10:00 committed by GitHub
commit 191b4f3f5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Traits/GenerateMigrationResources.php
View File

@ -783,6 +783,8 @@ info("get company");
if($invoice->end_date < now()) if($invoice->end_date < now())
return 4; return 4;
return 1;
} }
private function transformQuoteStatusId($quote) private function transformQuoteStatusId($quote)
@ -1833,7 +1835,7 @@ info("translated gateway_type = {$translated_gateway_type}");
$meta->exp_month = (string)$exp_month; $meta->exp_month = (string)$exp_month;
$meta->exp_year = (string)$exp_year; $meta->exp_year = (string)$exp_year;
$meta->brand = (string)$payment_method->payment_type->name; $meta->brand = (string)$payment_method->payment_type->name;
$meta->last4 = (string)str_replace(',', '', ($payment_method->expiration)); $meta->last4 = (string)str_replace(',', '', ($payment_method->last4));
$meta->type = $payment_method->payment_type->gateway_type_id; $meta->type = $payment_method->payment_type->gateway_type_id;
return $meta; return $meta;

5
resources/lang/en/texts.php
View File

@ -4266,6 +4266,11 @@ $LANG = array(
'count_minutes' => ':count Minutes', 'count_minutes' => ':count Minutes',
'password_timeout' => 'Password Timeout', 'password_timeout' => 'Password Timeout',
'shared_invoice_credit_counter' => 'Shared Invoice/Credit Counter', 'shared_invoice_credit_counter' => 'Shared Invoice/Credit Counter',
'activity_80' => ':user created subscription :subscription',
'activity_81' => ':user updated subscription :subscription',
'activity_82' => ':user archived subscription :subscription',
'activity_83' => ':user deleted subscription :subscription',
'activity_84' => ':user restored subscription :subscription',
); );
return $LANG; return $LANG;