trex-model 1.6.15__tar.gz → 1.6.17__tar.gz

{trex_model-1.6.15 → trex_model-1.6.17}/PKG-INFO

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

{trex_model-1.6.15 → trex_model-1.6.17}/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.15',
+     version='1.6.17',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.15 → trex_model-1.6.17}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.15 → trex_model-1.6.17}/trexmodel/models/datastore/customer_models.py

@@ -9,7 +9,7 @@ from trexmodel.models.datastore.user_models import User
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet,\
     MerchantUser
 import trexmodel.conf as model_conf
-from trexlib.utils.string_util import is_not_empty, is_empty
+from trexlib.utils.string_util import is_not_empty, is_empty, random_string
 import logging
 from trexlib.utils.common.date_util import convert_date_to_datetime,\
     to_day_of_year
@@ -71,6 +71,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     entitled_lucky_draw_ticket_summary          = ndb.JsonProperty(required=False)
     
     referrer_code                               = ndb.StringProperty(required=False)
+    invitation_code                             = ndb.StringProperty(required=False)
     
     kpi_summary                                 = ndb.JsonProperty()
     
@@ -84,7 +85,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            'entitled_birthday_reward_summary', 'tier_membership_key',
                            'registered_outlet_key', 'merchant_account_key', 
                            'registered_datetime', 'modified_datetime',
-                           'registered_user_acct','referral_code', 'is_referred_by_friend',
+                           'registered_user_acct','referral_code', 'invitation_code','is_referred_by_friend',
                            
                            ]
     
@@ -162,6 +163,19 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     def is_referred_by_friend(self):
         return self.referrer_code is not None and is_not_empty(self.referrer_code)
     
+    @classmethod
+    def get_by_invitation_code(cls, invitation_code):
+        return Customer.query(ndb.AND(Customer.invitation_code==invitation_code)).get()
+    
+    @classmethod
+    def _generate_invitation_code(cls):
+        invitation_code = random_string(8, is_human_mistake_safe=True)
+        checking_customer = cls.get_by_invitation_code(invitation_code)
+        while checking_customer is not None:
+            invitation_code = random_string(8, is_human_mistake_safe=True)
+            checking_customer = cls.get_by_invitation_code(invitation_code)
+        return invitation_code
+    
     @staticmethod    
     def update_KPI(customer_acct, tags_list=None, memberships_list=None, tier_membership_key=None):
         if isinstance(tags_list, string_types):
@@ -299,6 +313,11 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     def get_by_reference_code(cls, reference_code, merchant_acct):
         return cls.query(ndb.AND(cls.reference_code==reference_code, cls.merchant_acct==merchant_acct.create_ndb_key())).get()
     
+    @classmethod
+    def get_by_invitation_code(cls, invitation_code):
+        return cls.query(ndb.AND(cls.invitation_code==invitation_code)).get()
+    
+    
     @classmethod
     def get_by_merchant_reference_code(cls, merchant_reference_code, merchant_acct):
         return cls.query(ndb.AND(cls.merchant_reference_code==merchant_reference_code, cls.merchant_acct==merchant_acct.create_ndb_key())).get()
@@ -346,11 +365,17 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         
         created_user.put()
         created_customer = cls.create_from_user(outlet, created_user)
+        created_customer.invitation_code  = cls._generate_invitation_code()
         created_customer.merchant_reference_code = merchant_reference_code
         created_customer.put()
         
         return created_customer
     
+    @classmethod
+    def update_invitation_code(cls, customer):
+        customer.invitation_code  = cls._generate_invitation_code()
+        customer.put()
+        
     @classmethod
     def update(cls, customer=None, outlet=None, **kwargs):
         if outlet:
@@ -401,7 +426,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                                birth_day_in_year        = user_acct.birth_day_in_year,
                                merchant_reference_code  = merchant_reference_code,
                                referrer_code            = referrer_code,
