spree_backend 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec214ff2a06feab677374b259cbe3ed5117788ba
-  data.tar.gz: 8e262166c0c7cc2184fed2a7bca15521e236efba
+  metadata.gz: a67893cb1246afcc0b5633e064a985fc5bef80a9
+  data.tar.gz: 461eab8dabfc977a06b14203561983a768120bb7
 SHA512:
-  metadata.gz: 5138ae5ce5036521d3e75b276aef5a25876bdb16fdab647e241a7c503f98f3052b1f02679681b832499aded94cbc97f7c9da6730adef60b11865db284032c970
-  data.tar.gz: c4053f45aebe4441685eb8d02565ffdb66e7afaac1d9a1caaff565470a4752d8dd5ba587246b9ca6f2c95d4807cc2cb7a9463a702e84d245a4fede9c797759a2
+  metadata.gz: 650dcdb0372b5c022d2fdb616572b8da81809c44e1bd586d1ba35c3c5ff293f6aa618802b9e751c8e92e6a0323000d81389cedffe4b1f9dda9fe5fea9363ca28
+  data.tar.gz: 8045ce114eeb4db7729a73994d6a108377b55aa4398750faa7746145add558df4a86a870fdf1f1448997ad7aeb8fad198a6d23c9b1f28e4486790c65842934c7

data/app/assets/javascripts/admin/option_type_autocomplete.js.erb

@@ -18,7 +18,8 @@ $(document).ready(function () {
           return {
             q: {
               name_cont: term
-            }
+            },
+            token: Spree.api_key
           };
         },
         results: function (data) {

data/app/assets/javascripts/admin/product_picker.js

@@ -20,7 +20,8 @@ $.fn.productAutocomplete = function () {
             name_cont: term,
             sku_cont: term
           },
-          m: 'OR'
+          m: 'OR',
+          token: Spree.api_key
         };
       },
       results: function (data, page) {

data/app/assets/javascripts/admin/stock_transfer.js.coffee

@@ -69,9 +69,7 @@ $ ->
     populate_select: (select, except=0) ->
       select.children('option').remove()
       for location in @locations when location.id isnt except
-        select.append $('<option></option>')
-                        .text(location.name)
-                        .attr('value', location.id)
+        select.append $('<option></option>').text(location.name).attr('value', location.id)
       select.select2()
 
   # Populates variants drop down

data/app/assets/javascripts/admin/taxon_autocomplete.js.erb

@@ -22,7 +22,8 @@ $(document).ready(function () {
             page: page,
             q: {
               name_cont: term
-            }
+            },
+            token: Spree.api_key
           };
         },
         results: function (data, page) {
@@ -41,4 +42,4 @@ $(document).ready(function () {
       }
     });
   }
-});
+});

data/app/controllers/spree/admin/payments_controller.rb

@@ -71,7 +71,7 @@ module Spree
         if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
           params[:payment][:source_attributes] = source_params
         end
-        params.require(:payment).permit(:amount, :payment_method_id, source_attributes: [:number, :expiry, :verification_value])
+        params.require(:payment).permit(permitted_payment_attributes)
       end
 
       def load_data

data/app/controllers/spree/admin/products_controller.rb

@@ -65,7 +65,7 @@ module Spree
       protected
 
         def find_resource
-          Product.find_by_permalink!(params[:id])
+          Product.with_deleted.find_by_permalink!(params[:id])
         end
 
         def location_after_save

data/app/controllers/spree/admin/reports_controller.rb

@@ -28,23 +28,17 @@ module Spree
       def sales_total
         params[:q] = {} unless params[:q]
 
-        if params[:q][:created_at_gt].blank?
-          params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
+        if params[:q][:completed_at_gt].blank?
+          params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
         else
-          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
+          params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
         end
 
-        if params[:q] && !params[:q][:created_at_lt].blank?
-          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
+        if params[:q] && !params[:q][:completed_at_lt].blank?
+          params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
         end
 
-        if params[:q].delete(:completed_at_not_null) == "1"
-          params[:q][:completed_at_not_null] = true
-        else
-          params[:q][:completed_at_not_null] = false
-        end
-
-        params[:q][:s] ||= "created_at desc"
+        params[:q][:s] ||= "completed_at desc"
 
         @search = Order.complete.ransack(params[:q])
         @orders = @search.result

data/app/controllers/spree/admin/zones_controller.rb

@@ -13,7 +13,7 @@ module Spree
           params[:q] ||= {}
           params[:q][:s] ||= "ascend_by_name"
           @search = super.ransack(params[:q])
-          @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
+          @zones = @search.result.page(params[:page]).per(params[:per_page])
         end
 
         def load_data

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

