Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n

add missing i18n key for closed OC
This commit is contained in:
Luis Ramos
2020-06-25 20:33:55 +01:00
committed by GitHub
5 changed files with 7 additions and 6 deletions

View File

@@ -99,8 +99,7 @@ class ApplicationController < ActionController::Base
if current_distributor_closed?
current_order.empty!
current_order.set_distribution! nil, nil
flash[:info] = "The hub you have selected is temporarily closed for orders. "\
"Please try again later."
flash[:info] = I18n.t('order_cycles_closed_for_hub')
redirect_to main_app.root_url
end
end
@@ -117,7 +116,7 @@ class ApplicationController < ActionController::Base
session[:expired_order_cycle_id] = current_order_cycle.id
current_order.empty!
current_order.set_order_cycle! nil
flash[:info] = "The order cycle you've selected has just closed. Please try again!"
flash[:info] = I18n.t('order_cycle_closed')
redirect_to main_app.root_url
end
end

View File

@@ -2204,6 +2204,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
hub_sidebar_at_least: "At least one hub must be selected"
hub_sidebar_blue: "blue"
hub_sidebar_red: "red"
order_cycles_closed_for_hub: "The hub you have selected is temporarily closed for orders. Please try again later."
report_customers_distributor: "Distributor"
report_customers_supplier: "Supplier"
report_customers_cycle: "Order Cycle"
@@ -2442,6 +2443,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
order_cycles_email_to_producers_notice: 'Emails to be sent to producers have been queued for sending.'
order_cycles_no_permission_to_coordinate_error: "None of your enterprises have permission to coordinate an order cycle"
order_cycles_no_permission_to_create_error: "You don't have permission to create an order cycle coordinated by that enterprise"
order_cycle_closed: "The order cycle you've selected has just closed. Please try again!"
back_to_orders_list: "Back to order list"
no_orders_found: "No Orders Found"
order_information: "Order Information"

View File

@@ -20,6 +20,6 @@ describe BaseController, type: :controller do
expect(session[:expired_order_cycle_id]).to eq oc.id
expect(response).to redirect_to root_url
expect(flash[:info]).to eq "The order cycle you've selected has just closed. Please try again!"
expect(flash[:info]).to eq I18n.t('order_cycle_closed')
end
end

View File

@@ -33,7 +33,7 @@ describe CheckoutController, type: :controller do
get :edit
expect(response).to redirect_to root_url
expect(flash[:info]).to eq("The hub you have selected is temporarily closed for orders. Please try again later.")
expect(flash[:info]).to eq(I18n.t('order_cycles_closed_for_hub'))
end
describe "redirection to cart and stripe" do

View File

@@ -116,7 +116,7 @@ describe Spree::OrdersController, type: :controller do
spree_get :edit
expect(response).to redirect_to root_url
expect(flash[:info]).to eq("The hub you have selected is temporarily closed for orders. Please try again later.")
expect(flash[:info]).to eq(I18n.t('order_cycles_closed_for_hub'))
end
describe "when an item is in the cart" do