trex-model 1.4.1__tar.gz → 1.4.3__tar.gz

{trex-model-1.4.1 → trex-model-1.4.3}/PKG-INFO

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

{trex-model-1.4.1 → trex-model-1.4.3}/setup.py

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

{trex-model-1.4.1 → trex-model-1.4.3}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.4.1 → trex-model-1.4.3}/trexmodel/models/datastore/customer_models.py

@@ -81,7 +81,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            'tags_list', 'memberships_list', 'registered_merchant_acct', 'entitled_membership_reward_summary',
                            'reward_summary', 'entitled_voucher_summary', 'prepaid_summary', 'kpi_summary', 'entitled_lucky_draw_ticket_summary',
                            'entitled_birthday_reward_summary', 'tier_membership_key',
-                           'registered_outlet_key', 'registered_merchant_acct_key', 'registered_datetime', 'modified_datetime',
+                           'registered_outlet_key', 'merchant_account_key', 
+                           'registered_datetime', 'modified_datetime',
                            'registered_user_acct','referral_code',
                            
                            ]
@@ -116,6 +117,11 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     def registered_merchant_acct_key(self):
         if self.merchant_acct:
             return self.merchant_acct.urlsafe().decode("utf-8")
+        
+    @property
+    def merchant_account_key(self):
+        if self.merchant_acct:
+            return self.merchant_acct.urlsafe().decode("utf-8")    
     
     @property
     def registered_outlet(self):

{trex-model-1.4.1 → trex-model-1.4.3}/trexmodel/models/datastore/merchant_models.py

@@ -1219,14 +1219,15 @@ class MerchantAcct(MerchantMin):
         
         for program in published_program_configuration.get('programs'):
             if program.get('giveaway_method') == program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_SYSTEM:
