spree_backend 2.3.13 → 2.4.0.rc1

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

@@ -1,77 +1,95 @@
 <div data-hook="admin_stock_locations_form_fields" class="row">
-  <div class="alpha nine columns" data-hook="stock_location_names">
-    <div data-hook="stock_location_name">
+  <div class="row">
+    <div class="alpha twelve columns">
       <%= f.field_container :name do %>
         <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-        <%= f.text_field :name, class: 'fullwidth', required: true %>
-      <% end %>
-    </div>
-    <div data-hook="stock_location_admin_name">
+        <%= f.text_field :name, :class => 'fullwidth' %>
+      <% end %><br>
       <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
-        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
+        <%= f.text_field :admin_name, :class => 'fullwidth', :label => false %>
+      <% end %>
+    </div>
+    <div class="omega four columns">
+      <%= f.field_container :active do %>
+        <label for="active"><%= Spree.t(:status) %></label>
+        <ul>
+          <li>
+            <%= f.label :active, Spree.t(:active) %>
+            <%= f.check_box :active %>
+          </li>
+          <li>
+            <%= f.label :default, Spree.t(:default) %>
+            <%= f.check_box :default %>
+          </li>
+          <li>
+            <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
+            <%= f.check_box :backorderable_default %>
+          </li>
+          <li>
+            <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
+            <%= f.check_box :propagate_all_variants %>
+          </li>
+        </ul>
       <% end %>
     </div>
   </div>
 
-  <div class="omega three columns" data-hook="stock_location_status">
-    <%= f.field_container :active do %>
-      <label for="active"><%= Spree.t(:status) %></label>
-      <ul>
-        <li class="fullwidth" data-hook="stock_location_active">
-          <%= f.check_box :active %>
-          <%= f.label :active, Spree.t(:active) %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_backorderable_default">
-          <%= f.check_box :backorderable_default %>
-          <%= f.label :backorderable_default, Spree.t(:backorderable_default) %>
-        </li>
-        <li class="fullwidth" data-hook="stock_location_propagate_all_variants">
-          <%= f.check_box :propagate_all_variants %>
-          <%= f.label :propagate_all_variants, Spree.t(:propagate_all_variants) %>
-        </li>
-      </ul>
-    <% end %>
-  </div>
-
-  <div class="alpha six columns field" data-hook="stock_location_address1">
-    <%= f.label :address1, Spree.t(:street_address) %>
-    <%= f.text_field :address1, class: 'fullwidth' %>
-  </div>
-
-  <div class="omega six columns field" data-hook="stock_location_city">
-    <%= f.label :city, Spree.t(:city) %>
-    <%= f.text_field :city, class: 'fullwidth' %>
-  </div>
+  <div class="row">
+    <div class="alpha four columns">
+      <div class="field ">
+        <%= f.label :address1, Spree.t(:street_address) %>
+        <%= f.text_field :address1, :class => 'fullwidth' %>
+      </div>
+    </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_address2">
-    <%= f.label :address2, Spree.t(:street_address_2) %>
-    <%= f.text_field :address2, class: 'fullwidth' %>
-  </div>
+    <div class="four columns">
+      <div class="field ">
+        <%= f.label :address2, Spree.t(:street_address_2) %>
+        <%= f.text_field :address2, :class => 'fullwidth' %>
+      </div>
+    </div>
+    <div class="four columns">
+      <div class="field ">
+        <%= f.label :city, Spree.t(:city) %>
+        <%= f.text_field :city, :class => 'fullwidth' %>
+      </div>
+    </div>
 
-  <div class="three columns field" data-hook="stock_location_zipcode">
-    <%= f.label :zipcode, Spree.t(:zip) %>
-    <%= f.text_field :zipcode, class: 'fullwidth' %>
+    <div class="omega four columns">
+      <div class="field ">
+        <%= f.label :zipcode, Spree.t(:zip) %>
+        <%= f.text_field :zipcode, :class => 'fullwidth' %>
+      </div>
+    </div>
   </div>
 
-  <div class="omega three columns field" data-hook="stock_location_phone">
-    <%= f.label :phone, Spree.t(:phone) %>
-    <%= f.phone_field :phone, class: 'fullwidth' %>
-  </div>
+  <div class="row">
+    <div class="alpha eight columns">
+      <div class="field ">
+        <%= f.label :country_id, Spree.t(:country) %>
+        <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'} %></span>
+      </div>
+    </div>
 
-  <div class="alpha six columns field" data-hook="stock_location_country">
-    <%= f.label :country_id, Spree.t(:country) %>
-    <span id="country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 fullwidth' } %></span>
-  </div>
+    <div class="four columns">
+      <div class="field ">
+        <% if f.object.country %>
+          <%= f.label :state_id, Spree.t(:state) %>
+          <span id="state" class="region">
+            <%= f.text_field :state_name, :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' %>
+            <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
+          </span>
+        <% end %>
+      </div>
+    </div>
 
