spree_backend 2.2.6 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e184877b7a2f35dd34344987bb3cbfb5ebfbf37c
-  data.tar.gz: e277a9c30e238faf1713d3ce7148b90231c64f01
+  metadata.gz: 3f59564b57c16054b7767c690eaadcbc2cccfad6
+  data.tar.gz: 23effe0eb5eeb447ef622cb3d9d3fab9a7f05da6
 SHA512:
-  metadata.gz: ca6afcbc07bb19b206dafac2cb65cdbcf0f528ad129d58c43bb4c81e1312440611e68a4cd507f274a43538d503fda9f18a333042dd0ad74b997ecec8d84732d7
-  data.tar.gz: 49d39b428ba01fcde54c1e5c5d5767c9af7de1e1f575e2e09f4afdaf1a8cb52fd7c8f2363357361e399a9e31c0ce4658a456a9cd06d00972594116996b72ba10
+  metadata.gz: cb1c8795329536adf932f3b1d24a6db53f87af5f6cfc9f8f343ca6df984701d94f25d6e1f6a4124be8ff5205fe6e51b33eee53faa1bb25dfefc701e4c9b8a267
+  data.tar.gz: b7f89d5f3d9053b0ca16e6d98980cf4870534d84963da333d7ee843d49bcc25d0bb5cdb15dff8015b5e571503b217e981a99efd57ae2ede628e17cc98a3c96a6

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

