diff --git a/app/views/admin/product_orders/bl.html.haml b/app/views/admin/product_orders/bl.html.haml index 4aa90c8..1e062ab 100644 --- a/app/views/admin/product_orders/bl.html.haml +++ b/app/views/admin/product_orders/bl.html.haml @@ -183,31 +183,10 @@ -if @product_order.reseaux_id != 19 %td{:style => "width:135px;padding:0;vertical-align:middle"} =image_tag "http://negos.pro"+product_order_product.product.default_image.image_file.file.large.medium.small.thumb.url, :style => "width:130px;" if product_order_product.product.default_image - %td + %td{:style => ""+("border-bottom: 0;padding-bottom:0;"if @product_order.reseaux_id == 19).to_s} =simple_format product_order_product.archived_product.lang(:fr).bl_title - -if @product_order.reseaux_id == 19 - %table.sub_products{:style => "width:100%;margin-bottom:20px;margin-top:5px;"} - %tr - %th Référence - %th Nom - - - %th Nbr - %th Prix HT - - -product_order_product.sub_products.each do |sub_product| - %tr - %td - =sub_product.reference - %td - =sub_product.name - - - %td - =sub_product.qte_tot - %td - =number_to_currency sub_product.price_tot_with_qte + @@ -216,16 +195,41 @@ =# product_order_product.archived_product_option.lang(I18n.locale).name if product_order_product.archived_product_option - %td{:style => "text-align:right;"} + %td{:style => "text-align:right;"+("border-bottom: 0;"if @product_order.reseaux_id == 19).to_s} = number_to_currency(product_order_product.archived_product.final_price_ht.to_f, locale: :fr) if product_order_product.archived_product - %td{:style => "text-align:right;"} + %td{:style => "text-align:right;"+("border-bottom: 0;"if @product_order.reseaux_id == 19).to_s} =product_order_product.qty - %td{:style => "text-align:right;"} + %td{:style => "text-align:right;"+("border-bottom: 0;"if @product_order.reseaux_id == 19).to_s} = number_to_currency(product_order_product.archived_final_price_ht_with_qty, locale: :fr) if product_order_product.archived_product - - + -if @product_order.reseaux_id == 19 + %tr + %td{:colspan => 3, :style => "border-top:0;padding-top:0"} + %table.sub_products{:style => "width:100%;margin-bottom:20px;margin-top:5px;"} + %tr + %th Référence + %th Nom + + %th Prix U. + %th Nbr + %th Prix HT + + -product_order_product.sub_products.each do |sub_product| + %tr + %td + =sub_product.reference + %td + =sub_product.name + + %td + =number_to_currency sub_product.price_ht_with_qte + + %td + =sub_product.qte_tot + %td + =number_to_currency sub_product.price_tot_with_qte + %td