update 1.0.8.0

Commits for version update
This commit is contained in:
Manish Verma
2016-10-17 12:02:27 +05:30
parent dec927987b
commit 76e85db070
9674 changed files with 495757 additions and 58922 deletions

View File

@@ -1,7 +1,13 @@
@extends('themes.default1.layouts.login')
@section('body')
<h4 class="login-box-msg">{!! Lang::get('lang.Login_to_start_your_session') !!}</h4>
<h4 class="login-box-msg">
@if (Session::has('login_require'))
{!! Session::get('login_require') !!}
@else
{!! Lang::get('lang.Login_to_start_your_session') !!}
@endif
</h4>
@if(Session::has('status'))
<div class="alert alert-success alert-dismissable">
<i class="fa fa-check-circle"> </i>
@@ -45,6 +51,11 @@
<!-- {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!} -->
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div>
@if (Session::has('referer'))
<input type='hidden' name="referer" value="{!! Session::get('referer') !!}">
@elseif(Session::has('errors'))
<input type='hidden' name="referer" value="form">
@endif
<div class="row">
<div class="col-xs-8">
<div class="checkbox icheck">
@@ -62,4 +73,6 @@
<a href="{{url('password/email')}}">{!! Lang::get("lang.iforgot") !!}</a><br>
<a href="{{url('auth/register')}}" class="text-center">{!! Lang::get("lang.register") !!}</a>
<!-- /.login-page -->
@include('themes.default1.client.layout.social-login')
@stop

View File

@@ -0,0 +1,143 @@
@extends('themes.default1.layouts.login')
@section('body')
<h4 id="otp-screen" class="login-box-msg">
<p>Hello
@if (Session::has('name'))
{{ Session::get('name')}}
@endif!</p><br/>
<span style='font-size: .8em'>
{!!Lang::get('lang.verify-screen-msg')!!}
<?php
$value = Session::get('values');
if (array_key_exists('referer', $value)) {
$referer = $value['referer'];
} else {
$referer = '/';
}
$email = $value['email'];
$password = $value['password'];
$number = Session::get('number');
$sub_number = substr($number, 1,6);
$show_number = str_replace($sub_number, '******', $number);
?>
{{ $show_number }}
</span>
</h4>
<h4 id="loading-screen" class="login-box-msg" style="display:none">
<center>Wait we are sending a new OTP code to your number.<br/><img src="{{asset('lb-faveo/media/images/gifloader.gif')}}"></center>
</h4>
<div id="success" style="display:none" class="alert alert-success alert-dismissable">
<i class="fa fa-check-circle"> </i>
<span id = "success_message"></span>
</div>
<div id="ere_msg" style="display:none" class="alert alert-danger alert-dismissable">
<i class="fa fa-ban"> </i> <b> {!! Lang::get('lang.alert') !!}! </b>
<span id = "error_message"></span>
</div>
<!-- failure message -->
@if(Session::has('errors'))
<div class="alert alert-danger alert-dismissable">
<i class="fa fa-ban"> </i> <b> {!! Lang::get('lang.alert') !!}! </b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
@if(Session::has('error'))
<li>{!! Session::get('error') !!}</li>
@else
<li>{!! Lang::get('lang.please_fill_all_required_feilds') !!}</li>
@endif
</div>
@endif
<!-- failure message -->
@if(Session::has('fails'))
<div class="alert alert-danger alert-dismissable">
<i class="fa fa-ban"> </i> <b> {!! Lang::get('lang.alert') !!}! </b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<li>{!! Session::get('fails') !!}</li>
</div>
@endif
<!-- form open -->
{!! Form::open(['route'=> 'otp-verification', 'method'=>'post']) !!}
<!-- Email -->
<div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
{!! Form::hidden('email',null,['placeholder'=> Lang::get("lang.email") ,'class' => 'form-control']) !!}
<!-- {!! $errors->first('email', '<spam class="help-block">:message</spam>') !!} -->
</div>
<!-- Password -->
<div class="form-group has-feedback {{ $errors->has('password') ? 'has-error' : '' }}">
{!! Form::hidden('password',['placeholder'=>Lang::get("lang.password"),'class' => 'form-control']) !!}
<!-- {!! $errors->first('password', '<spam class="help-block">:message</spam>') !!} -->
</div>
<div class="form-group has-feedback {{ $errors->has('otp') ? 'has-error' : '' }}">
{!! Form::input('text','otp',null,['placeholder'=> Lang::get("lang.enter-otp") ,'class' => 'form-control' , 'required' => true, 'pattern' => "[0-9]{6}", "title" => Lang::get('lang.otp-input-title')]) !!}
<!-- {!! $errors->first('email', '<spam class="help-block">:message</spam>') !!} -->
</div>
@if (Session::has('referer'))
<input type='hidden' name="referer" value="{!! Session::get('referer') !!}">
@elseif(Session::has('errors'))
<input type='hidden' name="referer" value="form">
@endif
<div class="row">
<div class="col-xs-8">
{!! Lang::get('lang.did-not-recive-code') !!}<br/>
<a id="resend" onclick="resendOTP();" href="#" title="{!!Lang::get('lang.resend-otp-title') !!}">{!! Lang::get("lang.resend_otp") !!}</a><br>
</div><!-- /.col -->
<div class="col-xs-4">
<button type="submit" class="btn btn-primary btn-block btn-flat">{!! Lang::get("lang.verify") !!}</button>
</div><!-- /.col -->
</div>
</form>
<!-- /.login-page -->
<style>
input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
</style>
<script type="text/javascript">
function resendOTP() {
var mobile = " <?php echo $number ?> ";
var full_name = "<?php echo Session::get('name');?>";
var email = document.getElementsByName("email")[0].value;
$.ajax({
url: '{{URL::route("resend-otp")}}',
type: 'post', // performing a POST request
data : {
mobile : mobile,
full_name: full_name,
email: email,
code: 0// will be accessible in $_POST['data1']
},
dataType: 'json',
beforeSend: function() {
$('#success').css('display', 'none');
$('#ere_msg').css('display','none');
$('#otp-screen').css('display','none');
$(".close").trigger("click");
$('#loading-screen').css('display','block');
},
success: function(response) {
var message = "{{Lang::get('lang.otp-sent')}}";
$("#success_message").html(message);
$('#otp-screen').css('display','block');
$('#success').css('display','block');
$('#loading-screen').css('display','none');
},
complete: function( jqXHR, textStatus) {
if (textStatus === "parsererror" || textStatus === "timeout" || textStatus === "abort" || textStatus === "error") {
var message = "{{Lang::get('lang.otp-not-sent')}}";
$("#error_message").html(message);
$('#otp-screen').css('display','block');
$('#ere_msg').css('display','block');
$('#loading-screen').css('display','none');
}
}
});
}
</script>
@stop

