Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-10-15 09:19:41 +03:00
parent 8da5517206
commit a4960245c2
9 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/InvoiceController.php
View File

@ -443,8 +443,8 @@ class InvoiceController extends BaseController
// check if we created a new client with the invoice
if ($input->invoice->client->public_id == '-1') {
$message = $message.' '.trans('texts.and_created_client');
$url = URL::to('clients/'.$input->invoice->client->public_id);
Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT, $url);
$trackUrl = URL::to('clients/'.$invoice->client->public_id);
Utils::trackViewed($invoice->client->getDisplayName(), ENTITY_CLIENT, $trackUrl);
}
if ($action == 'clone') {

7
app/Http/routes.php
View File

@ -72,13 +72,6 @@ Route::post('hook/email_opened', 'AppController@emailOpened');
// Laravel auth routes
/*
Route::controllers([
'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]);
*/
get('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@getRegister'));
post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@postRegister'));
get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLoginWrapper'));

4
app/Libraries/Utils.php
View File

@ -259,6 +259,10 @@ class Utils
public static function dateToString($date)
{
if (!$date) {
return false;
}
$dateTime = new DateTime($date);
$timestamp = $dateTime->getTimestamp();
$format = Session::get(SESSION_DATE_FORMAT, DEFAULT_DATE_FORMAT);

3
public/css/built.css vendored
View File

@ -2352,6 +2352,9 @@ body { background: #f8f8f8 !important;
font-family: 'Roboto', sans-serif;
font-size: 15px;
}
html {
overflow-y: scroll;
}
.bold { font-weight: 700; }
a {color:#0b4d78;}
/*a:hover { text-decoration: none; color: #0a3857;}*/

4
public/css/built.public.css vendored
View File

@ -785,7 +785,9 @@ body {
font-size: 14px;
background-color: #f8f8f8;
}
html {
overflow-y: scroll;
}
@media screen and (min-width: 700px) {
.navbar-header {

4
public/css/public.style.css vendored
View File

@ -3,7 +3,9 @@ body {
font-size: 14px;
background-color: #f8f8f8;
}
html {
overflow-y: scroll;
}
@media screen and (min-width: 700px) {
.navbar-header {

3
public/css/style.css vendored
View File

@ -2,6 +2,9 @@ body { background: #f8f8f8 !important;
font-family: 'Roboto', sans-serif;
font-size: 15px;
}
html {
overflow-y: scroll;
}
.bold { font-weight: 700; }
a {color:#0b4d78;}
/*a:hover { text-decoration: none; color: #0a3857;}*/

6
resources/views/accounts/invoice_design.blade.php
View File

@ -95,12 +95,12 @@
@if (!Utils::isPro() || \App\Models\InvoiceDesign::count() == COUNT_FREE_DESIGNS_SELF_HOST)
{!! Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id')->addOption(trans('texts.more_designs') . '...', '-1') !!}
{!! Former::select('invoice_design_id')->style('display:inline')->fromQuery($invoiceDesigns, 'name', 'id')->addOption(trans('texts.more_designs') . '...', '-1') !!}
@else
{!! Former::select('invoice_design_id')->style('display:inline;width:120px')->fromQuery($invoiceDesigns, 'name', 'id') !!}
{!! Former::select('invoice_design_id')->style('display:inline')->fromQuery($invoiceDesigns, 'name', 'id') !!}
@endif
{!! Former::text('font_size')->type('number')->min('0')->step('1')->style('width:120px') !!}
{!! Former::text('font_size')->type('number')->min('0')->step('1') !!}
{!! Former::text('primary_color') !!}
{!! Former::text('secondary_color') !!}

4
resources/views/invoices/edit.blade.php
View File

@ -18,7 +18,7 @@
<li>{!! link_to('invoices', trans('texts.recurring_invoice')) !!}</li>
@else
<li>{!! link_to(($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'), trans('texts.' . ($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'))) !!}</li>
<li class='active'>{{ $invoice->invoice_number }}</li>
<li class="active">{{ $invoice->invoice_number }}</li>
@endif
</ol>
@endif
@ -115,7 +115,7 @@
</div>
@elseif ($invoice && isset($lastSent) && $lastSent)
<div class="pull-right" style="padding-top: 6px">
{!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, Utils::dateToString($invoice->last_sent_date), ['id' => 'lastSent'])]) !!}
{!! trans('texts.last_sent_on', ['date' => link_to('/invoices/'.$lastSent->public_id, $invoice->last_sent_date, ['id' => 'lastSent'])]) !!}
</div>
@endif
@endif