From 420de05ebc6e801623bc7f58b029023baba7a75f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 18 Oct 2015 13:37:04 +0300
Subject: [PATCH] Bug fixes

---
 app/Http/Controllers/InvoiceController.php | 2 +-
 app/Models/Invitation.php                  | 2 +-
 app/Models/Invoice.php                     | 6 +++---
 resources/views/invoices/edit.blade.php    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 16db772f08e6..7c04bafcd0e4 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -327,7 +327,7 @@ class InvoiceController extends BaseController
                         if ($invitation->contact_id == $contact->id) {
                             $contact->email_error = $invitation->email_error;
                             $contact->invitation_link = $invitation->getLink();
-                            $contact->invitation_viewed = $invitation->viewed_date;
+                            $contact->invitation_viewed = $invitation->viewed_date && $invitation->viewed_date != '0000-00-00 00:00:00' ? $invitation->viewed_date : false;
                             $contact->invitation_status = $contact->email_error ? false : $invitation->getStatus();
                         }
                     }
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 2d3c58f439e2..00807b1a6913 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -57,7 +57,7 @@ class Invitation extends EntityModel
         foreach ($statuses as $status) {
             $field = "{$status}_date";
             $date = '';
-            if ($this->$field) {
+            if ($this->$field && $this->field != '0000-00-00 00:00:00') {
                 $date = Utils::dateToString($this->$field);
                 $hasValue = true;
             }
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 396c421e2ab3..a0001150c09d 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -230,10 +230,10 @@ class Invoice extends EntityModel
             return false;
         }
 
-        $startDate = $this->last_sent_date ?: $this->start_date;
+        $startDate = $this->last_sent_date ?: $this->getOriginal('start_date');
         $startDate .= ' ' . DEFAULT_SEND_RECURRING_HOUR . ':00:00';
         $startDate = $this->account->getDateTime($startDate);
-        $endDate = $this->end_date ? $this->account->getDateTime($this->end_date) : null;
+        $endDate = $this->end_date ? $this->account->getDateTime($this->getOriginal('end_date')) : null;
         $timezone = $this->account->getTimezone();
 
         $rule = $this->getRecurrenceRule();
@@ -257,7 +257,7 @@ class Invoice extends EntityModel
     public function getNextSendDate()
     {
         if ($this->start_date && !$this->last_sent_date) {
-            $startDate = $this->start_date . ' ' . DEFAULT_SEND_RECURRING_HOUR . ':00:00';
+            $startDate = $this->getOriginal('start_date') . ' ' . DEFAULT_SEND_RECURRING_HOUR . ':00:00';
             return $this->account->getDateTime($startDate);
         }
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index d94606e4904d..30a550819367 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -119,9 +119,9 @@
                                     '<span class="glyphicon glyphicon-info-sign" style="padding-left:10px;color:#B1B5BA"></span></span>']) !!}
                         @endif
                     @endif
-    			@endif
                 </div>
             </div>
+            @endif
 		</div>
 
 		<div class="col-md-4" id="col_2">