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

Bug-fix-patch2

Browse Source 
# correct while registration
This commit is contained in:
Manish Verma
2016-12-19 17:22:21 +05:30
parent 77c88cc229
commit 54af5c3765
8 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Auth/AuthController.php
View File

@@ -183,9 +183,11 @@ class AuthController extends Controller
$message12 = '';
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
// Event for login
\Event::fire(new \App\Events\LoginEvent($request));
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
// Event for login
\Event::fire(new \App\Events\LoginEvent($request));
if ($request->input('email') !== '') {
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/'.$code)]);
}
if ($settings->status == 1 || $settings->status == '1') {
if (count($sms) > 0) {
if ($sms->status == 1 || $sms->status == '1') {
@@ -194,7 +196,11 @@ class AuthController extends Controller
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
}
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
if ($request->input('email') !== '') {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
} else {
$message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt');
}
}
} else {
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');

3
resources/lang/de/lang.php
View File

@@ -1146,4 +1146,7 @@ return [
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/en/lang.php
View File

@@ -1583,4 +1583,7 @@ return [
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/fr/lang.php
View File

@@ -1554,4 +1554,7 @@ return [
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/it/lang.php
View File

@@ -1105,4 +1105,7 @@ return [
'restore-user' => 'Restore user account',
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/nl/lang.php
View File

@@ -1599,4 +1599,7 @@ return [
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/pt/lang.php
View File

@@ -1544,4 +1544,7 @@ return [
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];

3
resources/lang/ru/lang.php
View File

@@ -1052,4 +1052,7 @@ return [
'restore-user' => 'Restore user account',
'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.',
'reply-can-not-be-empty' => 'Reply can not be blank. Please enter your reply.',
//update 18-12-2016
'account-created-contact-admin-as-we-were-not-able-to-send-opt' => 'Your account has been created successfully. Please contact admin for account activation as we were not able to send you an OPT code.',
];