View File

@@ -34,7 +34,7 @@
<!-- Email -->
<!-- <div class="input-group margin"> -->
<div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
<input type="email" class="form-control" name="email" placeholder="{!! Lang::get('lang.email') !!}" value="{{ old('email') }}">
<input type="text" class="form-control" name="email" placeholder="{!! Lang::get('lang.email_or_mobile') !!}" value="{{ old('email') }}">
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>

View File

@@ -31,10 +31,38 @@
<span class="glyphicon glyphicon-user form-control-feedback"></span>
</div>
<!-- Email -->
@if (($email_mandatory->status == 1 || $email_mandatory->status == '1'))
<div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
{!! Form::text('email',null,['placeholder'=>Lang::get('lang.email'),'class' => 'form-control']) !!}
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
@elseif (($settings->status == 0 || $settings->status == '0') && ($email_mandatory->status == 0 || $email_mandatory->status == '0'))
<div class="form-group has-feedback {{ $errors->has('email') ? 'has-error' : '' }}">
{!! Form::text('email',null,['placeholder'=>Lang::get('lang.email'),'class' => 'form-control']) !!}
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div>
@else
{!! Form::hidden('email', null) !!}
@endif
@if($settings->status == '1' || $settings->status == 1)
<div class='row'>
<div class="col-md-3">
<div class="form-group {{ $errors->has('code') ? 'has-error' : '' }}">
{!! Form::text('code',null,['placeholder'=>91,'class' => 'form-control']) !!}
</div>
</div>
<div class="col-md-9">
<div class="form-group has-feedback {{ $errors->has('mobile') ? 'has-error' : '' }}">
{!! Form::text('mobile',null,['placeholder'=>Lang::get('lang.mobile'),'class' => 'form-control']) !!}
<span class="glyphicon glyphicon-phone form-control-feedback"></span>
</div>
</div>
</div>
@else
{!! Form::hidden('mobile', null) !!}
{!! Form::hidden('code', null) !!}
@endif
<!-- Password -->
<div class="form-group has-feedback {{ $errors->has('password') ? 'has-error' : '' }}">
{!! Form::password('password',['placeholder'=>Lang::get('lang.password'),'class' => 'form-control']) !!}