trex-model 1.6.11__tar.gz → 1.6.13__tar.gz

{trex_model-1.6.11 → trex_model-1.6.13}/PKG-INFO

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

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

{trex_model-1.6.11 → trex_model-1.6.13}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.11 → trex_model-1.6.13}/trexmodel/models/datastore/customer_models.py

@@ -84,7 +84,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',
+                           'registered_user_acct','referral_code', 'is_referred_by_friend',
                            
                            ]
     
@@ -157,7 +157,11 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     def tier_membership_entity(self):
         if self.tier_membership:
             return MerchantTierMembership.fetch(self.tier_membership.urlsafe())    
-        
+    
+    @property
+    def is_referred_by_friend(self):
+        return self.referrer_code is not None and is_not_empty(self.referrer_code)
+    
     @staticmethod    
     def update_KPI(customer_acct, tags_list=None, memberships_list=None, tier_membership_key=None):
         if isinstance(tags_list, string_types):
@@ -380,7 +384,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         customer.put()
         
     @classmethod
-    def create_from_user(cls, outlet, user_acct, merchant_reference_code=None, merchant_acct=None):
+    def create_from_user(cls, outlet, user_acct, merchant_reference_code=None, merchant_acct=None, referrer_code=None):
         registered_merchant_acct       = outlet.merchant_acct_entity if merchant_acct is None else merchant_acct
         created_customer    = cls(
                                parent=user_acct.create_ndb_key(),
@@ -396,6 +400,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                                birth_date_date_str      = user_acct.birth_date_date_str, 
                                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()
                            )
         

{trex_model-1.6.11 → trex_model-1.6.13}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -240,9 +240,12 @@ def give_reward_from_sales_transaction(customer, sales_transaction, for_testing=
         return customer_transaction
     
     customer_transaction = CustomerTransaction.get_by_transaction_id(sales_transaction.transaction_id)
+    logger.debug('customer_transaction=%s', customer_transaction)
+    
     if customer_transaction is None:
         customer_transaction = __start_transaction(customer, sales_transaction)
-    
+    else:
+        logger.info('customer transaction have been created thus ignore to give reward')
     return customer_transaction
     
 

{trex_model-1.6.11 → trex_model-1.6.13}/trexmodel/models/datastore/user_models.py

@@ -452,6 +452,7 @@ class User(UserBase):
                 is_found = False
                 for device_details_by_platform in  found_device_details_list_by_platform:
                     device_token_by_platform = device_details_by_platform.get('device_token')
+                    logger.info('device_token_by_platform=%s', device_token_by_platform)
                     if device_token_by_platform:
                         device_details_by_platform['last_updated_datetime'] = datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S")
                         is_found = True
@@ -466,7 +467,8 @@ class User(UserBase):
                                                             )
                         
                 else:
