From 787f88023add43594a79f4900b37f5d2fa0d7bf5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 22 Feb 2018 20:42:52 +0200
Subject: [PATCH] Working on L5.4

---
 composer.json  |  3 ++-
 composer.lock  | 70 +++++++++++++++++++++++++++++++++++++++++++++-----
 config/app.php |  3 +++
 3 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index e41d01d3d3e5..224622682539 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,7 @@
         "barryvdh/laravel-debugbar": "~2.2",
         "barryvdh/laravel-ide-helper": "~2.2",
         "cerdic/css-tidy": "~v1.5",
+        "chumper/datatable": "dev-add-back-options",
         "cleverit/ubl_invoice": "1.*",
         "codedge/laravel-selfupdater": "5.x-dev",
         "collizo4sky/omnipay-wepay": "dev-address-fix",
@@ -146,7 +147,7 @@
         },
         {
             "type": "vcs",
-            "url": "https://github.com/hillelcoren/omnipay-authorizenet"
+            "url": "https://github.com/hillelcoren/datatable"
         }
     ]
 }
diff --git a/composer.lock b/composer.lock
index 2438a97c0eb9..36bbbe0dbb4e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5be912a625595841e5796fc3852e5483",
-    "content-hash": "902aae75f2416ae434ad82c4f739a870",
+    "hash": "73cc6cc4d5ef1dc765346e16d08ab20f",
+    "content-hash": "aebd89b4966c82948f90bf1dfe6dc67e",
     "packages": [
         {
             "name": "abdala/omnipay-pagseguro",
@@ -393,16 +393,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.52.14",
+            "version": "3.52.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "56eaf614aa943dff652ce7458cfaf3220e568a6c"
+                "reference": "4b24dc72095c50f2256cef9c66b7c4db31ead5d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/56eaf614aa943dff652ce7458cfaf3220e568a6c",
-                "reference": "56eaf614aa943dff652ce7458cfaf3220e568a6c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4b24dc72095c50f2256cef9c66b7c4db31ead5d7",
+                "reference": "4b24dc72095c50f2256cef9c66b7c4db31ead5d7",
                 "shasum": ""
             },
             "require": {
@@ -469,7 +469,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-02-21 18:50:51"
+            "time": "2018-02-22 18:10:24"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -975,6 +975,61 @@
             "description": "CSSTidy is a CSS minifier",
             "time": "2017-09-29 14:18:45"
         },
+        {
+            "name": "chumper/datatable",
+            "version": "dev-add-back-options",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hillelcoren/Datatable.git",
+                "reference": "5672e7395e85b27f18166a6446bcecdba9719381"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hillelcoren/Datatable/zipball/5672e7395e85b27f18166a6446bcecdba9719381",
+                "reference": "5672e7395e85b27f18166a6446bcecdba9719381",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/config": "~5.0",
+                "illuminate/support": "~5.0",
+                "illuminate/view": "~5.0",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "dev-master",
+                "orchestra/testbench": "3.1.*",
+                "phpunit/phpunit": "3.7.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Chumper\\Datatable": "src/"
+                }
+            },
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Plaschke",
+                    "email": "github@nilsplaschke.de",
+                    "homepage": "http://nilsplaschke.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "This is a laravel 4 package for the server and client side of datatablaes at http://datatables.net/",
+            "homepage": "http://github.com/Chumper/datatable",
+            "keywords": [
+                "ajax",
+                "datatables",
+                "jquery",
+                "laravel"
+            ],
+            "support": {
+                "source": "https://github.com/hillelcoren/Datatable/tree/add-back-options"
+            },
+            "time": "2018-02-22 18:37:06"
+        },
         {
             "name": "cleverit/ubl_invoice",
             "version": "v1.0.1",
@@ -12714,6 +12769,7 @@
     ],
     "minimum-stability": "dev",
     "stability-flags": {
+        "chumper/datatable": 20,
         "codedge/laravel-selfupdater": 20,
         "collizo4sky/omnipay-wepay": 20,
         "digitickets/omnipay-gocardlessv2": 20,
diff --git a/config/app.php b/config/app.php
index 214bcb596445..05821f9e7fe8 100644
--- a/config/app.php
+++ b/config/app.php
@@ -161,6 +161,8 @@ return [
         Nwidart\Modules\LaravelModulesServiceProvider::class,
         Barryvdh\Cors\ServiceProvider::class,
         PragmaRX\Google2FALaravel\ServiceProvider::class,
+        'Chumper\Datatable\DatatableServiceProvider',
+
 
         /*
          * Application Service Providers...
@@ -262,6 +264,7 @@ return [
         'Excel'           => 'Maatwebsite\Excel\Facades\Excel',
         //'PushNotification' => 'Davibennun\LaravelPushNotification\Facades\PushNotification',
         //'Crawler'   => 'Jaybizzle\LaravelCrawlerDetect\Facades\LaravelCrawlerDetect',
+        'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade',
         'Updater' => Codedge\Updater\UpdaterFacade::class,
         'Module' => Nwidart\Modules\Facades\Module::class,