From 2f56a10aedffb1d990f90fd715a961fab149c987 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 11 Mar 2022 13:20:53 +1100
Subject: [PATCH] Fixes for exporting projects attached to invoices

---
 .../ClientPortal/NinjaPlanController.php           | 14 ++++++++------
 app/Jobs/Company/CompanyExport.php                 |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
index 1b8bc6ffc0ff..c231c21593f2 100644
--- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php
+++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php
@@ -12,6 +12,7 @@
 
 namespace App\Http\Controllers\ClientPortal;
 
+use App\DataMapper\Analytics\TrialStarted;
 use App\Factory\RecurringInvoiceFactory;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ClientPortal\Uploads\StoreUploadRequest;
@@ -32,6 +33,7 @@ use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
+use Turbo124\Beacon\Facades\LightLogs;
 
 class NinjaPlanController extends Controller
 {
@@ -159,14 +161,16 @@ class NinjaPlanController extends Controller
         $recurring_invoice->next_send_date = now()->addDays(14)->format('Y-m-d');
 
         $recurring_invoice->save();
-        $recurring_invoice = $recurring_invoice->calc()->getRecurringInvoice();
+        $r = $recurring_invoice->calc()->getRecurringInvoice();
 
-        $recurring_invoice->service()->start();
+        $recurring_invoice->service()->start()->save();
+
+        LightLogs::create(new TrialStarted())
+                 ->increment()
+                 ->queue();
 
         return $this->render('plan.trial_confirmed', $data);
 
-        // return redirect('https://invoicing.co');
-
     }
 
 
@@ -183,8 +187,6 @@ class NinjaPlanController extends Controller
     public function plan()
     {
 
-        return $this->render('plan.trial_confirmed');
-
         //harvest the current plan
         $data = [];
         $data['late_invoice'] = false;
diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php
index 4e6fcc528b7a..368a70ed4e1f 100644
--- a/app/Jobs/Company/CompanyExport.php
+++ b/app/Jobs/Company/CompanyExport.php
@@ -259,7 +259,7 @@ class CompanyExport implements ShouldQueue
         $this->export_data['invoices'] = $this->company->invoices()->orderBy('number', 'DESC')->cursor()->map(function ($invoice){
 
             $invoice = $this->transformBasicEntities($invoice);
-            $invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']);
+            $invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id','project_id']);
 
             return $invoice->makeVisible(['id',
                                         'private_notes',