app/helpers/spree/admin/adjustments_helper.rb in solidus_backend-1.0.7 vs app/helpers/spree/admin/adjustments_helper.rb in solidus_backend-1.1.0.beta1

- old
+ new

@@ -1,12 +1,11 @@ module Spree module Admin module AdjustmentsHelper def adjustment_state(adjustment) - state = adjustment.state.to_sym - icon = { closed: 'lock', open: 'unlock' } - content_tag(:span, '', class: "fa fa-#{ icon[state] }") + icon = adjustment.finalized? ? 'lock' : 'unlock' + content_tag(:span, '', class: "fa fa-#{icon}") end def display_adjustable(adjustable) case adjustable when Spree::LineItem @@ -25,18 +24,14 @@ variant = line_item.variant parts = [] parts << variant.product.name parts << "(#{variant.options_text})" if variant.options_text.present? parts << line_item.display_total - safe_join(parts, "<br />".html_safe) + parts.join("<br>").html_safe end def display_shipment(shipment) - parts = [ - "#{Spree.t(:shipment)} ##{shipment.number}", - shipment.display_cost - ] - safe_join(parts, "<br />".html_safe) + "#{Spree.t(:shipment)} ##{shipment.number}<br>#{shipment.display_cost}".html_safe end def display_order(order) Spree.t(:order) end