spree_backend 2.4.0.rc3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20e9b9d30543a971ed7797b83d1345b3902e3c5c
-  data.tar.gz: 50fba7739d5c4ef525b63d3a84a6704814f76217
+  metadata.gz: a6b7f7e1b021d4babc31a7b8ecdecef76de49f0b
+  data.tar.gz: 53aa1e90ecf3ea1a3f66c4af5e121eda36dbae2a
 SHA512:
-  metadata.gz: bccd2cc77112fe4f112d1f2983bbd55c53e77daa4d549b56b53892dce6975b1f33a9c379c264a34f67b7b887abf645b114f38c5c76071667ee5b26a414776157
-  data.tar.gz: 2c68dc2d57f6d1573bcbbc978ba58b830bd9c6a984606b6d83d25073205fb2bbd01fed73aedf2dd85cbe99efde8f55699170b5810ae0d19b18447ba77026ede4
+  metadata.gz: d4dea2af0ee3bfb392f049811c8fcfee71f50c8e1403b01b06257ec62e90ebaea12e7ff88e4a603ea53c513bc0350393472b8e07595b243ed4483543e650e359
+  data.tar.gz: 0a47836a0f067fb5f06799593afbee09ea6164d55f729e3b2778f56bb521be8ad43454edee8283517aa2032f441e70abd21d7f3f531ebe9fbe999f8bdef63819

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

@@ -0,0 +1,13 @@
+$(@).ready( ->
+  $('[data-hook=general_settings_clear_cache] #clear_cache').click ->
+    $.ajax
+      type: 'POST'
+      url: '/admin/general_settings/clear_cache'
+      success: ->
+        show_flash 'success', "Cache was flushed."
+      error: (msg) ->
+        if msg.responseJSON["error"]
+          show_flash 'error', msg.responseJSON["error"]
+        else
+          show_flash 'error', "There was a problem while flushing cache."
+)

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController
+      include Spree::Backend::Callbacks
+
       before_action :set_store
 
       def edit
@@ -31,6 +33,12 @@ module Spree
         end
       end
 
+      def clear_cache
+        Rails.cache.clear
+        invoke_callbacks(:clear_cache, :after)
+        head :no_content
+      end
+
       private
       def store_params
         params.require(:store).permit(permitted_params)

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

@@ -33,12 +33,6 @@ module Spree
       def load_simulated_refunds
         @reimbursement_objects = @reimbursement.simulate
       end
-
-      # TODO: Remove this when https://github.com/spree/spree/pull/5158 gets merged in
-      def permitted_resource_params
-        params[object_name].present? ? super : ActionController::Parameters.new
-      end
-
     end
   end
 end

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

@@ -60,6 +60,15 @@
                 </div>
             <% end %>
           </fieldset>
+          <fieldset class="security no-border-bottom">
+            <legend align="center"><%= Spree.t(:clear_cache)%></legend>
+            <div>
+              <%= Spree.t(:clear_cache_warning) %>
+            </div>
+            <div class="field" data-hook="general_settings_clear_cache">
+              <%= button Spree.t(:clear_cache), '', 'button', id: "clear_cache" %>
+            </div>
+          </fieldset>
         </div>
         <div class="omega six columns">
           <fieldset class="currency no-border-bottom">

data/app/views/spree/admin/option_types/_option_value_fields.html.erb

@@ -1,9 +1,11 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>"  data-hook="option_value" class="<%= cycle('odd', 'even')%>">
-  <td class="no-border">
-    <span class="handle"></span>
-    <%= f.hidden_field :id %>
-  </td>
-  <td class="name"><%= f.text_field :name %></td>
+  <% if f.object.persisted? %>
+    <td class="no-border">
+      <span class="handle"></span>
+      <%= f.hidden_field :id %>
+    </td>
+  <% end %>
+  <td colspan="<%= f.object.persisted? ? '' : '2' %>" class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
   <td class="actions"><%= link_to_remove_fields Spree.t(:remove), f, :no_text => true %></td>
 </tr>

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

@@ -32,15 +32,8 @@
         </tr>
       </thead>
       <tbody id="option_values">
-        <% if @option_type.option_values.empty? %>
-          <tr id="none" data-hook="option_none" class="<%= cycle('odd', 'even')%>">
-            <td colspan="2"><%= Spree.t(:none) %></td>
-            <td class="actions"></td>
-          </tr>
-        <% else %>
-          <%= f.fields_for :option_values do |option_value_form| %>
-            <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
-          <% end %>
+        <%= f.fields_for :option_values, @option_values do |option_value_form| %>
+          <%= render :partial => 'option_value_fields', :locals => { :f => option_value_form } %>
         <% end %>
       </tbody>
     </table>

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

@@ -4,39 +4,30 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, icon: 'plus', remote: true, id: 'new_promotion_category_link' %>
+    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
   </li>
 <% end %>
 
 <%= render 'spree/admin/shared/promotion_sub_menu' %>
 
