From e2b26b2e9c5e8d91a6df1eeae67d8472b9f863ed Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sun, 3 May 2020 12:00:23 +0100 Subject: [PATCH] Replace break with if What we would need would be a continue, not break, so that other units will be processed without halting the cycle through the units --- .../admin/orders/_shipment_manifest.html.haml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/spree/admin/orders/_shipment_manifest.html.haml b/app/views/spree/admin/orders/_shipment_manifest.html.haml index 611cf4a5d7..fb9e51148f 100644 --- a/app/views/spree/admin/orders/_shipment_manifest.html.haml +++ b/app/views/spree/admin/orders/_shipment_manifest.html.haml @@ -1,26 +1,26 @@ - shipment.manifest.each do |item| - line_item = order.find_line_item_by_variant(item.variant) - - break if line_item.blank? - %tr.stock-item{ "data-item-quantity" => "#{item.quantity}" } - %td.item-image - = mini_image(item.variant) - %td.item-name - = item.variant.product_and_full_name - %td.item-price.align-center - = line_item.single_money.to_html - %td.item-qty-show.align-center - - item.states.each do |state,count| - = "#{count} x #{t(state.humanize.downcase, scope: [:spree, :shipment_states], default: [:missing, "none"])}" - - unless shipment.shipped? - %td.item-qty-edit.hidden - = number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 - %td.item-total.align-center - = line_item_shipment_price(line_item, item.quantity) + - if line_item.present? + %tr.stock-item{ "data-item-quantity" => "#{item.quantity}" } + %td.item-image + = mini_image(item.variant) + %td.item-name + = item.variant.product_and_full_name + %td.item-price.align-center + = line_item.single_money.to_html + %td.item-qty-show.align-center + - item.states.each do |state,count| + = "#{count} x #{t(state.humanize.downcase, scope: [:spree, :shipment_states], default: [:missing, "none"])}" + - unless shipment.shipped? + %td.item-qty-edit.hidden + = number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 + %td.item-total.align-center + = line_item_shipment_price(line_item, item.quantity) - %td.cart-item-delete.actions{ "data-hook" => "cart_item_delete" } - - if !shipment.shipped? && can?(:update, shipment) - = link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('actions.save'), :style => 'display: none' - = link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('actions.cancel'), :style => 'display: none' - = link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('actions.edit') - = link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove', :confirm => t(:are_you_sure)}, :title => t('actions.delete') + %td.cart-item-delete.actions{ "data-hook" => "cart_item_delete" } + - if !shipment.shipped? && can?(:update, shipment) + = link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('actions.save'), :style => 'display: none' + = link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('actions.cancel'), :style => 'display: none' + = link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('actions.edit') + = link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove', :confirm => t(:are_you_sure)}, :title => t('actions.delete')