mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-08 11:14:31 -04:00
Bug fixes
This commit is contained in:
Hillel Coren
parent
4c1b33f601
commit
3d6530e83f
@ -6,11 +6,9 @@
|
|||||||
|
|
||||||
Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies.
|
Most online invoicing sites are expensive. They shouldn't be. The aim of this project is to provide a free, open-source alternative. Additionally, the hope is the codebase will serve as a sample site for Laravel as well as other JavaScript technologies.
|
||||||
|
|
||||||
The high level instructions for setting up the site are below but there's also a [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
|
The high level instructions for setting up the site are below but there's also a [setup guide](http://hillelcoren.com/invoice-ninja/laravel-ubuntu-virtualbox/). If you'd like to translate the site please use [caouecs/Laravel4-long](https://github.com/caouecs/Laravel4-lang) for the starter files.
|
||||||
|
|
||||||
For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja).
|
For updates follow [@invoiceninja](https://twitter.com/invoiceninja) or join the [Facebook Group](https://www.facebook.com/invoiceninja). For discussion of the code please use the [Google Group](https://groups.google.com/d/forum/invoiceninja).
|
||||||
|
|
||||||
If you'd like to translate the site please use [caouecs/Laravel4-long](https://github.com/caouecs/Laravel4-lang) for the starter files.
|
|
||||||
|
|
||||||
Site design by [kantorp-wegl.in](http://kantorp-wegl.in/)
|
Site design by [kantorp-wegl.in](http://kantorp-wegl.in/)
|
||||||
|
|
||||||
|
|||||||
@ -176,8 +176,16 @@ class InvoiceRepository
|
|||||||
|
|
||||||
$total += $total * $invoice->tax_rate / 100;
|
$total += $total * $invoice->tax_rate / 100;
|
||||||
|
|
||||||
$invoice->amount = $total;
|
if ($publicId)
|
||||||
$invoice->balance = $total;
|
{
|
||||||
|
$invoice->balance = $total - ($invoice->amount - $invoice->balance);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$invoice->balance = $total;
|
||||||
|
}
|
||||||
|
|
||||||
|
$invoice->amount = $total;
|
||||||
$invoice->save();
|
$invoice->save();
|
||||||
|
|
||||||
$invoice->invoice_items()->forceDelete();
|
$invoice->invoice_items()->forceDelete();
|
||||||
|
|||||||
@ -3,499 +3,502 @@
|
|||||||
|
|
||||||
|
|
||||||
@section('head')
|
@section('head')
|
||||||
<meta name="csrf-token" content="<?= csrf_token() ?>">
|
<meta name="csrf-token" content="<?= csrf_token() ?>">
|
||||||
|
|
||||||
<script src="{{ asset('vendor/jquery-ui/ui/minified/jquery-ui.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/jquery-ui/ui/minified/jquery-ui.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/bootstrap/dist/js/bootstrap.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/bootstrap/dist/js/bootstrap.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/datatables/media/js/jquery.dataTables.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/datatables/media/js/jquery.dataTables.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/datatables-bootstrap3/BS3/assets/js/datatables.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/datatables-bootstrap3/BS3/assets/js/datatables.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/knockout.js/knockout.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/knockout.js/knockout.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/knockout-mapping/build/output/knockout.mapping-latest.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/knockout-mapping/build/output/knockout.mapping-latest.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/knockout-sortable/build/knockout-sortable.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/knockout-sortable/build/knockout-sortable.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/underscore/underscore-min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/underscore/underscore-min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/bootstrap-datepicker/js/bootstrap-datepicker.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/bootstrap-datepicker/js/bootstrap-datepicker.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/typeahead.js/dist/typeahead.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/typeahead.js/dist/typeahead.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('vendor/accounting/accounting.min.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('vendor/accounting/accounting.min.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/bootstrap-combobox.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/bootstrap-combobox.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/jspdf.source.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/jspdf.source.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/jspdf.plugin.split_text_to_size.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/jspdf.plugin.split_text_to_size.js') }}" type="text/javascript"></script>
|
||||||
<script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/script.js') }}" type="text/javascript"></script>
|
||||||
|
|
||||||
<link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('vendor/bootstrap/dist/css/bootstrap.min.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('vendor/datatables/media/css/jquery.dataTables.css') }}" rel="stylesheet" type="text/css">
|
<link href="{{ asset('vendor/datatables/media/css/jquery.dataTables.css') }}" rel="stylesheet" type="text/css">
|
||||||
<link href="{{ asset('vendor/datatables-bootstrap3/BS3/assets/css/datatables.css') }}" rel="stylesheet" type="text/css">
|
<link href="{{ asset('vendor/datatables-bootstrap3/BS3/assets/css/datatables.css') }}" rel="stylesheet" type="text/css">
|
||||||
<link href="{{ asset('vendor/font-awesome/css/font-awesome.min.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('vendor/font-awesome/css/font-awesome.min.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('vendor/bootstrap-datepicker/css/datepicker.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('vendor/bootstrap-datepicker/css/datepicker.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('css/bootstrap-combobox.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('css/bootstrap-combobox.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('css/typeahead.js-bootstrap.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('css/typeahead.js-bootstrap.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>
|
<link href="{{ asset('css/style.css') }}" rel="stylesheet" type="text/css"/>
|
||||||
|
|
||||||
|
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|
||||||
body {
|
body {
|
||||||
/* background-color: #F6F6F6; */
|
/* background-color: #F6F6F6; */
|
||||||
background-color: #EEEEEE;
|
background-color: #EEEEEE;
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
var currencies = {{ Currency::remember(120)->get(); }};
|
var currencies = {{ Currency::remember(120)->get(); }};
|
||||||
var currencyMap = {};
|
var currencyMap = {};
|
||||||
for (var i=0; i<currencies.length; i++) {
|
for (var i=0; i<currencies.length; i++) {
|
||||||
var currency = currencies[i];
|
var currency = currencies[i];
|
||||||
currencyMap[currency.id] = currency;
|
currencyMap[currency.id] = currency;
|
||||||
}
|
}
|
||||||
var NINJA = {};
|
var NINJA = {};
|
||||||
NINJA.parseFloat = function(str) {
|
NINJA.parseFloat = function(str) {
|
||||||
if (!str) return '';
|
if (!str) return '';
|
||||||
str = (str+'').replace(/[^0-9\.\-]/g, '');
|
str = (str+'').replace(/[^0-9\.\-]/g, '');
|
||||||
return window.parseFloat(str);
|
return window.parseFloat(str);
|
||||||
|
}
|
||||||
|
function formatMoney(value, currency_id, hide_symbol) {
|
||||||
|
value = NINJA.parseFloat(value);
|
||||||
|
if (!currency_id) currency_id = {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY); }};
|
||||||
|
var currency = currencyMap[currency_id];
|
||||||
|
return accounting.formatMoney(value, hide_symbol ? '' : currency.symbol, currency.precision, currency.thousand_separator, currency.decimal_separator);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set the defaults for DataTables initialisation */
|
||||||
|
$.extend( true, $.fn.dataTable.defaults, {
|
||||||
|
"sDom": "t<'row-fluid'<'span6'i><'span6'p>>",
|
||||||
|
"sPaginationType": "bootstrap",
|
||||||
|
"bInfo": true,
|
||||||
|
"oLanguage": {
|
||||||
|
'sEmptyTable': "{{ trans('texts.empty_table') }}",
|
||||||
|
'sLengthMenu': '_MENU_',
|
||||||
|
'sSearch': ''
|
||||||
}
|
}
|
||||||
function formatMoney(value, currency_id, hide_symbol) {
|
} );
|
||||||
value = NINJA.parseFloat(value);
|
|
||||||
if (!currency_id) currency_id = {{ Session::get(SESSION_CURRENCY, DEFAULT_CURRENCY); }};
|
|
||||||
var currency = currencyMap[currency_id];
|
|
||||||
return accounting.formatMoney(value, hide_symbol ? '' : currency.symbol, currency.precision, currency.thousand_separator, currency.decimal_separator);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Set the defaults for DataTables initialisation */
|
</script>
|
||||||
$.extend( true, $.fn.dataTable.defaults, {
|
|
||||||
"sDom": "t<'row-fluid'<'span6'i><'span6'p>>",
|
|
||||||
"sPaginationType": "bootstrap",
|
|
||||||
"bInfo": true,
|
|
||||||
"oLanguage": {
|
|
||||||
'sEmptyTable': "{{ trans('texts.empty_table') }}",
|
|
||||||
'sLengthMenu': '_MENU_',
|
|
||||||
'sSearch': ''
|
|
||||||
}
|
|
||||||
} );
|
|
||||||
|
|
||||||
</script>
|
|
||||||
@stop
|
@stop
|
||||||
|
|
||||||
@section('body')
|
@section('body')
|
||||||
|
|
||||||
<p> </p>
|
<p> </p>
|
||||||
<p> </p>
|
<p> </p>
|
||||||
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
|
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
|
||||||
<span class="sr-only">Toggle navigation</span>
|
<span class="sr-only">Toggle navigation</span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
<span class="icon-bar"></span>
|
<span class="icon-bar"></span>
|
||||||
</button>
|
</button>
|
||||||
<a href="{{ URL::to('/') }}" class='navbar-brand'>
|
<a href="{{ URL::to('/') }}" class='navbar-brand'>
|
||||||
<img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:18px;width:auto"/>
|
<img src="{{ asset('images/invoiceninja-logo.png') }}" style="height:18px;width:auto"/>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="collapse navbar-collapse" id="navbar-collapse-1">
|
@if (Auth::check())
|
||||||
<ul class="nav navbar-nav" style="font-weight: bold">
|
<div class="collapse navbar-collapse" id="navbar-collapse-1">
|
||||||
{{ HTML::nav_link('dashboard', 'dashboard') }}
|
<ul class="nav navbar-nav" style="font-weight: bold">
|
||||||
{{ HTML::menu_link('client') }}
|
{{ HTML::nav_link('dashboard', 'dashboard') }}
|
||||||
{{ HTML::menu_link('invoice') }}
|
{{ HTML::menu_link('client') }}
|
||||||
{{ HTML::menu_link('payment') }}
|
{{ HTML::menu_link('invoice') }}
|
||||||
{{ HTML::menu_link('credit') }}
|
{{ HTML::menu_link('payment') }}
|
||||||
{{-- HTML::nav_link('reports', 'Reports') --}}
|
{{ HTML::menu_link('credit') }}
|
||||||
</ul>
|
{{-- HTML::nav_link('reports', 'Reports') --}}
|
||||||
<div class="navbar-form navbar-right">
|
</ul>
|
||||||
@if (Auth::check() && !Auth::user()->registered)
|
|
||||||
{{ Button::sm_success_primary('Sign up', array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }}
|
<div class="navbar-form navbar-right">
|
||||||
|
@if (Auth::check() && !Auth::user()->registered)
|
||||||
|
{{ Button::sm_success_primary('Sign up', array('id' => 'signUpButton', 'data-toggle'=>'modal', 'data-target'=>'#signUpModal')) }}
|
||||||
|
|
||||||
@if (Auth::check() && Auth::user()->showSignUpPopOver())
|
@if (Auth::check() && Auth::user()->showSignUpPopOver())
|
||||||
<button id="signUpPopOver" type="button" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Sign up to save your work" data-html="true" style="display:none">
|
<button id="signUpPopOver" type="button" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Sign up to save your work" data-html="true" style="display:none">
|
||||||
Sign Up
|
Sign Up
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
$(function() {
|
$(function() {
|
||||||
$('#signUpPopOver').show().popover('show').hide();
|
$('#signUpPopOver').show().popover('show').hide();
|
||||||
$('body').click(function() {
|
$('body').click(function() {
|
||||||
$('#signUpPopOver').popover('hide');
|
$('#signUpPopOver').popover('hide');
|
||||||
});
|
|
||||||
});
|
});
|
||||||
</script>
|
});
|
||||||
|
</script>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if (Auth::check())
|
<div class="btn-group">
|
||||||
<div class="btn-group">
|
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
|
||||||
<button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
|
<span id="myAccountButton">
|
||||||
<span id="myAccountButton">
|
@if (Auth::user()->registered)
|
||||||
@if (Auth::check() && Auth::user()->registered)
|
{{ Auth::user()->getFullName() }}
|
||||||
{{ Auth::user()->getFullName() }}
|
@else
|
||||||
@else
|
Guest
|
||||||
Guest
|
@endif
|
||||||
@endif
|
</span>
|
||||||
</span>
|
<span class="caret"></span>
|
||||||
<span class="caret"></span>
|
</button>
|
||||||
</button>
|
<ul class="dropdown-menu" role="menu">
|
||||||
<ul class="dropdown-menu" role="menu">
|
<li>{{ link_to('company/details', 'Company Details') }}</li>
|
||||||
<li>{{ link_to('company/details', 'Company Details') }}</li>
|
<li>{{ link_to('company/payments', 'Online Payments') }}</li>
|
||||||
<li>{{ link_to('company/payments', 'Online Payments') }}</li>
|
<li>{{ link_to('company/notifications', 'Notifications') }}</li>
|
||||||
<li>{{ link_to('company/notifications', 'Notifications') }}</li>
|
<li>{{ link_to('company/import_export', 'Import/Export') }}</li>
|
||||||
<li>{{ link_to('company/import_export', 'Import/Export') }}</li>
|
|
||||||
|
|
||||||
<li class="divider"></li>
|
<li class="divider"></li>
|
||||||
<li>{{ link_to('#', 'Logout', array('onclick'=>'logout()')) }}</li>
|
<li>{{ link_to('#', 'Logout', array('onclick'=>'logout()')) }}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<form class="navbar-form navbar-right" role="search">
|
<form class="navbar-form navbar-right" role="search">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<input type="text" id="search" class="form-control" placeholder="{{ trans('texts.search') }}">
|
<input type="text" id="search" class="form-control" placeholder="{{ trans('texts.search') }}">
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<ul class="nav navbar-nav navbar-right">
|
<ul class="nav navbar-nav navbar-right">
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ trans('texts.history') }} <b class="caret"></b></a>
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ trans('texts.history') }} <b class="caret"></b></a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
@if (count(Session::get(RECENTLY_VIEWED)) == 0)
|
@if (count(Session::get(RECENTLY_VIEWED)) == 0)
|
||||||
<li><a href="#">{{ trans('texts.no_items') }}</a></li>
|
<li><a href="#">{{ trans('texts.no_items') }}</a></li>
|
||||||
@else
|
@else
|
||||||
@foreach (Session::get(RECENTLY_VIEWED) as $link)
|
@foreach (Session::get(RECENTLY_VIEWED) as $link)
|
||||||
<li><a href="{{ $link->url }}">{{ $link->name }}</a></li>
|
<li><a href="{{ $link->url }}">{{ $link->name }}</a></li>
|
||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@endif
|
||||||
|
|
||||||
</div><!-- /.navbar-collapse -->
|
</div><!-- /.navbar-collapse -->
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
@if (!isset($showBreadcrumbs) || $showBreadcrumbs)
|
@if (!isset($showBreadcrumbs) || $showBreadcrumbs)
|
||||||
{{ HTML::breadcrumbs() }}
|
{{ HTML::breadcrumbs() }}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if (Session::has('warning'))
|
@if (Session::has('warning'))
|
||||||
<div class="alert alert-warning">{{ Session::get('warning') }}</div>
|
<div class="alert alert-warning">{{ Session::get('warning') }}</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if (Session::has('message'))
|
@if (Session::has('message'))
|
||||||
<div class="alert alert-info">{{ Session::get('message') }}</div>
|
<div class="alert alert-info">{{ Session::get('message') }}</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if (Session::has('error'))
|
@if (Session::has('error'))
|
||||||
<div class="alert alert-danger">{{ Session::get('error') }}</div>
|
<div class="alert alert-danger">{{ Session::get('error') }}</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@yield('content')
|
@yield('content')
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="footer" style="padding-top: 32px">
|
<div class="footer" style="padding-top: 32px">
|
||||||
@if (false)
|
@if (false)
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
{{ Former::open('user/setTheme')->addClass('themeForm') }}
|
{{ Former::open('user/setTheme')->addClass('themeForm') }}
|
||||||
<div style="display:none">
|
<div style="display:none">
|
||||||
{{ Former::text('theme_id') }}
|
{{ Former::text('theme_id') }}
|
||||||
{{ Former::text('path')->value(Request::url()) }}
|
{{ Former::text('path')->value(Request::url()) }}
|
||||||
</div>
|
</div>
|
||||||
<div class="btn-group tr-action dropup">
|
<div class="btn-group tr-action dropup">
|
||||||
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
|
<button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
|
||||||
Site Theme <span class="caret"></span>
|
Site Theme <span class="caret"></span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu" role="menu">
|
<ul class="dropdown-menu" role="menu">
|
||||||
<li><a href="#" onclick="setTheme(0)">Default</a></li>
|
<li><a href="#" onclick="setTheme(0)">Default</a></li>
|
||||||
@foreach (Theme::remember(DEFAULT_QUERY_CACHE)->get() as $theme)
|
@foreach (Theme::remember(DEFAULT_QUERY_CACHE)->get() as $theme)
|
||||||
<li><a href="#" onclick="setTheme({{ $theme->id }})">{{ ucwords($theme->name) }}</a></li>
|
<li><a href="#" onclick="setTheme({{ $theme->id }})">{{ ucwords($theme->name) }}</a></li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
{{ Former::close() }}
|
{{ Former::close() }}
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice-ninja', 'open source', array('target'=>'_blank')) }}, email us at {{ link_to('mailto:contact@invoiceninja.com', 'contact@invoiceninja.com') }}.
|
Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice-ninja', 'open source', array('target'=>'_blank')) }}, email us at {{ link_to('mailto:contact@invoiceninja.com', 'contact@invoiceninja.com') }}.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@if (!Auth::check() || !Auth::user()->registered)
|
@if (!Auth::check() || !Auth::user()->registered)
|
||||||
<div class="modal fade" id="signUpModal" tabindex="-1" role="dialog" aria-labelledby="signUpModalLabel" aria-hidden="true">
|
<div class="modal fade" id="signUpModal" tabindex="-1" role="dialog" aria-labelledby="signUpModalLabel" aria-hidden="true">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
<h4 class="modal-title" id="myModalLabel">Sign up</h4>
|
<h4 class="modal-title" id="myModalLabel">Sign up</h4>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="background-color: #fff; padding-right:20px" id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
|
<div style="background-color: #fff; padding-right:20px" id="signUpDiv" onkeyup="validateSignUp()" onclick="validateSignUp()" onkeydown="checkForEnter(event)">
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
{{ Former::open('signup/submit')->addClass('signUpForm') }}
|
{{ Former::open('signup/submit')->addClass('signUpForm') }}
|
||||||
|
|
||||||
@if (Auth::check())
|
@if (Auth::check())
|
||||||
{{ Former::populateField('new_first_name', Auth::user()->first_name); }}
|
{{ Former::populateField('new_first_name', Auth::user()->first_name); }}
|
||||||
{{ Former::populateField('new_last_name', Auth::user()->last_name); }}
|
{{ Former::populateField('new_last_name', Auth::user()->last_name); }}
|
||||||
{{ Former::populateField('new_email', Auth::user()->email); }}
|
{{ Former::populateField('new_email', Auth::user()->email); }}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
{{ Former::hidden('path')->value(Request::path()) }}
|
{{ Former::hidden('path')->value(Request::path()) }}
|
||||||
{{ Former::text('new_first_name')->label('First name') }}
|
{{ Former::text('new_first_name')->label('First name') }}
|
||||||
{{ Former::text('new_last_name')->label('Last name') }}
|
{{ Former::text('new_last_name')->label('Last name') }}
|
||||||
{{ Former::text('new_email')->label('Email') }}
|
{{ Former::text('new_email')->label('Email') }}
|
||||||
{{ Former::password('new_password')->label('Password') }}
|
{{ Former::password('new_password')->label('Password') }}
|
||||||
{{ Former::checkbox('terms_checkbox')->label(' ')->text('I agree to the Invoice Ninja <a href="'.URL::to('terms').'" target="_blank">Terms of Service</a>') }}
|
{{ Former::checkbox('terms_checkbox')->label(' ')->text('I agree to the Invoice Ninja <a href="'.URL::to('terms').'" target="_blank">Terms of Service</a>') }}
|
||||||
{{ Former::close() }}
|
{{ Former::close() }}
|
||||||
|
|
||||||
<center><div id="errorTaken" style="display:none"> <br/>The email address is already regiestered</div></center>
|
<center><div id="errorTaken" style="display:none"> <br/>The email address is already regiestered</div></center>
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="padding-left:40px;padding-right:40px;display:none;min-height:130px" id="working">
|
<div style="padding-left:40px;padding-right:40px;display:none;min-height:130px" id="working">
|
||||||
<h3>Working...</h3>
|
<h3>Working...</h3>
|
||||||
<div class="progress progress-striped active">
|
<div class="progress progress-striped active">
|
||||||
<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
|
<div class="progress-bar" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="signUpSuccessDiv">
|
<div style="background-color: #fff; padding-right:20px;padding-left:20px; display:none" id="signUpSuccessDiv">
|
||||||
<br/>
|
<br/>
|
||||||
<h3>Success</h3>
|
<h3>Success</h3>
|
||||||
You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.
|
You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.
|
||||||
<br/>
|
<br/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="modal-footer" id="signUpFooter" style="margin-top: 0px">
|
<div class="modal-footer" id="signUpFooter" style="margin-top: 0px">
|
||||||
<button type="button" class="btn btn-default" data-dismiss="modal">Close <i class="glyphicon glyphicon-remove-circle"></i></button>
|
<button type="button" class="btn btn-default" data-dismiss="modal">Close <i class="glyphicon glyphicon-remove-circle"></i></button>
|
||||||
<button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()" disabled>Save <i class="glyphicon glyphicon-floppy-disk"></i></button>
|
<button type="button" class="btn btn-primary" id="saveSignUpButton" onclick="validateServerSignUp()" disabled>Save <i class="glyphicon glyphicon-floppy-disk"></i></button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="logoutModalLabel" aria-hidden="true">
|
<div class="modal fade" id="logoutModal" tabindex="-1" role="dialog" aria-labelledby="logoutModalLabel" aria-hidden="true">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
<h4 class="modal-title" id="myModalLabel">Logout</h4>
|
<h4 class="modal-title" id="myModalLabel">Logout</h4>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<h3>Are you sure?</h3>
|
<h3>Are you sure?</h3>
|
||||||
<p>This will permanently erase your data.</p>
|
<p>This will permanently erase your data.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="modal-footer" id="signUpFooter">
|
<div class="modal-footer" id="signUpFooter">
|
||||||
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
|
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
|
||||||
<button type="button" class="btn btn-primary" onclick="logout(true)">Logout</button>
|
<button type="button" class="btn btn-primary" onclick="logout(true)">Logout</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if ($_SERVER['SERVER_NAME'] != 'www.invoiceninja.com')
|
@if ($_SERVER['SERVER_NAME'] != 'www.invoiceninja.com')
|
||||||
<div class="container">{{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/" target="_blank">InvoiceNinja.com</a></div>
|
<div class="container">{{ trans('texts.powered_by') }} <a href="https://www.invoiceninja.com/" target="_blank">InvoiceNinja.com</a></div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<p> </p>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
function setTheme(id)
|
||||||
|
{
|
||||||
|
$('#theme_id').val(id);
|
||||||
|
$('form.themeForm').submit();
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (!Auth::check() || !Auth::user()->registered)
|
||||||
|
function validateSignUp(showError)
|
||||||
|
{
|
||||||
|
var isFormValid = true;
|
||||||
|
$(['first_name','last_name','email','password']).each(function(i, field) {
|
||||||
|
var $input = $('form.signUpForm #new_'+field),
|
||||||
|
val = $.trim($input.val());
|
||||||
|
var isValid = val && val.length >= (field == 'password' ? 6 : 1);
|
||||||
|
if (isValid && field == 'email') {
|
||||||
|
isValid = isValidEmailAddress(val);
|
||||||
|
}
|
||||||
|
if (isValid) {
|
||||||
|
$input.closest('div.form-group').removeClass('has-error').addClass('has-success');
|
||||||
|
} else {
|
||||||
|
isFormValid = false;
|
||||||
|
$input.closest('div.form-group').removeClass('has-success');
|
||||||
|
if (showError) {
|
||||||
|
$input.closest('div.form-group').addClass('has-error');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!$('#terms_checkbox').is(':checked')) {
|
||||||
|
isFormValid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#saveSignUpButton').prop('disabled', !isFormValid);
|
||||||
|
|
||||||
|
return isFormValid;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateServerSignUp()
|
||||||
|
{
|
||||||
|
if (!validateSignUp(true)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$('#signUpDiv, #signUpFooter').hide();
|
||||||
|
$('#working').show();
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: '{{ URL::to('signup/validate') }}',
|
||||||
|
data: 'email=' + $('form.signUpForm #new_email').val(),
|
||||||
|
success: function(result) {
|
||||||
|
if (result == 'available') {
|
||||||
|
submitSignUp();
|
||||||
|
} else {
|
||||||
|
$('#errorTaken').show();
|
||||||
|
$('form.signUpForm #new_email').closest('div.form-group').removeClass('has-success').addClass('has-error');
|
||||||
|
$('#signUpDiv, #signUpFooter').show();
|
||||||
|
$('#working').hide();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function submitSignUp() {
|
||||||
|
$.ajax({
|
||||||
|
type: 'POST',
|
||||||
|
url: '{{ URL::to('signup/submit') }}',
|
||||||
|
data: 'new_email=' + encodeURIComponent($('form.signUpForm #new_email').val()) +
|
||||||
|
'&new_password=' + encodeURIComponent($('form.signUpForm #new_password').val()) +
|
||||||
|
'&new_first_name=' + encodeURIComponent($('form.signUpForm #new_first_name').val()) +
|
||||||
|
'&new_last_name=' + encodeURIComponent($('form.signUpForm #new_last_name').val()),
|
||||||
|
success: function(result) {
|
||||||
|
if (result) {
|
||||||
|
localStorage.setItem('guest_key', '');
|
||||||
|
isRegistered = true;
|
||||||
|
$('#signUpButton').hide();
|
||||||
|
$('#myAccountButton').html(result);
|
||||||
|
}
|
||||||
|
$('#signUpSuccessDiv, #signUpFooter').show();
|
||||||
|
$('#working, #saveSignUpButton').hide();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function checkForEnter(event)
|
||||||
|
{
|
||||||
|
if (event.keyCode === 13){
|
||||||
|
event.preventDefault();
|
||||||
|
validateServerSignUp();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<p> </p>
|
window.isRegistered = {{ Auth::check() && Auth::user()->registered ? 'true' : 'false' }};
|
||||||
|
function logout(force)
|
||||||
|
{
|
||||||
|
if (force || isRegistered) {
|
||||||
|
window.location = '{{ URL::to('logout') }}';
|
||||||
|
} else {
|
||||||
|
$('#logoutModal').modal('show');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
</body>
|
$(function()
|
||||||
|
{
|
||||||
|
$('#search').focus(function(){
|
||||||
<script type="text/javascript">
|
if (!window.hasOwnProperty('searchData')) {
|
||||||
|
$.get('{{ URL::route('getSearchData') }}', function(data) {
|
||||||
function setTheme(id)
|
window.searchData = true;
|
||||||
{
|
var datasets = [];
|
||||||
$('#theme_id').val(id);
|
for (var type in data)
|
||||||
$('form.themeForm').submit();
|
{
|
||||||
}
|
if (!data.hasOwnProperty(type)) continue;
|
||||||
|
datasets.push({
|
||||||
@if (!Auth::check() || !Auth::user()->registered)
|
name: type,
|
||||||
function validateSignUp(showError)
|
header: ' <b>' + type + '</b>',
|
||||||
{
|
local: data[type]
|
||||||
var isFormValid = true;
|
});
|
||||||
$(['first_name','last_name','email','password']).each(function(i, field) {
|
|
||||||
var $input = $('form.signUpForm #new_'+field),
|
|
||||||
val = $.trim($input.val());
|
|
||||||
var isValid = val && val.length >= (field == 'password' ? 6 : 1);
|
|
||||||
if (isValid && field == 'email') {
|
|
||||||
isValid = isValidEmailAddress(val);
|
|
||||||
}
|
|
||||||
if (isValid) {
|
|
||||||
$input.closest('div.form-group').removeClass('has-error').addClass('has-success');
|
|
||||||
} else {
|
|
||||||
isFormValid = false;
|
|
||||||
$input.closest('div.form-group').removeClass('has-success');
|
|
||||||
if (showError) {
|
|
||||||
$input.closest('div.form-group').addClass('has-error');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!$('#terms_checkbox').is(':checked')) {
|
|
||||||
isFormValid = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$('#saveSignUpButton').prop('disabled', !isFormValid);
|
|
||||||
|
|
||||||
return isFormValid;
|
|
||||||
}
|
|
||||||
|
|
||||||
function validateServerSignUp()
|
|
||||||
{
|
|
||||||
if (!validateSignUp(true)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$('#signUpDiv, #signUpFooter').hide();
|
|
||||||
$('#working').show();
|
|
||||||
|
|
||||||
$.ajax({
|
|
||||||
type: 'POST',
|
|
||||||
url: '{{ URL::to('signup/validate') }}',
|
|
||||||
data: 'email=' + $('form.signUpForm #new_email').val(),
|
|
||||||
success: function(result) {
|
|
||||||
if (result == 'available') {
|
|
||||||
submitSignUp();
|
|
||||||
} else {
|
|
||||||
$('#errorTaken').show();
|
|
||||||
$('form.signUpForm #new_email').closest('div.form-group').removeClass('has-success').addClass('has-error');
|
|
||||||
$('#signUpDiv, #signUpFooter').show();
|
|
||||||
$('#working').hide();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function submitSignUp() {
|
|
||||||
$.ajax({
|
|
||||||
type: 'POST',
|
|
||||||
url: '{{ URL::to('signup/submit') }}',
|
|
||||||
data: 'new_email=' + encodeURIComponent($('form.signUpForm #new_email').val()) +
|
|
||||||
'&new_password=' + encodeURIComponent($('form.signUpForm #new_password').val()) +
|
|
||||||
'&new_first_name=' + encodeURIComponent($('form.signUpForm #new_first_name').val()) +
|
|
||||||
'&new_last_name=' + encodeURIComponent($('form.signUpForm #new_last_name').val()),
|
|
||||||
success: function(result) {
|
|
||||||
if (result) {
|
|
||||||
localStorage.setItem('guest_key', '');
|
|
||||||
isRegistered = true;
|
|
||||||
$('#signUpButton').hide();
|
|
||||||
$('#myAccountButton').html(result);
|
|
||||||
}
|
|
||||||
$('#signUpSuccessDiv, #signUpFooter').show();
|
|
||||||
$('#working, #saveSignUpButton').hide();
|
|
||||||
}
|
}
|
||||||
|
if (datasets.length == 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
$('#search').typeahead(datasets).on('typeahead:selected', function(element, datum, name) {
|
||||||
|
var type = name == 'Contacts' ? 'clients' : name.toLowerCase();
|
||||||
|
window.location = '{{ URL::to('/') }}' + '/' + type + '/' + datum.public_id;
|
||||||
|
}).focus().typeahead('setQuery', $('#search').val());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
|
||||||
function checkForEnter(event)
|
|
||||||
{
|
if (isStorageSupported()) {
|
||||||
if (event.keyCode === 13){
|
@if (Auth::check() && !Auth::user()->registered)
|
||||||
event.preventDefault();
|
localStorage.setItem('guest_key', '{{ Auth::user()->password }}');
|
||||||
validateServerSignUp();
|
@endif
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
@if (!Auth::check() || !Auth::user()->registered)
|
||||||
|
validateSignUp();
|
||||||
|
|
||||||
|
$('#signUpModal').on('shown.bs.modal', function () {
|
||||||
|
$(['first_name','last_name','email','password']).each(function(i, field) {
|
||||||
|
var $input = $('form.signUpForm #new_'+field);
|
||||||
|
if (!$input.val()) {
|
||||||
|
$input.focus();
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
@endif
|
});
|
||||||
|
})
|
||||||
|
|
||||||
window.isRegistered = {{ Auth::check() && Auth::user()->registered ? 'true' : 'false' }};
|
/*
|
||||||
function logout(force)
|
$(window).on('beforeunload', function() {
|
||||||
{
|
return true;
|
||||||
if (force || isRegistered) {
|
});
|
||||||
window.location = '{{ URL::to('logout') }}';
|
$('form').submit(function() { $(window).off('beforeunload') });
|
||||||
} else {
|
$('a[rel!=ext]').click(function() { $(window).off('beforeunload') });
|
||||||
$('#logoutModal').modal('show');
|
*/
|
||||||
}
|
@endif
|
||||||
}
|
|
||||||
|
|
||||||
$(function()
|
@if (false && Session::has('message'))
|
||||||
{
|
setTimeout(function() {
|
||||||
$('#search').focus(function(){
|
$('.alert-info').fadeOut();
|
||||||
if (!window.hasOwnProperty('searchData')) {
|
}, 3000);
|
||||||
$.get('{{ URL::route('getSearchData') }}', function(data) {
|
@endif
|
||||||
window.searchData = true;
|
|
||||||
var datasets = [];
|
|
||||||
for (var type in data)
|
|
||||||
{
|
|
||||||
if (!data.hasOwnProperty(type)) continue;
|
|
||||||
datasets.push({
|
|
||||||
name: type,
|
|
||||||
header: ' <b>' + type + '</b>',
|
|
||||||
local: data[type]
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (datasets.length == 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$('#search').typeahead(datasets).on('typeahead:selected', function(element, datum, name) {
|
|
||||||
var type = name == 'Contacts' ? 'clients' : name.toLowerCase();
|
|
||||||
window.location = '{{ URL::to('/') }}' + '/' + type + '/' + datum.public_id;
|
|
||||||
}).focus().typeahead('setQuery', $('#search').val());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
@yield('onReady')
|
||||||
|
});
|
||||||
|
|
||||||
if (isStorageSupported()) {
|
</script>
|
||||||
@if (Auth::check() && !Auth::user()->registered)
|
|
||||||
localStorage.setItem('guest_key', '{{ Auth::user()->password }}');
|
|
||||||
@endif
|
|
||||||
}
|
|
||||||
|
|
||||||
@if (!Auth::check() || !Auth::user()->registered)
|
|
||||||
validateSignUp();
|
|
||||||
|
|
||||||
$('#signUpModal').on('shown.bs.modal', function () {
|
|
||||||
$(['first_name','last_name','email','password']).each(function(i, field) {
|
|
||||||
var $input = $('form.signUpForm #new_'+field);
|
|
||||||
if (!$input.val()) {
|
|
||||||
$input.focus();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
})
|
|
||||||
|
|
||||||
/*
|
|
||||||
$(window).on('beforeunload', function() {
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
$('form').submit(function() { $(window).off('beforeunload') });
|
|
||||||
$('a[rel!=ext]').click(function() { $(window).off('beforeunload') });
|
|
||||||
*/
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@if (false && Session::has('message'))
|
|
||||||
setTimeout(function() {
|
|
||||||
$('.alert-info').fadeOut();
|
|
||||||
}, 3000);
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@yield('onReady')
|
|
||||||
});
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
@stop
|
@stop
|
||||||
@ -93,7 +93,7 @@ function GetReportTemplate4(doc, invoice, layout, checkMath) {
|
|||||||
doc.setFontType("bold");
|
doc.setFontType("bold");
|
||||||
doc.text(layout.footerLeft, y, 'Balance Due');
|
doc.text(layout.footerLeft, y, 'Balance Due');
|
||||||
|
|
||||||
total = formatMoney(invoice.balance_amount, currencyId)
|
total = formatMoney(invoice.balance_amount, currencyId);
|
||||||
var totalX = layout.headerRight - (doc.getStringUnitWidth(total) * doc.internal.getFontSize());
|
var totalX = layout.headerRight - (doc.getStringUnitWidth(total) * doc.internal.getFontSize());
|
||||||
doc.text(totalX, y, total);
|
doc.text(totalX, y, total);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user