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

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

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

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

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

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

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/customer_models.py

@@ -768,7 +768,7 @@ class CustomerMembership(BaseNModel, DictModel):
     renewed_outlet              = ndb.KeyProperty(name="renewed_outlet", kind=Outlet)
     
     dict_properties     =[
-                            'customer', 'merchant_membership_entity', 'entitled_date', 'expiry_date'
+                            'customer', 'merchant_membership_entity', 'entitled_date', 'expiry_date', 'merchant_membership_key'
                             ]
     
     @property
@@ -1001,7 +1001,7 @@ class CustomerTierMembership(BaseNModel, DictModel):
     valid                       = ndb.BooleanProperty(required=True, default=True)
     
     dict_properties     =[
-                            'customer', 'merchant_tier_membership_entity', 'entitled_date', 'expiry_date', 'valid'
+                            'customer', 'merchant_tier_membership_entity', 'entitled_date', 'expiry_date', 'valid', 'merchant_tier_membership_key',
                             ] 
     
     

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

@@ -194,21 +194,21 @@ def create_reward_transaction(customer, transact_outlet=None, sales_amount=.0, t
         
     return __start_transaction_for_customer_transaction()
 
-def give_reward_from_sales_transaction(customer, sales_transaction):
+def give_reward_from_sales_transaction(customer, sales_transaction, for_testing=False):
     
     logger.debug('---give_reward_from_sales_transaction---')
     
     @model_transactional(desc='give_reward_from_sales_transaction')
     def __start_transaction(customer, sales_transaction):
-        customer_transaction = CustomerTransaction.create_from_sales_transaction(customer, sales_transaction)
-        
-        trigger_check_reward_success = trigger_spending_reward_for_transaction(customer_transaction)
-        
-        logger.debug('trigger_check_reward_success=%s', trigger_check_reward_success)
-        
-        if trigger_check_reward_success:
-            create_transaction_message(customer_transaction)
-            create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, streamed_datetime=sales_transaction.transact_datetime)
+        customer_transaction = CustomerTransaction.create_from_sales_transaction(customer, sales_transaction, for_testing=for_testing)
+        if for_testing==False:
+            trigger_check_reward_success = trigger_spending_reward_for_transaction(customer_transaction)
+            
+            logger.debug('trigger_check_reward_success=%s', trigger_check_reward_success)
+            
+            if trigger_check_reward_success:
+                create_transaction_message(customer_transaction)
+                create_merchant_customer_transaction_upstream_for_merchant(customer_transaction, streamed_datetime=sales_transaction.transact_datetime)
         
         return customer_transaction
     

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/lucky_draw_models.py