@@ -14,7 +14,7 @@ $(document).ready(function() {
         $('.payment-methods').hide();
         $('.payment-methods input').prop('disabled', true);
         if (this.checked) {
-          $('#payment_method_' + this.value).prop('disabled', false);
+          $('#payment_method_' + this.value + ' input').prop('disabled', false);
           $('#payment_method_' + this.value).show();
         }
       }
@@ -23,11 +23,11 @@ $(document).ready(function() {
     $('.payment_methods_radios').each(
       function() {
         if (this.checked) {
-          $('#payment_method_' + this.value).prop('disabled', false);
+          $('#payment_method_' + this.value + ' input').prop('disabled', false);
           $('#payment_method_' + this.value).show();
         } else {
           $('#payment_method_' + this.value).hide();
-          $('#payment_method_' + this.value).prop('disabled', true);
+          $('#payment_method_' + this.value + ' input').prop('disabled', true);
         }
 
         if ($("#card_new" + this.value).is("*")) {

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

@@ -10,25 +10,12 @@ module Spree
 
       skip_before_filter :load_resource, only: [:toggle_state, :edit, :update, :destroy]
 
-      def destroy
-        find_adjustment
-        super
-      end
-
-      def edit
-        find_adjustment
-        super
-      end
+      before_action :find_adjustment, only: [:destroy, :edit, :update]
 
       def index
         @adjustments = @order.all_adjustments.order("created_at ASC")
       end
 
-      def update
-        find_adjustment
-        super
-      end
-
       private
 
       def find_adjustment

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

@@ -20,11 +20,11 @@ module Spree
 
         params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
 
-        if !params[:q][:created_at_gt].blank?
+        if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
 
-        if !params[:q][:created_at_lt].blank?
+        if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 

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

@@ -22,7 +22,10 @@
         </tr>
       </thead>
       <tbody>
-        <%= render "spree/admin/log_entries/#{@payment.payment_method.name.gsub(' ', '').underscore}", entry: entry %>
+        <tr>
+          <td>Message</td>
+          <td><%= entry.parsed_details.message %></td>
+        </tr>
       </tbody>
   <% end %>
-</table>
+</table>

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/orders/_form.html.erb

@@ -3,23 +3,24 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+  <% if Spree::Order.checkout_step_names.include?(:delivery) && !%w(cart address).include?(@order.state) %>
     <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
   <% else %>
     <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
   <% end %>
+
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.line_item_adjustments, 
+        :adjustments => @order.line_item_adjustments,
         :order => order,
         :title => Spree.t(:line_item_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.shipment_adjustments, 
+        :adjustments => @order.shipment_adjustments,
         :order => order,
         :title => Spree.t(:shipment_adjustments)
    } %>
   <%= render :partial => "spree/admin/orders/adjustments", :locals => {
-        :adjustments => @order.adjustments, 
+        :adjustments => @order.adjustments,
         :order => order,
         :title => Spree.t(:order_adjustments)
    } %>

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

@@ -126,7 +126,13 @@
           <% if Spree::Order.checkout_step_names.include?(:delivery) %>
             <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
           <% end %>
-        <td><%= mail_to order.email %></td>
+        <td>
+          <% if order.user %>
+            <%= link_to order.email, edit_admin_user_path(order.user) %>
+          <% else %>
+            <%= mail_to order.email %>
+          <% end %>
+        </td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
           <%= link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true %>

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

@@ -4,7 +4,7 @@
     <div data-hook="admin_product_form_name">
       <%= f.field_container :name do %>
         <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
-        <%= f.text_field :name, :class => 'fullwidth title' %>
+        <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :name %>
       <% end %>
     </div>
@@ -12,7 +12,7 @@
     <div data-hook="admin_product_form_slug">
       <%= f.field_container :slug do %>
         <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *',  :class => "required")) %>
-        <%= f.text_field :slug, :class => 'fullwidth title' %>
+        <%= f.text_field :slug, :class => 'fullwidth title', :required => true %>
         <%= f.error_message_on :slug %>
       <% end %>
     </div>
@@ -30,7 +30,7 @@
     <div data-hook="admin_product_form_price">
     <%= f.field_container :price do %>
       <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
-      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
+      <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :required => true %>
       <%= f.error_message_on :price %>
     <% end %>
     </div>
@@ -42,6 +42,7 @@
         <%= f.error_message_on :cost_price %>
       <% end %>
     </div>
+
     <div data-hook="admin_product_form_cost_currency" class="omega two columns">
       <%= f.field_container :cost_currency do %>
         <%= f.label :cost_currency, Spree.t(:cost_currency) %>

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

@@ -9,7 +9,7 @@
 
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
-      <%= f.text_field :name, :class => 'fullwidth title' %>
+      <%= f.text_field :name, :class => 'fullwidth title', :required => true %>
       <%= f.error_message_on :name %>
     <% end %>
 
@@ -34,7 +34,7 @@
       <div data-hook="new_product_price" class="four columns">
         <%= f.field_container :price do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
-          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
+          <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth', :required => true %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -53,7 +53,7 @@
       <div data-hook="new_product_shipping_category" class="alpha four columns">
         <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><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', :required => true }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

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

@@ -11,7 +11,7 @@
     <div id='properties' data-hook>
       <%= f.field_container :property_ids do %>
         <%= f.label :property_ids, Spree.t(:properties) %><br>
-        <%= f.select :property_ids, Spree::Property.all.map { |p| [p.presentation, p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+        <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
       <% end %>
     </div>
   </div>
@@ -19,7 +19,7 @@
   <div class="six columns omega">
     <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
-      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| [ot.presentation, ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
+      <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { :multiple => true, :class => "select2 fullwidth" } %>
     <% end %>
   </div>
 </div>

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

@@ -24,7 +24,6 @@
       <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
         <%= link_to_with_icon 'tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
       <% end if can?(:stock, Spree::Product) %>
-      </li>
     </ul>
   </nav>
 

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

@@ -12,7 +12,7 @@
     </div>
     <div class="omega four columns">
       <%= f.field_container :active do %>
-        <label for="active"><%= Spree.t(:state) %></label>
+        <label for="active"><%= Spree.t(:status) %></label>
         <ul>
           <li>
             <%= f.label :active, Spree.t(:active) %>

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

@@ -49,5 +49,6 @@
             </tr>
           {{/each}}
         </tbody>
+      </table>
   </fieldset>
 </script>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 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.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.6
+        version: 2.2.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,6 @@ files:
 - app/views/spree/admin/inventory_units/adjust.html.erb
 - app/views/spree/admin/line_items/create.js.erb
 - app/views/spree/admin/line_items/destroy.js.erb
-- app/views/spree/admin/log_entries/_credit_card.html.erb
 - app/views/spree/admin/log_entries/index.html.erb
 - app/views/spree/admin/mail_methods/_form.html.erb
 - app/views/spree/admin/mail_methods/edit.html.erb

data/app/views/spree/admin/log_entries/_credit_card.html.erb

@@ -1,4 +0,0 @@
-<tr>
-  <td>Message</td>
-  <td><%= entry.parsed_details.message %></td>
-</tr>