From 36114d251f2d0c2dda7d70896bd84ce402187dff Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 25 May 2014 17:48:00 +0300
Subject: [PATCH] Bug fixes

---
 app/controllers/PaymentController.php                | 6 +++---
 app/models/EntityModel.php                           | 2 +-
 app/ninja/repositories/InvoiceRepository.php         | 8 ++++----
 app/views/emails/invoice_html.blade.php              | 2 +-
 app/views/emails/payment_confirmation_html.blade.php | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php
index 53822ad487b1..749781149bb7 100755
--- a/app/controllers/PaymentController.php
+++ b/app/controllers/PaymentController.php
@@ -411,7 +411,7 @@ class PaymentController extends \BaseController
         
         if ($invoice->is_quote)
         {
-            $invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id, $invitation);
+            $invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id);
         }
         
         $payment = Payment::createNew($invitation);
@@ -430,10 +430,10 @@ class PaymentController extends \BaseController
         }
         
         $payment->save();
-
+        
         $invoice->invoice_status_id = INVOICE_STATUS_PAID;
         $invoice->save();
-                
+        
         Event::fire('invoice.paid', $payment);
         
         return $payment;
diff --git a/app/models/EntityModel.php b/app/models/EntityModel.php
index 20c4d79f9091..dc6d46f26d04 100755
--- a/app/models/EntityModel.php
+++ b/app/models/EntityModel.php
@@ -12,7 +12,7 @@ class EntityModel extends Eloquent
 		$className = get_called_class();
 		$entity = new $className();
 		
-		if ($parent) 
+		if ($parent)
 		{
 			$entity->user_id = $parent->user_id;
 			$entity->account_id = $parent->account_id;
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index 7f7979cf7cf9..c68c7b45c45f 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -318,11 +318,11 @@ class InvoiceRepository
 		return $invoice;
 	}
 
-  public function cloneInvoice($invoice, $quotePublicId = null, $invitation = null)
+  public function cloneInvoice($invoice, $quotePublicId = null)
   {
     $invoice->load('invitations', 'invoice_items');
 
-    $clone = Invoice::createNew($invitation ? $invitation : $invoice);
+    $clone = Invoice::createNew($invoice);
     $clone->balance = $invoice->amount;
     $clone->invoice_number = $invoice->account->getNextInvoiceNumber();
 
@@ -364,7 +364,7 @@ class InvoiceRepository
     
     foreach ($invoice->invoice_items as $item)
     {
-      $cloneItem = InvoiceItem::createNew();
+      $cloneItem = InvoiceItem::createNew($invoice);
       
       foreach ([
         'product_id', 
@@ -383,7 +383,7 @@ class InvoiceRepository
 
     foreach ($invoice->invitations as $invitation)
     {
-      $cloneInvitation = Invitation::createNew();
+      $cloneInvitation = Invitation::createNew($invoice);
       $cloneInvitation->contact_id = $invitation->contact_id;
       $cloneInvitation->invitation_key = str_random(RANDOM_KEY_LENGTH);
       $clone->invitations()->save($cloneInvitation);
diff --git a/app/views/emails/invoice_html.blade.php b/app/views/emails/invoice_html.blade.php
index f6334228e363..b9a985ca6f4f 100755
--- a/app/views/emails/invoice_html.blade.php
+++ b/app/views/emails/invoice_html.blade.php
@@ -19,7 +19,7 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=view_email_footer">Invoice Ninja</a>']) }}
       @endif    
 
     </body>
diff --git a/app/views/emails/payment_confirmation_html.blade.php b/app/views/emails/payment_confirmation_html.blade.php
index cdefeb3ec8bd..9f224df389d7 100644
--- a/app/views/emails/payment_confirmation_html.blade.php
+++ b/app/views/emails/payment_confirmation_html.blade.php
@@ -18,7 +18,7 @@
 
       @if ($showNinjaFooter)
       <p/>
-      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=email_footer">Invoice Ninja</a>']) }}
+      {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
       @endif
       
     </body>