more changes
This commit is contained in:
@@ -537,7 +537,7 @@ CREATE TABLE IF NOT EXISTS `ticket_token` (
|
|||||||
`id` int(11) NOT NULL AUTO_INCREMENT,
|
`id` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
`ticket_id` int(11) NOT NULL,
|
`ticket_id` int(11) NOT NULL,
|
||||||
`token` varchar(255) NOT NULL,
|
`token` varchar(255) NOT NULL,
|
||||||
`created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',,
|
`created_at` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
|
||||||
`updated_at` timestamp NOT NULL,
|
`updated_at` timestamp NOT NULL,
|
||||||
PRIMARY KEY (`id`)
|
PRIMARY KEY (`id`)
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=10 ;
|
||||||
@@ -549,7 +549,7 @@ CREATE TABLE IF NOT EXISTS `ticket_token` (
|
|||||||
--
|
--
|
||||||
|
|
||||||
ALTER TABLE `users`
|
ALTER TABLE `users`
|
||||||
ADD `country_code` int(11) NOT NULL AFTER `profile_pic`;
|
ADD `country_code` int(11) NOT NULL AFTER `profile_pic`;
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
-- --------------------------------------------------------
|
||||||
|
|
||||||
@@ -573,4 +573,25 @@ CREATE TABLE IF NOT EXISTS `workflow_close` (
|
|||||||
--
|
--
|
||||||
|
|
||||||
INSERT INTO `workflow_close` (`id`, `days`, `condition`, `send_email`, `status`, `created_at`, `updated_at`) VALUES
|
INSERT INTO `workflow_close` (`id`, `days`, `condition`, `send_email`, `status`, `created_at`, `updated_at`) VALUES
|
||||||
(1, 3, 1, 1, 3, '2016-05-25 07:52:22', '2016-05-25 02:22:22');
|
(1, 3, 1, 1, 3, '2016-05-25 07:52:22', '2016-05-25 02:22:22');
|
||||||
|
|
||||||
|
-- ----------------------------------------------------------
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Alter Table structure for table `system_settings`
|
||||||
|
--
|
||||||
|
ALTER TABLE `settings_system`
|
||||||
|
ADD `version` varchar(222) NOT NULL AFTER `time_zone`;
|
||||||
|
|
||||||
|
--
|
||||||
|
-- Dumping data for table `system_settings`
|
||||||
|
--
|
||||||
|
|
||||||
|
UPDATE `settings_system` SET `version`='1.0.7.5' WHERE 1
|
||||||
|
|
||||||
|
|
||||||
|
ALTER TABLE `settings_ticket`
|
||||||
|
ADD `lock_ticket_frequency` varchar(222) NOT NULL AFTER `max_file_size`;
|
||||||
|
|
||||||
|
|
||||||
|
UPDATE `settings_ticket` SET `lock_ticket_frequency`='0' WHERE 1
|
||||||
|
@@ -144,6 +144,7 @@ class WorkflowController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function create(Emails $emails)
|
public function create(Emails $emails)
|
||||||
{
|
{
|
||||||
|
$email_data = "";
|
||||||
foreach ($emails->lists('email_address', 'id') as $key => $email) {
|
foreach ($emails->lists('email_address', 'id') as $key => $email) {
|
||||||
$email_data["E-$key"] = $email;
|
$email_data["E-$key"] = $email;
|
||||||
}
|
}
|
||||||
|
@@ -96,10 +96,13 @@ class AuthController extends Controller {
|
|||||||
$code = str_random(60);
|
$code = str_random(60);
|
||||||
$user->remember_token = $code;
|
$user->remember_token = $code;
|
||||||
$user->save();
|
$user->save();
|
||||||
|
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
|
||||||
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
|
try {
|
||||||
|
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => 'Activate your Account', 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
|
||||||
return redirect('home')->with('success', Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'));
|
} catch (Exception $e) {
|
||||||
|
$message12 = Lang::get('lang.failed_to_send_email_contact_administrator');
|
||||||
|
}
|
||||||
|
return redirect('home')->with('success', $message12);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -395,10 +395,9 @@ class SettingsController extends Controller {
|
|||||||
*/
|
*/
|
||||||
public function version_check() {
|
public function version_check() {
|
||||||
$response_url = \URL::route('post-version-check');
|
$response_url = \URL::route('post-version-check');
|
||||||
echo "<form action='http://www.faveohelpdesk.com/billing/version' method='post' name='redirect'>";
|
echo "<form action='http://www.faveohelpdesk.com/billing/public/version' method='post' name='redirect'>";
|
||||||
echo "<input type='hidden' name='_token' value='csrf_token()'/>";
|
echo "<input type='hidden' name='_token' value='csrf_token()'/>";
|
||||||
echo "<input type='hidden' name='title' value='helpdeskcommunityedition'/>";
|
echo "<input type='hidden' name='title' value='Faveo helpdesk community'/>";
|
||||||
echo "<input type='hidden' name='id' value='19'/>";
|
|
||||||
echo "<input type='hidden' name='response_url' value='" . $response_url . "' />";
|
echo "<input type='hidden' name='response_url' value='" . $response_url . "' />";
|
||||||
echo '</form>';
|
echo '</form>';
|
||||||
echo "<script language='javascript'>document.redirect.submit();</script>";
|
echo "<script language='javascript'>document.redirect.submit();</script>";
|
||||||
@@ -410,7 +409,10 @@ class SettingsController extends Controller {
|
|||||||
* @return type
|
* @return type
|
||||||
*/
|
*/
|
||||||
public function post_version_check(Request $request) {
|
public function post_version_check(Request $request) {
|
||||||
|
// dd($request);
|
||||||
$current_version = \Config::get('app.version');
|
$current_version = \Config::get('app.version');
|
||||||
|
$current_version = explode(' ',$current_version);
|
||||||
|
$current_version = $current_version[1];
|
||||||
$new_version = $request->value;
|
$new_version = $request->value;
|
||||||
if ($current_version == $new_version) {
|
if ($current_version == $new_version) {
|
||||||
return redirect()->route('checkupdate')->with('info', ' No, new Updates');
|
return redirect()->route('checkupdate')->with('info', ' No, new Updates');
|
||||||
|
@@ -1313,6 +1313,7 @@ return [
|
|||||||
'sorry_you_are_not_allowed_token_expired' => 'Sorry you are not allowed. Token Expired!',
|
'sorry_you_are_not_allowed_token_expired' => 'Sorry you are not allowed. Token Expired!',
|
||||||
'thank_you_for_your_rating' => 'Thank you for your rating!',
|
'thank_you_for_your_rating' => 'Thank you for your rating!',
|
||||||
'your_ticket_has_been' => 'Your ticket has been',
|
'your_ticket_has_been' => 'Your ticket has been',
|
||||||
|
'failed_to_send_email_contact_administrator' => 'Email sending faied. Please contact system Administrator',
|
||||||
/*
|
/*
|
||||||
* |---------------------------------------------------------------------------------------
|
* |---------------------------------------------------------------------------------------
|
||||||
|Api settings
|
|Api settings
|
||||||
@@ -1341,4 +1342,5 @@ return [
|
|||||||
'error-debug-settings-saved-message' => 'Your error and debugging settings have been saved successfully',
|
'error-debug-settings-saved-message' => 'Your error and debugging settings have been saved successfully',
|
||||||
'error-debug-settings-error-message' => 'You have not made any change in the settings.',
|
'error-debug-settings-error-message' => 'You have not made any change in the settings.',
|
||||||
'error-logs' => 'Error logs',
|
'error-logs' => 'Error logs',
|
||||||
|
|
||||||
];
|
];
|
||||||
|
@@ -173,7 +173,7 @@
|
|||||||
<!-- Menu Footer-->
|
<!-- Menu Footer-->
|
||||||
<li class="user-footer" style="background-color:#1a2226;">
|
<li class="user-footer" style="background-color:#1a2226;">
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<a href="{{url('admin-profile')}}" class="btn btn-info btn-sm"><b>{!! Lang::get('lang.profile') !!}</b></a>
|
<a href="{{url('profile')}}" class="btn btn-info btn-sm"><b>{!! Lang::get('lang.profile') !!}</b></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-right">
|
<div class="pull-right">
|
||||||
<a href="{{url('auth/logout')}}" class="btn btn-danger btn-sm"><b>{!! Lang::get('lang.sign_out') !!}</b></a>
|
<a href="{{url('auth/logout')}}" class="btn btn-danger btn-sm"><b>{!! Lang::get('lang.sign_out') !!}</b></a>
|
||||||
|
Reference in New Issue
Block a user