solidus_backend 2.4.2 → 2.5.0.beta1

data/app/views/spree/admin/orders/confirm/_customer_details.html.erb

@@ -1,5 +1,5 @@
 <fieldset class="no-border-bottom" data-hook="customer_details_total">
-  <legend><%= Spree.t(:customer) %></legend>
+  <legend><%= t('spree.customer') %></legend>
   <div class="customer"><%= order.user.try(:email) %></div><br/>
 </fieldset>
 
@@ -7,7 +7,7 @@
   <div class="row">
     <div data-hook="bill_address_wrapper" class="col-6">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:billing_address) %></legend>
+        <legend align="center"><%= t('spree.billing_address') %></legend>
         <% if order.bill_address %>
           <%= render partial: 'spree/admin/shared/address', locals: {address: order.bill_address} %>
         <% end %>
@@ -16,7 +16,7 @@
 
     <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+        <legend align="center"><%= t('spree.shipping_address') %></legend>
         <% if order.ship_address %>
           <%= render partial: 'spree/admin/shared/address', locals: {address: order.ship_address} %>
         <% end %>

data/app/views/spree/admin/orders/confirm/_payments.html.erb

@@ -31,7 +31,7 @@
           </td>
           <td>
             <span class="pill pill-<%= payment.state %>">
-              <%= Spree.t(payment.state, scope: :payment_states) %>
+              <%= t(payment.state, scope: 'spree.payment_states') %>
             </span>
           </td>
         </tr>

data/app/views/spree/admin/orders/confirm/_shipment.html.erb

@@ -3,7 +3,7 @@
     <legend align="center" class="stock-location" data-hook="stock-location">
       <%= Spree::Shipment.model_name.human %>
       <span class="shipment-number"><%= shipment.number %></span>
-      <%= Spree.t(:from) %>
+      <%= t('spree.from') %>
       <strong class="stock-location-name" data-hook="stock-location-name">"<%= shipment.stock_location.name %>"</strong>
     </legend>
   </fieldset>
@@ -30,7 +30,7 @@
             <span><%= shipment.display_cost %></span>
           </td>
         <% else %>
-          <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+          <td colspan='5'><%= t('spree.no_shipping_method_selected') %></td>
         <% end %>
       </tr>
 

data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb

@@ -12,7 +12,7 @@
     <td class="item-price"><%= item.line_item.single_money.to_html %></td>
     <td class="item-qty-show">
         <% item.states.each do |state,count| %>
-          <%= count %> x <%= Spree.t(state, scope: 'inventory_states') %>
+          <%= count %> x <%= t(state, scope: 'spree.inventory_states') %>
         <% end %>
     </td>
     <td class="item-total"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>

data/app/views/spree/admin/orders/confirm_advance.html.erb

@@ -1,11 +1,11 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Confirm'} %>
 
-<% admin_breadcrumb(Spree.t(:confirm_order)) %>
+<% admin_breadcrumb(t('spree.confirm_order')) %>
 
 
 <div class="form-buttons filter-actions actions" data-hook="complete-order-button">
-  <div><%= Spree.t(:order_please_refresh) %></div><br/>
+  <div><%= t('spree.order_please_refresh') %></div><br/>
   <%= button_to [:advance, :admin, @order], { class: 'button', method: 'put' } do %>
-    <%= Spree.t(:order_refresh_totals) %>
+    <%= t('spree.order_refresh_totals') %>
   <% end %>
 </div>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -1,7 +1,7 @@
 <fieldset data-hook="admin_customer_detail_form_fields" class="no-border-top">
 
   <fieldset class="index no-border-bottom" data-hook="customer_guest">
-    <legend align="center"><%= Spree.t(:account) %></legend>
+    <legend align="center"><%= t('spree.account') %></legend>
 
     <div data-hook="customer_fields" class="row">
       <div class="col-9">
@@ -12,21 +12,25 @@
       </div>
       <div class="col-3">
         <div class="field">
-          <%= label_tag nil, Spree.t(:guest_checkout) %>
+          <%= label_tag nil, t('spree.guest_checkout') %>
           <ul>
             <% if @order.completed? %>
               <li>
-                <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
+                <%= @order.user.nil? ? t('spree.say_yes') : t('spree.say_no') %>
               </li>
             <% else %>
               <% guest = @order.user.nil? %>
               <li>
