solidus_backend 2.1.1 → 2.2.0.beta1

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

@@ -1,21 +1,21 @@
 <% 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 Spree.t(:new_product), new_object_url, { id: 'admin_new_product' } %>
     </li>
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Product Details' } %>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @product } %>
+<%= 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)) %>
 
-<%= form_for [:admin, @product], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product], html: { multipart: true } do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
     <% if can?(:update, @product) %>
-      <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+      <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     <% end %>
   </fieldset>
 <% end %>

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

@@ -4,7 +4,7 @@
 
 <% 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' } %>
+    <%= button_link_to Spree.t(:new_product), new_object_url, { remote: true, id: 'admin_new_product' } %>
   </li>
 <% end if can?(:create, Spree::Product) %>
 
@@ -15,26 +15,26 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_products_sidebar">
     <%= search_form_for [:admin, @search] do |f| %>
-        <%- locals = {:f => f} %>
+        <%- locals = {f: f} %>
         <div class="row" data-hook="admin_products_index_search" >
-          <div class="col-xs-6">
+          <div class="col-6">
             <div class="field">
               <%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
-              <%= f.text_field :name_cont, :size => 15 %>
+              <%= f.text_field :name_cont, size: 15 %>
             </div>
           </div>
 
-          <div class="col-xs-4">
+          <div class="col-4">
             <div class="field">
               <%= f.label :variants_including_master_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
-              <%= f.text_field :variants_including_master_sku_cont, :size => 15 %>
+              <%= f.text_field :variants_including_master_sku_cont, size: 15 %>
             </div>
           </div>
 
-          <div class="col-xs-2">
+          <div class="col-2">
             <div class="field checkbox">
               <label>
-                <%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null] == '0'}, '0', '1' %>
+                <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
                 <%= Spree.t(:show_deleted) %>
               </label>
             </div>
@@ -64,8 +64,8 @@
     <thead>
       <tr data-hook="admin_products_index_headers">
         <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 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>
@@ -73,22 +73,22 @@
       <% @collection.each do |product| %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td class="align-center"><%= product.sku %></td>
-            <td class="align-center"><%= image_tag product.display_image.attachment(:mini) %></td>
+            <td class="align-center"><%= render 'spree/admin/shared/image', image: product.display_image, size: :mini %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="align-center"><%= product.display_price.to_html %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">
-              <%= link_to_edit product, :no_text => true, :class => 'edit' if can?(:edit, product) && !product.deleted? %>
+              <%= link_to_edit product, no_text: true, class: 'edit' if can?(:edit, product) && !product.deleted? %>
               &nbsp;
-              <%= link_to_clone product, :no_text => true, :class => 'clone' if can?(:clone, product) %>
+              <%= link_to_clone product, no_text: true, class: 'clone' if can?(:clone, product) %>
               &nbsp;
-              <%= link_to_delete product, :no_text => true if can?(:delete, product) && !product.deleted? %>
+              <%= link_to_delete product, no_text: true if can?(:delete, product) && !product.deleted? %>
             </td>
           </tr>
       <% end %>
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 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,6 +1,6 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @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| %>
+<%= form_for [:admin, @product], method: :post, url: admin_products_path, html: { multipart: true } do |f| %>
 
   <fieldset data-hook="new_product">
 
@@ -8,61 +8,61 @@
 
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
+      <%= 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-xs-3">
+        <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.text_field :sku, size: 16, class: 'fullwidth' %>
             <%= f.error_message_on :sku %>
           <% end %>
         </div>
       <% end %>
 
-      <div data-hook="new_product_price" class="col-xs-3">
+      <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.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-xs-3">
+      <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' %>
+          <%= f.text_field :available_on, class: 'datepicker fullwidth' %>
         <% end %>
       </div>
 
     </div>
 
     <div class='row'>
-      <div data-hook="new_product_shipping_category" class="col-xs-3">
+      <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 => 'select2 fullwidth' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_tax_category" class="col-xs-3">
+      <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 => 'select2 fullwidth' }) %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 fullwidth' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>
     </div>
 
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
 
   </fieldset>
 <% end %>

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

@@ -1,4 +1,4 @@
-$("#new_product_wrapper").html('<%= escape_javascript(render :template => "spree/admin/products/new", :formats => [:html], :handlers => [:erb]) %>');
+$("#new_product_wrapper").html('<%= escape_javascript(render template: "spree/admin/products/new", formats: [:html], handlers: [:erb]) %>');
 handle_date_picker_fields();
 <% unless Rails.env.test? %>
   $('.select2').select2();

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,13 +1,14 @@
-$('#actions').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_action', :object => @promotion_action) ) %>');
+$('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
 $(document).ready(function(){
   $(".variant_autocomplete").variantAutocomplete();
   //enable select2 functions for recently added box
   $('.type-select.select2').last().select2();
 });
-initProductActions();
+initPromotionActions();
 
 
 $('#<%= dom_id @promotion_action %>').hide();
 $('#<%= dom_id @promotion_action %>').fadeIn();
+new Spree.CalculatorEditView({el: $('#<%= dom_id @promotion_action %> .js-calculator-fields')});
 

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

@@ -1,14 +1,14 @@
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @promotion } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @promotion } %>
 
 <div class='row'>
-  <div class='col-xs-4'>
+  <div class='col-4'>
     <%= f.field_container :name do %>
       <%= f.label :name %>
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
     <%= f.field_container :code do %>
       <%= f.label :code %>
-      <%= f.text_field :code, :class => 'fullwidth' %>
+      <%= f.text_field :code, class: 'fullwidth' %>
     <% end %>
   </div>
 </div>

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

@@ -3,9 +3,9 @@
 <% admin_breadcrumb(@promotion_category.name) %>
 
 
