diff --git a/app/views/admin/product_import/_save_results.html.haml b/app/views/admin/product_import/_save_results.html.haml index 9ab9652ac1..901bb466e1 100644 --- a/app/views/admin/product_import/_save_results.html.haml +++ b/app/views/admin/product_import/_save_results.html.haml @@ -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') diff --git a/config/locales/en.yml b/config/locales/en.yml index 67c8d17fd3..ebe1c524bb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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: diff --git a/spec/features/admin/product_import_spec.rb b/spec/features/admin/product_import_spec.rb index 35ebee5b1a..faedb012b7 100644 --- a/spec/features/admin/product_import_spec.rb +++ b/spec/features/admin/product_import_spec.rb @@ -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