Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

sharix_admin/forms/service.py

@@ -20,11 +20,10 @@ class ServiceTariffUpdateForm(forms.ModelForm):
             'service_category',
             'resource',
             'requirements',
-            'price_alg',
+            'price_type',
             'price_km',
             'price_min',
             'price_amount',
-            'service_status',
             'is_global',
             'is_visible'
         ]

sharix_admin/tables.py

@@ -241,11 +241,11 @@ class ProviderTable(tables.Table):
             "class": "table table-layout-fixed"
         }
         exclude = (
-            'type',
-            'company',
             'id_metaservice',
+            'gap',
             'requirements',
-            'ticket_status',
+            'status',
+            'service_status',
             'location_type',
             'default_location',
             'is_global',
@@ -305,12 +305,11 @@ class ServiceTariffTable(tables.Table):
         }
         exclude = (
             'resource',
-            'price_alg',
+            'price_type',
             'price_min',
             'price_amount',
             'id_metaservice',
             'requirements',
-            'service_status',
             'price_km',
             'is_global',
             'is_visible',
@@ -445,8 +444,7 @@ class ServiceTable(tables.Table):
             'resource',
             'requirements',
             'id_metaservice',
-            'price_alg',
-            'service_status',
+            'price_type',
             'ticket_status',
             'is_global',
             'is_visible'