trex-model 1.6.14__tar.gz → 1.6.16__tar.gz

{trex_model-1.6.14 → trex_model-1.6.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex_model
-Version: 1.6.14
+Version: 1.6.16
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex_model-1.6.14 → trex_model-1.6.16}/setup.py

@@ -3,7 +3,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
      name='trex_model',  
-     version='1.6.14',
+     version='1.6.16',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.14 → trex_model-1.6.16}/trex_model.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.6.14
+Version: 1.6.16
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

{trex_model-1.6.14 → trex_model-1.6.16}/trexmodel/models/merchant_helpers.py

@@ -7,6 +7,9 @@ from trexconf import conf
 from datetime import datetime
 import logging
 from trexlib.utils.crypto_util import aes_encrypt_json
+from trexmodel.models.datastore.customer_models import CustomerTierMembership,\
+    CustomerMembership
+from trexmodel.models.datastore.membership_models import MerchantMembership
 
 logger = logging.getLogger('helper')
 
@@ -169,6 +172,7 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum
                                                 'refer_a_friend_message'            : refer_a_friend_message,
                                                 'refer_a_friend_deep_link'          : refer_a_friend_deep_link,
                                                 'referrer_merchant_and_friend_code' : referrer_merchant_and_friend_code,
+                                                'referrer_code'                     : referrer_code,
                                             }
         
         
@@ -368,4 +372,84 @@ def convert_points_between_merchants(
     # Convert monetary value to Merchant B points
     required_points_b = monetary_value / merchant_b_point_value
     
-    return round(required_points_b, 2)
+    return round(required_points_b, 2)
+
+def return_customer_details(customer):
+    customer_details_dict = customer.to_dict(
+                                        date_format="%d-%m-%Y", 
+                                        datetime_format="%d-%m-%Y %H:%M:%S",
+                                        excluded_dict_properties = [
+                                                'registered_merchant_acct', 
+                                                'memberships_list', 
+                                                'tier_membership_key',
+                                                'registered_user_acct',
+                                                
+                                                ],
+                                        )
+    customer_details_dict['customer_key']               = customer.key_in_str
+    
+    
+    customer_basic_memberships_list = _list_customer_basic_memberships(customer)
+    if customer_basic_memberships_list:
+        customer_details_dict['basic_memberships'] = customer_basic_memberships_list
+    
+    customer_tier_membership = _get_tier_membership(customer)
+    if customer_tier_membership:
+        customer_details_dict['tier_membership']  = customer_tier_membership
+    
+    if 'entitled_voucher_summary' in customer_details_dict:
+        customer_details_dict['voucher_summary']            = customer.entitled_voucher_summary
+        del customer_details_dict['entitled_voucher_summary']
+    
+    return customer_details_dict
+
+def _list_customer_basic_memberships(customer):
+    customer_membership_final_list = []
+    
+    if is_not_empty(customer.memberships_list):
+        customer_memberships_list = CustomerMembership.list_all_by_customer(customer)
+        if is_not_empty(customer_memberships_list):
+            merchant_acct = customer.registered_merchant_acct
+            merchant_memberships_list = MerchantMembership.list_by_merchant_acct(merchant_acct)
+            
+            for cm in customer_memberships_list:
+                for mm in merchant_memberships_list:
+                    logger.debug('cm=%s', cm)
+                    if mm.key_in_str == cm.merchant_membership_key:
+                        membership_data = {
+                                                        'key'                   : mm.key_in_str,
+                                                        'label'                 : mm.label,
+                                                        'card_image'            : mm.membership_card_image,
+                                                        'desc'                  : mm.desc if is_not_empty(mm.desc) else '',
+                                                        'terms_and_conditions'  : mm.terms_and_conditions if is_not_empty(mm.terms_and_conditions) else '',
+                                                        'is_tier'               : False,
+                                                        'entitled_date'         : cm.entitled_date.strftime('%d-%m-%Y'),
+                                                        'expiry_date'           : cm.expiry_date.strftime('%d-%m-%Y'),
+                                                        
+                                                        }
+                        
+                        if cm.renewed_date is not None:
+                            membership_data['renewed_date'] = cm.renewed_date.strftime('%d-%m-%Y'),
+                        
+                        customer_membership_final_list.append(membership_data)
+                        break
+    return customer_membership_final_list
+
+def _get_tier_membership(customer):
+            
+    if is_not_empty(customer.tier_membership):
+        merchant_tier_membership = customer.tier_membership_entity
+        customer_tier_membership = CustomerTierMembership.get_by_customer_and_merchant_tier_membership(customer, merchant_tier_membership)
+        
+        membership_data = {
+                        'key'                   : customer_tier_membership.merchant_tier_membership_key,
+                        'label'                 : merchant_tier_membership.label,
+                        'card_image'            : merchant_tier_membership.membership_card_image,
+                        'desc'                  : merchant_tier_membership.desc if is_not_empty(merchant_tier_membership.desc) else '',
+                        'terms_and_conditions'  : merchant_tier_membership.terms_and_conditions if is_not_empty(merchant_tier_membership.terms_and_conditions) else '',
+                        'entitled_date'         : customer_tier_membership.entitled_date.strftime('%d-%m-%Y'),
+                        'expiry_date'           : customer_tier_membership.expiry_date.strftime('%d-%m-%Y'),
+                        'is_tier'               : True,
+                        }
+        
+        return membership_data