sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.1.10 split mover and customer forms

Browse Source
This commit is contained in:
SDE
2025-01-13 01:58:47 +03:00
parent eabfe3ab27
commit 0b03bdc81a
2 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
RoutesApp/js_views.py
View File

@@ -1,6 +1,7 @@
import json
from copy import deepcopy
from django.conf import settings
from django.shortcuts import render
from uuid import uuid1
@@ -345,7 +346,6 @@ def get_my_routes_ajax(request):
def create_or_change_route_ajax(request, route_id=None):
from ReferenceDataApp.models import Airport, City
if request.method != 'POST':
raise Http404
@@ -358,12 +358,24 @@ def create_or_change_route_ajax(request, route_id=None):
Dict = {}
route_old_Dict = None
owner_type = None
tpl_form_by_owner_type = 'v2/forms/f_make_poster_order.html'
tpl_block_by_owner_type = 'v2/blocks/b_make_poster_order.html'
try:
data = request.POST
if not data:
data = json.loads(request.body)
if 'owner_type' in data and data['owner_type']:
owner_type = data['owner_type']
if owner_type == 'mover':
tpl_form_by_owner_type = 'v2/forms/f_make_mover_order.html'
tpl_block_by_owner_type = 'v2/blocks/b_make_mover_order.html'
route = None
if route_id:
route = Route.objects.get(id=route_id)
@@ -379,15 +391,15 @@ def create_or_change_route_ajax(request, route_id=None):
form.initial = form.cleaned_data
Dict.update({
'form': form,
'owner_type': data['owner_type'],
'owner_type': owner_type,
})
html = render_to_string('v2/forms/f_make_poster_order.html', Dict, request=request)
html = render_to_string(tpl_form_by_owner_type, Dict, request=request)
return JsonResponse({'html': html}, status=400)
obj = form.save(commit=False)
if 'owner_type' in data and data['owner_type']:
obj.owner_type = data['owner_type']
if owner_type:
obj.owner_type = owner_type
# if obj.from_address_point:
# obj.from_city = get_city_by_type_transport_and_address_point(obj.type_transport, obj.from_address_point)
@@ -420,8 +432,7 @@ def create_or_change_route_ajax(request, route_id=None):
if 'errors' in routes_Dict:
form.errors.update(routes_Dict['errors'])
Dict.update({'form': form})
html = render_to_string(
'v2/forms/f_make_poster_order.html', Dict, request=request)
html = render_to_string(tpl_form_by_owner_type, Dict, request=request)
return JsonResponse({'html': html}, status=400)
html = render_to_string('blocks/profile/b_my_routes.html', routes_Dict, request=request)
@@ -444,5 +455,5 @@ def create_or_change_route_ajax(request, route_id=None):
}
# Dict = {'form': errors_Dict}
Dict.update({'form': errors_Dict})
html = render_to_string('v2/blocks/b_make_poster_order.html', Dict, request=request)
html = render_to_string(tpl_block_by_owner_type, Dict, request=request)
return JsonResponse({'html': html}, status=400)