trex-model 1.4.2__tar.gz → 1.4.4__tar.gz

{trex-model-1.4.2 → trex-model-1.4.4}/PKG-INFO

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

{trex-model-1.4.2 → trex-model-1.4.4}/setup.py

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

{trex-model-1.4.2 → trex-model-1.4.4}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.4.2 → trex-model-1.4.4}/trexmodel/models/datastore/merchant_models.py

@@ -1219,14 +1219,15 @@ class MerchantAcct(MerchantMin):
         
         for program in published_program_configuration.get('programs'):
             if program.get('giveaway_method') == program_conf.PROGRAM_REWARD_GIVEAWAY_METHOD_SYSTEM:
-                logger.debug('giveaway system condition=%s', program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'))
-                if program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition') == program_conf.GIVEAWAY_SYSTEM_CONDITION_DATA_IMPORT:
-                    logger.debug('giveaway reward_format=%s', program.get('reward_format'))
-                    if program.get('reward_format') == target_reward_format:
-                        data_import_giveaway_programs.append({
-                                                            'program_key'   : program.get('program_key'),
-                                                            'label'         : program.get('label'),
-                                                            })
+                if program.get('program_settings').get('giveaway_system_settings') and program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'):
+                    logger.debug('giveaway system condition=%s', program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition'))
+                    if program.get('program_settings').get('giveaway_system_settings').get('giveaway_system_condition') == program_conf.GIVEAWAY_SYSTEM_CONDITION_DATA_IMPORT:
+                        logger.debug('giveaway reward_format=%s', program.get('reward_format'))
+                        if program.get('reward_format') == target_reward_format:
+                            data_import_giveaway_programs.append({
+                                                                'program_key'   : program.get('program_key'),
+                                                                'label'         : program.get('label'),
+                                                                })
                     
         return data_import_giveaway_programs
     

{trex-model-1.4.2 → trex-model-1.4.4}/trexmodel/models/datastore/reward_models.py

@@ -479,8 +479,10 @@ class CustomerEntitledVoucher(CustomerEntitledReward):
     def to_redeem_info(self):
         return {
                 'redeem_code'       : self.redeem_code,
+                'entitled_datetime' : self.rewarded_datetime.strftime('%d-%m-%Y %H:%M'),
                 'effective_date'    : self.effective_date.strftime('%d-%m-%Y'),
                 'expiry_date'       : self.expiry_date.strftime('%d-%m-%Y'),
+                
                 }
     
     @staticmethod