trex-model 1.2.17__tar.gz → 1.2.19__tar.gz

{trex-model-1.2.17 → trex-model-1.2.19}/PKG-INFO

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

{trex-model-1.2.17 → trex-model-1.2.19}/setup.py

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

{trex-model-1.2.17 → trex-model-1.2.19}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.2.17 → trex-model-1.2.19}/trex_model.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ trexmodel/models/datastore/import_models.py
 trexmodel/models/datastore/inventory_model.py
 trexmodel/models/datastore/loyalty_models.py
 trexmodel/models/datastore/lucky_draw_models.py
+trexmodel/models/datastore/marketing_models.py
 trexmodel/models/datastore/membership_models.py
 trexmodel/models/datastore/merchant_models.py
 trexmodel/models/datastore/message_model_helper.py

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/customer_models.py

@@ -70,6 +70,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     
     kpi_summary                                 = ndb.JsonProperty()
     
+    device_details                              = ndb.JsonProperty()
+    
     fulltextsearch_field_name           = 'name'
     
     dict_properties     = ['name', 'mobile_phone', 'email', 'gender', 'birth_date', 'reference_code', 'merchant_reference_code',  
@@ -77,7 +79,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            '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_user_acct',
                            
                            ]
     

trex-model-1.2.19/trexmodel/models/datastore/marketing_models.py

