Merge remote-tracking branch 'origin/unstable' into assist

apiviews/orders_local.py

@@ -6,7 +6,7 @@ from rest_framework.response import Response
 from rest_framework.exceptions import NotFound
 from webservice_running.models import OrdersLocal
 # from dbsynce.models import Orders, Service, ServiceType, Provider, Client
-# from SharixAdmin.models import SharixUser
+# from sharix_admin.models import SharixUser
 # from tickets.models import Task
 # from tickets.serializer import TaskSerializer
 

forms.py

@@ -1,8 +1,7 @@
 from django import forms
-from django.contrib.auth import get_user_model
 
 from webservice_running.models import OrdersLocal 
-from django.contrib.auth.forms import UserCreationForm
+
 
 class OrderRegForm(forms.ModelForm):
     class Meta: 
@@ -13,18 +12,3 @@ class OrderRegForm(forms.ModelForm):
       super().__init__(*args, **kwargs)
       for field in self.fields.values():
           field.widget.attrs['class'] = 'form-control'
-
-class RegisterUserForm(UserCreationForm):
-
-    password1 = forms.CharField(label="Пароль",
-        widget=forms.PasswordInput(attrs={'class':'form-control'}))
-    
-    password2 = forms.CharField(label="Подтверждение пароля",
-        widget=forms.PasswordInput(attrs={'class':'form-control'}))
-
-    username = forms.CharField(label="Номер телефона",
-        widget=forms.TextInput(attrs={'class':'form-control'}))
-
-    class Meta:
-        model = get_user_model()
-        fields = ['username', 'password1', 'password2']

templates/webservice_running/order_reg.html

@@ -1,4 +1,4 @@
-{% extends 'SharixAdmin/index.html' %}
+{% extends 'sharix_admin/index.html' %}
 {% block contenthome %}
 <div class="container" style="padding: 2px;">
   <div class="row justify-content-center fs-6">

templates/webservice_running/registration.html

@@ -1,36 +0,0 @@
-{% extends 'SharixAdmin/base.html' %}
-{% load static %}
-
-{% block content %}
-<div class="text-center" style="margin-top: 150px;">
-    <div class="form-signin" style="width: 100%; max-width:330px; margin: auto; display:block;">
-        <form class="m-2 p-2" method="post">
-            <img class="mb-4" src="{% static 'SharixAdmin/img/logo.png' %}" alt="" style="height: 100px;">
-            <h1 class="h3 mb-3 fw-normal">Регистрация в {{ NameSystem }}</h1>
-            {% csrf_token %}
-            
-            {% for item in form %}
-                <div class="form-floating my-3">
-                    {{item}}
-                    <label for="{{ item.id_for_label }}">{{ item.label }}</label>
-                </div>
-                {% if item.errors %}
-                    <div class="alert alert-danger" role="alert">
-                        {{ item.errors }}
-                    </div>
-                {% endif %}
-            {% endfor %}
-            {% if form.non_field_errors %}
-                <div class="alert alert-danger" role="alert">
-                    Please, enter the correct phone number and password.
-                </div>
-            {% endif %}
-            <div>
-              <a class="w-100 btn btn-primary btn-lg mb-3" href="{% url 'authweb' %}">Авторизация</a>
-              <button class="w-100 btn btn-primary btn-lg" type="submit">Зарегистрироваться</button>
-            </div>
-              <p class="mt-5 mb-3 text-muted">© 2022</p>
-          </form>
-    </div>
-</div>
-{% endblock %}

urls.py

@@ -10,6 +10,5 @@ router.register(r'webservice', OrdersLocalMVS)
 
 urlpatterns = [
     path('order_reg/', views.order_reg, name="order_reg"),
-    path('', views.registration, name="registration"),
     path('api/', include(router.urls), name="webservice_running_api"),
 ]

views.py

@@ -1,5 +1,5 @@
-from django.urls import reverse_lazy
 import requests
+
 from django.http import HttpResponse
 from webservice_running.apps import api
 from core.settings import API_URL
@@ -15,14 +15,4 @@ def order_reg(request):
         return HttpResponse(responce.text)
     else:
       form = OrderRegForm()
-    return render(request, 'webservice_running/order_reg.html', {'form': form})
-
-def registration(request):
-    if request.method == 'POST':
-      form = RegisterUserForm(request.POST)
-      if form.is_valid():
-        form.save()
-        return redirect('authweb')
-    else:
-       form = RegisterUserForm()
-    return render(request, 'webservice_running/registration.html', {'form': form})
+    return render(request, 'webservice_running/order_reg.html', {'form': form})