-                    device_details_by_platform['device_token'] = device_token
+                    device_details_by_platform['device_token']          = device_token
+                    device_details_by_platform['last_updated_datetime'] = datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
             else:
                 self.device_details[platform] = [
                                                     {

{trex_model-1.6.11 → trex_model-1.6.13}/trexmodel/models/merchant_helpers.py

@@ -10,30 +10,30 @@ from trexlib.utils.crypto_util import aes_encrypt_json
 
 logger = logging.getLogger('helper')
 
-def construct_merchant_acct_info(merchant_acct, referrer_code=None):
+def construct_merchant_acct_info(merchant_acct, referrer_code=None, read_minimum=False):
     account_settings        = {
                                 'account_code'  : merchant_acct.account_code,
                                 'currency'      : merchant_acct.currency_code,
                                 'locale'        : merchant_acct.locale,
                                 'gmt_hour'      : merchant_acct.gmt_hour,   
                                 }
-    
-    outlet_list = Outlet.list_by_merchant_acct(merchant_acct)
-    outlet_json_list = []
-    for o in outlet_list:
-        if o.is_physical_store:
-            outlet_info = construct_outlet_info(o)
-            outlet_info['industry_type'] = merchant_acct.industry
-            outlet_json_list.append(outlet_info)
+    if read_minimum==False:
+        outlet_list = Outlet.list_by_merchant_acct(merchant_acct)
+        outlet_json_list = []
+        for o in outlet_list:
+            if o.is_physical_store:
+                outlet_info = construct_outlet_info(o)
+                outlet_info['industry_type'] = merchant_acct.industry
+                outlet_json_list.append(outlet_info)
         
+    if read_minimum==False:
+        banner_file_listing =  BannerFile.list_by_merchant_acct(merchant_acct)
+        banner_listing = []
+        if banner_file_listing:
+            for banner_file in banner_file_listing:
+                banner_listing.append(banner_file.banner_file_public_url)
+            
     
-    banner_file_listing =  BannerFile.list_by_merchant_acct(merchant_acct)
-    banner_listing = []
-    if banner_file_listing:
-        for banner_file in banner_file_listing:
-            banner_listing.append(banner_file.banner_file_public_url)
-        
-        
     invoice_no_generation   = InvoiceNoGeneration.getByMerchantAcct(merchant_acct)
     
     if invoice_no_generation:
@@ -41,49 +41,55 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None):
                                                      'invoice_no_generators'    : invoice_no_generation.generators_list,
                                                                      
                                                     }
-    referral_program_settings = None
-    if merchant_acct.program_settings is not None:
-        referral_program_settings = merchant_acct.program_settings.get('referral_program', {})
+    if read_minimum==False:
+        referral_program_settings = None
+        if merchant_acct.program_settings is not None:
+            referral_program_settings = merchant_acct.program_settings.get('referral_program', {})
     
     
     
-    merchant_news_list=[]
     
-    if merchant_acct.published_news_configuration:
-        merchant_news_list = merchant_acct.published_news_configuration['news']
-        
-        for news in merchant_news_list:
-            logger.debug('news public url=%s', news.get('news_public_url'))
+    merchant_news_list=[]
     
-    published_redemption_catalogue_configuration = merchant_acct.published_redemption_catalogue_configuration
-    catalogues_list = []    
-    if published_redemption_catalogue_configuration:
-        catalogues_list = published_redemption_catalogue_configuration.get('catalogues')
+    if read_minimum==False:
+        if merchant_acct.published_news_configuration:
+            merchant_news_list = merchant_acct.published_news_configuration['news']
+            
+            for news in merchant_news_list:
+                logger.debug('news public url=%s', news.get('news_public_url'))
         
-        if len(catalogues_list)>0:
-            for catalogue in catalogues_list:
-                catalogue['items'] = __resolve_catalogue_items_details(catalogue.get('items'), merchant_acct.published_voucher_configuration.get('vouchers'))
-                
+    if read_minimum==False:
+        published_redemption_catalogue_configuration = merchant_acct.published_redemption_catalogue_configuration
+        catalogues_list = []    
+        if published_redemption_catalogue_configuration:
+            catalogues_list = published_redemption_catalogue_configuration.get('catalogues')
+            
+            if len(catalogues_list)>0:
+                for catalogue in catalogues_list:
+                    catalogue['items'] = __resolve_catalogue_items_details(catalogue.get('items'), merchant_acct.published_voucher_configuration.get('vouchers'))
+                    
     
-    partner_redemption_catalogue_configuration = merchant_acct.partner_redemption_catalogue_configuration
-       
-    if partner_redemption_catalogue_configuration:
-        partner_catalogues_list = partner_redemption_catalogue_configuration.get('catalogues')
+    if read_minimum==False:    
+        partner_redemption_catalogue_configuration = merchant_acct.partner_redemption_catalogue_configuration
+           
+        if partner_redemption_catalogue_configuration:
+            partner_catalogues_list = partner_redemption_catalogue_configuration.get('catalogues')
+            
+            if len(partner_catalogues_list)>0:
+                for catalogue in partner_catalogues_list:
+                    catalogue['from_partner']   = True
+                    partner_merchant_account    = MerchantAcct.get_or_read_from_cache(catalogue['merchant_acct_key'])
+                    catalogue['items'] = __resolve_catalogue_items_details(catalogue.get('items'), partner_merchant_account.published_voucher_configuration.get('vouchers'))            
         
