trex-model 1.3.9__tar.gz → 1.4.1__tar.gz

{trex-model-1.3.9 → trex-model-1.4.1}/PKG-INFO

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.9
+Version: 1.4.1
 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.3.9 → trex-model-1.4.1}/setup.py

@@ -3,7 +3,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 setuptools.setup(
      name='trex-model',  
-     version='1.3.9',
+     version='1.4.1',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex-model-1.3.9 → trex-model-1.4.1}/trex_model.egg-info/PKG-INFO

@@ -1,15 +1,20 @@
 Metadata-Version: 2.1
 Name: trex-model
-Version: 1.3.9
+Version: 1.4.1
 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.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/admin_models.py

@@ -9,7 +9,7 @@ from trexlib.utils.security_util import generate_user_id, hash_password
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_string
 from trexlib.utils.common.common_util import logger
-from trexlib import conf
+from trexconf import conf
 
 
 class SuperUser(UserMin):

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/analytic_models.py

@@ -3,7 +3,7 @@ Created on 25 Jan 2021
 
 @author: jacklok
 '''
-from trexmodel import conf as model_conf
+from trexconf import conf as model_conf
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from datetime import timedelta

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/coporate_models.py

@@ -5,17 +5,7 @@ Created on 19 Feb 2021
 '''
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.system_models import SentEmail
-from trexmodel.models.datastore.user_models import UserMin
-import trexmodel.conf as model_conf
-from trexlib.utils.security_util import generate_user_id, hash_password
-from trexlib.utils.string_util import random_number
 import logging
-from datetime import datetime, timedelta
-from trexlib.utils.common.date_util import parse_datetime
-from trexmodel import conf
-from google.auth._default import default
-from trexmodel.models.datastore.system_models import Tagging
 
 
 logger = logging.getLogger('model')

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/customer_models.py

@@ -13,7 +13,7 @@ from trexlib.utils.string_util import is_not_empty, is_empty
 import logging
 from trexlib.utils.common.date_util import convert_date_to_datetime,\
     to_day_of_year
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from six import string_types
 from datetime import datetime, timedelta
 from trexmodel.models.datastore.membership_models import MerchantTierMembership,\
@@ -46,6 +46,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     birth_day_in_year           = ndb.IntegerProperty(required=False)
     gender                      = ndb.StringProperty(required=False)
     reference_code              = ndb.StringProperty(required=True)
+    referral_code               = ndb.StringProperty(required=False)
     
     mobile_app_installed        = ndb.BooleanProperty(required=False, default=False)
     
@@ -68,6 +69,8 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     entitled_membership_reward_summary          = ndb.JsonProperty()
     entitled_lucky_draw_ticket_summary          = ndb.JsonProperty(required=False)
     
+    referrer_code                               = ndb.StringProperty(required=False)
+    
     kpi_summary                                 = ndb.JsonProperty()
     
     device_details                              = ndb.JsonProperty()
@@ -79,7 +82,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                            'reward_summary', 'entitled_voucher_summary', 'prepaid_summary', 'kpi_summary', 'entitled_lucky_draw_ticket_summary',
                            'entitled_birthday_reward_summary', 'tier_membership_key',
                            'registered_outlet_key', 'registered_merchant_acct_key', 'registered_datetime', 'modified_datetime',
-                           'registered_user_acct',
+                           'registered_user_acct','referral_code',
                            
                            ]
     
@@ -267,6 +270,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         for ticket in tickets_list:
             ticket.patch_prize_image_base_url()
             Customer.update_ticket_into_lucky_draw_ticket_summary(customer_acct, ticket.to_configuration())
+    
     @classmethod
     def get_by_reference_code(cls, reference_code, merchant_acct):
         return cls.query(ndb.AND(cls.reference_code==reference_code, cls.merchant_acct==merchant_acct.create_ndb_key())).get()
@@ -353,6 +357,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
                                mobile_phone             = user_acct.mobile_phone, 
                                gender                   = user_acct.gender, 
                                reference_code           = user_acct.reference_code, 
+                               referral_code            = user_acct.referral_code,
                                birth_date               = user_acct.birth_date, 
                                birth_date_date_str      = user_acct.birth_date_date_str, 
                                birth_day_in_year        = user_acct.birth_day_in_year,

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/fb_subsriber_models.py

