spree_backend 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7293cfdad90b0c0d77e0a14dba7f38693d8bfe3
-  data.tar.gz: cd4c80af67cb2d6406041d18cacf041033184239
+  metadata.gz: cebe3e7299845641b73d9070be94f428951ab670
+  data.tar.gz: 4e5ec2d0d25cb341c0096b54273f5463ce1fa434
 SHA512:
-  metadata.gz: 9892a402e7cd357b49ba7c5a9d1ba8b37fdcee8417b2c3d64ecf00379f55594265f502f7fdf47e64072a254d3b94b4fd88d758204d2753ebe67532471e97a67e
-  data.tar.gz: 24071420bb31be09518eb59001676177415d90eb19292f7e368ac752fd20ae65540ec384f7378ba9167d614dd84e7cffe723a8b6e844336338e7258d9a90cc23
+  metadata.gz: c8d848cf38a22b7ee82476b0fb552035439987a1219e3447850fdfb6d18ac2df147302e1cb6cad98b0d538620e98020136505dbe387ecc055159d74d2a0607b0
+  data.tar.gz: ccb8dd70ac73d53bef5a00e541581391d85f4fb5c9b0e9c1154e193f24cc7c0000605482e175467b13c1370793a38b02417e9f40766aa358c78b4d03f6cb5045

data/app/assets/javascripts/spree/backend.js

@@ -11,7 +11,41 @@
 //= require velocity
 //= require spree
 //= require spree/backend/spree-select2
-//= require_tree .
+//= require spree/backend/address_states
+//= require spree/backend/adjustments
+//= require spree/backend/admin
+//= require spree/backend/calculator
+//= require spree/backend/checkouts/edit
+//= require spree/backend/gateway
+//= require spree/backend/general_settings
+//= require spree/backend/handlebar_extensions
+//= require spree/backend/line_items
+//= require spree/backend/line_items_on_order_edit
+//= require spree/backend/nested-attribute
+//= require spree/backend/option_type_autocomplete
+//= require spree/backend/option_value_picker
+//= require spree/backend/orders/edit
+//= require spree/backend/orders/edit_form
+//= require spree/backend/payments/edit
+//= require spree/backend/payments/new
+//= require spree/backend/product_picker
+//= require spree/backend/progress
+//= require spree/backend/promotions
+//= require spree/backend/returns/expedited_exchanges_warning
+//= require spree/backend/returns/return_item_selection
+//= require spree/backend/shipments
+//= require spree/backend/states
+//= require spree/backend/stock_management
+//= require spree/backend/stock_movement
+//= require spree/backend/stock_transfer
+//= require spree/backend/taxon_autocomplete
+//= require spree/backend/taxon_tree_menu
+//= require spree/backend/taxonomy
+//= require spree/backend/taxons
+//= require spree/backend/user_picker
+//= require spree/backend/variant_autocomplete
+//= require spree/backend/variant_management
+//= require spree/backend/zone
 
 Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')

data/app/assets/stylesheets/spree/backend/components/_labels.scss

@@ -7,7 +7,8 @@
 .label-ready,
 .label-active,
 .label-success,
