raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

PI post-save UI changes

Browse Source
This commit is contained in:
Matt-Yorkley
2018-07-15 00:14:29 +01:00
parent da344adbcd
commit a4210a1cab
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/product_import/_save_results.html.haml
View File

@@ -56,8 +56,8 @@
%a.button.view{href: main_app.admin_inventory_path, ng: {show: 'updates.inventory_created > 0 || updates.inventory_updated > 0'}}
= t('admin.product_import.save.view_inventory')
%a.button.view{href: admin_products_path + '?latest_import=true', ng: {show: 'updates.products_created > 0 || updates.products_updated > 0'}}
%a.button.view{href: admin_products_path, ng: {show: 'updates.products_created > 0 || updates.products_updated > 0'}}
= t('admin.product_import.save.view_products')
%a.button{href: main_app.admin_product_import_path}
= t('admin.back')
= t('admin.product_import.save.import_again')

5
config/locales/en.yml
View File

@@ -516,8 +516,9 @@ en:
all_saved: "All items saved successfully"
some_saved: "items saved successfully"
save_errors: Save errors
view_products: View Products
view_inventory: View Inventory
import_again: Upload Another File
view_products: Go To Products Page
view_inventory: Go To Inventory Page
variant_overrides:
loading_flash:

6
spec/features/admin/product_import_spec.rb
View File

@@ -72,7 +72,7 @@ feature "Product Import", js: true do
wait_until { page.find("a.button.view").present? }
click_link 'View Products'
click_link I18n.t('admin.product_import.save.view_products')
expect(page).to have_content 'Bulk Edit Products'
wait_until { page.find("#p_#{potatoes.id}").present? }
@@ -174,7 +174,7 @@ feature "Product Import", js: true do
potatoes = Spree::Product.find_by_name('Potatoes')
expect(potatoes.variants.first.import_date).to be_within(1.minute).of Time.zone.now
click_link 'View Products'
click_link I18n.t('admin.product_import.save.view_products')
wait_until { page.find("#p_#{carrots.id}").present? }
@@ -251,7 +251,7 @@ feature "Product Import", js: true do
expect(Float(cabbage_override.price)).to eq 1.50
expect(cabbage_override.count_on_hand).to eq 2001
click_link 'View Inventory'
click_link I18n.t('admin.product_import.save.view_inventory')
expect(page).to have_content 'Inventory'
select enterprise2.name, from: "hub_id", visible: false