rattail-project/rattail Changeset

Changeset - 6626b1479830

Parent rev.

Child rev.

[Not reviewed]

0 2 1

Lance Edgar (lance) - 3 years ago 2021-10-07 11:32:11
lance@edbob.org

Add `contact_name` for custorder and batch

so that we have something handy to easily sort/filter by etc.

3 files changed with 52 insertions and 0 deletions:

rattail/batch/custorder.py

rattail/db/alembic/versions/c10adeff4117_add_custorder_contact_name.py

rattail/db/model/custorders.py

0 comments (0 inline, 0 general)

rattail/batch/custorder.py

➞

Show inline comments

@@ @@ -113,12 +113,15 @@ class CustomerOrderBatchHandler(BatchHandler): @@
             raise ValueError("Must specify a customer account")
         # assign contact
         batch.customer = customer
         batch.person = person
         # cache contact name
         batch.contact_name = self.get_contact_display(batch)
         # update phone/email per new contact
         batch.phone_number = None
         batch.email_address = None
         if customer_required:
             batch.phone_number = clientele.get_first_phone_number(customer)
             batch.email_address = clientele.get_first_email_address(customer)
@@ @@ -156,14 +159,19 @@ class CustomerOrderBatchHandler(BatchHandler): @@
     def get_contact_display(self, batch):
         """
         Should return contact display text for the batch,
         i.e. customer name.
         """
         contact = self.get_contact(batch)
         if contact:
             return six.text_type(contact)
         pending = batch.pending_customer
         if pending:
             return six.text_type(pending)
     def get_contact_phones(self, batch):
         """
         Retrieve all phone records on file for the batch contact, to
         be presented as options for user to choose from when making a
         new order.
         """
@@ @@ -242,12 +250,13 @@ class CustomerOrderBatchHandler(BatchHandler): @@
     def unassign_contact(self, batch, **kwargs):
         """
         Unassign the customer and/or person "contact" for the order.
         """
         batch.customer = None
         batch.person = None
         batch.contact_name = None
         batch.phone_number = None
         batch.email_address = None
         # always reset "add to customer" flags
         batch.clear_param('add_phone_number')
         batch.clear_param('add_email_address')

rattail/db/alembic/versions/c10adeff4117_add_custorder_contact_name.py

➞

Show inline comments

@@ new file 100644 @@
 # -*- coding: utf-8; -*-
 """add custorder.contact_name
 Revision ID: c10adeff4117
 Revises: 5a256a77e6d0
 Create Date: 2021-10-07 11:05:10.561894
 """
 from __future__ import unicode_literals, absolute_import
 # revision identifiers, used by Alembic.
 revision = 'c10adeff4117'
 down_revision = u'5a256a77e6d0'
 branch_labels = None
 depends_on = None
 from alembic import op
 import sqlalchemy as sa
 import rattail.db.types
 def upgrade():
     # batch_custorder
     op.add_column('batch_custorder', sa.Column('contact_name', sa.String(length=100), nullable=True))
     # custorder
     op.add_column('custorder', sa.Column('contact_name', sa.String(length=100), nullable=True))
 def downgrade():
     # custorder
     op.drop_column('custorder', 'contact_name')
     # batch_custorder
     op.drop_column('batch_custorder', 'contact_name')

rattail/db/model/custorders.py

➞

Show inline comments

@@ @@ -100,12 +100,16 @@ class CustomerOrderBase(object): @@
             PendingCustomer,
             doc="""
             Reference to the *pending* customer account for the order,
             if applicable.
             """)
     contact_name = sa.Column(sa.String(length=100), nullable=True, doc="""
     Cached display name for the contact (customer).
     """)
     phone_number = sa.Column(sa.String(length=20), nullable=True, doc="""
     Customer contact phone number for sake of this order.
     """)
     email_address = sa.Column(sa.String(length=255), nullable=True, doc="""
     Customer contact email address for sake of this order.

0 comments (0 inline, 0 general)