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

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

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

{trex_model-1.6.6 → 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.6',
+     version='1.6.7',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.6 → 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.6
+Version: 1.6.7
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok

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

@@ -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)
             

{trex_model-1.6.6 → 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.6 → 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):