webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
franknstayn
2021-10-11 20:06:40 +08:00
parent bc50470935
commit ae4a6fb4ad
9 changed files with 706 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/Http/Controllers/CustomAuthController.php
View File

@@ -78,23 +78,23 @@ class CustomAuthController extends Controller
$post['captcha'] = $this->captchaCheck();
$validator = Validator::make(
$post,
[
'username' => 'unique:user_logins',
'email' => 'unique:user_logins',
'g-recaptcha-response' => 'required',
'captcha' => 'required|min:1'
],
[
'g-recaptcha-response.required' => 'Captcha is required',
'captcha.min' => 'Wrong captcha, please try again.'
]
// $post,
// [
// 'username' => 'unique:user_logins',
// 'email' => 'unique:user_logins',
// 'g-recaptcha-response' => 'required',
// 'captcha' => 'required|min:1'
// ],
// [
// 'g-recaptcha-response.required' => 'Captcha is required',
// 'captcha.min' => 'Wrong captcha, please try again.'
// ]
$post,
[
'username' => 'unique:user_logins',
'email' => 'unique:user_logins',
]
);
@@ -123,20 +123,36 @@ class CustomAuthController extends Controller
));
}
// var_dump($post);
$user = User::create([
'name' => $post['name'],
'username' => $post['username'],
'name' => $post['firstname'] . ' ' . $post['lastname'],
'username' => $post['email'],
'email' => $post['email'],
'password' => bcrypt($post['password']),
'role' => 'user'
]);
$country = explode("_", $post['country']);
// $country = explode("_", $post['country']);
// $data = array(
// 'UserId' => $user->id,
// 'CountryCode' => $country[0],
// 'Country' => $country[1]
// );
$data = array(
'UserId' => $user->id,
'CountryCode' => $country[0],
'Country' => $country[1]
'Fullname' => $post['firstname'] . ' ' . $post['lastname'],
'ContactNumber' => $post['mobilenumber'],
// 'OtherNotes' => $post['othernotes'],
'Address' => $post['address'],
'Address2' => $post['address2'],
'State' => $post['state'],
'City' => $post['city'],
'ZipCode' => $post['zipcode'],
'CountryCode' => $post['countryCode'],
'Country' => $post['country']
);
$userModel->insertAddressBook($data);
Auth::attempt(['email' => $post['email'], 'password' => $post['password']]);

1
app/Http/Controllers/paypal/PaypalController.php
View File

@@ -201,6 +201,7 @@ class PaypalController extends Controller
$shipping = PayPal::ShippingAddress();
$shipping->setRecipientName($array_address_book[0]->Fullname);
$shipping->setLine1($array_address_book[0]->Address);
$shipping->setLine2($array_address_book[0]->Address2);
$shipping->setCity($array_address_book[0]->City);
$shipping->setCountryCode($array_address_book[0]->CountryCode);
$shipping->setPostalCode($array_address_book[0]->ZipCode);

2
app/Http/Controllers/user/UserController.php
View File

