diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index 7ac23f8222..af0738b17e 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -60,7 +60,7 @@ module Spree @insufficient_stock_lines = [] @order = order_to_update unless @order - flash[:error] = t(:order_not_found) + flash[:error] = t(:order_not_updated) redirect_to(main_app.root_path) && return end diff --git a/app/views/checkout/payment/_gateway.html.haml b/app/views/checkout/payment/_gateway.html.haml deleted file mode 100644 index e2e1f8412d..0000000000 --- a/app/views/checkout/payment/_gateway.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -= f.fields :bill_address, model: @order.bill_address do |bill_address| - %div.checkout-input - = bill_address.label :firstname, t("checkout.step1.your_details.first_name.label") - = bill_address.text_field :firstname, { placeholder: t("checkout.step1.your_details.first_name.placeholder") } - = f.error_message_on "bill_address.firstname" - - %div.checkout-input - = bill_address.label :lastname, t("checkout.step1.your_details.last_name.label") - = bill_address.text_field :lastname, { placeholder: t("checkout.step1.your_details.last_name.placeholder") } - = f.error_message_on "bill_address.lastname" - -.flex{style: "justify-content: space-between; gap: 10px;" } - %div.checkout-input{style: "flex-grow: 2;" } - = f.label :card_number, t("checkout.step2.form.card_number.label") - = f.text_field :card_number, { placeholder: t("checkout.step2.form.card_number.placeholder") } - - %div.checkout-input{style: "flex: 0 1 100px;"} - = f.label :card_verification_value, t("checkout.step2.form.card_verification_value.label") - = f.number_field :card_verification_value, { placeholder: t("checkout.step2.form.card_verification_value.placeholder") } - - %div.checkout-input{style: "flex: 0 1 70px;"} - = f.label :card_month, t("checkout.step2.form.card_month.label") - = f.number_field :card_month, { placeholder: t("checkout.step2.form.card_month.placeholder"), max: 12 } - - %div.checkout-input{style: "flex: 0 1 70px;"} - = f.label :card_year, t("checkout.step2.form.card_year.label") - = f.number_field :card_year, { placeholder: t("checkout.step2.form.card_year.placeholder"), min: Time.now.year, max: Time.now.year + 10 } diff --git a/app/views/home/_connect.html.haml b/app/views/home/_connect.html.haml deleted file mode 100644 index 6afcb1ae96..0000000000 --- a/app/views/home/_connect.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -#connect.pane - .row - .small-12.medium-6.medium-offset-3.columns.text-center - %h2= t :label_connect - %p.text-normal= t :connect_body - %a.button.transparent{href: "https://openfoodnetwork.org/au/connect/"} - = t :connect_cta diff --git a/app/views/home/_learn.html.haml b/app/views/home/_learn.html.haml deleted file mode 100644 index f6d3061e20..0000000000 --- a/app/views/home/_learn.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -#learn.pane - .row - .small-12.medium-6.medium-offset-3.columns.text-center - %h2= t :label_learn - %p.text-normal= t :learn_body - %a.button.transparent{href: "https://openfoodnetwork.org/au/learn/"} - = t :learn_cta diff --git a/app/views/spree/admin/payments/index.html.haml b/app/views/spree/admin/payments/index.html.haml index 98e00c102d..c3c52c2a23 100644 --- a/app/views/spree/admin/payments/index.html.haml +++ b/app/views/spree/admin/payments/index.html.haml @@ -20,5 +20,3 @@ - if @payments.any? = render partial: 'list', locals: { payments: @payments } -- else - .alpha.twelve.columns.no-objects-found= t(:order_has_no_payments) diff --git a/app/views/spree/admin/taxons/edit.html.haml b/app/views/spree/admin/taxons/edit.html.haml index efb5c29e91..1df6e7288f 100644 --- a/app/views/spree/admin/taxons/edit.html.haml +++ b/app/views/spree/admin/taxons/edit.html.haml @@ -1,7 +1,7 @@ = render partial: 'spree/admin/shared/configuration_menu' - content_for :page_title do - = t("spree.taxon_edit") + = t("spree.taxonomy_edit") - content_for :page_actions do %li diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml index ddde898e32..fb50b995eb 100644 --- a/app/views/spree/orders/edit.html.haml +++ b/app/views/spree/orders/edit.html.haml @@ -28,8 +28,8 @@ #cart-container - if @order.line_items.empty? %div.row - %p= t(:your_cart_is_empty) - %p= link_to t(:continue_shopping), current_shop_products_path, :class => 'button continue' + %p= t(:cart_empty) + %p= link_to t(:orders_edit_continue), current_shop_products_path, :class => 'button continue' - else %div diff --git a/config/locales/en.yml b/config/locales/en.yml index 162f65d273..662b5fe984 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -264,6 +264,10 @@ en: not_available_to_shop: "is not available to %{shop}" card_details: "Card details" card_type: "Card type" + card_type_is: "Card type is" + unrecognized_card_type: "Unrecognized card type" + use_new_cc: "Use a new credit card" + what_is_this: "What is this?" cardholder_name: "Cardholder name" community_forum_url: "Community forum URL" customer_instructions: "Customer instructions" @@ -712,6 +716,7 @@ en: status: Status ok: Ok instance_secret_key: Instance Secret Key + instance_publishable_key: Instance Publishable Key account_id: Account ID business_name: Business Name charges_enabled: Charges Enabled @@ -2628,6 +2633,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using orders_bought_already_confirmed: "* already confirmed" orders_confirm_cancel: "Are you sure you want to cancel this order?" order_processed_successfully: "Your order has been processed successfully" + thank_you_for_your_order: "Thank you for your order" products_cart_distributor_choice: "Distributor for your order:" products_cart_distributor_change: "Your distributor for this order will be changed to %{name} if you add this product to your cart." @@ -3872,6 +3878,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using editing_tax_category: "Editing tax category" editing_tax_rate: "Editing tax rate" editing_zone: "Editing zone" + editing_state: "Editing State" expiration: "Expiration" invalid_payment_provider: "Invalid payment provider" items_cannot_be_shipped: "Items cannot be shipped" @@ -3883,7 +3890,8 @@ See the %{link} to find out more about %{sitename}'s features and to start using new_taxon: "New taxon" new_user: "New user" no_pending_payments: "No pending payments" - "none": "None" + remove: "Remove" + none: "None" not_found: "Not found" notice_messages: variant_deleted: "Variant deleted" @@ -3909,6 +3917,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using resend: "Resend" back_to_orders_list: "Back To Orders List" back_to_payments_list: "Back To Payments List" + back_to_states_list: "Back To States List" return_authorizations: "Return Authorizations" cannot_create_returns: "Cannot create returns as this order has no shipped units." select_stock: "Select stock"