spree_backend 2.1.3 → 2.1.4

data/app/assets/stylesheets/admin/spree_admin.scss

@@ -35,6 +35,7 @@
 @import 'sections/edit_checkouts';
 @import 'sections/bulk_transfer';
 @import 'sections/tax_zones';
+@import 'sections/log_entries';
 
 @import 'hacks/mozilla';
 @import 'hacks/opera';

data/app/assets/stylesheets/admin/spree_backend.css

@@ -13,5 +13,5 @@
  *= require jquery.powertip
  *= require select2
 
- *= require ./spree_admin
+ *= require admin/spree_admin
 */

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

@@ -19,7 +19,7 @@ module Spree
         def load_data
           @product = Product.find_by_permalink(params[:product_id])
           @variants = @product.variants.collect do |variant|
-            [variant.options_text, variant.id]
+            [variant.sku_and_options_text, variant.id]
           end
           @variants.insert(0, [Spree.t(:all), @product.master.id])
         end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Admin
+    class LogEntriesController < Spree::Admin::BaseController
+      before_filter :find_order_and_payment
+
+      def index
+        @log_entries = @payment.log_entries
+      end
+
+
+      private
+
+      def find_order_and_payment
+        @order = Spree::Order.where(:number => params[:order_id]).first!
+        @payment = @order.payments.find(params[:payment_id])
+      end
+    end
+  end
+end

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

@@ -1,8 +1,6 @@
 module Spree
   module Admin
     class MailMethodsController < Spree::Admin::BaseController
-      after_filter :initialize_mail_settings
-
       def update
         if params[:smtp_password].blank?
           params.delete(:smtp_password)
@@ -14,7 +12,7 @@ module Spree
         end
 
         flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:mail_methods))
-        render :edit
+        redirect_to edit_admin_mail_method_url
       end
 
       def testmail
@@ -28,11 +26,6 @@ module Spree
       ensure
         redirect_to edit_admin_mail_method_url
       end
-
-      private
-        def initialize_mail_settings
-          Spree::Core::MailSettings.init
-        end
     end
   end
 end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -48,6 +48,10 @@ module Spree
             @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
           end
 
+          def model_class
+            Spree::Order
+          end
+
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Spree
       def index
         params[:q] ||= {}
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
-        @show_only_completed = params[:q][:completed_at_not_null].present?
+        @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
 
         # As date params are deleted if @show_only_completed, store
@@ -35,7 +35,11 @@ module Spree
         end
 
         @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
-        @orders = @search.result.includes([:user, :shipments, :payments]).
+
+        # lazyoading other models here (via includes) may result in an invalid query
+        # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
+        # see https://github.com/spree/spree/pull/3919
+        @orders = @search.result(distinct: true).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])
 
@@ -58,25 +62,17 @@ module Spree
       end
 
       def update
-        return_path = nil
         if @order.update_attributes(params[:order]) && @order.line_items.present?
           @order.update!
           unless @order.complete?
             # Jump to next step if order is not complete.
-            return_path = admin_order_customer_path(@order)
-          else
-            # Otherwise, go back to first page since all necessary information has been filled out.
-            return_path = admin_order_path(@order)
+            redirect_to admin_order_customer_path(@order) and return
           end
         else
           @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
         end
 
-        if return_path
-          redirect_to return_path
-        else
-          render :action => :edit
-        end
+        render :action => :edit
       end
 
       def fire
@@ -118,9 +114,8 @@ module Spree
       end
 
       private
-
         def load_order
-          @order = Order.includes(:adjustments).find_by_number!(params[:id]) if params[:id]
+          @order = Order.includes(:adjustments).find_by_number!(params[:id])
           authorize! action, @order
         end
 

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

@@ -101,6 +101,10 @@ module Spree
       def load_payment
         @payment = Payment.find(params[:id])
       end
+
+      def model_class
+        Spree::Payment
+      end
     end
   end
 end

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

@@ -90,15 +90,11 @@ module Spree
           # @search needs to be defined as this is passed to search_form_for
           @search = @collection.ransack(params[:q])
           @collection = @search.result.