-<div id="new_promotion_category"></div>
-
-<% if @promotion_categories.any? %>
-  <table>
-    <colgroup>
-      <col style="width: 85%">
-      <col style="width: 15%">
-    </colgroup>
-    <thead>
-      <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
-      <th class='actions'></th>
-    </thead>
-    <tbody>
-      <% @promotion_categories.each do |promotion_category| %>
-        <tr>
-          <td><%= promotion_category.name %></td>
-          <td class="actions">
-            <%= link_to_edit promotion_category, :no_text => true %>
-            <%= link_to_delete promotion_category, :no_text => true %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% else %>
-  <div class="alpha sixteen columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion_category')) %>
-    <%= link_to Spree.t(:add_one) + '!', spree.new_admin_promotion_category_path, remote: true, id: 'new_promotion_category_link' %>
-  </div>
-<% end %>
+<table>
+  <colgroup>
+    <col style="width: 85%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
+    <th class='actions'></th>
+  </thead>
+  <tbody>
+    <% @promotion_categories.each do |promotion_category| %>
+      <tr>
+        <td><%= promotion_category.name %></td>
+        <td class="actions">
+          <%= link_to_edit promotion_category, :no_text => true %>
+          <%= link_to_delete promotion_category, :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -99,7 +99,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha omega sixteen columns no-objects-found">
+  <div class="alpha twelve columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/promotion')) %>,
     <%= link_to Spree.t(:add_one), spree.new_admin_promotion_path %>!
   </div>

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

@@ -21,9 +21,10 @@
       <%= f.fields_for :return_items, @form_return_items do |item_fields| %>
         <% return_item = item_fields.object %>
         <% inventory_unit = return_item.inventory_unit %>
+        <% editable = inventory_unit.shipped? && allow_return_item_changes && return_item.reimbursement.nil? %>
         <tr>
           <td class="align-center" class="inventory-unit-checkbox">
-            <% if inventory_unit.shipped? && allow_return_item_changes %>
+            <% if editable %>
               <%= item_fields.hidden_field :inventory_unit_id %>
               <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '0', '1' %>
             <% end %>
@@ -37,24 +38,24 @@
             <%= return_item.display_pre_tax_amount %>
           </td>
           <td class="align-center">
-            <% if inventory_unit.shipped? && allow_return_item_changes %>
+            <% if editable %>
               <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
             <% else %>
               <%= return_item.display_pre_tax_amount %>
             <% end %>
           </td>
           <td>
-            <% if inventory_unit.shipped? && allow_return_item_changes %>
+            <% if editable %>
               <%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
+            <% else %>
+              <%= return_item.preferred_reimbursement_type.try(:name) %>
             <% end %>
           </td>
           <td class="align-center">
-            <% if inventory_unit.shipped? && allow_return_item_changes %>
-              <% if return_item.exchange_processed? %>
-                <%= return_item.exchange_variant.options_text %>
-              <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
-              <% end %>
+            <% if editable %>
+              <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+            <% elsif return_item.exchange_processed? %>
+              <%= return_item.exchange_variant.options_text %>
             <% end %>
           </td>
         </tr>

data/config/routes.rb

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

data/lib/spree/backend/callbacks.rb

@@ -28,6 +28,11 @@ module Spree
           @callbacks ||= {}
           @callbacks[:destroy] ||= Spree::ActionCallbacks.new
         end
+
+        def custom_callback(action)
+          @callbacks ||= {}
+          @callbacks[action] ||= Spree::ActionCallbacks.new
+        end
       end
 
       protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc3
+  version: 2.4.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +96,7 @@ files:
 - app/assets/javascripts/spree/backend/calculator.js
 - app/assets/javascripts/spree/backend/checkouts/edit.js
 - app/assets/javascripts/spree/backend/gateway.js
+- app/assets/javascripts/spree/backend/general_settings.js.coffee
 - app/assets/javascripts/spree/backend/handlebar_extensions.js
 - app/assets/javascripts/spree/backend/images/index.js.coffee
 - app/assets/javascripts/spree/backend/images/new.js.coffee
@@ -317,7 +318,6 @@ files:
 - app/views/spree/admin/promotion_categories/edit.html.erb
 - app/views/spree/admin/promotion_categories/index.html.erb
 - app/views/spree/admin/promotion_categories/new.html.erb
-- app/views/spree/admin/promotion_categories/new.js.erb
 - app/views/spree/admin/promotion_rules/create.js.erb
 - app/views/spree/admin/promotion_rules/destroy.js.erb
 - app/views/spree/admin/promotions/_actions.html.erb
@@ -553,9 +553,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: spree_backend

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

@@ -1,5 +0,0 @@
-$("#new_promotion_category").html('<%= escape_javascript(render template: "spree/admin/promotion_categories/new", formats: [:html], handlers: [:erb]) %>');
-<% unless Rails.env.test? %>
-  $('.select2').select2();
-<% end %>
-$("#new_promotion_category_link").parent().hide();