-                logger.debug('giveaway system condition=%s', program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'))
-                if program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition') == program_conf.GIVEAWAY_SYSTEM_CONDITION_DATA_IMPORT:
-                    logger.debug('giveaway reward_format=%s', program.get('reward_format'))
-                    if program.get('reward_format') == target_reward_format:
-                        data_import_giveaway_programs.append({
-                                                            'program_key'   : program.get('program_key'),
-                                                            'label'         : program.get('label'),
-                                                            })
+                if program.get('program_settings').get('giveaway_system_settings') and program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'):
+                    logger.debug('giveaway system condition=%s', program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'))
+                    if program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition') == program_conf.GIVEAWAY_SYSTEM_CONDITION_DATA_IMPORT:
+                        logger.debug('giveaway reward_format=%s', program.get('reward_format'))
+                        if program.get('reward_format') == target_reward_format:
+                            data_import_giveaway_programs.append({
+                                                                'program_key'   : program.get('program_key'),
+                                                                'label'         : program.get('label'),
+                                                                })
                     
         return data_import_giveaway_programs
     
@@ -1892,4 +1893,76 @@ class BannerFile(BaseNModel, DictModel):
         old_logo_blob = bucket.get_blob(banner_file.banner_file_storage_filename) 
         if old_logo_blob:
             old_logo_blob.delete()
-            banner_file.delete()    
+            banner_file.delete()   
+            
+class MerchantNewsFile(BaseNModel, DictModel):
+    '''
+    Merchant Account as ancestor
+    '''
+    label                         = ndb.StringProperty(required=False)
+    desc                          = ndb.StringProperty(required=False)
+    news_text                     = ndb.StringProperty(required=False)
+    
+    news_file_type                = ndb.StringProperty(required=True)
+    news_file_public_url          = ndb.StringProperty(required=True)
+    news_file_storage_filename    = ndb.StringProperty(required=True)
+    start_date                    = ndb.DateProperty(required=True)
+    end_date                      = ndb.DateProperty(required=True)
+    
+    
+    dict_properties = ['news_file_public_url', 'news_file_storage_filename', 'news_file_type', 'label', 'desc', 'news_text', 'start_date', 'end_date']
+    
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct):
+        result = MerchantNewsFile.query(ancestor=merchant_acct.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
+        return result
+    
+    @staticmethod
+    def create(merchant_acct, label=None, desc=None, news_text=None):
+        news_file = MerchantNewsFile(
+                            parent      = merchant_acct.create_ndb_key(),
+                            label       = label,
+                            desc        = desc,
+                            news_text   = news_text,
+                            )
+        
+        news_file.put()
+    
+    @staticmethod
+    def upload_file(merchant_news, uploading_file, merchant_acct, bucket, news_file_type=None):
+        file_prefix                         = random_string(8)
+        news_file_storage_filename          = 'merchant/'+merchant_acct.key_in_str+'/news/'+file_prefix+'-'+uploading_file.filename
+        blob                                = bucket.blob(news_file_storage_filename)
+        
+        logger.debug('news_file_storage_filename=%s', news_file_storage_filename)
+        
+        blob.upload_from_string(
+                uploading_file.read(),
+                content_type=uploading_file.content_type
+            )
+        
+        uploaded_url        = blob.public_url
+        
+        logger.debug('uploaded_url=%s', uploaded_url)
+        logger.debug('news_file_type=%s', news_file_type)
+        
+        if is_not_empty(merchant_news.news_file_storage_filename):
+            old_logo_blob = bucket.get_blob(merchant_news.news_file_storage_filename)
+            if old_logo_blob:
+                old_logo_blob.delete()
+            
+        
+        merchant_news.news_file_public_url          = uploaded_url
+        merchant_news.news_file_storage_filename    = news_file_storage_filename
+        merchant_news.news_file_type                = news_file_type
+        
+        
+        merchant_news.put()
+    
+    @staticmethod
+    def remove_file(news_file, bucket):
+        
+        old_logo_blob = bucket.get_blob(news_file.news_file_storage_filename) 
+        if old_logo_blob:
+            old_logo_blob.delete()
+            news_file.delete()                

{trex-model-1.4.1 → trex-model-1.4.3}/trexmodel/models/merchant_helpers.py

@@ -3,6 +3,7 @@ from trexmodel.models.datastore.pos_models import InvoiceNoGeneration,\
 from trexmodel.models.datastore.merchant_models import ReceiptSetup, Outlet,\
     BannerFile
 from trexlib.utils.string_util import is_not_empty
+from trexconf import conf
 
 def construct_merchant_acct_info(merchant_acct):
     account_settings        = {
@@ -34,6 +35,24 @@ def construct_merchant_acct_info(merchant_acct):
     
     referral_program_settings = merchant_acct.program_settings.get('referral_program', {})
     
+    
+    merchant_news_list = [
+        {
+            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/395358935_817823987014226_84933362912055577_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi42NTF4NjUwLnNkci5mMzA4MDgifQ&_nc_ht=scontent.cdninstagram.com&_nc_cat=102&_nc_ohc=v_kSSi1t6JgQ7kNvgERj6Vi&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzIyMjUxMzQ0MzI0ODIyMzYzMg%3D%3D.2-ccb7-5&oh=00_AfAUoP1jFeskadyDc4xrwkZb1PuH9t5JSajL6Q5tKAwCew&oe=663DAE72&_nc_sid=10d13b',
+            'text':'',
+            },
+        {
+            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/422867915_881086610687963_4914358090885890823_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi4xMDAweDEwMDAuc2RyLmYzMDgwOCJ9&_nc_ht=scontent.cdninstagram.com&_nc_cat=111&_nc_ohc=-26XTqUwW_UQ7kNvgGzfHx3&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzI5MDg0MTIxNDU3MjA1Nzk3OA%3D%3D.2-ccb7-5&oh=00_AfC8Mj_E7VFXjv_lXqKRYZujgLyIzSHCIL7zM4-sVgRl_A&oe=663DC772&_nc_sid=10d13b',
+            'text':'',
+            },
+        {
+            'image_url': 'https://scontent.cdninstagram.com/v/t39.30808-6/429531381_18323200675112934_3919053740927881532_n.jpg?stp=dst-jpg_e35&efg=eyJ2ZW5jb2RlX3RhZyI6ImltYWdlX3VybGdlbi4xMDgweDEwODAuc2RyLmYzMDgwOCJ9&_nc_ht=scontent.cdninstagram.com&_nc_cat=106&_nc_ohc=xNmQi508i6sQ7kNvgEEkOg4&edm=APs17CUAAAAA&ccb=7-5&ig_cache_key=MzMxMzI2NDY1NDg3NDQxNDI1Mw%3D%3D.2-ccb7-5&oh=00_AfApkzmZjDGPJB1Vnf49is-ZpqqYYL5nKgmB9jXmDGpUGQ&oe=663FD578&_nc_sid=10d13b',
+            'text':'',
+            }
+        
+        ]
+    
+    merchant_news_list=[]
     info =  {
                 'key'                               : merchant_acct.key_in_str,
                 'company_name'                      : merchant_acct.company_name,
@@ -46,7 +65,7 @@ def construct_merchant_acct_info(merchant_acct):
                 'account_settings'                  : account_settings,
                 'outlets'                           : outlet_json_list,
                 'banners'                           : banner_listing,
-                
+                'merchant_news'                     : merchant_news_list,
                 } 
     if is_not_empty(referral_program_settings):
         
@@ -54,7 +73,7 @@ def construct_merchant_acct_info(merchant_acct):
                                                 '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'),
+                                                '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'),