From 06be7afedfa7528b40e8e2210e101b69154f37e5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 29 Sep 2015 21:19:18 +0300
Subject: [PATCH] Bug fixes

---
 app/Exceptions/Handler.php                 |  3 +-
 app/Http/Controllers/InvoiceController.php |  2 +-
 app/Http/Controllers/TaskController.php    |  7 ++++
 app/Libraries/Utils.php                    |  5 +++
 resources/views/auth/login.blade.php       |  6 ++-
 resources/views/invoices/edit.blade.php    | 43 ++++++++--------------
 6 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 177382ae67b6..ca6e43efd3b1 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -49,8 +49,7 @@ class Handler extends ExceptionHandler {
         }
         
         // In production, except for maintenance mode, we'll show a custom error screen
-        //if (Utils::isNinjaProd() && $e->getStatusCode() != 503) {
-        if (Utils::isNinjaProd()) {
+        if (Utils::isNinjaProd() && !Utils::isDownForMaintenance()) {
             $data = [
                 'error' => get_class($e),
                 'hideHeader' => true,
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index aaacbfb3a69a..7f7ee72ea790 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -586,7 +586,7 @@ class InvoiceController extends BaseController
     {
         Session::reflash();
 
-        return Redirect::to('invoices/'.$publicId.'/edit');
+        return Redirect::to("invoices/{$publicId}/edit");
     }
 
     /**
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 59e2439f0ea3..13d3fec2e0a8 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -119,6 +119,13 @@ class TaskController extends BaseController
         return $this->save();
     }
 
+    public function show($publicId)
+    {
+        Session::reflash();
+
+        return Redirect::to("tasks/{$publicId}/edit");
+    }
+
     /**
      * Show the form for creating a new resource.
      *
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index 9c54f5164a4b..a04d08b25a2b 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -40,6 +40,11 @@ class Utils
         }
     }
 
+    public static function isDownForMaintenance()
+    {
+        return file_exists(storage_path() . '/framework/down');
+    }
+
     public static function isProd()
     {
         return App::environment() == ENV_PRODUCTION;
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index b3ac449db155..faf732edf63a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -62,8 +62,12 @@
 @section('body')
 <div class="container">
 
+    @include('partials.warn_session', ['redirectTo' => '/login'])
 
-    {!! Former::open('login')->rules(['email' => 'required|email', 'password' => 'required'])->addClass('form-signin') !!}
+
+    {!! Former::open('login')
+            ->rules(['email' => 'required|email', 'password' => 'required'])
+            ->addClass('form-signin warn-on-exit') !!}
     {{ Former::populateField('remember', 'true') }}
 
     <div class="modal-header">
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 5aa57cb2fd76..ec36ceb95f61 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -691,21 +691,17 @@
             while($(this).outerHeight() < this.scrollHeight + parseFloat($(this).css("borderTopWidth")) + parseFloat($(this).css("borderBottomWidth"))) {
                 $(this).height($(this).height()+1);
             };
-        });        
+        });
 
 		@if (Auth::user()->account->fill_products)
-			$('.datalist').on('input', function() {			                
+			$('.datalist').on('input', function() {
 				var key = $(this).val();
 				for (var i=0; i<products.length; i++) {
 					var product = products[i];
 					if (product.product_key == key) {
-						var model = ko.dataFor(this);					
-                        if (!model.notes()) {
-						  model.notes(product.notes);
-                        }
-                        if (!model.cost()) {
-						  model.cost(accounting.toFixed(product.cost,2));
-                        }
+						var model = ko.dataFor(this);
+                        model.notes(product.notes);
+                        model.cost(accounting.toFixed(product.cost,2));
                         if (!model.qty()) {
 						  model.qty(1);
                         }
@@ -1741,23 +1737,22 @@
 			} else {
 				return total ? formatMoney(total, 1) : '';
 			}
-  	});
+      	});
 
-  	this.hideActions = function() {
-		this.actionsVisible(false);
-  	}
+        this.hideActions = function() {
+            this.actionsVisible(false);
+        }
 
-  	this.showActions = function() {
-		this.actionsVisible(true);
-  	}
+        this.showActions = function() {
+            this.actionsVisible(true);
+        }
 
-  	this.isEmpty = function() {
-  		return !self.product_key() && !self.notes() && !self.cost() && (!self.qty() || {{ $account->hide_quantity ? 'true' : 'false' }});
-  	}
+        this.isEmpty = function() {
+            return !self.product_key() && !self.notes() && !self.cost() && (!self.qty() || {{ $account->hide_quantity ? 'true' : 'false' }});
+        }
 
-  	this.onSelect = function(){              
+        this.onSelect = function() {}
     }
-	}
 
 	function onItemChange()
 	{
@@ -1772,12 +1767,6 @@
 		if (!hasEmpty) {
 			model.invoice().addItem();
 		}
-
-        /*
-		$('.word-wrap').each(function(index, input) {
-			$(input).height($(input).val().split('\n').length * 20);
-		});
-        */
 	}
 
 	function onTaxRateChange()