-  <div class="omega six columns field" data-hook="stock_location_state">
-    <% if f.object.country %>
-      <%= f.label :state_id, Spree.t(:state) %>
-      <span id="state" class="region">
-        <%= f.text_field :state_name, style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };", disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' %>
-        <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
-      </span>
-    <% end %>
+    <div class="omega four columns">
+      <div class="field ">
+        <%= f.label :phone, Spree.t(:phone) %>
+        <%= f.phone_field :phone, :class => 'fullwidth' %>
+      </div>
+    </div>
   </div>
 </div>
 

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

@@ -69,8 +69,8 @@
       </div>
       <div class="two columns">
         <div class="field" id="stock_movement_quantity_field">
-          <%= label_tag 'quantity', Spree.t(:quantity) %>
-          <%= number_field_tag 'transfer_variant_quantity', 1, class: 'fullwidth', min: 0 %>
+          <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
+          <%= number_field_tag :transfer_variant_quantity, 1, class: 'fullwidth', min: 0 %>
         </div>
       </div>
       <div class="two columns omega">

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

@@ -3,7 +3,14 @@
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, :class => 'fullwidth' %>
-    <% end %>  
+    <% end %>
+  </div>
+
+  <div class="two columns">
+    <%= f.field_container :tax_code do %>
+      <%= f.label :tax_code, Spree.t(:tax_code) %>
+      <%= f.text_field :tax_code, :class => 'fullwidth' %>
+    <% end %>
   </div>
   
   <div class="five columns">
@@ -21,4 +28,4 @@
       </label>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -15,7 +15,8 @@
 <% if @tax_categories.any? %>
 <table class="index" id='listing_tax_categories' data-hook>
   <colgroup>
-    <col style="width: 30%" />
+    <col style="width: 20%" />
+    <col style="width: 10%" />
     <col style="width: 40%" />
     <col style="width: 15%" />
     <col style="width: 15%" />
@@ -23,6 +24,7 @@
   <thead>
     <tr data-hook="tax_header">
       <th><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:tax_code) %></th>
       <th><%= Spree.t(:description) %></th>
       <th><%= Spree.t(:default) %></th>
       <th class="actions"></th>
@@ -35,6 +37,7 @@
     %>
       <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row" class="<%= cycle('odd', 'even')%>">
         <td class="align-center"><%= tax_category.name %></td>
+        <td class="align-center"><%= tax_category.tax_code %></td>
         <td class="align-center"><%= tax_category.description %></td>
         <td class="align-center"><%= tax_category.is_default? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
         <td class="actions">

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

@@ -1,3 +1,7 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:taxons) %>
+<% end %>
+
 <% content_for :table_filter_title do %>
   <%= Spree.t(:choose_a_taxon_to_sort_products_for) %>
 <% end %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_tracker_form_fields" class="row">
   <div class="alpha four columns">
     <div data-hook="analytics_id" class="field">
-      <%= label_tag nil, Spree.t(:google_analytics_id) %>
+      <%= label_tag :tracker_analytics_id, Spree.t(:google_analytics_id) %>
       <%= text_field :tracker, :analytics_id, :class => 'fullwidth' %>
     </div>
   </div>
   <div class="four columns">
     <div data-hook="environment" class="field">
-      <%= label_tag nil, Spree.t(:environment) %>
+      <%= label_tag :tracker_environment, Spree.t(:environment) %>
       <%= collection_select(:tracker, :environment, rails_environments, :to_s, :titleize, {}, {:id => 'tracker-env', :class => 'select2 fullwidth'}) %>
     </div>
   </div>
@@ -17,11 +17,11 @@
       <ul>
         <li>
           <%= radio_button(:tracker, :active, true) %>
-          <%= Spree.t(:say_yes) %>
+          <%= label_tag :tracker_active_true, Spree.t(:say_yes) %>
         </li>
         <li>
           <%= radio_button(:tracker, :active, false) %>
-          <%= Spree.t(:say_no) %>
+          <%= label_tag :tracker_active_false, Spree.t(:say_no) %>
         </li>
       </ul>
     </div>

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

@@ -12,7 +12,7 @@
         <% @roles.each do |role| %>
           <li>
             <%= check_box_tag 'user[spree_role_ids][]', role.id, @user.spree_roles.include?(role), :id => "user_spree_role_#{role.name}" %>
-            <%= label_tag role.name %>
+            <%= label_tag "user_spree_role_#{role.name}", role.name %>
           </li>
         <% end %>
       </ul>

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

@@ -42,7 +42,7 @@
   <div class="box align-center" data-hook="admin_users_index_search">
     <%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
       <div class="field">
