Skip to content

Commit 43cec59

Browse files
kreatorcodeskreatorcodes
authored
Merge pull request #2923 from ladybirdweb/development
v1.10.7
2 parents 9eabcac + 9fe479b commit 43cec59

3,354 files changed

Lines changed: 160299 additions & 140749 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎DB/demodatabase.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` (
14571457
--
14581458

14591459
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
1460-
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.6', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
1460+
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.7', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
14611461

14621462
-- --------------------------------------------------------
14631463

‎DB/dummy-data.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` (
14571457
--
14581458

14591459
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
1460-
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.6', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
1460+
(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.7', '2016-12-13 03:19:29', '2016-12-13 03:19:29');
14611461

14621462
-- --------------------------------------------------------
14631463

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@ Faveo can be customised according to requirement and we do undertake such reques
2323
Flavors of Faveo
2424
--------------------------
2525
* Faveo Community Edition – Free, Open source edition
26+
* Faveo Freelancer - Free version with features available in Faveo Pro Edition for two agents
2627
* Faveo Pro Edition – Paid version with many advance features and integrations
2728
* Faveo Service Desk - Paid version for IT Assest management
29+
30+
[View complete comparision list of all flavors of Faveo to select the most suitable solution for your business](https://www.faveohelpdesk.com/pricing-india/)
2831

2932
Faveo Documentation
3033
--------------------------

‎app/Api/routes.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* ================================================================================================
45
* @version v1

‎app/Http/Controllers/Admin/helpdesk/AgentController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ public function destroy($id, User $user, Assign_team_agent $team_assign_agent)
278278
$user->delete();
279279

280280
throw new \Exception($error);
281+
281282
return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully'));
282283
} catch (\Exception $e) {
283284
return redirect('agents')->with('fails', $error);

‎app/Http/Controllers/Admin/helpdesk/BanlistController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use App\Http\Requests\helpdesk\BanlistRequest;
99
use App\Http\Requests\helpdesk\BanRequest;
1010
// model
11-
use App\Model\helpdesk\Email\Banlist;
1211
use App\User;
1312
//classes
1413
use Exception;

‎app/Http/Controllers/Admin/helpdesk/DepartmentController.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use App\Model\helpdesk\Agent\Teams;
1515
use App\Model\helpdesk\Email\Emails;
1616
use App\Model\helpdesk\Email\Template;
17-
use App\Model\helpdesk\Manage\Help_topic;
1817
use App\Model\helpdesk\Manage\Sla_plan;
1918
use App\Model\helpdesk\Settings\System;
2019
use App\Model\helpdesk\Ticket\Tickets;

‎app/Http/Controllers/Admin/helpdesk/PriorityController.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@
1414
use App\Model\helpdesk\Settings\CommonSettings;
1515
use App\Model\helpdesk\Settings\Email;
1616
use App\Model\helpdesk\Ticket\Ticket_Priority;
17-
use Auth;
1817
use DB;
1918
use Exception;
2019
// classes
2120
use Illuminate\Http\Request;
22-
use Illuminate\support\Collection;
2321
use Lang;
2422

2523
/**

‎app/Http/Controllers/Admin/helpdesk/SettingsController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ public function postCleanDummyData(Request $request)
10811081
$result = 'failed';
10821082
$system_check = CommonSettings::select('status')->where('option_name', '=', 'dummy_data_installation')->first();
10831083
if ($system_check->status == 1 || $system_check->status == '1') {
1084-
$result = Self::cleanDatabase();
1084+
$result = self::cleanDatabase();
10851085
}
10861086

10871087
return response()->json(compact('result'));

‎app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,15 @@
1010
use App\Model\helpdesk\Agent\Department;
1111
//models
1212
use App\Model\helpdesk\Filters\Filter;
13-
use App\Model\helpdesk\Filters\Label;
1413
use App\Model\helpdesk\Manage\Help_topic;
1514
use App\Model\helpdesk\Ticket\Ticket_Priority;
16-
use App\Model\helpdesk\Ticket\Ticket_Status;
1715
use App\Model\helpdesk\Ticket\Tickets;
1816
use App\Model\helpdesk\Ticket\TicketStatusType;
1917
use App\User;
2018
//classes
2119
use Auth;
2220
use DB;
2321
use Illuminate\Http\Request;
24-
use UTC;
2522

2623
/**
2724
* -----------------------------------------------------------------------------

0 commit comments

Comments
 (0)