From 6350c5bc1b6a8a638e9b411510727c9cc3ca3d12 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 6 Feb 2015 14:55:19 +0200
Subject: [PATCH] Fixed problem with history page list

---
 app/controllers/InvoiceController.php                 | 11 ++++++-----
 .../2013_11_05_180133_confide_setup_users_table.php   | 10 +++++-----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index 929f10e1a390..cedd12e10b25 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -505,9 +505,11 @@ class InvoiceController extends \BaseController
         $invoice->is_quote = intval($invoice->is_quote);
 
         $activityTypeId = $invoice->is_quote ? ACTIVITY_TYPE_UPDATE_QUOTE : ACTIVITY_TYPE_UPDATE_INVOICE;
-        $activities = Activity::scope(false, $invoice->account_id)->with(['user' => function($query) {
-            $query->select(['id', 'first_name', 'last_name']);
-        }])->where('activity_type_id', '=', $activityTypeId)->orderBy('id', 'desc')->get(['id', 'created_at', 'user_id', 'json_backup']);
+        $activities = Activity::scope(false, $invoice->account_id)
+                        ->where('activity_type_id', '=', $activityTypeId)
+                        ->where('invoice_id', '=', $invoice->id)
+                        ->orderBy('id', 'desc')
+                        ->get(['id', 'created_at', 'user_id', 'json_backup', 'message']);
 
         $versionsJson = [];
         $versionsSelect = [];
@@ -522,8 +524,7 @@ class InvoiceController extends \BaseController
             $backup->account = $invoice->account->toArray();
 
             $versionsJson[$activity->id] = $backup;
-            
-            $key = Utils::timestampToDateTimeString(strtotime($activity->created_at)) . ' - ' . $activity->user->getDisplayName();
+            $key = Utils::timestampToDateTimeString(strtotime($activity->created_at)) . ' - ' . Utils::decodeActivity($activity->message);
             $versionsSelect[$lastId ? $lastId : 0] = $key;
             $lastId = $activity->id;
         }
diff --git a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index 2bfb38b07f77..cb2594770923 100755
--- a/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -332,7 +332,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->decimal('balance', 13, 2);
         
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
-            $t->foreign('account_id')->references('id')->on('accounts'); 
+            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); 
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); 
             $t->foreign('invoice_status_id')->references('id')->on('invoice_statuses');
             $t->foreign('recurring_invoice_id')->references('id')->on('invoices')->onDelete('cascade');
@@ -424,7 +424,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->decimal('tax_rate', 13, 2)->nullable();
 
             $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
-            $t->foreign('product_id')->references('id')->on('products');
+            $t->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
 
             $t->unsignedInteger('public_id');
@@ -451,11 +451,11 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('transaction_reference')->nullable();
             $t->string('payer_id')->nullable();
 
-            $t->foreign('invoice_id')->references('id')->on('invoices');
+            $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
             $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
             $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
-            $t->foreign('contact_id')->references('id')->on('contacts');
-            $t->foreign('account_gateway_id')->references('id')->on('account_gateways');
+            $t->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
+            $t->foreign('account_gateway_id')->references('id')->on('account_gateways')->onDelete('cascade');
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
             $t->foreign('payment_type_id')->references('id')->on('payment_types');