solidus_backend 2.4.2 → 2.5.0.beta1

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

@@ -13,8 +13,8 @@
 
       <div data-hook="admin_product_form_slug">
         <%= f.field_container :slug do %>
-          <%= f.label :slug, class: 'required' %>
-          <%= f.text_field :slug, class: 'fullwidth title', required: true %>
+          <%= f.label :slug, class: ('required' if !f.object.new_record?) %>
+          <%= f.text_field :slug, class: 'fullwidth title', required: !f.object.new_record?, disabled: f.object.new_record? %>
           <%= f.error_message_on :slug %>
         <% end %>
       </div>
@@ -31,8 +31,10 @@
     <div class="right col-3" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
-          <%= f.label :price, class: 'required' %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price,
+          <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
+          <%= render "spree/admin/shared/number_with_currency", f: f,
+                     amount_attr: :price,
+                     required: Spree::Config.require_master_price,
                      currency: Spree::Config.default_pricing_options.currency %>
           <%= f.error_message_on :price %>
         <% end %>
@@ -69,30 +71,31 @@
 
       <div data-hook="admin_product_form_promotionable">
         <%= f.field_container :promotionable do %>
-          <%= f.label :promotionable do %>
-            <%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
-          <% end %>
+          <label>
+            <%= f.check_box :promotionable %>
+            <%= Spree::Product.human_attribute_name(:promotionable) %>
+          </label>
           <%= f.field_hint :promotionable %>
         <% end %>
       </div>
 
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants">
-          <%= f.label :skus, Spree.t(:skus) %>
+          <%= f.label :skus, t('spree.skus') %>
           <span class="info">
-            <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
+            <%= t('spree.info_product_has_multiple_skus', count: @product.variants.count) %>
             <ul class="text_list">
               <% @product.variants.first(5).each do |variant| %>
                 <li><%= link_to variant.sku, spree.edit_admin_product_variant_path(@product, variant) %></li>
               <% end %>
             </ul>
             <% if @product.variants.count > 5 %>
-              <%= Spree.t(:info_number_of_skus_not_shown, count: @product.variants.count - 5) %>
+              <%= t('spree.info_number_of_skus_not_shown', count: @product.variants.count - 5) %>
             <% end %>
           </span>
           <div class="info-actions">
             <% if can?(:admin, Spree::Variant) %>
-              <%= link_to_with_icon 'th-large', Spree.t(:manage_variants), admin_product_variants_url(@product) %>
+              <%= link_to_with_icon 'th-large', t('spree.manage_variants'), admin_product_variants_url(@product) %>
             <% end %>
           </div>
         </div>
@@ -119,9 +122,9 @@
 
       <div data-hook="admin_product_form_shipping_categories">
         <%= f.field_container :shipping_categories do %>
-          <%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
+          <%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human, class: 'required' %>
           <%= f.field_hint :shipping_category %>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' , required: true}) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>
       </div>
@@ -130,7 +133,7 @@
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
           <%= f.field_hint :tax_category %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>

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

@@ -1,7 +1,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Product) %>
     <li id="new_product_link">
-      <%= button_link_to Spree.t(:new_product), new_object_url, { id: 'admin_new_product' } %>
+      <%= button_link_to t('spree.new_product'), new_object_url, { id: 'admin_new_product' } %>
     </li>
   <% end %>
 <% end %>
@@ -9,7 +9,7 @@
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Product Details' } %>
 <%= render partial: 'spree/shared/error_messages', locals: { target: @product } %>
 
-<% admin_breadcrumb(Spree.t(:product_details)) %>
+<% admin_breadcrumb(t('spree.product_details')) %>
 
 <%= form_for [:admin, @product], html: { multipart: true } do |f| %>
   <fieldset class="no-border-top">

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

@@ -3,13 +3,13 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Product)) %>
 
 <% content_for :page_actions do %>
-  <li id="new_product_link">
-    <%= button_link_to Spree.t(:new_product), new_object_url, { remote: true, id: 'admin_new_product' } %>
+  <li>
+    <%= button_link_to t('spree.new_product'), new_object_url %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -35,14 +35,14 @@
             <div class="field checkbox">
               <label>
                 <%= f.check_box :with_deleted, { checked: params[:q][:with_deleted] == 'true' }, 'true', 'false' %>
-                <%= Spree.t(:show_deleted) %>
+                <%= t('spree.show_deleted') %>
               </label>
             </div>
           </div>
         </div>
 
         <div class="actions filter-actions" data-hook="admin_products_index_search_buttons">
-          <%= button Spree.t(:search) %>
+          <%= button t('spree.search') %>
         </div>
     <% end %>
   </div>
@@ -89,7 +89,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::Product,
                   new_resource_url: new_object_url %>

data/app/views/spree/admin/products/new.html.erb

@@ -1,68 +1,14 @@
+<% admin_breadcrumb link_to(plural_resource_name(Spree::Product), spree.admin_products_path) %>
+<% admin_breadcrumb t('spree.new_product') %>
+
 <%= render partial: 'spree/shared/error_messages', locals: { target: @product } %>
 
 <%= form_for [:admin, @product], method: :post, url: admin_products_path, html: { multipart: true } do |f| %>