-                               merchant_acct            = registered_merchant_acct.create_ndb_key()
+                               merchant_acct            = registered_merchant_acct.create_ndb_key(),
+                               invitation_code          = cls._generate_invitation_code(),
                            )
         
         created_customer.put()

{trex_model-1.6.15 → trex_model-1.6.17}/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -12,10 +12,8 @@ from trexmodel.models.datastore.merchant_models import MerchantUser,\
     MerchantAcct
 from trexlib.utils.string_util import is_not_empty, is_empty
 from trexmodel.models.datastore.model_decorators import model_transactional
-from trexconf.program_conf import REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,\
-    REDEMPTION_CATALOGUE_STATUS_NEW, REDEMPTION_CATALOGUE_STATUS_PUBLISH
+from trexconf.program_conf import REDEMPTION_CATALOGUE_STATUS_NEW, REDEMPTION_CATALOGUE_STATUS_PUBLISH
 from trexlib.utils.common.common_util import sort_list
-from audioop import reverse
 
 logger = logging.getLogger('model')
 

{trex_model-1.6.15 → trex_model-1.6.17}/trexmodel/models/merchant_helpers.py

@@ -7,13 +7,13 @@ 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,\
+from trexmodel.models.datastore.customer_models import Customer, CustomerTierMembership,\
     CustomerMembership
 from trexmodel.models.datastore.membership_models import MerchantMembership
 
 logger = logging.getLogger('helper')
 
-def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum=False):
+def construct_merchant_acct_info(merchant_acct, customer=None, read_minimum=False):
     account_settings        = {
                                 'account_code'  : merchant_acct.account_code,
                                 'currency'      : merchant_acct.currency_code,
@@ -114,10 +114,12 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum
                 'partner_merchants'                 : partner_merchants_list, 
                 'industry_type'                     : merchant_acct.industry,
                 } 
-    if is_not_empty(referral_program_settings):
-        
+    if is_not_empty(referral_program_settings) and customer is not None:
+        user_acct = customer.registered_user_acct
+        referrer_code           = user_acct.referral_code
+        invitation_code         = customer.invitation_code
         refer_a_friend_url      = '{base_url}/referral/program/merchant-acct-code/{merchant_code}/referrer-code/{referrer_code}/join'
-        refer_a_friend_message  = 'Hi, \n\n{referee_promote_desc}. Please join {brand_name} via below link:\n\n{refer_a_friend_url}'
+        refer_a_friend_message  = 'Hi, \n\n{referee_promote_desc}. Please join {brand_name} via my invitation code - {invitation_code}'
         referee_promote_desc    = referral_program_settings.get('referee_promote_desc')
         
         referrer_data = {
@@ -130,7 +132,7 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum
         logger.debug('encrypted_referrer_data=%s', encrypted_referrer_data)
         
         logger.debug('refer_a_friend_url before=%s', refer_a_friend_url)
-            
+             
         refer_a_friend_url = refer_a_friend_url.format(
                                     base_url        = conf.REFER_BASE_URL,
                                     merchant_code   = merchant_acct.account_code,
@@ -157,9 +159,11 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum
                                     referee_promote_desc    = referee_promote_desc,
                                     brand_name              = merchant_acct.brand_name,
                                     refer_a_friend_url      = refer_a_friend_url,
+                                    invitation_code         = invitation_code,
                                     )
         logger.debug('refer_a_friend_message=%s', refer_a_friend_message)
         
+        
         info['referral_program_settings'] = {
                                                 'program_count'                     : merchant_acct.effective_referral_program_count,
                                                 'referrer_promote_title'            : referral_program_settings.get('referrer_promote_title'),
@@ -173,6 +177,7 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum
                                                 'refer_a_friend_deep_link'          : refer_a_friend_deep_link,
                                                 'referrer_merchant_and_friend_code' : referrer_merchant_and_friend_code,
                                                 'referrer_code'                     : referrer_code,
+                                                'invitation_code'                   : invitation_code,
                                             }