-<%= form_for @promotion_category, :url => object_url, :method => :put do |f| %>
+<%= form_for @promotion_category, url: object_url, method: :put do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

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

@@ -28,10 +28,10 @@
         <td><%= promotion_category.code%></td>
         <td class="actions">
           <% if can?(:update, promotion_category) %>
-            <%= link_to_edit promotion_category, :no_text => true %>
+            <%= link_to_edit promotion_category, no_text: true %>
           <% end %>
           <% if can?(:destroy, promotion_category) %>
-            <%= link_to_delete promotion_category, :no_text => true %>
+            <%= link_to_delete promotion_category, no_text: true %>
           <% end %>
         </td>
       </tr>

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

@@ -3,9 +3,9 @@
 <% admin_breadcrumb(Spree.t(:new_promotion_category)) %>
 
 
-<%= form_for :promotion_category, :url => collection_url do |f| %>
+<%= form_for :promotion_category, url: collection_url do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/promotion_code_batches/download.csv.ruby

@@ -0,0 +1,6 @@
+CSV.generate do |csv|
+  csv << ['Code']
+  @promotion_code_batch.promotion_codes.order(:id).pluck(:value).each do |value|
+    csv << [value]
+  end
+end

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

@@ -0,0 +1,65 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, spree.edit_admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <% if can?(:create, Spree::PromotionCodeBatch) %>
+      <%= button_link_to Spree.t(:new_promotion_code_batch), new_object_url %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if @promotion_code_batches.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:base_code) %></th>
+        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:total_codes) %></th>
+        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:status) %></th>
+        <th><%= Spree::PromotionCodeBatch.human_attribute_name(:email) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @promotion_code_batches.each do |promotion_code_batch| %>
+        <tr>
+          <td><%= promotion_code_batch.base_code %></td>
+          <td><%= promotion_code_batch.number_of_codes %></td>
+          <td>
+            <% if promotion_code_batch.error.present? %>
+              <%= Spree.t(
+                "promotion_code_batches.errored",
+                error: promotion_code_batch.error
+              ) %>
+            <% elsif promotion_code_batch.finished? %>
+              <%= Spree.t(
+                "promotion_code_batches.finished",
+                number_of_codes: promotion_code_batch.number_of_codes
+              ) %>
+              <%= link_to(
+                Spree.t(: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",
+                number_of_codes: promotion_code_batch.number_of_codes,
+                number_of_codes_processed: promotion_code_batch.promotion_codes.count
+              ) %>
+            <% end %>
+          </td>
+          <td><%= promotion_code_batch.email %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::PromotionCodeBatch,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

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

@@ -0,0 +1,23 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, spree.admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
+
+<%= form_for :promotion_code_batch, url: collection_url do |f| %>
+  <%= f.hidden_field :promotion_id, value: params[:promotion_id] %>
+
+  <%= f.field_container :base_code do %>
+    <%= f.label :base_code %>
+    <%= f.text_field :base_code, class: "fullwidth" %>
+  <% end %>
+
+  <%= f.field_container :number_of_codes do %>
+    <%= f.label :number_of_codes %>
+    <%= f.text_field :number_of_codes, class: "fullwidth" %>
+  <% end %>
+
+  <%= f.field_container :email do %>
+    <%= f.label :email %>
+    <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
+  <% end %>
+  <%= button Spree.t('actions.create') %>
+<% 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).pluck(:value).each do |value|
+  @promotion_codes.order(:id).pluck(:value).each do |value|
     csv << [value]
   end
 end

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

@@ -0,0 +1,28 @@
+<% admin_breadcrumb link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path %>
+<% admin_breadcrumb link_to(@promotion.name, spree.edit_admin_promotion_path(@promotion)) %>
+<% admin_breadcrumb plural_resource_name(Spree::PromotionCode) %>
+
+<% 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) %>
+  </li>
+<% end %>
+
+<div class="pagination-summary">
+  <%= page_entries_info(@promotion_codes) %>
+</div>
+
+<table>
+  <thead>
+    <th><%= Spree::PromotionCode.human_attribute_name :value %></th>
+  </thead>
+  <tbody>
+    <% @promotion_codes.each do |promotion_code| %>
+      <tr>
+        <td><%= promotion_code.value %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate @promotion_codes, theme: "solidus_admin" %>

data/app/views/spree/admin/promotion_rules/create.js.erb

@@ -1,4 +1,4 @@
-$('#rules').append('<%= escape_javascript( render(:partial => 'spree/admin/promotions/promotion_rule', :object => @promotion_rule) ) %>');
+$('#rules').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_rule', object: @promotion_rule) ) %>');
 $('#rules .no-objects-found').hide();
 
 $('.product_picker').productAutocomplete();

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

@@ -1,13 +1,13 @@
 <fieldset id="action_fields" class="no-border-top">
 
-  <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), :remote => true, :id => 'new_promotion_action_form' do %>
+  <%= 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"><%= plural_resource_name(Spree::PromotionAction) %></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' %>
+          <%= select_tag 'action_type', options, class: 'select2 fullwidth' %>
         </div>
         <div class="filter-actions actions">
           <%= button Spree.t('actions.add') %>
@@ -16,10 +16,10 @@
     </fieldset>
   <% end %>
 
-  <%= form_for @promotion, :url => spree.admin_promotion_path(@promotion), :method => :put do |f| %>
+  <%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
     <div id="actions" class="filter_list">
       <% if @promotion.actions.any? %>
-        <%= render :partial => 'promotion_action',  :collection => @promotion.actions %>
+        <%= render partial: 'promotion_action',  collection: @promotion.actions %>
       <% else %>
         <div class="no-objects-found">
           <%= Spree.t(:no_actions_added) %>