solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -9,7 +9,7 @@
       </li>
       <li>
         <span id="new_ptype_link">
-          <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button fa fa-copy' %>
+          <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, :class => 'button fa fa-copy' %>
         </span>
       </li>
     </ul>
@@ -18,17 +18,16 @@
 
 <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
   <fieldset>
-    <legend align="center"><%= Spree.t(:product_properties) %></legend>
+    <legend align="center"><%= Spree::ProductProperty.model_name.human(count: :other) %></legend>
     <div class="add_product_properties" data-hook="add_product_properties"></div>
 
     <div id="prototypes" data-hook></div>
-    <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
 
     <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
       <thead>
         <tr data-hook="product_properties_header">
-          <th colspan="2"><%= Spree.t(:property) %></th>
-          <th><%= Spree.t(:value) %></th>
+          <th colspan="2"><%= Spree::Property.model_name.human %></th>
+          <th><%= Spree::ProductProperty.human_attribute_name(:value) %></th>
           <th class="actions"></th>
         </tr>
       </thead>
@@ -60,7 +59,6 @@
       <div class="form-buttons filter-actions actions">
         <%= button Spree.t(:filter_results) %>
         <% if @option_value_ids.present? %>
-          <span class="or"><%= Spree.t(:or) %></span>
           <%= link_to_add_fields Spree.t(:add_variant_properties), 'tbody#variant_property_values', class: 'plus button' %>
         <% end %>
       </div>
@@ -77,8 +75,8 @@
         <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_variant_property_rule_values_url %>">
           <thead>
             <tr data-hook="variant_property_values_header">
-              <th colspan="2"><%= Spree.t(:property) %></th>
-              <th><%= Spree.t(:value) %></th>
+              <th colspan="2"><%= Spree::Property.model_name.human %></th>
+              <th><%= Spree::ProductProperty.human_attribute_name(:value) %></th>
               <th class="actions"></th>
             </tr>
           </thead>

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

@@ -1,9 +1,9 @@
 <div data-hook="admin_product_form_fields">
 
-  <div class="left eight columns alpha" data-hook="admin_product_form_left">
+  <div class="left twelve columns alpha" data-hook="admin_product_form_left">
     <div data-hook="admin_product_form_name">
       <%= f.field_container :name do %>
-        <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
+        <%= f.label :name, class: 'required' %>
         <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :name %>
       <% end %>
@@ -11,7 +11,7 @@
 
     <div data-hook="admin_product_form_slug">
       <%= f.field_container :slug do %>
-        <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
+        <%= f.label :slug, class: 'required' %>
         <%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :slug %>
       <% end %>
@@ -19,7 +19,7 @@
 
     <div data-hook="admin_product_form_description">
       <%= f.field_container :description do %>
-        <%= f.label :description, Spree.t(:description) %>
+        <%= f.label :description %>
         <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '22' else '15' end}", :class => 'fullwidth'} %>
         <%= f.error_message_on :description %>
       <% end %>
@@ -29,7 +29,7 @@
   <div class="right four columns omega" data-hook="admin_product_form_right">
     <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
-      <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
+      <%= f.label :price, class: 'required' %>
       <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
       <%= f.error_message_on :price %>
     <% end %>
@@ -37,7 +37,7 @@
 
     <div data-hook="admin_product_form_cost_price" class="alpha two columns">
       <%= f.field_container :cost_price do %>
-        <%= f.label :cost_price, Spree.t(:cost_price) %>
+        <%= f.label :cost_price %>
         <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
         <%= f.error_message_on :cost_price %>
       <% end %>
@@ -45,7 +45,7 @@
 
     <div data-hook="admin_product_form_cost_currency" class="omega two columns">
       <%= f.field_container :cost_currency do %>
-        <%= f.label :cost_currency, Spree.t(:cost_currency) %>
+        <%= f.label :cost_currency %>
         <%= f.text_field :cost_currency %>
         <%= f.error_message_on :cost_currency %>
       <% end %>
@@ -55,7 +55,7 @@
 
     <div data-hook="admin_product_form_available_on">
       <%= f.field_container :available_on do %>
