Merge pull request #126 from lovata/develop

Release version 1.16.0
oc-shopaholic · Nov 2, 2018 · c0e3c4d · c0e3c4d
2 parents 7406b2f + e54b4e3
commit c0e3c4d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/controllers/offers/import.htm b/controllers/offers/import.htm
@@ -15,6 +15,9 @@ <h3><?= trans('lovata.toolbox::lang.message.import_additional_info') ?></h3>
             <li><?= trans('lovata.toolbox::lang.message.import_active_field_info') ?></li>
             <li><?= trans('lovata.toolbox::lang.message.import_preview_image_field_info') ?></li>
             <li><?= trans('lovata.toolbox::lang.message.import_images_field_info') ?></li>
+            <?php if (\System\Classes\PluginManager::instance()->hasPlugin('Lovata.PropertiesShopaholic')) {?>
+            <li><?= trans('lovata.propertiesshopaholic::lang.message.import_available_property_value') ?></li>
+            <?php }?>
         </ul>
     </div>
 </div>

diff --git a/controllers/products/import.htm b/controllers/products/import.htm
@@ -16,6 +16,9 @@ <h3><?= trans('lovata.toolbox::lang.message.import_additional_info') ?></h3>
             <li><?= trans('lovata.toolbox::lang.message.import_preview_image_field_info') ?></li>
             <li><?= trans('lovata.toolbox::lang.message.import_images_field_info') ?></li>
             <li><?= trans('lovata.shopaholic::lang.message.import_additional_category_info') ?></li>
+            <?php if (\System\Classes\PluginManager::instance()->hasPlugin('Lovata.PropertiesShopaholic')) {?>
+            <li><?= trans('lovata.propertiesshopaholic::lang.message.import_available_property_value') ?></li>
+            <?php }?>
         </ul>
     </div>
 </div>

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -57,4 +57,6 @@
 1.14.1:
     - 'Remove vendor folder from plugin.'
 1.15.0:
-    - 'Added import product, offers, categories, brands from CSV file in backend. Requires Toolbox plugin version 1.18.0 and later'
+    - 'Added import product, offers, categories, brands from CSV file in backend. Requires Toolbox plugin version 1.18.0 and later'
+1.16.0:
+    - 'Added block with description about import of product/offer properties from CSV file.'