raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-10 03:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted BOM spec to reflect currency symbol changes

Browse Source
This commit is contained in:
Lynne Davis
2016-12-09 11:40:55 +00:00
parent 14ee7a06ae
commit cad3464f56
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -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()' }

8
spec/features/admin/bulk_order_management_spec.rb
View File

@@ -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