trex-model 1.6.1__tar.gz → 1.6.3__tar.gz

{trex_model-1.6.1 → trex_model-1.6.3}/PKG-INFO

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

{trex_model-1.6.1 → trex_model-1.6.3}/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.1',
+     version='1.6.3',
      author="Jack Lok",
      author_email="sglok77@gmail.com",
      description="TRex database module package",

{trex_model-1.6.1 → trex_model-1.6.3}/trex_model.egg-info/PKG-INFO

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

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/analytic_models.py

@@ -17,8 +17,9 @@ class UpstreamData(BaseNModel, DictModel):
     stream_content          = ndb.JsonProperty(required=True)
     is_sent                 = ndb.BooleanProperty(required=True, default=False)
     created_datetime        = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    partition_datetime      = ndb.DateTimeProperty(required=False)
     
-    dict_properties = ['table_template_name', 'dataset_name', 'table_name', 'stream_content', 'is_sent']
+    dict_properties = ['table_template_name', 'dataset_name', 'table_name', 'stream_content', 'is_sent', 'partition_datetime']
     
     @staticmethod
     def list_not_send(offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
@@ -27,6 +28,12 @@ class UpstreamData(BaseNModel, DictModel):
         return UpstreamData.list_all_with_condition_query(query, offset=offset, start_cursor=start_cursor, return_with_cursor=return_with_cursor, keys_only=keys_only, limit=limit)
 
 
+    @staticmethod
+    def list_all(offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
+        query = UpstreamData.query()
+        
+        return UpstreamData.list_all_with_condition_query(query, offset=offset, start_cursor=start_cursor, return_with_cursor=return_with_cursor, keys_only=keys_only, limit=limit)
+
     @staticmethod
     def list_by_date_range(datetime_start, datetime_end, offset=0, limit=model_conf.MAX_FETCH_RECORD, start_cursor=None,return_with_cursor=False, keys_only=False):
         
@@ -43,6 +50,10 @@ class UpstreamData(BaseNModel, DictModel):
     def count_not_sent(limit=model_conf.MAX_FETCH_RECORD):
         return UpstreamData.query(ndb.AND(UpstreamData.is_sent==False)).count(limit = limit)
     
+    @staticmethod
+    def count_all(limit=model_conf.MAX_FETCH_RECORD):
+        return UpstreamData.query().count(limit = limit)
+    
     @staticmethod
     def count_by_date_range(datetime_start, datetime_end, limit=model_conf.MAX_FETCH_RECORD):
         datetime_end = datetime_end + timedelta(days=1)
@@ -53,13 +64,14 @@ class UpstreamData(BaseNModel, DictModel):
                                 )).count(limit = limit)
     
     @staticmethod
-    def create(merchant_acct, dataset_name, table_name, table_template_name, stream_content):
+    def create(merchant_acct, dataset_name, table_name, table_template_name, stream_content, partition_datetime=None):
         UpstreamData(
                     merchant_acct       = merchant_acct.create_ndb_key(), 
                     table_template_name = table_template_name,
                     dataset_name        = dataset_name,
                     table_name          = table_name,
                     stream_content      = stream_content,
+                    partition_datetime  = partition_datetime,
                     ).put()
                     
 

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/customer_models.py

@@ -757,7 +757,7 @@ class Customer(BaseNModel, DictModel, FullTextSearchable):
     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)