@@ -7,13 +7,6 @@ Created on 23 Oct 2020
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 
-import logging  
-from trexlib.utils.security_util import generate_user_id, hash_password
-
-from trexlib import conf as lib_conf
-from trexmodel import conf as model_conf
-import json
-from json import JSONEncoder
 from datetime import datetime
 
 class FacebookSubscriber(BaseNModel, DictModel):

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/import_models.py

@@ -5,17 +5,13 @@ Created on 26 Sep 2023
 '''
 
 from google.cloud import ndb
-from trexmodel.models.datastore.user_models import UserMin
-from trexlib.utils.security_util import generate_user_id, hash_password
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexlib.utils.string_util import random_string
-from trexlib.utils.common.common_util import logger
-from trexlib import conf
 from trexmodel.models.datastore.merchant_models import MerchantAcct
 import logging
 import csv, io
 
-from trexmodel import program_conf
+from trexconf import program_conf
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/inventory_model.py

@@ -5,17 +5,9 @@ Created on 19 Aug 2021
 '''
 
 from google.cloud import ndb
-from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.user_models import User
-from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet, MerchantUser
-from trexlib.utils.string_util import is_empty, is_not_empty
-import logging, json
-from trexmodel import conf, program_conf
-from trexlib.utils.string_util import random_string
-from datetime import datetime, timedelta
-from trexmodel.models.datastore.customer_models import Customer
-import trexmodel.conf as model_conf
-from trexmodel.models.datastore.model_decorators import model_transactional
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from trexmodel.models.datastore.merchant_models import MerchantUser
+import logging
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/loyalty_models.py

@@ -8,10 +8,10 @@ from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexmodel.models.datastore.merchant_models import Outlet
 from trexlib.utils.string_util import random_number
-import logging, json
-from trexmodel import conf, program_conf
+import logging
+from trexconf import conf
 from datetime import datetime
-from google.api_core.operations_v1.operations_client_config import config
+#from google.api_core.operations_v1.operations_client_config import config
 
 logger = logging.getLogger('debug')
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/lucky_draw_models.py

