From 01044aae5224eb5ef93a45dc86ca2d6416ce4dbb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 30 Mar 2020 21:36:35 +0300 Subject: [PATCH 1/3] #1195 add sort order for list and admin page --- ...odule.location__create_location_fields.php | 165 +----------------- ....module.location__create_cities_stream.php | 2 +- ...dule.location__create_districts_stream.php | 2 +- ....location__create_neighborhoods_stream.php | 2 +- ...module.location__create_village_stream.php | 2 +- .../src/City/Table/CityTableBuilder.php | 2 +- .../src/Country/Table/CountryTableBuilder.php | 2 +- .../District/Table/DistrictTableBuilder.php | 2 +- .../src/Http/Controller/AjaxController.php | 10 +- .../src/LocationModuleSeeder.php | 4 +- .../Table/NeighborhoodTableBuilder.php | 2 +- .../src/Village/Table/VillageTableBuilder.php | 2 +- 12 files changed, 21 insertions(+), 176 deletions(-) diff --git a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php index 4bfed624d..2a73d4360 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php +++ b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php @@ -28,186 +28,31 @@ class VisiosoftModuleLocationCreateLocationFields extends Migration ], ], 'description' => 'anomaly.field_type.textarea', - 'advs_desc' => [ - 'type' => 'anomaly.field_type.wysiwyg', - 'config' => [ - 'height' => 500, - ], - ], - 'cat1' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => 0, - ] - ], - 'cat2' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'cat3' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'cat4' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'cat5' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'cat6' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'cat7' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - "default_value" => NULL, - ] - ], - 'parent_category' => [ - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => CategoryModel::class, - "default_value" => 0, - ] - ], - 'status' => [ - 'type' => 'anomaly.field_type.text', - 'config' => [ - 'type' => 'text', - 'default_value' => 'pending_user' - ] - ], - 'order' => 'anomaly.field_type.integer', - 'price' => 'anomaly.field_type.decimal', - 'currency' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'handler' => 'currencies', - ], - ], - 'stock' => 'anomaly.field_type.integer', - 'online_payment' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => 0, - ] - ], - 'is_get_adv' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => 0, - ] - ], - 'files' => [ - 'type' => 'visiosoft.field_type.media', - 'config' => [ - 'folders' => ["images"], - 'mode' => 'upload', - ] - ], - 'country' => [ + 'parent_country' => [ 'type' => 'anomaly.field_type.relationship', 'config' => [ 'related' => CountryModel::class, "default_value" => 0, ] ], - 'city' => [ + 'parent_city' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], ] ], - 'district' => [ + 'parent_district' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], ] ], - 'neighborhood' => [ + 'parent_neighborhood' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], ] ], - 'village' => [ - "type" => "anomaly.field_type.select", - "config" => [ - "options" => [], - ] - ], - 'map_Val' => "anomaly.field_type.text", - 'parent_country_id' => 'anomaly.field_type.integer', - 'parent_city_id' => 'anomaly.field_type.integer', - 'parent_district_id' => 'anomaly.field_type.integer', - 'parent_neighborhood_id' => 'anomaly.field_type.integer', - 'publish_at' => 'anomaly.field_type.datetime', - 'finish_at' => 'anomaly.field_type.datetime', - 'custom_field_category' => [ - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => CustomFieldModel::class, - ], - ], - 'parent_adv' => [ - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => AdvModel::class, - ], - ], - 'custom_field_value' => 'anomaly.field_type.text', - 'type' => [ - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'options' => ['text' => 'Text Box', 'select' => 'Secim Alani(Select Box)', 'checkboxes' => 'Coklu Secim(Check Box)', 'multiple' => 'Cok Satirli Alan(Multi Line Box)', 'integer' => 'Tam Sayi', 'colorpicker' => 'Color Picker'], - 'separator' => ':', - ] - ], - 'custom_field_select_options' => 'anomaly.field_type.text', - 'popular_adv' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => 0, - ] - ], - 'adv_day' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => 0, - ] - ], - 'custom_field_type' => "anomaly.field_type.text", - 'cf_json' => "visiosoft.field_type.json", - 'foreign_currencies' => 'visiosoft.field_type.json', - 'deleted_at' => "anomaly.field_type.datetime", - 'value' => 'anomaly.field_type.text', - 'cover_photo' => 'anomaly.field_type.text', - 'category_id' => 'anomaly.field_type.integer', - 'field_id' => 'anomaly.field_type.integer', - 'custom_field' => [ - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => CustomFieldModel::class, - ], - ], - 'count_show_phone' => [ - 'type' => 'anomaly.field_type.integer', - 'config' => [ - 'default_value' => 0, - ] - ], + 'order' => 'anomaly.field_type.integer', ]; } diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php index 3e2e1d313..4c64234cd 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateCitiesStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_country_id' => [ + 'parent_country' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php index 4ccb2922a..6148a8be7 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateDistrictsStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_city_id' => [ + 'parent_city' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php index 3238f3959..17a929df8 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateNeighborhoodsStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_district_id' => [ + 'parent_district' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php index 60ad2d598..b34dc55f5 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateVillageStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_neighborhood_id' => [ + 'parent_neighborhood' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php b/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php index 87fc3b03f..86dd6a93b 100644 --- a/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php @@ -61,7 +61,7 @@ class CityTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'id' => 'DESC', + 'sort_order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php b/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php index 15bd398ee..08f21241b 100644 --- a/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php @@ -61,7 +61,7 @@ class CountryTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'id' => 'DESC', + 'sort_order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php b/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php index 5163c9f13..291429ad6 100644 --- a/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php @@ -61,7 +61,7 @@ class DistrictTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'id' => 'DESC', + 'sort_order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php index 396af406e..88012e68f 100644 --- a/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php +++ b/addons/default/visiosoft/location-module/src/Http/Controller/AjaxController.php @@ -57,7 +57,7 @@ class AjaxController extends PublicController if ($this->request->id) return $this->country_model->find($this->request->id); else - return $this->country_model->get(); + return $this->country_model->orderBy('order', 'ASC')->get(); } /** @@ -67,7 +67,7 @@ class AjaxController extends PublicController { if ($this->request->id) { $id = explode(',', $this->request->id); - return $this->city_model->whereIn('parent_country_id', $id)->get(); + return $this->city_model->whereIn('parent_country_id', $id)->orderBy('order', 'ASC')->get(); } } @@ -78,7 +78,7 @@ class AjaxController extends PublicController { if ($this->request->id) { $id = explode(',', $this->request->id); - return $this->district_model->whereIn('parent_city_id', $id)->get(); + return $this->district_model->whereIn('parent_city_id', $id)->orderBy('order', 'ASC')->get(); } } @@ -89,7 +89,7 @@ class AjaxController extends PublicController { if ($this->request->id) { $id = explode(',', $this->request->id); - return $this->neighborhood_model->whereIn('parent_district_id', $id)->get(); + return $this->neighborhood_model->whereIn('parent_district_id', $id)->orderBy('order', 'ASC')->get(); } } @@ -100,7 +100,7 @@ class AjaxController extends PublicController { if ($this->request->id) { $id = explode(',', $this->request->id); - return $this->village_model->whereIn('parent_neighborhood_id', $id)->get(); + return $this->village_model->whereIn('parent_neighborhood_id', $id)->orderBy('order', 'ASC')->get(); } } } \ No newline at end of file diff --git a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php index c53714fdd..0023fa962 100644 --- a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php +++ b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php @@ -28,8 +28,8 @@ class LocationModuleSeeder extends Seeder Model::unguard(); DB::unprepared(file_get_contents(__DIR__.'/countries.sql')); DB::unprepared(file_get_contents(__DIR__.'/cities.sql')); - DB::unprepared(file_get_contents(__DIR__.'/districts.sql')); - DB::unprepared(file_get_contents(__DIR__.'/neighborhoods.sql')); +// DB::unprepared(file_get_contents(__DIR__.'/districts.sql')); +// DB::unprepared(file_get_contents(__DIR__.'/neighborhoods.sql')); Model::reguard(); /* Demo Stop*/ } diff --git a/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php b/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php index c5e158e1c..24461448b 100644 --- a/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php @@ -61,7 +61,7 @@ class NeighborhoodTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'id' => 'DESC', + 'sort_order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php b/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php index be16276dd..5c79b4666 100644 --- a/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php @@ -52,7 +52,7 @@ class VillageTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'id' => 'DESC', + 'sort_order' => 'ASC', ], ]; /** From 90e51713185d106e9576dd4495a2e7602c89f5cb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 31 Mar 2020 09:57:31 +0300 Subject: [PATCH 2/3] add trash && fixed order --- ....module.location__create_location_fields.php | 7 ++++--- ...module.location__create_countries_stream.php | 2 +- ...ft.module.location__create_cities_stream.php | 4 ++-- ...module.location__create_districts_stream.php | 4 ++-- ...le.location__create_neighborhoods_stream.php | 4 ++-- ...t.module.location__create_village_stream.php | 4 ++-- .../location-module/src/City/CityModel.php | 4 ++-- .../src/City/Table/CityTableBuilder.php | 2 +- .../src/Country/Table/CountryTableBuilder.php | 2 +- .../src/District/DistrictModel.php | 4 ++-- .../src/District/Table/DistrictTableBuilder.php | 2 +- .../src/LocationModuleSeeder.php | 17 +++++++++-------- .../src/Neighborhood/NeighborhoodModel.php | 4 ++-- .../Table/NeighborhoodTableBuilder.php | 2 +- .../src/Village/Table/VillageTableBuilder.php | 2 +- .../src/Village/VillageModel.php | 4 ++-- 16 files changed, 35 insertions(+), 33 deletions(-) diff --git a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php index 2a73d4360..cdafb646d 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php +++ b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php @@ -35,19 +35,20 @@ class VisiosoftModuleLocationCreateLocationFields extends Migration "default_value" => 0, ] ], - 'parent_city' => [ + 'parent_country_id' => 'anomaly.field_type.integer', + 'parent_city_id' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], ] ], - 'parent_district' => [ + 'parent_district_id' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], ] ], - 'parent_neighborhood' => [ + 'parent_neighborhood_id' => [ "type" => "anomaly.field_type.select", "config" => [ "options" => [], diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043016_visiosoft.module.location__create_countries_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043016_visiosoft.module.location__create_countries_stream.php index f788c1cc2..dd4634d6e 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043016_visiosoft.module.location__create_countries_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043016_visiosoft.module.location__create_countries_stream.php @@ -14,7 +14,7 @@ class VisiosoftModuleLocationCreateCountriesStream extends Migration 'slug' => 'countries', 'title_column' => 'name', 'translatable' => true, - 'trashable' => false, + 'trashable' => true, 'searchable' => false, 'sortable' => false, ]; diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php index 4c64234cd..d8d8449b7 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043036_visiosoft.module.location__create_cities_stream.php @@ -14,7 +14,7 @@ class VisiosoftModuleLocationCreateCitiesStream extends Migration 'slug' => 'cities', 'title_column' => 'name', 'translatable' => true, - 'trashable' => false, + 'trashable' => true, 'searchable' => false, 'sortable' => false, ]; @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateCitiesStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_country' => [ + 'parent_country_id' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php index 6148a8be7..cc3a5243b 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043108_visiosoft.module.location__create_districts_stream.php @@ -14,7 +14,7 @@ class VisiosoftModuleLocationCreateDistrictsStream extends Migration 'slug' => 'districts', 'title_column' => 'name', 'translatable' => true, - 'trashable' => false, + 'trashable' => true, 'searchable' => false, 'sortable' => false, ]; @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateDistrictsStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_city' => [ + 'parent_city_id' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php index 17a929df8..082adaf90 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_11_043124_visiosoft.module.location__create_neighborhoods_stream.php @@ -14,7 +14,7 @@ class VisiosoftModuleLocationCreateNeighborhoodsStream extends Migration 'slug' => 'neighborhoods', 'title_column' => 'name', 'translatable' => true, - 'trashable' => false, + 'trashable' => true, 'searchable' => false, 'sortable' => false, ]; @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateNeighborhoodsStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_district' => [ + 'parent_district_id' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php b/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php index b34dc55f5..df03e9e60 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php +++ b/addons/default/visiosoft/location-module/migrations/2018_10_16_112447_visiosoft.module.location__create_village_stream.php @@ -14,7 +14,7 @@ class VisiosoftModuleLocationCreateVillageStream extends Migration 'slug' => 'village', 'title_column' => 'name', 'translatable' => true, - 'trashable' => false, + 'trashable' => true, 'searchable' => false, 'sortable' => false, ]; @@ -33,7 +33,7 @@ class VisiosoftModuleLocationCreateVillageStream extends Migration 'unique' => true, 'required' => true, ], - 'parent_neighborhood' => [ + 'parent_neighborhood_id' => [ 'required' => true, ], 'order' diff --git a/addons/default/visiosoft/location-module/src/City/CityModel.php b/addons/default/visiosoft/location-module/src/City/CityModel.php index 957e8d590..5a9283fa9 100644 --- a/addons/default/visiosoft/location-module/src/City/CityModel.php +++ b/addons/default/visiosoft/location-module/src/City/CityModel.php @@ -15,13 +15,13 @@ class CityModel extends LocationCitiesEntryModel implements CityInterface } public function getSubCities($country) { - return $this->query()->where('parent_country_id', $country)->get(); + return $this->query()->where('parent_country_id', $country)->orderBy('order','ASC')->get(); } public function deleteCitiesByCountry($id) { $districts = new DistrictModel(); $city = $this->where('parent_country_id',$id); - $city_id = $city->get(); + $city_id = $city->orderBy('id','DESC')->get(); foreach ($city_id as $item) { $districts->deleteDistrictByCity($item->id); diff --git a/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php b/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php index 86dd6a93b..706d17fe5 100644 --- a/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/City/Table/CityTableBuilder.php @@ -61,7 +61,7 @@ class CityTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'sort_order' => 'ASC', + 'order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php b/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php index 08f21241b..a21b26f9d 100644 --- a/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Country/Table/CountryTableBuilder.php @@ -61,7 +61,7 @@ class CountryTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'sort_order' => 'ASC', + 'order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/District/DistrictModel.php b/addons/default/visiosoft/location-module/src/District/DistrictModel.php index cc7dd7da5..5f7799002 100644 --- a/addons/default/visiosoft/location-module/src/District/DistrictModel.php +++ b/addons/default/visiosoft/location-module/src/District/DistrictModel.php @@ -11,13 +11,13 @@ class DistrictModel extends LocationDistrictsEntryModel implements DistrictInter } public function getSubDistricts($city) { - return $this->query()->where('parent_city_id', $city)->get(); + return $this->query()->where('parent_city_id', $city)->orderBy('order','ASC')->get(); } public function deleteDistrictByCity($id) { $neighborhood = new NeighborhoodModel(); $districts = $this->where('parent_city_id',$id); - $districts_id = $districts->get(); + $districts_id = $districts->orderBy('id','DESC')->get(); foreach ($districts_id as $item) { $neighborhood->deleteNeighborhoodByDistrict($item->id); diff --git a/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php b/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php index 291429ad6..588ece85d 100644 --- a/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/District/Table/DistrictTableBuilder.php @@ -61,7 +61,7 @@ class DistrictTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'sort_order' => 'ASC', + 'order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php index 0023fa962..21eeccb89 100644 --- a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php +++ b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php @@ -1,4 +1,5 @@ query()->where('parent_district_id', $district)->get(); + return $this->query()->where('parent_district_id', $district)->orderBy('order','ASC')->get(); } public function deleteNeighborhoodByDistrict($id) { $village = new VillageModel(); $neighborhood = $this->where('parent_district_id',$id); - $neighborhoods_id = $neighborhood->get(); + $neighborhoods_id = $neighborhood->orderBy('id','DESC')->get(); foreach ($neighborhoods_id as $item) { $village->deleteVillageByNeighborhood($item->id); diff --git a/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php b/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php index 24461448b..a385ef3e1 100644 --- a/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Neighborhood/Table/NeighborhoodTableBuilder.php @@ -61,7 +61,7 @@ class NeighborhoodTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'sort_order' => 'ASC', + 'order' => 'ASC', ], ]; diff --git a/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php b/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php index 5c79b4666..c1e8eb50b 100644 --- a/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php +++ b/addons/default/visiosoft/location-module/src/Village/Table/VillageTableBuilder.php @@ -52,7 +52,7 @@ class VillageTableBuilder extends TableBuilder */ protected $options = [ 'order_by' => [ - 'sort_order' => 'ASC', + 'order' => 'ASC', ], ]; /** diff --git a/addons/default/visiosoft/location-module/src/Village/VillageModel.php b/addons/default/visiosoft/location-module/src/Village/VillageModel.php index c81697cba..1df42043f 100644 --- a/addons/default/visiosoft/location-module/src/Village/VillageModel.php +++ b/addons/default/visiosoft/location-module/src/Village/VillageModel.php @@ -10,10 +10,10 @@ class VillageModel extends LocationVillageEntryModel implements VillageInterface } public function getSubVillages($neighborhood) { - return $this->query()->where('parent_neighborhood_id', $neighborhood)->get(); + return $this->query()->where('parent_neighborhood_id', $neighborhood)->orderBy('order','ASC')->get(); } public function deleteVillageByNeighborhood($id) { - $this->where('parent_neighborhood_id',$id)->delete(); + $this->where('parent_neighborhood_id',$id)->orderBy('id','DESC')->delete(); } } From 707fb2ab1955cf1cdfd8902dbb9043bd0113cd9c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 31 Mar 2020 09:59:58 +0300 Subject: [PATCH 3/3] seeder && remove description --- ...211014_visiosoft.module.location__create_location_fields.php | 1 - .../visiosoft/location-module/src/LocationModuleSeeder.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php index cdafb646d..8634959fd 100644 --- a/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php +++ b/addons/default/visiosoft/location-module/migrations/2018_09_25_211014_visiosoft.module.location__create_location_fields.php @@ -27,7 +27,6 @@ class VisiosoftModuleLocationCreateLocationFields extends Migration 'type' => '_' ], ], - 'description' => 'anomaly.field_type.textarea', 'parent_country' => [ 'type' => 'anomaly.field_type.relationship', 'config' => [ diff --git a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php index 21eeccb89..c62b3d10e 100644 --- a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php +++ b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php @@ -30,7 +30,7 @@ class LocationModuleSeeder extends Seeder DB::unprepared(file_get_contents(__DIR__ . '/countries.sql')); DB::unprepared(file_get_contents(__DIR__ . '/cities.sql')); DB::unprepared(file_get_contents(__DIR__ . '/districts.sql')); -// DB::unprepared(file_get_contents(__DIR__ . '/neighborhoods.sql')); + DB::unprepared(file_get_contents(__DIR__ . '/neighborhoods.sql')); Model::reguard(); /* Demo Stop*/ }