@@ -0,0 +1,226 @@
+'''
+Created on 8 Jan 2024
+
+@author: jacklok
+'''
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from google.cloud import ndb
+from trexmodel.models.datastore.merchant_models import MerchantUser,\
+    MerchantAcct
+from trexlib.utils.string_util import is_not_empty, random_string
+from datetime import datetime
+from trexmodel import program_conf, conf
+import trexmodel.conf as model_conf
+import logging
+
+logger = logging.getLogger('model')
+
+class PushNotificationSetup(BaseNModel, DictModel):
+    '''
+    Merchant Acct as ancestor
+    
+    '''
+    
+    title                   = ndb.StringProperty(required=True)
+    desc                    = ndb.StringProperty(required=True)
+    send_mode               = ndb.StringProperty(required=True, default="send_now", choices=set(['send_now','send_schedule']))
+    schedule_datetime       = ndb.DateTimeProperty(required=False)
+    
+    content_settings        = ndb.JsonProperty()
+    
+    is_archived             = ndb.BooleanProperty(required=True)
+    
+    created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    archived_datetime       = ndb.DateTimeProperty(required=False)
+    
+    created_by              = ndb.KeyProperty(name="created_by", kind=MerchantUser)
+    created_by_username     = ndb.StringProperty(required=False)
+    
+    archived_by             = ndb.KeyProperty(name="created_by", kind=MerchantUser)
+    archived_by_username    = ndb.StringProperty(required=False)
+    
+    send                    = ndb.BooleanProperty(required=True, default=False)
+    sent_datetime           = ndb.DateTimeProperty(required=False)
+    
+    dict_properties = [
+                        'title', 'desc', 'send_mode', 'schedule_datetime', 
+                        'content_type', 'content_value', 'content_settings', 
+                        'created_datetime', 'send', 'sent_datetime',
+                    ]
+    
+    @property
+    def merchant_acct_entity(self):
+        return MerchantAcct.fetch(self.key.parent().urlsafe())
+    
+    @property
+    def content_type(self):
+        if self.content_settings:
+            return self.content_settings.get('content_type')
+    
+    @property
+    def content_value(self):
+        if self.content_settings:
+            return self.content_settings.get('content_value')
+        
+    @property
+    def image_url(self):
+        if self.content_settings:
+            if self.content_settings.get('content_type')=='image':
+                return self.content_settings.get('content_value')
+            
+    @property
+    def text_data(self):
+        if self.content_settings:
+            if self.content_settings.get('content_type')=='text':
+                return self.content_settings.get('content_value')
+            
+    @property
+    def action_link(self):
+        if self.content_settings:
+            if self.content_settings.get('content_type')=='action_link':
+                return self.content_settings.get('content_value')                    
+            
+    @staticmethod
+    def create(merchant_acct, title=None, desc=None, send_mode=None, schedule_datetime=None, content_settings={},
+               created_by=None):
+        
+        created_by_username = None
+        if is_not_empty(created_by):
+            if isinstance(created_by, MerchantUser):
+                created_by_username = created_by.username
+        
+                
+        push_notification_setup = PushNotificationSetup(
+                                                parent                  = merchant_acct.create_ndb_key(),
+                                                title                   = title,
+                                                desc                    = desc,
+                                                send_mode               = send_mode,
+                                                schedule_datetime       = schedule_datetime,
+                                                content_settings        = content_settings,
+                                                is_archived             = False,
+                                                created_by              = created_by.create_ndb_key(),
+                                                created_by_username     = created_by_username,
+                                                )
+        push_notification_setup.put()
+        
+        return push_notification_setup
+    
+    
+    def to_configuration(self):
+        return {
+                
+                }
+    
+    def archived(self, archived_by=None):
+        
+        archived_by_username = None
+        if is_not_empty(archived_by):
+            if isinstance(archived_by, MerchantUser):
+                archived_by_username = archived_by.username
+        
+        self.is_archived                = True
+        self.archived_datetime          = datetime.utcnow()
+        self.archived_by                = archived_by.create_ndb_key()
+        self.archived_by_username       = archived_by_username
+        self.put()
+        
+    def update_as_send(self):
+        self.send = True
+        self.sent_datetime = datetime.utcnow()
+        self.put()
+        
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct):
+        return PushNotificationSetup.query(ndb.AND(PushNotificationSetup.is_archived!=True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+    
+    @staticmethod
+    def list_archived_by_merchant_acct(merchant_acct):
+        return PushNotificationSetup.query(ndb.AND(PushNotificationSetup.is_archived==True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+    
+    @staticmethod
+    def list(schedule_datetime=datetime.utcnow()):
+        result = PushNotificationSetup.query(
+                    ndb.AND(
+                            PushNotificationSetup.send==False, 
+                            PushNotificationSetup.schedule_datetime<=schedule_datetime)).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        return result
+    
+class MarketingImage(BaseNModel, DictModel):
+    '''
+    Merchant Account as ancestor
+    '''
+    image_label                    = ndb.StringProperty(required=True)
+    image_file_type                = ndb.StringProperty(required=True)
+    image_file_public_url          = ndb.StringProperty(required=True)
+    image_file_storage_filename    = ndb.StringProperty(required=True)
+    
+    dict_properties = ['image_label', 'image_file_public_url', 'image_file_storage_filename', 'image_file_type']
+    
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct):
+        result = MarketingImage.query(ancestor=merchant_acct.create_ndb_key()).fetch(limit=conf.MAX_FETCH_RECORD)
+        return result
+    
+    @staticmethod
+    def upload_file(uploading_file, image_label, merchant_acct, bucket, image_file_type=None):
+        file_prefix                         = random_string(8)
+        image_file_storage_filename         = 'merchant/'+merchant_acct.key_in_str+'/marketing/'+file_prefix+'-'+uploading_file.filename
+        blob                                = bucket.blob(image_file_storage_filename)
+        
+        logger.debug('image_label=%s', image_label)
+        logger.debug('image_file_storage_filename=%s', image_file_storage_filename)
+        
+        blob.upload_from_string(
+                uploading_file.read(),
+                content_type=uploading_file.content_type
+            )
+        
+        uploaded_url        = blob.public_url
+        
+        logger.debug('image_file_type=%s', image_file_type)
+        
+        image_file = MarketingImage(
+                            parent                              = merchant_acct.create_ndb_key(),
+                            image_label                         = image_label,
+                            image_file_public_url               = uploaded_url,
+                            image_file_storage_filename         = image_file_storage_filename,
+                            image_file_type                     = image_file_type,
+                            )
+        
+        image_file.put()
+        
+        return image_file
+    
+    @staticmethod
+    def remove_file(image_file, bucket):
+        
+        old_logo_blob = bucket.get_blob(image_file.image_file_storage_filename) 
+        if old_logo_blob:
+            old_logo_blob.delete()
+            image_file.delete()      
+
+class ScheduledPushNotificationHistory(BaseNModel, DictModel):
+    push_notification_setup = ndb.KeyProperty(name="push_notification_setup", kind=PushNotificationSetup)
+    created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    send                    = ndb.BooleanProperty(required=True, default=False)
+    scheduled_datetime      = ndb.DateTimeProperty(required=True)
+    sent_datetime           = ndb.DateTimeProperty(required=False)    
+
+    @staticmethod
+    def create(push_notification_setup, scheduled_datetime=None):
+        if scheduled_datetime is None:
+            scheduled_datetime = datetime.utcnow()
+        ScheduledPushNotificationHistory(
+                                    push_notification_setup = push_notification_setup.create_ndb_key(),
+                                    scheduled_datetime      = scheduled_datetime,
+                                    ).put()
+                                    
+    
+    @staticmethod
+    def list(scheduled_datetime=datetime.utcnow()):
+        result = ScheduledPushNotificationHistory.query(
+                    ndb.AND(
+                            ScheduledPushNotificationHistory.send==False, 
+                            ScheduledPushNotificationHistory.scheduled_datetime<=scheduled_datetime)).fetch(offset=0, limit=conf.MAX_FETCH_RECORD)
+        return result
+    

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/merchant_models.py

@@ -60,6 +60,7 @@ class MerchantAcct(MerchantMin):
     dashboard_stat_figure                   = ndb.JsonProperty()
     currency_code                           = ndb.StringProperty(required=False, default='MYR')
     locale                                  = ndb.StringProperty(required=False, default='en_MY')
+    timezone                                = ndb.StringProperty(required=False, default='Asia/Kuala_Lumpur')
     api_key                                 = ndb.StringProperty(required=False)
     
     account_plan                            = ndb.JsonProperty()
@@ -85,8 +86,10 @@ class MerchantAcct(MerchantMin):
     stat_figure_update_interval_in_minutes  = conf.MERCHANT_STAT_FIGURE_UPDATE_INTERVAL_IN_MINUTES
     stat_figure_update_datetime_format      = '%d-%m-%Y %H:%M:%S'
     
-    dict_properties = ['company_name', 'brand_name', 'contact_name', 'business_reg_no', 'mobile_phone', 'office_phone', 'fax_phone', 'email', 'account_code', 'country',
+    dict_properties = ['company_name', 'brand_name', 'contact_name', 'business_reg_no', 'mobile_phone', 
+                       'office_phone', 'fax_phone', 'email', 'account_code', 'country',
                        'registered_datetime', 'modified_datetime', 'plan_start_date', 'plan_end_date', 'currency_code', 
+                       'timezone',
                        'published_program_configuration', 'published_voucher_configuration', 'membership_configuration', 
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
@@ -224,8 +227,7 @@ class MerchantAcct(MerchantMin):
     @staticmethod
     def update_details(merchant_acct, company_name=None, brand_name=None, business_reg_no=None, contact_name=None, 
                        email=None, mobile_phone=None, office_phone=None, currency_code=None,
-                       
-                       country=None, website=None):
+                       country=None, timezone=None, website=None):
         
         
         
@@ -238,7 +240,9 @@ class MerchantAcct(MerchantMin):
         merchant_acct.office_phone      = office_phone
         merchant_acct.currency_code     = currency_code
         merchant_acct.country           = country
+        merchant_acct.timezone          = timezone
         merchant_acct.website           = website
+        
         merchant_acct.put()
     
     @staticmethod
@@ -882,7 +886,7 @@ class MerchantAcct(MerchantMin):
     @staticmethod
     def create(company_name=None, brand_name=None, contact_name=None, email=None, mobile_phone=None, office_phone=None, 
                plan_start_date=None, plan_end_date=None,  
-               account_code=None, currency_code=None, country=None, website=None,
+               account_code=None, currency_code=None, country=None, timezone=None, website=None,
                product_package=None,loyalty_package=None, outlet_limit=1
                ):
         
@@ -906,7 +910,8 @@ class MerchantAcct(MerchantMin):
                                        plan_start_date  = plan_start_date, 
                                        plan_end_date    = plan_end_date,
                                        currency_code    = currency_code,
-                                       country          = country,    
+                                       country          = country, 
+                                       timezone         = timezone,   
                                        website          = website,
                                        api_key          = random_string(24),
                                        program_settings = MerchantAcct.default_program_settings(),
@@ -925,7 +930,7 @@ class MerchantAcct(MerchantMin):
     @staticmethod
     def update(merchant_acct, company_name=None, brand_name=None, contact_name=None, email=None, mobile_phone=None, office_phone=None, 
                plan_start_date=None, plan_end_date=None,  
-               currency_code=None, country=None, website=None,
+               currency_code=None, country=None, timezone=None, website=None,
                product_package=None,loyalty_package=None, outlet_limit=1,
                ):
         
@@ -945,6 +950,7 @@ class MerchantAcct(MerchantMin):
         merchant_acct.plan_end_date    = plan_end_date
         merchant_acct.currency_code    = currency_code
         merchant_acct.country          = country
+        merchant_acct.timezone         = timezone
         merchant_acct.website          = website
         merchant_acct.account_plan     = account_plan
         

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/ndb_models.py

@@ -327,7 +327,8 @@ class BaseNModel(DictModel, NDBModel):
             if more:
                 return search_results, next_cursor.to_websafe_string().decode('utf-8')  
             else:    
-                return search_results, 'None'
+                #return search_results, 'None'
+                return search_results, None
             
         else:
             search_results = query.fetch(limit=limit, offset=offset, keys_only=keys_only)

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -43,12 +43,14 @@ class RedemptionCatalogue(BaseNModel, DictModel):
     image_storage_filename              = ndb.StringProperty(required=False)
     image_public_url                    = ndb.StringProperty(required=False)
     
+    loyalty_package                    = ndb.StringProperty(required=False, default=program_conf.LOYALTY_PACKAGE_SCALE)
+    
     dict_properties = [
                         "label","desc","completed_status","start_date","end_date","created_datetime",
                         "redeem_reward_format","catalogue_settings", "image_storage_filename", "image_public_url",
                         "exclusive_tags_list", "exclusive_memberships_list", "exclusive_tier_memberships_list",
                         "completed_prograss_in_percentage","completed_status_index", "catalogue_items",
-                        "is_enabled", "is_disabled", "is_archived", "is_published",
+                        "is_enabled", "is_disabled", "is_archived", "is_published", "loyalty_package",
                         ]
     
     @property
@@ -92,14 +94,15 @@ class RedemptionCatalogue(BaseNModel, DictModel):
     
     @property
     def completed_prograss_in_percentage(self):
-        return program_conf.redemption_catalogue_completed_progress_percentage(self.completed_status)
+        return program_conf.redemption_catalogue_completed_progress_percentage(self.completed_status, self.loyalty_package)
     
     @property
     def completed_status_index(self):
         return program_conf.get_redemption_catalogue_completed_status_index(self.completed_status)
     
     @staticmethod
-    def create(merchant_acct, label=None, desc=None, start_date=None, end_date=None, redeem_reward_format=None, created_by=None):
+    def create(merchant_acct, label=None, desc=None, start_date=None, end_date=None, redeem_reward_format=None, 
+               created_by=None, loyalty_package=program_conf.LOYALTY_PACKAGE_SCALE):
         
         created_by_username = None
         if is_not_empty(created_by):
@@ -117,6 +120,7 @@ class RedemptionCatalogue(BaseNModel, DictModel):
                                 created_by_username = created_by_username,
                                 completed_status    = program_conf.REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,
                                 catalogue_settings  = {},
+                                loyalty_package     = loyalty_package,
                                 )
         
         redemption_catalogue.put()
@@ -124,7 +128,8 @@ class RedemptionCatalogue(BaseNModel, DictModel):
         return redemption_catalogue
     
     @staticmethod
-    def update(redemption_catalogue, label=None, desc=None, start_date=None, end_date=None, redeem_reward_format=None, modified_by=None):
+    def update(redemption_catalogue, label=None, desc=None, start_date=None, end_date=None, 
+               redeem_reward_format=None, modified_by=None, loyalty_package=program_conf.LOYALTY_PACKAGE_SCALE):
         
         modified_by_username = None
         if is_not_empty(modified_by):
@@ -140,6 +145,7 @@ class RedemptionCatalogue(BaseNModel, DictModel):
         
         redemption_catalogue.modified_by            = modified_by.create_ndb_key()
         redemption_catalogue.modified_by_username   = modified_by_username
+        redemption_catalogue.loyalty_package        = loyalty_package
         
         redemption_catalogue.put()
         

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/system_models.py

@@ -3,10 +3,9 @@ Created on 20 Apr 2020
 
 @author: jacklok
 '''
-from trexmodel import conf as model_conf
+from trexmodel import conf as model_conf, conf
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
- 
 
 class Country(BaseNModel, DictModel):
     cnty_id                 = ndb.IntegerProperty(required=True)
@@ -158,9 +157,25 @@ class Tagging(BaseNModel, DictModel):
     @classmethod
     def get_by_label(cls, parent, label):
         return cls.query(ndb.AND(cls.label==label), ancestor=parent).fetch(limit=1)
+
+
+
+'''        
+class ScheduledProjectExecutionHistory(BaseNModel, DictModel):
+    merchant_acct       = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
+    merchant_program    = ndb.KeyProperty(name="merchant_program", kind=MerchantProgram)
+    created_datetime    = ndb.DateTimeProperty(required=True, auto_now_add=True)
     
-        
-        
+    @staticmethod
+    def create(merchant_acct, merchant_program):
+        ScheduledProjectExecutionHistory(
+                                    merchant_acct       = merchant_acct.create_ndb_key(),
+                                    merchant_program    = merchant_program.create_ndb_key(),
+                                    ).put()
+
+'''
+    
+            
     
     
     

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/models/datastore/user_models.py

@@ -45,6 +45,8 @@ class UserMin(BaseNModel, DictModel, UserMixin):
     demo_account                = ndb.BooleanProperty(required=False, default=False)
     deleted                     = ndb.BooleanProperty(required=False, default=False)
     
+    
+    
     dict_properties             = ['user_id', 'name', 'email', 'gravatar_url', 'active', 'locked', 'lock_expiry_datetime']
     
     @classmethod
@@ -352,11 +354,13 @@ class User(UserBase):
     redeem_pin                 = ndb.StringProperty(required=False)
     status                     = ndb.StringProperty(required=False, default=USER_STATUS_ANONYMOUS)
     new_message_count          = ndb.IntegerProperty(required=False, default=0)
+    device_details             = ndb.JsonProperty()
+    
     dict_properties            = [
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
-                                    'address', 'redeem_pin', 'new_message_count', 'status'
-
+                                    'address', 'redeem_pin', 'new_message_count', 'status',
+                                    'device_details',
                                     ]
 
     #unique_attributes = 'email,username'
@@ -364,7 +368,7 @@ class User(UserBase):
     audit_properties            = [
                                     'mobile_phone', 'email', 'password', 'name', 'birth_date', 'gender',
                                     'reference_code', 'country', 'state', 'city', 'postcode', 
-                                    'address', 'redeem_pin', 'status'
+                                    'address', 'redeem_pin', 'status', 'device_details',
 
                                     ]
 
@@ -405,7 +409,45 @@ class User(UserBase):
         """Returns `True` if the user is active."""
         logger.info('calling is_active')
         return self.active
-
+    
+    def update_device_details(self, platform, device_token):
+        if self.device_details:
+            found_device_details_list_by_platform = self.device_details.get(platform)
+            if found_device_details_list_by_platform:
+                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')
+                    if device_token_by_platform:
+                        device_details_by_platform['last_updated_datetime'] = datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S")
+                        is_found = True
+                        break
+                
+                if is_found == False:
+                    found_device_details_list_by_platform.append(
+                                                                {
+                                                                'device_token'              : device_token,
+                                                                'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                                }
+                                                            )
+                        
+                    
+            else:
+                self.device_details[platform] = [
+                                                    {
+                                                    'device_token'              : device_token,
+                                                    'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                    }
+                                                ]
+        else:
+            self.device_details = {
+                                    platform : [
+                                                {
+                                                    'device_token'              : device_token,
+                                                    'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                    }
+                                                ]
+                                }
+        self.put()
 
 class DeletedUser(User):
     deleted_datetime            = ndb.DateTimeProperty(required=False, auto_now_add=True)

{trex-model-1.2.17 → trex-model-1.2.19}/trexmodel/program_conf.py

@@ -291,7 +291,13 @@ REDEMPTION_CATALOGUE_STATUS                   = (
                                                  REDEMPTION_CATALOGUE_STATUS_PUBLISH
                                                  )
 
-
+LITE_REDEMPTION_CATALOGUE_STATUS                   = (
+                                                 REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,
+                                                 REDEMPTION_CATALOGUE_STATUS_DEFINE_ITEM,
+                                                 REDEMPTION_CATALOGUE_STATUS_UPLOAD_MATERIAL,
+                                                 REDEMPTION_CATALOGUE_STATUS_REVIEW,
+                                                 REDEMPTION_CATALOGUE_STATUS_PUBLISH
+                                                 )
 
 
 
@@ -544,7 +550,10 @@ def lucky_draw_program_completed_progress_percentage(completed_status):
     print('lucky_draw_program_completed_progress_percentage: completed_status_index(%s)=%s'% (completed_status,completed_status_index))
     return int((completed_status_index+1)/len(LUCKY_DRAW_PROGRAM_STATUS) * 100)
     
-def redemption_catalogue_completed_progress_percentage(completed_status):
+def redemption_catalogue_completed_progress_percentage(completed_status, loyalty_package):
     completed_status_index  = get_redemption_catalogue_completed_status_index(completed_status)
     print('redemption_catalogue_completed_progress_percentage: completed_status_index(%s)=%s'% (completed_status,completed_status_index))
-    return int((completed_status_index+1)/len(REDEMPTION_CATALOGUE_STATUS) * 100)
+    if loyalty_package == LOYALTY_PACKAGE_LITE:
+        return int((completed_status_index+1)/len(LITE_REDEMPTION_CATALOGUE_STATUS) * 100)
+    else:
+        return int((completed_status_index+1)/len(REDEMPTION_CATALOGUE_STATUS) * 100)