diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 6cd3d2295f..f805745c15 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -89,7 +89,7 @@ class InvoiceController extends \BaseController { $table->addColumn('frequency', function($model) { return link_to('invoices/' . $model->public_id, $model->frequency); }); if (!$clientPublicId) { - $table->addColumn('client', function($model) { return link_to('clients/' . $model->client_public_id, Utils::getClientDisplayName($model)); }); + $table->addColumn('client_name', function($model) { return link_to('clients/' . $model->client_public_id, Utils::getClientDisplayName($model)); }); } return $table->addColumn('start_date', function($model) { return Utils::fromSqlDate($model->start_date); }) diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php index c8327d0311..5f31ab7cc2 100755 --- a/app/ninja/repositories/InvoiceRepository.php +++ b/app/ninja/repositories/InvoiceRepository.php @@ -50,13 +50,13 @@ class InvoiceRepository { $query = \DB::table('invoices') ->join('clients', 'clients.id', '=','invoices.client_id') - ->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id') - ->join('contacts', 'contacts.client_id', '=', 'clients.id') - ->where('invoices.account_id', '=', $accountId) + ->join('frequencies', 'frequencies.id', '=', 'invoices.frequency_id') + ->join('contacts', 'contacts.client_id', '=', 'clients.id') + ->where('invoices.account_id', '=', $accountId) ->where('clients.deleted_at', '=', null) ->where('invoices.is_recurring', '=', true) ->where('contacts.is_primary', '=', true) - ->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email'); + ->select('clients.public_id as client_public_id', 'clients.name as client_name', 'invoices.public_id', 'amount', 'frequencies.name as frequency', 'start_date', 'end_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email'); if ($clientPublicId) { diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php index e948438dd1..ec56f0dd9b 100755 --- a/app/views/public/splash.blade.php +++ b/app/views/public/splash.blade.php @@ -40,7 +40,7 @@
-
+

100% FREE, ALWAYS

Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.

@@ -48,8 +48,7 @@
-
+

OPEN-SOURCE

Cloud-based, super secure, and user-developed. Open source platforms are a better way to do business (and save the world). Need we say more?

@@ -57,7 +56,7 @@
-
+

LIVE .PDF VIEW

Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.

@@ -65,8 +64,7 @@
-
+

ONLINE PAYMENTS

PayPal? Authorize.Net? Stripe? We support many payment technologies and if you need help or advice we’ll lend a hand (we’re pretty friendly).