@@ -4,7 +4,7 @@ Created on 12 May 2023
 @author: jacklok
 '''
 import logging
-from trexmodel import program_conf
+from trexconf import program_conf
 import trexmodel.conf as model_conf
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from google.cloud import ndb

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/marketing_models.py

@@ -9,7 +9,7 @@ from trexmodel.models.datastore.merchant_models import MerchantUser,\
     MerchantAcct
 from trexlib.utils.string_util import is_not_empty, random_string
 from datetime import datetime
-from trexmodel import program_conf, conf
+from trexconf import conf
 import trexmodel.conf as model_conf
 import logging
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/membership_models.py

@@ -9,13 +9,12 @@ from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import trexmodel.conf as model_conf
 from trexlib.utils.string_util import is_not_empty, random_string
 from trexmodel.models.datastore.merchant_models import MerchantAcct, \
-    MerchantUser, Outlet
+    MerchantUser
 import logging
 from dateutil.relativedelta import relativedelta
-from datetime import timedelta
 
 from datetime import datetime
-from trexmodel import program_conf
+from trexconf import program_conf
 
 logger = logging.getLogger('model')
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/merchant_models.py

@@ -14,10 +14,9 @@ from trexlib.utils.string_util import random_number, is_empty, is_not_empty,\
     split_by_length, random_string
 import logging
 from datetime import datetime, timedelta
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from trexmodel.models.datastore.system_models import Tagging
 from trexmodel.models.datastore.model_decorators import model_transactional
-from trexlib.utils.common.common_util import sort_dict_list
 from trexmodel.program_conf import LOYALTY_PACKAGE_LITE, LOYALTY_PRODUCT
 
 logger = logging.getLogger('model')
@@ -90,7 +89,7 @@ class MerchantAcct(MerchantMin):
     dict_properties = ['company_name', 'brand_name', 'contact_name', 'business_reg_no', 'mobile_phone', 
                        'office_phone', 'fax_phone', 'email', 'account_code', 'country',
                        'registered_datetime', 'modified_datetime', 'plan_start_date', 'plan_end_date', 'currency_code', 
-                       'timezone',
+                       'timezone', 'effective_referral_program_count',
                        'published_program_configuration', 'published_referral_program_configuration', 
                        'published_voucher_configuration', 'membership_configuration', 
                        'tier_membership_configuration', 'prepaid_configuration', 'lucky_draw_configuration', 'product_modifier_configuration',
@@ -125,6 +124,31 @@ class MerchantAcct(MerchantMin):
         
         return LOYALTY_PACKAGE_LITE
     
+    @property
+    def effective_referral_program_count(self):
+        if self.published_referral_program_configuration:
+            program_count = self.published_referral_program_configuration.get('count',0)
+            if program_count>0:
+                check_effective_count = 0
+                program_list = self.published_referral_program_configuration.get('programs');
+                today_date = datetime.today()
+                for program_details in program_list:
+                    start_date_str = program_details.get('start_date')
+                    start_date = datetime.strptime(start_date_str, '%d-%m-%Y')
+                    
+                    end_date_str = program_details.get('end_date')
+                    end_date = datetime.strptime(end_date_str, '%d-%m-%Y')
+                    
+                    if start_date<=today_date and today_date<=end_date:
+                        check_effective_count+=1
+                
+                return check_effective_count
+                    
+            else:
+                return program_count
+                
+        return 0
+    
     @property
     def outlet_limit(self):
         if self.account_plan:

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/message_model_helper.py

@@ -7,7 +7,7 @@ from trexmodel.program_conf import REWARD_FORMAT_MAP, REWARD_FORMAT_PREPAID
 from trexmodel.models.datastore.message_models import Message
 from trexmodel.conf import MESSAGE_CATEGORY_REWARD, MESSAGE_STATUS_NEW,\
     MESSAGE_CATEGORY_REDEEM
-from trexmodel import program_conf
+from trexconf import program_conf
 from babel.numbers import format_currency
 import logging
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/message_models.py

@@ -7,13 +7,9 @@ Created on 9 Nov 2023
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexmodel.models.datastore.user_models import User
-import trexmodel.conf as model_conf
+from datetime import datetime
 import logging
-from datetime import datetime, timedelta
-from trexlib.utils.common.date_util import parse_datetime
 from trexmodel import conf
-from google.auth._default import default
-from trexmodel.models.datastore.system_models import Tagging
 from trexmodel.conf import MESSAGE_STATUS_SET, MESSAGE_STATUS_NEW, MESSAGE_CATEGORY_SYSTEM,\
     MESSAGE_STATUS_READ, MESSAGE_CATEGORIES, MESSAGE_CATEGORY_ANNOUNCEMENT
 from trexmodel.models.datastore.transaction_models import CustomerTransaction

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/ndb_models.py

@@ -12,9 +12,9 @@ from six import string_types
 from trexlib.utils.common.date_util import increase_date 
 import logging
 #from google.cloud.ndb._datastore_query import Cursor
-from google.cloud.ndb import Cursor
-from trexlib import conf as lib_conf 
-from trexmodel import conf as model_conf
+#from google.cloud.ndb import Cursor
+from trexconf import conf as lib_conf 
+from trexconf import conf as model_conf
 from google.cloud.datastore.helpers import GeoPoint
  
 logger = logging.getLogger('model') 
@@ -288,7 +288,7 @@ class BaseNModel(DictModel, NDBModel):
     def count_with_condition_query(cls, query, limit=model_conf.MAX_FETCH_RECORD):    
         
         
-        return query.count(limit=limit, keys_only=True)
+        return query.count(limit=limit)
     
     @classmethod
     def list_all(cls, offset=0,  start_cursor=None, return_with_cursor=False, keys_only=False, 
@@ -411,7 +411,7 @@ class FullTextSearchable(ndb.Model):
             
         logger.debug('query=%s', query)
         
-        return query.count(limit=limit, keys_only=True)
+        return query.count(limit=limit)
             
            
         

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/pos_models.py

@@ -3,8 +3,8 @@ from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from trexmodel.models.datastore.merchant_models import Outlet
 from trexlib.utils.string_util import random_number, is_not_empty
-import logging, json
-from trexmodel import conf
+import logging
+from trexconf import conf
 from datetime import datetime
 from trexmodel.models.datastore.product_models import ProductCatalogue
 from trexmodel.models.datastore.model_decorators import model_transactional

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/prepaid_models.py

@@ -9,11 +9,9 @@ from trexmodel.models.datastore.user_models import User
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet, MerchantUser
 import logging, json
 from trexmodel import conf, program_conf
-from trexlib.utils.string_util import random_string, random_number, is_not_empty
-from datetime import datetime, timedelta
-import trexmodel.conf as model_conf
+from trexlib.utils.string_util import random_number, is_not_empty
+from datetime import datetime
 from trexlib.utils.common.common_util import sort_dict_list
-from trexmodel.utils.model.model_util import generate_transaction_id
 from dateutil.relativedelta import relativedelta
 from trexmodel.program_conf import PRODUCT_TYPES, LOYALTY_PRODUCT
 from trexlib.utils.crypto_util import encrypt
@@ -568,9 +566,11 @@ class CustomerPrepaidReward(BaseNModel,DictModel):
         topup_prepaid_rate  = CustomerPrepaidReward.__calculate_topup_prepaid_rate(prepaid_scheme_details)
         
         topup_by_key = None
+        topup_by_username = None
         
         if topup_by:
             topup_by_key = topup_by.create_ndb_key()
+            topup_by_username = topup_by.username
             
         if topup_datetime is None:
             topup_datetime = datetime.utcnow()
@@ -591,7 +591,7 @@ class CustomerPrepaidReward(BaseNModel,DictModel):
                                                             invoice_id              = invoice_id,
                                                             
                                                             topup_by                = topup_by_key,
-                                                            
+                                                            topup_by_username       = topup_by_username, 
                                                             topup_datetime          = topup_datetime,    
                                                             )
         
@@ -599,6 +599,42 @@ class CustomerPrepaidReward(BaseNModel,DictModel):
         
         return prepaid_topup_reward
     
+    @staticmethod
+    def create(customer_acct, topup_outlet, 
+               topup_amount=0, topup_unit=0, topup_prepaid_rate = 1, 
+               prepaid_amount=.0, prepaid_scheme_details={}, 
+               topup_datetime=None, topup_by=None,
+               transaction_id=None, invoice_id=None,
+               ):
+        
+        merchant_acct  = customer_acct.registered_merchant_acct
+        
+        topup_by_key = None
+        topup_by_username = None
+        
+        if topup_by:
+            topup_by_key = topup_by.create_ndb_key()
+            topup_by_username = topup_by.username
+            
+        CustomerPrepaidReward(
+            parent                  = customer_acct.create_ndb_key(),
+            merchant_acct           = merchant_acct.create_ndb_key(),
+            topup_outlet            = topup_outlet.create_ndb_key() if topup_outlet else None,
+            topup_amount            = topup_amount,
+            topup_unit              = topup_unit,
+            prepaid_amount          = prepaid_amount,
+            topup_prepaid_rate      = topup_prepaid_rate,
+            used_prepaid_amount     = .0,
+            prepaid_scheme_details  = prepaid_scheme_details,
+            
+            transaction_id          = transaction_id,
+            invoice_id              = invoice_id,
+            
+            topup_by                = topup_by_key,
+            topup_by_username       = topup_by_username, 
+            topup_datetime          = topup_datetime,   
+             
+            )
     
     @staticmethod
     def delete_all_by_customer(customer):

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/product_models.py

@@ -5,14 +5,11 @@ Created on 23 Jul 2021
 '''
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.user_models import User
 from trexmodel.models.datastore.merchant_models import MerchantAcct, MerchantUser
 from trexlib.utils.string_util import is_empty, is_not_empty