@@ -79,6 +79,7 @@ class UserController extends Controller {
'ContactNumber' => $post['mobilenumber'],
'OtherNotes' => $post['othernotes'],
'Address' => $post['address'],
'Address2' => $post['address2'],
'State' => $post['state'],
'City' => $post['city'],
'ZipCode' => $post['zipcode'],
@@ -118,6 +119,7 @@ class UserController extends Controller {
'ContactNumber' => $post['mobilenumber'],
'OtherNotes' => $post['othernotes'],
'Address' => $post['address'],
'Address2' => $post['address2'],
'State' => $post['state'],
'City' => $post['city'],
'ZipCode' => $post['zipcode'],

79
resources/views/auth/register.blade.php
View File

@@ -4,6 +4,7 @@
.error {
color: red;
}
.g-recaptcha {
width: 100%;
}
@@ -24,14 +25,19 @@
<form role="form" id="frm-register">
<input type="hidden" name="redirect" value="{{ Request::get('redirectUrl') }}">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<div class="mb-3">
<label class="control-label">Fullname</label>
<input type="text" class="form-control" name="name" value="{{ old('name') }}" placeholder="Fullname">
<div class="text-center my-3 clearfix">
<strong>Personal Information</strong>
</div>
<div class="mb-3">
<label class="control-label">Username</label>
<input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="Username">
<label class="control-label">First name</label>
<input type="text" class="form-control" name="firstname" placeholder="First name">
</div>
<div class="mb-3">
<label class="control-label">Last name</label>
<input type="text" class="form-control" name="lastname" placeholder="Last name">
</div>
<div class="mb-3">
@@ -39,6 +45,12 @@
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="Email Address">
</div>
<div class="mb-3">
<label class="control-label">Phone Number</label>
<input type="text" class="form-control" name="mobilenumber" placeholder="Phone Number">
</div>
<div class="mb-3">
<label class="control-label">Password</label>
<input type="password" class="form-control" name="password" id="password" required placeholder="Password">
@@ -49,30 +61,67 @@
<input type="password" class="form-control" name="password_confirmation" placeholder="Confirm Password" data-rule-equalTo="#password" required>
</div>
<!-- <div class="mb-3">
<label class="control-label">Username</label>
<input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="Username">
</div> -->
<div class="text-center my-3 clearfix">
<strong>Address Information</strong>
</div>
<div class="mb-3">
<label class="control-label">Select Country</label>
<select name="country" id="country" class="form-control">
<option value="US_United States">United States</option>
<option value="CA_Canada">Canada</option>
<select name="countryCode" id="select_country" class="form-control" onchange="selectCountry(this)">
<option value="">Select Country</option>
<option value="US">United States</option>
<option value="CA">Canada</option>
</select>
</div>
<div class="mb-3">
<label class="control-label">State / Province</label>
<label></label>
<select class="form-control" name="state" id="lst-states">
<option value="">Select State</option>
</select>
</div>
<div class="mb-3">
<label class="control-label">City</label>
<select class="form-control" name="city" id="lst-cities">
<option value="">Select City</option>
</select>
</div>
<div class="mb-3">
<label class="control-label">Address 1</label>
<!-- <textarea type="text" class="form-control" name="address" placeholder="Please enter your House Number, Building and Street Name"></textarea> -->
<input type="text" class="form-control" name="address" placeholder="Address 1">
</div>
<div class="mb-3">
<label class="control-label">Address 2</label>
<!-- <textarea type="text" class="form-control" name="address" placeholder="Please enter your House Number, Building and Street Name"></textarea> -->
<input type="text" class="form-control" name="address2" placeholder="Address 2">
</div>
<div class="mb-3">
<label class="control-label">Zip Code</label>
<input type="text" class="form-control" name="zipcode" placeholder="Please enter your zip code">
</div>
<div class="mb-3">
<div class="g-recaptcha text-center" data-sitekey="{{ env('CAPTCHA_SITE_KEY') }}"></div>
</div>
<button
type="submit"
class="btn btn-black btn-sm w-100 mt-3"
>
<button type="submit" class="btn btn-black btn-sm w-100 mt-3">
Register
</button>
</form>
<hr class="custom-hr" />
<div class="py-3 text-start">
Have already an account?
<a href="{{ url('./auth/login') }}" class="btn btn-green btn-sm w-100"
>Login here</a
>
<a href="{{ url('./auth/login') }}" class="btn btn-green btn-sm w-100">Login here</a>
</div>
</div>
</div>

99
resources/views/merchbay/cart.blade.php
View File

@@ -12,7 +12,6 @@
.cart-store-logo {
border: 1px solid #e2e2e2;
}
</style>
<div class="wrapper pb-5">
@@ -26,8 +25,7 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
@if (isset($store_array[0]->StoreUrl))
<li class="breadcrumb-item"><a
href="{{ url('store') . '/' . $store_array[0]->StoreUrl }}">{{ $store_array[0]->StoreName }}</a>
<li class="breadcrumb-item"><a href="{{ url('store') . '/' . $store_array[0]->StoreUrl }}">{{ $store_array[0]->StoreName }}</a>
</li>
@else
<li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
@@ -51,8 +49,7 @@
<div class="alert alert-danger alert-dismissible fade show" role="alert">
<strong>Error!</strong> {!! Session::get('cartkeyError') !!}
<button type="button" class="btn-close" data-bs-dismiss="alert"
aria-label="Close"></button>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
@endif
</div>
@@ -62,9 +59,9 @@
<div class="row">
<div class="col-md-8 col-md-pull-4">
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<h6><img height="30px" class="cart-store-logo"
src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}">
{{ $store_array[0]->StoreName }}</h6>
<h6><img height="30px" class="cart-store-logo" src="{{ config('site_config.uploads') . 'teamstore/' . $store_array[0]->ImageFolder . '/' . $store_array[0]->StoreLogo }}">
{{ $store_array[0]->StoreName }}
</h6>
</div>
@foreach ($item_group as $item)
@if ($item->VoucherId == null)
@@ -74,20 +71,19 @@
<div class="text-center">
@foreach ($img_thumb as $img)
@if ($img->ProductId == $item->ProductId)
<img class="previewImage"
src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
<img class="previewImage" src="{{ config('site_config.images_url') }}/{{ $img->Image }}">
@endif
@endforeach
</div>
</div>
<div class="col-md-9">
<h4>
<a
href="{{ url('store') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a>
<a href="{{ url('store') . '/' . $item->StoreURL . '/' . 'product/' . $item->ProductURL }}">{{ $item->ProductName }}</a>
</h4>
<p>Total Price:
{{ $item->total_price . ' ' . $store_array[0]->StoreCurrency }}
&bull; Row(s): {{ $item->qty }} </p>
&bull; Row(s): {{ $item->qty }}
</p>
<div class="table-responsive">
<table class="table table-striped table-condensed">
@@ -193,9 +189,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="tshirt-form")
<tr>
@@ -203,18 +197,14 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="quantity-form")
<tr>
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-number-form")
<tr>
@@ -223,9 +213,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-number-size-form")
<tr>
@@ -235,9 +223,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="number-form")
<tr>
@@ -245,9 +231,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-name2-size-form")
<tr>
@@ -257,9 +241,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="name-size-form")
<tr>
@@ -268,9 +250,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="jersey-and-shorts-quantity-form")
<tr>
@@ -279,9 +259,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@elseif($item->FormUsed=="number-jersey-shorts-form")
<tr>
@@ -291,9 +269,7 @@
<td>{{ $sub_item->Price . ' ' . $store_array[0]->StoreCurrency }}
</td>
<td>{{ $sub_item->Quantity }}</td>
<td><a class="btn btn-xs btn-link pull-right"
href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i
class="fa fa-times"></i></a></td>
<td><a class="btn btn-xs btn-link pull-right" href="{{ url('removeitem') }}/{{ $sub_item->Id }}"><i class="fa fa-times"></i></a></td>
</tr>
@else
@@ -314,8 +290,7 @@
<div style="border: 1px solid #e2e2e2; padding: 10px; border-bottom: none;">
@if (Session::has('msg'))
<div class="alert alert-warning alert-dismissible">
<button type="button" class="close" data-dismiss="alert"
aria-hidden="true">×</button>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="fa fa-exclamation-triangle"></i> Warning:</h4>
{!! Session::get('msg') !!}
</div>
@@ -334,7 +309,7 @@
<div>{{ $address_book[0]->Fullname }}</div>
<div>{{ $address_book[0]->ContactNumber }}</div>
<div>
{{ $address_book[0]->Address . ', ' . $address_book[0]->State . ', ' . $address_book[0]->City . ', ' . $address_book[0]->Country . ', ' . $address_book[0]->CountryCode . ' ' . $address_book[0]->ZipCode }}
{{ $address_book[0]->Address . ' ' . $address_book[0]->Address2 . ', ' . $address_book[0]->State . ', ' . $address_book[0]->City . ', ' . $address_book[0]->Country . ', ' . $address_book[0]->CountryCode . ' ' . $address_book[0]->ZipCode }}
<a href="{{ url('user/address-book/edit/'.$address_book[0]->Id) }}">[ Edit ]</a>
</div>
@endif
@@ -352,8 +327,7 @@
<small>{{ number_format($tax['tax'], 2) . ' ' . $store_array[0]->StoreCurrency }}</small>
</h5>
<hr>
<h3>Total: <span
id="my_subtotal">{{ number_format($tax['order_grandtotal'] + $shipping_fee + $tax['tax'], 2) }}</span>
<h3>Total: <span id="my_subtotal">{{ number_format($tax['order_grandtotal'] + $shipping_fee + $tax['tax'], 2) }}</span>
<small>{{ $store_array[0]->StoreCurrency }}</small>
</h3>
@@ -365,17 +339,14 @@
@if ($item->VoucherId != null)
<div class="btn-group mb-2">
@if ($item->VoucherType == 'Percentage')
<button type="button" class="btn btn-black btn-sm dropdown-toggle"
data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}
<button type="button" class="btn btn-black btn-sm dropdown-toggle" data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . '%' }}
OFF</button>
@else
<button type="button" class="btn btn-black btn-sm dropdown-toggle"
data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }}
<button type="button" class="btn btn-black btn-sm dropdown-toggle" data-bs-toggle="dropdown">{{ $item->VoucherCode . ' ' . $item->VoucherValue . ' ' . $store_array[0]->StoreCurrency }}
OFF</button>
@endif
<ul class="dropdown-menu">
<li><a class="dropdown-item"
href="{{ url('removeitem') . '/' . $item->Id }}">Remove</a>
<li><a class="dropdown-item" href="{{ url('removeitem') . '/' . $item->Id }}">Remove</a>
</li>
</ul>
</div>
@@ -385,11 +356,9 @@
</div>
<form id="frm_voucher">
<div class="input-group">
<input type="text" class="form-control" name="voucher" data-error="#error_voucher"
placeholder="Enter Voucher Code">
<input type="text" class="form-control" name="voucher" data-error="#error_voucher" placeholder="Enter Voucher Code">
<span class="input-group-btn">
<button class="btn btn-default" id="btn_apply_voucher"
type="submit">Apply</button>
<button class="btn btn-default" id="btn_apply_voucher" type="submit">Apply</button>
</span>
</div>
<span id="error_voucher" style="color: #dd4b39"></span>
@@ -398,19 +367,21 @@
</div>
<div style="border: 1px solid #e2e2e2; padding: 10px;">
<a @if ($getSubtotal <= 0) disabled @endif href="{{ url('getCheckout') }}" class="btn w-100"
style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;">Checkout</a><br>
<a @if ($getSubtotal <=0) disabled @endif href="{{ url('getCheckout') }}" class="btn w-100" style="background-color: #ffc300; border-color: #e2ad00; text-align: -webkit-center;">Checkout</a><br>
<!-- <div class="my-2">
<button class="btn btn-lg btn-info w-100">Checkout with Voucher</button>
</div> -->
<div class="bg-info p-2 mt-2">
Be advised payments made on merchbay will show up as crewsportswear on your receipt
<div class="border rounded-2 p-2 mt-2">
Payments made on Merchbay will show up as Crewsportswear on your order confirmations and receipt.
</div>
<div class="border rounded-2 p-2 mt-2">
Store payments are processed through PayPal. A PayPal account is not required to make a purchase. If you do not have a PayPal account click on “Pay with Debit or Credit Card” on the PayPal check out page
</div>
</div>
<div class="py-4">
<a href="{{ url('store') . '/' . $store_array[0]->StoreUrl }}"
class="btn btn-black w-100" type="submit">Continue Shopping</a>
<a href="{{ url('store') . '/' . $store_array[0]->StoreUrl }}" class="btn btn-black w-100" type="submit">Continue Shopping</a>
</div>
</div>

