trex-model 1.6.9__tar.gz → 1.6.11__tar.gz

{trex_model-1.6.9 → trex_model-1.6.11}/PKG-INFO

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

{trex_model-1.6.9 → trex_model-1.6.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.6.9',
+     version='1.6.11',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.9 → trex_model-1.6.11}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.9 → trex_model-1.6.11}/trex_model.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ trexmodel/models/datastore/redemption_catalogue_models.py
 trexmodel/models/datastore/referral_program_model.py
 trexmodel/models/datastore/reward_models.py
 trexmodel/models/datastore/spending_base_program_model.py
+trexmodel/models/datastore/support_models.py
 trexmodel/models/datastore/system_models.py
 trexmodel/models/datastore/task_models.py
 trexmodel/models/datastore/test_models.py

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/customer_model_helpers.py

@@ -399,6 +399,32 @@ def update_customer_entiteld_voucher_summary_after_removed_voucher(customer_enti
                 customer_entitled_voucher_summary[merchant_voucher_key]['amount']           = len(new_redeem_info_list)
                 
     return customer_entitled_voucher_summary
+
+def update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code(customer_entitled_voucher_summary, redeem_code):
+    '''
+    removed entitled voucher from customer entitled voucher summary 
+    '''
+    logger.debug('redeem_code=%s', redeem_code)
+    
+    new_customer_entitled_voucher_summary = {}
+    
+    if customer_entitled_voucher_summary:
+        
+        for merchant_voucher_key, voucher_summary in customer_entitled_voucher_summary.items():
+            new_redeem_info_list = []
+            redeem_info_list     = voucher_summary.get('redeem_info_list')
+            for redeem_info in redeem_info_list:
+                if redeem_info.get('redeem_code')!=redeem_code:
+                    new_redeem_info_list.append(redeem_info)
+            
+            new_customer_entitled_voucher_summary[merchant_voucher_key] = {}
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['redeem_info_list'] = new_redeem_info_list
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['count']            = len(new_redeem_info_list)
+            new_customer_entitled_voucher_summary[merchant_voucher_key]['amount']           = len(new_redeem_info_list)
+            
+        
+                
+    return new_customer_entitled_voucher_summary
     
 
 def update_customer_entiteld_voucher_summary_after_reverted_voucher(entitled_voucher_summary, reverted_customer_voucher):

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/customer_models.py

@@ -19,7 +19,8 @@ from datetime import datetime, timedelta
 from trexmodel.models.datastore.membership_models import MerchantTierMembership,\
     MerchantMembership
 from trexmodel.models.datastore.customer_model_helpers import update_customer_entiteld_voucher_summary_after_removed_voucher,\
-    update_customer_entiteld_voucher_summary_with_customer_new_voucher
+    update_customer_entiteld_voucher_summary_with_customer_new_voucher,\
+    update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code
     
 
 logger = logging.getLogger('model')
@@ -758,6 +759,10 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
         update_customer_entiteld_voucher_summary_after_removed_voucher(entitled_voucher_summary, removed_voucher)
         self.put()
         
+    def update_after_removed_voucher_by_redeem_code(self, redeem_code):
+        self.entitled_voucher_summary = update_customer_entiteld_voucher_summary_after_removed_voucher_by_redeem_code(self.entitled_voucher_summary, redeem_code)
+        self.put()    
+        
     def update_after_added_voucher(self, added_voucher):
         entitled_voucher_summary = self.entitled_voucher_summary
         update_customer_entiteld_voucher_summary_with_customer_new_voucher(entitled_voucher_summary, added_voucher)

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/merchant_models.py

@@ -171,8 +171,10 @@ class MerchantAcct(MerchantMin):
                 'currency_code'     : self.currency_code,
                 'country'           : self.country,
                 'account_plan'      : self.account_plan,
+                'gmt_hour'          : self.gmt_hour,
+                'account_plan'      : self.account_plan,
                 }
-    
+        
     @property
     def product_package(self):
         if self.account_plan:
@@ -1852,6 +1854,16 @@ class Outlet(BusinessEntity, FullTextSearchable):
         outlet.is_headquarter       = is_headquarter
         outlet.put()
     
+    def to_brief_dict(self):
+        return {
+                'outlet_name'       : self.name,
+                'company_name'      : self.company_name,
+                'business_reg_no'   : self.business_reg_no,
+                'address'           : self.address,
+                'email'             : self.email,
+                'office_phone'      : self.office_phone,
+                }
+    
     @staticmethod
     def list_by_merchant_acct(merchant_acct):
         return Outlet.query(ancestor = merchant_acct.create_ndb_key()).fetch(limit=model_conf.MAX_FETCH_RECORD)

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/ndb_models.py

