trex-model 1.5.9__tar.gz → 1.5.11__tar.gz

{trex-model-1.5.9 → trex-model-1.5.11}/PKG-INFO

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

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

{trex-model-1.5.9 → trex-model-1.5.11}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.9 → trex-model-1.5.11}/trex_model.egg-info/SOURCES.txt

@@ -44,7 +44,6 @@ trexmodel/models/datastore/recruit_models.py
 trexmodel/models/datastore/redeem_models.py
 trexmodel/models/datastore/redemption_catalogue_models.py
 trexmodel/models/datastore/referral_program_model.py
-trexmodel/models/datastore/reward_model_helpers.py
 trexmodel/models/datastore/reward_models.py
 trexmodel/models/datastore/spending_base_program_model.py
 trexmodel/models/datastore/system_models.py
@@ -53,6 +52,9 @@ trexmodel/models/datastore/test_models.py
 trexmodel/models/datastore/transaction_models.py
 trexmodel/models/datastore/user_models.py
 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/utils/__init__.py
 trexmodel/utils/gcloud/__init__.py
 trexmodel/utils/gcloud/datastore_util.py

{trex-model-1.5.9 → trex-model-1.5.11}/trexmodel/conf.py

@@ -34,6 +34,8 @@ MESSAGE_CATEGORY_PROMOTION              = 'promotion'
 MESSAGE_CATEGORY_SURVEY                 = 'survey'
 MESSAGE_CATEGORY_SYSTEM                 = 'system'
 MESSAGE_CATEGORY_REWARD                 = 'reward'
+MESSAGE_CATEGORY_REFERRAL               = 'referral'
+MESSAGE_CATEGORY_BIRTHDAY               = 'birthday'
 MESSAGE_CATEGORY_REDEEM                 = 'redeem'
 MESSAGE_CATEGORY_REDEMPTION_CATALOGUE   = 'redemption_catalogue'
 

{trex-model-1.5.9/trexmodel/models/datastore → trex-model-1.5.11/trexmodel/models/datastore/helper}/reward_model_helpers.py

@@ -12,9 +12,28 @@ import logging
 from trexconf import program_conf
 from trexmodel.models.datastore.reward_models import CustomerEntitledVoucher
 from trexmodel.models.datastore.voucher_models import MerchantVoucher
+from trexconf.program_conf import REWARD_BASE_ON_BIRTHDAY
 
 
-logger = logging.getLogger('debug')
+logger = logging.getLogger('helper')
+
+def list_merchant_birthday_program_configuration(merchant_acct):
+    program_configuration_list = merchant_acct.published_program_configuration.get('programs')
+    birthday_program_configuration_list = []
+    today = datetime.utcnow().date()
+    for program_configuration in program_configuration_list:
+        start_date  = program_configuration.get('start_date')
+        end_date    = program_configuration.get('end_date')
+        
+        start_date  = datetime.strptime(start_date, '%d-%m-%Y').date()
+        end_date    = datetime.strptime(end_date, '%d-%m-%Y').date()
+        
+        if today>=start_date and today<=end_date:
+            if program_configuration.get('reward_base')==REWARD_BASE_ON_BIRTHDAY:
+                birthday_program_configuration_list.append(program_configuration)
+    
+    return birthday_program_configuration_list    
+        
 
 def is_customer_entitled_voucher_within_limit(customer, merchant_voucher, redeem_count):