Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 09:04:35 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-23 22:56:19 +02:00
parent 499b92ac87
commit 53f9eef3ca
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/InvoiceController.php
View File

@ -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); })

8
app/ninja/repositories/InvoiceRepository.php
View File

@ -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)
{

10
app/views/public/splash.blade.php
View File

@ -40,7 +40,7 @@
<div class="row">
<div class="col-md-3 one">
<div class="box">
<div class="icon"><img src="images/icon-free.png"></div>
<div class="icon"><img src="{{ asset('images/icon-free.png') }}"></div>
<h2>100% FREE, ALWAYS</h2>
<p>Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.</p>
</div>
@ -48,8 +48,7 @@
<div class="col-md-3 two">
<div class="box">
<div class="icon"><img src=
"images/icon-opensource.png"></div>
<div class="icon"><img src="{{ asset('images/icon-opensource.png') }}"></div>
<h2>OPEN-SOURCE</h2>
<p>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?</p>
</div>
@ -57,7 +56,7 @@
<div class="col-md-3 three">
<div class="box">
<div class="icon"><img src="images/icon-pdf.png"></div>
<div class="icon"><img src="{{ asset('images/icon-pdf.png') }}"></div>
<h2>LIVE .PDF VIEW</h2>
<p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>
</div>
@ -65,8 +64,7 @@
<div class="col-md-3 four">
<div class="box">
<div class="icon"><img src=
"images/icon-payment.png"></div>
<div class="icon"><img src="{{ asset('images/icon-payment.png') }}"></div>
<h2>ONLINE PAYMENTS</h2>
<p>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).</p>
</div>