@@ -139,8 +139,13 @@ class DictObject(object):
     def properties(self):
         return self.__dict__
 
-    def to_dict(self, full=True, show_key=True, dict_properties=None, excluded_dict_properties=None, gmt=lib_conf.DEFAULT_GMT, 
-                        datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, date_format=lib_conf.DEFAULT_DATE_FORMAT, time_format=lib_conf.DEFAULT_TIME_FORMAT, 
+    def to_dict(self, full=True, show_key=True, dict_properties=None, 
+                        excluded_dict_properties=None, 
+                        #gmt=lib_conf.DEFAULT_GMT,
+                        gmt=0, 
+                        datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, 
+                        date_format=lib_conf.DEFAULT_DATE_FORMAT, 
+                        time_format=lib_conf.DEFAULT_TIME_FORMAT, 
                         deep_level=99,
                         ):
         logger.info('calling DictObject.to_dict')
@@ -183,7 +188,8 @@ class DictModel(ndb.Model):
     def __str__(self):
         return '%s' % self.to_dict(deep_level=1) 
 
-    def to_dict(self, full=False, show_key=True, dict_properties=None, excluded_dict_properties=None, gmt=lib_conf.DEFAULT_GMT, 
+    def to_dict(self, full=False, show_key=True, dict_properties=None, excluded_dict_properties=None, 
+                        gmt=0, 
                         datetime_format=lib_conf.DEFAULT_DATETIME_FORMAT, 
                         date_format=lib_conf.DEFAULT_DATE_FORMAT,time_format=lib_conf.DEFAULT_TIME_FORMAT,
                         deep_level=99,

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/rating_models.py

@@ -12,6 +12,7 @@ from datetime import datetime, timedelta
 import logging
 from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.model_decorators import model_transactional
+from trexlib.utils.common.date_util import convert_date_to_datetime
 
 #logger = logging.getLogger('model')
 logger = logging.getLogger('target_debug')
@@ -34,13 +35,34 @@ class TransactionRating(RatingBase):
     
     created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
     
-    dict_properties         = ['transaction_id','rating_result', 'remarks', 'industry', 'score',
+    dict_properties         = ['transaction_id','rating_result', 'remarks', 'industry', 'score', 'created_datetime',
                                ]
     
     @property
     def merchant_acct_entity(self):
         return self.merchant_acct.get()
     
+    @property
+    def user_acct_key(self):
+        return self.user_acct.urlsafe().decode('utf-8')
+    
+    @staticmethod
+    def list_transaction_by_date(enquiry_date, outlet=None,  offset=0, limit=conf.PAGINATION_SIZE, return_with_cursor=False, start_cursor=None):
+        start_datetime  = convert_date_to_datetime(enquiry_date)
+        end_datetime    = start_datetime + timedelta(days=1)
+        query = TransactionRating.query(
+                        ndb.AND(
+                            TransactionRating.outlet==outlet.create_ndb_key(),
+                            TransactionRating.created_datetime>=start_datetime,
+                            TransactionRating.created_datetime<end_datetime,
+                        ))
+        if return_with_cursor:
+            (result, next_cursor) = TransactionRating.list_all_with_condition_query(query, order_by=TransactionRating.created_datetime, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return query.order(TransactionRating.created_datetime).fetch(offset=offset, limit=limit)
+    
     @staticmethod
     @model_transactional(desc="update rating changes")
     def create(user_acct, transaction_id, rating_result={}, 
@@ -321,7 +343,11 @@ class OutletRatingResult(RatingResult):
     outlet                  = ndb.KeyProperty(name="outlet", kind=Outlet)
     
     
-    dict_properties         = ['total_rating_count', 'rating_result', 'previous_rating_result', 'modified_datetime',]
+    dict_properties         = ['total_rating_count', 'rating_result', 'previous_rating_result', 'modified_datetime', 'outlet_key']
+    
+    @property
+    def outlet_key(self):
+        return self.outlet.urlsafe().decode('utf-8')
     
     @staticmethod
     def get_by_outlet(outlet):

trex_model-1.6.11/trexmodel/models/datastore/support_models.py

@@ -0,0 +1,32 @@
+'''
+Created on 28 Jul 2025
+
+@author: jacklok
+'''
+
+from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
+from google.cloud import ndb
+import logging
+
+#logger = logging.getLogger('model')
+logger = logging.getLogger('target_debug')
+
+class SupportReportBase(BaseNModel, DictModel):
+    activation_code                 = ndb.StringProperty(required=False)
+    platform                        = ndb.StringProperty(required=True)
+    error_message                   = ndb.TextProperty(required=False)
+    stack_trace                     = ndb.TextProperty(required=False)
+    reported_datetime               = ndb.DateTimeProperty(required=True, auto_now=True)
+    
+    
+    
+class ErrorReport(SupportReportBase):
+    
+    @staticmethod
+    def create(platform, error_message, activation_code=None, stack_trace=None, ):
+        ErrorReport(
+            activation_code     = activation_code,
+            platform            = platform,
+            error_message       = error_message,
+            stack_trace         = stack_trace, 
+            ).put()

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/datastore/transaction_models.py

@@ -188,13 +188,29 @@ class SalesTransaction(BaseNModel, DictModel):
         return customer_transaction
     
     @classmethod
-    def list_outlet_transaction(cls, transact_outlet, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
-        if reverse_order:
-            query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key())).order(-cls.transact_datetime)
+    def list_outlet_transaction(cls, transact_outlet, enquiry_date=None, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):
+        if enquiry_date:
+            enquiry_datetime        = datetime.combine(enquiry_date, datetime.min.time())
+            next_enquiry_datetime   = enquiry_datetime + timedelta(days=1)
+            query = cls.query(ndb.AND(
+                                    cls.transact_datetime  >= enquiry_datetime,
+                                    cls.transact_datetime  <  next_enquiry_datetime,
+                                    cls.transact_outlet==transact_outlet.create_ndb_key())
+                                )
+            if reverse_order:
+                query = query.order(-cls.transact_datetime)
+            else:
+                query = query.order(cls.transact_datetime)
+            
+            return cls.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
         else:
-            query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key())).order(cls.transact_datetime)
-        
-        return cls.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
+            query = cls.query(ndb.AND(cls.transact_outlet==transact_outlet.create_ndb_key())).order(-cls.transact_datetime)
+            if reverse_order:
+                query = query.order(-cls.transact_datetime)
+            else:
+                query = query.order(cls.transact_datetime)
+            
+            return cls.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
     @classmethod
     def count_outlet_transaction(cls, transact_outlet, limit=conf.MAX_FETCH_RECORD):

{trex_model-1.6.9 → trex_model-1.6.11}/trexmodel/models/merchant_helpers.py

@@ -15,6 +15,7 @@ def construct_merchant_acct_info(merchant_acct, referrer_code=None):
                                 'account_code'  : merchant_acct.account_code,
                                 'currency'      : merchant_acct.currency_code,
                                 'locale'        : merchant_acct.locale,
+                                'gmt_hour'      : merchant_acct.gmt_hour,   
                                 }
     
     outlet_list = Outlet.list_by_merchant_acct(merchant_acct)
@@ -229,6 +230,7 @@ def construct_setting_by_outlet(outlet, device_setting=None, is_pos_device=False
                                 'account_code'  : merchant_acct.account_code,
                                 'currency'      : merchant_acct.currency_code,
                                 'locale'        : merchant_acct.locale,    
+                                'gmt_hour'      : merchant_acct.gmt_hour,    
                                 }
     
     logger.info('is_pos_device=%s', is_pos_device)
@@ -287,11 +289,12 @@ def construct_setting_by_outlet(outlet, device_setting=None, is_pos_device=False
                                         'is_rounding_required'  : d.is_rounding_required,
                                         })
     
-    account_settings['assigned_service_charge_setup']   = outlet.service_charge_settings
-    account_settings['assigned_tax_setup']              = outlet.assigned_tax_setup
-    account_settings['dinning_table_list']              = outlet.assigned_dinning_table_list
-    account_settings['show_dinning_table_occupied']     = outlet.show_dinning_table_occupied
-    account_settings['payment_methods']                 = pos_payment_method_json
+    if is_pos_device:
+        account_settings['assigned_service_charge_setup']   = outlet.service_charge_settings
+        account_settings['assigned_tax_setup']              = outlet.assigned_tax_setup
+        account_settings['dinning_table_list']              = outlet.assigned_dinning_table_list
+        account_settings['show_dinning_table_occupied']     = outlet.show_dinning_table_occupied
+        account_settings['payment_methods']                 = pos_payment_method_json
     
     
     outlet_details = {
@@ -305,7 +308,8 @@ def construct_setting_by_outlet(outlet, device_setting=None, is_pos_device=False
                     'email'                      : outlet.email,
                     'phone'                      : outlet.office_phone,
                     'website'                    : merchant_acct.website or '',  
-                        
+                    'industry_type'              : merchant_acct.industry,
+                    'gmt_hour'                   : merchant_acct.gmt_hour,   
                     }
     
     program_configurations = {