From 703d61a22b8c6d3fa93f87a01acd179b58623016 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 9 Jan 2014 15:26:27 +0000
Subject: [PATCH] bug fixes

---
 app/commands/SendRecurringInvoices.php |  1 -
 app/config/app.php                     |  2 +-
 app/controllers/InvoiceController.php  | 10 +++++++++-
 app/models/Invoice.php                 | 23 -----------------------
 app/ninja/mailers/ContactMailer.php    |  2 --
 app/routes.php                         |  2 ++
 6 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/app/commands/SendRecurringInvoices.php b/app/commands/SendRecurringInvoices.php
index b9f0b9dc79fb..7ae6f1f4270b 100755
--- a/app/commands/SendRecurringInvoices.php
+++ b/app/commands/SendRecurringInvoices.php
@@ -29,7 +29,6 @@ class SendRecurringInvoices extends Command {
 
 		foreach ($invoices as $recurInvoice)
 		{
-			$this->info($recurInvoice->invoice_date);
 			$this->info('Processing Invoice ' . $recurInvoice->id . ' - Should send ' . ($recurInvoice->shouldSendToday() ? 'YES' : 'NO'));
 			
 			if (!$recurInvoice->shouldSendToday())
diff --git a/app/config/app.php b/app/config/app.php
index a26d57453e7e..5b4bee37d873 100755
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -26,7 +26,7 @@ return array(
 	|
 	*/
 
-	'url' => 'http://localhost',
+	'url' => 'http://www.invoiceninja.com',
 
 	/*
 	|--------------------------------------------------------------------------
diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index f82ced540549..ed104a56e3b6 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -136,6 +136,9 @@ class InvoiceController extends \BaseController {
 
 		$client->account->loadLocalizationSettings();		
 
+		$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
+		$invoice->due_date = Utils::fromSqlDate($invoice->due_date);
+
 		$data = array(
 			'invoice' => $invoice->hidePrivateFields(),
 			'invitation' => $invitation
@@ -289,7 +292,12 @@ class InvoiceController extends \BaseController {
 	{
 		$invoice = Invoice::scope($publicId)->with('account.country', 'client.contacts', 'client.country', 'invoice_items')->firstOrFail();
 		Utils::trackViewed($invoice->invoice_number . ' - ' . $invoice->client->getDisplayName(), ENTITY_INVOICE);
-			
+	
+		$invoice->invoice_date = Utils::fromSqlDate($invoice->invoice_date);
+		$invoice->due_date = Utils::fromSqlDate($invoice->due_date);
+		$invoice->start_date = Utils::fromSqlDate($invoice->start_date);
+		$invoice->end_date = Utils::fromSqlDate($invoice->end_date);
+
     	$contactIds = DB::table('invitations')
     				->join('contacts', 'contacts.id', '=','invitations.contact_id')
     				->where('invitations.invoice_id', '=', $invoice->id)
diff --git a/app/models/Invoice.php b/app/models/Invoice.php
index 535ae0a847ee..2b44d746fac1 100755
--- a/app/models/Invoice.php
+++ b/app/models/Invoice.php
@@ -36,27 +36,7 @@ class Invoice extends EntityModel
 	{
 		return ENTITY_INVOICE;
 	}	
-
-	public function getInvoiceDateAttribute($value)
-	{
-		return Utils::fromSqlDate($value);
-	}
 	
-	public function getDueDateAttribute($value)
-	{
-		return Utils::fromSqlDate($value);
-	}
-	
-	public function getStartDateAttribute($value)
-	{
-		return Utils::fromSqlDate($value);
-	}
-	
-	public function getEndDateAttribute($value)
-	{
-		return Utils::fromSqlDate($value);
-	}
-
 	public function isSent()
 	{
 		return $this->invoice_status_id >= INVOICE_STATUS_SENT;
@@ -89,9 +69,6 @@ class Invoice extends EntityModel
 
 	public function shouldSendToday()
 	{
-		//$dayOfWeekStart = strtotime($this->start_date);
-		return false;
-
 		$dayOfWeekToday = date('w');
 		$dayOfWeekStart = date('w', strtotime($this->start_date));
 
diff --git a/app/ninja/mailers/ContactMailer.php b/app/ninja/mailers/ContactMailer.php
index beaec51b72a7..b4efb77cde29 100755
--- a/app/ninja/mailers/ContactMailer.php
+++ b/app/ninja/mailers/ContactMailer.php
@@ -27,9 +27,7 @@ class ContactMailer extends Mailer {
 			$invitation->save();
 	
 			$data = array('link' => URL::to('view') . '/' . $invitation->invitation_key);		
-
 			$this->sendTo($invitation->contact->email, $invitation->user->email, $subject, $view, $data);
-			//$this->sendTo($invitation->contact->email, $subject, $view, $data);
 
 			Activity::emailInvoice($invitation);
 		}
diff --git a/app/routes.php b/app/routes.php
index db41fc1449fd..7a93c6c613a1 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -11,6 +11,8 @@
 |
 */
 
+//apc_clear_cache();
+
 //dd(DB::getQueryLog());
 //dd(Client::getPrivateId(1));
 //dd(new DateTime());