diff --git a/.env b/.env index 19aa69cf2..77619ceb1 100644 --- a/.env +++ b/.env @@ -2,8 +2,8 @@ APP_ENV=local APP_DEBUG=true APP_KEY=SomeRandomString DB_HOST=localhost -DB_DATABASE= -DB_USERNAME= +DB_DATABASE=fav222222 +DB_USERNAME=root DB_PASSWORD= CACHE_DRIVER=file SESSION_DRIVER=file diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php index 5a4f672f3..ecb4ff365 100644 --- a/app/Http/Controllers/Api/v1/InstallerApiController.php +++ b/app/Http/Controllers/Api/v1/InstallerApiController.php @@ -9,6 +9,7 @@ use App\User; use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Form\Form_details; use App\Model\helpdesk\Utility\Date_time_format; +use App\Model\helpdesk\Utility\Timezones; // classes use App; use Artisan; @@ -103,19 +104,22 @@ class InstallerApiController extends Controller { Artisan::call('migrate', array('--force' => true)); Artisan::call('db:seed', array('--force' => true)); - // var_dump($datetime); - // $date_time_format = Date_time_format::where('format','=',$datetime)->first(); - // // dd($date_time_format->id); - // if($date_time_format->id){ - // $date_time = 1; - // } else { - // return 'date time format not supported'; - // } - - // Creating minum settings - $system = System::where('id','=','1')->first(); - $system->time_zone = 1; - $system->date_time_format = 1; + // checking requested timezone for the admin and system + $timezones = Timezones::where('name','=',$timezone)->first(); + if($timezones->id == null){ + return ['response'=>'fail','reason'=>'Invalid time-zone','status'=>'0']; + } + // checking requested date time format for the admin and system + $date_time_format = Date_time_format::where('format','=',$datetime)->first(); + if($date_time_format->id == null){ + return ['response'=>'fail','reason'=>'invalid date-time format','status'=>'0']; + } + // Creating minum settings for system + $system = new System; + $system->status = 1; + $system->department = 1; + $system->date_time_format = $date_time_format->id; + $system->time_zone = $timezones->id; $system->save(); // Creating user diff --git a/config/app.php b/config/app.php index d87ea94a5..214063173 100644 --- a/config/app.php +++ b/config/app.php @@ -38,7 +38,7 @@ return [ | */ - 'version' => 'COMMUNITY 1.0.5.3', + 'version' => 'COMMUNITY 1.0.5.6', /* |-------------------------------------------------------------------------- diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index e88da0b8e..7babff4c9 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -39,15 +39,15 @@ class DatabaseSeeder extends Seeder { /* Date time format */ $date_time_formats = [ - 'd/m/Y H:i:s', - 'd.m.Y H:i:s', - 'd-m-Y H:i:s', - 'm/d/Y H:i:s', - 'm.d.Y H:i:s', - 'm-d-Y H:i:s', - 'Y/m/d H:i:s', - 'Y.m.d H:i:s', - 'Y-m-d H:i:s']; + 'd/m/Y H:i:s', + 'd.m.Y H:i:s', + 'd-m-Y H:i:s', + 'm/d/Y H:i:s', + 'm.d.Y H:i:s', + 'm-d-Y H:i:s', + 'Y/m/d H:i:s', + 'Y.m.d H:i:s', + 'Y-m-d H:i:s']; foreach ($date_time_formats as $date_time_format) { Date_time_format::create(['format' => $date_time_format]); @@ -251,7 +251,7 @@ class DatabaseSeeder extends Seeder { Company::create(array('id' => '1')); Email::create(array('id' => '1','email_fetching'=>'1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1')); Responder::create(array('id' => '1','new_ticket' => '1' , 'agent_new_ticket' => '1')); - System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32')); + // System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32')); Ticket::create(array('num_format' => '#ABCD 1234 1234567', 'num_sequence' => '0', 'priority' => '1', 'sla' => '2', 'help_topic' => '1','status' => '1')); /* Ticket source */ Ticket_source::create(array('name'=>'web', 'value'=>'Web')); diff --git a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php index 8b81d4675..78502835c 100644 --- a/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dashboard/dashboard.blade.php @@ -78,6 +78,9 @@ $delete = App\Model\helpdesk\Ticket\Tickets::where('dept_id','=',$department->id +
+ +