diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index d8b04988b27a..ae17463a7c94 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -783,6 +783,8 @@ info("get company"); if($invoice->end_date < now()) return 4; + return 1; + } private function transformQuoteStatusId($quote) @@ -1833,7 +1835,7 @@ info("translated gateway_type = {$translated_gateway_type}"); $meta->exp_month = (string)$exp_month; $meta->exp_year = (string)$exp_year; $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; return $meta; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index a211f1054657..0958cc603992 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4266,6 +4266,11 @@ $LANG = array( 'count_minutes' => ':count Minutes', 'password_timeout' => 'Password Timeout', '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;