-                <%= radio_button_tag :guest_checkout, true, guest %>
-                <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>
+                <label>
+                  <%= radio_button_tag :guest_checkout, true, guest %>
+                  <%= t('spree.say_yes') %>
+                </label>
               </li>
               <li>
-                <%= radio_button_tag :guest_checkout, false, !guest, disabled: @order.cart? %>
-                <%= label_tag :guest_checkout_false, Spree.t(:say_no) %>
+                <label>
+                  <%= radio_button_tag :guest_checkout, false, !guest, disabled: @order.cart? %>
+                  <%= t('spree.say_no') %>
+                </label>
               </li>
               <%= hidden_field_tag :user_id, @order.user_id %>
             <% end %>
@@ -39,12 +43,14 @@
   <div class="row">
     <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+        <legend align="center"><%= t('spree.shipping_address') %></legend>
         <% if Spree::Config[:order_bill_address_used] %>
-          <div class="field" style="position: absolute;margin-top: -15px;left: 0;">
+          <div class="field">
             <span data-hook="use_billing">
-              <%= check_box_tag 'order[use_billing]', '1', (@order.ship_address.new_record? && @order.bill_address == @order.ship_address) %>
-              <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+              <label>
+                <%= check_box_tag 'order[use_billing]', '1', (@order.ship_address.new_record? && @order.bill_address == @order.ship_address) %>
+                <%= t('spree.use_billing_address') %>
+              </label>
             </span>
           </div>
         <% end %>
@@ -60,7 +66,7 @@
     <% if Spree::Config[:order_bill_address_used] %>
       <div class="col-6" data-hook="bill_address_wrapper">
         <fieldset class="no-border-bottom">
-          <legend align="center"><%= Spree.t(:billing_address) %></legend>
+          <legend align="center"><%= t('spree.billing_address') %></legend>
           <div class="js-billing-address">
             <%= f.fields_for :bill_address do |ba_form| %>
               <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
@@ -74,6 +80,6 @@
   <div class="clear"></div>
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <%= button Spree.t('actions.update') %>
+    <%= button t('spree.actions.update') %>
   </div>
 </fieldset>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
 
-<% admin_breadcrumb(Spree.t(:customer_details)) %>
+<% admin_breadcrumb(t('spree.customer_details')) %>
 
 
 <% content_for :page_actions do %>
@@ -9,7 +9,7 @@
 <div class="js-customer-details" data-order-number="<%= @order.number %>">
   <div id="select-customer" data-hook>
     <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:customer_search) %></legend>
+      <legend align="center"><%= t('spree.customer_search') %></legend>
       <%= hidden_field_tag :customer_search,  nil, class: 'fullwidth title' %>
     </fieldset>
   </div>

data/app/views/spree/admin/orders/customer_details/show.html.erb

@@ -1,27 +1,27 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Customer Details' } %>
 
-<% admin_breadcrumb(Spree.t(:customer_details)) %>
+<% admin_breadcrumb(t('spree.customer_details')) %>
 
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path %></li>
+  <li><%= button_link_to t('spree.back_to_orders_list'), admin_orders_path %></li>
 <% end %>
 
 
 <main class="col-5">
   <section>
-    <%= content_tag :h4, Spree.t(:account) %>
-    <%= Spree.t(:email) %>: <%= @order.email %><br>
-    <%= Spree.t(:guest_checkout) %>: <%= @order.user ? Spree.t(:yes) : Spree.t(:no) %>
+    <%= content_tag :h4, t('spree.account') %>
+    <%= t('spree.email') %>: <%= @order.email %><br>
+    <%= t('spree.guest_checkout') %>: <%= @order.user ? t('spree.yes') : t('spree.no') %>
   </section>
 
   <section>
-    <%= content_tag :h4, Spree.t(:billing_address) %>
+    <%= content_tag :h4, t('spree.billing_address') %>
     <%= render "spree/admin/shared/address", address: @order.bill_address %>
   </section>
 
   <section>
-    <%= content_tag :h4, Spree.t(:shipping_address) %>
+    <%= content_tag :h4, t('spree.shipping_address') %>
     <%= render "spree/admin/shared/address", address: @order.ship_address %>
   </section>
 </main>

data/app/views/spree/admin/orders/edit.html.erb

@@ -3,7 +3,7 @@
     <li><%= event_links %></li>
   <% end %>
   <% if can?(:resend, @order) && @order.completed? %>
