diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 81da3b68c..f7cd6dced 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -41,6 +41,7 @@ class Handler extends ExceptionHandler */ public function report(\Throwable $e) { + dd($e); Bugsnag::setBeforeNotifyFunction(function ($error) { //set bugsnag return false; }); diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 8b9823822..3fcbad598 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -36,6 +36,7 @@ use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; use App\User; use Auth; +use Chumper\Datatable\Facades\DatatableFacade; use Crypt; use DB; use Exception; @@ -50,6 +51,7 @@ use Lang; use Mail; use PDF; use UTC; +use Yajra\DataTables\Facades\DataTables; /** * TicketController. @@ -678,7 +680,7 @@ class TicketController extends Controller $token = Str::random(60); $user->remember_token = $token; // mail user his/her password - //\Event::fire(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source)); + //\Illuminate\Support\Facades\Event::dispatch(new \App\Events\ClientTicketFormPost($from_data, $emailadd, $source)); if ($user->save()) { $user_id = $user->id; $email_mandatory = CommonSettings::select('status')->where('option_name', '=', 'email_mandatory')->first(); @@ -2684,7 +2686,7 @@ class TicketController extends Controller */ public function getTableFormat() { - return \Datatable::table() + return DatatableFacade::table() ->addColumn( '', Lang::get('lang.subject'), @@ -2716,7 +2718,7 @@ class TicketController extends Controller */ public static function genreateTableJson($tickets) { - return \Datatables::of($tickets) + return DataTables::of($tickets) ->editColumn('id', function ($tickets) { $rep = ($tickets->last_replier == 'client') ? '#F39C12' : '#000'; @@ -3159,7 +3161,7 @@ class TicketController extends Controller public static function getTable($tickets) { - return \Datatables::of($tickets) + return DataTables::of($tickets) ->addColumn('id', function ($tickets) { return ""; }) diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index f8f677198..a6eaa1479 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -11,19 +11,20 @@ use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Timezones; use App\User; -use Artisan; +Use Illuminate\Support\Facades\Artisan; // classes -use Cache; +use Illuminate\Support\Facades\Cache; use DB; use Exception; -use File; +use Illuminate\Support\Facades\File; use Hash; use Illuminate\Http\Request; use Illuminate\Support\Facades\Request as Input; -use Redirect; -use Session; +use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Facades\Redirect; +use Illuminate\Support\Facades\Session; use UnAuth; -use View; +use Illuminate\Support\Facades\View; /** * |======================================================================= diff --git a/app/Http/Controllers/Utility/LibraryController.php b/app/Http/Controllers/Utility/LibraryController.php index c8b324606..0b5b02149 100644 --- a/app/Http/Controllers/Utility/LibraryController.php +++ b/app/Http/Controllers/Utility/LibraryController.php @@ -61,7 +61,7 @@ class LibraryController extends Controller $public_key = openssl_get_publickey($key_content); $encrypted = $e = null; - openssl_seal($data, $encrypted, $e, [$public_key]); + openssl_seal($data, $encrypted, $e, [$public_key], 'rc4'); $sealed_data = base64_encode($encrypted); $envelope = base64_encode($e[0]); diff --git a/app/Http/ViewComposers/UserLanguage.php b/app/Http/ViewComposers/UserLanguage.php index 3674b17fb..83e97ecdf 100644 --- a/app/Http/ViewComposers/UserLanguage.php +++ b/app/Http/ViewComposers/UserLanguage.php @@ -12,7 +12,7 @@ class UserLanguage public function compose(View $view) { - $path = base_path().DIRECTORY_SEPARATOR.'resources'.DIRECTORY_SEPARATOR.'lang'; + $path = lang_path(); $langs = scandir($path); $langs = array_diff($langs, ['.', '..']); $languages = []; diff --git a/composer.json b/composer.json index d4e8d488b..582c0073c 100644 --- a/composer.json +++ b/composer.json @@ -7,6 +7,32 @@ ], "license": "MIT", "type": "project", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/RafficMohammed/laravel-push-notification.git" + }, + { + "type": "vcs", + "url": "https://github.com/RafficMohammed/Datatable.git" + }, + { + "type": "vcs", + "url": "https://github.com/RafficMohammed/Zipper.git" + }, + { + "type": "vcs", + "url": "https://github.com/RafficMohammed/Laravel-FCM.git" + }, + { + "type": "vcs", + "url": "https://github.com/RafficMohammed/laravel-ckeditor.git" + }, + { + "type": "vcs", + "url": "https://github.com/sandesh556/laravel-gravatar.git" + } + ], "require": { "php": "^8.0", "laravel/framework": "^9.46", @@ -32,7 +58,13 @@ "laravel/tinker": "^2.7", "laravel/ui": "^3.3", "guzzlehttp/guzzle": "^7.2", - "league/flysystem-aws-s3-v3": "^3.0" + "league/flysystem-aws-s3-v3": "^3.0", + "davibennun/laravel-push-notification": "dev-master", + "chumper/datatable": "dev-master", + "chumper/zipper": "dev-master", + "brozot/laravel-fcm": "dev-master", + "unisharp/laravel-ckeditor": "dev-master", + "thomaswelton/laravel-gravatar": "dev-master" }, "require-dev": { "phpunit/phpunit": "^9.5.10", @@ -44,7 +76,8 @@ "mockery/mockery": "^1.4.4", "fakerphp/faker": "^1.9.1", "barryvdh/laravel-debugbar": "^3.7", - "spatie/laravel-ignition": "^1.4" + "spatie/laravel-ignition": "^1.4", + "laravel/pint": "^1.4" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index a4a694fa1..93dada89b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2015b3cf782f2c9893c7995edf1060ae", + "content-hash": "7ebbbf8ffaf810ed88945255469750aa", "packages": [ { "name": "aws/aws-crt-php", @@ -206,6 +206,80 @@ ], "time": "2022-08-10T22:54:19+00:00" }, + { + "name": "brozot/laravel-fcm", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/RafficMohammed/Laravel-FCM.git", + "reference": "e5bbea1cf57eeba7f8f467111c87056175ee1cd6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RafficMohammed/Laravel-FCM/zipball/e5bbea1cf57eeba7f8f467111c87056175ee1cd6", + "reference": "e5bbea1cf57eeba7f8f467111c87056175ee1cd6", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~7.0", + "illuminate/support": "5.*|^6|9.*", + "monolog/monolog": "^1.12|^2.0", + "php": "^8.0" + }, + "require-dev": { + "laravel/laravel": "5.2.*", + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "4.7.*", + "satooshi/php-coveralls": "dev-master" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "LaravelFCM\\FCMServiceProvider" + ], + "aliases": { + "FCM": "LaravelFCM\\Facades\\FCM", + "FCMGroup": "LaravelFCM\\Facades\\FCMGroup" + } + } + }, + "autoload": { + "psr-4": { + "LaravelFCM\\": "src/", + "LaravelFCM\\Mocks\\": "tests/mocks" + } + }, + "autoload-dev": { + "classmap": [ + "tests/" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Brosy", + "email": "nicolas.brosy@gmail.com" + } + ], + "description": "Laravel / Lumen package for Firebase Cloud Messaging ", + "keywords": [ + "fcm", + "firebase", + "firebase cloud messaging", + "laravel", + "lumen", + "notification", + "push" + ], + "support": { + "source": "https://github.com/RafficMohammed/Laravel-FCM/tree/master" + }, + "time": "2023-01-18T11:13:47+00:00" + }, { "name": "bugsnag/bugsnag", "version": "v3.29.0", @@ -389,6 +463,131 @@ }, "time": "2022-01-12T11:07:19+00:00" }, + { + "name": "chumper/datatable", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/RafficMohammed/Datatable.git", + "reference": "a90fa9ae15d2bcaabcdcb8ae02b4162cce756b2b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RafficMohammed/Datatable/zipball/a90fa9ae15d2bcaabcdcb8ae02b4162cce756b2b", + "reference": "a90fa9ae15d2bcaabcdcb8ae02b4162cce756b2b", + "shasum": "" + }, + "require": { + "illuminate/config": "4.*|~5.0|9.*", + "illuminate/support": "4.*|~5.0|9.*", + "illuminate/view": "4.*|~5.0|9.*", + "php": "^8.0" + }, + "require-dev": { + "mockery/mockery": "dev-master", + "orchestra/testbench": "2.1.*", + "phpunit/phpunit": "3.7.*" + }, + "default-branch": true, + "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 9 package for the server and client side of datatables at http://datatables.net/", + "homepage": "http://github.com/Chumper/datatable", + "keywords": [ + "ajax", + "datatables", + "jquery", + "laravel" + ], + "support": { + "source": "https://github.com/RafficMohammed/Datatable/tree/master" + }, + "time": "2023-01-18T10:56:41+00:00" + }, + { + "name": "chumper/zipper", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/RafficMohammed/Zipper.git", + "reference": "c051e25320ce309f92530100feb69ee9776062c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RafficMohammed/Zipper/zipball/c051e25320ce309f92530100feb69ee9776062c1", + "reference": "c051e25320ce309f92530100feb69ee9776062c1", + "shasum": "" + }, + "require": { + "ext-zip": "*", + "illuminate/filesystem": "^9.0", + "illuminate/support": "^9.0", + "php": "^8.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.7" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Chumper\\Zipper\\ZipperServiceProvider" + ], + "aliases": { + "Zipper": "Chumper\\Zipper\\Zipper" + } + } + }, + "autoload": { + "psr-4": { + "Chumper\\Zipper\\": "src/Chumper/Zipper" + } + }, + "autoload-dev": { + "psr-4": { + "Chumper\\Zipper\\": "tests/" + } + }, + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Nils Plaschke", + "email": "github@nilsplaschke.de", + "homepage": "http://nilsplaschke.de", + "role": "Developer" + } + ], + "description": "This is a little neat helper for the ZipArchive methods with handy functions", + "homepage": "http://github.com/Chumper/zipper", + "keywords": [ + "Archive", + "ZIP", + "laravel" + ], + "support": { + "source": "https://github.com/RafficMohammed/Zipper/tree/master" + }, + "time": "2023-01-18T11:06:47+00:00" + }, { "name": "composer/ca-bundle", "version": "1.3.4", @@ -609,6 +808,51 @@ "abandoned": "diglactic/laravel-breadcrumbs", "time": "2019-12-30T22:50:51+00:00" }, + { + "name": "davibennun/laravel-push-notification", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/RafficMohammed/laravel-push-notification.git", + "reference": "f634dd1c831e880a053529072543d5d7a0dfc166" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RafficMohammed/laravel-push-notification/zipball/f634dd1c831e880a053529072543d5d7a0dfc166", + "reference": "f634dd1c831e880a053529072543d5d7a0dfc166", + "shasum": "" + }, + "require": { + "illuminate/support": "9.*", + "php": "^8.0", + "sly/notification-pusher": "2.*" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "Davibennun\\LaravelPushNotification": "src/" + } + }, + "authors": [ + { + "name": "DaviBenNun", + "email": "davi@andradenunes.org" + } + ], + "description": "Laravel package to send push notifications to mobile devices (apns, gcm)", + "keywords": [ + "apns", + "gcm", + "laravel", + "notification", + "push" + ], + "support": { + "source": "https://github.com/RafficMohammed/laravel-push-notification/tree/master" + }, + "time": "2023-01-18T07:51:42+00:00" + }, { "name": "dflydev/dot-access-data", "version": "v3.0.2", @@ -5566,6 +5810,72 @@ ], "time": "2022-12-31T22:20:34+00:00" }, + { + "name": "sly/notification-pusher", + "version": "v2.2.2", + "source": { + "type": "git", + "url": "https://github.com/Ph3nol/NotificationPusher.git", + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Ph3nol/NotificationPusher/zipball/6112841c4b679bc4f6cf01f6cf655e24794bc670", + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/console": ">=2.3", + "symfony/options-resolver": ">=2.3", + "symfony/process": ">=2.3", + "zendframework/zendservice-apple-apns": "1.*", + "zendframework/zendservice-google-gcm": "1.*" + }, + "require-dev": { + "atoum/atoum": "dev-master" + }, + "type": "standalone", + "autoload": { + "psr-0": { + "Sly": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cédric Dugat", + "email": "cedric@dugat.me" + }, + { + "name": "Contributors", + "homepage": "https://github.com/Ph3nol/NotificationPusher/contributors" + } + ], + "description": "Standalone PHP library for easy devices notifications push.", + "homepage": "https://github.com/Ph3nol/NotificationPusher", + "keywords": [ + "android", + "apns", + "apple", + "gcm", + "iphone", + "message", + "notification", + "push", + "pusher" + ], + "support": { + "issues": "https://github.com/Ph3nol/NotificationPusher/issues", + "source": "https://github.com/Ph3nol/NotificationPusher/tree/master" + }, + "time": "2013-12-08T20:35:03+00:00" + }, { "name": "symfony/console", "version": "v6.2.3", @@ -6442,6 +6752,73 @@ ], "time": "2022-12-14T16:38:10+00:00" }, + { + "name": "symfony/options-resolver", + "version": "v6.2.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "d28f02acde71ff75e957082cd36e973df395f626" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d28f02acde71ff75e957082cd36e973df395f626", + "reference": "d28f02acde71ff75e957082cd36e973df395f626", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.2.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-11-02T09:08:04+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.27.0", @@ -7882,6 +8259,133 @@ }, "time": "2015-01-08T03:22:20+00:00" }, + { + "name": "thomaswelton/gravatarlib", + "version": "0.1.0", + "target-dir": "thomaswelton/GravatarLib", + "source": { + "type": "git", + "url": "https://github.com/thomaswelton/gravatarlib.git", + "reference": "8a4e829c53ca2abb51ef2e514f696938a9bdbd0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thomaswelton/gravatarlib/zipball/8a4e829c53ca2abb51ef2e514f696938a9bdbd0c", + "reference": "8a4e829c53ca2abb51ef2e514f696938a9bdbd0c", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "suggest": { + "twig/twig": ">=1.4.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "thomaswelton\\GravatarLib\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Sam Thompson", + "email": "sam@emberlabs.org" + }, + { + "name": "Damian Bushong", + "email": "damian@emberlabs.org" + }, + { + "name": "Thomas Welton", + "email": "thomaswelton@me.com", + "homepage": "https://github.com/thomaswelton", + "role": "Developer" + } + ], + "description": "A lightweight PHP 5.3 OOP library providing easy gravatar integration.", + "keywords": [ + "gravatar", + "templating", + "twig" + ], + "support": { + "issues": "https://github.com/thomaswelton/gravatarlib/issues", + "source": "https://github.com/thomaswelton/gravatarlib/tree/master" + }, + "time": "2014-03-02T18:29:18+00:00" + }, + { + "name": "thomaswelton/laravel-gravatar", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sandesh556/laravel-gravatar.git", + "reference": "b42777a03739ca7a35edde8dc23ea8f8e915d84c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sandesh556/laravel-gravatar/zipball/b42777a03739ca7a35edde8dc23ea8f8e915d84c", + "reference": "b42777a03739ca7a35edde8dc23ea8f8e915d84c", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0", + "php": ">=5.4.0", + "thomaswelton/gravatarlib": "0.1.x" + }, + "require-dev": { + "mockery/mockery": "0.9.*", + "phpunit/phpunit": "4.8.*" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Thomaswelton\\LaravelGravatar\\LaravelGravatarServiceProvider" + ], + "aliases": { + "Gravatar": "Thomaswelton\\LaravelGravatar\\Facades\\Gravatar" + } + } + }, + "autoload": { + "psr-4": { + "Thomaswelton\\LaravelGravatar\\": "src/", + "Thomaswelton\\Tests\\LaravelGravatar\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "ThomasWelton", + "email": "thomaswelton@me.com", + "role": "Developer" + }, + { + "name": "Antoine Augusti", + "email": "antoine.augusti@gmail.com", + "role": "Developer" + } + ], + "description": "Laravel 5 Gravatar helper", + "homepage": "https://github.com/thomaswelton/laravel-gravatar", + "keywords": [ + "gravatar", + "laravel", + "laravel5" + ], + "support": { + "source": "https://github.com/sandesh556/laravel-gravatar/tree/master" + }, + "time": "2022-11-03T16:36:52+00:00" + }, { "name": "tijsverkoyen/css-to-inline-styles", "version": "2.2.6", @@ -8101,6 +8605,73 @@ ], "time": "2022-04-27T08:53:50+00:00" }, + { + "name": "unisharp/laravel-ckeditor", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/RafficMohammed/laravel-ckeditor.git", + "reference": "d11b9811e60c163d0916326b4399ab41f293ec01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/RafficMohammed/laravel-ckeditor/zipball/d11b9811e60c163d0916326b4399ab41f293ec01", + "reference": "d11b9811e60c163d0916326b4399ab41f293ec01", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Unisharp\\Ckeditor\\ServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Unisharp\\Ckeditor\\": "./" + } + }, + "license": [ + "GPL-2.0+", + "LGPL-2.1+", + "MPL-1.1+" + ], + "authors": [ + { + "name": "CKSource", + "homepage": "http://cksource.com" + }, + { + "name": "UniSharp Ltd. (Composer Package Maintainer)", + "homepage": "http://www.unisharp.com" + } + ], + "description": "JavaScript WYSIWYG web text editor (for laravel).", + "homepage": "http://ckeditor.com", + "keywords": [ + "ckeditor", + "editor", + "fckeditor", + "html", + "javascript", + "laravel", + "richtext", + "text", + "wysiwyg" + ], + "support": { + "issues": "http://dev.ckeditor.com", + "forum": "http://ckeditor.com/forums", + "wiki": "http://docs.ckeditor.com", + "source": "http://github.com/ckeditor/ckeditor-dev" + }, + "time": "2023-01-18T11:19:59+00:00" + }, { "name": "unisharp/laravel-filemanager", "version": "v2.5.1", @@ -8530,6 +9101,563 @@ } ], "time": "2022-07-12T04:48:03+00:00" + }, + { + "name": "zendframework/zend-escaper", + "version": "2.5.2", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-escaper.git", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Escaper\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-escaper", + "keywords": [ + "escaper", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-escaper/issues", + "source": "https://github.com/zendframework/zend-escaper/tree/master" + }, + "abandoned": "laminas/laminas-escaper", + "time": "2016-06-30T19:48:38+00:00" + }, + { + "name": "zendframework/zend-http", + "version": "2.5.3", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-http.git", + "reference": "21174ba162cfda8d0b1d172d9f80a8bea0b767be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/21174ba162cfda8d0b1d172d9f80a8bea0b767be", + "reference": "21174ba162cfda8d0b1d172d9f80a8bea0b767be", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "zendframework/zend-loader": "~2.5", + "zendframework/zend-stdlib": "~2.5", + "zendframework/zend-uri": "~2.5", + "zendframework/zend-validator": "~2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Http\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", + "homepage": "https://github.com/zendframework/zend-http", + "keywords": [ + "http", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-http/issues", + "source": "https://github.com/zendframework/zend-http/tree/master" + }, + "abandoned": "laminas/laminas-http", + "time": "2015-09-14T15:58:07+00:00" + }, + { + "name": "zendframework/zend-hydrator", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-hydrator.git", + "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/f3ed8b833355140350bbed98d8a7b8b66875903f", + "reference": "f3ed8b833355140350bbed98d8a7b8b66875903f", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "zendframework/zend-stdlib": "^2.5.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "^2.0@dev", + "zendframework/zend-eventmanager": "^2.5.1", + "zendframework/zend-filter": "^2.5.1", + "zendframework/zend-inputfilter": "^2.5.1", + "zendframework/zend-serializer": "^2.5.1", + "zendframework/zend-servicemanager": "^2.5.1" + }, + "suggest": { + "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage", + "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage", + "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy", + "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev", + "dev-develop": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Hydrator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-hydrator", + "keywords": [ + "hydrator", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-hydrator/issues", + "source": "https://github.com/zendframework/zend-hydrator/tree/master" + }, + "abandoned": "laminas/laminas-hydrator", + "time": "2015-09-17T14:06:43+00:00" + }, + { + "name": "zendframework/zend-json", + "version": "2.6.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-json.git", + "reference": "e2945611a98e1fefcaaf69969350a0bfa6a8d574" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-json/zipball/e2945611a98e1fefcaaf69969350a0bfa6a8d574", + "reference": "e2945611a98e1fefcaaf69969350a0bfa6a8d574", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-http": "~2.5", + "zendframework/zend-server": "~2.5", + "zendframework/zend-stdlib": "~2.5", + "zendframework/zendxml": "~1.0" + }, + "suggest": { + "zendframework/zend-http": "Zend\\Http component", + "zendframework/zend-server": "Zend\\Server component", + "zendframework/zend-stdlib": "To use the cache for Zend\\Server", + "zendframework/zendxml": "To support Zend\\Json\\Json::fromXml() usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Json\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides convenience methods for serializing native PHP to JSON and decoding JSON to native PHP", + "homepage": "https://github.com/zendframework/zend-json", + "keywords": [ + "json", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-json/issues", + "source": "https://github.com/zendframework/zend-json/tree/release-2.6.0" + }, + "abandoned": "laminas/laminas-json", + "time": "2015-11-18T13:59:33+00:00" + }, + { + "name": "zendframework/zend-loader", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-loader.git", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c", + "reference": "c5fd2f071bde071f4363def7dea8dec7393e135c", + "shasum": "" + }, + "require": { + "php": ">=5.3.23" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Loader\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-loader", + "keywords": [ + "loader", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-loader/issues", + "source": "https://github.com/zendframework/zend-loader/tree/release-2.5.0" + }, + "abandoned": "laminas/laminas-loader", + "time": "2015-06-03T14:05:47+00:00" + }, + { + "name": "zendframework/zend-stdlib", + "version": "2.7.4", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-stdlib.git", + "reference": "cae029346a33663b998507f94962eb27de060683" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cae029346a33663b998507f94962eb27de060683", + "reference": "cae029346a33663b998507f94962eb27de060683", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "zendframework/zend-hydrator": "~1.0" + }, + "require-dev": { + "athletic/athletic": "~0.1", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-config": "~2.5", + "zendframework/zend-eventmanager": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-inputfilter": "~2.5", + "zendframework/zend-serializer": "~2.5", + "zendframework/zend-servicemanager": "~2.5" + }, + "suggest": { + "zendframework/zend-eventmanager": "To support aggregate hydrator usage", + "zendframework/zend-filter": "To support naming strategy hydrator usage", + "zendframework/zend-serializer": "Zend\\Serializer component", + "zendframework/zend-servicemanager": "To support hydrator plugin manager usage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Stdlib\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "homepage": "https://github.com/zendframework/zend-stdlib", + "keywords": [ + "stdlib", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-stdlib/issues", + "source": "https://github.com/zendframework/zend-stdlib/tree/release-2.7.4" + }, + "abandoned": "laminas/laminas-stdlib", + "time": "2015-10-15T15:57:32+00:00" + }, + { + "name": "zendframework/zend-uri", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-uri.git", + "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "reference": "fe6c7f4c8d9037fe551898a538a2b6d39483f572", + "shasum": "" + }, + "require": { + "php": ">=5.3.23", + "zendframework/zend-escaper": "~2.5", + "zendframework/zend-validator": "~2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Uri\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "a component that aids in manipulating and validating » Uniform Resource Identifiers (URIs)", + "homepage": "https://github.com/zendframework/zend-uri", + "keywords": [ + "uri", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-uri/issues", + "source": "https://github.com/zendframework/zend-uri/tree/release-2.5.1" + }, + "abandoned": "laminas/laminas-uri", + "time": "2015-06-03T15:32:03+00:00" + }, + { + "name": "zendframework/zend-validator", + "version": "2.5.3", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-validator.git", + "reference": "53e567a58c8952a03da0b8edf0f075303a5ac5d1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/53e567a58c8952a03da0b8edf0f075303a5ac5d1", + "reference": "53e567a58c8952a03da0b8edf0f075303a5ac5d1", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "zendframework/zend-stdlib": "~2.5" + }, + "require-dev": { + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/phpunit": "~4.0", + "zendframework/zend-cache": "~2.5", + "zendframework/zend-config": "~2.5", + "zendframework/zend-db": "~2.5", + "zendframework/zend-filter": "~2.5", + "zendframework/zend-http": "~2.5", + "zendframework/zend-i18n": "~2.5", + "zendframework/zend-math": "~2.5", + "zendframework/zend-servicemanager": "~2.5", + "zendframework/zend-session": "~2.5", + "zendframework/zend-uri": "~2.5" + }, + "suggest": { + "zendframework/zend-db": "Zend\\Db component", + "zendframework/zend-filter": "Zend\\Filter component, required by the Digits validator", + "zendframework/zend-i18n": "Zend\\I18n component to allow translation of validation error messages as well as to use the various Date validators", + "zendframework/zend-i18n-resources": "Translations of validator messages", + "zendframework/zend-math": "Zend\\Math component", + "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", + "zendframework/zend-session": "Zend\\Session component", + "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.5-dev", + "dev-develop": "2.6-dev" + } + }, + "autoload": { + "psr-4": { + "Zend\\Validator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "provides a set of commonly needed validators", + "homepage": "https://github.com/zendframework/zend-validator", + "keywords": [ + "validator", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/zend-validator/issues", + "source": "https://github.com/zendframework/zend-validator/tree/release-2.5.3" + }, + "abandoned": "laminas/laminas-validator", + "time": "2015-09-03T19:06:11+00:00" + }, + { + "name": "zendframework/zendservice-apple-apns", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/zendframework/ZendService_Apple_Apns.git", + "reference": "ee2c44ee833206c1eb95b2fb7be1e2335e7570eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/ZendService_Apple_Apns/zipball/ee2c44ee833206c1eb95b2fb7be1e2335e7570eb", + "reference": "ee2c44ee833206c1eb95b2fb7be1e2335e7570eb", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "zendframework/zend-json": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "ZendService\\Apple\\Apns\\": "library/", + "ZendService\\Apple\\Exception\\": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "OOP Zend Framework 2 wrapper for Apple Push Notification Service", + "homepage": "http://packages.zendframework.com/", + "keywords": [ + "apns", + "apple", + "notification", + "push", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/ZendService_Apple_Apns/issues", + "source": "https://github.com/zendframework/ZendService_Apple_Apns/tree/release-1.2.0" + }, + "abandoned": true, + "time": "2015-12-09T22:55:07+00:00" + }, + { + "name": "zendframework/zendservice-google-gcm", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/zendframework/ZendService_Google_Gcm.git", + "reference": "86d16e9dcb4d41677e6f691642856b3eb95a1073" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/ZendService_Google_Gcm/zipball/86d16e9dcb4d41677e6f691642856b3eb95a1073", + "reference": "86d16e9dcb4d41677e6f691642856b3eb95a1073", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "zendframework/zend-http": ">=2.0.0", + "zendframework/zend-json": ">=2.0.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "ZendService\\Google\\Gcm\\": "library/", + "ZendService\\Google\\Exception\\": "library/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "OOP wrapper for Google Cloud Messaging", + "homepage": "http://packages.zendframework.com/", + "keywords": [ + "gcm", + "google", + "notification", + "push", + "zf2" + ], + "support": { + "issues": "https://github.com/zendframework/ZendService_Google_Gcm/issues", + "source": "https://github.com/zendframework/ZendService_Google_Gcm/tree/release-1.0.3" + }, + "abandoned": true, + "time": "2015-10-14T03:18:56+00:00" } ], "packages-dev": [ @@ -8950,6 +10078,72 @@ }, "time": "2022-09-29T09:37:07+00:00" }, + { + "name": "laravel/pint", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/laravel/pint.git", + "reference": "0e7ffdb0af871be10d798e234772ea5d4020ae4a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/pint/zipball/0e7ffdb0af871be10d798e234772ea5d4020ae4a", + "reference": "0e7ffdb0af871be10d798e234772ea5d4020ae4a", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*", + "ext-xml": "*", + "php": "^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~3.13.1", + "illuminate/view": "^9.32.0", + "laravel-zero/framework": "^9.2.0", + "mockery/mockery": "^1.5.1", + "nunomaduro/larastan": "^2.2.0", + "nunomaduro/termwind": "^1.14.0", + "pestphp/pest": "^1.22.1" + }, + "bin": [ + "builds/pint" + ], + "type": "project", + "autoload": { + "psr-4": { + "App\\": "app/", + "Database\\Seeders\\": "database/seeders/", + "Database\\Factories\\": "database/factories/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "An opinionated code formatter for PHP.", + "homepage": "https://laravel.com", + "keywords": [ + "format", + "formatter", + "lint", + "linter", + "php" + ], + "support": { + "issues": "https://github.com/laravel/pint/issues", + "source": "https://github.com/laravel/pint" + }, + "time": "2023-01-10T20:03:42+00:00" + }, { "name": "masterminds/html5", "version": "2.7.6", @@ -11722,7 +12916,13 @@ "stability-flags": { "neitanod/forceutf8": 20, "tymon/jwt-auth": 20, - "maatwebsite/excel": 20 + "maatwebsite/excel": 20, + "davibennun/laravel-push-notification": 20, + "chumper/datatable": 20, + "chumper/zipper": 20, + "brozot/laravel-fcm": 20, + "unisharp/laravel-ckeditor": 20, + "thomaswelton/laravel-gravatar": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/config/app.php b/config/app.php index 37836a824..69b00fe5b 100644 --- a/config/app.php +++ b/config/app.php @@ -182,6 +182,8 @@ return [ Yajra\Datatables\DatatablesServiceProvider::class, \App\Api\ApiServiceProvider::class, Barryvdh\Debugbar\ServiceProvider::class, + \Chumper\Datatable\DatatableServiceProvider::class, + \Yajra\DataTables\DataTablesServiceProvider::class ], /* |-------------------------------------------------------------------------- diff --git a/config/database.php b/config/database.php index ff0f35eca..f7791168d 100644 --- a/config/database.php +++ b/config/database.php @@ -56,7 +56,7 @@ return [ 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', 'prefix_indexes' => true, - 'strict' => true, + 'strict' => false, 'engine' => null, 'options' => extension_loaded('pdo_mysql') ? array_filter([ PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), diff --git a/database/migrations/2016_02_16_140450_create_department_table.php b/database/migrations/2016_02_16_140450_create_department_table.php index 394c5124b..e676faab2 100644 --- a/database/migrations/2016_02_16_140450_create_department_table.php +++ b/database/migrations/2016_02_16_140450_create_department_table.php @@ -17,15 +17,15 @@ return new class() extends Migration { $table->string('type'); $table->integer('sla')->unsigned()->nullable()->index('sla'); $table->integer('manager')->unsigned()->nullable()->index('manager_2'); - $table->string('ticket_assignment'); - $table->string('outgoing_email'); - $table->string('template_set'); - $table->string('auto_ticket_response'); - $table->string('auto_message_response'); - $table->string('auto_response_email'); - $table->string('recipient'); - $table->string('group_access'); - $table->string('department_sign'); + $table->string('ticket_assignment')->nullable(); + $table->string('outgoing_email')->nullable(); + $table->string('template_set')->nullable(); + $table->string('auto_ticket_response')->nullable(); + $table->string('auto_message_response')->nullable(); + $table->string('auto_response_email')->nullable(); + $table->string('recipient')->nullable(); + $table->string('group_access')->nullable(); + $table->string('department_sign')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_groups_table.php b/database/migrations/2016_02_16_140450_create_groups_table.php index c607fafe8..073995f6e 100644 --- a/database/migrations/2016_02_16_140450_create_groups_table.php +++ b/database/migrations/2016_02_16_140450_create_groups_table.php @@ -24,10 +24,10 @@ return new class() extends Migration { $table->boolean('can_delete_ticket'); $table->boolean('can_ban_email'); $table->boolean('can_manage_canned'); - $table->boolean('can_manage_faq'); + $table->boolean('can_manage_faq')->default(0); $table->boolean('can_view_agent_stats'); $table->boolean('department_access'); - $table->string('admin_notes'); + $table->string('admin_notes')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_help_topic_table.php b/database/migrations/2016_02_16_140450_create_help_topic_table.php index 9b7a79eb6..763176747 100644 --- a/database/migrations/2016_02_16_140450_create_help_topic_table.php +++ b/database/migrations/2016_02_16_140450_create_help_topic_table.php @@ -14,15 +14,15 @@ return new class() extends Migration { Schema::create('help_topic', function (Blueprint $table) { $table->increments('id'); $table->string('topic'); - $table->string('parent_topic'); + $table->string('parent_topic')->nullable(); $table->integer('custom_form')->unsigned()->nullable()->index('custom_form'); $table->integer('department')->unsigned()->nullable()->index('department'); $table->integer('ticket_status')->unsigned()->nullable()->index('ticket_status'); $table->integer('priority')->unsigned()->nullable()->index('priority'); $table->integer('sla_plan')->unsigned()->nullable()->index('sla_plan'); - $table->string('thank_page'); + $table->string('thank_page')->nullable(); $table->string('ticket_num_format'); - $table->string('internal_notes'); + $table->string('internal_notes')->nullable(); $table->boolean('status'); $table->boolean('type'); $table->integer('auto_assign')->unsigned()->nullable()->index('auto_assign_2'); diff --git a/database/migrations/2016_02_16_140450_create_password_resets_table.php b/database/migrations/2016_02_16_140450_create_password_resets_table.php index b0137d6bc..d404cdcf7 100644 --- a/database/migrations/2016_02_16_140450_create_password_resets_table.php +++ b/database/migrations/2016_02_16_140450_create_password_resets_table.php @@ -14,7 +14,7 @@ return new class() extends Migration { Schema::create('password_resets', function (Blueprint $table) { $table->string('email')->index(); $table->string('token')->index(); - $table->dateTime('created_at')->default('0000-00-00 00:00:00'); + $table->timestamp('created_at'); }); } diff --git a/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php b/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php index 23b61d11f..92659eb3b 100644 --- a/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php +++ b/database/migrations/2016_02_16_140450_create_settings_alert_notice_table.php @@ -13,35 +13,35 @@ return new class() extends Migration { { Schema::create('settings_alert_notice', function (Blueprint $table) { $table->increments('id'); - $table->boolean('ticket_status'); - $table->boolean('ticket_admin_email'); - $table->boolean('ticket_department_manager'); - $table->boolean('ticket_department_member'); - $table->boolean('ticket_organization_accmanager'); - $table->boolean('message_status'); - $table->boolean('message_last_responder'); - $table->boolean('message_assigned_agent'); - $table->boolean('message_department_manager'); - $table->boolean('message_organization_accmanager'); - $table->boolean('internal_status'); - $table->boolean('internal_last_responder'); - $table->boolean('internal_assigned_agent'); - $table->boolean('internal_department_manager'); - $table->boolean('assignment_status'); - $table->boolean('assignment_assigned_agent'); - $table->boolean('assignment_team_leader'); - $table->boolean('assignment_team_member'); - $table->boolean('transfer_status'); - $table->boolean('transfer_assigned_agent'); - $table->boolean('transfer_department_manager'); - $table->boolean('transfer_department_member'); - $table->boolean('overdue_status'); - $table->boolean('overdue_assigned_agent'); - $table->boolean('overdue_department_manager'); - $table->boolean('overdue_department_member'); - $table->boolean('system_error'); - $table->boolean('sql_error'); - $table->boolean('excessive_failure'); + $table->boolean('ticket_status')->default(0); + $table->boolean('ticket_admin_email')->default(0); + $table->boolean('ticket_department_manager')->default(0); + $table->boolean('ticket_department_member')->default(0); + $table->boolean('ticket_organization_accmanager')->default(0); + $table->boolean('message_status')->default(0); + $table->boolean('message_last_responder')->default(0); + $table->boolean('message_assigned_agent')->default(0); + $table->boolean('message_department_manager')->default(0); + $table->boolean('message_organization_accmanager')->default(0); + $table->boolean('internal_status')->default(0); + $table->boolean('internal_last_responder')->default(0); + $table->boolean('internal_assigned_agent')->default(0); + $table->boolean('internal_department_manager')->default(0); + $table->boolean('assignment_status')->default(0); + $table->boolean('assignment_assigned_agent')->default(0); + $table->boolean('assignment_team_leader')->default(0); + $table->boolean('assignment_team_member')->default(0); + $table->boolean('transfer_status')->default(0); + $table->boolean('transfer_assigned_agent')->default(0); + $table->boolean('transfer_department_manager')->default(0); + $table->boolean('transfer_department_member')->default(0); + $table->boolean('overdue_status')->default(0); + $table->boolean('overdue_assigned_agent')->default(0); + $table->boolean('overdue_department_manager')->default(0); + $table->boolean('overdue_department_member')->default(0); + $table->boolean('system_error')->default(0); + $table->boolean('sql_error')->default(0); + $table->boolean('excessive_failure')->default(0); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php b/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php index 07b178b03..4b5b73a40 100644 --- a/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php +++ b/database/migrations/2016_02_16_140450_create_settings_auto_response_table.php @@ -13,11 +13,11 @@ return new class() extends Migration { { Schema::create('settings_auto_response', function (Blueprint $table) { $table->increments('id'); - $table->boolean('new_ticket'); - $table->boolean('agent_new_ticket'); - $table->boolean('submitter'); - $table->boolean('participants'); - $table->boolean('overlimit'); + $table->boolean('new_ticket')->default(0); + $table->boolean('agent_new_ticket')->default(0); + $table->boolean('submitter')->default(0); + $table->boolean('participants')->default(0); + $table->boolean('overlimit')->default(0); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_settings_email_table.php b/database/migrations/2016_02_16_140450_create_settings_email_table.php index 092817245..951414c36 100644 --- a/database/migrations/2016_02_16_140450_create_settings_email_table.php +++ b/database/migrations/2016_02_16_140450_create_settings_email_table.php @@ -15,16 +15,16 @@ return new class() extends Migration { $table->increments('id'); $table->string('template'); $table->string('sys_email')->nullable(); - $table->string('alert_email'); - $table->string('admin_email'); - $table->string('mta'); - $table->boolean('email_fetching'); - $table->boolean('notification_cron'); - $table->boolean('strip'); - $table->boolean('separator'); - $table->boolean('all_emails'); - $table->boolean('email_collaborator'); - $table->boolean('attachment'); + $table->string('alert_email')->nullable(); + $table->string('admin_email')->nullable(); + $table->string('mta')->nullable(); + $table->boolean('email_fetching')->default(0); + $table->boolean('notification_cron')->default(0); + $table->boolean('strip')->default(0); + $table->boolean('separator')->default(0); + $table->boolean('all_emails')->default(0); + $table->boolean('email_collaborator')->default(0); + $table->boolean('attachment')->default(0); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_settings_system_table.php b/database/migrations/2016_02_16_140450_create_settings_system_table.php index d3620dc96..54652ac35 100644 --- a/database/migrations/2016_02_16_140450_create_settings_system_table.php +++ b/database/migrations/2016_02_16_140450_create_settings_system_table.php @@ -20,8 +20,8 @@ return new class() extends Migration { $table->string('page_size'); $table->string('log_level'); $table->string('purge_log'); - $table->integer('api_enable'); - $table->integer('api_key_mandatory'); + $table->integer('api_enable')->nullable(); + $table->integer('api_key_mandatory')->nullable(); $table->string('api_key'); $table->string('name_format'); $table->integer('time_farmat')->unsigned()->nullable()->index('time_farmat'); diff --git a/database/migrations/2016_02_16_140450_create_sla_plan_table.php b/database/migrations/2016_02_16_140450_create_sla_plan_table.php index fd5959deb..1c878ab92 100644 --- a/database/migrations/2016_02_16_140450_create_sla_plan_table.php +++ b/database/migrations/2016_02_16_140450_create_sla_plan_table.php @@ -15,10 +15,10 @@ return new class() extends Migration { $table->increments('id'); $table->string('name'); $table->string('grace_period'); - $table->string('admin_note'); + $table->string('admin_note')->nullable(); $table->boolean('status'); - $table->boolean('transient'); - $table->boolean('ticket_overdue'); + $table->boolean('transient')->nullable(); + $table->boolean('ticket_overdue')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_teams_table.php b/database/migrations/2016_02_16_140450_create_teams_table.php index 8d5d37166..4496dbcbf 100644 --- a/database/migrations/2016_02_16_140450_create_teams_table.php +++ b/database/migrations/2016_02_16_140450_create_teams_table.php @@ -14,10 +14,10 @@ return new class() extends Migration { Schema::create('teams', function (Blueprint $table) { $table->increments('id'); $table->string('name'); - $table->boolean('status'); + $table->boolean('status')->default(0); $table->integer('team_lead')->unsigned()->nullable()->index('team_lead'); - $table->boolean('assign_alert'); - $table->string('admin_notes'); + $table->boolean('assign_alert')->default(0); + $table->string('admin_notes')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_ticket_priority_table.php b/database/migrations/2016_02_16_140450_create_ticket_priority_table.php index 21063d23e..d35f7df22 100644 --- a/database/migrations/2016_02_16_140450_create_ticket_priority_table.php +++ b/database/migrations/2016_02_16_140450_create_ticket_priority_table.php @@ -19,7 +19,7 @@ return new class() extends Migration { $table->string('priority_color'); $table->boolean('priority_urgency'); $table->boolean('ispublic'); - $table->string('is_default'); + $table->string('is_default')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_02_16_140450_create_ticket_status_table.php b/database/migrations/2016_02_16_140450_create_ticket_status_table.php index 6a34dc4fd..8cf4555e3 100644 --- a/database/migrations/2016_02_16_140450_create_ticket_status_table.php +++ b/database/migrations/2016_02_16_140450_create_ticket_status_table.php @@ -19,8 +19,8 @@ return new class() extends Migration { $table->string('message'); $table->integer('flags'); $table->integer('sort'); - $table->integer('email_user'); - $table->string('icon_class'); + $table->integer('email_user')->nullable(); + $table->string('icon_class')->nullable(); $table->string('properties'); $table->timestamps(); }); diff --git a/database/migrations/2016_02_16_140450_create_users_table.php b/database/migrations/2016_02_16_140450_create_users_table.php index e83ba0471..b3bb97c13 100644 --- a/database/migrations/2016_02_16_140450_create_users_table.php +++ b/database/migrations/2016_02_16_140450_create_users_table.php @@ -23,10 +23,10 @@ return new class() extends Migration { $table->integer('active'); $table->boolean('is_delete')->default(0); $table->string('ext'); - $table->integer('country_code'); + $table->integer('country_code')->nullable(); $table->string('phone_number'); $table->string('mobile')->nullable()->unique(); - $table->text('agent_sign', 65535); + $table->text('agent_sign')->nullable(); $table->string('account_type'); $table->string('account_status'); $table->integer('assign_group')->unsigned()->nullable()->index('assign_group_3'); diff --git a/database/migrations/2016_05_10_102423_create_country_code_table.php b/database/migrations/2016_05_10_102423_create_country_code_table.php index 707dcb812..0e6086d32 100644 --- a/database/migrations/2016_05_10_102423_create_country_code_table.php +++ b/database/migrations/2016_05_10_102423_create_country_code_table.php @@ -13,11 +13,11 @@ return new class() extends Migration { { Schema::create('country_code', function (Blueprint $table) { $table->increments('id'); - $table->char('iso', 2); + $table->char('iso', 2)->nullable(); $table->string('name', 100); $table->string('nicename', 100); - $table->char('iso3', 3); - $table->smallInteger('numcode'); + $table->char('iso3', 3)->nullable(); + $table->string('numcode'); $table->integer('phonecode'); $table->timestamps(); }); diff --git a/database/migrations/2016_06_02_072210_create_common_settings_table.php b/database/migrations/2016_06_02_072210_create_common_settings_table.php index dc5ada9e9..d8f5372db 100644 --- a/database/migrations/2016_06_02_072210_create_common_settings_table.php +++ b/database/migrations/2016_06_02_072210_create_common_settings_table.php @@ -14,9 +14,9 @@ return new class() extends Migration { Schema::create('common_settings', function (Blueprint $table) { $table->increments('id'); $table->string('option_name'); - $table->string('option_value'); + $table->string('option_value')->nullable(); $table->string('status'); - $table->string('optional_field'); + $table->string('optional_field')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2016_06_02_074913_create_login_attempts_table.php b/database/migrations/2016_06_02_074913_create_login_attempts_table.php index fa5b6c815..08090b803 100644 --- a/database/migrations/2016_06_02_074913_create_login_attempts_table.php +++ b/database/migrations/2016_06_02_074913_create_login_attempts_table.php @@ -16,7 +16,7 @@ return new class() extends Migration { $table->string('User'); $table->string('IP'); $table->string('Attempts'); - $table->datetime('LastLogin'); + $table->timestamp('LastLogin')->nullable(); $table->timestamps(); }); } diff --git a/database/seeders/AlterColumnTypeSeeder.php b/database/seeders/AlterColumnTypeSeeder.php new file mode 100644 index 000000000..53c48e3b1 --- /dev/null +++ b/database/seeders/AlterColumnTypeSeeder.php @@ -0,0 +1,43 @@ +modifyStringType(Schema::getAllTables()); + } + + private function modifyStringType($tables) + { + foreach ($tables as $table) { + $tableName = (array)$table; + $tableName = reset($tableName); + + $columns = Schema::getColumnListing($tableName); + + foreach ($columns as $column) { + if (Schema::getColumnType($tableName, $column) == 'string') { + Schema::table($tableName, function ($table) use($column) { + $table->string($column)->nullable()->change(); + }); + } elseif (Schema::getColumnType($tableName, $column) == 'boolean') { + Schema::table($tableName, function ($table) use($column) { + $table->boolean($column)->default(0)->change(); + }); + } + } + } + } +} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 7a0604771..c2a24f1bd 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -48,6 +48,7 @@ class DatabaseSeeder extends Seeder public function run() { + (new AlterColumnTypeSeeder())->run(); /* Date time format */ $date_time_formats = [ 'd/m/Y H:i:s', @@ -267,7 +268,7 @@ class DatabaseSeeder extends Seeder /* Daily notification log */ Log_notification::create(['log' => 'NOT-1']); /* System complete settings */ - Alert::create(['id' => '1', 'ticket_status' => '1', 'ticket_admin_email' => '1', 'assignment_status' => '1', 'assignment_status' => '1', 'assignment_assigned_agent' => '1']); + Alert::create(['id' => '1', 'ticket_status' => '1', 'ticket_admin_email' => '1', 'assignment_status' => '1', 'assignment_assigned_agent' => '1']); Company::create(['id' => '1']); Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']); Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']); @@ -298,7 +299,7 @@ class DatabaseSeeder extends Seeder Widgets::create(['id' => '19', 'name' => 'dribbble']); Widgets::create(['id' => '20', 'name' => 'instagram']); /* Knowledge base setting */ - Settings::create(['id' => 'id', 'pagination' => '10']); + Settings::create(['pagination' => '10']); /* Counrty phone code and iso code */ CountryCode::create(['id' => '1', diff --git a/example.env b/example.env deleted file mode 100644 index 1c56a5518..000000000 --- a/example.env +++ /dev/null @@ -1,18 +0,0 @@ -APP_ENV=production -APP_DEBUG=false -APP_KEY=SomeRandomString -DB_TYPE= -DB_HOST= -DB_PORT= -DB_DATABASE= -DB_USERNAME= -DB_PASSWORD= -DB_INSTALL=%0% -MAIL_MAILER=smtp -MAIL_HOST=mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -CACHE_DRIVER=file -SESSION_DRIVER=file -QUEUE_CONNECTION=sync \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 99b3a7c78..b8611185a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -106,7 +106,7 @@ - {!! Form::open(['action'=>'Auth\AuthController@postLogin', 'method'=>'post']) !!} + {!! Form::open(['route' => 'auth.post.login']) !!}