trex-model 1.2.8__tar.gz → 1.2.9__tar.gz

{trex-model-1.2.8/trex_model.egg-info → trex-model-1.2.9}/PKG-INFO

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

{trex-model-1.2.8 → trex-model-1.2.9}/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.8',
+     version='1.2.9',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.2.8 → trex-model-1.2.9/trex_model.egg-info}/PKG-INFO

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

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/models/datastore/customer_models.py

@@ -76,7 +76,10 @@ 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', 'registered_merchant_acct_key', 'registered_datetime', 'modified_datetime',
+                           
+                           
+                           ]
     
     @property
     def is_any_entitled_voucher_active(self):
@@ -91,15 +94,10 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         
         return False
     
-    @property
-    def registered_user_acct_key(self):
-        #return self.user_acct.urlsafe().decode('utf-8')
-        return self.key.parent().urlsafe().decode('utf-8')
-    
     @property
     def registered_user_acct(self):
         #return User.fetch(self.user_acct.urlsafe())
-        return User.fetch(self.key.parent().urlsafe())
+        return User.get_by_reference_code(self.reference_code)
     
     @property
     def registered_merchant_acct(self):
@@ -120,6 +118,15 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         if self.outlet:
             return self.outlet.urlsafe().decode("utf-8")
     
+    @property
+    def merchant_memberships_list(self):
+        _memberships_list = []
+        for key in self.memberships_list:
+            merchant_membership = MerchantMembership.fetch(key)
+            _memberships_list.append(merchant_membership)
+        
+        return _memberships_list
+    
     @property
     def tier_membership_key(self):
         if self.tier_membership:

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/models/datastore/membership_models.py

@@ -27,6 +27,7 @@ class MembershipBase(BaseNModel, DictModel):
     
     label                   = ndb.StringProperty(required=True)
     desc                    = ndb.StringProperty(required=False)
+    terms_and_conditions    = ndb.StringProperty(required=False)
     
     expiration_type         = ndb.StringProperty(required=True)
     expiration_value        = ndb.IntegerProperty(required=False)
@@ -43,7 +44,7 @@ class MembershipBase(BaseNModel, DictModel):
     modified_by             = ndb.KeyProperty(name="modified_by", kind=MerchantUser)
     modified_by_username    = ndb.StringProperty(required=False)
 
-    dict_properties         = ['label', 'desc', 'expiration_type', 'expiration_value', 'created_datetime', 'modified_datetime']
+    dict_properties         = ['label', 'desc', 'terms_and_conditions', 'expiration_type', 'expiration_value', 'created_datetime', 'modified_datetime']
     
     @property
     def merchant_acct(self):

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/models/datastore/merchant_models.py

@@ -65,10 +65,12 @@ class MerchantAcct(MerchantMin):
     account_plan                            = ndb.JsonProperty()
     outlet_count                            = ndb.IntegerProperty(default=0)
     
-    published_program_configuration         = ndb.JsonProperty()
-    published_voucher_configuration         = ndb.JsonProperty()
-    membership_configuration                = ndb.JsonProperty()
-    tier_membership_configuration           = ndb.JsonProperty()
+    published_program_configuration                 = ndb.JsonProperty()
+    published_voucher_configuration                 = ndb.JsonProperty()
+    published_redemption_catalogue_configuration    = ndb.JsonProperty()
+    
+    membership_configuration                        = ndb.JsonProperty()
+    tier_membership_configuration                   = ndb.JsonProperty()
     
     reward_naming_configuration             = ndb.JsonProperty()
     
@@ -89,6 +91,7 @@ class MerchantAcct(MerchantMin):
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
                        'product_package', 'loyalty_package','account_plan','outlet_count', 'outlet_limit',
+                       'published_redemption_catalogue_configuration',
                        ]
     
     
@@ -477,7 +480,33 @@ class MerchantAcct(MerchantMin):
         self.lucky_draw_configuration['programs']        = existing_lucky_draw_list
         self.lucky_draw_configuration['count']           = len(existing_lucky_draw_list) 
             
-        self.put()    
+        self.put()  
+    
+    def update_published_redemption_catalogue(self, catalogue_configuration):
+        if is_empty(self.published_redemption_catalogue_configuration):
+            self.published_redemption_catalogue_configuration = {
+                                                'catalogues'    :[catalogue_configuration],
+                                                'count'         : 1,
+                                                } 
+                                            
+        else:
+            existing_catalogue_list  = self.published_redemption_catalogue_configuration.get('catalogues')
+            
+            catalogue_key = catalogue_configuration.get('catalogue_key')
+            
+            index = 0
+            for v in existing_catalogue_list:
+                if v.get('catalogue_key') == catalogue_key:
+                    existing_catalogue_list.pop(index)
+                
+                index = index+1
+            
+            existing_catalogue_list.append(catalogue_configuration)
+            
+            self.published_redemption_catalogue_configuration['catalogues']  = existing_catalogue_list
+            self.published_redemption_catalogue_configuration['count']       = len(existing_catalogue_list) 
+            
+        self.put()   
         
     def update_lucky_draw_program_settings(self, lucky_draw_program_settings):
         logger.debug('update_lucky_draw_program_settings debug: lucky_draw_program_settings = %s', lucky_draw_program_settings)
@@ -645,6 +674,34 @@ class MerchantAcct(MerchantMin):
             
         self.put()
         
+    def remove_redeption_catalogue(self, catalogue_key):
+        existing_catalogues_list = self.published_redemption_catalogue_configuration['catalogues']
+        
+        new_catalogues_list = []
+        for catalogue in existing_catalogues_list:
+            if catalogue.get('catalogue_key') != catalogue_key:
+                new_catalogues_list.append(catalogue)
+            
+        
+        self.published_redemption_catalogue_configuration['catalogues']      = new_catalogues_list
+        self.published_redemption_catalogue_configuration['count']           = len(new_catalogues_list)
+            
+        self.put()    
+        
+    def remove_archieve_redemption_catalogue(self, archieve_redemption_catalogue_key):
+        existing_catalogues_list = self.published_redemption_catalogue_configuration['catalogues']
+        
+        new_catalogues_list = []
+        for catalogue in existing_catalogues_list:
+            if catalogue.get('catalogue_key') != archieve_redemption_catalogue_key:
+                new_catalogues_list.append(catalogue)
+            
+        
+        self.published_redemption_catalogue_configuration['catalogues']  = new_catalogues_list
+        self.published_redemption_catalogue_configuration['count']       = len(new_catalogues_list)
+            
+        self.put()    
+        
     def remove_archieve_basic_membership(self, archieve_membership_key):
         self.flush_dirty_membership_configuration()
         existing_memberships_list = self.membership_configuration['memberships']

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/models/datastore/product_models.py

@@ -413,6 +413,10 @@ class Product(ProductBase, FullTextSearchable):
     
     dict_properties = ['product_sku', 'product_name', 'category_key', 'price', 'cost', 'product_desc', 'barcode', 'pos_settings', 'tax_details', 'product_modifier']
     
+    @property
+    def product_default_image(self):
+        return self.pos_settings.get('representation_settings').get('image_url')
+    
     def setting_details_for_pos(self, merchant_acct):
         modifier_keys_list              = self.product_modifier
         modifier_setting_list_for_pos   = []

trex-model-1.2.9/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -0,0 +1,373 @@
+'''
+Created on 25 Sep 2023
+
+@author: jacklok
+'''
+import logging
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from google.cloud import ndb
+from datetime import datetime
+import trexmodel.conf as model_conf
+from trexmodel import program_conf
+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
+
+logger = logging.getLogger('model')
+
+class RedemptionCatalogue(BaseNModel, DictModel):
+    #merchant_acct                       = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
+    label                               = ndb.StringProperty(required=True)
+    desc                                = ndb.StringProperty(required=False)
+    redeem_reward_format                = ndb.StringProperty(required=True, choices=set(program_conf.REDEEM_REWARD_FORMAT_GROUP))
+    completed_status                    = ndb.StringProperty(required=True, choices=set(program_conf.REDEMPTION_CATALOGUE_STATUS))
+    start_date                          = ndb.DateProperty(required=True)
+    end_date                            = ndb.DateProperty(required=True)
+    created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    modified_datetime                   = ndb.DateTimeProperty(required=True, auto_now=True)
+    
+    published_datetime                  = ndb.DateTimeProperty(required=False)
+    archived_datetime                   = ndb.DateTimeProperty(required=False)
+    
+    catalogue_settings                  = ndb.JsonProperty(required=True)
+    
+    created_by                          = ndb.KeyProperty(name="created_by", kind=MerchantUser)
+    created_by_username                 = ndb.StringProperty(required=False)
+    modified_by                         = ndb.KeyProperty(name="modified_by", kind=MerchantUser)
+    modified_by_username                = ndb.StringProperty(required=False)
+    
+    enabled                             = ndb.BooleanProperty(required=True, default=True)
+    archived                            = ndb.BooleanProperty(required=True, default=False)
+    
+    image_storage_filename              = ndb.StringProperty(required=False)
+    image_public_url                    = ndb.StringProperty(required=False)
+    
+    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",
+                        ]
+    
+    @property
+    def is_enabled(self):
+        return self.enabled
+    
+    @property
+    def is_disabled(self):
+        return self.enabled==False
+    
+    @property
+    def is_archived(self):
+        return self.archived
+    
+    @property
+    def is_published(self):
+        return self.completed_status == program_conf.PROGRAM_STATUS_PUBLISH
+    
+    @property
+    def merchant_acct(self):
+        return MerchantAcct.fetch(self.key.parent().urlsafe())
+    
+    @property
+    def exclusive_tags_list(self):
+        if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('tags'):
+            return self.catalogue_settings.get('exclusivity').get('tags') or []
+        
+    @property
+    def exclusive_memberships_list(self):
+        if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('memberships'):
+            return self.catalogue_settings.get('exclusivity').get('memberships') or []
+        
+    @property
+    def exclusive_tier_memberships_list(self):
+        if self.catalogue_settings.get('exclusivity') and self.catalogue_settings.get('exclusivity').get('tier_memberships'):
+            return self.catalogue_settings.get('exclusivity').get('tier_memberships') or []
+    
+    @property
+    def catalogue_items(self):
+        return self.catalogue_settings.get('items') or []
+    
+    @property
+    def completed_prograss_in_percentage(self):
+        return program_conf.redemption_catalogue_completed_progress_percentage(self.completed_status)
+    
+    @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):
+        
+        created_by_username = None
+        if is_not_empty(created_by):
+            if isinstance(created_by, MerchantUser):
+                created_by_username = created_by.username
+                
+        redemption_catalogue = RedemptionCatalogue(
+                                parent              = merchant_acct.create_ndb_key(),
+                                label               = label,
+                                desc                = desc,
+                                start_date          = start_date,
+                                end_date            = end_date,
+                                redeem_reward_format= redeem_reward_format,
+                                created_by          = created_by.create_ndb_key(),
+                                created_by_username = created_by_username,
+                                completed_status    = program_conf.REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,
+                                catalogue_settings  = {},
+                                )
+        
+        redemption_catalogue.put()
+        
+        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):
+        
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                
+        redemption_catalogue.label                  = label
+        redemption_catalogue.desc                   = desc
+        redemption_catalogue.start_date             = start_date
+        redemption_catalogue.end_date               = end_date
+        redemption_catalogue.redeem_reward_format   = redeem_reward_format
+        redemption_catalogue.completed_status       = program_conf.REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE
+        
+        redemption_catalogue.modified_by            = modified_by.create_ndb_key()
+        redemption_catalogue.modified_by_username   = modified_by_username
+        
+        redemption_catalogue.put()
+        
+        return redemption_catalogue
+    
+    
+    def remove_redemption_catalogue_item(self, voucher_index, modified_by=None):
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                
+        
+        catalogue_settings = self.catalogue_settings
+        
+        items = catalogue_settings.get('items')
+        if is_not_empty(items):
+            items = [item for item in items if item.get('voucher_index') != voucher_index]
+            
+        catalogue_settings['items'] = items
+        
+        self.catalogue_settings     = catalogue_settings
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()
+    
+    def update_redemption_catalogue_image(self, image_public_url=None, image_storage_filename=None, modified_by=None):
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        self.image_public_url       = image_public_url
+        self.image_storage_filename = image_storage_filename
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.completed_status       = program_conf.REDEMPTION_CATALOGUE_STATUS_UPLOAD_MATERIAL
+        self.put()
+        
+    def completed_redemption_catalogue_image_status(self, modified_by=None, default_redemption_catalogue_image=None):
+        modified_by_username    = None              
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+
+        
+        if is_empty(self.image_public_url):
+            self.image_public_url = default_redemption_catalogue_image
+          
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        self.completed_status       = program_conf.REDEMPTION_CATALOGUE_STATUS_UPLOAD_MATERIAL
+        self.put()      
+    
+    def add_redemption_catalogue_item(self, item_settings, modified_by=None):
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                
+        
+        catalogue_settings = self.catalogue_settings
+        
+        items = catalogue_settings.get('items')
+        if items is None:
+            items = []
+        
+        items.append(item_settings)
+        
+        catalogue_settings['items'] = items
+        
+        self.catalogue_settings     = catalogue_settings
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()
+    
+    @model_transactional(desc="update_redemption_catalogue_exclusivity")    
+    def update_redemption_catalogue_exclusivity(self, exclusivity_configuration, modified_by=None):
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                
+        
+        catalogue_settings = self.catalogue_settings
+        catalogue_settings['exclusivity'] = exclusivity_configuration
+        
+        self.catalogue_settings     = catalogue_settings
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.completed_status       = program_conf.REDEMPTION_CATALOGUE_STATUS_DEFINE_EXCLUSIVITY
+        
+        self.put()    
+        
+    
+    @model_transactional(desc="complete_adding_redemption_catalogue_item")
+    def complete_adding_redemption_catalogue_item(self, modified_by=None):
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        self.completed_status = program_conf.REDEMPTION_CATALOGUE_STATUS_DEFINE_ITEM
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()
+    
+    
+    @model_transactional(desc="publish_redemption_catalogue")
+    def publish_redemption_catalogue(self, modified_by=None):
+        modified_by_username = None
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+            self.modified_by            = modified_by.create_ndb_key()
+        
+        self.completed_status       = program_conf.REDEMPTION_CATALOGUE_STATUS_PUBLISH
+        self.published_datetime     = datetime.utcnow()
+        
+        self.modified_by_username   = modified_by_username
+        self.put()
+        
+        catalogue_configuration = self.to_configuration()
+        
+        logger.debug('catalogue_configuration=%s', catalogue_configuration)
+        
+        merchant_acct = self.merchant_acct
+        merchant_acct.update_published_redemption_catalogue(catalogue_configuration)
+    
+    @model_transactional(desc="enable redemption catalogue")
+    def enable(self, modified_by=None):
+        self.enabled = True
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+        
+        self.modified_by            = modified_by.create_ndb_key()
+        self.modified_by_username   = modified_by_username
+        
+        self.put()
+        
+        if self.is_published:
+            merchant_acct = self.merchant_acct
+            merchant_acct.update_published_redemption_catalogue(self.to_configuration())
+            
+            
+            
+        
+    @model_transactional(desc="disable redemption catalogue")
+    def disable(self, modified_by=None):
+        self.enabled = False
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                self.modified_by            = modified_by.create_ndb_key()
+                
+        self.modified_by_username   = modified_by_username
+        
+        self.put()  
+        
+        merchant_acct = self.merchant_acct
+        merchant_acct.remove_redeption_catalogue(self.key_in_str)
+        
+    @model_transactional(desc="archive redemption catal0gue")
+    def archive(self, modified_by=None):
+        self.archived = True
+        
+        modified_by_username = None
+        
+        if is_not_empty(modified_by):
+            if isinstance(modified_by, MerchantUser):
+                modified_by_username = modified_by.username
+                self.modified_by            = modified_by.create_ndb_key()
+                
+        self.modified_by_username   = modified_by_username
+        self.archived_datetime      = datetime.utcnow()
+        self.put()  
+        
+        merchant_acct = self.merchant_acct
+        merchant_acct.remove_redeption_catalogue(self.key_in_str)    
+        
+    def to_configuration(self):
+        catalogue_configuration = {
+                                'merchant_acct_key'                 : self.parent_key,
+                                'catalogue_key'                     : self.key_in_str,
+                                'label'                             : self.label,
+                                'desc'                              : self.desc,
+                                'redeem_reward_format'              : self.redeem_reward_format,
+                                'start_date'                        : self.start_date.strftime('%d-%m-%Y'),
+                                'end_date'                          : self.end_date.strftime('%d-%m-%Y'),    
+                                'items'                             : self.catalogue_settings.get('items'),
+                                'exclusivity'                       : self.catalogue_settings.get('exclusivity'),
+                                }
+        
+        return catalogue_configuration    
+        
+    @staticmethod
+    @model_transactional(desc="archive_redemption_catalogue")
+    def archive_redemption_catalogue(redemption_catalogue):
+        redemption_catalogue.archived = True
+        redemption_catalogue.archived_datetime = datetime.now()
+        redemption_catalogue.put()
+        
+        merchant_acct = redemption_catalogue.merchant_acct
+        merchant_acct.remove_archieve_redemption_catalogue(redemption_catalogue.key_in_str) 
+        
+    @staticmethod
+    def list_by_merchant_account(merchant_acct):
+        return RedemptionCatalogue.query(ndb.AND(RedemptionCatalogue.archived!=True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+    
+    @staticmethod
+    def list_archived_by_merchant_account(merchant_acct):
+        return RedemptionCatalogue.query(ndb.AND(RedemptionCatalogue.archived==True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)    

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/models/datastore/voucher_models.py

@@ -46,7 +46,6 @@ class VoucherBase(BaseNModel, DictModel):
     modified_by             = ndb.KeyProperty(name="modified_by", kind=MerchantUser)
     modified_by_username    = ndb.StringProperty(required=False)
     
-    published               = ndb.BooleanProperty(default=False)
     archived                = ndb.BooleanProperty(default=False)
     image_storage_filename  = ndb.StringProperty(required=False)
     image_public_url        = ndb.StringProperty(required=False)
@@ -263,7 +262,7 @@ class MerchantVoucher(VoucherBase):
         return merchant_voucher
     
     @staticmethod
-    def update_voucher_configuration_data(merchant_voucher, configuration=None, modified_by=None):
+    def update_voucher_configuration_data(merchant_voucher, configuration=None, modified_by=None, image_public_url=None):
         
         modified_by_username = None
         
@@ -275,6 +274,8 @@ class MerchantVoucher(VoucherBase):
         merchant_voucher.completed_status       = program_conf.VOUCHER_STATUS_CONFIGURATION
         merchant_voucher.modified_by            = modified_by.create_ndb_key()
         merchant_voucher.modified_by_username   = modified_by_username
+        if image_public_url:
+            merchant_voucher.image_public_url   = image_public_url
         
         merchant_voucher.put()
         
@@ -343,7 +344,12 @@ class MerchantVoucher(VoucherBase):
     
     @staticmethod
     def list_by_merchant_account(merchant_acct):
-        return MerchantVoucher.query(ndb.AND(MerchantVoucher.archived!=True), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+        vouchers_list = MerchantVoucher.query(ndb.AND(MerchantVoucher.completed_status==program_conf.VOUCHER_STATUS_PUBLISH), ancestor=merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)
+        final_list = []
+        for v in vouchers_list:
+            if v.archived==False:
+                final_list.append(v)
+        return final_list
     
     @staticmethod
     def list_archived_by_merchant_account(merchant_acct):

{trex-model-1.2.8 → trex-model-1.2.9}/trexmodel/program_conf.py

@@ -167,6 +167,8 @@ REWARD_FORMAT_DISCOUNT                  = 'discount'
 REWARD_FORMAT_PREPAID                   = 'prepaid'
 REWARD_FORMAT_MESSAGE                   = 'message'
 
+REDEEM_REWARD_FORMAT_GROUP              = (REWARD_FORMAT_POINT, REWARD_FORMAT_STAMP)
+
 REWARD_FORMAT_MAP = {
                 REWARD_FORMAT_POINT: 'points',
                 REWARD_FORMAT_STAMP: 'stamp',
@@ -265,14 +267,27 @@ ALL_PROGRAM_STATUS                            = (PROGRAM_STATUS_PROGRAM_BASE,
                                                  PROGRAM_STATUS_PUBLISH
                                                  )
 
-REDEMPTION_CATALOGUE_STATUS                   = (PROGRAM_STATUS_PROGRAM_BASE,
-                                                 PROGRAM_STATUS_DEFINE_ITEM,
-                                                 PROGRAM_STATUS_EXCLUSIVITY,
-                                                 PROGRAM_STATUS_PUBLISH
+REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE       = 'define_catalogue'
+REDEMPTION_CATALOGUE_STATUS_DEFINE_ITEM             = 'define_item'
+REDEMPTION_CATALOGUE_STATUS_UPLOAD_MATERIAL         = 'upload_material'
+REDEMPTION_CATALOGUE_STATUS_DEFINE_EXCLUSIVITY      = 'define_exclusivity'
+REDEMPTION_CATALOGUE_STATUS_REVIEW                  = 'review'
+REDEMPTION_CATALOGUE_STATUS_PUBLISH                 = 'published'
+
+
+REDEMPTION_CATALOGUE_STATUS                   = (
+                                                 REDEMPTION_CATALOGUE_STATUS_DEFINED_CATALOGUE,
+                                                 REDEMPTION_CATALOGUE_STATUS_DEFINE_ITEM,
+                                                 REDEMPTION_CATALOGUE_STATUS_UPLOAD_MATERIAL,
+                                                 REDEMPTION_CATALOGUE_STATUS_DEFINE_EXCLUSIVITY,
+                                                 REDEMPTION_CATALOGUE_STATUS_REVIEW,
+                                                 REDEMPTION_CATALOGUE_STATUS_PUBLISH
                                                  )
 
 
 
+
+
 PROGRAM_SCHEDULE_TYPE_DAILY             = 'daily'
 PROGRAM_SCHEDULE_TYPE_MONTH_START       = 'month_start'
 PROGRAM_SCHEDULE_TYPE_WEEKEND           = 'weekend'
@@ -418,6 +433,9 @@ def get_tier_reward_program_completed_status_index(completed_status):
 def get_lucky_draw_program_completed_status_index(completed_status):
     return LUCKY_DRAW_PROGRAM_STATUS.index(completed_status)
 
+def get_redemption_catalogue_completed_status_index(completed_status):
+    return REDEMPTION_CATALOGUE_STATUS.index(completed_status)
+
 def is_program_current_status_reach(checking_status, completed_status):
     completed_status_index  = get_program_completed_status_index(completed_status)
     checking_status_index   = get_program_completed_status_index(checking_status)
@@ -516,4 +534,7 @@ 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):
+    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)

trex-model-1.2.8/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -1,22 +0,0 @@
-'''
-Created on 25 Sep 2023
-
-@author: jacklok
-'''
-import logging
-from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
-from google.cloud import ndb
-from datetime import datetime
-import trexmodel.conf as model_conf
-from trexmodel import program_conf
-
-logger = logging.getLogger('model')
-
-class RedemptionCatalogue(BaseNModel, DictModel):
-    label                   = ndb.StringProperty(required=True)
-    desc                    = ndb.StringProperty(required=False)
-    completed_status        = ndb.StringProperty(required=True, choices=set(program_conf.REDEMPTION_CATALOGUE_STATUS))
-    start_date              = ndb.DateProperty(required=True)
-    end_date                = ndb.DateProperty(required=True)
-    
-