-    <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post %></li>
+    <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
   <% end %>
 <% end %>
 
@@ -24,7 +24,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= t('spree.your_order_is_empty_add_product')%>
   </div>
 <% end %>
 

data/app/views/spree/admin/orders/index.html.erb

@@ -5,12 +5,12 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_order), new_admin_order_url, id: 'admin_new_order' %>
+    <%= button_link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order' %>
   </li>
 <% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -19,31 +19,33 @@
       <div class="row">
         <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
           <div class="date-range-filter field">
-            <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+            <%= label_tag :q_created_at_gt, t('spree.date_range') %>
             <div class="date-range-fields input-group">
-              <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
+              <%= f.text_field :created_at_gt, class: 'datepicker form-control datepicker-from', value: params[:q][:created_at_gt], placeholder: t('spree.start') %>
 
-              <span class="range-divider input-group-addon">
-                <i class="fa fa-arrow-right"></i>
-              </span>
+              <div class="input-group-prepend input-group-append">
+                <span class="input-group-text range-divider">
+                  <i class="fa fa-arrow-right"></i>
+                </span>
+              </div>
 
-              <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
+              <%= f.text_field :created_at_lt, class: 'datepicker form-control datepicker-to', value: params[:q][:created_at_lt], placeholder: t('spree.stop') %>
             </div>
           </div>
 
           <div class="field">
-            <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'custom-select fullwidth' %>
+            <%= label_tag :q_state_eq, t('spree.status') %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [t(s.name, scope: 'spree.order_state'), s.value]}, {include_blank: true}, class: 'custom-select fullwidth' %>
           </div>
 
           <div class="field">
-            <%= label_tag nil, Spree.t(:promotion) %>
-            <%= f.text_field :order_promotions_promotion_code_value_cont, size: 25 %>
+            <%= label_tag nil, t('spree.promotion') %>
+            <%= f.text_field :order_promotions_promotion_code_value_start, size: 25 %>
           </div>
 
           <div class="field">
-            <%= label_tag nil, Spree.t(:shipment_number) %>
-            <%= f.text_field :shipments_number_cont %>
+            <%= label_tag nil, t('spree.shipment_number') %>
+            <%= f.text_field :shipments_number_start %>
           </div>
 
         </div>
@@ -52,30 +54,30 @@
           <div class="row">
             <div class="col-12 col-xl-6">
               <div class="field">
-                <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
-                <%= f.text_field :number_cont %>
+                <%= label_tag :q_number_start, t('spree.order_number', number: '') %>
+                <%= f.text_field :number_start %>
               </div>
 
               <div class="field">
-                <%= label_tag :q_email_cont, Spree.t(:email) %>
-                <%= f.text_field :email_cont %>
+                <%= label_tag :q_email_start, t('spree.email') %>
+                <%= f.text_field :email_start %>
               </div>
             </div>
 
             <div class="col-12 col-xl-6">
               <div class="field">
-                <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+                <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
                 <%= f.text_field :bill_address_firstname_start, size: 25 %>
               </div>
               <div class="field">
-                <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+                <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
                 <%= f.text_field :bill_address_lastname_start, size: 25%>
               </div>
             </div>
 
             <div class="col-12 col-xl-6">
               <div class="field" data-hook="sku-select">
-                <%= label_tag :q_line_items_variant_id_in, Spree.t(:variant) %>
+                <%= label_tag :q_line_items_variant_id_in, t('spree.variant') %>
                 <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
               </div>
             </div>
@@ -85,7 +87,7 @@
         <div class="col-12 col-md-6 col-lg-4 col-xl-3">
           <% if Spree::Store.count > 1 %>
             <div class="field">
-              <%= label_tag :q_store_id_eq, Spree.t(:store) %>
+              <%= label_tag :q_store_id_eq, t('spree.store') %>
               <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "custom-select fullwidth" } %>
             </div>
           <% end %>
@@ -93,7 +95,7 @@
           <div class="field checkbox">
             <label>
               <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
-              <%= Spree.t(:show_only_complete_orders) %>
+              <%= t('spree.show_only_complete_orders') %>
             </label>
           </div>
         </div>
@@ -104,7 +106,7 @@
 
       <div class="actions filter-actions">
         <div data-hook="admin_orders_index_search_buttons">
-          <%= button Spree.t(:filter_results) %>
+          <%= button t('spree.filter_results') %>
         </div>
       </div>
     <% end %>