-import logging, json
-from trexmodel import conf, program_conf
+import logging
+from trexconf import conf
 from trexlib.utils.string_util import random_string
-from datetime import datetime, timedelta
-from trexmodel.models.datastore.customer_models import Customer
 import trexmodel.conf as model_conf
 from trexmodel.models.datastore.model_decorators import model_transactional
 from flask_babel import gettext

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/program_models.py

@@ -7,11 +7,9 @@ from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import trexmodel.conf as model_conf
 from trexlib.utils.string_util import is_not_empty, random_string
-from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet,\
-    MerchantUser
-from trexmodel.models.datastore.coporate_models import CorporateAcct
+from trexmodel.models.datastore.merchant_models import MerchantAcct,MerchantUser
 import logging
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from datetime import datetime
 from trexmodel.models.datastore.model_decorators import model_transactional
 from trexlib.utils.common.common_util import sort_list, sort_dict_list

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/rating_models.py

@@ -7,7 +7,7 @@ from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from google.cloud import ndb
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet
 from trexmodel.models.datastore.user_models import User
-from trexmodel import conf
+from trexconf import conf
 from datetime import datetime, timedelta
 import logging
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/recruit_models.py

@@ -6,10 +6,6 @@ Created on 27 Mar 2024
 
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from google.cloud import ndb
-from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet
-from trexmodel.models.datastore.user_models import User
-from trexmodel import conf
-from datetime import datetime, timedelta
 import logging
 from builtins import staticmethod
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/redeem_models.py

