From 523b008d01f80f40d03fb84285a1d063bd82f0b9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 1 Feb 2016 15:58:52 +0200
Subject: [PATCH] Added support for right aligning table columns

---
 app/Http/Controllers/AccountController.php        |  1 -
 app/Http/Controllers/AccountGatewayController.php |  2 ++
 public/css/built.css                              |  4 ++++
 public/css/style.css                              |  4 ++++
 resources/views/accounts/bank_account.blade.php   |  2 +-
 resources/views/datatable.blade.php               | 14 ++++++++++----
 resources/views/list.blade.php                    |  1 +
 7 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 5cedc354ae12..02921782e035 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -722,7 +722,6 @@ class AccountController extends BaseController
 
     private function saveInvoiceDesign()
     {
-        //dd(Input::get('all_pages_header'));
         if (Auth::user()->account->isPro()) {
             $account = Auth::user()->account;
             $account->hide_quantity = Input::get('hide_quantity') ? true : false;
diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php
index 86c76ecf2760..5fc4d55c1a52 100644
--- a/app/Http/Controllers/AccountGatewayController.php
+++ b/app/Http/Controllers/AccountGatewayController.php
@@ -195,6 +195,8 @@ class AccountGatewayController extends BaseController
 
         if ($gatewayId == GATEWAY_DWOLLA) {
             $optional = array_merge($optional, ['key', 'secret']);
+        } elseif ($gatewayId == GATEWAY_STRIPE) {
+            $rules['publishable_key'] = 'required';
         }
 
         foreach ($fields as $field => $details) {
diff --git a/public/css/built.css b/public/css/built.css
index 763c36cddca6..a93d1f86a77c 100644
--- a/public/css/built.css
+++ b/public/css/built.css
@@ -3372,6 +3372,10 @@ ul.user-accounts a:hover div.remove {
     font-size: .9em;
 }
 
+td.right {
+  text-align: right;
+}
+
 /* Show selected section in settings nav */
 .list-group-item.selected:before {
     position: absolute;
diff --git a/public/css/style.css b/public/css/style.css
index d140f23f9661..78c44f781fe2 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -1021,6 +1021,10 @@ ul.user-accounts a:hover div.remove {
     font-size: .9em;
 }
 
+td.right {
+  text-align: right;
+}
+
 /* Show selected section in settings nav */
 .list-group-item.selected:before {
     position: absolute;
diff --git a/resources/views/accounts/bank_account.blade.php b/resources/views/accounts/bank_account.blade.php
index eca953dc4250..540463cf1d61 100644
--- a/resources/views/accounts/bank_account.blade.php
+++ b/resources/views/accounts/bank_account.blade.php
@@ -23,7 +23,7 @@
 
     <div class="panel panel-default">
     <div class="panel-heading">
-        <h3 class="panel-title" data-bind="text: title"></h3>
+        <h3 class="panel-title" data-bind="text: title">&nbsp;</h3>
     </div>
     <div class="panel-body">
 
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index f21f6c8cfff4..2d0b78d9faa4 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -56,10 +56,16 @@
             @if (isset($hasCheckboxes) && $hasCheckboxes)
             'aaSorting': [['1', 'asc']],
             // Disable sorting on the first column
-            "aoColumnDefs": [ {
-                'bSortable': false,
-                'aTargets': [ 0, {{ count($columns) - 1 }} ]
-            } ],
+            "aoColumnDefs": [ 
+                {
+                    'bSortable': false,
+                    'aTargets': [ 0, {{ count($columns) - 1 }} ]
+                },
+                {
+                    'sClass': 'right',
+                    'aTargets': {{ isset($values['rightAlign']) ? json_encode($values['rightAlign']) : '[]' }}
+                }
+            ],
             @endif
             @foreach ($options as $k => $o)
             {!! json_encode($k) !!}: {!! json_encode($o) !!},
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index d7b298957cc3..93aebcebb262 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -45,6 +45,7 @@
 	{!! Datatable::table()		
     	->addColumn($columns)
     	->setUrl(route('api.' . $entityType . 's'))    	
+        ->setCustomValues('rightAlign', isset($rightAlign) ? $rightAlign : [])
     	->setOptions('sPaginationType', 'bootstrap')
         ->setOptions('aaSorting', [[isset($sortCol) ? $sortCol : '1', 'desc']])
     	->render('datatable') !!}