Skip to content

Commit

Permalink
Merge pull request #2923 from ladybirdweb/development
Browse files Browse the repository at this point in the history 
v1.10.7
  • Loading branch information
@mverma16
mverma16 authored Dec 18, 2019
2 parents 9eabcac + 9fe479b commit 43cec59
Show file tree
Hide file tree
Showing 3,354 changed files with 160,299 additions and 140,749 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion DB/demodatabase.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` (
--

INSERT INTO `settings_system` (`id`, `status`, `url`, `name`, `department`, `page_size`, `log_level`, `purge_log`, `api_enable`, `api_key_mandatory`, `api_key`, `name_format`, `time_farmat`, `date_format`, `date_time_format`, `day_date_time`, `time_zone`, `content`, `version`, `created_at`, `updated_at`) VALUES
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.6', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.7', '2016-12-13 03:19:29', '2016-12-13 03:19:29');

-- --------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion DB/dummy-data.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` (
--

INSERT INTO `settings_system` (`id`, `status`, `url`, `name`, `department`, `page_size`, `log_level`, `purge_log`, `api_enable`, `api_key_mandatory`, `api_key`, `name_format`, `time_farmat`, `date_format`, `date_time_format`, `day_date_time`, `time_zone`, `content`, `version`, `created_at`, `updated_at`) VALUES
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.6', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.7', '2016-12-13 03:19:29', '2016-12-13 03:19:29');

-- --------------------------------------------------------

Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ Faveo can be customised according to requirement and we do undertake such reques
Flavors of Faveo
--------------------------
* Faveo Community Edition – Free, Open source edition
* Faveo Freelancer - Free version with features available in Faveo Pro Edition for two agents
* Faveo Pro Edition – Paid version with many advance features and integrations
* Faveo Service Desk - Paid version for IT Assest management

[View complete comparision list of all flavors of Faveo to select the most suitable solution for your business](https://www.faveohelpdesk.com/pricing-india/)

Faveo Documentation
--------------------------
Expand Down
1 change: 1 addition & 0 deletions app/Api/routes.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/*
* ================================================================================================
* @version v1
Expand Down
1 change: 1 addition & 0 deletions app/Http/Controllers/Admin/helpdesk/AgentController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ public function destroy($id, User $user, Assign_team_agent $team_assign_agent)
$user->delete();

throw new \Exception($error);

return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully'));
} catch (\Exception $e) {
return redirect('agents')->with('fails', $error);
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Admin/helpdesk/BanlistController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use App\Http\Requests\helpdesk\BanlistRequest;
use App\Http\Requests\helpdesk\BanRequest;
// model
use App\Model\helpdesk\Email\Banlist;
use App\User;
//classes
use Exception;
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Admin/helpdesk/DepartmentController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use App\Model\helpdesk\Agent\Teams;
use App\Model\helpdesk\Email\Emails;
use App\Model\helpdesk\Email\Template;
use App\Model\helpdesk\Manage\Help_topic;
use App\Model\helpdesk\Manage\Sla_plan;
use App\Model\helpdesk\Settings\System;
use App\Model\helpdesk\Ticket\Tickets;
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/Admin/helpdesk/PriorityController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@
use App\Model\helpdesk\Settings\CommonSettings;
use App\Model\helpdesk\Settings\Email;
use App\Model\helpdesk\Ticket\Ticket_Priority;
use Auth;
use DB;
use Exception;
// classes
use Illuminate\Http\Request;
use Illuminate\support\Collection;
use Lang;

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Admin/helpdesk/SettingsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ public function postCleanDummyData(Request $request)
$result = 'failed';
$system_check = CommonSettings::select('status')->where('option_name', '=', 'dummy_data_installation')->first();
if ($system_check->status == 1 || $system_check->status == '1') {
$result = Self::cleanDatabase();
$result = self::cleanDatabase();
}

return response()->json(compact('result'));
Expand Down
3 changes: 0 additions & 3 deletions app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@
use App\Model\helpdesk\Agent\Department;
//models
use App\Model\helpdesk\Filters\Filter;
use App\Model\helpdesk\Filters\Label;
use App\Model\helpdesk\Manage\Help_topic;
use App\Model\helpdesk\Ticket\Ticket_Priority;
use App\Model\helpdesk\Ticket\Ticket_Status;
use App\Model\helpdesk\Ticket\Tickets;
use App\Model\helpdesk\Ticket\TicketStatusType;
use App\User;
//classes
use Auth;
use DB;
use Illuminate\Http\Request;
use UTC;

/**
* -----------------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Agent/helpdesk/Filter/FilterControllerOld.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Http\Controllers\Agent\helpdesk\TicketController;
use App\Http\Controllers\Controller;
use App\Model\helpdesk\Filters\Filter;
use App\Model\helpdesk\Filters\Label;
use App\Model\helpdesk\Ticket\Tickets;
use Auth;
use DB;
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Agent/helpdesk/TicketController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
use App\Model\helpdesk\Ticket\Ticket_attachments;
use App\Model\helpdesk\Ticket\Ticket_Collaborator;
use App\Model\helpdesk\Ticket\Ticket_Form_Data;
use App\Model\helpdesk\Ticket\Ticket_Priority;
use App\Model\helpdesk\Ticket\Ticket_source;
use App\Model\helpdesk\Ticket\Ticket_Status;
use App\Model\helpdesk\Ticket\Ticket_Thread;
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/Client/helpdesk/FormController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use App\Http\Controllers\Controller;
// requests
use App\Http\Requests\helpdesk\ClientRequest;
use App\Model\helpdesk\Agent\Department;
// models
use App\Model\helpdesk\Form\Fields;
use App\Model\helpdesk\Manage\Help_topic;
Expand All @@ -26,7 +25,6 @@
use Form;
use GeoIP;
use Illuminate\Http\Request;
use Input;
use Lang;
use Redirect;

Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Common/ApiSettings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use App\Http\Controllers\Controller;
use App\Model\Api\ApiSetting;
use App\Model\helpdesk\Ticket\Ticket_Thread;
use App\Model\helpdesk\Ticket\Tickets;
use DB;
use Exception;
Expand Down
2 changes: 0 additions & 2 deletions app/Http/Controllers/HomeController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

namespace App\Http\Controllers;

use App\Model\helpdesk\Ticket\Tickets;

class HomeController extends Controller
{
/*
Expand Down
1 change: 0 additions & 1 deletion app/Http/Controllers/Installer/helpdesk/InstallController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Artisan;
// classes
use Cache;
use Config;
use DB;
use Exception;
use File;
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"fzaninotto/faker": "1.*",
"filp/whoops": "~2.0",
"laravel/dusk": "~3.0",
"laravel/tinker": "^1.0"
"laravel/tinker": "^1.0",
"codacy/coverage": "dev-master"
},
"autoload": {
"classmap": [
Expand Down
Loading

0 comments on commit 43cec59

Please sign in to comment.