Skip to content

Commit 3a81210

Browse files
author
Ivan
committed
location issue on going
1 parent 7a5230b commit 3a81210

File tree

4 files changed

+88
-12
lines changed

4 files changed

+88
-12
lines changed

app/Http/Controllers/User/ProfileController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function update(Request $request)
9393
$userInfo->save();
9494
}
9595

96-
$user->info->fill($input['user']);
96+
$user->info->fill($input);
9797
$user->info->save();
9898
$output = new \stdClass();
9999
$output->status = true;

config/constants.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
/**
3+
* Created by PhpStorm.
4+
* User: User
5+
* Date: 12/07/2016
6+
* Time: 5:32 PM
7+
*/
8+
9+
return [
10+
'countries' => [
11+
'es' => 'www.domain.es',
12+
'en' => 'www.domain.us'
13+
// etc
14+
]
15+
];

public/assets/internal/js/commonFunctions.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,12 @@ function getFileSizeFromInput(input) {
125125
return input.files[0].size;
126126
}
127127
return 0;
128+
}
129+
130+
function getRESTCountries(params, callback) {
131+
$.getJSON(params.url, function (response) {
132+
if (typeof callback == "function") {
133+
callback(response);
134+
}
135+
});
128136
}

resources/views/user/profile/edit.blade.php

Lines changed: 64 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</div>
7777
<div class="form-group">
7878
{!! Form::label('country', 'Country') !!} &nbsp;
79-
{!! Form::text('country', old('country'), ['class' => 'form-control input-sm', 'placeholder' => 'country']) !!}
79+
{!! Form::select('country', array(), old('country'), ['class' => 'form-control input-sm', 'id' => 'sel-country']) !!}
8080
</div>
8181
<div class="form-group">
8282
{!! Form::label('state', 'State') !!} &nbsp;
@@ -117,19 +117,52 @@
117117
@section('script')
118118
<script type="text/javascript" src="{{asset('assets/external/package/Cropper/cropper.min.js')}}"></script>
119119
<script type="text/javascript" src="{{asset('assets/external/sa/js/datetimepicker.min.js')}}"></script>
120+
<script type="text/javascript" src="{{asset('assets/external/sa/js/chosen.min.js')}}"></script>
120121
<script type="text/javascript">
121122
var cropper = null;
122123
$(function () {
124+
pageInit();
125+
});
126+
127+
function pageInit() {
123128
var $dateOnly = $(".date-only");
124-
if($dateOnly.length > 0) {
129+
if ($dateOnly.length > 0) {
125130
$dateOnly.datetimepicker({
126131
pickTime: false
127132
});
128-
$('.datetime-pick input:text').on('click', function(){
133+
$('.datetime-pick input:text').on('click', function () {
129134
$(this).closest('.datetime-pick').find('.add-on i').click();
130135
});
131136
}
132-
});
137+
getRESTCountries({
138+
"url": "{{asset("assets/internal/json/countries.json")}}"
139+
}, function (countries) {
140+
console.info('countries', countries);
141+
var $selCountry = $("#sel-country");
142+
$.each(countries, function (index, country) {
143+
$selCountry.append(
144+
$("<option>").attr({
145+
"value": country.name
146+
}).text(country.name)
147+
);
148+
});
149+
$selCountry.select();
150+
// $("#sel-country").autocomplete({
151+
// source: function (request, response) {
152+
// var matcher = new RegExp("^" + $.ui.autocomplete.escapeRegex(request.term), "i");
153+
// response($.grep(countries, function (item) {
154+
// return matcher.test(item.name)
155+
// }))
156+
// },
157+
// }).data("ui-autocomplete")._renderItem = function (ul, item) {
158+
// return $(ul).addClass("dropdown-menu inner").append(
159+
// $("<li>").attr("data-value", item.name).append(
160+
// $("<a>").attr("href", "#").text(item.name)
161+
// )
162+
// );
163+
// };
164+
});
165+
}
133166
134167
function previewSelectedImage(el) {
135168
if (getFileSizeFromInput(el) <= 0 || getFileSizeFromInput(el) > 950 * 1024) {
@@ -198,9 +231,7 @@ function submitProfilePicture(data, callback) {
198231
"type": "put",
199232
"data": {
200233
"_token": "{!! csrf_token() !!}",
201-
"user": {
202-
"profile_pic": data
203-
}
234+
"profile_pic": data
204235
},
205236
'cache': false,
206237
'dataType': "json",
@@ -211,7 +242,7 @@ function submitProfilePicture(data, callback) {
211242
}
212243
},
213244
"error": function () {
214-
console.info("Upload error");
245+
alertP("Profile Picture Upload Failed", "Unable to upload profile picture, please try again later.");
215246
}
216247
})
217248
}
@@ -221,9 +252,31 @@ function objectDropOnProfilePicture(el, e) {
221252
e.stopPropagation();
222253
}
223254
224-
function updateUserProfileOnClick()
225-
{
255+
function updateUserProfileOnClick() {
256+
var params = $("#frm-update-user-profile").serialize();
257+
submitUserProfile(params, function (response) {
258+
if (response.status == true) {
259+
alertP("Profile Updated", "You profile information has been updated.");
260+
}
261+
});
262+
}
226263
264+
function submitUserProfile(data, callback) {
265+
$.ajax({
266+
"url": "{{url("user/profile")}}",
267+
"type": "put",
268+
"data": data,
269+
'cache': false,
270+
'dataType': "json",
271+
"success": function (response) {
272+
if ($.isFunction(callback)) {
273+
callback(response);
274+
}
275+
},
276+
"error": function () {
277+
alertP("Profile Update Failed", "Unable to update profile, please try again later.");
278+
}
279+
});
227280
}
228281
</script>
229-
@stop
282+
@stop

0 commit comments

Comments
 (0)