From 30631b2bc49dcdf022848991c7fbd347835c33dd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 29 Nov 2015 18:00:50 +0200
Subject: [PATCH] Optimized client view page

---
 app/Ninja/Repositories/CreditRepository.php |   1 +
 app/Services/DatatableService.php           |  12 ++++++----
 public/favicon-v2.png                       | Bin 0 -> 3064 bytes
 resources/views/clients/show.blade.php      |  24 ++++++++++++++++++--
 resources/views/datatable.blade.php         |  17 ++++++++++----
 resources/views/invoices/knockout.blade.php |   2 +-
 resources/views/master.blade.php            |   2 +-
 7 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 public/favicon-v2.png

diff --git a/app/Ninja/Repositories/CreditRepository.php b/app/Ninja/Repositories/CreditRepository.php
index 1ac543c5b2..4fdace91ed 100644
--- a/app/Ninja/Repositories/CreditRepository.php
+++ b/app/Ninja/Repositories/CreditRepository.php
@@ -19,6 +19,7 @@ class CreditRepository extends BaseRepository
                     ->join('contacts', 'contacts.client_id', '=', 'clients.id')
                     ->where('clients.account_id', '=', \Auth::user()->account_id)
                     ->where('clients.deleted_at', '=', null)
+                    ->where('contacts.deleted_at', '=', null)
                     ->where('contacts.is_primary', '=', true)
                     ->select('credits.public_id', 'clients.name as client_name', 'clients.public_id as client_public_id', 'credits.amount', 'credits.balance', 'credits.credit_date', 'clients.currency_id', 'contacts.first_name', 'contacts.last_name', 'contacts.email', 'credits.private_notes', 'credits.deleted_at', 'credits.is_deleted');
 
diff --git a/app/Services/DatatableService.php b/app/Services/DatatableService.php
index 32d5909800..67636ebc96 100644
--- a/app/Services/DatatableService.php
+++ b/app/Services/DatatableService.php
@@ -12,7 +12,8 @@ class DatatableService
 
         if ($actions && $showCheckbox) {
             $table->addColumn('checkbox', function ($model) {
-                return '<input type="checkbox" name="ids[]" value="' . $model->public_id . '" ' . Utils::getEntityRowClass($model) . '>';
+                return '<input type="checkbox" name="ids[]" value="' . $model->public_id
+                        . '" ' . Utils::getEntityRowClass($model) . '>';
             });
         }
 
@@ -81,14 +82,17 @@ class DatatableService
                 }
 
                 if ($entityType != ENTITY_USER || $model->public_id) {
-                    $str .= "<li><a href=\"javascript:archiveEntity({$model->public_id})\">" . trans("texts.archive_{$entityType}") . "</a></li>";
+                    $str .= "<li><a href=\"javascript:archiveEntity({$model->public_id})\">"
+                            . trans("texts.archive_{$entityType}") . "</a></li>";
                 }
             } else {
-                $str .= "<li><a href=\"javascript:restoreEntity({$model->public_id})\">" . trans("texts.restore_{$entityType}") . "</a></li>";
+                $str .= "<li><a href=\"javascript:restoreEntity({$model->public_id})\">"
+                        . trans("texts.restore_{$entityType}") . "</a></li>";
             }
 
             if (property_exists($model, 'is_deleted') && !$model->is_deleted) {
-                $str .= "<li><a href=\"javascript:deleteEntity({$model->public_id})\">" . trans("texts.delete_{$entityType}") . "</a></li>";
+                $str .= "<li><a href=\"javascript:deleteEntity({$model->public_id})\">"
+                        . trans("texts.delete_{$entityType}") . "</a></li>";
             }
 
             return $str.'</ul></div>';
diff --git a/public/favicon-v2.png b/public/favicon-v2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fdfcb9aae66f41359c8e22d524914dfef9cf094
GIT binary patch
literal 3064
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
GLSTZZJ>P)<

literal 0
HcmV?d00001

diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index d8918f9d63..b83bbb51f7 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -186,6 +186,7 @@
 		    		trans('texts.balance'),
 		    		trans('texts.adjustment'))
 		    	->setUrl(url('api/activities/'. $client->public_id))
+                ->setCustomValues('entityType', 'activity')
 		    	->setOptions('sPaginationType', 'bootstrap')
 		    	->setOptions('bFilter', false)
 		    	->setOptions('aaSorting', [['0', 'desc']])
@@ -203,6 +204,7 @@
                     trans('texts.description'),
                     trans('texts.status'))
                 ->setUrl(url('api/tasks/'. $client->public_id))
+                ->setCustomValues('entityType', 'tasks')
                 ->setOptions('sPaginationType', 'bootstrap')
                 ->setOptions('bFilter', false)
                 ->setOptions('aaSorting', [['0', 'desc']])
@@ -223,6 +225,7 @@
 	    			trans('texts.valid_until'),
 	    			trans('texts.status'))
 		    	->setUrl(url('api/quotes/'. $client->public_id))
+                ->setCustomValues('entityType', 'quotes')
 		    	->setOptions('sPaginationType', 'bootstrap')
 		    	->setOptions('bFilter', false)
 		    	->setOptions('aaSorting', [['0', 'desc']])