-            group_by_products_id.
-            includes(product_includes).
-            page(params[:page]).
-            per(Spree::Config[:admin_products_per_page])
-
-          if params[:q][:s].include?("master_default_price_amount")
-            # PostgreSQL compatibility
-            @collection = @collection.group("spree_prices.amount")
-          end
+                distinct_by_product_ids(params[:q][:s]).
+                includes(product_includes).
+                page(params[:page]).
+                per(Spree::Config[:admin_products_per_page])
+
           @collection
         end
 
@@ -114,9 +110,9 @@ module Spree
         end
 
         def product_includes
-         [{:variants => [:images, {:option_values => :option_type}]}, {:master => [:images, :default_price]}]
+          [{ :variants => [:images, { :option_values => :option_type }], :master => [:images, :default_price]}]
         end
-
+        
         def clone_object_url resource
           clone_admin_product_url resource
         end

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

@@ -3,12 +3,26 @@ module Spree
     class ReportsController < Spree::Admin::BaseController
       respond_to :html
 
-      AVAILABLE_REPORTS = {
-        :sales_total => { :name => Spree.t(:sales_total), :description => Spree.t(:sales_total_description) }
-      }
+      class << self
+        def available_reports
+          @@available_reports
+        end
+
+        def add_available_report!(report_key, report_description_key = nil)
+          if report_description_key.nil?
+            report_description_key = "#{report_key}_description"
+          end
+          @@available_reports[report_key] = {name: Spree.t(report_key), description: Spree.t(report_description_key)}
+        end
+      end
+
+      def initialize
+        super 
+        ReportsController.add_available_report!(:sales_total)
+      end
 
       def index
-        @reports = AVAILABLE_REPORTS
+        @reports = ReportsController.available_reports
       end
 
       def sales_total
@@ -50,6 +64,8 @@ module Spree
         Spree::Admin::ReportsController
       end
 
+      @@available_reports = {}
+
     end
   end
 end

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

@@ -6,20 +6,23 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
 
   respond_to :html
-  respond_to :js, :except => [:show, :index]
 
   def new
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js   { render :layout => false }
+      if request.xhr?
+        format.js   { render :layout => false }
+      end
     end
   end
 
   def edit
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js   { render :layout => false }
+      if request.xhr?
+        format.js   { render :layout => false }
+      end
     end
   end
 

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

@@ -96,8 +96,7 @@ module Spree
         end
 
         def permitted_params
-          [:name, :parent_id, :position, :icon, :description, :permalink,
-           :taxonomy_id, :meta_description, :meta_keywords, :meta_title]
+          Spree::PermittedAttributes.taxon_attributes
         end
     end
   end

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

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    class VariantsIncludingMasterController < VariantsController
+
+      def model_class
+        Spree::Variant
+      end
+
+      def object_name
+        "variant"
+      end
+
+    end
+  end
+end

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

@@ -71,7 +71,7 @@ module Spree
         when :integer
           text_field_tag(name, value, preference_field_options(options))
         when :boolean
-          hidden_field_tag(name, 0) +
+          hidden_field_tag(name, 0, id: "#{name}_hidden") +
           check_box_tag(name, 1, value, preference_field_options(options))
         when :string
           text_field_tag(name, value, preference_field_options(options))

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

@@ -29,7 +29,9 @@ module Spree
           link = link_to(titleized_label, destination_url)
         end
 
-        selected = if options[:match_path]
+        selected = if options[:match_path].is_a? Regexp
+          request.fullpath =~ options[:match_path]
+        elsif options[:match_path]
           request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
@@ -69,8 +71,9 @@ module Spree
       end
 
       def link_to_edit(resource, options={})
+        url = options[:url] || edit_object_url(resource)
         options[:data] = {:action => 'edit'}
-        link_to_with_icon('icon-edit', Spree.t(:edit), edit_object_url(resource), options)
+        link_to_with_icon('icon-edit', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options={})

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

@@ -18,6 +18,48 @@ module Spree
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, { currency: line_item.currency })
       end
+
+      def avs_response_code
+        {
+          "A" => "Street address matches, but 5-digit and 9-digit postal code do not match.",
+          "B" => "Street address matches, but postal code not verified.",
+          "C" => "Street address and postal code do not match.",
+          "D" => "Street address and postal code match. ",
+          "E" => "AVS data is invalid or AVS is not allowed for this card type.",
+          "F" => "Card member's name does not match, but billing postal code matches.",
+          "G" => "Non-U.S. issuing bank does not support AVS.",
+          "H" => "Card member's name does not match. Street address and postal code match.",
+          "I" => "Address not verified.",
+          "J" => "Card member's name, billing address, and postal code match.",
+          "K" => "Card member's name matches but billing address and billing postal code do not match.",
+          "L" => "Card member's name and billing postal code match, but billing address does not match.",
+          "M" => "Street address and postal code match. ",
+          "N" => "Street address and postal code do not match.",
+          "O" => "Card member's name and billing address match, but billing postal code does not match.",
+          "P" => "Postal code matches, but street address not verified.",
+          "Q" => "Card member's name, billing address, and postal code match.",
+          "R" => "System unavailable.",
+          "S" => "Bank does not support AVS.",
+          "T" => "Card member's name does not match, but street address matches.",
+          "U" => "Address information unavailable. Returned if the U.S. bank does not support non-U.S. AVS or if the AVS in a U.S. bank is not functioning properly.",
+          "V" => "Card member's name, billing address, and billing postal code match.",
+          "W" => "Street address does not match, but 9-digit postal code matches.",
+          "X" => "Street address and 9-digit postal code match.",
+          "Y" => "Street address and 5-digit postal code match.",
+          "Z" => "Street address does not match, but 5-digit postal code matches."
+        }
+      end
+
+      def cvv_response_code
+        {
+          "M" => "CVV2 Match",
+          "N" => "CVV2 No Match",
+          "P" => "Not Processed",
+          "S" => "Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card",
+          "U" => "Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys",
+          ""  => "Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered"
+        }
+      end
     end
   end
 end

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

@@ -3,7 +3,11 @@ module Spree
     module StockMovementsHelper
       def pretty_originator(stock_movement)
         if stock_movement.originator.respond_to?(:number)
-          link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+          if stock_movement.originator.respond_to?(:order)
+            link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+          else
+            stock_movement.originator.number
+          end
         else
           ""
         end

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

@@ -0,0 +1,28 @@
+<%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
+
+<% content_for :page_title do %>
+  <i class="icon-arrow-right"></i>
+  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
+  <i class="icon-arrow-right"></i>
+  <%= Spree.t(:log_entries) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'icon-archive' %></li>
+  <li><%= button_link_to Spree.t(:back_to_payment), spree.admin_order_payment_url(@order, @payment), :icon => 'icon-arrow-left' %></li>
+<% end %>
+
+<table class='index' id='listing_log_entries'>
+  <% @log_entries.each do |entry| %>
+      <thead>
+        <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
+          <td colspan='2'>
+            <h4><i class='icon icon-<%= entry.parsed_details.success? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
+          </td>
+        </tr>
+      </thead>
+      <tbody>
+        <%= render "spree/admin/log_entries/#{@payment.payment_method.name.gsub(' ', '').underscore}", entry: entry %>
+      </tbody>
+  <% end %>
+</table>

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

@@ -64,11 +64,11 @@
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />
-          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth' %>
+          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth', :autocomplete => 'off' %>
         </div>
         <div class="field">
           <%= label_tag :preferred_smtp_password, Spree.t(:smtp_password) %><br />
-          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth' %>
+          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth', :autocomplete => 'off' %>
         </div>
       </fieldset>
     </div>

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

@@ -3,7 +3,11 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% 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>
@@ -32,6 +36,10 @@
     </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/_line_items.html.erb

