add trash && fixed order

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" => [],

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,
     ];

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'

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'

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'

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'

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);

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',
         ],
     ];
 

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',
         ],
     ];
 

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);

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',
         ],
     ];
 

addons/default/visiosoft/location-module/src/LocationModuleSeeder.php

@@ -1,4 +1,5 @@
 <?php namespace Visiosoft\LocationModule;
+
 use Anomaly\Streams\Platform\Database\Seeder\Seeder;
 use Anomaly\Streams\Platform\Model\Options\OptionsAdvertisementEntryModel;
 use Illuminate\Database\Eloquent\Model;
@@ -19,17 +20,17 @@ class LocationModuleSeeder extends Seeder
     {
         //Download demo SQL
         $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/";
-        file_put_contents(__DIR__."/countries.sql", fopen($repository."countries.sql", 'r'));
+        file_put_contents(__DIR__ . "/countries.sql", fopen($repository . "countries.sql", 'r'));
-        file_put_contents(__DIR__."/cities.sql", fopen($repository."cities.sql", 'r'));
+        file_put_contents(__DIR__ . "/cities.sql", fopen($repository . "cities.sql", 'r'));
-        file_put_contents(__DIR__."/districts.sql", fopen($repository."districts.sql", 'r'));
+        file_put_contents(__DIR__ . "/districts.sql", fopen($repository . "districts.sql", 'r'));
-        file_put_contents(__DIR__."/neighborhoods.sql", fopen($repository."neighborhoods.sql", 'r'));
+        file_put_contents(__DIR__ . "/neighborhoods.sql", fopen($repository . "neighborhoods.sql", 'r'));
 
         /* Demo Start */
         Model::unguard();
-        DB::unprepared(file_get_contents(__DIR__.'/countries.sql'));
+        DB::unprepared(file_get_contents(__DIR__ . '/countries.sql'));
-        DB::unprepared(file_get_contents(__DIR__.'/cities.sql'));
+        DB::unprepared(file_get_contents(__DIR__ . '/cities.sql'));
-//        DB::unprepared(file_get_contents(__DIR__.'/districts.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*/
     }

addons/default/visiosoft/location-module/src/Neighborhood/NeighborhoodModel.php

@@ -11,13 +11,13 @@ class NeighborhoodModel extends LocationNeighborhoodsEntryModel implements Neigh
     }
 
     public function getSubNeighborhoods($district) {
-        return $this->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);

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',
         ],
     ];
 

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',
         ],
     ];
     /**

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();
     }
 }