rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Overhaul new custorder so contact may be either Person or Customer

Browse source 
also make the handler responsible for (un)assigning contact
This commit is contained in:
Lance Edgar 2021-09-27 09:22:06 -04:00
parent 12310da09e
commit a52b5ec380
2 changed files with 202 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

137
tailbone/views/custorders/orders.py
View file

@ -227,8 +227,10 @@ class CustomerOrderView(MasterView):
data = dict(self.request.json_body)
action = data.get('action')
json_actions = [
'assign_contact',
'unassign_contact',
'get_customer_info',
'set_customer_data',
# 'set_customer_data',
'find_product_by_upc',
'get_product_info',
'add_item',
@ -251,8 +253,17 @@ class CustomerOrderView(MasterView):
context = {'batch': batch,
'normalized_batch': self.normalize_batch(batch),
'new_order_requires_customer': self.handler.new_order_requires_customer(),
'contact_profile_url': None,
'order_items': items,
'product_autocomplete_url': self.request.route_url(product_autocomplete)}
# maybe add profile URL
if batch.person_uuid:
if self.request.has_perm('people.view_profile'):
context['contact_profile_url'] = self.request.route_url(
'people.view_profile', uuid=batch.person_uuid)
return self.render_to_response(template, context)
def get_current_batch(self):
@ -307,13 +318,22 @@ class CustomerOrderView(MasterView):
def customer_autocomplete(self):
"""
Custom customer autocomplete logic, which invokes the handler.
Customer autocomplete logic, which invokes the handler.
"""
self.handler = self.get_batch_handler()
term = self.request.GET['term']
return self.handler.customer_autocomplete(self.Session(), term,
user=self.request.user)
def person_autocomplete(self):
"""
Person autocomplete logic, which invokes the handler.
"""
self.handler = self.get_batch_handler()
term = self.request.GET['term']
return self.handler.person_autocomplete(self.Session(), term,
user=self.request.user)
def get_customer_info(self, batch, data):
uuid = data.get('uuid')
if not uuid:
@ -326,30 +346,90 @@ class CustomerOrderView(MasterView):
return self.info_for_customer(batch, data, customer)
def info_for_customer(self, batch, data, customer):
phone = customer.first_phone()
email = customer.first_email()
return {
'uuid': customer.uuid,
'phone_number': phone.number if phone else None,
'email_address': email.address if email else None,
# most info comes from handler
info = self.handler.get_customer_info(batch)
# maybe add profile URL
if info['person_uuid']:
if self.request.has_perm('people.view_profile'):
info['contact_profile_url'] = self.request.route_url(
'people.view_profile', uuid=info['person_uuid']),
return info
def assign_contact(self, batch, data):
kwargs = {}
# this will either be a Person or Customer UUID
uuid = data['uuid']
if self.handler.new_order_requires_customer():
customer = self.Session.query(model.Customer).get(uuid)
if not customer:
return {'error': "Customer not found"}
kwargs['customer'] = customer
else:
person = self.Session.query(model.Person).get(uuid)
if not person:
return {'error': "Person not found"}
kwargs['person'] = person
# invoke handler to assign contact
try:
self.handler.assign_contact(batch, **kwargs)
except ValueError as error:
return {'error': six.text_type(error)}
context = {
'success': True,
'customer_uuid': batch.customer_uuid,
'person_uuid': batch.person_uuid,
'phone_number': batch.phone_number,
'email_address': batch.email_address,
}
def set_customer_data(self, batch, data):
if 'customer_uuid' in data:
batch.customer_uuid = data['customer_uuid']
if 'person_uuid' in data:
batch.person_uuid = data['person_uuid']
elif batch.customer_uuid:
self.Session.flush()
batch.person = batch.customer.first_person()
else: # no customer set
batch.person_uuid = None
if 'phone_number' in data:
batch.phone_number = data['phone_number']
if 'email_address' in data:
batch.email_address = data['email_address']
self.Session.flush()
return {'success': True}
# maybe add profile URL
if batch.person_uuid:
if self.request.has_perm('people.view_profile'):
context['contact_profile_url'] = self.request.route_url(
'people.view_profile', uuid=batch.person_uuid)
return context
def unassign_contact(self, batch, data):
self.handler.unassign_contact(batch)
context = {
'success': True,
'customer_uuid': batch.customer_uuid,
'person_uuid': batch.person_uuid,
'phone_number': batch.phone_number,
'email_address': batch.email_address,
'contact_profile_url': None,
}
return context
# def set_customer_data(self, batch, data):
# if 'customer_uuid' in data:
# batch.customer_uuid = data['customer_uuid']
# if 'person_uuid' in data:
# batch.person_uuid = data['person_uuid']
# elif batch.customer_uuid:
# self.Session.flush()
# batch.person = batch.customer.first_person()
# else: # no customer set
# batch.person_uuid = None
# if 'phone_number' in data:
# batch.phone_number = data['phone_number']
# if 'email_address' in data:
# batch.email_address = data['email_address']
# self.Session.flush()
# return {'success': True}
def product_autocomplete(self):
"""
@ -601,6 +681,15 @@ class CustomerOrderView(MasterView):
route_prefix = cls.get_route_prefix()
url_prefix = cls.get_url_prefix()
# person autocomplete
config.add_route('{}.person_autocomplete'.format(route_prefix),
'{}/person-autocomplete'.format(url_prefix),
request_method='GET')
config.add_view(cls, attr='person_autocomplete',
route_name='{}.person_autocomplete'.format(route_prefix),
renderer='json',
permission='people.list')
# customer autocomplete
config.add_route('{}.customer_autocomplete'.format(route_prefix),
'{}/customer-autocomplete'.format(url_prefix),