diff --git a/app/views/admin/products_v3/_table.html.haml b/app/views/admin/products_v3/_table.html.haml index f5f14fad7d..a1b8b9fd6c 100644 --- a/app/views/admin/products_v3/_table.html.haml +++ b/app/views/admin/products_v3/_table.html.haml @@ -41,7 +41,7 @@ %td.align-left .line-clamp-1= product.taxons.map(&:name).join(', ') %td.align-left - .line-clamp-1= product.tax_category&.name + .line-clamp-1= product.tax_category&.name || "None" # TODO: convert to dropdown, else translate hardcoded string. %td.align-left .line-clamp-1= product.inherits_properties ? 'YES' : 'NO' #TODO: consider using https://github.com/RST-J/human_attribute_values, else use I18n.t (also below) - product.variants.each do |variant| @@ -59,9 +59,9 @@ %td.align-left .line-clamp-1= variant.product.supplier.name # same as product %td.align-left - .line-clamp-1= variant.product.taxons.map(&:name).join(', ') # same as product + -# empty %td.align-left - .line-clamp-1= variant.tax_category&.name + -# empty %td.align-left - .line-clamp-1= variant.product.inherits_properties ? 'YES' : 'NO' # same as product + -# empty diff --git a/app/views/spree/admin/shared/_product_sub_menu.html.haml b/app/views/spree/admin/shared/_product_sub_menu.html.haml index 41a3f5b3b7..f9cd83d9b4 100644 --- a/app/views/spree/admin/shared/_product_sub_menu.html.haml +++ b/app/views/spree/admin/shared/_product_sub_menu.html.haml @@ -1,8 +1,10 @@ - content_for :sub_menu do %ul#sub_nav.inline-menu - = tab :products, match_path: '/products' + = tab :products = tab :properties = tab :variant_overrides, url: main_app.admin_inventory_path, match_path: '/inventory' = tab :import, url: main_app.admin_product_import_path, match_path: '/product_import' - if feature?(:new_products_page, spree_current_user) - = tab :new_products, url: main_app.admin_new_products_path, match_path: '/new_products' + = tab :new_products, url: main_app.admin_new_products_path + - if feature?(:admin_style_v3, spree_current_user) + = tab :products_v3, url: main_app.admin_products_v3_path