Commit 3c449558 by Tobin

Merge branch 'master' into production

parents 4bbec476 13ca7c9d
.navbar-nav > .user-menu > .dropdown-menu > li.user-header {
height:50px !important;
.navbar-nav>.user-menu>.dropdown-menu>li.user-header {
height: 50px !important;
}
.dropdown-toggle {
background: rgba(0, 0, 0, 0.1) none repeat scroll 0 0;
}
.modal-wide .modal-dialog {
width:80% !important;
width: 80% !important;
}
.modal-content .box {
border-left:1px solid #f4f4f4;
border-left: 1px solid #f4f4f4;
}
.select2-selection--multiple .select2-search--inline .select2-search__field {
width:1px !important;
border:none !important;
width: 1px !important;
border: none !important;
}
#map_canvas {
height: 350px;
width: 98%;
height: 350px;
width: 98%;
}
.input_size {
width: 322px !important;
}
.input_size{width: 322px !important;}
/* Profile Pic change */
.user-profile-pic {
position:relative;
position: relative;
}
.profile-user-img {
height:150px;
width:150px;
height: 150px;
width: 150px;
}
.change-profile-pic {
position:absolute;
width:150px;
background-color:rgba(0,0,0,0.5);
height:150px;
border-radius:200px;
left:calc(50% - 75px);
bottom:0;
display:none;
position: absolute;
width: 150px;
background-color: rgba(0, 0, 0, 0.5);
height: 150px;
border-radius: 200px;
left: calc(50% - 75px);
bottom: 0;
display: none;
}
.user-profile-pic:hover .change-profile-pic {
display:block;
display: block;
}
.uploadFile {
background: url('../images/whitecam.png') no-repeat;
height: 32px;
width: 32px;
position:absolute;
left: -webkit-calc(50% - 16px);
left: calc(50% - 16px);
bottom:calc(50% - 16px);
overflow: hidden;
cursor: pointer;
background: url('../images/whitecam.png') no-repeat;
height: 32px;
width: 32px;
position: absolute;
left: -webkit-calc(50% - 16px);
left: calc(50% - 16px);
bottom: calc(50% - 16px);
overflow: hidden;
cursor: pointer;
}
.uploadFile input {
filter: alpha(opacity=0);
opacity: 0;
margin-left: -110px;
filter: alpha(opacity=0);
opacity: 0;
margin-left: -110px;
}
.custom-file-input {
height: 35px;
cursor: pointer;
height: 35px;
cursor: pointer;
}
.left-sid{max-width: 52px !important;border-radius: 50%;}
.box_sizes{width: 100% !important;}
.left-sid {
max-width: 52px !important;
border-radius: 50%;
}
.box_sizes {
width: 100% !important;
}
.sleeper{
background-image: url(./images/1.png);background-repeat: no-repeat;height: 23px;
.sleeper {
background-image: url(./images/1.png);
background-repeat: no-repeat;
height: 23px;
width: 34px;
margin-top:10px;
height: 41px;
}.seater{
background-image: url(./images/4.png);background-repeat: no-repeat;height: 23px;
width: 34px;
margin-top:10px;
height: 41px;
}.sleeper1{
background-image: url(../images/empty.png);background-repeat: no-repeat;height: 23px;
width: 34px;
margin-top:10px;
height: 41px;
margin-top: 10px;
height: 41px;
}
.seater {
background-image: url(./images/4.png);
background-repeat: no-repeat;
height: 23px;
width: 34px;
margin-top: 10px;
height: 41px;
}
.sleeper1 {
background-image: url(../images/empty.png);
background-repeat: no-repeat;
height: 23px;
width: 34px;
margin-top: 10px;
height: 41px;
}
.add-new {
width:100px;
width: 100px;
background-color: #874DA3;
}
.btn-dangers{background-color: #3c8dbc;
border-color: #3c8dbc;}
.btn-dangers {
background-color: #3c8dbc;
border-color: #3c8dbc;
}
.name-color{color: #72afd2 !important;}
.name-color {
color: #72afd2 !important;
}
/* ALTERNATE-CSS */
.shoper_link img {
position: relative;
bottom: 5px;
margin-right: 10px;
}
\ No newline at end of file
@import url(https://fonts.googleapis.com/css?family=Roboto:300);
.login-page {
width: 360px;
padding: 8% 0 0;
margin: auto;
width: 360px;
padding: 8% 0 0;
margin: auto;
}
.form {
position: relative;
z-index: 1;
background: #FFFFFF;
max-width: 360px;
margin: 0 auto 100px;
padding: 45px;
text-align: center;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
position: relative;
z-index: 1;
background: #FFFFFF;
max-width: 360px;
margin: 0 auto 100px;
padding: 45px;
text-align: center;
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2), 0 5px 5px 0 rgba(0, 0, 0, 0.24);
}
.form input {
font-family: "Roboto", sans-serif;
outline: 0;
background: #f2f2f2;
width: 100%;
border: 0;
margin: 0 0 15px;
padding: 15px;
box-sizing: border-box;
font-size: 14px;
font-family: "Roboto", sans-serif;
outline: 0;
background: #f2f2f2;
width: 100%;
border: 0;
margin: 0 0 15px;
padding: 15px;
box-sizing: border-box;
font-size: 14px;
}
.form button {
font-family: "Roboto", sans-serif;
text-transform: uppercase;
outline: 0;
background: #4CAF50;
width: 100%;
border: 0;
padding: 15px;
color: #FFFFFF;
font-size: 14px;
-webkit-transition: all 0.3 ease;
transition: all 0.3 ease;
cursor: pointer;
font-family: "Roboto", sans-serif;
text-transform: uppercase;
outline: 0;
background: #4CAF50;
width: 100%;
border: 0;
padding: 15px;
color: #FFFFFF;
font-size: 14px;
-webkit-transition: all 0.3 ease;
transition: all 0.3 ease;
cursor: pointer;
}
.form button:hover,.form button:active,.form button:focus {
background: #43A047;
.form button:hover,
.form button:active,
.form button:focus {
background: #43A047;
}
.form .message {
margin: 15px 0 0;
color: #b3b3b3;
font-size: 12px;
margin: 15px 0 0;
color: #b3b3b3;
font-size: 12px;
}
.form .message a {
color: #4CAF50;
text-decoration: none;
color: #4CAF50;
text-decoration: none;
}
.form .register-form {
display: none;
display: none;
}
.container {
position: relative;
z-index: 1;
max-width: 300px;
margin: 0 auto;
position: relative;
z-index: 1;
max-width: 300px;
margin: 0 auto;
}
.container:before, .container:after {
content: "";
display: block;
clear: both;
.container:before,
.container:after {
content: "";
display: block;
clear: both;
}
.container .info {
margin: 50px auto;
text-align: center;
margin: 50px auto;
text-align: center;
}
.container .info h1 {
margin: 0 0 15px;
padding: 0;
font-size: 36px;
font-weight: 300;
color: #1a1a1a;
margin: 0 0 15px;
padding: 0;
font-size: 36px;
font-weight: 300;
color: #1a1a1a;
}
.container .info span {
color: #4d4d4d;
font-size: 12px;
color: #4d4d4d;
font-size: 12px;
}
.container .info span a {
color: #000000;
text-decoration: none;
color: #000000;
text-decoration: none;
}
.container .info span .fa {
color: #EF3B3A;
}
body {
background: #76b852; /* fallback for old browsers */
background: -webkit-linear-gradient(right, #76b852, #8DC26F);
background: -moz-linear-gradient(right, #76b852, #8DC26F);
background: -o-linear-gradient(right, #76b852, #8DC26F);
background: linear-gradient(to left, #76b852, #8DC26F);
font-family: "Roboto", sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #EF3B3A;
}
body {
background: #76b852;
/* fallback for old browsers */
background: -webkit-linear-gradient(right, #76b852, #8DC26F);
background: -moz-linear-gradient(right, #76b852, #8DC26F);
background: -o-linear-gradient(right, #76b852, #8DC26F);
background: linear-gradient(to left, #76b852, #8DC26F);
font-family: "Roboto", sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
\ No newline at end of file
......@@ -67,8 +67,14 @@ public function credit_payment(){
$user = $this->Checkout_model->get_account_popup();
$amount = $info->payment_for;
$from_Currency = $settings->currency_symbol;
$booking_id = 'CK'.strtotime(date('m/d/Y H:i:s'));
list($schedule_date,$time) = explode(' ', $info->schedule_date, 2);
$booking_id = 'CK'.strtotime(date('m/d/Y H:i:s')); $time = '00:00 - 00:00';
$schedule_date = $info->schedule_date;
if(!empty(trim($info->schedule_date)) && strpos($info->schedule_date, ' ') !== false){
$dateTime = explode(' ', $info->schedule_date, 2);
$time = (isset($dateTime[1]) && !empty($dateTime[1]))?$dateTime[1]:$time;
$schedule_date = (isset($dateTime[0]) && !empty($dateTime[0]))?$dateTime[0]:$schedule_date;
}
......@@ -157,8 +163,14 @@ public function con_payment(){ //echo "hi";die;
$user = $this->Checkout_model->get_account_popup();
$amount = $info->payment_for;
$from_Currency = $settings->currency_symbol;
$booking_id = 'CK'.strtotime(date('m/d/Y H:i:s'));
list($schedule_date,$time) = explode(' ', $info->schedule_date, 2);
$booking_id = 'CK'.strtotime(date('m/d/Y H:i:s')); $time = '00:00 - 00:00';
$schedule_date = $info->schedule_date;
if(!empty(trim($info->schedule_date)) && strpos($info->schedule_date, ' ') !== false){
$dateTime = explode(' ', $info->schedule_date, 2);
$time = (isset($dateTime[1]) && !empty($dateTime[1]))?$dateTime[1]:$time;
$schedule_date = (isset($dateTime[0]) && !empty($dateTime[0]))?$dateTime[0]:$schedule_date;
}
......
......@@ -212,7 +212,7 @@ $this->load->library('email');
$config = Array(
'protocol' => 'smtp',
'smtp_host' => $setting->smtp_host,
'smtp_port' => 587,
'smtp_port' => 465,
'smtp_user' => $setting->smtp_username, // change it to yours
'smtp_pass' => $setting->smtp_password, // change it to yours
'smtp_timeout'=>20,
......@@ -394,37 +394,62 @@ public function shopper_registration(){
}
}
public function facebook_login(){
$this->load->library('Facebook');
$user = $this->facebook->getUser();
/*$data['login_url'] = $this->facebook->getLoginUrl(array(
'redirect_uri' => site_url('welcome/login'),
'scope' => array("email") // permissions here
));*/
$data = array();
if($user){
$data = $this->facebook->api('/me?fields=id,first_name,last_name,picture,email');
$data['social_id'] = $data['id'];
// old
// public function facebook_login(){
// $this->load->library('Facebook');
// $user = $this->facebook->getUser();
// $data['login_url'] = $this->facebook->getLoginUrl(array(
// 'redirect_uri' => site_url('welcome/login'),
// 'scope' => array("email") // permissions here
// ));
// $data = array();
// if($user){
// $data = $this->facebook->api('/me?fields=id,first_name,last_name,picture,email');
// $data['social_id'] = $data['id'];
unset($data['picture']);
unset($data['id']);
$data['zip'] = $this->home->default_store();
$result = $this->home->social_registration($data);
if($result=='0'){
$res = $this->home->default_login($data);
if($res==1){
redirect(base_url('store'));
}
} else {
redirect(base_url('store'));
}
}
}
// unset($data['picture']);
// unset($data['id']);
// $data['zip'] = $this->home->default_store();
// $result = $this->home->social_registration($data);
// if($result=='0'){
// $res = $this->home->default_login($data);
// if($res==1){
// redirect(base_url('store'));
// }
// } else {
// redirect(base_url('store'));
// }
// }
// }
public function facebooklogin(){
$resp = array();
$resp['status'] = 0;
if(isset($_POST) && isset($_POST['fb_data']) && !empty($_POST['fb_data'])){
$data = $_POST['fb_data'];
$data['social_id'] = $data['id'];
$data['first_name'] = $data['name'];
unset($data['id']);
unset($data['name']);
unset($data['picture']);
$data['zip'] = $this->home->default_store();
$result = $this->home->social_registration($data);
if($result=='0'){
$res = $this->home->default_login($data);
}
$resp['status'] = 1;
}
echo json_encode($resp);exit;
}
public function google_login(){
include_once APPPATH."libraries/google-api-php-client/Google_Client.php";
......
......@@ -146,6 +146,9 @@ function convert_to_usd($amount,$from_Currency){
return $rs->first_name.' '.$rs->last_name;
}
function getstorelimit($store_id){
if(empty($store_id)){
return;
}
$ci = & get_instance();
$rs = $ci->db->where('id',$store_id)->get('shopper')->row();
return $rs->store_limit;
......
......@@ -65,6 +65,7 @@ function is_email_exists($data){
'email' =>$data['email'],
'first_name'=>$data['first_name'],
'zip'=>$data['zip'],
'password'=>$data['password'],
'address_status'=>0
);
$this->session->set_userdata('user_values',$sess_array);
......@@ -94,7 +95,8 @@ public function customer_login($data)
'email' =>$query_value->email,
'first_name'=>$query_value->first_name,
'zip'=>$query_value->zip,
'address_status'=>$query_value->address_status
'address_status'=>$query_value->address_status,
'password'=>$query_value->password
);
$this->session->set_userdata('user_values',$sess_array);
$this->session->set_userdata('store_id',$query_value->store_id);
......@@ -134,7 +136,6 @@ public function customer_login($data)
'username' =>$data['username'],
'store_name' =>$data['store_name'],
'zip'=>$data['zip']
);
$this->session->set_userdata('store_values',$sess_array);
return $insert_id;
......@@ -411,7 +412,8 @@ $setting = getSettings();
'email' =>$query_value->email,
'first_name'=>$query_value->first_name,
'zip'=>$query_value->zip,
'address_status'=>$query_value->address_status
'address_status'=>$query_value->address_status,
'password'=>$query_value->password
);
$this->session->set_userdata('user_values',$sess_array);
$this->session->set_userdata('store_id',$query_value->store_id);
......@@ -441,6 +443,7 @@ $setting = getSettings();
'email' =>$data['email'],
'first_name'=>$data['first_name'],
'zip'=>$data['zip'],
'password'=>'',
'address_status'=>0
);
$this->session->set_userdata('user_values',$sess_array);
......
......@@ -283,7 +283,7 @@ $settings = getSettings();
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
......@@ -8,7 +8,6 @@ $id = $sess['id'];
$currency = getSettings()->currency;
$currency_symbol = getSettings()->currency_symbol;
$cart_count = count($cart_details);
?>
<div class="overlay-div"></div>
<!-- Navigation -->
......@@ -328,7 +327,7 @@ $cart_count = count($cart_details);
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p class="showlocation" id="loc" href="" data-target="#myModalnew"><img src="<?php echo base_url('assets/images/locate.png'); ?>"> &nbsp; Change Location</p>
</div>
</div>
......@@ -462,10 +461,14 @@ $cart_count = count($cart_details);
<button type="button" class="close" data-dismiss="modal">×</button>
<div class="acount_form ful_wdth">
<form method="post" action="<?php echo base_url(); ?>Account/change_password/">
<label for="email">Current Password:</label>
<input type="password" class="form-control bg_wht wdth_fill" id="email" name="password" placeholder="Enter Current Password" required>
<br><br>
<br><br>
<?php if(!empty($sess) && isset($sess['password']) && !empty($sess['password'])){ ?>
<label for="email">Current Password:</label>
<input type="password" class="form-control bg_wht wdth_fill" id="email" name="password" placeholder="Enter Current Password" required>
<br><br>
<br><br>
<?php }else{ ?>
<input type="hidden" id="email" name="password" value=''>
<?php } ?>
<label for="email">New Password:</label>
<input type="password" class="form-control bg_wht wdth_fill" id="email" placeholder="Enter New Password" name="n_password" required>
<br><br>
......
......@@ -24,7 +24,7 @@ die();*/
<div class="col-md-12">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url();?>assets/images/locate.png"> &nbsp; Change Location</p>
</div>
......
......@@ -5,7 +5,7 @@
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p class="showlocation" href="" data-target="#myModalnew"><img src="<?php echo base_url('assets/images/locate.png'); ?>"> &nbsp; Change Location</p>
</div>
</div>
......@@ -74,7 +74,7 @@
</div>
</div>
<script src="<?php echo base_url('assets/js/jquery-1.9.1.min.js'); ?>"></script>
<script src="http://thecodeplayer.com/uploads/js/jquery.easing.min.js" type="text/javascript"></script>
<script src="<?php echo base_url('assets/js/jquery.easing.min.js') ;?>"></script>
<script src="<?php echo base_url('assets/js/jquery.mCustomScrollbar.concat.min.js') ;?>"></script>
<script src="<?php echo base_url('assets/js/parsley/parsley.min.js'); ?>"></script>
<script src="<?php echo base_url('assets/js/custom.js') ;?>"></script>
......
......@@ -278,7 +278,7 @@
<div class="row">
<div class="col-md-12">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
......@@ -335,7 +335,7 @@ What are your hours?
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
<?php
$setting = getSettings();
$fbAppId = $setting->fb_app_id;
$fbSecret = $setting->fb_sec_key;
?>
<div class="landing_bg">
<div class="landing_rht">
<div class="become1"> <p class="cpoint shoper_link frst_div"><img src="<?php echo base_url('assets/images/lockk.png'); ?>"> Become a Shopper </p></div>
......@@ -228,7 +233,7 @@
<br>
<p class="or">OR</p>
<div class="social_icon">
<a href="<?=$login_url; ?>"><button class="facebook" type="button"> Log in with Facebook</button></a>
<a href="javascript:void(0)" onclick="myFacebookLogin()"><button class="facebook" type="button"> Log in with Facebook</button></a>
<a href="<?=$authUrl; ?>"><button class="google" type="button">Log in with Google</button></a>
<p class="have_acnt">Forgot your password? <span class="violet_log reset_div">Reset it</span></p>
</div>
......@@ -250,15 +255,9 @@
<br>
<div class="result_msg"></div>
</form>
</form>
</div>
<!-- find-end-->
<div class="footer_list">
<ul>
......@@ -277,3 +276,47 @@
</div>
</div>
<script>
window.fbAsyncInit = function() {
FB.init({
appId : '<?=$fbAppId?>',
xfbml : true,
version : 'v2.8'
});
FB.AppEvents.logPageView();
};
(function(d, s, id){
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) {return;}
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_US/sdk.js";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
function myFacebookLogin() {
FB.login(function(response){
if (response.status === 'connected') {
getUserDetails();
}
});
}
function getUserDetails() {
var data,id,name,pic,email;
FB.api('/me?fields=id,name,picture,email', function(response) {
console.log(response)
data = {'fb_data':response};
$.post("<?php echo base_url();?>Home/facebooklogin",data,function(ret){
var ret = JSON.parse(ret);
if(ret.status == 0)
location.reload();
else if(ret.status == 1)
window.location.href= base_url+"Store/";
});
});
}
</script>
......@@ -238,7 +238,7 @@
<!-- <div class="radio"></div> -->
<?php } } else {?>
<div class="container">
<h3>No Address Found! Add <a class="button" data-rel="#content-b" href="#">New</a></h3>
<h3>No Address Found!</h3>
</div>
<?php } ?>
</section>
......@@ -469,7 +469,7 @@
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......@@ -595,4 +595,4 @@
}
</script>
</body>
</html>
\ No newline at end of file
</html>
......@@ -287,7 +287,7 @@ $settings = getSettings();
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
......@@ -283,7 +283,7 @@ $settings = getSettings();
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
......@@ -187,7 +187,7 @@
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
......@@ -168,7 +168,7 @@
<div class="col-md-12">
<div class="zip_outer">
<div class="head_store">
<h4>Choose a store in <b><?php echo $zip; ?></b> </h4>
<h4>Choose a store in <b id="zipPinCode"><?php echo $zip; ?></b> </h4>
<p><img src="<?php echo base_url('assets/images/locate.png'); ?>"> Change Location</p>
</div>
</div>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -305,6 +305,7 @@
var result = val['store'];
var z=val.zip;
$('#zip').html('');
$('[id^="zipPinCode"]').html(z);
$('<div class=""> </div>').appendTo('#zip');
if(val['message']=="zip_present"){
$('#myModalnew').modal('hide');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment