spree_backend 2.1.12 → 2.2.0

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController
-      belongs_to 'spree/product', :find_by => :permalink
+      belongs_to 'spree/product', :find_by => :slug
       before_filter :find_properties
       before_filter :setup_property, :only => [:index]
 

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

@@ -25,11 +25,24 @@ module Spree
         if params[:product][:option_type_ids].present?
           params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
         end
-        super
+        invoke_callbacks(:update, :before)
+        if @object.update_attributes(permitted_resource_params)
+          invoke_callbacks(:update, :after)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+          respond_with(@object) do |format|
+            format.html { redirect_to location_after_save }
+            format.js   { render :layout => false }
+          end
+        else
+          # Stops people submitting blank slugs, causing errors when they try to update the product again
+          @product.slug = @product.slug_was if @product.slug.blank?
+          invoke_callbacks(:update, :fails)
+          respond_with(@object)
+        end
       end
 
       def destroy
-        @product = Product.find_by_permalink!(params[:id])
+        @product = Product.friendly.find(params[:id])
         @product.destroy
 
         flash[:success] = Spree.t('notice_messages.product_deleted')
@@ -65,7 +78,7 @@ module Spree
       protected
 
         def find_resource
-          Product.with_deleted.find_by_permalink!(params[:id])
+          Product.with_deleted.friendly.find(params[:id])
         end
 
         def location_after_save

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

@@ -2,7 +2,6 @@ module Spree
   module Admin
     class PromotionsController < ResourceController
       before_filter :load_data
-      before_filter :load_event_names
 
       helper 'spree/promotion_rules'
 
@@ -14,10 +13,6 @@ module Spree
         def load_data
           @calculators = Rails.application.config.spree.calculators.promotion_actions_create_adjustments
         end
-
-        def load_event_names
-          @event_names = Spree::Activator.event_names.map { |name| [Spree.t("events.#{name}"), name] }
-        end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Spree
       before_filter :set_zones, :only => [:create, :update]
 
       def destroy
-        @object.destroy
+        @object.touch :deleted_at
 
         flash[:success] = flash_message_for(@object, :successfully_removed)
 
@@ -38,6 +38,7 @@ module Spree
 
       def load_data
         @available_zones = Zone.order(:name)
+        @tax_categories = Spree::TaxCategory.order(:name)
         @calculators = ShippingMethod.calculators.sort_by(&:name)
       end
     end

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

@@ -3,9 +3,6 @@ module Spree
     class TaxRatesController < ResourceController
       before_filter :load_data
 
-      update.after :update_after
-      create.after :create_after
-
       private
 
       def load_data
@@ -13,14 +10,6 @@ module Spree
         @available_categories = TaxCategory.order(:name)
         @calculators = TaxRate.calculators.sort_by(&:name)
       end
-
-      def update_after
-        Rails.cache.delete('vat_rates')
-      end
-
-      def create_after
-        Rails.cache.delete('vat_rates')
-      end
     end
   end
 end

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

@@ -4,6 +4,10 @@ module Spree
 
       respond_to :html, :json, :js
 
+      def index
+
+      end
+
       def search
         if params[:ids]
           @taxons = Spree::Taxon.where(:id => params[:ids].split(','))

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

@@ -1,8 +1,9 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
-      belongs_to 'spree/product', :find_by => :permalink
+      belongs_to 'spree/product', :find_by => :slug
       new_action.before :new_before
+      before_filter :load_data, :only => [:new, :create, :edit, :update]
 
       # override the destory method to set deleted_at value
       # instead of actually deleting the product.
@@ -38,6 +39,11 @@ module Spree
           end
           @collection
         end
+
+      private
+        def load_data
+          @tax_categories = TaxCategory.order(:name)
+        end
     end
   end
 end

data/app/helpers/spree/admin/adjustments_helper.rb

@@ -0,0 +1,42 @@
+module Spree
+  module Admin
+    module AdjustmentsHelper
+      def adjustment_state(adjustment)
+        state = adjustment.state.to_sym
+        icon = { closed: 'icon-lock', open: 'icon-unlock' }
+        content_tag(:span, '', class: icon[state])
+      end
+
+      def display_adjustable(adjustable)
+        case adjustable
+          when Spree::LineItem
+            display_line_item(adjustable)
+          when Spree::Shipment
+            display_shipment(adjustable)
+          when Spree::Order
+            display_order(adjustable)
+        end
+
+      end
+
+      private
+
+      def display_line_item(line_item)
+        variant = line_item.variant
+        parts = []
+        parts << variant.product.name
+        parts << "(#{variant.options_text})" if variant.options_text.present?
+        parts << line_item.display_total
+        parts.join("<br>").html_safe
+      end
+
+      def display_shipment(shipment)
+        "#{Spree.t(:shipment)} ##{shipment.number}<br>#{shipment.display_cost}".html_safe
+      end
+
+      def display_order(order)
+        Spree.t(:order)
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/images_helper.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Admin
+    module ImagesHelper
+      def options_text_for(image)
+        if image.viewable.is_a?(Spree::Variant)
+          if image.viewable.is_master?
+            Spree.t(:all)
+          else
+            image.viewable.sku_and_options_text
+          end
+        else
+          Spree.t(:all)
+        end
+      end
+    end
+  end
+end
+

data/app/helpers/spree/admin/orders_helper.rb

@@ -6,7 +6,7 @@ module Spree
         links = []
         @order_events.sort.each do |event|
           if @order.send("can_#{event}?")
-            links << button_link_to(Spree.t(event), fire_admin_order_url(@order, :e => event),
+            links << button_link_to(Spree.t(event), [event, :admin, @order],
                                     :method => :put,
                                     :icon => "icon-#{event}",
                                     :data => { :confirm => Spree.t(:order_sure_want_to, :event => Spree.t(event)) })

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -0,0 +1,16 @@
+<%
+  @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
+  @delete_url = admin_order_adjustment_path(@order, adjustment)
+%>
+<tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row" class="<%= cycle('odd', 'even')%>">
+  <td class="align-center"><%= display_adjustable(adjustment.adjustable) %></td>
+  <td class="align-center"><%= adjustment.label %></td>
+  <td class="align-center"><%= adjustment.display_amount.to_html %></td>
+  <td class="align-center"><%= adjustment_state(adjustment) %></td>
+  <td class='actions'>
+    <% if adjustment.open? %>
+      <%= link_to_edit adjustment, :no_text => true %>
+      <%= link_to_delete adjustment, :no_text => true %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -1,7 +1,7 @@
-<table class="index" data-hook="adjustments">
+<table class="index adjustments" data-hook="adjustments">
   <thead data-hook="adjustmment_head">
     <tr>
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+      <th><%= Spree.t(:adjustable) %></th>
       <th><%= Spree.t(:description) %></th>
       <th><%= Spree.t(:amount) %></th>
       <th><%= Spree.t(:state) %></th>
@@ -9,22 +9,7 @@
     </tr>
   </thead>
   <tbody>
-    <% @collection.each do |adjustment|
-         @edit_url = edit_admin_order_adjustment_path(@order, adjustment)
-         @delete_url = admin_order_adjustment_path(@order, adjustment)
-    %>
-      <tr id="<%= spree_dom_id(adjustment) %>" data-hook="adjustment_row" class="<%= cycle('odd', 'even')%>">
-        <td class="align-center"><%= pretty_time(adjustment.created_at) %></td>
-        <td class="align-center"><%= adjustment.label %></td>
-        <td class="align-center"><%= adjustment.display_amount.to_html %></td>
-        <td class="align-center"><%= adjustment_state(adjustment) %></td>
-        <td class='actions'>
-          <%= link_to_edit adjustment, :no_text => true %>
-          <%= link_to_delete adjustment, :no_text => true %>
-          <%= link_to_toggle_adjustment_state @order, adjustment, :no_text => true %>
-        </td>
-      </tr>
-    <% end %>
+    <%= render :partial => "adjustment", :collection => @adjustments %>
     <tr>
       <td class="align-center" colspan='4'>
         <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), :method => :get %>&nbsp;

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

@@ -4,11 +4,21 @@
    <i class="icon-arrow-right"></i> <%= Spree.t(:adjustments) %>
 <% end %>
 
-<% content_for :page_actions do %>  
+<% content_for :page_actions do %>
   <li><%= button_link_to Spree.t(:new_adjustment), new_admin_order_adjustment_url(@order), :icon => 'icon-plus' %></li>
   <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'adjustments_table' %>
 
+<% if @order.can_add_coupon? %>
+  <div data-hook="adjustments_new_coupon_code">
+    <%= text_field_tag "coupon_code", "", :placeholder => Spree.t(:coupon_code) %>
+    <%= button Spree.t(:add_coupon_code), 'icon-plus', 'submit', :id => "add_coupon_code" %>
+  </div>
+<% end %>
+<%= javascript_tag do -%>
+  var order_number = '<%= @order.number %>';
+<% end -%>
+
 <%= button_link_to Spree.t(:continue), @order.cart? ? new_admin_order_payment_url(@order) : admin_orders_url, :icon => 'icon-arrow-right' %>

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

@@ -12,4 +12,4 @@
   </fieldset>
 <% end %>
 
-<%= javascript_include_tag 'admin/images/new.js' %>
+<%= javascript_include_tag 'spree/backend/images/new.js' %>

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

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

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

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

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