@@ -1,5 +1,5 @@
 <fieldset class="no-border-bottom">
-  <legend><%= Spree.t(:risk_analysis) %></legend>
+  <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
   <table>
     <thead>
       <th><%= Spree.t('risk')%></th>
@@ -11,7 +11,7 @@
           <%= Spree.t(:failed_payment_attempts) %>:
         </strong></td>
           <td class="align-center">
-            <span class="<%= @order.is_risky? ? 'state void' : 'state complete' %>">
+            <span class="<%= @order.payments.failed.count > 0 ? 'state void' : 'state complete' %>">
               <%= link_to "#{pluralize(@order.payments.failed.count, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
             </span>
         </td>

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

@@ -23,6 +23,10 @@
         <%= label_tag nil, Spree.t(:display) %>
         <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
       </div>
+      <div data-hook="auto_capture" class="field">
+        <%= label_tag nil, Spree.t(:auto_capture) %>
+        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
+      </div>
       <div data-hook="active" class="field">
         <%= label_tag nil, Spree.t(:active) %>
         <ul>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -17,6 +17,7 @@
     <div class="alpha four columns">
       <div data-hook="card_number">
         <div class="field">
+          <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {:id => 'cc_type'} %>
           <%= label_tag 'card_number', raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
           <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth', :id => 'card_number', :maxlength => 19 %>
           <span id="card_type" style="display:none;">

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -12,7 +12,7 @@
 <% end %>
 
 <% content_for :table_filter do %>
-  <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
+  <%= render :partial => 'spree/admin/shared/report_order_criteria', :locals => {} %>
 <% end %>
 
 <table class="admin-report" data-hook="sales_total">

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -0,0 +1,17 @@
+<%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
+    <div class="date-range-filter field align-center">
+        <%= label_tag nil, Spree.t(:start), :class => 'inline' %>
+        <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
+        
+        <span class="range-divider">
+          <i class="icon-arrow-right"></i>
+        </span>
+
+        <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
+        <%= label_tag nil, Spree.t(:end), :class => 'inline' %>
+    </div>
+
+    <div class="actions filter-actions">
+      <%= button Spree.t(:search), 'icon-search'  %>
+    </div>
+<% end %>

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

@@ -38,7 +38,7 @@
       %>
         <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= display_name(stock_location) %></td>
-          <td class="align-center"><span class="state <%= state(stock_location) %>"><%= state(stock_location) %></span></td>
+          <td class="align-center"><span class="state <%= state(stock_location) %>"><%= Spree.t(state(stock_location)) %></span></td>
           <td class="align-center"><%= link_to Spree.t(:stock_movements), admin_stock_location_stock_movements_path(stock_location.id) %> </td>
           <td class="actions">
             <%= link_to_edit stock_location, :no_text => true %>

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

@@ -1,4 +1,3 @@
-
 <script type='text/template' id='variant_autocomplete_stock_template'>
   <fieldset>
     <legend align="center"><%= Spree.t(:select_stock) %></legend>
@@ -19,10 +18,10 @@
           {{#each variant.stock_items}}
             <tr>
               <td>{{this.stock_location_name}}</td>
-              {{#if this.available}}
+
+              {{#unless ../variant.track_inventory}}
                 <td>
-                  {{this.count_on_hand}}
-                  {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
+                  It doesn't track inventory
                 </td>
                 <td>
                   <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
@@ -31,9 +30,22 @@
                   <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
                 </td>
               {{else}}
-                <td><%= Spree.t(:out_of_stock) %></td>
-                <td>0</td>
-              {{/if}}
+                {{#if this.available}}
+                  <td>
+                    {{this.count_on_hand}}
+                    {{#if this.backorderable}} (<%= Spree.t(:backorders_allowed) %>) {{/if}}
+                  </td>
+                  <td>
+                    <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
+                  </td>
+                  <td class="actions">
+                    <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
+                  </td>
+                {{else}}
+                  <td><%= Spree.t(:out_of_stock) %></td>
+                  <td>0</td>
+                {{/if}}
+              {{/unless}}
             </tr>
           {{/each}}
         </tbody>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
@@ -363,6 +363,7 @@ files:
 - app/views/spree/admin/shared/_product_sub_menu.html.erb
 - app/views/spree/admin/shared/_product_tabs.html.erb
 - app/views/spree/admin/shared/_report_criteria.html.erb
+- app/views/spree/admin/shared/_report_order_criteria.html.erb
 - app/views/spree/admin/shared/_routes.html.erb
 - app/views/spree/admin/shared/_show_resource_links.html.erb
 - app/views/spree/admin/shared/_sidebar.html.erb