-        <%= f.label :available_on, Spree.t(:available_on) %>
+        <%= f.label :available_on %>
         <%= f.error_message_on :available_on %>
         <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
       <% end %>
@@ -64,7 +64,7 @@
     <div data-hook="admin_product_form_promotionable">
       <%= f.field_container :promotionable do %>
         <%= f.label :promotionable do %>
-          <%= f.check_box :promotionable %> <%= Spree.t(:promotionable) %>
+          <%= f.check_box :promotionable %> <%= Spree::Product.human_attribute_name(:promotionable) %>
         <% end %>
       <% end %>
     </div>
@@ -76,7 +76,7 @@
           <%= Spree.t(:info_product_has_multiple_skus, count: @product.variants.count) %>
           <ul class="text_list">
             <% @product.variants.first(5).each do |variant| %>
-              <li><%= variant.sku %></li>
+              <li><%= link_to variant.sku, spree.edit_admin_product_variant_path(@product, variant) %></li>
             <% end %>
           </ul>
           <% if @product.variants.count > 5 %>
@@ -92,34 +92,34 @@
     <% else %>
       <div data-hook="admin_product_form_sku">
         <%= f.field_container :sku do %>
-          <%= f.label :sku, Spree.t(:sku) %>
+          <%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
           <%= f.text_field :sku, :size => 16 %>
         <% end %>
       </div>
 
-      <ul id="shipping_specs">
-        <li id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field alpha two columns">
-          <%= f.label :weight, Spree.t(:weight) %>
-          <%= f.text_field :weight, :size => 4 %>
-        </li>
-        <li id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field omega two columns">
-          <%= f.label :height, Spree.t(:height) %>
+      <div id="shipping_specs">
+        <div id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field alpha two columns">
+          <%= f.label :height %>
           <%= f.text_field :height, :size => 4 %>
-        </li>
-        <li id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field alpha two columns">
-          <%= f.label :width, Spree.t(:width) %>
+        </div>
+        <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field omega two columns">
+          <%= f.label :width %>
           <%= f.text_field :width, :size => 4 %>
-        </li>
-        <li id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field omega two columns">
-          <%= f.label :depth, Spree.t(:depth) %>
+        </div>
+        <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field alpha two columns">
+          <%= f.label :depth %>
           <%= f.text_field :depth, :size => 4 %>
-        </li>
-      </ul>
+        </div>
+        <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field omega two columns">
+          <%= f.label :weight %>
+          <%= f.text_field :weight, :size => 4 %>
+        </div>
+      </div>
     <% end %>
 
     <div data-hook="admin_product_form_shipping_categories">
       <%= f.field_container :shipping_categories do %>
-        <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
+        <%= f.label :shipping_category_id, Spree::ShippingCategory.model_name.human %>
         <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
         <%= f.error_message_on :shipping_category %>
       <% end %>
@@ -127,7 +127,7 @@
 
     <div data-hook="admin_product_form_tax_category">
       <%= f.field_container :tax_category do %>
-        <%= f.label :tax_category_id, Spree.t(:tax_category) %>
+        <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
         <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
         <%= f.error_message_on :tax_category %>
       <% end %>
@@ -137,14 +137,14 @@
   <div class="twelve columns alpha omega">
     <div data-hook="admin_product_form_taxons">
       <%= f.field_container :taxons do %>
-        <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
+        <%= f.label :taxon_ids, Spree::Taxon.model_name.human(count: :other) %><br />
         <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_option_types">
       <%= f.field_container :option_types do %>
-        <%= f.label :option_type_ids, Spree.t(:option_types) %>
+        <%= f.label :option_type_ids, Spree::OptionType.model_name.human(count: :other) %>
         <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
       <% end %>
     </div>
@@ -153,21 +153,21 @@
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
     <div data-hook="admin_product_form_meta_title">
       <%= f.field_container :meta_title do %>
-        <%= f.label :meta_title, Spree.t(:meta_title) %>
+        <%= f.label :meta_title %>
         <%= f.text_field :meta_title, :class => 'fullwidth' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_keywords">
       <%= f.field_container :meta_keywords do %>
-        <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+        <%= f.label :meta_keywords %>
         <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_description">
       <%= f.field_container :meta_description do %>
