cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "update ver1.0.5.7"

Browse Source 
This reverts commit 21e2ecef16.
This commit is contained in:
sujitprasad
2016-02-05 15:10:36 +05:30
parent f3078c983c
commit 50c9557a5a
3 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -10,8 +10,6 @@ use App\Http\Requests\helpdesk\InstallerRequest;
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;
@@ -290,29 +288,6 @@ class InstallController extends Controller {
// $system->date_time_format = $datetime;
// $system->save();
// 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'];
}
// var_dump($datetime);
// checking requested date time format for the admin and system
$date_time_format = Date_time_format::where('format','=',$datetime)->first();
// dd($date_time_format);
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 an user
$user = User::create(array(
'first_name' => $firstname,

2
config/app.php
View File

@@ -38,7 +38,7 @@ return [
|
*/
'version' => 'COMMUNITY 1.0.5.7',
'version' => 'COMMUNITY 1.0.5.6',
/*
|--------------------------------------------------------------------------

6
resources/views/themes/default1/installer/helpdesk/view5.blade.php
View File

@@ -243,9 +243,9 @@ active
</td>
<td>
<select name="datetime" style="margin-left: 170px">
<option value="d/m/Y H:i:s">DD/MM/YYYY H:i:s</option>
<option value="m/d/Y H:i:s">MM/DD/YYYY H:i:s</option>
<option value="Y/m/d H:i:s">YYYY/MM/DD H:i:s</option>
<option value="d/m/Y H:i">DD/MM/YYYY H:i</option>
<option value="m/d/Y H:i">MM/DD/YYYY H:i</option>
<option value="Y/m/d H:i">YYYY/MM/DD H:i</option>
</select>
</td>
</tr>