@@ -0,0 +1,19 @@
+<% if adjustments.eligible.exists? %>
+  <fieldset class="no-border-bottom">
+    <legend><%= title %></legend>
+    <table>
+      <thead>
+        <th><%= Spree.t('name')%></th>
+        <th><%= Spree.t('amount')%></th>
+      </thead>
+      <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
+        <% adjustments.eligible.group_by(&:label).each do |label, adjustments| %>
+          <tr class="total">
+            <td><strong><%= label %>:</strong></td>
+            <td class="total align-center"><span><%= Spree::Money.new(adjustments.sum(&:amount)) %></span></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </fieldset>
+<% end %>

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

@@ -8,26 +8,21 @@
   <% else %>
     <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
   <% end %>
-  <% if order.adjustments.eligible.exists? %>
-    <fieldset class="no-border-bottom">
-      <legend><%= Spree.t('adjustments') %></legend>
-      <table>
-        <thead>
-          <th><%= Spree.t('name')%></th>
-          <th><%= Spree.t('amount')%></th>
-        </thead>
-        <tbody id="order-charges" data-hook="order_details_adjustments"  class="with-border">
-          <% order.adjustments.eligible.each do |adjustment| %>
-            <% next if ((adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0)) || adjustment.originator_type == 'Spree::ShippingMethod' %>
-            <tr class="total">
-              <td><strong><%= adjustment.label %>:</strong></td>
-              <td class="total align-center"><span><%= adjustment.display_amount %></span></td>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </fieldset>
-  <% end %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+        :adjustments => @order.line_item_adjustments, 
+        :order => order,
+        :title => Spree.t(:line_item_adjustments)
+   } %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+        :adjustments => @order.shipment_adjustments, 
+        :order => order,
+        :title => Spree.t(:shipment_adjustments)
+   } %>
+  <%= render :partial => "spree/admin/orders/adjustments", :locals => {
+        :adjustments => @order.adjustments, 
+        :order => order,
+        :title => Spree.t(:order_adjustments)
+   } %>
 
   <% if order.line_items.exists? %>
     <fieldset class="no-border-bottom" id="order-total" data-hook="order_details_total">
@@ -36,10 +31,6 @@
     </fieldset>
   <% end %>
 
-<% if @order.payments.exists? %>
-  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
-<% end %>
-
   <%= javascript_tag do -%>
     var order_number = '<%= @order.number %>';
     var shipments = [];

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

@@ -1,4 +1,4 @@
-<fieldset class="no-border-bottom">
+<fieldset class="no-border-bottom" id="risk_analysis">
   <legend><%= "#{Spree.t(:risk_analysis)}: #{Spree.t(:not) unless @order.is_risky?} #{Spree.t(:risky)}" %></legend>
   <table>
     <thead>

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

@@ -41,19 +41,9 @@
             <div class="field alpha five columns">
               <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
               <%= select_tag :selected_shipping_rate_id,
-                    options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                    options_for_select(shipment.shipping_rates.with_shipping_method.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
                     {:class => 'select2 fullwidth', :data => {'shipment-number' => shipment.number } } %>
             </div>
-
-            <% if shipment.adjustment && shipment.adjustment.closed? %>
-              <div class="field omega four columns">
-                <label><%= Spree.t(:associated_adjustment_closed) %></label>
-                <ul>
-                  <li><%= radio_button_tag :open_adjustment, 'yes', false, data: { 'shipment-number' => shipment.number } %> <%= Spree.t(:say_yes) %></li>
-                  <li><%= radio_button_tag :open_adjustment, 'no', true, data: { 'shipment-number' => shipment.number } %> <%= Spree.t(:say_no) %></li>
-                </ul>
-              </div>
-            <% end %>
           </td>
           <td class="actions">
             <% if can? :update, shipment %>
@@ -64,29 +54,26 @@
             <% end %>
           </td>
         </tr>
-      <% end %>
 
-      <tr class="show-method total">
-        <td colspan="4">
-          <% if shipment.adjustment.present? && shipment.shipping_method.present? %>
-            <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
+        <tr class="show-method total">
+          <% if shipment.shipping_method %>
+            <td colspan="4">
+              <strong><%= shipment.shipping_method.name %></strong>
+            </td>
+            <td class="total" align="center">
+              <span><%= shipment.display_cost %></span>
+            </td>
           <% else %>
-            <%= Spree.t(:cannot_set_shipping_method_without_address) %>
-          <% end %>
-        </td>
-        <td class="total" align="center">
-          <% if shipment.adjustment.present? %>
-            <span><%= shipment.adjustment.display_amount %></span>
+            <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
           <% end %>
-        </td>
-        <% if shipment.adjustment.present? && !shipment.shipped? %>
+
           <td class="actions">
             <% if can? :update, shipment %>
               <%= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
             <% end %>
           </td>
-        <% end %>
-      </tr>
+        </tr>
+      <% end %>
 
       <tr class="edit-tracking hidden total">
         <td colspan="5">