diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 70de7fdd89..5f6764e8d9 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -151,7 +151,7 @@ %th.final_weight_volume{ 'ng-show' => 'columns.final_weight_volume.visible' } = t("admin.orders.bulk_management.weight_volume") %th.price{ 'ng-show' => 'columns.price.visible' } - = t("admin.price") + = t("admin.price (#{currency_symbol})") %th.actions %th.actions = t("admin.orders.bulk_management.ask") @@ -178,7 +178,7 @@ %input.show-dirty{ :type => 'number', :name => 'final_weight_volume', :id => 'final_weight_volume', ng: { model: "line_item.final_weight_volume", readonly: "unitValueLessThanZero(line_item)", change: "weightAdjustedPrice(line_item)", required: "true", class: '{"update-error": line_item.errors.final_weight_volume}' }, min: 0, 'ng-pattern' => '/[1-9]+/' } %span.error{ ng: { bind: 'line_item.errors.final_weight_volume' } } %td.price{ 'ng-show' => 'columns.price.visible' } - %input.show-dirty{ :type => 'text', :name => 'price', :id => 'price', :ng => { value: 'line_item.price * line_item.quantity | currency', readonly: "true", class: '{"update-error": line_item.errors.price}' } } + %input.show-dirty{ :type => 'text', :name => 'price', :id => 'price', :ng => { value: 'line_item.price * line_item.quantity | currency:""', readonly: "true", class: '{"update-error": line_item.errors.price}' } } %span.error{ ng: { bind: 'line_item.errors.price' } } %td.actions %a{ href: "/admin/orders/{{line_item.order.number}}/edit", :class => "edit-order icon-edit no-text", 'confirm-link-click' => 'confirmRefresh()' } diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb index ef4fc13e39..74c10c7b72 100644 --- a/spec/features/admin/bulk_order_management_spec.rb +++ b/spec/features/admin/bulk_order_management_spec.rb @@ -162,9 +162,9 @@ feature %q{ # hide dropdown find("div#columns-dropdown", :text => "COLUMNS").click within "tr#li_#{li1.id}" do - expect(page).to have_field "price", with: "$50.00" + expect(page).to have_field "price", with: "50.00" fill_in "final_weight_volume", :with => 2000 - expect(page).to have_field "price", with: "$100.00" + expect(page).to have_field "price", with: "100.00" end click_button "Save Changes" expect(page).to have_no_selector "#save-bar" @@ -181,9 +181,9 @@ feature %q{ find("div#columns-dropdown div.menu div.menu_item", text: "Price").click find("div#columns-dropdown", :text => "COLUMNS").click within "tr#li_#{li1.id}" do - expect(page).to have_field "price", with: "$#{format("%.2f",li1.price * 5)}" + expect(page).to have_field "price", with: "#{format("%.2f",li1.price * 5)}" fill_in "quantity", :with => 6 - expect(page).to have_field "price", with: "$#{format("%.2f",li1.price * 6)}" + expect(page).to have_field "price", with: "#{format("%.2f",li1.price * 6)}" end end end