@@ -10,12 +10,11 @@ from trexmodel.models.datastore.user_models import User
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet, MerchantUser
 from trexlib.utils.string_util import is_empty, is_not_empty
 import logging, json
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from datetime import datetime, timedelta
 from trexmodel.utils.model.model_util import generate_transaction_id
 from trexmodel.models.datastore.reward_models import CustomerPointReward,\
     CustomerStampReward, CustomerEntitledVoucher
-from trexmodel.models.datastore.model_decorators import model_transactional
 from trexmodel.models.datastore.customer_models import Customer
 from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.prepaid_models import CustomerPrepaidReward

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/redemption_catalogue_models.py

@@ -7,8 +7,7 @@ import logging
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 from google.cloud import ndb
 from datetime import datetime
-import trexmodel.conf as model_conf
-from trexmodel import program_conf
+from trexconf import program_conf, conf as model_conf
 from trexmodel.models.datastore.merchant_models import MerchantUser,\
     MerchantAcct
 from trexlib.utils.string_util import is_not_empty, is_empty

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/referral_program_model.py

@@ -7,15 +7,12 @@ Created on 8 Apr 2024
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import trexmodel.conf as model_conf
-from trexlib.utils.string_util import is_not_empty, random_string, is_empty
-from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet,\
-    MerchantUser
-from trexmodel.models.datastore.coporate_models import CorporateAcct
+from trexlib.utils.string_util import is_not_empty
+from trexmodel.models.datastore.merchant_models import MerchantAcct, MerchantUser
 import logging
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from datetime import datetime
 from trexmodel.models.datastore.model_decorators import model_transactional
-from trexlib.utils.common.common_util import sort_list, sort_dict_list
 from builtins import staticmethod
     
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/reward_model_helpers.py

@@ -9,7 +9,7 @@ from dateutil.relativedelta import relativedelta
 from trexlib.utils.string_util import is_not_empty
 
 import logging
-from trexmodel import program_conf
+from trexconf import program_conf
 from trexmodel.models.datastore.reward_models import CustomerEntitledVoucher
 from trexmodel.models.datastore.voucher_models import MerchantVoucher
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/reward_models.py

@@ -12,7 +12,7 @@ from trexmodel.models.datastore.program_models import MerchantProgram,\
 from trexmodel.models.datastore.voucher_models import MerchantVoucher
 from trexlib.utils.string_util import is_empty, is_not_empty
 import logging
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf
 from trexlib.utils.string_util import random_string
 from datetime import datetime, timedelta
 from trexmodel.utils.model.model_util import generate_transaction_id,\

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/system_models.py

@@ -3,7 +3,7 @@ Created on 20 Apr 2020
 
 @author: jacklok
 '''
-from trexmodel import conf as model_conf, conf
+from trexconf import conf as model_conf
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/task_models.py

@@ -4,8 +4,7 @@ Created on 13 Apr 2020
 @author: jacklok
 '''
 from google.cloud import ndb
-import logging
-from trexmodel import conf as model_conf
+from trexconf import conf as model_conf
 from trexmodel.models.datastore.ndb_models import BaseNModel
 
  

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/test_models.py