@@ -152,13 +154,13 @@
         <td><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td>
           <span class="pill pill-<%= order.state %>">
-            <%= Spree.t(order.state, scope: :order_state) %>
+            <%= t(order.state, scope: 'spree.order_state') %>
           </span>
         </td>
         <td>
           <% if order.payment_state  %>
             <span class="pill pill-<%= order.payment_state %>">
-              <%= Spree.t(order.payment_state, scope: :payment_states) %>
+              <%= t(order.payment_state, scope: 'spree.payment_states') %>
             </span>
           <% end %>
         </td>
@@ -166,7 +168,7 @@
           <td>
             <% if order.shipment_state %>
               <span class="pill pill-<%= order.shipment_state %>">
-                <%= Spree.t(order.shipment_state, scope: :shipment_states) %>
+                <%= t(order.shipment_state, scope: 'spree.shipment_states') %>
               </span>
             <% end %>
           </td>
@@ -187,7 +189,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-9 no-objects-found">
+  <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Order,
                  new_resource_url: spree.new_admin_order_path %>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -12,37 +12,44 @@
 
           <div class="field js-preference-source-wrapper">
             <%= f.label :preference_source %>
-            <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'custom-select fullwidth js-preference-source') %>
+            <%= f.select(:preference_source, [[t('spree.preference_source_none'), nil]] + @object.class.available_preference_sources, {}, class: 'custom-select fullwidth js-preference-source') %>
           </div>
 
           <div class="gateway-settings js-gateway-settings">
             <% if @object.preference_source.present? %>
-              <%= Spree.t :preference_source_using, name: @object.preference_source %>
+              <%= t('spree.preference_source_using', name: @object.preference_source) %>
             <% elsif !@object.new_record? %>
-              <% @object.preferences.keys.each do |key| %>
-                <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(key)}",
-                   form: f, attribute: "preferred_#{key}", label: Spree.t(key) %>
+              <% @object.admin_form_preference_names.each do |name| %>
+                <%= render "spree/admin/shared/preference_fields/#{@object.preference_type(name)}",
+                  form: f, attribute: "preferred_#{name}",
+                  label: t(name, scope: 'spree', default: name.to_s.humanize) %>
               <% end %>
             <% end %>
           </div>
 
-          <div class="info warning js-gateway-settings-warning"><%= Spree.t(:payment_method_settings_warning) %></div>
+          <div class="info warning js-gateway-settings-warning"><%= t('spree.payment_method_settings_warning') %></div>
         </div>
         <div data-hook="auto_capture" class="field">
           <%= f.label :auto_capture %>
-          <%= f.select :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'custom-select fullwidth'} %>
+          <%= f.select :auto_capture, [["#{t('spree.use_app_default')} (#{Spree::Config[:auto_capture]})", ''], [t('spree.say_yes'), true], [t('spree.say_no'), false]], {}, {class: 'custom-select fullwidth'} %>
         </div>
         <div data-hook="available_to_user" class="field">
-          <%= f.check_box :available_to_users %>
-          <%= f.label :available_to_users %>
+          <label>
+            <%= f.check_box :available_to_users %>
+            <%= Spree::PaymentMethod.human_attribute_name :available_to_users %>
+          </label>
         </div>
         <div data-hook="available_to_user" class="field">
-          <%= f.check_box :available_to_admin %>
-          <%= f.label :available_to_admin %>
+          <label>
+            <%= f.check_box :available_to_admin %>
+            <%= Spree::PaymentMethod.human_attribute_name :available_to_admin %>
+          </label>
         </div>
         <div data-hook="active" class="field">
-          <%= f.check_box :active %>
-          <%= f.label :active %>
+          <label>
+            <%= f.check_box :active %>
+            <%= Spree::PaymentMethod.human_attribute_name :active %>
+          </label>
         </div>
       </div>
 
@@ -55,6 +62,10 @@
           <%= f.label :description %>
           <%= f.text_area :description, {cols: 60, rows: 6, class: 'fullwidth'} %>
         </div>
+        <div data-hook="stores" class="field">
+          <%= f.label :store_ids, plural_resource_name(Spree::Store) %>
+          <%= f.collection_select :store_ids, Spree::Store.all, :id, :name, {}, multiple: true, class: "select2 fullwidth" %>
+        </div>
       </div>
     </div>
   </div>