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

sharix_admin/forms/service.py

@@ -17,8 +17,8 @@ class ServiceTariffUpdateForm(forms.ModelForm):
         fields = [
             'status',
             'ticket_status',
-            'servicetype',
-            'resource',
+            'servicetype_id',
+            'resource_id',
             'requirements',
             'price_alg',
             'price_km',
@@ -32,8 +32,8 @@ class ServiceTariffUpdateForm(forms.ModelForm):
             'status': forms.TextInput(attrs={'readonly': True}, ),
             'ticket_status': forms.TextInput(attrs={'readonly': True}),
             
-            'servicetype': forms.Select(attrs={'class': 'form-select'}),
-            'resource': forms.Select(attrs={'class': 'form-select'}),
+            'servicetype_id': forms.Select(attrs={'class': 'form-select'}),
+            'resource_id': forms.Select(attrs={'class': 'form-select'}),
         }
 
 

sharix_admin/tables.py

@@ -99,8 +99,8 @@ class ProviderTable(tables.Table):
 class ServiceTariffTable(tables.Table):
 
     id = tables.Column(verbose_name=_('ID'), attrs={"td":{"width":"5%"}})
-    servicetype_id = tables.LinkColumn('service_tariff/edit/', verbose_name=_('Name of the tariff'), text = lambda record: record.servicetype.caption,
-                                       args=[tables.A('pk')], attrs={'th':{'scope':'col'}, "td":{"width":"20%"}})
+    servicetype_id = tables.LinkColumn('service_tariff/edit/', verbose_name=_('Name of the tariff'), text = lambda record: record.servicetype_id.caption,
+        args=[tables.A('pk')], attrs={'th':{'scope':'col'}, "td":{"width":"20%"}})
     ticket_status = tables.Column(verbose_name=_('Name of the service scheme'), attrs={'th':{'scope':'col'}, "td":{"width":"20%"}}) 
     check = tables.BooleanColumn(verbose_name=_('Activity'), orderable=False, attrs={'th':{'scope':'col'}, "td":{"width":"20%"}})
 

sharix_admin/views/cooperate.py

@@ -32,7 +32,7 @@ class CooperateView(BaseView, FormView):
             instance = form.save(commit=False)
         
             # Присваиваем полю repr_id идентификатор текущего пользователя
-            instance.repr = self.request.user
+            instance.repr_id = self.request.user
 
             # Создаем новую запись в БД, чтобы иметь доступ к ID
             instance.save() 

sharix_admin/views/partner_info.py

@@ -79,7 +79,7 @@ class PartnerInformationUpdateView(UserPassesTestMixin, UpdateView):
         if (self.object.inn != form.initial['inn'] or
             self.object.ogrn != form.initial['ogrn'] or
             self.object.kpp != form.initial['kpp'] or
-            self.object.repr != form.initial['repr_id'] or
+            self.object.repr_id != form.initial['repr_id'] or
             self.object.legal_name != form.initial['legal_name']):
             new_ticket = {
             "ticket_list": 1,