trex-model 1.5.10__tar.gz → 1.5.12__tar.gz

{trex-model-1.5.10 → trex-model-1.5.12}/PKG-INFO

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

{trex-model-1.5.10 → trex-model-1.5.12}/setup.py

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

{trex-model-1.5.10 → trex-model-1.5.12}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.10 → trex-model-1.5.12}/trexmodel/conf.py

@@ -37,6 +37,7 @@ MESSAGE_CATEGORY_REWARD                 = 'reward'
 MESSAGE_CATEGORY_REFERRAL               = 'referral'
 MESSAGE_CATEGORY_BIRTHDAY               = 'birthday'
 MESSAGE_CATEGORY_REDEEM                 = 'redeem'
+MESSAGE_CATEGORY_PAYMENT                = 'payment'
 MESSAGE_CATEGORY_REDEMPTION_CATALOGUE   = 'redemption_catalogue'
 
 MESSAGE_CATEGORIES = (
@@ -48,6 +49,7 @@ MESSAGE_CATEGORIES = (
                         MESSAGE_CATEGORY_REWARD, 
                         MESSAGE_CATEGORY_REDEEM,
                         MESSAGE_CATEGORY_REDEMPTION_CATALOGUE,
+                        MESSAGE_CATEGORY_PAYMENT,
                         )
 
 MESSAGE_STATUS_NEW      = 'n'

{trex-model-1.5.10 → trex-model-1.5.12}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -37,7 +37,7 @@ from trexlib.utils.string_util import is_not_empty
 from trexlib.utils.log_util import get_tracelog
 from trexmodel.models.datastore.lucky_draw_models import LuckyDrawTicket
 from trexmodel.models.datastore.message_model_helper import create_transaction_message,\
-    create_redemption_message
+    create_redemption_message, create_payment_message
 from trexmodel.models.datastore.helper.reward_model_helpers import list_merchant_birthday_program_configuration
 from dateutil.relativedelta import relativedelta
 
@@ -668,7 +668,7 @@ def check_giveaway_reward_for_membership_purchase_transaction(customer_acct, tra
 
 def redeem_reward_transaction(customer, redeem_outlet=None, reward_format=None, reward_amount=.0, invoice_id=None, remarks=None, 
                             redeemed_by=None, redeemed_datetime=None, transaction_id=None, prepaid_redeem_code=None,
-                            redeemed_voucher_keys_list=None
+                            redeemed_voucher_keys_list=None,
                             ):
     logger.debug('---redeem_reward_transaction---')
     
@@ -701,6 +701,40 @@ def redeem_reward_transaction(customer, redeem_outlet=None, reward_format=None,
     else:
         raise Exception("Invalid reward format")
 
+def prepaid_payment_transaction(customer, redeem_outlet=None, reward_format=None, reward_amount=.0, invoice_id=None, remarks=None, 
+                            redeemed_by=None, redeemed_datetime=None, transaction_id=None, prepaid_redeem_code=None,
+                            
+                            ):
+    logger.debug('---prepaid_payment_transaction---')
+    
+    if reward_format in program_conf.REWARD_FORMAT_SET:
+    
+        @model_transactional(desc='redeem_reward_transaction')
+        def __start_transaction_for_customer_transaction():
+            
+            logger.debug('reward_format=%s', reward_format)
+            
+            customer_redemption = CustomerRedemption.create(customer, reward_format, 
+                                      redeemed_outlet               = redeem_outlet, 
+                                      redeemed_amount               = reward_amount,
+                                      prepaid_redeem_code           = prepaid_redeem_code,
+                                      invoice_id                    = invoice_id, 
+                                      transaction_id                = transaction_id,
+                                      remarks                       = remarks, 
+                                      redeemed_by                   = redeemed_by, 
+                                      redeemed_datetime             = redeemed_datetime,
+                                      )
+            
+            if customer_redemption:
+                create_payment_message(customer_redemption)
+                create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, streamed_datetime=redeemed_datetime)
+            
+            return customer_redemption
+            
+        return __start_transaction_for_customer_transaction()
+    else:
+        raise Exception("Invalid reward format") 
+
 def update_customer_reward_summary(customer):
     entitled_point_details_list     = CustomerPointReward.list_by_customer(customer)
     entitled_stamp_details_list     = CustomerStampReward.list_by_customer(customer)      
@@ -1238,7 +1272,8 @@ def _giveaway_birthday_reward_to_customer(customer, program_configuration, trans
         else:
             logger.debug('Skip, because it is test user account')    
             
-        logger.debug('------> Customer(%s) entitled before (%s) =%s %s', customer.name, program_desc)
+        logger.debug('------> Customer(%s) entitled before (%s)', customer.name, program_desc)
+        logger.debug('------> remarks=%s', remarks)
         
         if is_entitled_before == False:
             transaction_details = create_non_sales_system_transaction(customer, transact_datetime=transact_datetime, remarks=remarks)
@@ -1249,11 +1284,11 @@ def _giveaway_birthday_reward_to_customer(customer, program_configuration, trans
                                                                                 program_configuration_list  = [program_configuration], 
                                                                                 )
             Customer.update_customer_entitled_birthday_reward_summary(customer, program_key)
-            create_transaction_message(transaction_details, remarks=program_configuration.get('remarks'))
+            create_transaction_message(transaction_details, remarks=remarks, message_category=conf.MESSAGE_CATEGORY_BIRTHDAY)
         else:
             logger.info('Customer(%s) have entitled birthday reward (%s) on year %d', customer.name, program_desc, this_year)
     except:
-        logger.error('Failed to process for customer=%s', customer.name)
+        logger.error('Failed to process for customer=%s, due to %s', customer.name, get_tracelog())
         
 @model_transactional(desc="giveaway_membership_reward_to_customer")                
 def giveaway_membership_reward_to_customer(customer, program_configuration, transact_datetime, merchant_acct ):

{trex-model-1.5.10 → trex-model-1.5.12}/trexmodel/models/datastore/message_model_helper.py

@@ -6,7 +6,8 @@ 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,\
-    MESSAGE_CATEGORY_REDEEM, MESSAGE_CATEGORY_REDEMPTION_CATALOGUE
+    MESSAGE_CATEGORY_REDEEM, MESSAGE_CATEGORY_REDEMPTION_CATALOGUE,\
+    MESSAGE_CATEGORY_PAYMENT
 from trexconf import program_conf
 from babel.numbers import format_currency
 import logging
@@ -189,6 +190,30 @@ def create_redemption_message(customer_redemption):
             
     return message
 
+def create_payment_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(
+                    parent              = user_acct.create_ndb_key(),
+                    source_key          = source_key,
+                    message_to          = user_acct.create_ndb_key(),
+                    title               = 'Payment',
+                    message_category    = MESSAGE_CATEGORY_PAYMENT,
+                    message_content     = __create_message_from_redeem_transaction(merchant_acct, customer_redemption),
+                    message_data        = __create_message_data_from_redemption(customer_redemption),
+                    status              = MESSAGE_STATUS_NEW,
+                    message_from        = merchant_acct.brand_name, 
+                    )
+        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
@@ -253,8 +278,31 @@ def __create_entiled_message_from_customer_transaction(customer_transaction, rem
     
     messages_for_json_list = []
     
+    header_message_list = [
+                            {
+                            'type': 'image',
+                            'value': {
+                                        'url': 'https://storage.googleapis.com/augmigo-image-storage/app/customer-rewards-min.png',
+                                        'height': 100,
+                                    }
+                            
+                            },
+                            {
+                            'type': 'image',    
+                            'value': {
+                                    'url': 'https://storage.googleapis.com/augmigo-image-storage/app/congratulations-min.png',
+                                    'height': 80,
+                                    }
+                            
+                            },
+                        ]
+    
     if is_not_empty(remarks):
-        message_list.append('<p>{remarks}</p>'.format(remarks=remarks))
+        header_message_list.append({
+                                    'type'      : 'text',
+                                    'value'     : remarks,
+                                    'font-size' : 20,
+                                    })
     
     for message in entitled_messages_list:
         message_list.append('<li class="pt-2">{message}</li>'.format(message=message))
@@ -267,24 +315,7 @@ def __create_entiled_message_from_customer_transaction(customer_transaction, rem
     return {
             'type'      : 'json',
             'content'   : {
-                            'header':[
-                                    {
-                                    'type': 'image',
-                                    'value': {
-                                                'url': 'https://storage.googleapis.com/augmigo-image-storage/app/customer-rewards-min.png',
-                                                'height': 100,
-                                            }
-                                    
-                                    },
-                                    {
-                                    'type': 'image',    
-                                    'value': {
-                                            'url': 'https://storage.googleapis.com/augmigo-image-storage/app/congratulations-min.png',
-                                            'height': 80,
-                                            }
-                                    
-                                    },
-                                ],
+                            'header':header_message_list,
                             'title':[
                                         {
                                         'type':'text',

{trex-model-1.5.10 → trex-model-1.5.12}/trexmodel/models/datastore/message_models.py

@@ -10,12 +10,9 @@ from trexmodel.models.datastore.user_models import User
 from datetime import datetime
 import logging
 from trexconf import conf
-from trexmodel.conf import MESSAGE_STATUS_SET, MESSAGE_STATUS_NEW, MESSAGE_CATEGORY_SYSTEM,\
-    MESSAGE_STATUS_READ, MESSAGE_CATEGORIES, MESSAGE_CATEGORY_ANNOUNCEMENT
 from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.redeem_models import RedemptionCatalogueTransaction,\
     CustomerRedemption
-from trexmodel.models.datastore.customer_models import Customer
 
 
 logger = logging.getLogger('model')
@@ -38,11 +35,11 @@ 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_category        = ndb.StringProperty(required=True, default=conf.MESSAGE_CATEGORY_SYSTEM, choices=conf.MESSAGE_CATEGORIES)
     message_content         = ndb.JsonProperty(required=True, indexed=False)
     message_data            = ndb.JsonProperty(required=True, indexed=False)
     message_from            = ndb.StringProperty(required=False)
-    status                  = ndb.StringProperty(required=True, default=MESSAGE_STATUS_NEW, choices=MESSAGE_STATUS_SET)    
+    status                  = ndb.StringProperty(required=True, default=conf.MESSAGE_STATUS_NEW, choices=conf.MESSAGE_STATUS_SET)    
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
     read_datetime           = ndb.DateTimeProperty(required=False)
     email_sent_datetime     = ndb.DateTimeProperty(required=False)
@@ -76,7 +73,7 @@ class Message(BaseNModel, DictModel):
         
     
     @staticmethod
-    def create(user_acct, source_key=None, message_to=None, title=None, message_type=MESSAGE_CATEGORY_ANNOUNCEMENT, message_content={}):
+    def create(user_acct, source_key=None, message_to=None, title=None, message_type=conf.MESSAGE_CATEGORY_ANNOUNCEMENT, message_content={}):
         Message(
             parent          = user_acct.create_ndb_key(),
             source_key      = source_key,
@@ -84,7 +81,7 @@ class Message(BaseNModel, DictModel):
             title           = title,
             message_type    = message_type,
             message_content = message_content,
-            #created_datetime= datetime.utcnow(),
+            created_datetime= datetime.utcnow(),
             ).put()
     
     @staticmethod        
@@ -93,7 +90,7 @@ class Message(BaseNModel, DictModel):
         if message:
             user_acct = message.user_acct_entity
             logger.debug('found message title=%s', message.title)
-            message.status = MESSAGE_STATUS_READ
+            message.status = conf.MESSAGE_STATUS_READ
             message.read_datetime = datetime.utcnow()
             message.put()
             '''