diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 714f2345..ead4b936 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -233,44 +233,7 @@ class EventController extends MyBaseController $event->sub_category_id = $request->get('sub_category_id'); $event->google_tag_manager_code = $request->get('google_tag_manager_code'); - /* - * If the google place ID is the same as before then don't update the venue - */ - if (($request->get('place_id') !== $event->location_google_place_id) || $event->location_google_place_id == '') { - $is_auto_address = (trim($request->get('place_id')) !== ''); - - if ($is_auto_address) { /* Google auto filled */ - $event->venue_name = $request->get('name'); - $event->venue_name_full = $request->get('venue_name_full'); - $event->location_lat = $request->get('lat'); - $event->location_long = $request->get('lng'); - $event->location_address = $request->get('formatted_address'); - $event->location_country = $request->get('country'); - $event->location_country_code = $request->get('country_short'); - $event->location_state = $request->get('administrative_area_level_1'); - $event->location_address_line_1 = $request->get('route'); - $event->location_address_line_2 = $request->get('locality'); - $event->location_post_code = $request->get('postal_code'); - $event->location_street_number = $request->get('street_number'); - $event->location_google_place_id = $request->get('place_id'); - $event->location_is_manual = 0; - } else { /* Manually entered */ - $event->venue_name = $request->get('location_venue_name'); - $event->location_address_line_1 = $request->get('location_address_line_1'); - $event->location_address_line_2 = $request->get('location_address_line_2'); - $event->location_state = $request->get('location_state'); - $event->location_post_code = $request->get('location_post_code'); - $event->location_is_manual = 1; - $event->location_google_place_id = ''; - $event->venue_name_full = ''; - $event->location_lat = ''; - $event->location_long = ''; - $event->location_address = ''; - $event->location_country = ''; - $event->location_country_code = ''; - $event->location_street_number = ''; - } - } + $event->venue_id = $request->get('venue_id'); $event->end_date = $request->get('end_date'); $event->event_image_position = $request->get('event_image_position'); diff --git a/config/app.php b/config/app.php index 3ac3ebd7..fc2f273f 100644 --- a/config/app.php +++ b/config/app.php @@ -66,7 +66,7 @@ return [ */ 'locale' => 'ru', - 'locales' => ['tk', 'en', 'ru'], + 'locales' => ['tk', 'ru'], /* |-------------------------------------------------------------------------- diff --git a/config/laravellocalization.php b/config/laravellocalization.php index 7bf3a3d0..7a5a7c18 100644 --- a/config/laravellocalization.php +++ b/config/laravellocalization.php @@ -42,7 +42,7 @@ return [ //'et' => ['name' => 'Estonian', 'script' => 'Latn', 'native' => 'eesti', 'regional' => 'et_EE'], //'na' => ['name' => 'Nauru', 'script' => 'Latn', 'native' => 'Ekakairũ Naoero', 'regional' => ''], //'guz' => ['name' => 'Ekegusii', 'script' => 'Latn', 'native' => 'Ekegusii', 'regional' => ''], - 'en' => ['name' => 'English', 'script' => 'Latn', 'native' => 'English', 'regional' => 'en_GB'], + //'en' => ['name' => 'English', 'script' => 'Latn', 'native' => 'English', 'regional' => 'en_GB'], //'en-AU' => ['name' => 'Australian English', 'script' => 'Latn', 'native' => 'Australian English', 'regional' => 'en_AU'], //'en-GB' => ['name' => 'British English', 'script' => 'Latn', 'native' => 'British English', 'regional' => 'en_GB'], //'en-US' => ['name' => 'U.S. English', 'script' => 'Latn', 'native' => 'U.S. English', 'regional' => 'en_US'], @@ -312,6 +312,6 @@ return [ // If you want to display the locales in particular order in the language selector you should write the order here. //CAUTION: Please consider using the appropriate locale code otherwise it will not work //Example: 'localesOrder' => ['es','en'], - 'localesOrder' => [ "ru", "tk","en"], + 'localesOrder' => [ "ru", "tk"], ];