-
   <fieldset data-hook="new_product">
+    <legend align="center"><%= t('spree.new_product') %></legend>
 
-    <legend align="center"><%= Spree.t(:new_product) %></legend>
-
-    <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, class: 'fullwidth title', required: true %>
-      <%= f.error_message_on :name %>
-    <% end %>
-
-    <div data-hook="new_product_attrs" class="row">
-      <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="col-3">
-          <%= f.field_container :sku do %>
-            <%= f.label :sku, Spree.t(:sku) %><br />
-            <%= f.text_field :sku, size: 16, class: 'fullwidth' %>
-            <%= f.error_message_on :sku %>
-          <% end %>
-        </div>
-      <% end %>
-
-      <div data-hook="new_product_price" class="col-3">
-        <%= f.field_container :price do %>
-          <%= f.label :price, class: 'required' %><br />
-          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'fullwidth', required: true %>
-          <%= f.error_message_on :price %>
-        <% end %>
-      </div>
-
-      <div data-hook="new_product_available_on" class="col-3">
-        <%= f.field_container :available_on do %>
-          <%= f.label :available_on %>
-          <%= f.error_message_on :available_on %>
-          <%= f.text_field :available_on, class: 'datepicker fullwidth' %>
-        <% end %>
-      </div>
-
-    </div>
-
-    <div class='row'>
-      <div data-hook="new_product_shipping_category" class="col-3">
-        <%= f.field_container :shipping_category do %>
-          <%= f.label :shipping_category_id, Spree::ShippingCategory.
-                model_name.human, class: 'required' %>
-          <%= f.field_hint :shipping_category %><br />
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
-          <%= f.error_message_on :shipping_category_id %>
-        <% end %>
-      </div>
-
-      <div data-hook="new_product_tax_category" class="col-3">
-        <%= f.field_container :tax_category do %>
-          <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
-          <%= f.field_hint :tax_category %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
-          <%= f.error_message_on :tax_category %>
-        <% end %>
-      </div>
-    </div>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <%= render partial: 'spree/admin/shared/new_resource_links' %>
-
   </fieldset>
 <% end %>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::PromotionCategory) %>
     <li>
-      <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path %>
+      <%= button_link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path %>
     </li>
   <% end %>
 <% end %>

data/app/views/spree/admin/promotion_categories/new.html.erb

@@ -1,6 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
 <% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
-<% admin_breadcrumb(Spree.t(:new_promotion_category)) %>
+<% admin_breadcrumb(t('spree.new_promotion_category')) %>
 
 
 <%= form_for :promotion_category, url: collection_url do |f| %>

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

@@ -5,7 +5,7 @@
 <% content_for :page_actions do %>
   <li>
     <% if can?(:create, Spree::PromotionCodeBatch) %>
-      <%= button_link_to Spree.t(:new_promotion_code_batch), new_object_url %>
+      <%= button_link_to t('spree.new_promotion_code_batch'), new_object_url %>
     <% end %>
   </li>
 <% end %>
@@ -27,25 +27,25 @@
           <td><%= promotion_code_batch.number_of_codes %></td>
           <td>
             <% if promotion_code_batch.error.present? %>
-              <%= Spree.t(
-                "promotion_code_batches.errored",
+              <%= t(
+                "spree.promotion_code_batches.errored",
                 error: promotion_code_batch.error
               ) %>
             <% elsif promotion_code_batch.finished? %>
-              <%= Spree.t(
-                "promotion_code_batches.finished",
+              <%= t(
+                "spree.promotion_code_batches.finished",
                 number_of_codes: promotion_code_batch.number_of_codes
               ) %>
               <%= link_to(
-                Spree.t(:download_promotion_code_list),
+                t('spree.download_promotion_code_list'),
                 admin_promotion_promotion_code_batch_download_path(
                   promotion_code_batch_id: promotion_code_batch.id,
                   format: :csv
                 )
               ) %>
             <% else %>
-              <%= Spree.t(
-                "promotion_code_batches.processing",
+              <%= t(
+                "spree.promotion_code_batches.processing",
                 number_of_codes: promotion_code_batch.number_of_codes,
                 number_of_codes_processed: promotion_code_batch.promotion_codes.count
               ) %>

data/app/views/spree/admin/promotion_code_batches/new.html.erb

@@ -19,5 +19,5 @@
     <%= f.label :email %>
     <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
   <% end %>
-  <%= button Spree.t('actions.create') %>
+  <%= button t('spree.actions.create') %>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:download_promotion_code_list), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
+    <%= button_link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv) %>
   </li>
 <% end %>
 

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -3,14 +3,14 @@
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form' do %>
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map {|action| [ action.model_name.human, action.name] } ) %>
     <fieldset>
-      <legend align="center"><%= plural_resource_name(Spree::PromotionAction) %></legend>
+      <legend align="center"><%= t('spree.promotion_actions') %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
-          <%= select_tag 'action_type', options, class: 'custom-select fullwidth' %>
+          <%= label_tag :action_type, t('spree.add_action_of_type')%>
+          <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t('actions.add') %>
+          <%= button t('spree.actions.add') %>
         </div>
       <% end %>
     </fieldset>