-.label-sold
+.label-sold,
+.label-open
 {
   background-color: $brand-success;
 
@@ -20,7 +21,8 @@
 .label-failed,
 .label-considered_risky,
 .label-error,
-.label-invalid {
+.label-invalid,
+.label-closed {
   background-color: $brand-danger;
 }
 

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

@@ -5,92 +5,63 @@ module Spree
       helper 'spree/admin/tables'
       layout '/spree/layouts/admin'
 
-      before_action :check_alerts
       before_action :authorize_admin
+      before_action :generate_admin_api_key
 
       protected
 
-        def action
-          params[:action].to_sym
-        end
-
-        def authorize_admin
-          if respond_to?(:model_class, true) && model_class
-            record = model_class
-          else
-            record = controller_name.to_sym
-          end
-          authorize! :admin, record
-          authorize! action, record
-        end
-
-        # Need to generate an API key for a user due to some backend actions
-        # requiring authentication to the Spree API
-        def generate_admin_api_key
-          if (user = try_spree_current_user) && user.spree_api_key.blank?
-            user.generate_spree_api_key!
-          end
-        end
-
-        def check_alerts
-          return unless should_check_alerts?
-          unless session.has_key? :alerts
-            session[:alerts] = Spree::Alert.current(request.host)
-            filter_dismissed_alerts
-            Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
-          end
-        end
-
-        def should_check_alerts?
-          return false if !Rails.env.production? || !Spree::Config[:check_for_spree_alerts]
-
-          last_check = Spree::Config[:last_check_for_spree_alerts]
-          return true if last_check.blank?
+      def action
+        params[:action].to_sym
+      end
 
-          DateTime.parse(last_check) < 12.hours.ago
+      def authorize_admin
+        if respond_to?(:model_class, true) && model_class
+          record = model_class
+        else
+          record = controller_name.to_sym
         end
+        authorize! :admin, record
+        authorize! action, record
+      end
 
-        def flash_message_for(object, event_sym)
-          resource_desc  = object.class.model_name.human
-          resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
-          Spree.t(event_sym, :resource => resource_desc)
+      # Need to generate an API key for a user due to some backend actions
+      # requiring authentication to the Spree API
+      def generate_admin_api_key
+        if (user = try_spree_current_user) && user.spree_api_key.blank?
+          user.generate_spree_api_key!
         end
+      end
 
-        def render_js_for_destroy
-          render :partial => '/spree/admin/shared/destroy'
-        end
+      def flash_message_for(object, event_sym)
+        resource_desc  = object.class.model_name.human
+        resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
+        Spree.t(event_sym, resource: resource_desc)
+      end
 
-        # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
-        def check_json_authenticity
-          return unless request.format.js? or request.format.json?
-          return unless protect_against_forgery?
-          auth_token = params[request_forgery_protection_token]
-          unless (auth_token and form_authenticity_token == URI.unescape(auth_token))
-            raise(ActionController::InvalidAuthenticityToken)
-          end
-        end
+      def render_js_for_destroy
+        render partial: '/spree/admin/shared/destroy'
+      end
 
-        def filter_dismissed_alerts
-          return unless session[:alerts]
-          dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
-          # If it's a string, something has gone wrong with the alerts service. Ignore it.
-          if session[:alerts].is_a?(String)
-            session[:alerts] = nil
-          else
-            session[:alerts].reject! { |a| dismissed.include? a["id"].to_s }
-          end
+      # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
+      def check_json_authenticity
+        return unless request.format.js? || request.format.json?
+        return unless protect_against_forgery?
+        auth_token = params[request_forgery_protection_token]
+        unless auth_token && form_authenticity_token == URI.unescape(auth_token)
+          raise(ActionController::InvalidAuthenticityToken)
         end
+      end
 
-        def config_locale
-          Spree::Backend::Config[:locale]
-        end
+      def config_locale
+        Spree::Backend::Config[:locale]
+      end
 
-        def can_not_transition_without_customer_info
-          unless @order.billing_address.present?
-            flash[:notice] = Spree.t(:fill_in_customer_info)
-            redirect_to edit_admin_order_customer_url(@order)
-          end
+      def can_not_transition_without_customer_info
+        unless @order.billing_address.present?
+          flash[:notice] = Spree.t(:fill_in_customer_info)
+          redirect_to edit_admin_order_customer_url(@order)
         end
+      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Spree
       before_action :set_store
 
       def edit
-        @preferences_security = [:check_for_spree_alerts]
+        @preferences_security = []
       end
 
       def update
@@ -21,15 +21,6 @@ module Spree
         redirect_to edit_admin_general_settings_path
       end
 
-      def dismiss_alert
-        if request.xhr? and params[:alert_id]
-          dismissed = Spree::Config[:dismissed_spree_alerts] || ''
-          Spree::Config.set dismissed_spree_alerts: dismissed.split(',').push(params[:alert_id]).join(',')
-          filter_dismissed_alerts
-          render nothing: true
-        end
-      end
-
       def clear_cache
         Rails.cache.clear
         invoke_callbacks(:clear_cache, :after)

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

@@ -1,3 +1,5 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
 
 <% content_for :page_title do %>

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

@@ -188,6 +188,12 @@
 
 
   <div data-hook="admin_product_form_meta">
+    <div data-hook="admin_product_form_meta_title">
+      <%= f.field_container :meta_title, class: ['form-group'] do %>
+        <%= f.label :meta_title, Spree.t(:meta_title) %>
+        <%= f.text_field :meta_title, class: 'form-control' %>
+      <% end %>
+    </div>
 
     <div data-hook="admin_product_form_meta_keywords">
       <%= f.field_container :meta_keywords, class: ['form-group'] do %>

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

@@ -43,7 +43,7 @@
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>
   </div>
 <% else %>
-  <div data-hook="rma_cannont_create" class="alert alert-info no-objects-found">
+  <div data-hook="rma_cannot_create" class="alert alert-info no-objects-found">
     <%= Spree.t(:cannot_create_returns) %>
   </div>
 <% end %>

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

@@ -39,7 +39,7 @@
     <%= f.text_field :meta_description, :class => 'form-control', :rows => 6 %>
   <% end %>
 
-  <%= f.field_container :meta_description, class: ['form-group'] do %>
+  <%= f.field_container :meta_keywords, class: ['form-group'] do %>
     <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
     <%= f.text_field :meta_keywords, :class => 'form-control', :rows => 6 %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <script type='text/template' id='variant_line_items_autocomplete_stock_template'>
-  
+
   <label><%= Spree.t(:select_stock) %></label>
 
   <table class="stock-levels table table-bordered" data-hook="stock-levels">

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

@@ -1,5 +1,5 @@
 <script type='text/template' id='variant_autocomplete_stock_template'>
-  
+
   <label><%= Spree.t(:select_stock) %></label>
   <table class="table table-condensed table-bordered stock-levels no-marginb" data-hook="stock-levels">
     <thead>
@@ -13,12 +13,12 @@
         <tr>
           <td>{{this.stock_location_name}}</td>
           {{#unless ../variant.track_inventory}}
-            <td>It doesn't track inventory</td>
+            <td><%= Spree.t(:doesnt_track_inventory) %></td>
             <td>
               <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
             </td>
             <td class="actions actions-1">
-              <button class="btn btn-sm btn-default add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+              <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
                 <span class="icon icon-add"></span>
               </button>
             </td>
@@ -32,7 +32,7 @@
                 <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
               </td>
               <td class="actions actions-1">
-                <button class="btn btn-sm btn-default add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
                   <span class="icon icon-add"></span>
                 </button>
               </td>
@@ -44,5 +44,5 @@
         </tr>
       {{/each}}
     </tbody>
-  </table>  
+  </table>
 </script>

data/app/views/spree/layouts/admin.html.erb

@@ -49,7 +49,6 @@
             <%# Alerts                                          %>
             <%#-------------------------------------------------%>
             <%= flash_alert(flash) %>
-            <%= render partial: 'spree/admin/shared/alert', collection: session[:alerts] %>
 
             <%#-------------------------------------------------%>
             <%# Main content                                    %>

data/config/routes.rb

@@ -114,7 +114,6 @@ Spree::Core::Engine.add_routes do
 
     resource :general_settings do
       collection do
-        post :dismiss_alert
         post :clear_cache
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.5.9.1
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -390,7 +376,6 @@ files:
 - app/views/spree/admin/search/users.rabl
 - app/views/spree/admin/shared/_address.html.erb
 - app/views/spree/admin/shared/_address_form.html.erb
-- app/views/spree/admin/shared/_alert.html.erb
 - app/views/spree/admin/shared/_calculator_fields.html.erb
 - app/views/spree/admin/shared/_content_header.html.erb
 - app/views/spree/admin/shared/_destroy.js.erb
@@ -550,8 +535,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.
 test_files: []
+has_rdoc: 

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

@@ -1,8 +0,0 @@
-<div class="col-md-12">
-  <div class="alert <%= alert['severity'].downcase %>">
-    <%= alert['message'] %> <%= link_to alert['url_name'], alert['url'] if alert['url'] %>
-    <%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert['id']),
-                :remote => true, :method => :post, :class => 'dismiss' %>
-  </div>
-
-</div>