-        <%= f.label Spree.t(:email) %> <br>
+        <%= f.label :email_cont, Spree.t(:email) %> <br>
         <%= f.text_field :email_cont, :class => 'fullwidth' %>
       </div>
       <div data-hook="admin_users_index_search_buttons">

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -0,0 +1,49 @@
+<script type='text/template' id='variant_line_items_autocomplete_stock_template'>
+  <fieldset>
+    <legend align="center"><%= Spree.t(:select_stock) %></legend>
+    <table class="stock-levels" data-hook="stock-levels">
+      <colgroup>
+        <col style="width: 30%;" />
+        <col style="width: 40%;" />
+        <col style="width: 30%;" />
+      </colgroup>
+      <thead>
+        <th><%= Spree.t(:name) %></th>
+        <th><%= Spree.t(:count_on_hand) %></th>
+        <th><%= Spree.t(:quantity) %></th>
+        <th class="actions"></th>
+      </thead>
+      <tbody>
+        <tr>
+          <td>{{variant.name}}</td>
+          {{#unless variant.track_inventory}}
+            <td>
+            It doesnt track inventory
+            </td>
+            <td>
+              <input class="quantity" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
+            </td>
+            <td class="actions">
+              <button class="add_variant no-text fa fa-plus icon_link with-tip" data-variant-id="{{this.variant_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+            </td>
+          {{else}}
+            {{#if variant.total_on_hand}}
+              <td>
+                {{variant.total_on_hand}}
+              </td>
+              <td>
+                <input class="quantity" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
+              </td>
+              <td class="actions">
+                <button class="add_variant no-text fa fa-plus icon_link with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+              </td>
+            {{else}}
+              <td><%= Spree.t(:out_of_stock) %></td>
+              <td>0</td>
+            {{/if}}
+          {{/unless}}
+        </tr>
+      </tbody>
+    </table>
+  </fieldset>
+</script>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -18,7 +18,6 @@
           {{#each variant.stock_items}}
             <tr>
               <td>{{this.stock_location_name}}</td>
-
               {{#unless ../variant.track_inventory}}
                 <td>
                   It doesn't track inventory

data/app/views/spree/admin/variants/_split.js.erb

@@ -13,7 +13,7 @@
       </optgroup>
       <optgroup label="<%=Spree.t('new_shipment_at_location')%>">
         {{#each variant.stock_items}}
-          <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}</option>
+          <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}&nbsp({{this.count_on_hand}} on hand)</option>
         {{/each}}
       </optgroup>
       </select>

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

@@ -14,7 +14,7 @@
 
     <div data-hook="default" class="field">
       <%= zone_form.check_box :default_tax %>
-      <%= label_tag Spree.t(:default_tax_zone) %>
+      <%= label_tag :zone_default_tax, Spree.t(:default_tax_zone) %>
     </div>
 
     <div data-hook="type" class="field">

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( jquery-ui/* logo/spree_50.png )
+Rails.application.config.assets.precompile += %w( jquery-ui/* )

data/config/routes.rb

@@ -7,6 +7,8 @@ Spree::Core::Engine.add_routes do
       resources :promotion_actions
     end
 
+    resources :promotion_categories, :except => [:show]
+
     resources :zones
 
     resources :countries do
@@ -69,6 +71,7 @@ Spree::Core::Engine.add_routes do
 
     resources :orders, :except => [:show] do
       member do
+        get :cart
         post :resend
         get :open_adjustments
         get :close_adjustments
@@ -78,6 +81,11 @@ Spree::Core::Engine.add_routes do
       end
 
       resource :customer, :controller => "orders/customer_details"
+      resources :customer_returns, only: [:index, :new, :edit, :create, :update] do
+        member do
+          put :refund
+        end
+      end
 
       resources :adjustments
       resources :line_items
@@ -92,6 +100,13 @@ Spree::Core::Engine.add_routes do
         end
 
         resources :log_entries
+        resources :refunds, only: [:new, :create, :edit, :update]
+      end
+
+      resources :reimbursements, only: [:create, :show, :edit, :update] do
+        member do
+          post :perform
+        end
       end
     end
 
@@ -101,9 +116,11 @@ Spree::Core::Engine.add_routes do
       end
     end
 
+    resources :return_items, only: [:update]
+
     resources :taxonomies do
       collection do
-      	post :update_positions
+        post :update_positions
       end
       member do
         get :get_children
@@ -124,6 +141,10 @@ Spree::Core::Engine.add_routes do
       end
     end
 
+    resources :reimbursement_types, :only => [:index]
+    resources :refund_reasons, :except => [:show, :destroy]
+    resources :return_authorization_reasons, :except => [:show, :destroy]
+
     resources :shipping_methods
     resources :shipping_categories
     resources :stock_transfers, :only => [:index, :show, :new, :create]