@@ -22,13 +22,13 @@
         <%= render partial: 'promotion_action',  collection: @promotion.actions %>
       <% else %>
         <div class="no-objects-found">
-          <%= Spree.t(:no_actions_added) %>
+          <%= t('spree.no_actions_added') %>
         </div>
       <% end %>
     </div>
     <% if can?(:update, @promotion) %>
       <div class="filter-actions actions promotion-update">
-        <%= button Spree.t('actions.update') %>
+        <%= button t('spree.actions.update') %>
       </div>
     <% end %>
   <% end %>

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

@@ -12,8 +12,10 @@
           <% end %>
 
           <%= f.field_container :advertise do %>
-            <%= f.check_box :advertise %>
-            <%= f.label :advertise %>
+            <label>
+              <%= f.check_box :advertise %>
+              <%= Spree::Promotion.human_attribute_name :advertise %>
+            </label>
           <% end %>
         </div>
 
@@ -25,7 +27,7 @@
 
           <%= f.field_container :category do %>
             <%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br />
-            <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select fullwidth' }) %>
+            <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select fullwidth' }) %>
           <% end %>
         </div>
       </div>
@@ -36,10 +38,17 @@
         <%= f.label :usage_limit %><br />
         <%= f.number_field :usage_limit, min: 0, class: 'fullwidth' %><br>
         <span class="info">
-          <%= Spree.t(:current_promotion_usage, count: @promotion.usage_count) %>
+          <%= t('spree.current_promotion_usage', count: @promotion.usage_count) %>
         </span>
       <% end %>
 
+      <% if @promotion.persisted? %>
+        <%= f.field_container :per_code_usage_limit do %>
+          <%= f.label :per_code_usage_limit %><br />
+          <%= f.number_field :per_code_usage_limit, min: 0, class: 'fullwidth' %><br>
+        <% end %>
+      <% end %>
+
       <div id="starts_at_field" class="field">
         <%= f.label :starts_at %>
         <%= f.field_hint :starts_at %>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -1,6 +1,6 @@
 <div class="promotion_rule promotion-block col-12" id="<%= dom_id promotion_rule %>">
   <% type_name = promotion_rule.model_name.element %>
-  <h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= promotion_rule.class.human_attribute_name(:description) %></h6>
+  <h6 class='promotion-title <%= 'no-text' if type_name.in? %w(user_logged_in first_order one_use_per_user) %>'><%= promotion_rule.class.human_attribute_name(:description) %></h6>
   <% if can?(:destroy, promotion_rule) %>
     <%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), remote: true, method: :delete, class: 'delete' %>
   <% end %>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -2,15 +2,15 @@
 
   <%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
     <fieldset>
-      <legend align="center"><%= Spree.t(:rules) %></legend>
+      <legend align="center"><%= t('spree.rules') %></legend>
 
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :promotion_rule_type, Spree.t(:add_rule_of_type) %>
-          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'custom-select fullwidth') %>
+          <%= label_tag :promotion_rule_type, t('spree.add_rule_of_type') %>
+          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth') %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t('actions.add') %>
+          <%= button t('spree.actions.add') %>
         </div>
       <% end %>
     </fieldset>
@@ -19,10 +19,10 @@
 
     <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
-        <div id="promotion-pilicy-select" class="align-center row">
+        <div id="promotion-policy-select" class="align-center row">
           <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
             <div class="col-6">
-              <label><%= f.radio_button :match_policy, policy %> <%= Spree.t "promotion_form.match_policies.#{policy}" %></label>
+              <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
             </div>
           <% end %>
         </div>
@@ -36,14 +36,14 @@
             </div>
           <% else %>
             <div class="no-objects-found">
-              <%= Spree.t(:no_rules_added) %>
+              <%= t('spree.no_rules_added') %>
             </div>
           <% end %>
         </div>
 
         <% if can?(:update, @promotion) %>
           <div class="promotion-update filter-actions actions">
-            <%= button Spree.t('actions.update') %>
+            <%= button t('spree.actions.update') %>
           </div>
         <% end %>
       </fieldset>

data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb

@@ -1,13 +1,7 @@
-<div class="col-12">
-  <div class="row">
-    <div class="col-12">
-      <div class="field">
-        <% field_name = "#{param_prefix}[preferred_group_size]" %>
-        <%= label_tag field_name, Spree.t(:group_size) %>
-        <%= number_field_tag field_name, promotion_action.preferred_group_size, class: "fullwidth", min: 1 %>
-      </div>
-    </div>
-  </div>
+<div class="field">
+  <% field_name = "#{param_prefix}[preferred_group_size]" %>
+  <%= label_tag field_name, t('spree.group_size') %>
+  <%= number_field_tag field_name, promotion_action.preferred_group_size, class: "fullwidth", min: 1 %>
 </div>
 
 <%= render "spree/admin/promotions/actions/create_item_adjustments",