mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-11-18 09:04:35 +01:00
bug fixes
This commit is contained in:
parent
da29bd8900
commit
99e4e40223
@ -388,7 +388,8 @@ class InvoiceController extends \BaseController {
|
||||
$invoice = Invoice::with('invoice_items')->scope($publicId)->firstOrFail();
|
||||
|
||||
$clone = Invoice::createNew();
|
||||
foreach (['client_id', 'discount', 'invoice_date', 'due_date', 'is_recurring', 'frequency_id', 'start_date', 'end_date', 'terms'] as $field)
|
||||
$clone->balance = $invoice->amount;
|
||||
foreach (['client_id', 'discount', 'invoice_date', 'due_date', 'is_recurring', 'frequency_id', 'start_date', 'end_date', 'terms', 'public_notes', 'invoice_design_id', 'tax_name', 'tax_rate', 'amount'] as $field)
|
||||
{
|
||||
$clone->$field = $invoice->$field;
|
||||
}
|
||||
|
@ -160,6 +160,14 @@ HTML::macro('image_data', function($imagePath) {
|
||||
HTML::macro('breadcrumbs', function() {
|
||||
$str = '<ol class="breadcrumb">';
|
||||
$crumbs = explode('/', $_SERVER['REQUEST_URI']);
|
||||
|
||||
foreach ($crumbs as $key => $val)
|
||||
{
|
||||
if (is_numeric($val))
|
||||
{
|
||||
unset($crumbs[$key]);
|
||||
}
|
||||
}
|
||||
for ($i=0; $i<count($crumbs); $i++) {
|
||||
$crumb = trim($crumbs[$i]);
|
||||
if (!$crumb) continue;
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
<label for="trashed" style="font-weight:normal">
|
||||
<input id="trashed" type="checkbox" onclick="setTrashVisible()"
|
||||
{{ Session::get('show_trash') ? 'checked' : ''}}/> Show archived/deleted
|
||||
{{ Session::get('show_trash') ? 'checked' : ''}}/> Show archived/deleted {{ $entityType }}s
|
||||
</label>
|
||||
|
||||
<div id="top_right_buttons" class="pull-right">
|
||||
|
Loading…
Reference in New Issue
Block a user