From 002c994c0b090df4da0c0e5efa624f5f3625afc1 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 6 Nov 2015 01:14:00 +0200
Subject: [PATCH] Refactoring datatable code

---
 app/Http/Controllers/ClientController.php  |  2 +-
 app/Http/Controllers/CreditController.php  |  2 +-
 app/Http/Controllers/InvoiceController.php |  2 +-
 app/Http/Controllers/PaymentController.php |  2 +-
 app/Http/Controllers/TaskController.php    |  2 +-
 app/Libraries/Utils.php                    |  4 +++-
 app/Services/DatatableService.php          | 14 ++++++++++++--
 resources/lang/en/texts.php                |  2 ++
 resources/views/list.blade.php             |  9 +++++++--
 9 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 7482ed3559e9..c281798ecd7c 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -51,7 +51,7 @@ class ClientController extends BaseController
             'entityType' => ENTITY_CLIENT,
             'title' => trans('texts.clients'),
             'sortCol' => '4',
-            'columns' => Utils::trans(['checkbox', 'client', 'contact', 'email', 'date_created', 'last_login', 'balance', 'action']),
+            'columns' => Utils::trans(['checkbox', 'client', 'contact', 'email', 'date_created', 'last_login', 'balance', '']),
         ));
     }
 
diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php
index 83f5b9dc5771..c3e3068c43bb 100644
--- a/app/Http/Controllers/CreditController.php
+++ b/app/Http/Controllers/CreditController.php
@@ -37,7 +37,7 @@ class CreditController extends BaseController
             'entityType' => ENTITY_CREDIT,
             'title' => trans('texts.credits'),
             'sortCol' => '4',
-            'columns' => Utils::trans(['checkbox', 'client', 'credit_amount', 'credit_balance', 'credit_date', 'private_notes', 'action']),
+            'columns' => Utils::trans(['checkbox', 'client', 'credit_amount', 'credit_balance', 'credit_date', 'private_notes', '']),
         ));
     }
 
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index b24022cfcd28..14676624c272 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -69,7 +69,7 @@ class InvoiceController extends BaseController
                 'balance_due',
                 'due_date',
                 'status',
-                'action'
+                ''
             ]),
         ];
 
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index f716d2f2a417..17331f21ac4f 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -46,7 +46,7 @@ class PaymentController extends BaseController
         return View::make('list', array(
             'entityType' => ENTITY_PAYMENT,
             'title' => trans('texts.payments'),
-            'columns' => Utils::trans(['checkbox', 'invoice', 'client', 'transaction_reference', 'method', 'payment_amount', 'payment_date', 'action']),
+            'columns' => Utils::trans(['checkbox', 'invoice', 'client', 'transaction_reference', 'method', 'payment_amount', 'payment_date', '']),
         ));
     }
 
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index b0e2c9a2ccfa..efd8f05bc680 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -43,7 +43,7 @@ class TaskController extends BaseController
             'entityType' => ENTITY_TASK,
             'title' => trans('texts.tasks'),
             'sortCol' => '2',
-            'columns' => Utils::trans(['checkbox', 'client', 'date', 'duration', 'description', 'status', 'action']),
+            'columns' => Utils::trans(['checkbox', 'client', 'date', 'duration', 'description', 'status', '']),
         ));
     }
 
diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php
index bf00184da92f..836d223162e3 100644
--- a/app/Libraries/Utils.php
+++ b/app/Libraries/Utils.php
@@ -150,8 +150,10 @@ class Utils
         foreach ($input as $field) {
             if ($field == "checkbox") {
                 $data[] = $field;
-            } else {
+            } elseif ($field) {
                 $data[] = trans("texts.$field");
+            } else {
+                $data[] = '';
             }
         }
 
diff --git a/app/Services/DatatableService.php b/app/Services/DatatableService.php
index 345f9377202d..067e5a574d34 100644
--- a/app/Services/DatatableService.php
+++ b/app/Services/DatatableService.php
@@ -40,8 +40,18 @@ class DatatableService
     private function createDropdown($entityType, $table, $actions)
     {
         $table->addColumn('dropdown', function ($model) use ($entityType, $actions) {
-            $str = '<div class="btn-group tr-action" style="visibility:hidden;">
-                    <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown">
+            $str = '';
+
+            if (property_exists($model, 'is_deleted') && $model->is_deleted) {
+                $str .= '<button type="button" class="btn btn-sm btn-danger tr-status" style="display:inline-block; width:80px">'.trans('texts.deleted').'</button>';
+            } elseif ($model->deleted_at && $model->deleted_at !== '0000-00-00') {
+                $str .= '<button type="button" class="btn btn-sm btn-warning tr-status" style="display:inline-block; width:80px">'.trans('texts.archived').'</button>';
+            } else {
+                $str .= '<div class="tr-status" style="display:inline-block; width:80px"></div>';
+            }
+
+            $str .= '<div class="btn-group tr-action" style="display:none;">
+                    <button type="button" class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" style="width:80px">
                         '.trans('texts.select').' <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu" role="menu">';
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 2aae6615b0ca..154b23025bce 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -906,4 +906,6 @@ return array(
     'deleted_recurring_invoice' => 'Successfully deleted recurring invoice',
     'restore_recurring_invoice' => 'Restore Recurring Invoice',
     'restored_recurring_invoice' => 'Successfully restored recurring invoice',
+    'archived' => 'Archived',
+    
 );
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 62c43929bfce..7bed68513938 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -135,12 +135,17 @@
             });
 
             $('tbody tr').mouseover(function() {
-                $(this).closest('tr').find('.tr-action').css('visibility', 'visible');
+                $(this).closest('tr').find('.tr-action').css('display', 'inline-block');
+                $(this).closest('tr').find('.tr-status').css('display', 'none');
             }).mouseout(function() {
+                //$(this).closest('tr').find('.tr-action').css('display', 'none');
+                
                 $dropdown = $(this).closest('tr').find('.tr-action');
                 if (!$dropdown.hasClass('open')) {
-                    $dropdown.css('visibility', 'hidden');
+                    $dropdown.css('display', 'none');
+                    $(this).closest('tr').find('.tr-status').css('display', 'inline-block');
                 }
+                
             });
 
         }