trex-model 1.5.9__tar.gz → 1.5.10__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of trex-model might be problematic. Click here for more details.
- {trex-model-1.5.9 → trex-model-1.5.10}/PKG-INFO +1 -1
- {trex-model-1.5.9 → trex-model-1.5.10}/setup.py +1 -1
- {trex-model-1.5.9 → trex-model-1.5.10}/trex_model.egg-info/PKG-INFO +1 -1
- {trex-model-1.5.9 → trex-model-1.5.10}/trex_model.egg-info/SOURCES.txt +3 -1
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/conf.py +2 -0
- {trex-model-1.5.9/trexmodel/models/datastore → trex-model-1.5.10/trexmodel/models/datastore/helper}/reward_model_helpers.py +20 -1
- trex-model-1.5.10/trexmodel/models/datastore/helper/reward_transaction_helper.py +1488 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/message_model_helper.py +10 -6
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/message_models.py +2 -2
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/prepaid_models.py +2 -2
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/user_models.py +2 -0
- trex-model-1.5.10/trexmodel/utils/model/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/LICENSE +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/MANIFEST.in +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/README.md +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/setup.cfg +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trex_model.egg-info/dependency_links.txt +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trex_model.egg-info/requires.txt +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trex_model.egg-info/top_level.txt +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/admin_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/analytic_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/app_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/coporate_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/customer_model_helpers.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/customer_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/fb_subsriber_models.py +0 -0
- {trex-model-1.5.9/trexmodel/utils → trex-model-1.5.10/trexmodel/models/datastore/helper}/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/import_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/inventory_model.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/loyalty_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/lucky_draw_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/marketing_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/membership_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/merchant_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/model_decorators.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/ndb_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/pos_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/product_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/program_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/rating_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/recruit_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/redeem_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/redemption_catalogue_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/referral_program_model.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/reward_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/spending_base_program_model.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/system_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/task_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/test_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/transaction_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/datastore/voucher_models.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/merchant_helpers.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/model_decorator.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/models/prepaid_helpers.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/pos_conf.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/program_conf.py +0 -0
- {trex-model-1.5.9/trexmodel/utils/gcloud → trex-model-1.5.10/trexmodel/utils}/__init__.py +0 -0
- {trex-model-1.5.9/trexmodel/utils/model → trex-model-1.5.10/trexmodel/utils/gcloud}/__init__.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/utils/gcloud/datastore_util.py +0 -0
- {trex-model-1.5.9 → trex-model-1.5.10}/trexmodel/utils/model/model_util.py +0 -0
|
@@ -44,7 +44,6 @@ trexmodel/models/datastore/recruit_models.py
|
|
|
44
44
|
trexmodel/models/datastore/redeem_models.py
|
|
45
45
|
trexmodel/models/datastore/redemption_catalogue_models.py
|
|
46
46
|
trexmodel/models/datastore/referral_program_model.py
|
|
47
|
-
trexmodel/models/datastore/reward_model_helpers.py
|
|
48
47
|
trexmodel/models/datastore/reward_models.py
|
|
49
48
|
trexmodel/models/datastore/spending_base_program_model.py
|
|
50
49
|
trexmodel/models/datastore/system_models.py
|
|
@@ -53,6 +52,9 @@ trexmodel/models/datastore/test_models.py
|
|
|
53
52
|
trexmodel/models/datastore/transaction_models.py
|
|
54
53
|
trexmodel/models/datastore/user_models.py
|
|
55
54
|
trexmodel/models/datastore/voucher_models.py
|
|
55
|
+
trexmodel/models/datastore/helper/__init__.py
|
|
56
|
+
trexmodel/models/datastore/helper/reward_model_helpers.py
|
|
57
|
+
trexmodel/models/datastore/helper/reward_transaction_helper.py
|
|
56
58
|
trexmodel/utils/__init__.py
|
|
57
59
|
trexmodel/utils/gcloud/__init__.py
|
|
58
60
|
trexmodel/utils/gcloud/datastore_util.py
|
|
@@ -34,6 +34,8 @@ MESSAGE_CATEGORY_PROMOTION = 'promotion'
|
|
|
34
34
|
MESSAGE_CATEGORY_SURVEY = 'survey'
|
|
35
35
|
MESSAGE_CATEGORY_SYSTEM = 'system'
|
|
36
36
|
MESSAGE_CATEGORY_REWARD = 'reward'
|
|
37
|
+
MESSAGE_CATEGORY_REFERRAL = 'referral'
|
|
38
|
+
MESSAGE_CATEGORY_BIRTHDAY = 'birthday'
|
|
37
39
|
MESSAGE_CATEGORY_REDEEM = 'redeem'
|
|
38
40
|
MESSAGE_CATEGORY_REDEMPTION_CATALOGUE = 'redemption_catalogue'
|
|
39
41
|
|
|
@@ -12,9 +12,28 @@ import logging
|
|
|
12
12
|
from trexconf import program_conf
|
|
13
13
|
from trexmodel.models.datastore.reward_models import CustomerEntitledVoucher
|
|
14
14
|
from trexmodel.models.datastore.voucher_models import MerchantVoucher
|
|
15
|
+
from trexconf.program_conf import REWARD_BASE_ON_BIRTHDAY
|
|
15
16
|
|
|
16
17
|
|
|
17
|
-
logger = logging.getLogger('
|
|
18
|
+
logger = logging.getLogger('helper')
|
|
19
|
+
|
|
20
|
+
def list_merchant_birthday_program_configuration(merchant_acct):
|
|
21
|
+
program_configuration_list = merchant_acct.published_program_configuration.get('programs')
|
|
22
|
+
birthday_program_configuration_list = []
|
|
23
|
+
today = datetime.utcnow().date()
|
|
24
|
+
for program_configuration in program_configuration_list:
|
|
25
|
+
start_date = program_configuration.get('start_date')
|
|
26
|
+
end_date = program_configuration.get('end_date')
|
|
27
|
+
|
|
28
|
+
start_date = datetime.strptime(start_date, '%d-%m-%Y').date()
|
|
29
|
+
end_date = datetime.strptime(end_date, '%d-%m-%Y').date()
|
|
30
|
+
|
|
31
|
+
if today>=start_date and today<=end_date:
|
|
32
|
+
if program_configuration.get('reward_base')==REWARD_BASE_ON_BIRTHDAY:
|
|
33
|
+
birthday_program_configuration_list.append(program_configuration)
|
|
34
|
+
|
|
35
|
+
return birthday_program_configuration_list
|
|
36
|
+
|
|
18
37
|
|
|
19
38
|
def is_customer_entitled_voucher_within_limit(customer, merchant_voucher, redeem_count):
|
|
20
39
|
|