trex-model 1.5.25__tar.gz → 1.5.26__tar.gz

{trex-model-1.5.25 → trex-model-1.5.26}/PKG-INFO

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

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

{trex-model-1.5.25 → trex-model-1.5.26}/trex_model.egg-info/PKG-INFO

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

{trex-model-1.5.25 → trex-model-1.5.26}/trexmodel/models/datastore/marketing_models.py

@@ -224,6 +224,22 @@ class MarketingImage(BaseNModel, DictModel):
         
         return image_file
     
+    @staticmethod
+    def create_upload_file(image_label, image_file_storage_filename, public_url, merchant_acct, image_file_type=None):
+        logger.debug('image_file_type=%s', image_file_type)
+        
+        image_file = MarketingImage(
+                            parent                              = merchant_acct.create_ndb_key(),
+                            image_label                         = image_label,
+                            image_file_public_url               = public_url,
+                            image_file_storage_filename         = image_file_storage_filename,
+                            image_file_type                     = image_file_type,
+                            )
+        
+        image_file.put()
+        
+        return image_file
+    
     @staticmethod
     def remove_file(image_file, bucket):
         
@@ -331,7 +347,7 @@ class MerchantNewsFile(BaseNModel, DictModel):
         
     @property
     def news_public_url(self):
-        return '%s//merchant/marketing/news/%s/show' % (MERCHANT_NEWS_BASE_URL, self.key_in_str)
+        return '%s/merchant/marketing/news/%s/show' % (MERCHANT_NEWS_BASE_URL, self.key_in_str)
     
     @property
     def completed_progress_in_percentage(self):

{trex-model-1.5.25 → trex-model-1.5.26}/trexmodel/models/merchant_helpers.py

@@ -45,6 +45,9 @@ def construct_merchant_acct_info(merchant_acct):
     
     if merchant_acct.published_news_configuration:
         merchant_news_list = merchant_acct.published_news_configuration['news']
+        
+        for news in merchant_news_list:
+            logger.debug('news public url=%s', news.get('news_public_url'))
     
     published_redemption_catalogue_configuration = merchant_acct.published_redemption_catalogue_configuration
     catalogues_list = []