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

Fixes for exporting projects attached to invoices

Browse Source
This commit is contained in:
David Bomba 2022-03-11 13:20:53 +11:00
parent 10f599594f
commit 2f56a10aed
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -12,6 +12,7 @@
namespace App\Http\Controllers\ClientPortal; namespace App\Http\Controllers\ClientPortal;
use App\DataMapper\Analytics\TrialStarted;
use App\Factory\RecurringInvoiceFactory; use App\Factory\RecurringInvoiceFactory;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\Uploads\StoreUploadRequest; use App\Http\Requests\ClientPortal\Uploads\StoreUploadRequest;
@ -32,6 +33,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Turbo124\Beacon\Facades\LightLogs;
class NinjaPlanController extends Controller 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->next_send_date = now()->addDays(14)->format('Y-m-d');
$recurring_invoice->save(); $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 $this->render('plan.trial_confirmed', $data);
// return redirect('https://invoicing.co');
} }
@ -183,8 +187,6 @@ class NinjaPlanController extends Controller
public function plan() public function plan()
{ {
return $this->render('plan.trial_confirmed');
//harvest the current plan //harvest the current plan
$data = []; $data = [];
$data['late_invoice'] = false; $data['late_invoice'] = false;

2
app/Jobs/Company/CompanyExport.php
View File

@ -259,7 +259,7 @@ class CompanyExport implements ShouldQueue
$this->export_data['invoices'] = $this->company->invoices()->orderBy('number', 'DESC')->cursor()->map(function ($invoice){ $this->export_data['invoices'] = $this->company->invoices()->orderBy('number', 'DESC')->cursor()->map(function ($invoice){
$invoice = $this->transformBasicEntities($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', return $invoice->makeVisible(['id',
'private_notes', 'private_notes',