-        <%= f.label :meta_description, Spree.t(:meta_description) %>
+        <%= f.label :meta_description %>
         <%= f.text_field :meta_description, :class => 'fullwidth' %>
       <% end %>
     </div>

data/app/views/spree/admin/products/_properties_form.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:properties) %>
+  <%= Spree::Property.model_name.human(count: :other) %>
 <% end %>
 
 <% f.fields_for :product_properties do |properties_form| %>

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

@@ -22,13 +22,13 @@
         <div data-hook="admin_products_index_search">
           <div class="alpha nine columns">
             <div class="field">
-              <%= f.label :name_cont, Spree.t(:name) %>
+              <%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
               <%= f.text_field :name_cont, :size => 15 %>
             </div>
           </div>
           <div class="four columns">
             <div class="field">
-              <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
+              <%= f.label :variants_including_master_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
               <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
             </div>
           </div>
@@ -53,7 +53,7 @@
 
 <div id="new_product_wrapper" data-hook></div>
 
-<%= paginate @collection %>
+<%= paginate @collection, theme: "solidus_admin" %>
 
 <% if @collection.any? %>
   <table class="index" id="listing_products">
@@ -66,9 +66,9 @@
     </colgroup>
     <thead>
       <tr data-hook="admin_products_index_headers">
-        <th><%= Spree.t(:sku) %></th>
-        <th colspan="2"><%= sort_link @search,:name, Spree.t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
-        <th><%= sort_link @search,:master_default_price_amount, Spree.t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
+        <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
+        <th colspan="2"><%= sort_link @search,:name, Spree::Product.human_attribute_name(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
+        <th><%= sort_link @search,:master_default_price_amount, Spree::Product.human_attribute_name(:price), {}, {:title => 'admin_products_listing_price_title'} %></th>
         <th data-hook="admin_products_index_header_actions" class="actions"></th>
       </tr>
     </thead>
@@ -92,9 +92,10 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/product')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_product_path %>!
+    <%= render 'spree/admin/shared/no_objects_found',
+                  resource: Spree::Product,
+                  new_resource_url: new_object_url %>
   </div>
 <% end %>
 
-<%= paginate @collection %>
+<%= paginate @collection, theme: "solidus_admin" %>

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

@@ -7,7 +7,7 @@
     <legend align="center"><%= Spree.t(:new_product) %></legend>
 
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
+      <%= f.label :name, class: 'required' %><br />
       <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
       <%= f.error_message_on :name %>
     <% end %>
@@ -25,14 +25,14 @@
 
       <div data-hook="new_product_prototype" class="four columns">
         <%= f.field_container :prototype do %>
-          <%= f.label :prototype_id, Spree.t(:prototype) %><br />
+          <%= f.label :prototype_id, Spree::Prototype.model_name.human %><br />
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
         <% end %>
       </div>
 
       <div data-hook="new_product_price" class="four columns">
         <%= f.field_container :price do %>
-          <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
+          <%= 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 %>
@@ -40,7 +40,7 @@
 
       <div data-hook="new_product_available_on" class="omega four columns">
         <%= f.field_container :available_on do %>
-          <%= f.label :available_on, Spree.t(:available_on) %>
+          <%= f.label :available_on %>
           <%= f.error_message_on :available_on %>
           <%= f.text_field :available_on, :class => 'datepicker fullwidth' %>
         <% end %>
@@ -51,7 +51,8 @@
     <div class='row'>
       <div data-hook="new_product_shipping_category" class="alpha four columns">
         <%= f.field_container :shipping_category do %>
-          <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
+          <%= f.label :shipping_category_id, Spree::ShippingCategory.
+                model_name.human, class: 'required' %><br />
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth', :required => true }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>

data/app/views/spree/admin/promotion_codes/index.csv.ruby

@@ -1,6 +1,6 @@
 CSV.generate do |csv|
   csv << ['Code']
-  @promotion.codes.order(:id).each do |code|
-    csv << [code.value]
+  @promotion.codes.order(:id).pluck(:value).each do |value|
+    csv << [value]
   end
 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(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
     <fieldset>
-      <legend align="center"><%= Spree.t(:promotion_actions) %></legend>
+      <legend align="center"><%= Spree::PromotionAction.model_name.human(count: :other) %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
           <%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t(:add), 'plus' %>
+          <%= button Spree.t('actions.add'), 'plus' %>
         </div>
       <% end %>
     </fieldset>

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

@@ -47,7 +47,7 @@
       <% end %>
 
       <%= f.field_container :category do %>
-        <%= f.label :promotion_category %><br />
+        <%= 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 => 'select2 fullwidth' }) %>
       <% end %>
     </div>
