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

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

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

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

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

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

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/conf.py

@@ -7,7 +7,7 @@ MAX_FETCH_RECORD_FULL_TEXT_SEARCH_PER_PAGE      = 10
 MAX_FETCH_RECORD                                = 99999999
 MAX_FETCH_IMAGE_RECORD                          = 100
 MAX_CHAR_RANDOM_UUID4                           = 20
-PAGINATION_SIZE                                 = 2
+PAGINATION_SIZE                                 = 10
 VISIBLE_PAGE_COUNT                              = 10
 
 DEFAULT_GMT_HOURS                               = 8
@@ -34,8 +34,9 @@ MESSAGE_CATEGORY_PROMOTION          = 'promotion'
 MESSAGE_CATEGORY_SURVEY             = 'survey'
 MESSAGE_CATEGORY_SYSTEM             = 'system'
 MESSAGE_CATEGORY_REWARD             = 'reward'
+MESSAGE_CATEGORY_REDEEM             = 'redeem'
 
-MESSAGE_CATEGORIES = (MESSAGE_CATEGORY_ANNOUNCEMENT, MESSAGE_CATEGORY_ALERT, MESSAGE_CATEGORY_PROMOTION, MESSAGE_CATEGORY_SURVEY, MESSAGE_CATEGORY_SYSTEM, MESSAGE_CATEGORY_REWARD)
+MESSAGE_CATEGORIES = (MESSAGE_CATEGORY_ANNOUNCEMENT, MESSAGE_CATEGORY_ALERT, MESSAGE_CATEGORY_PROMOTION, MESSAGE_CATEGORY_SURVEY, MESSAGE_CATEGORY_SYSTEM, MESSAGE_CATEGORY_REWARD, MESSAGE_CATEGORY_REDEEM)
 
 MESSAGE_STATUS_NEW      = 'n'
 MESSAGE_STATUS_READ     = 'r'
@@ -50,3 +51,5 @@ USER_STATUS_SET = (USER_STATUS_REGISTERED, USER_STATUS_ENTER_BIODATA, USER_STATU
 
 MESSAGE_STATUS_SET      = (MESSAGE_STATUS_NEW, MESSAGE_STATUS_READ)
 
+PREPAID_REDEEM_URL          = os.environ['PREPAID_REDEEM_URL']
+

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/models/datastore/loyalty_models.py

@@ -28,9 +28,19 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
     activated_datetime      = ndb.DateTimeProperty(required=False)
     testing                 = ndb.BooleanProperty(required=False, default=False)
+    device_details          = ndb.JsonProperty()
     
     dict_properties = ['device_name', 'activation_code', 'device_id', 'activated', 'assigned_outlet_key', 
-                       'activated_datetime', 'created_datetime']
+                       'activated_datetime', 'created_datetime', 'device_details']
+    
+    @property
+    def device_tokens_list(self):
+        if self.device_details:
+            _tokens_list = []
+            for k,v in self.device_details.items():
+                for dd in v:
+                    _tokens_list.append(dd.get('device_token'))
+        return _tokens_list
     
     @property
     def is_test_setting(self):
@@ -135,3 +145,42 @@ class LoyaltyDeviceSetting(BaseNModel,DictModel):
             return True
         else:
             return False
+        
+    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()    

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/models/datastore/message_model_helper.py

@@ -5,11 +5,20 @@ Created on 9 Nov 2023
 '''
 from trexmodel.program_conf import REWARD_FORMAT_MAP, REWARD_FORMAT_PREPAID
 from trexmodel.models.datastore.message_models import Message
-from trexmodel.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW
+from trexmodel.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW,\
+    MESSAGE_CATEGORY_REDEEM
+from trexmodel import program_conf
+from babel.numbers import format_currency
+import logging
+
+
+logger = logging.getLogger('helper')
 
 entitled_reward_message_template = '''{amount} {reward_format}'''
                                     
 entitled_voucher_message_template = '''{amount} voucher - {label}'''
+
+redeemed_voucher_message_template = '''{amount} voucher - {label}'''
                                     
 entitled_lucky_draw_message_template = '''{amount} lucky draw ticket(s)'''                                                                        
 
@@ -131,34 +140,70 @@ message_logo_image_template = '''
 
 
 def create_transaction_message(customer_transaction):