-        self.put()    
+        self.put()
     
 class CustomerMembership(BaseNModel, DictModel):
     '''

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/helper/reward_transaction_helper.py

@@ -1265,7 +1265,7 @@ def update_transaction_all_entitled_reward_summary(transaction_id):
         
         if vouchers_list:
             logger.debug('found entitled voucher list')
-            entiteld_voucher_brief          = EntitledVoucherSummary()
+            entiteld_voucher_brief          = EntitledVoucherSummary(transaction_id=transaction_id)
             
             for customer_voucher in vouchers_list:
                 merchant_voucher = customer_voucher.entitled_voucher_entity

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/merchant_models.py

@@ -23,8 +23,8 @@ import pytz
 from trexlib.utils.common.cache_util import deleteFromCache, getFromCache,\
     setCache
 
-logger = logging.getLogger('model')
-#logger = logging.getLogger('debug')
+#logger = logging.getLogger('model')
+logger = logging.getLogger('target_debug')
 
 class BusinessEntity(BaseNModel, DictModel):
     company_name                = ndb.StringProperty(required=False)
@@ -81,6 +81,7 @@ class MerchantAcct(MerchantMin):
     published_tier_program_configuration            = ndb.JsonProperty()
     
     approved_partner_merchant_configuration         = ndb.JsonProperty()
+    partner_merchant_history_configuration          = ndb.JsonProperty()
     
     membership_configuration                        = ndb.JsonProperty()
     tier_membership_configuration                   = ndb.JsonProperty()
@@ -115,7 +116,7 @@ class MerchantAcct(MerchantMin):
                        'dashboard_stat_figure', 'program_settings', 'is_tier_membership_configured', 'website', 
                        'product_package', 'loyalty_package','pos_package', 'account_plan','outlet_count', 'outlet_limit',
                        'published_redemption_catalogue_configuration', 'partner_redemption_catalogue_configuration',
-                       'approved_partner_merchant_configuration',
+                       'approved_partner_merchant_configuration', 'partner_merchant_history_configuration',
                        'logo_public_url'
                        ]
     
@@ -877,6 +878,12 @@ class MerchantAcct(MerchantMin):
     def update_partner_merchant_configuration(self, partner_merchant_configuration):
         merchant_acct_key = partner_merchant_configuration.get('merchant_acct_key')
         
+        if is_empty(self.partner_merchant_history_configuration):
+            self.partner_merchant_history_configuration = {
+                                                                'partners':{},
+                                                                'count':0
+                                                                }
+        
         if is_empty(self.approved_partner_merchant_configuration):
             self.approved_partner_merchant_configuration = {
                                                 'partners'              :{
@@ -884,15 +891,33 @@ class MerchantAcct(MerchantMin):
                                                                             },
                                                 'count'               : 1,
                                                 } 
+            
+            self.partner_merchant_history_configuration = {
+                                                'partners'              :{
+                                                                            merchant_acct_key  : partner_merchant_configuration,
+                                                                            },
+                                                'count'               : 1,
+                                                } 
                                             
         else:
+            
             existing_partner_merchant_dict  = self.approved_partner_merchant_configuration.get('partners')
-            partner_merchant_details = existing_partner_merchant_dict.get(merchant_acct_key) 
+            partner_merchant_history_dict   = self.partner_merchant_history_configuration.get('partners')
+            partner_merchant_details        = existing_partner_merchant_dict.get(merchant_acct_key)
+            
             if partner_merchant_details:
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
             else:
                 existing_partner_merchant_dict[merchant_acct_key] = partner_merchant_configuration
-                existing_partner_merchant_dict['count']+=existing_partner_merchant_dict['count']
+                self.approved_partner_merchant_configuration['count']+=self.approved_partner_merchant_configuration['count']
+            
+            partner_merchant_details        = partner_merchant_history_dict.get(merchant_acct_key) 
+            if partner_merchant_details:
+                partner_merchant_history_dict[merchant_acct_key] = partner_merchant_configuration
+            else:
+                partner_merchant_history_dict[merchant_acct_key] = partner_merchant_configuration
+            
+            self.partner_merchant_history_configuration['count']=len(self.partner_merchant_history_configuration['partners'])
                 
         self.put()  
         deleteFromCache(self.key_in_str)     
@@ -901,9 +926,17 @@ class MerchantAcct(MerchantMin):
         if self.approved_partner_merchant_configuration is not None:
             existing_partner_merchant_dict = self.approved_partner_merchant_configuration.get('partners')
             
-            if existing_partner_merchant_dict and existing_partner_merchant_dict.get(existing_partner_merchant_dict):
-                del existing_partner_merchant_dict[partner_merchant_acct_key]
-                self.approved_partner_merchant_configuration['count']-=1
+            logger.debug('existing_partner_merchant_dict=%s', existing_partner_merchant_dict)
+            
+            if existing_partner_merchant_dict:# and existing_partner_merchant_dict.get(existing_partner_merchant_dict):
+                for key in existing_partner_merchant_dict.keys():
+                    logger.debug('key=%s', key)
+                if partner_merchant_acct_key in existing_partner_merchant_dict:
+                    #existing_partner_merchant_dict.pop(partner_merchant_acct_key)
+                    del existing_partner_merchant_dict[partner_merchant_acct_key]
+                    self.approved_partner_merchant_configuration['count']-=1
+                else:
+                    logger.debug('%s not found', partner_merchant_acct_key)
         
         
     def update_approved_partner_redemption_catalogue(self, catalogue_configuration):

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/ndb_models.py

@@ -367,10 +367,11 @@ class BaseNModel(DictModel, NDBModel):
                                                  )
     
     @classmethod
-    def list_all_with_condition_query(cls, query, offset=0,  start_cursor=None, return_with_cursor=False, keys_only=False, 
-                 limit=model_conf.MAX_FETCH_RECORD):
+    def list_all_with_condition_query(cls, query, offset=0,  start_cursor=None, return_with_cursor=False, 
+                                      keys_only=False,limit=model_conf.MAX_FETCH_RECORD, order_by=None):
         
         
+        logger.debug('list_all: start_cursor=%s, order_by=%s, return_with_cursor=%s', start_cursor, order_by, return_with_cursor)
         
         if start_cursor or return_with_cursor:
             if is_not_empty(start_cursor):
@@ -379,12 +380,15 @@ class BaseNModel(DictModel, NDBModel):
             else:
                 start_cursor = ndb.Cursor()
             
-            (search_results, next_cursor, more)       = query.fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
+            if order_by:
+                (search_results, next_cursor, more)       = query.order(order_by).fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
+            else:
+                (search_results, next_cursor, more)       = query.fetch_page(page_size=limit, start_cursor=start_cursor, keys_only=keys_only)
             logger.debug('##########################################')
-            
             logger.debug('list_all: results=%s', search_results)
             logger.debug('list_all: next_cursor=%s', next_cursor)
             logger.debug('list_all: more=%s', more) 
+            logger.debug('list_all: return_with_cursor=%s', return_with_cursor) 
             
             logger.debug('##########################################')
             

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/partnership_models.py

@@ -9,14 +9,16 @@ from trexmodel.models.datastore.ndb_models import BaseNModel, DictModel
 import logging
 from trexmodel.models.datastore.merchant_models import MerchantAcct,\
     MerchantUser
-from trexconf import program_conf
-from datetime import datetime
+from trexconf import program_conf, conf
+from datetime import datetime, timedelta
 from trexlib.utils.string_util import is_not_empty
 from trexmodel.models.datastore.redemption_catalogue_models import RedemptionCatalogue
 from trexmodel.models.merchant_helpers import convert_points_between_merchants
 from trexmodel.models.datastore.user_models import User
 from trexlib.utils.common.cache_util import setCache, getFromCache,\
     deleteFromCache
+from trexlib.utils.common.date_util import convert_date_to_datetime
+
 
 
 logger = logging.getLogger('target_debug')
@@ -294,7 +296,7 @@ class PartnerLinked(BaseNModel, DictModel):
         if partner_merchant_account:
             logger.debug('partner company=%s', partner_merchant_account.company_name)
             
-            partner_merchant_account.remove_partner_merchant_configuration(self.key_in_str)
+            partner_merchant_account.remove_partner_merchant_configuration(self.merchant_key)
             
             for catalogue_key in self.redemption_catalogue_list:
                 partner_merchant_account.remove_partner_redeption_catalogue(catalogue_key)
@@ -322,22 +324,58 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
     '''
     This is used to record convert merchant point to partner merchant point
     '''
-    merchant_acct                   = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
-    partner_merchant_acct           = ndb.KeyProperty(name="partner_merchant_acct", kind=MerchantAcct)
+    merchant_acct                               = ndb.KeyProperty(name="merchant_acct", kind=MerchantAcct)
+    partner_merchant_acct                       = ndb.KeyProperty(name="partner_merchant_acct", kind=MerchantAcct)
     
     merchant_point_worth_value_in_currency      = ndb.FloatProperty(required=True, default=.0)
     partner_point_worth_value_in_currency       = ndb.FloatProperty(required=True, default=.0)
     
-    transact_point_amount           = ndb.FloatProperty(required=True)
-    transact_datetime               = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    transact_point_amount                       = ndb.FloatProperty(required=True)
+    transact_datetime                           = ndb.DateTimeProperty(required=True, auto_now_add=True)
+    
+    user_acct                                   = ndb.KeyProperty(name="user_acct", kind=User)
+    transaction_id                              = ndb.StringProperty(required=True)
+    reward_summary                              = ndb.JsonProperty()
+    
+    is_revert                                   = ndb.BooleanProperty(required=False, default=False)
+    reverted_datetime                           = ndb.DateTimeProperty(required=False)
+    reverted_by                                 = ndb.KeyProperty(name="reverted_by", kind=MerchantUser)
+    reverted_by_username                        = ndb.StringProperty(required=False)
+    
+    dict_properties = [
+                        'partner_merchant_acct_key', 'merchant_point_worth_value_in_currency', 'partner_point_worth_value_in_currency',
+                        'transact_point_amount', 'transact_datetime', 'reward_summary', 'transaction_id',
+                        ]
+    
+    @property
+    def merchant_acct_key(self):
+        return self.merchant_acct.urlsafe().decode('utf-8')
+    
+    @property
+    def partner_merchant_acct_key(self):
+        return self.partner_merchant_acct.urlsafe().decode('utf-8')
+    
+    @property
+    def merchant_acct_entity(self):
+        return self.merchant_acct.get()
+    
+    @property
+    def partner_merchant_acct_entity(self):
+        return self.partner_merchant_acct.get()
     
-    user_acct                       = ndb.KeyProperty(name="user_acct", kind=User)
+    @property
+    def user_acct_entity(self):
+        return self.user_acct.get()
+    
+    @property
+    def user_acct_reference_code(self):
+        return self.user_acct_entity.reference_code
     
     def convertion_rate(self)->float:
         return self.merchant_point_worth_value_in_currency/self.partner_point_worth_value_in_currency
     
     @staticmethod
-    def create(merchant_acct, partner_merchant_acct, user_acct, transact_point_amount):
+    def create(merchant_acct, partner_merchant_acct, user_acct, transact_point_amount, reward_summary=None):
         merchant_artnership_settings = PartnershipSettings.get_by_merchant_acct(merchant_acct)
         partner_partnership_settings = PartnershipSettings.get_by_merchant_acct(partner_merchant_acct)
         
@@ -353,6 +391,10 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
                                                 
                                                 transact_point_amount   = transact_point_amount,
                                                 user_acct               = user_acct.create_ndb_key(),
+                                                reward_summary          = {
+                                                                            'entitled_voucher_summary': reward_summary.entitled_voucher_summary,
+                                                                            },
+                                                transaction_id          = reward_summary.transaction_id,
                                                 )
             partnership_reward_transaction.put()
             return partnership_reward_transaction
@@ -361,7 +403,42 @@ class PartnershipRewardTransaction(BaseNModel, DictModel):
             raise Exception('Merchant or partner partnership settings is not enabled or created')
     
     
+    @staticmethod
+    def list_transaction_by_date(enquiry_date, merchant_acct=None,  partner_merchant_acct=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 = PartnershipRewardTransaction.query(
+                        ndb.AND(
+                            PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key(),
+                            PartnershipRewardTransaction.partner_merchant_acct==partner_merchant_acct.create_ndb_key(),
+                            PartnershipRewardTransaction.transact_datetime>=start_datetime,
+                            PartnershipRewardTransaction.transact_datetime<end_datetime,
+                        ))
+        if return_with_cursor:
+            (result, next_cursor) = PartnershipRewardTransaction.list_all_with_condition_query(query, order_by=PartnershipRewardTransaction.transact_datetime, start_cursor=start_cursor, return_with_cursor=True, limit=limit)
+        
+            return (result, next_cursor)
+        else:
+            return query.order(PartnershipRewardTransaction.transact_datetime).fetch(offset=offset, limit=limit)
     
     
+    @staticmethod
+    def list_merchant_partnership_reward_transaction(merchant_acct, offset=0, limit=conf.PAGINATION_SIZE, start_cursor=None, return_with_cursor=False, reverse_order=True, keys_only=False):
+        if keys_only:
+            query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key()))
+            return PartnershipRewardTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, keys_only=True)
+        else:
+            if reverse_order:
+                query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key())).order(-PartnershipRewardTransaction.transact_datetime)
+            else:
+                query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key())).order(PartnershipRewardTransaction.transact_datetime)
+            
+            return PartnershipRewardTransaction.list_all_with_condition_query(query, offset=offset, limit=limit, start_cursor=start_cursor, return_with_cursor=return_with_cursor)
     
+    @staticmethod
+    def count_merchant_partnership_reward_transaction(merchant_acct, limit=conf.MAX_FETCH_RECORD):
+        query = PartnershipRewardTransaction.query(ndb.AND(PartnershipRewardTransaction.merchant_acct==merchant_acct.create_ndb_key()))
+        
+        return   PartnershipRewardTransaction.count_with_condition_query(query, limit=limit)
     
+    

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/redeem_models.py

@@ -23,7 +23,7 @@ from trexmodel.models.datastore import user_models
 from _ast import Is
 
 
-logger = logging.getLogger('debug')
+logger = logging.getLogger('target_debug')
 
 
 class CustomerRedeemedItemUpstream(DictModel):
@@ -77,7 +77,8 @@ class CustomerRedemption(BaseNModel, DictModel):
     reverted_by                 = ndb.KeyProperty(name="reverted_by", kind=MerchantUser)
     reverted_by_username        = ndb.StringProperty(required=False)
     is_allow_to_revert          = ndb.BooleanProperty(required=False, default=False)
-    is_tier_program_redemption  = ndb.BooleanProperty(required=False, default=False) 
+    is_tier_program_redemption  = ndb.BooleanProperty(required=False, default=False)
+    is_partnership_redemption   = ndb.BooleanProperty(required=False, default=False) 
     tier_program_transaction_id = ndb.StringProperty(required=False)
     
     
@@ -86,7 +87,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                                'redeemed_datetime', 'is_revert', 'allow_to_revert', 'redeemed_outlet',
                                'is_system_redemption', 'is_tier_program_redemption', 'tier_program_transaction_id',
                                'redeemed_by_username', 'reverted_datetime', 'reverted_by_username', 'prepaid_redeem_code',
-                               'is_allow_to_revert',
+                               'is_allow_to_revert', 'is_partnership_redemption',
                                ]
     
     @staticmethod
@@ -329,7 +330,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                redeemed_voucher_keys_list=None, invoice_id=None, remarks=None, prepaid_redeem_code=None,
                redeemed_by=None, redeemed_datetime=None, redemption_catalogue_transction_summary=None,
                is_allow_to_revert=True,
-               is_partnership_redemption=False
+               is_partnership_redemption=False,
                ):
         
         
@@ -343,10 +344,16 @@ class CustomerRedemption(BaseNModel, DictModel):
                 redeemed_by_username = redeemed_by.username
 
         
+        logger.info('reward_summary=%s', reward_summary)
+        
         redeem_transaction_id = transaction_id or generate_transaction_id(prefix='d')
         
+        logger.info('redeem_transaction_id=%s', redeem_transaction_id)
+        
         if redeemed_datetime is None:
             redeemed_datetime = datetime.utcnow()
+            
+        logger.info('redeemed_datetime=%s', redeemed_datetime)
         
         redeemed_summary = {}
         if redemption_catalogue_transction_summary is not None:
@@ -354,7 +361,7 @@ class CustomerRedemption(BaseNModel, DictModel):
         
         #@model_transactional(desc='redeem reward')
         def __start_redeem(__customer, __total_redeemed_amount, cursor, reward_cls):
-            logger.debug('__start_redeem: reward_cls=%s',  reward_cls)
+            logger.debug('__start_redeem: reward_cls=%s, cursor=%s',  reward_cls, cursor)
             (result, next_cursor) = reward_cls.list_by_valid_with_cursor(__customer, limit=50, start_cursor=cursor)
             
             logger.debug('__start_redeem: result count=%s',  len(result))
@@ -368,28 +375,26 @@ class CustomerRedemption(BaseNModel, DictModel):
                     redeemed_amount                     = .0
                     reward_balance_before_redeem        = r.reward_balance
                     
-                    logger.debug('__start_redeem: reward_balance_before_redeem before=%s',  reward_balance_before_redeem)
-                    logger.debug('__start_redeem: __total_redeemed_amount before=%s',  __total_redeemed_amount)
+                    logger.info('__start_redeem: reward_balance_before_redeem before=%s, __total_redeemed_amount=%s',  reward_balance_before_redeem, __total_redeemed_amount)
                     
                     if reward_balance_before_redeem>0:
                         
                         if reward_balance_before_redeem<__total_redeemed_amount:
-                            logger.debug('__start_redeem: redeem partial amount from redeem amount')
+                            logger.info('__start_redeem: redeem partial amount from redeem amount')
                             redeemed_amount = reward_balance_before_redeem
                             __total_redeemed_amount -=reward_balance_before_redeem
                             r.update_used_reward_amount(reward_balance_before_redeem)
                             reward_balance_before_redeem = 0
                             
                         else:
-                            logger.debug('__start_redeem: redeem remaining balance from redeem amount')
+                            logger.info('__start_redeem: redeem remaining balance from redeem amount')
                             redeemed_amount = __total_redeemed_amount
                             r.update_used_reward_amount(__total_redeemed_amount)
                             reward_balance_before_redeem -= __total_redeemed_amount
                             __total_redeemed_amount = 0
                          
                         
-                        logger.debug('__start_redeem: __total_redeemed_amount=%s',  __total_redeemed_amount)
-                        logger.debug('__start_redeem: reward_balance_before_redeem after =%s',  reward_balance_before_redeem)
+                        logger.info('__start_redeem: reward_balance_before_redeem after =%s, __total_redeemed_amount=%s',  reward_balance_before_redeem, __total_redeemed_amount)
                         
                         transaction_id_list.append(r.transaction_id)
                     
@@ -405,9 +410,10 @@ class CustomerRedemption(BaseNModel, DictModel):
                     else:
                         logger.debug('__start_redeem reward balance is ZERO')
                 
-                logger.debug('after finished reading reward') 
+                transaction_id_list = set(transaction_id_list)
                 
-                transaction_id_list = set(transaction_id_list) 
+                logger.debug('after finished reading reward, transaction_id_list=%s', transaction_id_list)
+                 
                 for transaction_id in transaction_id_list:
                     CustomerTransaction.update_transaction_reward_have_been_redeemed(transaction_id, redeem_transaction_id)
                 
@@ -422,28 +428,37 @@ class CustomerRedemption(BaseNModel, DictModel):
             no_sufficient_to_redeem             = False
             continue_checking = True
             
-            if is_partnership_redemption==False:
-                while total_redeemed_amount>0 and continue_checking:
-                    (total_redeemed_amount, cursor, __redeemed_reward_details_list) = __start_redeem(customer, total_redeemed_amount, cursor, 
-                                                                                            CustomerPointReward)
-                    logger.debug('after __start_redeem total_redeemed_amount= %s, cursor=%s', total_redeemed_amount, cursor)
-                    
-                    logger.debug('__redeemed_reward_details_list count=%d', len(__redeemed_reward_details_list))
+            #if is_partnership_redemption==False:
+            while total_redeemed_amount>0 and continue_checking:
+                (total_redeemed_amount, cursor, __redeemed_reward_details_list) = __start_redeem(customer, total_redeemed_amount, cursor, 
+                                                                                        CustomerPointReward)
+                logger.debug('after __start_redeem total_redeemed_amount= %s, cursor=%s', total_redeemed_amount, cursor)
+                
+                logger.debug('__redeemed_reward_details_list count=%d', len(__redeemed_reward_details_list))
+                
+                if __redeemed_reward_details_list:
+                    redeemed_reward_details_list.extend(__redeemed_reward_details_list)
                     
-                    if __redeemed_reward_details_list:
-                        redeemed_reward_details_list.extend(__redeemed_reward_details_list)
-                        
-                    if total_redeemed_amount>0 and is_empty(cursor):
+                if total_redeemed_amount>0:
+                    if is_empty(cursor):
+                        logger.info('total_redeemed_amount=%s and no more reward to redeem thus it is considered no sufficient reward amount to redeem', total_redeemed_amount)
                         no_sufficient_to_redeem = True
                         continue_checking = False
-                        break    
-                    
-                    logger.debug('continue_checking=%s, no_sufficient_to_redeem=%s', continue_checking, no_sufficient_to_redeem)
-                    
-                if no_sufficient_to_redeem:
-                    raise Exception('No sufficient balance to redeem')    
-            else:
-                logger.info('This is partnership redemption')
+                        break   
+                else:
+                    logger.info('total_redeemed_amount=%s and the total redeem amount is ZERO', total_redeemed_amount)
+                    continue_checking = False
+                    break
+                     
+                
+                logger.debug('continue_checking=%s, no_sufficient_to_redeem=%s', continue_checking, no_sufficient_to_redeem)
+            
+            logger.info('Completed checking to redeem reward balance, no_sufficient_to_redeem=%s', no_sufficient_to_redeem)
+                
+            if no_sufficient_to_redeem:
+                raise Exception('No sufficient balance to redeem')    
+            #else:
+            #    logger.info('This is partnership redemption')
                 
             redeemed_summary = {
                                     reward_format               : {
@@ -458,6 +473,8 @@ class CustomerRedemption(BaseNModel, DictModel):
                 reward_balance = 0
                 
             reward_summary[reward_format]['amount'] = reward_balance
+            
+            logger.info('reward balance for %s = %s', reward_format, reward_balance)
         
         elif reward_format == program_conf.REWARD_FORMAT_STAMP:
             total_redeemed_amount           = redeemed_amount
@@ -658,6 +675,7 @@ class CustomerRedemption(BaseNModel, DictModel):
                                                     
                                                     redeemed_datetime           = redeemed_datetime,
                                                     is_tier_program_redemption  = is_tier_program_redemption,
+                                                    is_partnership_redemption   = is_partnership_redemption,
                                                     tier_program_transaction_id = tier_program_transaction_id,
                                                     is_allow_to_revert          = is_allow_to_revert,
                                                     )

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/reward_models.py

@@ -392,9 +392,11 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     use_online                  = ndb.BooleanProperty(required=False, default=False)
     use_in_store                = ndb.BooleanProperty(required=False, default=False)
     
+    partner_merchant_acct       = ndb.KeyProperty(name='partner_merchant_acct', kind=MerchantAcct)
+    
     dict_properties     = [
                             'redeem_code', 'configuration', 'rewarded_datetime', 'transaction_id', 
-                            'status', 'is_reverted', 'is_used',
+                            'status', 'is_reverted', 'is_used', 'is_partnership_voucher', 'partner_merchant_acct_key',
                            ]
     
     @property
@@ -402,6 +404,10 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
         if self.redeemed_by_outlet:
             return self.redeemed_by_outlet.urlsafe().decode('utf-8')
     
+    @property
+    def partner_merchant_acct_key(self):
+        if self.partner_merchant_acct:
+            return self.partner_merchant_acct.urlsafe().decode('utf-8')
     
     
     @staticmethod
@@ -616,7 +622,7 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
                effective_date=None, expiry_date=None,
                transaction_id=None, invoice_id=None,
                rewarded_by=None, rewarded_datetime=None,
-               program_key=None
+               program_key=None, partner_merchant_acct=None,
                ):
         logger.debug('program_key=%s', program_key)
         redeem_code = random_string(program_conf.REDEEM_CODE_LENGTH, is_human_mistake_safe=True)
@@ -645,6 +651,8 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
                                             
                                             user_acct               = customer_acct.registered_user_acct.create_ndb_key(),
                                             reward_program          = string_to_key_property(program_key) if program_key is not None else None,
+                                            
+                                            partner_merchant_acct   = partner_merchant_acct.create_ndb_key() if partner_merchant_acct is not None else None
                                             )
         
         customer_entiteld_voucher.put()

{trex_model-1.6.1 → trex_model-1.6.3}/trexmodel/models/datastore/transaction_models.py

@@ -202,6 +202,8 @@ class CustomerTransaction(SalesTransaction):
     
     is_tier_membership_upgraded = ndb.BooleanProperty(required=False, default=False)
     
+    is_partner_transaction      = ndb.BooleanProperty(required=False, default=False)
+    
     upgraded_merchant_tier_membership   = ndb.KeyProperty(name="upgraded_merchant_tier_membership", kind=MerchantTierMembership)
     
     purchased_merchant_membership        = ndb.KeyProperty(name="purchased_merchant_membership", kind=MerchantMembership)
@@ -213,7 +215,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', 'promotion_code',
+                               'is_rating_review_enabled', 'promotion_code', 'is_partner_transaction',
                                ]
     
     def to_transaction_details_json(self):
@@ -358,8 +360,8 @@ class CustomerTransaction(SalesTransaction):
                                   ): 
         return CustomerTransaction.create_system_transaction(customer, remarks=remarks, system_remarks=system_remarks, transact_outlet=transact_outlet, transact_by=transact_by, 
                                    transact_datetime=transact_datetime, reward_giveaway_method=program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_PARTNERSHIP, 
-                                   is_sales_transaction = False, allow_to_revert=False, 
-                                   is_membership_purchase=False, is_membership_renew=False,
+                                   is_sales_transaction = False, allow_to_revert=True, 
+                                   is_membership_purchase=False, is_membership_renew=False, is_partner_transaction=True,
                                    )
     
     @staticmethod
@@ -406,7 +408,7 @@ class CustomerTransaction(SalesTransaction):
     def create_system_transaction(customer, transact_amount=.0, tax_amount=.0, invoice_id=None, remarks=None, system_remarks=None,
                transact_outlet=None, transact_by=None, transact_datetime=None, reward_giveaway_method=program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_SYSTEM,
                is_sales_transaction = False, allow_to_revert=True, is_membership_purchase=False, is_membership_renew=False, purchased_customer_membership=None,
-               promotion_code=None
+               promotion_code=None, is_partner_transaction=False,
                ):
         
         transact_by_username = None
@@ -454,6 +456,7 @@ class CustomerTransaction(SalesTransaction):
                                                     allow_to_revert                 = allow_to_revert,
                                                     is_membership_purchase          = is_membership_purchase,
                                                     is_membership_renew             = is_membership_renew,
+                                                    is_partner_transaction          = is_partner_transaction,
                                                     purchased_merchant_membership   = purchased_customer_membership.merchant_membership_entity.create_ndb_key() if purchased_customer_membership else None,
                                                     purchased_customer_membership   = purchased_customer_membership.create_ndb_key() if purchased_customer_membership else None,
                                                     promotion_code                  = promotion_code,