@@ -5,18 +5,8 @@ Created on 16 May 2021
 '''
 
 from google.cloud import ndb
-from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel, FullTextSearchable
-from trexmodel.models.datastore.system_models import SentEmail
-from trexmodel.models.datastore.user_models import UserMin
-import trexmodel.conf as model_conf
-from trexlib.utils.security_util import generate_user_id, hash_password
-from trexlib.utils.string_util import random_number
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import logging
-from datetime import datetime, timedelta
-from trexlib.utils.common.date_util import parse_datetime
-from trexmodel import conf
-from google.auth._default import default
-from trexmodel.models.datastore.system_models import Tagging
 
 
 logger = logging.getLogger('model')

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/transaction_models.py

@@ -13,7 +13,7 @@ from trexlib.utils.string_util import is_not_empty
 from trexmodel.models.datastore.merchant_models import MerchantAcct, Outlet,\
     MerchantUser
 import logging
-from trexmodel import conf, program_conf
+from trexconf import conf, program_conf 
 from datetime import datetime, timedelta
 from trexmodel.utils.model.model_util import generate_transaction_id
 from trexmodel.models.datastore.membership_models import MerchantMembership,\
@@ -327,7 +327,14 @@ class CustomerTransaction(SalesTransaction):
                                    transact_datetime=transact_datetime, reward_giveaway_method=program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_MANUAL,
                                    is_sales_transaction = is_sales_transaction, allow_to_revert=allow_to_revert, 
                                    is_membership_purchase=is_membership_purchase, is_membership_renew=is_membership_renew,
-                                   )    
+                                   )
+        
+    @staticmethod
+    def create_referral_transaction(customer, transact_outlet=None, transact_datetime=None, ): 
+        return CustomerTransaction.create_system_transaction(customer, transact_outlet=transact_outlet, 
+                                   transact_datetime=transact_datetime, reward_giveaway_method=program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_REFERRAL,
+                                   allow_to_revert=False,
+                                   )        
     
     @staticmethod
     def create_from_sales_transaction(customer, sales_transaction):

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/user_models.py

@@ -5,19 +5,16 @@ Created on 10 Apr 2020
 '''
 from google.cloud import ndb
 from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
-from trexlib.utils.string_util import random_number, is_not_empty, random_string,\
+from trexlib.utils.string_util import random_number, random_string,\
     is_empty
 from flask_login import UserMixin
 import logging  
 from trexlib.utils.security_util import generate_user_id, hash_password
 
-from trexlib import conf as lib_conf
-from trexmodel import conf as model_conf, conf
-import json
-from json import JSONEncoder
+from trexconf import conf as lib_conf
+from trexconf import conf as model_conf, conf
 from trexlib.utils.common.date_util import to_day_of_year
 from datetime import datetime, timedelta
-from flask_babel import gettext
 from trexmodel.conf import USER_STATUS_ANONYMOUS, ACCOUNT_LOCKED_IN_MINUTES
 
 logger = logging.getLogger("model")
@@ -127,6 +124,7 @@ class UserBase(UserMin):
     # User System Generated fields
     #---------------------------------------------------------------------------
     reference_code              = ndb.StringProperty(required=True)
+    referral_code               = ndb.StringProperty(required=True)
     
     #---------------------------------------------------------------------------
     # User Mutual Mandatory fields
@@ -202,16 +200,33 @@ class UserBase(UserMin):
     
     @classmethod
     def list_by_email(cls, email):
-        return User.query(ndb.AND(User.email==email)).fetch(limit=conf.MAX_FETCH_RECORD)
-        
+        return cls.query(ndb.AND(User.email==email)).fetch(limit=conf.MAX_FETCH_RECORD)
+    
     @classmethod
     def get_by_mobile_phone(cls, mobile_phone):
         return User.query(ndb.AND(User.mobile_phone==mobile_phone, User.deleted==False)).get()
     
+    @classmethod
+    def get_by_referral_code(cls, referral_code):
+        return User.query(ndb.AND(User.referral_code==referral_code)).get()
+    
     @classmethod
     def get_by_reset_password_token(cls, request_reset_password_token):
         return User.query(ndb.AND(User.request_reset_password_token==request_reset_password_token)).get()
     
+    @classmethod
+    def count_all(cls):
+        return cls.count(limit=conf.MAX_FETCH_RECORD)
+    
+    @classmethod
+    def _generate_referral_code(cls):
+        referral_code = random_string(8, is_human_mistake_safe=True)
+        checking_user = cls.get_by_referral_code(referral_code)
+        while checking_user is not None:
+            referral_code = random_string(8, is_human_mistake_safe=True)
+            checking_user = cls.get_by_referral_code(referral_code)
+        return referral_code
+    
     @classmethod
     def create(cls, name=None, email=None, mobile_phone=None, 
                gender=None, birth_date=None, 
@@ -241,8 +256,9 @@ class UserBase(UserMin):
                            reference_code=reference_code, status=status,
                            )
         