@@ -241,6 +244,7 @@
 			    		trans('texts.end_date'),
 			    		trans('texts.invoice_total'))
 			    	->setUrl(url('api/recurring_invoices/' . $client->public_id))
+                    ->setCustomValues('entityType', 'recurring_invoices')
 			    	->setOptions('sPaginationType', 'bootstrap')
 			    	->setOptions('bFilter', false)
 			    	->setOptions('aaSorting', [['0', 'asc']])
@@ -256,6 +260,7 @@
 		    			trans('texts.due_date'),
 		    			trans('texts.status'))
 		    	->setUrl(url('api/invoices/' . $client->public_id))
+                ->setCustomValues('entityType', 'invoices')
 		    	->setOptions('sPaginationType', 'bootstrap')
 		    	->setOptions('bFilter', false)
 		    	->setOptions('aaSorting', [['0', 'desc']])
@@ -272,6 +277,7 @@
 			    			trans('texts.payment_amount'),
 			    			trans('texts.payment_date'))
 				->setUrl(url('api/payments/' . $client->public_id))
+                ->setCustomValues('entityType', 'payments')
 				->setOptions('sPaginationType', 'bootstrap')
 				->setOptions('bFilter', false)
 				->setOptions('aaSorting', [['0', 'desc']])
@@ -287,6 +293,7 @@
 								trans('texts.credit_date'),
 								trans('texts.private_notes'))
 				->setUrl(url('api/credits/' . $client->public_id))
+                ->setCustomValues('entityType', 'credits')
 				->setOptions('sPaginationType', 'bootstrap')
 				->setOptions('bFilter', false)
 				->setOptions('aaSorting', [['0', 'asc']])
@@ -297,6 +304,8 @@
 
 	<script type="text/javascript">
 
+    var loadedTabs = {};
+
 	$(function() {
 		$('.normalDropDown:not(.dropdown-toggle)').click(function() {
 			window.location = '{{ URL::to('clients/' . $client->public_id . '/edit') }}';
@@ -305,13 +314,24 @@
 			window.location = '{{ URL::to('invoices/create/' . $client->public_id ) }}';
 		});
 
+        // load datatable data when tab is shown and remember last tab selected
         $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
           var target = $(e.target).attr("href") // activated tab
+          target = target.substring(1);
           localStorage.setItem('client_tab', target);
+          if (!loadedTabs.hasOwnProperty(target)) {
+            loadedTabs[target] = true;
+            window['load_' + target]();
+            if (target == 'invoices') {
+                window['load_recurring_invoices']();
+            }
+          }
         });
-        var tab = localStorage.getItem('client_tab');
+        var tab = localStorage.getItem('client_tab').replace('#', '');
         if (tab) {
-            $('.nav-tabs a[href="' + tab + '"]').tab('show');
+            $('.nav-tabs a[href="#' + tab + '"]').tab('show');
+        } else {
+            window['load_activity']();
         }
 	});
 
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index cac84815a8..f21f6c8cff 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -32,8 +32,17 @@
     </tbody>
 </table>
 <script type="text/javascript">
-    jQuery(document).ready(function(){
-        // dynamic table
+    @if (isset($values['entityType']))
+            window.load_{{ $values['entityType'] }} = function load_{{ $values['entityType'] }}() {
+                load_{{ $class }}();
+            }
+    @else
+        jQuery(document).ready(function(){
+            load_{{ $class }}();
+        });
+    @endif
+
+    function load_{{ $class }}() {
         jQuery('.{{ $class }}').dataTable({
             "fnRowCallback": function(row, data) { 
                 if (data[0].indexOf('ENTITY_DELETED') > 0) {
@@ -49,7 +58,7 @@
             // Disable sorting on the first column
             "aoColumnDefs": [ {
                 'bSortable': false,
-                'aTargets': [ 0, {{ count($columns) - 1 }} ]                
+                'aTargets': [ 0, {{ count($columns) - 1 }} ]
             } ],
             @endif
             @foreach ($options as $k => $o)
@@ -64,5 +73,5 @@
                 }
             }
         });
-    });
+    }
 </script>
\ No newline at end of file
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index a66c2fcfe1..8308230634 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -354,7 +354,7 @@ function InvoiceModel(data) {
 
     self.totals.subtotal = ko.computed(function() {
         var total = self.totals.rawSubtotal();
-        return total > 0 ? formatMoney(total, self.client().currency_id()) : '';
+        return formatMoney(total, self.client().currency_id());
     });
 
     self.totals.rawDiscounted = ko.computed(function() {
diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php
index a5238a437f..ad13a7759d 100644
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@@ -6,7 +6,7 @@
     @else
         <title>{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}</title> 
         <meta name="description" content="{{ isset($description) ? $description : trans('texts.app_description') }}" />
-        <link href="{{ asset('favicon.png') }}" rel="shortcut icon">
+        <link href="{{ asset('favicon-v2.png') }}" rel="shortcut icon">
     @endif
 
     <!-- Source: https://github.com/hillelcoren/invoice-ninja -->