@@ -0,0 +1,46 @@
+<% if order.line_items.exists? %>
+  <table class="line-items index" data-hook="line-items">
+    <colgroup>
+      <col style="width: 10%;" />
+      <col style="width: 20%;" />
+      <col style="width: 20%;" />
+      <col style="width: 15%;" />
+    </colgroup>
+
+    <thead>
+      <th colspan="2"><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:price) %></th>
+      <th><%= Spree.t(:quantity) %></th>
+      <th><%= Spree.t(:total_price) %></th>
+      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
+    </thead>
+
+    <tbody>
+      <% order.line_items.each do |item| %>
+        
+        <tr class="line-item" id="line-item-<%= item.id %>">
+          <td class="line-item-image"><%= mini_image(item.variant) %></td>
+          <td class="line-item-name">
+            <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+          </td>
+          <td class="line-item-price align-center"><%= item.single_money.to_html %></td>
+          <td class="line-item-qty-show align-center">
+            <%= item.quantity %>
+          </td>
+          <td class="line-item-qty-edit hidden">
+            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+          </td>
+          <td class="line-item-total align-center"><%= line_item_shipment_price(item, item.quantity) %></td>
+          <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
+            <% if can? :update, item %>
+              <%= link_to '', '#', :class => 'save-line-item icon_link icon-ok no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'cancel-line-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'edit-line-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+              <%= link_to '', '#', :class => 'delete-line-item icon-trash no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete') %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

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

@@ -0,0 +1,47 @@
+<fieldset class="no-border-bottom">
+  <legend><%= Spree.t(:risk_analysis) %></legend>
+  <table>
+    <thead>
+      <th><%= Spree.t('risk')%></th>
+      <th><%= Spree.t('status')%></th>
+    </thead>
+    <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
+      <tr class="">
+        <td><strong>
+          <%= Spree.t(:failed_payment_attempts) %>:
+        </strong></td>
+          <td class="align-center">
+            <span class="<%= @order.is_risky? ? 'state void' : 'state complete' %>">
+              <%= link_to "#{pluralize(@order.payments.failed.count, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
+            </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
+        <td class="align-center">
+          <span class="<%= latest_payment.is_avs_risky? ? 'state void' : 'state complete' %>">
+            <% if latest_payment.is_avs_risky? %>
+              <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
+            <% else %>
+              <%= Spree.t(:success) %>
+            <% end %>
+          </span>
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
+        <td class="align-center">
+          <span class="<%= latest_payment.is_cvv_risky? ? 'state void' : 'state complete' %>">
+            <% if latest_payment.is_cvv_risky? %>
+              <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
+            <% else %>
+              <%= Spree.t(:success) %>
+            <% end %>
+          </span>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</fieldset>

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

@@ -41,7 +41,7 @@
             <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.backend.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>
 
@@ -68,7 +68,7 @@
 
       <tr class="show-method total">
         <td colspan="4">
-          <% if shipment.adjustment.present? %>
+          <% if shipment.adjustment.present? && shipment.shipping_method.present? %>
             <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
           <% else %>
             <%= Spree.t(:cannot_set_shipping_method_without_address) %>
@@ -101,6 +101,14 @@
         </td>
       </tr>
 
+      <% if @order.special_instructions.present? %>
+        <tr class='special_instructions'>
+          <td colspan="5">
+            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= @order.special_instructions %>
+          </td>
+        </tr>
+      <% end %>
+
       <tr class="show-tracking total">
         <td colspan="5">
           <% if shipment.tracking.present? %>
@@ -117,4 +125,4 @@
       </tr>
     </tbody>
   </table>
-</div>
+</div>

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

@@ -1,15 +1,19 @@
 <% shipment.manifest.each do |item| %>
   <% line_item = order.find_line_item_by_variant(item.variant) %>
-
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
-    <td class="item-image"><%= mini_image(item.variant) %></td>
+    <td class="item-image">
+      <%= mini_image(item.variant) %>
+    </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <% if item.variant.sku.present? %>
+        <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
+      <% end %>
     </td>
     <td class="item-price align-center"><%= line_item.single_money.to_html %></td>
     <td class="item-qty-show align-center">
         <% item.states.each do |state,count| %>
-          <%= count %> x <%= state.humanize.downcase %>
+          <%= count %> x <%= Spree.t(state).downcase %>
         <% end %>
     </td>
     <% unless shipment.shipped? %>

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

@@ -19,7 +19,7 @@
                 <%= @order.user.nil? ? Spree.t(:say_yes) : Spree.t(:say_no) %>
               </li>
             <% else %>
-              <% guest = @order.user.nil? || @order.user.anonymous? %>
+              <% guest = @order.user.nil? %>
               <li>
                 <%= radio_button_tag :guest_checkout, true, guest %>
                 <%= label_tag :guest_checkout_true, Spree.t(:say_yes) %>