trex-model 1.5.27__tar.gz → 1.6.0__tar.gz

{trex_model-1.5.27 → trex_model-1.6.0}/PKG-INFO

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

{trex_model-1.5.27 → trex_model-1.6.0}/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.27',
+     version='1.6.0',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.5.27 → trex_model-1.6.0}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.5.27 → trex_model-1.6.0}/trex_model.egg-info/SOURCES.txt

@@ -36,6 +36,7 @@ trexmodel/models/datastore/message_model_helper.py
 trexmodel/models/datastore/message_models.py
 trexmodel/models/datastore/model_decorators.py
 trexmodel/models/datastore/ndb_models.py
+trexmodel/models/datastore/partnership_models.py
 trexmodel/models/datastore/pos_models.py
 trexmodel/models/datastore/prepaid_models.py
 trexmodel/models/datastore/product_models.py

{trex_model-1.5.27 → trex_model-1.6.0}/trexmodel/models/datastore/customer_model_helpers.py

@@ -171,24 +171,25 @@ def update_reward_summary_with_new_reward(existing_reward_summary, new_reward_de
         
         found_program_reward_source = False
         
-        for reward_source in reward_source_list:
-            existing_reward_source_program_key = reward_source.get('program_key')
-            if existing_reward_source_program_key== program_key:
-                reward_source['amount']                 += reward_balance
-                reward_source['is_reach_reward_limit']  = is_reach_reward_limit
-                
-                found_program_reward_source = True
-                break
-
-        if found_program_reward_source==False:
-            reward_source_list.append(
-                                {
-                                'amount'                : reward_balance,
-                                'program_key'           : program_key, 
-                                'is_reach_reward_limit' : is_reach_reward_limit,
-
-                                }
-                            )
+        if program_key:
+            for reward_source in reward_source_list:
+                existing_reward_source_program_key = reward_source.get('program_key')
+                if existing_reward_source_program_key== program_key:
+                    reward_source['amount']                 += reward_balance
+                    reward_source['is_reach_reward_limit']  = is_reach_reward_limit
+                    
+                    found_program_reward_source = True
+                    break
+    
+            if found_program_reward_source==False:
+                reward_source_list.append(
+                                    {
+                                    'amount'                : reward_balance,
+                                    'program_key'           : program_key, 
+                                    'is_reach_reward_limit' : is_reach_reward_limit,
+    
+                                    }
+                                )
         
         if is_empty(reward_summary_by_reward_format):
             new_reward_amount = reward_balance

{trex_model-1.5.27 → trex_model-1.6.0}/trexmodel/models/datastore/customer_models.py

@@ -111,7 +111,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     
     @property
     def registered_merchant_acct(self):
-        return MerchantAcct.fetch(self.merchant_acct.urlsafe())
+        #return MerchantAcct.fetch(self.merchant_acct.urlsafe())
+        return self.merchant_acct.get()
     
     @property
     def registered_merchant_acct_key(self):
@@ -374,8 +375,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         customer.put()
         
     @classmethod
-    def create_from_user(cls, outlet, user_acct, merchant_reference_code=None):
-        merchant_acct       = outlet.merchant_acct_entity
+    def create_from_user(cls, outlet, user_acct, merchant_reference_code=None, merchant_acct=None):
+        registered_merchant_acct       = outlet.merchant_acct_entity if merchant_acct is None else merchant_acct
         created_customer    = cls(
                                parent=user_acct.create_ndb_key(),
                                #user_acct                = user_acct.create_ndb_key(),  
@@ -390,7 +391,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                                birth_date_date_str      = user_acct.birth_date_date_str, 
                                birth_day_in_year        = user_acct.birth_day_in_year,
                                merchant_reference_code  = merchant_reference_code,
-                               merchant_acct            = merchant_acct.create_ndb_key()
+                               merchant_acct            = registered_merchant_acct.create_ndb_key()
                            )
         
         created_customer.put()