-        if len(partner_catalogues_list)>0:
-            for catalogue in partner_catalogues_list:
-                catalogue['from_partner']   = True
-                partner_merchant_account    = MerchantAcct.get_or_read_from_cache(catalogue['merchant_acct_key'])
-                catalogue['items'] = __resolve_catalogue_items_details(catalogue.get('items'), partner_merchant_account.published_voucher_configuration.get('vouchers'))            
-    
-            catalogues_list.extend(partner_catalogues_list)
+                catalogues_list.extend(partner_catalogues_list)
     
     partner_merchants_list = []
     
-    approved_partner_merchant_configuration = merchant_acct.approved_partner_merchant_configuration
-    if approved_partner_merchant_configuration and approved_partner_merchant_configuration.get('partners'):
-        partner_merchants_list = list(approved_partner_merchant_configuration.get('partners').values())
-        
+    if read_minimum==False:
+        approved_partner_merchant_configuration = merchant_acct.approved_partner_merchant_configuration
+        if approved_partner_merchant_configuration and approved_partner_merchant_configuration.get('partners'):
+            partner_merchants_list = list(approved_partner_merchant_configuration.get('partners').values())
+            
         
     
     info =  {
@@ -136,6 +142,12 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None):
                                     referrer_code       = referrer_code,
                                     )
         
+        referrer_merchant_and_friend_code = conf.REFERRER_MERCHANT_AND_FRIEND_CODE.format(
+                                                #referrer_data = encrypted_referrer_data
+                                                merchant_acct_code  = merchant_acct.account_code,
+                                                referrer_code       = referrer_code,
+                                                )
+        
         logger.debug('refer_a_friend_deep_link=%s', refer_a_friend_deep_link)
         
         refer_a_friend_message = refer_a_friend_message.format(
@@ -146,16 +158,17 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None):
         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'),
-                                                'referrer_promote_desc'     : referral_program_settings.get('referrer_promote_desc'),
-                                                'referrer_promote_image'    : referral_program_settings.get('referrer_promote_image', conf.REFERRAL_DEFAULT_PROMOTE_IMAGE),
-                                                'referee_promote_title'     : referral_program_settings.get('referee_promote_title'),
-                                                'referee_promote_desc'      : referral_program_settings.get('referee_promote_desc'),
-                                                'referee_promote_image'     : referral_program_settings.get('referee_promote_image'),
-                                                'refer_a_friend_url'        : refer_a_friend_url,
-                                                'refer_a_friend_message'    : refer_a_friend_message,
-                                                'refer_a_friend_deep_link'  : refer_a_friend_deep_link,
+                                                'program_count'                     : merchant_acct.effective_referral_program_count,
+                                                'referrer_promote_title'            : referral_program_settings.get('referrer_promote_title'),
+                                                'referrer_promote_desc'             : referral_program_settings.get('referrer_promote_desc'),
+                                                'referrer_promote_image'            : referral_program_settings.get('referrer_promote_image', conf.REFERRAL_DEFAULT_PROMOTE_IMAGE),
+                                                'referee_promote_title'             : referral_program_settings.get('referee_promote_title'),
+                                                'referee_promote_desc'              : referral_program_settings.get('referee_promote_desc'),
+                                                'referee_promote_image'             : referral_program_settings.get('referee_promote_image'),
+                                                'refer_a_friend_url'                : refer_a_friend_url,
+                                                '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,
                                             }