trex-model 1.5.3__tar.gz → 1.5.5__tar.gz

{trex-model-1.5.3 → trex-model-1.5.5}/PKG-INFO

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

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

{trex-model-1.5.3 → trex-model-1.5.5}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.3 → trex-model-1.5.5}/trexmodel/models/datastore/customer_model_helpers.py

@@ -195,7 +195,8 @@ def update_customer_entiteld_voucher_summary_with_new_voucher_info(customer_enti
     if voucher_summary:
         logger.debug('Found voucher summary, thus going to add new redeem info')
         customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'].extend(redeem_info_list)
-        customer_entitled_voucher_summary[merchant_voucher_key]['amount'] = len(customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'])
+        customer_entitled_voucher_summary[merchant_voucher_key]['count']    = len(customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'])
+        customer_entitled_voucher_summary[merchant_voucher_key]['amount']   = len(customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'])
           
     else:
         logger.debug('Not found voucher summary, thus going to create it')
@@ -261,6 +262,7 @@ def update_customer_entiteld_voucher_summary_after_removed_voucher(customer_enti
             else:
                 customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'] = new_redeem_info_list
                 customer_entitled_voucher_summary[merchant_voucher_key]['count']            = len(new_redeem_info_list)
+                customer_entitled_voucher_summary[merchant_voucher_key]['amount']           = len(new_redeem_info_list)
                 
     return customer_entitled_voucher_summary
     

{trex-model-1.5.3 → trex-model-1.5.5}/trexmodel/models/datastore/redeem_models.py

@@ -365,7 +365,7 @@ class CustomerRedemption(BaseNModel, DictModel):
             redeemed_summary = {
                                     reward_format               : {
                                         
-                                                                    'amount'                    : redeemed_amount,        
+                                                                    'amount'                    : float(redeemed_amount),        
                                                                     'customer_point_rewards'    : redeemed_reward_details_list
                                                                     }
                                     }
@@ -448,7 +448,7 @@ class CustomerRedemption(BaseNModel, DictModel):
             redeemed_summary = {
                                 program_conf.REWARD_FORMAT_PREPAID: {
                                     
-                                                                'amount'                    : redeemed_amount,        
+                                                                'amount'                    : float(redeemed_amount),        
                                                                 'customer_prepaid_rewards'   : redeemed_reward_details_list
                                                                 }
                                 }