-        hashed_password = hash_password(user_id, password)
-        created_user.password = hashed_password
+        hashed_password             = hash_password(user_id, password)
+        created_user.password       = hashed_password
+        created_user.referral_code  = cls._generate_referral_code()
         
         
         created_user.is_email_verified          = is_email_verified
@@ -266,11 +282,14 @@ class UserBase(UserMin):
         
         mobile_phone    = kwargs.get('mobile_phone')
         password        = kwargs.get('password')
-        status          = kwargs.get('status')
+        #status          = kwargs.get('status')
         
         if mobile_phone:
             mobile_phone = mobile_phone.replace(" ", "")
         
+        if is_empty(user_acct.referral_code):
+            user_acct.referral_code = cls._generate_referral_code()
+        
         kwargs['mobile_phone'] = mobile_phone
         
         for key, value in kwargs.items():

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/datastore/voucher_models.py

@@ -10,7 +10,7 @@ from trexlib.utils.string_util import is_not_empty
 from trexmodel.models.datastore.merchant_models import MerchantAcct, \
     MerchantUser
 import logging
-from trexmodel import program_conf
+from trexconf import program_conf
 from datetime import datetime
 from trexmodel.program_conf import VOUCHER_REWARD_TYPE,\
     VOUCHER_REWARD_MAX_QUANTITY,\

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/models/merchant_helpers.py

@@ -2,6 +2,7 @@ from trexmodel.models.datastore.pos_models import InvoiceNoGeneration,\
     RoundingSetup, DinningOption, PosPaymentMethod
 from trexmodel.models.datastore.merchant_models import ReceiptSetup, Outlet,\
     BannerFile
+from trexlib.utils.string_util import is_not_empty
 
 def construct_merchant_acct_info(merchant_acct):
     account_settings        = {
@@ -31,6 +32,8 @@ def construct_merchant_acct_info(merchant_acct):
                                                                      
                                                     }
     
+    referral_program_settings = merchant_acct.program_settings.get('referral_program', {})
+    
     info =  {
                 'key'                               : merchant_acct.key_in_str,
                 'company_name'                      : merchant_acct.company_name,
@@ -43,7 +46,21 @@ def construct_merchant_acct_info(merchant_acct):
                 'account_settings'                  : account_settings,
                 'outlets'                           : outlet_json_list,
                 'banners'                           : banner_listing,
+                
                 } 
+    if is_not_empty(referral_program_settings):
+        
+        info['referral_program_settings'] = {
+                                                'program_count'             : merchant_acct.effective_referral_program_count,
+                                                'referrer_promote_title'    : referral_program_settings.get('referrer_promote_title'),
+                                                'referrer_promote_desc'     : referral_program_settings.get('referrer_promote_desc'),
+                                                'referrer_promote_image'    : referral_program_settings.get('referrer_promote_image'),
+                                                'referee_promote_title'     : referral_program_settings.get('referee_promote_title'),
+                                                'referee_promote_desc'      : referral_program_settings.get('referee_promote_desc'),
+                                                'referee_promote_image'     : referral_program_settings.get('referee_promote_image'),
+                                                
+                                            }
+    
     return info
 
 def construct_outlet_info(outlet):

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/program_conf.py

@@ -219,6 +219,7 @@ PROGRAM_REWARD_GIVEAWAY_METHOD_MANUAL   = 'manual'
 PROGRAM_REWARD_GIVEAWAY_METHOD_SYSTEM   = 'system'
 PROGRAM_REWARD_GIVEAWAY_METHOD_TIER     = 'tier'
 PROGRAM_REWARD_GIVEAWAY_METHOD_REDEEM   = 'redeem'
+PROGRAM_REWARD_GIVEAWAY_METHOD_REFERRAL = 'referral'
 
 GIVEAWAY_SYSTEM_CONDITION_NEW_MEMBERSHIP        = 'new_membership'
 GIVEAWAY_SYSTEM_CONDITION_RENEW_MEMBERSHIP      = 'renew_membership'

{trex-model-1.3.9 → trex-model-1.4.1}/trexmodel/utils/model/model_util.py

@@ -7,7 +7,7 @@ from google.cloud import ndb
 from google.oauth2 import service_account
 from google.auth import crypt
 import io, json, logging
-from trexmodel import conf as model_conf
+from trexconf import conf as model_conf
 import six
 from datetime import datetime
 from trexlib.utils.string_util import random_number