Merge pull request #89 from lovata/develop

Release version 1.11.1
oc-shopaholic · Jun 25, 2018 · 280ffe9 · 280ffe9
2 parents 480932d + e311ce8
commit 280ffe9
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 28 deletions.
diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -3,15 +3,16 @@
         'name'        => 'Shopaholic',
         'description' => 'Catalog of products for eCommerce',
     ],
-    'field'      => [
-        'vendor_code'        => 'Vendor code',
-        'price'              => 'Price',
-        'old_price'          => 'Old price',
-        'quantity'           => 'Quantity',
-        'brand'              => 'Brand',
-        'offer'              => 'Offers',
-        'currency'           => 'Currency',
-        'check_offer_active' => 'When you receive a list of active products, check for active offers',
+    'field' => [
+        'vendor_code'         => 'Vendor code',
+        'price'               => 'Price',
+        'old_price'           => 'Old price',
+        'quantity'            => 'Quantity',
+        'brand'               => 'Brand',
+        'offer'               => 'Offers',
+        'currency'            => 'Currency',
+        'check_offer_active'  => 'When you receive a list of active products, check for active offers',
+        'additional_category' => 'Additional categories',
     ],
     'menu'       => [
         'main'                => 'Catalog',

diff --git a/lang/fr/lang.php b/lang/fr/lang.php
@@ -3,15 +3,16 @@
         'name'        => 'Shopaholic',
         'description' => 'Catalogue de produits pour le eCommerce',
     ],
-    'field'      => [
-        'vendor_code'        => 'Code vendeur',
-        'price'              => 'Prix',
-        'old_price'          => 'Ancien prix',
-        'quantity'           => 'Quantité',
-        'brand'              => 'Marque',
-        'offer'              => 'Offres',
-        'currency'           => 'Devise',
-        'check_offer_active' => 'Lorsque vous recevez une liste de produits actifs, recherchez des offres actives',
+    'field' => [
+        'vendor_code'         => 'Code vendeur',
+        'price'               => 'Prix',
+        'old_price'           => 'Ancien prix',
+        'quantity'            => 'Quantité',
+        'brand'               => 'Marque',
+        'offer'               => 'Offres',
+        'currency'            => 'Devise',
+        'check_offer_active'  => 'Lorsque vous recevez une liste de produits actifs, recherchez des offres actives',
+        'additional_category' => 'Catégories supplémentaires',
     ],
     'menu'       => [
         'main'                => 'Catalogue',

diff --git a/lang/ru/lang.php b/lang/ru/lang.php
@@ -3,15 +3,16 @@
         'name'        => 'Shopaholic',
         'description' => 'Каталог товаров',
     ],
-    'field'      => [
-        'vendor_code'        => 'Артикул',
-        'price'              => 'Цена',
-        'old_price'          => 'Старая цена',
-        'quantity'           => 'Количество',
-        'brand'              => 'Бренд',
-        'offer'              => 'Товарные предложения',
-        'currency'           => 'Валюта',
-        'check_offer_active' => 'При получении списка активных товаров проверять наличие активных предложений',
+    'field' => [
+        'vendor_code'         => 'Артикул',
+        'price'               => 'Цена',
+        'old_price'           => 'Старая цена',
+        'quantity'            => 'Количество',
+        'brand'               => 'Бренд',
+        'offer'               => 'Товарные предложения',
+        'currency'            => 'Валюта',
+        'check_offer_active'  => 'При получении списка активных товаров проверять наличие активных предложений',
+        'additional_category' => 'Дополнительные категории',
     ],
     'menu' => [
         'main'                => 'Каталог товаров',

diff --git a/models/product/fields.yaml b/models/product/fields.yaml
@@ -31,6 +31,9 @@ tabs:
             type: relation
             span: right
             nameFrom: name
+            context:
+                - update
+                - preview
             tab: 'lovata.toolbox::lang.tab.settings'
         brand:
             label: 'lovata.shopaholic::lang.field.brand'

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -37,4 +37,6 @@
     - 'Adding relation between Product model and additional categories. Adding ability to get list of products by category ID list, by the parent category ID.'
     - create_table_additional_categories.php
 1.11.0:
-    - 'Adding getPageUrl() method to ProductItem, BrandItem classes.'
+    - 'Adding getPageUrl() method to ProductItem, BrandItem classes.'
+1.11.1:
+    - 'Adding "field.additional_category" value to lang files. Fixed displaying "additional categories" field only for update/preview forms.'