@@ -569,11 +569,11 @@ class LuckyDrawTicket(BaseNModel, DictModel):
         return LuckyDrawTicket.query(ndb.AND(LuckyDrawTicket.merchant_acct==merchant_acct.create_ndb_key())).count(limit=model_conf.MAX_FETCH_RECORD)
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct(merchant_acct, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         query = LuckyDrawTicket.query(ndb.AND(LuckyDrawTicket.merchant_acct==merchant_acct.create_ndb_key(),))
-        (result, next_cursor) = LuckyDrawTicket.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        return LuckyDrawTicket.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+        
         
-        return (result, next_cursor)
     
     @staticmethod
     def create_for_customer_from_sales_amount(customer_acct, sales_amount=None, merchant_acct=None, transact_outlet=None):

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/marketing_models.py

@@ -390,7 +390,7 @@ class MerchantNewsFile(BaseNModel, DictModel):
         merchant_news.start_date            = start_date
         merchant_news.end_date              = end_date
         merchant_news.completed_status      = program_conf.MERCHANT_NEWS_STATUS_BASE
-        merchant_news.modified_by           = modified_by
+        merchant_news.modified_by           = modified_by.create_ndb_key()
         merchant_news.modified_by_username  = modified_by_username
         merchant_news.modified_datetime     = datetime.utcnow()
         

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/merchant_models.py

@@ -300,6 +300,10 @@ class MerchantAcct(MerchantMin):
                 return self.program_settings.get('referral_program').get('referee_promote_image')        
         
     
+    @property
+    def is_rating_review_enabled(self):
+        return self.program_settings.get('rating_review', False)
+    
     @staticmethod
     def default_program_settings():
         return {
@@ -307,7 +311,7 @@ class MerchantAcct(MerchantMin):
                 'days_of_repeat_purchase_measurement'   : 7,
                 'membership_renew_advance_day'          : 7,
                 'membership_renew_late_day'             : 30,
-                
+                'rating_review'                         : False,
                 }
     
     def update_referrer_program_promote_text(self, 
@@ -1328,8 +1332,14 @@ class MerchantAcct(MerchantMin):
         
     
     @staticmethod
-    def list(offset=0, limit=10):
-        return MerchantAcct.query().order(-MerchantAcct.registered_datetime).fetch(offset=offset, limit=limit)
+    def list(offset=None, start_cursor=None, return_with_cursor=False, limit = model_conf.MAX_FETCH_RECORD):
+        if return_with_cursor:
+            query = MerchantAcct.query()
+            (result, next_cursor) = MerchantAcct.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return MerchantAcct.query().order(-MerchantAcct.registered_datetime).fetch(offset=offset, limit=limit)
     
     def delete_and_related(self):
         

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/pos_models.py

@@ -17,18 +17,34 @@ class POSSetting(BaseNModel,DictModel):
     '''
     merchant_acct as ancestor
     '''
-    device_name             = ndb.StringProperty(required=True)
-    activation_code         = ndb.StringProperty(required=True)
-    device_id               = ndb.StringProperty(required=False)
-    activated               = ndb.BooleanProperty(required=True, default=False)
-    assigned_outlet         = ndb.KeyProperty(name="assigned_outlet", kind=Outlet)
+    device_name                     = ndb.StringProperty(required=True)
+    activation_code                 = ndb.StringProperty(required=True)
+    device_id                       = ndb.StringProperty(required=False)
+    enable_lock_screen              = ndb.BooleanProperty(required=True, default=False)
+    lock_screen_code                = ndb.StringProperty(required=False, default='')
+    lock_screen_length_in_second    = ndb.IntegerProperty(required=False, default=30)
+    activated                       = ndb.BooleanProperty(required=True, default=False)
+    assigned_outlet                 = ndb.KeyProperty(name="assigned_outlet", kind=Outlet)
     #assigned_catalogue      = ndb.KeyProperty(name="assigned_outlet", kind=ProductCatalogue)
-    created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
-    activated_datetime      = ndb.DateTimeProperty(required=False)
-    testing                 = ndb.BooleanProperty(required=False, default=False)
+    created_datetime                = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    activated_datetime              = ndb.DateTimeProperty(required=False)
+    testing                         = ndb.BooleanProperty(required=False, default=False)
+    device_details                  = ndb.JsonProperty()
     
     dict_properties = ['device_name', 'activation_code', 'device_id', 'activated', 'assigned_outlet_key', 
-                       'activated_datetime', 'created_datetime']
+                       'enable_lock_screen', 'lock_screen_code', 'lock_screen_length_in_second', 
+                       'device_details', 'activated_datetime', 'created_datetime']
+    
+    @property
+    def device_tokens_list(self):
+        _tokens_list = []
+        
+        if self.device_details:
+            
+            for k,v in self.device_details.items():
+                for dd in v:
+                    _tokens_list.append(dd.get('device_token'))
+        return _tokens_list
     
     @property
     def is_test_setting(self):
@@ -83,6 +99,32 @@ class POSSetting(BaseNModel,DictModel):
         
         return pos_setting
     
+    def update_device_details(self, platform, device_token):
+        if self.device_details:
+            found_device_details_list_by_platform = self.device_details.get(platform)
+            if found_device_details_list_by_platform:
+                self.device_details[platform] = {
+                                                'device_token'              : device_token,
+                                                'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                }
+                                                        
+                
+                    
+            else:
+                self.device_details[platform] = {
+                                                'device_token'              : device_token,
+                                                'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                }
+        else:
+            self.device_details = {
+                                    platform :  {
+                                                    'device_token'              : device_token,
+                                                    'last_updated_datetime'     : datetime.utcnow().strftime("%d-%m-%Y %H:%M:%S"),
+                                                    }
+                                                
+                                }
+        self.put() 
+    
     @staticmethod
     def get_by_activation_code(activation_code):
         pos_setting = POSSetting.query(POSSetting.activation_code ==activation_code).get()

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/prepaid_models.py

@@ -640,4 +640,34 @@ class CustomerPrepaidReward(BaseNModel,DictModel):
     def delete_all_by_customer(customer):
         query = CustomerPrepaidReward.query(ancestor=customer.create_ndb_key())
         CustomerPrepaidReward.delete_multiples(query)
+        
+    @staticmethod
+    def list_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    CustomerPrepaidReward.topup_datetime>=datetime_range_start,
+                    CustomerPrepaidReward.topup_datetime<datetime_range_end,
+                    ))
+        else:
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+            
+        return CustomerPrepaidReward.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+    
+    @staticmethod
+    def count_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, limit=conf.MAX_FETCH_RECORD,):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    CustomerPrepaidReward.topup_datetime>=datetime_range_start,
+                    CustomerPrepaidReward.topup_datetime<datetime_range_end,
+                    ))
+        else:
+            query = CustomerPrepaidReward.query(ndb.AND(
+                    CustomerPrepaidReward.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+            
+        return CustomerPrepaidReward.count_with_condition_query(query, limit)    
     

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/rating_models.py

@@ -10,6 +10,7 @@ from trexmodel.models.datastore.user_models import User
 from trexconf import conf
 from datetime import datetime, timedelta
 import logging
+from trexmodel.models.datastore.transaction_models import SalesTransaction
 
 logger = logging.getLogger('model')
 
@@ -65,10 +66,11 @@ class OutletRating(RatingBase):
         return OutletRating.query(ndb.AND(OutletRating.merchant_acct==merchant_acct.create_ndb_key(), OutletRating.updated==True, OutletRating.modified_datetime>checking_datetime_from)).fetch(limit=conf.MAX_FETCH_RECORD)
     
     @staticmethod
-    def create(user_acct, outlet, service_rating=.5, ambience_rating=.5, food_rating=.5, value_rating=.5):
+    def create(user_acct, outlet, merchant_acct=None, service_rating=.5, ambience_rating=.5, food_rating=.5, value_rating=.5):
         outlet_rating = OutletRating.get_user_rating_by_outlet(user_acct, outlet)
         if outlet_rating is None:
-            merchant_acct   = outlet.merchant_acct_entity
+            if merchant_acct is None:
+                merchant_acct   = outlet.merchant_acct_entity
             outlet_rating       = OutletRating(
                                             user_acct           = user_acct.create_ndb_key(),
                                             merchant_acct       = merchant_acct.create_ndb_key(),
@@ -133,6 +135,65 @@ class OutletRating(RatingBase):
         
         return OutletRating.__calculate_rating(merchant_rating_list)
 
+class TransactionRating(RatingBase):
+    outlet                              = ndb.KeyProperty(name="outlet", kind=Outlet)
+    merchant_acct                       = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
+    transaction_id                      = ndb.StringProperty(required=True)
+    service_rating                      = ndb.FloatProperty(required=True, default=.0)
+    ambience_rating                     = ndb.FloatProperty(required=True, default=.0)
+    food_rating                         = ndb.FloatProperty(required=True, default=.0)
+    value_rating                        = ndb.FloatProperty(required=True, default=.0)
+    created_datetime                    = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    
+    dict_properties         = ['transaction_id','service_rating', 'ambience_rating', 'food_rating','value_rating',
+                               ]
+    
+    @staticmethod
+    def create(user_acct, transaction_id, service_rating=.5, ambience_rating=.5, food_rating=.5, value_rating=.5, for_testing=False):
+        sales_transaction = SalesTransaction.get_by_transaction_id(transaction_id)
+        if sales_transaction is not None:
+            outlet         = sales_transaction.transact_outlet_entity
+            merchant_acct  = sales_transaction.transact_merchant_acct
+            
+            transaction_rating = TransactionRating.get_by_transaction_id(transaction_id)
+            if transaction_rating is None:
+                transaction_rating       = TransactionRating(
+                                                user_acct           = user_acct.create_ndb_key(),
+                                                merchant_acct       = merchant_acct.create_ndb_key(),
+                                                outlet              = outlet.create_ndb_key(),
+                                                transaction_id      = transaction_id,
+                                                
+                                                service_rating      = service_rating,
+                                                ambience_rating     = ambience_rating,
+                                                food_rating         = food_rating,
+                                                value_rating        = value_rating,
+                                                
+                                                )
+                
+            else:
+                transaction_rating.service_rating   = service_rating
+                transaction_rating.ambience_rating  = ambience_rating
+                transaction_rating.food_rating      = food_rating
+                transaction_rating.value_rating     = value_rating
+                
+            if for_testing==False:
+                transaction_rating.put()
+                
+                OutletRating.create(user_acct, outlet, 
+                                        merchant_acct   = merchant_acct,
+                                        service_rating  = service_rating, 
+                                        ambience_rating = ambience_rating, 
+                                        food_rating     = food_rating, 
+                                        value_rating    = value_rating,
+                                        )
+                MerchantRatingResult.update(merchant_acct)
+    
+    
+    @staticmethod
+    def get_by_transaction_id(transaction_id):
+        return TransactionRating.query(ndb.AND(TransactionRating.transaction_id==transaction_id)).get()
+    
+            
 class RatingResult(BaseNModel, DictModel):
     total_rating_count      = ndb.IntegerProperty(required=True, default=0)
     rating_result           = ndb.JsonProperty()

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/redeem_models.py

@@ -20,6 +20,7 @@ from trexmodel.models.datastore.transaction_models import CustomerTransaction
 from trexmodel.models.datastore.prepaid_models import CustomerPrepaidReward
 from trexmodel.models.datastore.redemption_catalogue_models import RedemptionCatalogue
 from trexmodel.models.datastore import user_models
+from _ast import Is
 
 
 logger = logging.getLogger('debug')
@@ -188,18 +189,47 @@ class CustomerRedemption(BaseNModel, DictModel):
         
     def to_voucher_upstream_info_list(self):
         upstream_info_list = []
-        for merchant_voucher_key, voucher_redeemed_details in  self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER).get('vouchers').items():
-            upstream_info_list.append(CustomerRedeemedItemUpstream(
-                                        customer_key        = self.redeemed_customer_key,
-                                        merchant_key        = self.redeemed_merchant_acct_key,
-                                        redeemed_outlet_key = self.redeemed_outlet_key,
-                                        transaction_id      = self.transaction_id,
-                                        reward_format       = self.reward_format,
-                                        redeemed_datetime   = self.redeemed_datetime,
-                                        redeemed_amount     = voucher_redeemed_details.get('amount'),
-                                        voucher_key         = merchant_voucher_key,
-                                    ))    
-        return upstream_info_list
+        try:
+            if self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER) is not None:
+                
+                for merchant_voucher_key, voucher_redeemed_details in  self.redeemed_summary.get(program_conf.REWARD_FORMAT_VOUCHER).get('vouchers').items():
+                    amount = 1
+                    if isinstance(voucher_redeemed_details, int):
+                        amount = voucher_redeemed_details
+                    elif isinstance(voucher_redeemed_details, dict):
+                        amount = voucher_redeemed_details.get('amount')
+                        
+                    
+                    upstream_info_list.append(CustomerRedeemedItemUpstream(
+                                                customer_key        = self.redeemed_customer_key,
+                                                merchant_key        = self.redeemed_merchant_acct_key,
+                                                redeemed_outlet_key = self.redeemed_outlet_key,
+                                                transaction_id      = self.transaction_id,
+                                                reward_format       = self.reward_format,
+                                                redeemed_datetime   = self.redeemed_datetime,
+                                                redeemed_amount     = amount,
+                                                voucher_key         = merchant_voucher_key,
+                                            )) 
+            else:
+                for merchant_voucher_key, amount in  self.redeemed_summary.get('vouchers').items():
+                    upstream_info_list.append(CustomerRedeemedItemUpstream(
+                                                customer_key        = self.redeemed_customer_key,
+                                                merchant_key        = self.redeemed_merchant_acct_key,
+                                                redeemed_outlet_key = self.redeemed_outlet_key,
+                                                transaction_id      = self.transaction_id,
+                                                reward_format       = self.reward_format,
+                                                redeemed_datetime   = self.redeemed_datetime,
+                                                redeemed_amount     = amount,
+                                                voucher_key         = merchant_voucher_key,
+                                            ))
+        
+            return upstream_info_list
+        
+        except:
+            logger.error('failed to process redeem summary where self.redeemed_summary=%s', self.redeemed_summary)
+            raise 
+               
+        
     
     def revert(self, reverted_by, reverted_datetime=None):
         self.status = program_conf.REWARD_STATUS_REVERTED
@@ -244,7 +274,7 @@ class CustomerRedemption(BaseNModel, DictModel):
         return result
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_ranage_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct(merchant_acct, datetime_ranage_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         if is_not_empty(datetime_ranage_start) and is_not_empty(datetime_range_end):
             query = CustomerRedemption.query(ndb.AND(
                     CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
@@ -255,9 +285,9 @@ class CustomerRedemption(BaseNModel, DictModel):
             query = CustomerRedemption.query(ndb.AND(
                     CustomerRedemption.merchant_acct==merchant_acct.create_ndb_key(),
                     ))
-        (result, next_cursor) = CustomerRedemption.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        return CustomerRedemption.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
         
-        return (result, next_cursor)
+        #return (result, next_cursor)
     
     @staticmethod
     def list_merchant_transaction(merchant_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True):

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

@@ -151,6 +151,37 @@ class CustomerEntitledReward(RewardEntitlement):
     def delete_all_by_customer(cls, customer):
         query = cls.query(ancestor=customer.create_ndb_key())
         cls.delete_multiples(query)    
+    
+    @staticmethod
+    def count_by_merchant_acct(cls, merchant_acct, datetime_ranage_start=None, datetime_range_end=None):
+        if datetime_ranage_start and datetime_range_end:
+            result = cls.query(ndb.AND(
+                        cls.merchant_acct==merchant_acct.create_ndb_key(),
+                        cls.rewarded_datetime>=datetime_ranage_start,
+                        cls.rewarded_datetime<datetime_range_end,
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+        else:
+            result = cls.query(ndb.AND(
+                        cls.merchant_acct==merchant_acct.create_ndb_key(),
+                        )).count(limit=conf.MAX_FETCH_RECORD)
+    
+        
+        return result
+    
+    @classmethod
+    def list_by_merchant_acct(cls, merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
+        if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
+            query = cls.query(ndb.AND(
+                    cls.merchant_acct==merchant_acct.create_ndb_key(),
+                    cls.rewarded_datetime>=datetime_range_start,
+                    cls.rewarded_datetime<datetime_range_end,
+                    ))
+        else:
+            query = cls.query(ndb.AND(
+                    cls.merchant_acct==merchant_acct.create_ndb_key(),
+                    ))
+        return cls.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
+        
 
 class CustomerCountableReward(CustomerEntitledReward):
     reward_amount               = ndb.FloatProperty(required=True, default=0)
@@ -400,7 +431,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     
         
         return result
-    
+    '''
     @staticmethod
     def list_by_merchant_acct(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50,):
         if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
@@ -417,7 +448,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         
     
     @staticmethod
-    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None):
+    def list_by_merchant_acct_with_cursor(merchant_acct, datetime_range_start=None, datetime_range_end=None, offset=0, limit=50, start_cursor=None, return_with_cursor=True):
         if is_not_empty(datetime_range_start) and is_not_empty(datetime_range_end):
             query = CustomerEntitledVoucher.query(ndb.AND(
                     CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
@@ -428,10 +459,10 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
             query = CustomerEntitledVoucher.query(ndb.AND(
                     CustomerEntitledVoucher.merchant_acct==merchant_acct.create_ndb_key(),
                     ))
-        (result, next_cursor) = CustomerEntitledVoucher.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=True, offset=offset, limit=limit)
+        (result, next_cursor) = CustomerEntitledVoucher.list_all_with_condition_query(query, start_cursor=start_cursor, return_with_cursor=return_with_cursor, offset=offset, limit=limit)
         
         return (result, next_cursor)
-    
+    '''
     @staticmethod
     def count_redeemed_by_merchant_voucher_and_passed_redeemed_datetime(customer, merchant_voucher, passed_redeemed_datetime):
         

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/datastore/transaction_models.py

@@ -185,7 +185,7 @@ class CustomerTransaction(SalesTransaction):
     
     is_from_instant_transaction = ndb.BooleanProperty(required=False, default=False)
     is_reward_redeemed          = ndb.BooleanProperty(required=False, default=False)
-    
+    is_rating_review_enabled    = ndb.BooleanProperty(required=False, default=False)
     
     
     is_membership_purchase      = ndb.BooleanProperty(required=False, default=False)
@@ -204,6 +204,7 @@ class CustomerTransaction(SalesTransaction):
                                'transact_datetime', 'created_datetime',  'transact_outlet_key', 'is_revert', 'reverted_datetime', 'reverted_by_username',
                                'transact_by', 'transact_by_username', 'is_reward_redeemed', 'is_sales_transaction', 'allow_to_revert',
                                'is_membership_purchase', 'purchased_merchant_membership_key', 'is_tier_membership_upgraded', 'upgraded_merchant_tier_membership_key',
+                               'is_rating_review_enabled',
                                ]
     
     def to_transaction_details_json(self):
@@ -337,12 +338,14 @@ class CustomerTransaction(SalesTransaction):
                                    )        
     
     @staticmethod
-    def create_from_sales_transaction(customer, sales_transaction):
+    def create_from_sales_transaction(customer, sales_transaction, for_testing=False):
         if sales_transaction:
+            merchant_acct               = customer.registered_merchant_acct
+            is_rating_review_enabled    = merchant_acct.is_rating_review_enabled
             customer_transaction = CustomerTransaction(
                                                         parent                          = customer.create_ndb_key(),
                                                         
-                                                        transact_merchant               = customer.registered_merchant_acct.create_ndb_key(),
+                                                        transact_merchant               = merchant_acct.create_ndb_key(),
                                                         transact_outlet                 = sales_transaction.transact_outlet,
                                                         
                                                         tax_amount                      = sales_transaction.tax_amount,
@@ -358,7 +361,7 @@ class CustomerTransaction(SalesTransaction):
                                                         
                                                         transact_datetime               = sales_transaction.transact_datetime,
                                                         is_from_instant_transaction     = True,
-                                                        
+                                                        is_rating_review_enabled        = is_rating_review_enabled
                                                         #is_sales_transaction            = True,
                                                         #allow_to_revert                 = True,
                                                         #is_membership_purchase          = False,
@@ -368,9 +371,10 @@ class CustomerTransaction(SalesTransaction):
                                                         )
         
         
-            customer_transaction.put()
-            sales_transaction.used = True
-            sales_transaction.put()
+            if for_testing==False:
+                customer_transaction.put()
+                sales_transaction.used = True
+                sales_transaction.put()
             return customer_transaction
     
     @staticmethod

{trex-model-1.5.16 → trex-model-1.5.19}/trexmodel/models/merchant_helpers.py

@@ -246,6 +246,7 @@ def construct_setting_by_outlet(outlet, device_setting=None, is_pos_device=False
                 'outlet_details'                    : outlet_details,
                 'program_configurations'            : program_configurations,
                 'membership_configurations'         : merchant_acct.membership_configuration, 
+                'rating_review'                     : merchant_acct.program_settings.get('rating_review', False),
                 } 
     if device_setting:
         setting['activation_code']              = device_setting.activation_code