rattail-project/rattail Changeset

Changeset - 121e9cc6c56c

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Lance Edgar (lance) - 3 years ago 2021-10-06 11:29:14
lance@edbob.org

Add `get_contact_emails()` and `should_restrict_contact_info()`

for custorder batch

2 files changed with 72 insertions and 0 deletions:

rattail/batch/custorder.py

rattail/settings.py

0 comments (0 inline, 0 general)

rattail/batch/custorder.py

➞

Show inline comments

@@ @@ -63,24 +63,34 @@ class CustomerOrderBatchHandler(BatchHandler): @@
     def new_order_requires_customer(self):
         """
         Returns a boolean indicating whether a *new* "customer order"
         in fact requires a proper customer account, or not.  Note that
         in all cases a new order requires a *person* to associate
         with, but technically the customer is optional, unless this
         returns true.
         """
         return self.config.getbool('rattail.custorders',
                                    'new_order_requires_customer',
                                    default=False)
     def should_restrict_contact_info(self):
         """
         Returns a boolean indicating whether contact info should be
         "restricted" - i.e. user can only choose from existing contact
         info and cannot override by e.g. entering a new phone number.
         """
         return self.config.getbool('rattail.custorders',
                                    'new_orders.restrict_contact_info',
                                    default=False)
     def assign_contact(self, batch, customer=None, person=None, **kwargs):
         """
         Assign the customer and/or person "contact" for the order.
         """
         clientele = self.app.get_clientele_handler()
         customer_required = self.new_order_requires_customer()
         # nb. person is always required
         if customer and not person:
             person = clientele.get_person(customer)
         if not person:
             raise ValueError("Must specify a person")
@@ @@ -99,24 +109,36 @@ class CustomerOrderBatchHandler(BatchHandler): @@
         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)
         else:
             batch.phone_number = person.first_phone_number()
             batch.email_address = person.first_email_address()
         session = self.app.get_session(batch)
         session.flush()
     def get_contact_display(self, batch):
         """
         Should return contact display text for the batch,
         i.e. customer name.
         """
         customer_required = self.new_order_requires_customer()
         if customer_required:
             return six.text_type(batch.customer)
         else:
             return six.text_type(batch.person)
     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.
         """
         customer_required = self.new_order_requires_customer()
         phones = []
         if customer_required:
             if batch.customer:
                 phones = batch.customer.phones
@@ @@ -131,24 +153,63 @@ class CustomerOrderBatchHandler(BatchHandler): @@
         """
         Normalize the given phone record to simple data dict, for
         passing around via JSON etc.
         """
         return {
             'uuid': phone.uuid,
             'type': phone.type,
             'number': phone.number,
             'preference': phone.preference,
             'preferred': phone.preference == 1,
+        }
     def get_contact_emails(self, batch):
         """
         Retrieve all email records on file for the batch contact, to
         be presented as options for user to choose from when making a
         new order.
         Note that the default logic will exclude invalid email addresses.
         """
         customer_required = self.new_order_requires_customer()
         emails = []
         if customer_required:
             if batch.customer:
                 emails = batch.customer.emails
         else:
             if batch.person:
                 emails = batch.person.emails
         # exclude invalid
         emails = [email for email in emails
                   if not email.invalid]
         return [self.normalize_email(email)
                 for email in emails]
     def normalize_email(self, email):
         """
         Normalize the given email record to simple data dict, for
         passing around via JSON etc.
         """
         return {
             'uuid': email.uuid,
             'type': email.type,
             'address': email.address,
             'invalid': email.invalid,
             'preference': email.preference,
             'preferred': email.preference == 1,
+        }
     def get_contact_notes(self, batch):
         """
         Get extra "contact notes" which should be made visible to the
         user who is entering the new order.
         """
         notes = []
         customer_required = self.new_order_requires_customer()
         invalid = False
         if customer_required:
             if batch.customer:
                 invalid = [email for email in batch.customer.emails

rattail/settings.py

➞

Show inline comments

@@ @@ -118,24 +118,35 @@ class rattail_workdir(Setting): @@
 ##############################
 class rattail_custorders_new_order_requires_customer(Setting):
     """
     If set, then all new orders require a proper customer account.  If
     *not* set then just a "person" will suffice.
     """
     group = "Customer Orders"
     namespace = 'rattail.custorders'
     name = 'new_order_requires_customer'
     data_type = bool
 class rattail_custorders_new_orders_restrict_contact_info(Setting):
     """
     If set, then user can only choose from existing contact info options,
     for the customer/order.  If *not* set, then user is allowed to enter
     new/different contact info.
     """
     group = "Customer Orders"
     namespace = 'rattail.custorders'
     name = 'new_orders.restrict_contact_info'
     data_type = bool
 ##############################
 # DataSync
 ##############################
 class rattail_datasync_url(Setting):
     """
     URL for datasync change queue.
     """
     group = "DataSync"
     namespace = 'rattail.datasync'
     name = 'url'

0 comments (0 inline, 0 general)