diff --git a/app/views/spree/admin/orders/_shipment_manifest.html.haml b/app/views/spree/admin/orders/_shipment_manifest.html.haml index a9b73240f5..8651ee3188 100644 --- a/app/views/spree/admin/orders/_shipment_manifest.html.haml +++ b/app/views/spree/admin/orders/_shipment_manifest.html.haml @@ -10,7 +10,7 @@ = line_item.single_money.to_html %td.item-qty-show.align-center - item.states.each do |state,count| - = "#{count} x #{t(state.humanize.downcase)}" + = "#{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 diff --git a/app/views/spree/admin/shared/_order_tabs.html.haml b/app/views/spree/admin/shared/_order_tabs.html.haml index 2eb028799e..89d7299fdc 100644 --- a/app/views/spree/admin/shared/_order_tabs.html.haml +++ b/app/views/spree/admin/shared/_order_tabs.html.haml @@ -33,14 +33,14 @@ %dd#shipment_status - shipment_state_classes = "state #{@order.shipment_state}" %span{ class: shipment_state_classes } - = t(@order.shipment_state, scope: :shipment_states, default: [:missing, "none"]) + = t(@order.shipment_state, scope: [:spree, :shipment_states], default: [:missing, "none"]) %dt = t(:payment) \: %dd#payment_status - payment_state_classes = "state #{@order.payment_state}" %span{ class: payment_state_classes } - = t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) + = t(@order.payment_state, scope: [:spree, :payment_states], default: [:missing, "none"]) %dt = t(:date_completed) \: