From 99e4e402233d59891fcf4c218660da6f725b594b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 20 Feb 2014 16:42:09 +0200 Subject: [PATCH] bug fixes --- app/controllers/InvoiceController.php | 5 +++-- app/routes.php | 10 +++++++++- app/views/list.blade.php | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php index 7117a797e077..0a93c4bf81cb 100755 --- a/app/controllers/InvoiceController.php +++ b/app/controllers/InvoiceController.php @@ -388,10 +388,11 @@ 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; - } + } if (!$clone->is_recurring) { diff --git a/app/routes.php b/app/routes.php index 3b79be97f88f..6dd40fcea0ed 100755 --- a/app/routes.php +++ b/app/routes.php @@ -159,7 +159,15 @@ HTML::macro('image_data', function($imagePath) { HTML::macro('breadcrumbs', function() { $str = '
    '; - $crumbs = explode('/', $_SERVER['REQUEST_URI']); + $crumbs = explode('/', $_SERVER['REQUEST_URI']); + + foreach ($crumbs as $key => $val) + { + if (is_numeric($val)) + { + unset($crumbs[$key]); + } + } for ($i=0; $i Show archived/deleted + {{ Session::get('show_trash') ? 'checked' : ''}}/> Show archived/deleted {{ $entityType }}s