From d4df8747f7aa608ca638afdce39ea48e0e31f5da Mon Sep 17 00:00:00 2001
From: Patrick Samson <patricksamson236@gmail.com>
Date: Wed, 27 May 2015 13:27:29 -0400
Subject: [PATCH 1/3] fixed ambiguous column name in SQLite

---
 app/Http/Controllers/ClientController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 7a58ad08bb8c..9da18f804291 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -58,7 +58,7 @@ class ClientController extends BaseController
             ->addColumn('name', function ($model) { return link_to('clients/'.$model->public_id, $model->name); })
             ->addColumn('first_name', function ($model) { return link_to('clients/'.$model->public_id, $model->first_name.' '.$model->last_name); })
             ->addColumn('email', function ($model) { return link_to('clients/'.$model->public_id, $model->email); })
-            ->addColumn('created_at', function ($model) { return Utils::timestampToDateString(strtotime($model->created_at)); })
+            ->addColumn('clients.created_at', function ($model) { return Utils::timestampToDateString(strtotime($model->created_at)); })
             ->addColumn('last_login', function ($model) { return Utils::timestampToDateString(strtotime($model->last_login)); })
             ->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); })
             ->addColumn('dropdown', function ($model) {

From 2717298e5669c6b0efde48e534beb98549d26fd9 Mon Sep 17 00:00:00 2001
From: Patrick Samson <patricksamson236@gmail.com>
Date: Wed, 27 May 2015 13:29:52 -0400
Subject: [PATCH 2/3] fixed ambiguous column name in SQLite

---
 app/Http/Controllers/ActivityController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index bf37d1cb9a54..9704b3adaaad 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -17,7 +17,7 @@ class ActivityController extends BaseController
                     ->select('activities.id', 'activities.message', 'activities.created_at', 'clients.currency_id', 'activities.balance', 'activities.adjustment');
 
         return Datatable::query($query)
-            ->addColumn('id', function ($model) { return Utils::timestampToDateTimeString(strtotime($model->created_at)); })
+            ->addColumn('activities.id', function ($model) { return Utils::timestampToDateTimeString(strtotime($model->created_at)); })
             ->addColumn('message', function ($model) { return Utils::decodeActivity($model->message); })
             ->addColumn('balance', function ($model) { return Utils::formatMoney($model->balance, $model->currency_id); })
             ->addColumn('adjustment', function ($model) { return $model->adjustment != 0 ? self::wrapAdjustment($model->adjustment, $model->currency_id) : ''; })

From c60831f7f472649889ee6743dba43508fd302809 Mon Sep 17 00:00:00 2001
From: Patrick Samson <patricksamson236@gmail.com>
Date: Wed, 27 May 2015 13:45:50 -0400
Subject: [PATCH 3/3] Fix constraint violations in SQLite

---
 .../2013_11_05_180133_confide_setup_users_table.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/database/migrations/2013_11_05_180133_confide_setup_users_table.php
index cb2594770923..6a370bd67127 100644
--- a/database/migrations/2013_11_05_180133_confide_setup_users_table.php
+++ b/database/migrations/2013_11_05_180133_confide_setup_users_table.php
@@ -183,7 +183,7 @@ class ConfideSetupUsersTable extends Migration {
             $t->string('username')->unique();
             $t->string('email')->nullable();
             $t->string('password');
-            $t->string('confirmation_code');
+            $t->string('confirmation_code')->nullable();
             $t->boolean('registered')->default(false);
             $t->boolean('confirmed')->default(false);
             $t->integer('theme_id')->nullable();
@@ -355,8 +355,8 @@ class ConfideSetupUsersTable extends Migration {
             $t->softDeletes();
 
             $t->string('transaction_reference')->nullable();
-            $t->timestamp('sent_date');
-            $t->timestamp('viewed_date');
+            $t->timestamp('sent_date')->nullable();
+            $t->timestamp('viewed_date')->nullable();
 
             $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
             $t->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');