175
resources/views/merchbay_main.blade.php
View File

@@ -115,12 +115,15 @@
$("#frm-register").validate({
rules: {
name: {
firstname: {
required: true
},
username: {
lastname: {
required: true
},
// username: {
// required: true
// },
email: {
required: true,
email: true
@@ -128,6 +131,24 @@
password: {
required: true
//minlength: 6 // <-- removed underscore
},
mobilenumber: {
required: true
},
address: {
required: true
},
state: {
required: true
},
city: {
required: true
},
zipcode: {
required: true
},
countryCode: {
required: true
}
},
messages: {},
@@ -182,6 +203,148 @@
}); // end document ready
function getSelectedCountry() {
var selectedState = $('#select_country').data('selected');
if (selectedState) {
// console.log(selectedState)
$("#select_country").val(selectedState).change();
// selectCountry()
}
}
function selectCountry(item) {
const country = item.options[item.selectedIndex].text;
const countryCode = item.options[item.selectedIndex].value
console.log(countryCode)
if (countryCode === "US") {
fetchUSA()
}
if (countryCode === "CA") {
fetchCanada()
}
}
function fetchCanada() {
$.getJSON("{{ asset('/public/api/canada.json') }}", function(items) {
var states = [];
Object.keys(items).forEach(function(state) {
states.push(state)
});
var uniqueStates = Array.from(new Set(states));
var selectedState = $('#lst-states').data('selected');
$('.dynamic-state').remove();
$('.dynamic-city').remove();
uniqueStates.sort().forEach(function(key) {
if (selectedState == key) {
$('#lst-states').append('<option value="' + key + '" selected class="dynamic-state">' + key + '</option>');
var cities = [];
cities = items[selectedState];
var uniqueCities = Array.from(new Set(cities));
var selectedCity = $('#lst-cities').data('selected');
$('.dynamic-city').remove();
uniqueCities.sort().forEach(function(key) {
if (selectedCity == key) {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city" selected>' + key + '</option>');
} else {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city">' + key + '</option>');
}
});
} else {
$('#lst-states').append('<option value="' + key + '" class="dynamic-state">' + key + '</option>');
}
});
$(document).on('select change', '#lst-states', function() {
var cities = [];
var selectedState = $(this).val()
cities = items[selectedState];
var uniqueCities = Array.from(new Set(cities));
$('.dynamic-city').remove();
uniqueCities.sort().forEach(function(key) {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city">' + key + '</option>');
});
});
});
}
function fetchUSA() {
$.getJSON("{{ asset('/public/api/usaCities.json') }}", function(data) {
var states = [];
for (i = 0; i < data.length; i++) {
states.push(data[i]['state']);
}
var uniqueStates = Array.from(new Set(states));
var selectedState = $('#lst-states').data('selected');
$('.dynamic-state').remove();
$('.dynamic-city').remove();
uniqueStates.sort().forEach(function(key) {
if (selectedState == key) {
$('#lst-states').append('<option value="' + key + '" selected class="dynamic-state">' + key + '</option>');
//
var cities = [];
for (i = 0; i < data.length; i++) {
console.log(data[i])
cities.push(data[i]);
}
var city = getCities(cities, key);
var uniqueCities = Array.from(new Set(city));
var selectedCity = $('#lst-cities').data('selected');
$('.dynamic-city').remove();
uniqueCities.sort().forEach(function(key) {
if (selectedCity == key) {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city" selected>' + key + '</option>');
} else {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city">' + key + '</option>');
}
});
} else {
$('#lst-states').append('<option value="' + key + '" class="dynamic-state">' + key + '</option>');
}
});
$(document).on('select change', '#lst-states', function() {
var cities = [];
for (i = 0; i < data.length; i++) {
cities.push(data[i]);
}
var city = getCities(cities, $(this).val());
var uniqueCities = Array.from(new Set(city));
$('.dynamic-city').remove();
uniqueCities.sort().forEach(function(key) {
$('#lst-cities').append('<option value="' + key + '" class="dynamic-city">' + key + '</option>');
});
});
});
}
function getCities(arr, q) {
var sd = [];
arr.find(function(element) {
if (element['state'] == q) {
sd.push(element['city']);
}
});
return sd;
}
function submitLoginForm() {
// method="POST" action="{{ url('/auth/login') }}"
var data = $("#frm-login").serialize();
@@ -218,7 +381,13 @@
} /* login submit */
function submitRegisterForm() {
var data = $("#frm-register").serialize();
var data = $("#frm-register").serializeArray();
data.push({
name: "country",
value: $("#select_country option:selected").text()
});
// var data = $("#frm-register").serialize();
$.ajax({
type: 'POST',

2
resources/views/user-layouts/address_book.blade.php
View File

@@ -40,7 +40,7 @@
@foreach($array_address_book as $row)
<tr>
<td>{{ $row->Fullname }}</td>
<td>{{ $row->Address }}, {{ $row->State }}, {{ $row->City }}, {{ $row->Country}} {{ $row->CountryCode}}, {{ $row->ZipCode }}</td>
<td>{{ $row->Address . ' ' . $row->Address2 }}, {{ $row->State }}, {{ $row->City }}, {{ $row->Country}} {{ $row->CountryCode}}, {{ $row->ZipCode }}</td>
<td>{{ $row->ContactNumber }}</td>
<td class="text-center">
<a href="{{ url('user/address-book/edit/') }}/{{ $row->Id }}" class="btn btn-default btn-xs"><i class="fa fa-edit"></i> Edit</a>

8
resources/views/user-layouts/create_address_book.blade.php
View File

@@ -66,8 +66,12 @@
</select>
</div>
<div class="form-group">
<label>House Number, Building and Street Name</label>
<textarea type="text" class="form-control" name="address" placeholder="Please enter your House Number, Building and Street Name"></textarea>
<label>Address 1</label>
<textarea type="text" class="form-control" name="address" placeholder="Address 1"></textarea>
</div>
<div class="form-group">
<label>Address 2</label>
<textarea type="text" class="form-control" name="address2" placeholder="Address 2"></textarea>
</div>
<div class="form-group">
<label>Zip Code</label>

9
resources/views/user-layouts/edit_address_book.blade.php
View File

@@ -66,8 +66,13 @@
</select>
</div>
<div class="form-group">
<label>House Number, Building and Street Name</label>
<input type="text" class="form-control" name="address" placeholder="Please enter your House Number, Building and Street Name" value="{{ $array_address_book[0]->Address }}">
<label>Address 1</label>
<input type="text" class="form-control" name="address" placeholder="Address 1" value="{{ $array_address_book[0]->Address }}">
</div>
<div class="form-group">
<label>Address 2</label>
<input type="text" class="form-control" name="address2" placeholder="Address 2" value="{{ $array_address_book[0]->Address2 }}">
</div>
<div class="form-group">
<label>Zip Code</label>