trex-model 1.5.15__tar.gz → 1.5.16__tar.gz

{trex-model-1.5.15 → trex-model-1.5.16}/PKG-INFO

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.5.15
+Version: 1.5.16
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok
 Author-email: sglok77@gmail.com
-License: UNKNOWN
-Description: This is database modelusing google datastore mode module
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: google-cloud-firestore
+Requires-Dist: google_cloud_datastore
+Requires-Dist: google-cloud-ndb
+Requires-Dist: six
+Requires-Dist: trex-lib
+Requires-Dist: flask-login==0.6.2
+
+This is database modelusing google datastore mode module

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

{trex-model-1.5.15 → trex-model-1.5.16}/trex_model.egg-info/PKG-INFO

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.5.15
+Version: 1.5.16
 Summary: TRex database module package
 Home-page: https://bitbucket.org/lokjac/trex-model
 Author: Jack Lok
 Author-email: sglok77@gmail.com
-License: UNKNOWN
-Description: This is database modelusing google datastore mode module
-        
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: google-cloud-firestore
+Requires-Dist: google_cloud_datastore
+Requires-Dist: google-cloud-ndb
+Requires-Dist: six
+Requires-Dist: trex-lib
+Requires-Dist: flask-login==0.6.2
+
+This is database modelusing google datastore mode module

{trex-model-1.5.15 → trex-model-1.5.16}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -24,7 +24,9 @@ from trexanalytics.bigquery_upstream_data_config import create_merchant_customer
     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_revert_entitled_customer_voucher_upstream_for_merchant,\
+    create_entitled_customer_voucher_upstream_for_merchant,\
+    create_redeemed_customer_voucher_to_upstream_for_merchant
 from trexmodel.models.datastore.membership_models import MerchantTierMembership
 from trexmodel.models.datastore.transaction_models import CustomerTransaction,\
     SalesTransaction
@@ -695,6 +697,12 @@ def redeem_reward_transaction(customer, redeem_outlet=None, reward_format=None,
             if customer_redemption:
                 create_redemption_message(customer_redemption)
                 create_merchant_customer_redemption_upstream_for_merchant(customer_redemption, streamed_datetime=redeemed_datetime)
+                if reward_format == program_conf.REWARD_FORMAT_VOUCHER:
+                    for voucher_key in redeemed_voucher_keys_list:
+                        customer_voucher        = CustomerEntitledVoucher.fetch(voucher_key)
+                        if customer_voucher:
+                            create_redeemed_customer_voucher_to_upstream_for_merchant(customer_voucher)
+                    
             
             return customer_redemption
             

{trex-model-1.5.15 → trex-model-1.5.16}/trexmodel/models/datastore/reward_models.py

@@ -560,7 +560,9 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     def create(merchant_voucher, customer_acct, transact_outlet=None, 
                effective_date=None, expiry_date=None,
                transaction_id=None, invoice_id=None,
-               rewarded_by=None, rewarded_datetime=None):
+               rewarded_by=None, rewarded_datetime=None,
+               program_key=None
+               ):
         
         redeem_code = random_string(program_conf.REDEEM_CODE_LENGTH, is_human_mistake_safe=True)
         
@@ -587,6 +589,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
                                             rewarded_datetime       = rewarded_datetime,
                                             
                                             user_acct               = customer_acct.registered_user_acct.create_ndb_key(),
+                                            reward_program          = string_to_key_property(program_key),
                                             )
         
         customer_entiteld_voucher.put()