trex-model 1.5.11__tar.gz → 1.5.13__tar.gz

{trex-model-1.5.11 → trex-model-1.5.13}/PKG-INFO

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

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

{trex-model-1.5.11 → trex-model-1.5.13}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.11 → trex-model-1.5.13}/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.11 → trex-model-1.5.13}/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)      

{trex-model-1.5.11 → trex-model-1.5.13}/trexmodel/models/datastore/message_model_helper.py

@@ -5,8 +5,9 @@ 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
+from trexconf.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW,\
+    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

{trex-model-1.5.11 → trex-model-1.5.13}/trexmodel/models/datastore/message_models.py

@@ -81,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