trex-model 1.6.5__tar.gz → 1.6.7__tar.gz

{trex_model-1.6.5 → trex_model-1.6.7}/PKG-INFO

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

{trex_model-1.6.5 → trex_model-1.6.7}/setup.py

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

{trex_model-1.6.5 → trex_model-1.6.7}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.5 → trex_model-1.6.7}/trex_model.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ trexmodel/models/datastore/voucher_models.py
 trexmodel/models/datastore/helper/__init__.py
 trexmodel/models/datastore/helper/reward_model_helpers.py
 trexmodel/models/datastore/helper/reward_transaction_helper.py
+trexmodel/models/datastore/helper/sales_transaction_helpers.py
 trexmodel/utils/__init__.py
 trexmodel/utils/gcloud/__init__.py
 trexmodel/utils/gcloud/datastore_util.py

{trex_model-1.6.5 → trex_model-1.6.7}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -19,14 +19,14 @@ from trexmodel.models.datastore.customer_model_helpers import update_customer_en
     update_customer_entiteld_voucher_summary_with_customer_new_voucher,\
     update_prepaid_summary_with_reverted_prepaid,\
     update_reward_summary_with_reverted_reward
-from trexanalytics.bigquery_upstream_data_config import create_merchant_customer_reward_reverted_upstream_for_merchant,\
-    create_merchant_customer_transaction_upstream_for_merchant,\
+from trexanalytics.bigquery_upstream_data_config import create_merchant_customer_transaction_upstream_for_merchant,\
     create_merchant_customer_redemption_upstream_for_merchant,\
     create_merchant_customer_prepaid_upstream_for_merchant,\
     create_merchant_customer_redemption_reverted_upstream_for_merchant,\
     create_revert_entitled_customer_voucher_upstream_for_merchant,\
     create_redeemed_customer_voucher_to_upstream_for_merchant,\
-    create_merchant_sales_transaction_upstream_for_merchant
+    create_merchant_sales_transaction_upstream_for_merchant,\
+    create_merchant_customer_reward_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -221,13 +221,13 @@ def create_reward_transaction(customer, transact_outlet=None, sales_amount=.0, t
         
     return __start_transaction_for_customer_transaction()
 
-def give_reward_from_sales_transaction(customer, sales_transaction, for_testing=False):
+def give_reward_from_sales_transaction(customer, sales_transaction, for_testing=False, ):
     
     logger.debug('---give_reward_from_sales_transaction---')
     
     @model_transactional(desc='give_reward_from_sales_transaction')
     def __start_transaction(customer, sales_transaction):
-        customer_transaction = CustomerTransaction.create_from_sales_transaction(customer, sales_transaction, for_testing=for_testing)
+        customer_transaction = CustomerTransaction.create_from_sales_transaction(customer, sales_transaction, for_testing=for_testing,)
         if for_testing==False:
             trigger_check_reward_success = trigger_spending_reward_for_transaction(customer_transaction)
             
@@ -831,7 +831,8 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
     merchant_acct                       = transaction_details.transact_merchant_acct
     transaction_id                      = transaction_details.transaction_id
     customer_acct                       = transaction_details.transact_customer_acct
-        
+    is_from_instant_transaction         = transaction_details.is_from_instant_transaction
+    
     if transaction_details.is_membership_purchase:
         #remove membership
         
@@ -941,18 +942,12 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
             
             create_merchant_customer_transaction_upstream_for_merchant(transaction_details, Reverted=True)
             
-            if transaction_details.is_sales_transaction:
+            if transaction_details.is_from_instant_transaction:
                 sales_transaction = SalesTransaction.get_by_transaction_id(transaction_id)
                 
                 if sales_transaction:
-                    sales_transaction.is_revert                  = True
-                    sales_transaction.reverted_datetime          = reverted_datetime
-                    sales_transaction.reverted_by                = reverted_by_key
-                    sales_transaction.reverted_by_username       = reverted_by.username
+                    sales_transaction.used                  = False
                     sales_transaction.put()
-                    
-                    create_merchant_sales_transaction_upstream_for_merchant(sales_transaction, Reverted=True)
-                
             
             if is_stamp_entitled_in_transaction or is_point_entitled_in_transaction or is_voucher_entitled_in_transaction or is_prepaid_entitled_in_transaction:
                 for p in reverting_point_details_list:
@@ -965,7 +960,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, p, Reverted=True)
                         
                     
                 for p in reverting_stamp_details_list:
@@ -978,7 +973,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_reward_summary = update_reward_summary_with_reverted_reward(customer_reward_summary, p.to_reward_summary())
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, p, Reverted=True)
                     
                 for p in reverting_vouchers_list:
                     if p.is_valid:
@@ -998,7 +993,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         voucher_reward_brief = VoucherRewardDetailsForUpstreamData(voucher_key, 1, expiry_date, rewarded_datetime)
                         if create_upstream:
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, voucher_reward_brief, reverted_datetime)
+                            create_merchant_customer_reward_upstream_for_merchant(transaction_details, voucher_reward_brief, Reverted=True)
                 
                 for p in reverting_prepaid_list:
                     if p.is_valid:
@@ -1010,8 +1005,7 @@ def revert_transaction(transaction_details, reverted_by, reverted_datetime=None,
                         
                         customer_prepaid_summary = update_prepaid_summary_with_reverted_prepaid(customer_prepaid_summary, p.to_prepaid_summary())
                         if create_upstream:
-                            #create_merchant_customer_prepaid_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
-                            create_merchant_customer_reward_reverted_upstream_for_merchant(transaction_details, p, reverted_datetime)
+                            create_merchant_customer_prepaid_upstream_for_merchant(transaction_details, p, Reverted=True)
                 
                 
             

trex_model-1.6.7/trexmodel/models/datastore/helper/sales_transaction_helpers.py

@@ -0,0 +1,33 @@
+'''
+Created on 23 Jun 2025
+
+@author: jacklok
+'''
+import logging
+from datetime import datetime
+from trexanalytics.bigquery_upstream_data_config import create_merchant_sales_transaction_upstream_for_merchant
+
+#logger = logging.getLogger('helper')
+logger = logging.getLogger('target_debug')
+
+def revert_sales_transaction(transaction_details, reverted_by, reverted_datetime=None):
+    
+    if transaction_details.is_revert==False and transaction_details.allow_to_revert and transaction_details.used==False:
+        logger.info('going to check for sales transaction revert')
+        
+        if reverted_datetime is None:
+            reverted_datetime = datetime.utcnow()
+        
+        if reverted_by:
+            transaction_details.reverted_by                = reverted_by.create_ndb_key()
+            transaction_details.reverted_by_username       = reverted_by.username
+        
+        transaction_details.reverted_datetime   = reverted_datetime
+        transaction_details.is_revert = True
+        transaction_details.put()
+        
+        create_merchant_sales_transaction_upstream_for_merchant(transaction_details, Reverted=True)
+        
+    else:
+        logger.error('Sales transaction is either reverted or not allow to revert or it has been claimed by customer')
+        raise Exception('Sales transaction is either reverted or not allow to revert or it has been claimed by customer')

{trex_model-1.6.5 → trex_model-1.6.7}/trexmodel/models/datastore/merchant_models.py

@@ -1606,6 +1606,7 @@ class Outlet(BusinessEntity, FullTextSearchable):
     fax_phone                       = ndb.StringProperty(required=False)
     email                           = ndb.StringProperty(required=False)
     business_hour                   = ndb.StringProperty(required=False)
+    
     is_physical_store               = ndb.BooleanProperty(required=False, default=True)
     geo_location                    = ndb.GeoPtProperty(required=False)
     created_datetime                = ndb.DateTimeProperty(required=True, auto_now_add=True)
@@ -1732,7 +1733,7 @@ class Outlet(BusinessEntity, FullTextSearchable):
                office_phone=None, business_hour=None, geo_location=None, is_physical_store=True, id=None, 
                is_headquarter=False,
                ):
-        
+        logger.info('is_headquarter=%s', is_headquarter)
         outlet_limit = merchant_acct.outlet_limit
         
         total_count = Outlet.count_by_merchant_account(merchant_acct)

{trex_model-1.6.5 → trex_model-1.6.7}/trexmodel/models/datastore/model_decorators.py

@@ -12,7 +12,7 @@ from trexlib.utils.log_util import get_tracelog
 logger = logging.getLogger('model')
 
 def model_transactional(
-        retries = 1,
+        retries = 3,
         read_only=False,
         join=True,
         xg=True,
@@ -20,7 +20,7 @@ def model_transactional(
         desc=None):
     
     if desc is None:
-        desc='modeal transaction'
+        desc='model transaction'
     
     
     def transactional_wrapper(wrapped):