-    user_acct = customer_transaction.transact_user_acct
-    message = Message(
-                message_to          = user_acct.create_ndb_key(),
-                title               = 'Transaction Reward',
-                message_category    = MESSAGE_CATEGORY_REWARD,
-                message_content     = __create_entiled_message_from_customer_transaction(customer_transaction),
-                message_data        = __create_message_data_from_transaction(customer_transaction),
-                status              = MESSAGE_STATUS_NEW,
-                
-                )
-    message.put()
-    user_acct.new_message_count+=1
-    user_acct.put()
+    user_acct   = customer_transaction.transact_user_acct
+    source_key  = customer_transaction.key_in_str
+    message     = Message.get_by_source_key(source_key)
+    
+    if message is None:
+        message = Message(
+                    message_to          = user_acct.create_ndb_key(),
+                    title               = 'Transaction Reward',
+                    message_category    = MESSAGE_CATEGORY_REWARD,
+                    message_content     = __create_entiled_message_from_customer_transaction(customer_transaction),
+                    message_data        = __create_message_data_from_transaction(customer_transaction),
+                    status              = MESSAGE_STATUS_NEW,
+                    
+                    )
+        message.put()
+        user_acct.new_message_count+=1
+        user_acct.put()
+        
+    return message
+    
+def create_redemption_message(customer_redemption):
+    user_acct       = customer_redemption.redeemed_user_acct
+    merchant_acct   = customer_redemption.redeemed_merchant_acct
+    source_key      = customer_redemption.key_in_str
+    message = Message.get_by_source_key(source_key)
+    
+    if message is None:
+        message = Message(
+                    source_key          = source_key,
+                    message_to          = user_acct.create_ndb_key(),
+                    title               = 'Redemption',
+                    message_category    = MESSAGE_CATEGORY_REDEEM,
+                    message_content     = __create_message_from_redeem_transaction(merchant_acct, customer_redemption),
+                    message_data        = __create_message_data_from_transaction(customer_redemption),
+                    status              = MESSAGE_STATUS_NEW,
+                    
+                    )
+        message.put()
+        user_acct.new_message_count+=1
+        user_acct.put()
+            
+    return message
     
 def create_redeem_catalogue_item_message(customer, entitled_vouchers_summary, redemption_catalogue_transaction):
-    user_acct = customer.registered_user_acct
-    message = Message(
-                message_to          = user_acct.create_ndb_key(),
-                title               = 'Redemption Catalogue Reward',
-                message_category    = MESSAGE_CATEGORY_REWARD,
-                message_content     = __create_message_from_redeem_catalogue_transaction(customer, entitled_vouchers_summary),
-                message_data        = __create_message_data_from_redemption_catalogue(redemption_catalogue_transaction),
-                status              = MESSAGE_STATUS_NEW,
-                
-                )
-    message.put()
-    user_acct.new_message_count+=1
-    user_acct.put()    
+    user_acct   = customer.registered_user_acct
+    source_key  = redemption_catalogue_transaction.key_in_str
+    message     = Message.get_by_source_key(source_key)
+    
+    if message is None:
+        message = Message(
+                    
+                    message_to          = user_acct.create_ndb_key(),
+                    title               = 'Redemption Catalogue Reward',
+                    message_category    = MESSAGE_CATEGORY_REWARD,
+                    message_content     = __create_message_from_redeem_catalogue_transaction(customer, entitled_vouchers_summary),
+                    message_data        = __create_message_data_from_redemption_catalogue(redemption_catalogue_transaction),
+                    status              = MESSAGE_STATUS_NEW,
+                    
+                    )
+        message.put()
+        user_acct.new_message_count+=1
+        user_acct.put()  
+    
+    return message  
 
 def __create_message_data_from_transaction(customer_transaction):
     return {
@@ -201,23 +246,6 @@ def __create_entiled_message_from_customer_transaction(customer_transaction):
                                     'font-size' : 20,
                                     })
     
-    merchant_logo_content = message_logo_image_template.format(merchant_logo= merchant_logo,)
-    merchant_name = merchant_acct.company_name
-    '''    
-    html_content =  entitled_messages_template.format(
-                                        message_list            = ''.join(message_list), 
-                                        merchant_logo           = merchant_name, 
-                                        #message_banner_image    = message_banner_image_template,
-                                        message_banner_image    = '', 
-                                        #message_congrat_image   = message_congrat_image_template,
-                                        message_congrat_image   = '',
-                                        )
-    
-    return {
-            'type'      : 'html',
-            'content'   : html_content,
-            }
-    '''
     return {
             'type'      : 'json',
             'content'   : {
@@ -287,9 +315,6 @@ def __create_message_from_redeem_catalogue_transaction(customer, entitled_vouche
                                     'font-size' : 20,
                                     })
     
-    merchant_logo_content = message_logo_image_template.format(merchant_logo= merchant_logo,)
-    merchant_name = merchant_acct.company_name    
-    
     return {
             'type'      : 'json',
             'content'   : {
@@ -338,7 +363,57 @@ def __create_message_from_redeem_catalogue_transaction(customer, entitled_vouche
                                 ]
                             }
         }    
+
+def __create_message_from_redeem_transaction(merchant_acct, customer_redemption):
+
+    messages_list   = []
+    
+    message_list    = []
+    #merchant_logo   = merchant_acct.logo_public_url
+    brand_name      = merchant_acct.brand_name
+    
+    messages_for_json_list = []
+    
+    messages_list.extend(__create_customer_redemption_message(customer_redemption))
     
+    for message in messages_list:
+        message_list.append('<li class="pt-2">{message}</li>'.format(message=message))
+        messages_for_json_list.append({
+                                    'type'      : 'text',
+                                    'value'     : message,
+                                    'font-size' : 20,
+                                    })
+    
+    return {
+            'type'      : 'json',
+            'content'   : {
+                            'header':[
+                                    {
+                                    'type': 'text',
+                                    'value': 'Redemption'
+                                    
+                                    },
+                                ],
+                            'title':[
+                                        {
+                                        'type':'text',
+                                        'value': __create_customer_redemption_title(customer_redemption),
+                                        'font-size': 25,
+                                        }
+                                    ],
+                            
+                            'body':messages_for_json_list,
+                            
+                            'footer':[
+                                
+                                    {
+                                        'type':'text',
+                                        'value': 'To %s' % brand_name,
+                                        'font-size': 25,
+                                    }
+                                ]
+                            }
+            }    
     
 def __create_entitled_reward_message(customer_transaction):    
     entitled_reward_summary             = customer_transaction.entitled_reward_summary
@@ -389,6 +464,46 @@ def __create_entitled_voucher_message_from_entitled_voucher_summary(entitled_vou
             
     return entitled_messages_list
 
+def __create_customer_redemption_message(customer_redemption):
+    messages_list = []    
+    if customer_redemption.reward_format == program_conf.FEATURE_CODE_PREPAID_REWARD_FORMAT:
+        merchant_acct = customer_redemption.redeemed_merchant_acct
+        
+        logger.debug('redeemed_amount=%d', customer_redemption.redeemed_amount)
+        logger.debug('currency_code=%s', merchant_acct.currency_code)
+        
+        formated_redeem_amount = format_currency(customer_redemption.redeemed_amount, 
+                                                 merchant_acct.currency_code,
+                                                 u'#,##0.00',
+                                                 locale='en_US',
+                                                 currency_digits=False,
+                                                 )
+        logger.debug('formated_redeem_amount=%s', formated_redeem_amount)
+        
+        messages_list.append("%s prepaid" % (formated_redeem_amount))
+        
+    elif customer_redemption.reward_format == program_conf.FEATURE_CODE_VOUCHER_REWARD_FORMAT:
+        redeemed_summary = customer_redemption.redeemed_summary
+        redeemed_vouchers_list = redeemed_summary.get('voucher').get('vouchers')
+        for voucher_key, voucher_details in redeemed_vouchers_list.items():
+            
+            messages_list.append(
+                    redeemed_voucher_message_template.format(
+                        label           = voucher_details.get('label'),
+                        amount          = voucher_details.get('amount'),
+                        )
+                    )
+        
+    return messages_list
+
+def __create_customer_redemption_title(customer_redemption):
+    
+    if customer_redemption.reward_format == program_conf.FEATURE_CODE_PREPAID_REWARD_FORMAT:
+        return "You have paid"
+        
+    elif customer_redemption.reward_format == program_conf.FEATURE_CODE_VOUCHER_REWARD_FORMAT:
+        return "You have redeemed"
+
 def __create_entitled_lucky_draw_ticket_message(customer_transaction):    
     entitled_lucky_draw_ticket_summary             = customer_transaction.entitled_lucky_draw_ticket_summary
     entitled_messages_list = [

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/models/datastore/message_models.py

@@ -34,6 +34,7 @@ content_body=[text in html]
 
 class Message(BaseNModel, DictModel):
     message_to              = ndb.KeyProperty(name="message_to", kind=User)
+    source_key              = ndb.StringProperty(required=False)
     title                   = ndb.StringProperty(required=True)
     message_category        = ndb.StringProperty(required=True, default=MESSAGE_CATEGORY_SYSTEM, choices=MESSAGE_CATEGORIES)
     message_content         = ndb.JsonProperty(required=True, indexed=False)
@@ -44,7 +45,7 @@ class Message(BaseNModel, DictModel):
     email_sent_datetime     = ndb.DateTimeProperty(required=False)
 
     dict_properties = [
-                        'message_to', 'title', 'message_category', 'message_content', 'message_data', 'status', 'created_datetime'
+                        'source_key', 'message_to', 'title', 'message_category', 'message_content', 'message_data', 'status', 'created_datetime'
                     ]
 
     @property
@@ -59,8 +60,9 @@ class Message(BaseNModel, DictModel):
             return  CustomerTransaction.fetch(customer_transaction_key) 
     
     @staticmethod
-    def create(message_to=None, title=None, message_type=MESSAGE_CATEGORY_ANNOUNCEMENT,message_content={}):
+    def create(source_key=None, message_to=None, title=None, message_type=MESSAGE_CATEGORY_ANNOUNCEMENT,message_content={}):
         Message(
+            source_key      = source_key,
             message_to      = message_to.create_ndb_key(),
             title           = title,
             message_type    = message_type,
@@ -99,5 +101,7 @@ class Message(BaseNModel, DictModel):
         return Message.list_all_with_condition_query(query, limit=limit, start_cursor=start_cursor, return_with_cursor=True, keys_only=False)
     
 
-            
+    @staticmethod
+    def get_by_source_key(source_key):
+        return  Message.query(ndb.AND(Message.source_key==source_key)).get()
     

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/models/datastore/prepaid_models.py

@@ -9,14 +9,16 @@ from trexmodel.models.datastore.user_models import User
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet, MerchantUser
 import logging, json
 from trexmodel import conf, program_conf
-from trexlib.utils.string_util import random_string
+from trexlib.utils.string_util import random_string, random_number, is_not_empty
 from datetime import datetime, timedelta
 import trexmodel.conf as model_conf
 from trexlib.utils.common.common_util import sort_dict_list
 from trexmodel.utils.model.model_util import generate_transaction_id
 from dateutil.relativedelta import relativedelta
+from trexmodel.program_conf import PRODUCT_TYPES, LOYALTY_PRODUCT
+from trexlib.utils.crypto_util import encrypt
 
-logger = logging.getLogger('debug')
+logger = logging.getLogger('model')
 
 class PrepaidSettings(BaseNModel,DictModel):
     '''
@@ -185,6 +187,160 @@ class PrepaidSettings(BaseNModel,DictModel):
         merchant_acct.remove_prepaid_program_configuration(prepaid_settings.key_in_str)
         merchant_acct.put()    
 
+class PrepaidRedeemSettings(BaseNModel,DictModel):
+    '''
+    Merchant acct as ancestor
+    '''
+    label                               = ndb.StringProperty(required=True)
+    device_activation_code              = ndb.StringProperty(required=True)
+    device_type                         = ndb.StringProperty(required=False, default=LOYALTY_PRODUCT, choices=set(PRODUCT_TYPES))
+    assigned_outlet                     = ndb.KeyProperty(name="assigned_outlet", kind=Outlet)
+    testing                             = ndb.BooleanProperty(required=False, default=False)
+    
+    redeem_code                         = ndb.StringProperty(required=True)
+    
+    created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    modified_datetime                   = ndb.DateTimeProperty(required=True, auto_now=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)
+    
+    
+    dict_properties = [
+                        'label', 'redeem_code', 'redeem_url', 'device_activation_code', 'device_type', 'assigned_outlet_key', 'created_datetime', 'modified_datetime',
+                    ]
+    
+    @property
+    def is_test_setting(self):
+        return self.testing
+    
+    @property
+    def assigned_outlet_key(self):
+        return self.assigned_outlet.urlsafe().decode('utf-8')
+    
+    @property
+    def assigned_outlet_entity(self):
+        return Outlet.fetch(self.assigned_outlet_key)
+    
+    @property
+    def merchant_acct_entity(self):
+        return MerchantAcct.fetch(self.key.parent().urlsafe())
+    
+    @property
+    def redeem_url(self):
+        encrypted_redeem_code = encrypt(self.redeem_code)
+        return conf.PREPAID_REDEEM_URL.format(code=encrypted_redeem_code)
+    
+    @property
+    def is_loyalty_device(self):
+        if self.device_type == program_conf.LOYALTY_PRODUCT:
+            return True
+        return False
+    
+    @staticmethod
+    def create(merchant_acct, label, assigned_outlet, device_activation_code=None, testing=False, 
+               created_by=None
+               ):
+        
+        created_by_username = None
+        if is_not_empty(created_by):
+            if isinstance(created_by, MerchantUser):
+                created_by_username = created_by.username
+        
+        redeem_code = random_number(24)
+        checking_redeem_setting = PrepaidRedeemSettings.get_by_redeem_code(redeem_code)
+        regenerate_redeem_code = False
+        
+        if checking_redeem_setting:
+            regenerate_redeem_code = True
+        
+        while(regenerate_redeem_code):
+            redeem_code = random_number(24)
+            checking_redeem_setting = PrepaidRedeemSettings.get_by_redeem_code(redeem_code)
+            if checking_redeem_setting==None:
+                regenerate_redeem_code = False
+                
+        prepaid_redeem_settings = PrepaidRedeemSettings(
+                                        parent                  = merchant_acct.create_ndb_key(),
+                                        assigned_outlet         = assigned_outlet.create_ndb_key(),
+                                        label                   = label,
+                                        redeem_code             = redeem_code,
+                                        testing                 = testing, 
+                                        device_activation_code  = device_activation_code,
+                                        
+                                        created_by              = created_by.create_ndb_key(),
+                                        created_by_username     = created_by_username,   
+                                    )
+        
+        prepaid_redeem_settings.put()
+        
+        return prepaid_redeem_settings
+        
+    @staticmethod
+    def update(prepaid_redeem_settings_key, label, assigned_outlet, device_activation_code=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
+        
+        prepaid_redeem_settings = PrepaidRedeemSettings.fetch(prepaid_redeem_settings_key)
+        
+        prepaid_redeem_settings.label                   = label
+        prepaid_redeem_settings.device_activation_code  = device_activation_code
+        prepaid_redeem_settings.assigned_outlet         = assigned_outlet.create_ndb_key()
+        prepaid_redeem_settings.modified_by             = modified_by.create_ndb_key()
+        prepaid_redeem_settings.modified_by_username    = modified_by_username
+        
+        prepaid_redeem_settings.put()
+        
+        return prepaid_redeem_settings    
+    
+    @staticmethod
+    def remove(prepaid_redeem_settings_key):
+        prepaid_redeem_settings = PrepaidRedeemSettings.fetch(prepaid_redeem_settings_key)
+        if prepaid_redeem_settings:
+            prepaid_redeem_settings.delete()
+    
+    @staticmethod
+    def get_by_redeem_code(redeem_code):
+        return PrepaidRedeemSettings.query(PrepaidRedeemSettings.redeem_code ==redeem_code).get()
+    
+    @staticmethod
+    def list_by_merchant_account_and_assigned_outlet(merchant_acct, assigned_outlet, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):
+        query = PrepaidRedeemSettings.query(ndb.AND(
+                        PrepaidRedeemSettings.assigned_outlet==assigned_outlet.create_ndb_key()
+                        ),ancestor=merchant_acct.create_ndb_key())
+        
+        return PrepaidRedeemSettings.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+    
+    @staticmethod
+    def count_by_merchant_account_and_assigned_outlet(merchant_acct, assigned_outlet):
+        query = PrepaidRedeemSettings.query(ndb.AND(
+                        PrepaidRedeemSettings.assigned_outlet==assigned_outlet.create_ndb_key()
+                        ),ancestor=merchant_acct.create_ndb_key())
+        
+        return PrepaidRedeemSettings.count_with_condition_query(query)
+    
+    @staticmethod
+    def list_by_merchant_account(merchant_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False):
+        query = PrepaidRedeemSettings.query(ancestor=merchant_acct.create_ndb_key())
+        
+        return PrepaidRedeemSettings.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+    
+    @staticmethod
+    def count_by_merchant_acct(merchant_acct):
+        if merchant_acct:
+            query = PrepaidRedeemSettings.query(ancestor=merchant_acct.create_ndb_key())
+        else:
+            query = PrepaidRedeemSettings.query()
+        
+        return PrepaidRedeemSettings.count_with_condition_query(query)
+    
 class CustomerPrepaidReward(BaseNModel,DictModel):
     '''
     Customer acct as ancestor

{trex-model-1.2.19 → trex-model-1.3.1}/trexmodel/models/datastore/redeem_models.py

@@ -62,7 +62,7 @@ class CustomerRedemption(BaseNModel, DictModel):
     redeemed_amount             = ndb.FloatProperty(required=True, default=1)
     
     redeemed_summary            = ndb.JsonProperty(required=True)
-    
+    prepaid_redeem_code         = ndb.StringProperty(required=False)
     transaction_id              = ndb.StringProperty(required=True)
     invoice_id                  = ndb.StringProperty(required=False)
     remarks                     = ndb.StringProperty(required=False)
@@ -85,7 +85,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                                'redeemed_summary', 'redeemed_customer_acct', 'redeemed_outlet_details', 'redeemed_merchant_acct',
                                'redeemed_datetime', 'is_revert', 'allow_to_revert', 'redeemed_outlet',
                                'is_system_redemption', 'is_tier_program_redemption', 'tier_program_transaction_id',
-                               'redeemed_by_username', 'reverted_datetime', 'reverted_by_username',
+                               'redeemed_by_username', 'reverted_datetime', 'reverted_by_username', 'prepaid_redeem_code',
                                ]
     
     @staticmethod
@@ -100,6 +100,12 @@ class CustomerRedemption(BaseNModel, DictModel):
     def is_system_redemption(self):
         return self.is_tier_program_redemption
     
+    @property
+    def is_redeem_by_user(self):
+        if self.reward_format == program_conf.REWARD_FORMAT_PREPAID and is_not_empty(self.prepaid_redeem_code):
+            return True
+        return False
+    
     @property
     def allow_to_revert(self):
         return self.is_revert == False and self.is_tier_program_redemption==False
@@ -128,6 +134,10 @@ class CustomerRedemption(BaseNModel, DictModel):
     def redeemed_merchant_acct(self):
         return MerchantAcct.fetch(self.merchant_acct.urlsafe())
     
+    @property
+    def redeemed_user_acct(self):
+        return User.fetch(self.user_acct.urlsafe())
+    
     @property
     def redeemed_merchant_acct_key(self):
         return self.merchant_acct.urlsafe().decode('utf-8')
@@ -242,7 +252,7 @@ class CustomerRedemption(BaseNModel, DictModel):
     @staticmethod
     def create(customer, reward_format, redeemed_outlet=None, transaction_id=None, 
                redeemed_amount=1, is_tier_program_redemption=False, tier_program_transaction_id=None,
-               redeemed_voucher_keys_list=None, invoice_id=None, remarks=None, 
+               redeemed_voucher_keys_list=None, invoice_id=None, remarks=None, prepaid_redeem_code=None,
                redeemed_by=None, redeemed_datetime=None, redemption_catalogue_transction_summary=None):
         
         
@@ -256,7 +266,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                 redeemed_by_username = redeemed_by.username
 
         
-        redeem_transaction_id = transaction_id or generate_transaction_id(prefix='r')
+        redeem_transaction_id = transaction_id or generate_transaction_id(prefix='d')
         
         if redeemed_datetime is None:
             redeemed_datetime = datetime.utcnow()
@@ -552,7 +562,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                                                     reward_format               = reward_format,
                                                     redeemed_amount             = redeemed_amount,
                                                     redeemed_summary            = redeemed_summary,
-                                                    
+                                                    prepaid_redeem_code         = prepaid_redeem_code,
                                                     transaction_id              = redeem_transaction_id,
                                                     invoice_id                  = invoice_id,
                                                     remarks                     = remarks,

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

@@ -13,6 +13,8 @@ IMAGE_BASE_URL                          = os.environ.get('IMAGE_BASE_URL')
 POS_PRODUCT                                 = 'point_of_sales'
 LOYALTY_PRODUCT                             = 'loyalty'
 
+PRODUCT_TYPES                               = (POS_PRODUCT, LOYALTY_PRODUCT)
+
 POS_PACKAGE_DEFAULT                         = 'lite'
 POS_PACKAGE_STANDARD                        = 'standard'
 POS_PACKAGE_SCALE                           = 'scale'