From 2f7e91b46de11d5303133c56b7d10f63682fe56b Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 14 Apr 2021 07:29:35 +1000
Subject: [PATCH 1/3] textsg

---
 resources/lang/en/texts.php | 5 +++++
 1 file changed, 5 insertions(+)

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;

From 5630193dfe00d09f8ec5f6c090c848c9b10f94f5 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 16 Apr 2021 12:05:14 +1000
Subject: [PATCH 2/3] Fixes for credit card meta data

---
 app/Traits/GenerateMigrationResources.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index d8b04988b27a..ebc9dd79bd3e 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -1833,7 +1833,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;

From 71acb1189e0a7937977a4a2a10a5fb69ae2651f3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 18 Apr 2021 07:01:11 +1000
Subject: [PATCH 3/3] Fixes for recurring status

---
 app/Traits/GenerateMigrationResources.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index d8b04988b27a..cbcc11151b13 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)