diff --git a/app/views/admin/enterprises/index.rep b/app/views/admin/enterprises/index.rep index 2d22dab0dd..1356e035d8 100644 --- a/app/views/admin/enterprises/index.rep +++ b/app/views/admin/enterprises/index.rep @@ -5,5 +5,9 @@ r.list_of :enterprises, @collection do r.list_of :supplied_products do |product| r.element :name r.element :image_url, product.images.present? ? product.images.first.attachment.url(:mini) : nil + r.list_of :variants do |variant| + r.element :id + r.element :label, variant.options_text + end end end diff --git a/app/views/admin/order_cycles/_form.html.haml b/app/views/admin/order_cycles/_form.html.haml index dbe372ab05..bb3f9e6e06 100644 --- a/app/views/admin/order_cycles/_form.html.haml +++ b/app/views/admin/order_cycles/_form.html.haml @@ -28,6 +28,8 @@ .exchange-product{'ng-repeat' => 'product in enterprises[exchange.enterprise_id].supplied_products'} %img{'ng-src' => '{{ product.image_url }}'} {{ product.name }} + .exchange-product-variant{'ng-repeat' => 'variant in product.variants'} + {{ variant.label }} = select_tag :new_supplier_id, options_from_collection_for_select(Enterprise.is_primary_producer, :id, :name), {'ng-model' => 'new_supplier_id'} = f.submit 'Add supplier', 'ng-click' => 'addSupplier($event)'