@@ -55,7 +55,7 @@
 
   <div id="expiry_fields" class="three columns omega">
     <%= f.field_container :overall_usage_limit do %>
-      <%= f.label :overall_usage_limit %><br />
+      <%= 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) %>

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

@@ -10,7 +10,7 @@
           <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
         </div>
         <div class="filter-actions actions">
-          <%= button Spree.t(:add), 'plus' %>
+          <%= button Spree.t('actions.add'), 'plus' %>
         </div>
       <% end %>
     </fieldset>

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

@@ -2,7 +2,7 @@
 
   <div class="field alpha four columns">
     <% field_name = "#{param_prefix}[calculator_type]" %>
-    <%= label_tag field_name, Spree.t(:calculator) %>
+    <%= label_tag field_name, Spree::Calculator.model_name.human %>
     <%= select_tag field_name,
                    options_from_collection_for_select(calculators, :to_s, :description, promotion_action.calculator.type),
                    :class => 'type-select select2 fullwidth' %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -11,4 +11,4 @@
   'form-prefix' => prefix,
   'calculator' => 'tiered_flat_rate'
 } %>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button>

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -11,4 +11,4 @@
   'form-prefix' => prefix,
   'calculator' => 'tiered_percent'
 } %>
-<button class="fa fa-plus button js-add-tier"><%= Spree.t(:add) %></button>
+<button class="fa fa-plus button js-add-tier"><%= Spree.t('actions.add') %></button>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:promotions) %>
+  <%= Spree::Promotion.model_name.human(count: :other) %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -19,28 +19,28 @@
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="four columns alpha">
         <div class="field">
-          <%= label_tag :q_name_cont, Spree.t(:name) %>
+          <%= label_tag :q_name_cont, Spree::Promotion.human_attribute_name(:name) %>
           <%= f.text_field :name_cont, tabindex: 1 %>
         </div>
       </div>
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag :q_codes_value_cont, Spree.t(:code) %>
+          <%= label_tag :q_codes_value_cont, Spree::Promotion.human_attribute_name(:code) %>
           <%= f.text_field :codes_value_cont, tabindex: 1 %>
         </div>
       </div>
 
       <div class="four columns">
         <div class="field">
-          <%= label_tag :q_path_cont, Spree.t(:path) %>
+          <%= label_tag :q_path_cont, Spree::Promotion.human_attribute_name(:path) %>
           <%= f.text_field :path_cont, tabindex: 1 %>
         </div>
       </div>
 
       <div class="four columns omega">
         <div class="field">
-          <%= label_tag :q_promotion_category_id_eq, 'promotion category' %><br>
+          <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
           <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { :include_blank => Spree.t('match_choices.all') }, { :class => 'select2 fullwidth' }) %>
         </div>
       </div>
@@ -57,7 +57,7 @@
 <% end %>
 
 
-<%= paginate @promotions %>
+<%= paginate @promotions, theme: "solidus_admin" %>
 
 <% if @promotions.any? %>
   <table class="index">
@@ -72,12 +72,12 @@
     </colgroup>
     <thead>
       <tr>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:code) %></th>
-        <th><%= Spree.t(:description) %></th>
-        <th><%= Spree.t(:usage_limit) %></th>
-        <th><%= Spree.t(:promotion_uses) %></th>
-        <th><%= Spree.t(:expiration) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:name) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:code) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:description) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:usage_limit) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:promotion_uses) %></th>
+        <th><%= Spree::Promotion.human_attribute_name(:expires_at) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -104,9 +104,8 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion')) %>
-    <% if can? :create, Spree::Promotion %>
-      <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
-    <% end %>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::Promotion,
+                 new_resource_url: new_object_url %>
   </div>
 <% end %>