spree_backend 2.1.12 → 2.2.0

data/app/assets/javascripts/{admin → spree/backend}/variant_autocomplete.js.erb

@@ -17,7 +17,7 @@ formatVariantResult = function(variant) {
 }
 
 $.fn.variantAutocomplete = function() {
-  this.parent().children(".options_placeholder").attr('id', this.parent().data('index'))
+  this.parent().children(".options_placeholder").prop('id', this.parent().data('index'))
   this.select2({
     placeholder: Spree.translations.variant_placeholder,
     minimumInputLength: 3,

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

@@ -0,0 +1,22 @@
+//= require jquery
+//= require jquery_ujs
+//= require jquery-migrate-1.0.0
+//= require jquery.ui.datepicker
+//= require jquery.ui.sortable
+//= require jquery.ui.autocomplete
+//= require modernizr
+//= require jquery.cookie
+//= require jquery.delayedobserver
+//= require jquery.jstree/jquery.jstree
+//= require jquery.alerts/jquery.alerts
+//= require jquery.powertip
+//= require jquery.vAlign
+//= require css_browser_selector_dev
+//= require spin
+//= require trunk8
+//= require jquery.adaptivemenu
+//= require equalize
+//= require responsive-tables
+//= require spree
+//= require spree/backend/spree-select2
+//= require_tree .

data/app/assets/stylesheets/{admin → spree/backend}/components/_messages.scss

@@ -25,7 +25,7 @@
   }
 }
 
-.flash {
+.flash, .alert {
   position: fixed;
   top: 0;
   left: 0;
@@ -40,4 +40,15 @@
   &.notice  { background-color: rgba($color-notice,  0.8) }
   &.success { background-color: rgba($color-success, 0.8) }
   &.error   { background-color: rgba($color-error,   0.8) }
+}
+
+.alert {
+  position: relative;
+  font-weight: normal !important;
+
+  a {
+    text-decoration: underline;
+  }
+
+  &.error a { color: very-light($color-error, 10) }
 }

data/app/assets/stylesheets/{admin → spree/backend}/globals/_variables.scss

@@ -120,16 +120,27 @@ $color-ste-active-bg:            $color-success !default;
 $color-ste-active-text:          $color-1 !default;
 $color-ste-inactive-bg:          $color-notice !default;
 $color-ste-inactive-text:        $color-1 !default;
+$color-ste-considered_risky-bg:  $color-error !default;
+$color-ste-considered_risky-text:$color-1 !default;
 
 // Available states
-$states:                      completed,                 complete,                 sold,                 pending,                 awaiting_return,                 returned,                 credit_owed,                 paid,                 shipped,                 balance_due,                 backorder,                 checkout,                 cart,                 address,                 delivery,                 payment,                 confirm,                 canceled,                 ready,                 void,                 active,                 inactive  !default;
-$states-bg-colors:            $color-ste-completed-bg,   $color-ste-complete-bg,   $color-ste-sold-bg,   $color-ste-pending-bg,   $color-ste-awaiting_return-bg,   $color-ste-returned-bg,   $color-ste-credit_owed-bg,   $color-ste-paid-bg,   $color-ste-shipped-bg,   $color-ste-balance_due-bg,   $color-ste-backorder-bg,   $color-ste-checkout-bg,   $color-ste-cart-bg,   $color-ste-address-bg,   $color-ste-delivery-bg,   $color-ste-payment-bg,   $color-ste-confirm-bg,   $color-ste-canceled-bg,   $color-ste-ready-bg,   $color-ste-void-bg,   $color-ste-active-bg,   $color-ste-inactive-bg  !default;
-$states-text-colors:          $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text, $color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text, $color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text, $color-ste-canceled-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text !default;
+$states: completed, complete, sold, pending, awaiting_return, returned, credit_owed, paid, shipped, balance_due, backorder, checkout, cart, address,
+delivery, payment, confirm, canceled, ready, void, active, inactive, considered_risky !default;
+
+$states-bg-colors: $color-ste-completed-bg, $color-ste-complete-bg, $color-ste-sold-bg, $color-ste-pending-bg, $color-ste-awaiting_return-bg,
+$color-ste-returned-bg, $color-ste-credit_owed-bg, $color-ste-paid-bg, $color-ste-shipped-bg, $color-ste-balance_due-bg, $color-ste-backorder-bg, 
+$color-ste-checkout-bg, $color-ste-cart-bg, $color-ste-address-bg, $color-ste-delivery-bg, $color-ste-payment-bg, $color-ste-confirm-bg, 
+$color-ste-canceled-bg, $color-ste-ready-bg, $color-ste-void-bg, $color-ste-active-bg, $color-ste-inactive-bg, $color-ste-considered_risky-bg !default;
+
+$states-text-colors: $color-ste-completed-text, $color-ste-complete-text, $color-ste-sold-text, $color-ste-pending-text, $color-ste-awaiting_return-text, 
+$color-ste-returned-text, $color-ste-credit_owed-text, $color-ste-paid-text, $color-ste-shipped-text, $color-ste-balance_due-text, $color-ste-backorder-text, 
+$color-ste-checkout-text, $color-ste-cart-text, $color-ste-address-text, $color-ste-delivery-text, $color-ste-payment-text, $color-ste-confirm-text, 
+$color-ste-canceled-text, $color-ste-ready-text, $color-ste-void-text, $color-ste-active-text, $color-ste-inactive-text, $color-ste-considered_risky-text !default;
 
 // Available actions
-$actions:                        edit,                   clone,                   remove,                   void,                   capture,                   save,                      cancel,                   mail  !default;
-$actions-bg-colors:              $color-action-edit-bg,  $color-action-clone-bg,  $color-action-remove-bg,  $color-action-void-bg,  $color-action-capture-bg,  $color-action-save-bg,     $color-action-cancel-bg,  $color-action-mail-bg  !default;
-$actions-brd-colors:             $color-action-edit-brd, $color-action-clone-brd, $color-action-remove-brd, $color-action-void-brd, $color-action-capture-brd, $color-action-save-brd,    $color-action-cancel-brd, $color-action-mail-brd !default;
+$actions: edit, clone, remove, void, capture, save, cancel, mail !default;
+$actions-bg-colors: $color-action-edit-bg, $color-action-clone-bg, $color-action-remove-bg, $color-action-void-bg, $color-action-capture-bg, $color-action-save-bg, $color-action-cancel-bg, $color-action-mail-bg !default;
+$actions-brd-colors: $color-action-edit-brd, $color-action-clone-brd, $color-action-remove-brd, $color-action-void-brd, $color-action-capture-brd, $color-action-save-brd, $color-action-cancel-brd, $color-action-mail-brd !default;
 
 // Sizes
 //--------------------------------------------------------------

data/app/assets/stylesheets/{admin → spree/backend}/sections/_orders.scss

@@ -52,3 +52,13 @@
     }
   }
 }
+
+[data-hook="adjustments_new_coupon_code"] {
+  margin-bottom: 18px;
+}
+
+#risk_analysis legend {
+  background-color: #c00;
+  color: #FFF;
+  font-size: 2em;
+}

data/app/assets/stylesheets/spree/backend/sections/_taxons.scss

@@ -0,0 +1,15 @@
+#sorting_explanation {
+  font-size: 133%;
+  font-style: italic;
+}
+
+.small_product {
+  text-align: center;
+
+  img {
+    border: 1px solid #d9d9db;
+    padding: 5px;
+  }
+  
+  margin: 10px;
+}

data/app/assets/stylesheets/{admin → spree/backend}/shared/_icons.scss

@@ -16,6 +16,7 @@
 
 .icon-email:before    { @extend .icon-envelope:before }
 .icon-resume:before   { @extend .icon-refresh:before  }
+.icon-approve:before  { @extend .icon-ok:before       }
 
 .icon-cancel:before,
 .icon-void:before     { @extend .icon-remove:before   }

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -0,0 +1,42 @@
+@import 'spree/backend/globals/functions';
+@import 'spree/backend/globals/variables_override';
+@import 'spree/backend/globals/variables';
+@import 'spree/backend/globals/mixins';
+
+@import 'spree/backend/shared/typography';
+@import 'spree/backend/shared/tables';
+@import 'spree/backend/shared/icons';
+@import 'spree/backend/shared/forms';
+@import 'spree/backend/shared/layout';
+
+@import 'spree/backend/components/states';
+@import 'spree/backend/components/actions';
+@import 'spree/backend/components/date-picker';
+@import 'spree/backend/components/messages';
+@import 'spree/backend/components/pagination';
+@import 'spree/backend/components/progress';
+@import 'spree/backend/components/table-filter';
+@import 'spree/backend/components/navigation';
+@import 'spree/backend/components/sidebar';
+@import 'spree/backend/components/product_autocomplete';
+
+@import 'font-awesome';
+@import 'spree/backend/plugins/powertip';
+@import 'spree/backend/plugins/select2';
+@import 'spree/backend/plugins/token-input';
+@import 'spree/backend/plugins/jstree';
+
+@import 'spree/backend/sections/alerts';
+@import 'spree/backend/sections/orders';
+@import 'spree/backend/sections/overview';
+@import 'spree/backend/sections/products';
+@import 'spree/backend/sections/promotions';
+@import 'spree/backend/sections/edit_checkouts';
+@import 'spree/backend/sections/bulk_transfer';
+@import 'spree/backend/sections/tax_zones';
+@import 'spree/backend/sections/log_entries';
+@import 'spree/backend/sections/taxons';
+
+@import 'spree/backend/hacks/mozilla';
+@import 'spree/backend/hacks/opera';
+@import 'spree/backend/hacks/ie';

data/app/assets/stylesheets/{admin → spree/backend}/spree_backend.css

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

data/app/assets/stylesheets/spree/backend.css

@@ -0,0 +1,17 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ 
+ *= require jquery.alerts/jquery.alerts
+ *= require jquery.alerts/jquery.alerts.spree
+ *= require responsive-tables
+ *= require normalize
+ *= require skeleton
+ *= require jquery.ui.datepicker
+ *= require jquery.ui.autocomplete
+ *= require jquery.powertip
+ *= require select2
+
+ *= require spree/backend/spree_admin
+*/

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

@@ -3,27 +3,44 @@ module Spree
     class AdjustmentsController < ResourceController
       belongs_to 'spree/order', :find_by => :number
       destroy.after :reload_order
+      destroy.after :update_totals
+      create.after :update_totals
+      update.after :update_totals
 
-      def toggle_state
-        redirect_to admin_order_adjustments_path(@order) if @adjustment.finalized?
-
-        if @adjustment.immutable?
-          @adjustment.fire_state_event(:open)
-          flash[:success] = Spree.t(:adjustment_successfully_opened)
-        else
-          @adjustment.fire_state_event(:close)
-          flash[:success] = Spree.t(:adjustment_successfully_closed)
-        end
-        redirect_to admin_order_adjustments_path(@order)
+      skip_before_filter :load_resource, :only => [:toggle_state, :edit, :update, :destroy]
+
+      def index
+        @adjustments = @order.all_adjustments.order("created_at ASC")
+      end
+
+      def edit
+        find_adjustment
+        super
+      end
+
+      def update
+        find_adjustment
+        super
+      end
+
+      def destroy
+        find_adjustment 
+        super
       end
 
       private
+      def find_adjustment
+        # Need to assign to @object here to keep ResourceController happy
+        @adjustment = @object = parent.all_adjustments.find(params[:id])
+      end
+
       def reload_order
         @order.reload
       end
 
-      def collection
-        parent.adjustments.eligible
+      def update_totals
+        @order.updater.update_adjustment_total
+        @order.persist_totals
       end
     end
   end

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

@@ -17,7 +17,7 @@ module Spree
         end
 
         def load_data
-          @product = Product.find_by_permalink(params[:product_id])
+          @product = Product.friendly.find(params[:product_id])
           @variants = @product.variants.collect do |variant|
             [variant.sku_and_options_text, variant.id]
           end

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

@@ -1,9 +1,8 @@
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
-      require 'spree/core/gateway_error'
       before_filter :initialize_order_events
-      before_filter :load_order, :only => [:edit, :update, :fire, :resend, :open_adjustments, :close_adjustments]
+      before_filter :load_order, :only => [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments]
 
       respond_to :html
 
@@ -75,18 +74,21 @@ module Spree
         render :action => :edit
       end
 
-      def fire
-        # TODO - possible security check here but right now any admin can before any transition (and the state machine
-        # itself will make sure transitions are not applied in the wrong state)
-        event = params[:e]
-        if @order.state_events.include?(event.to_sym) && @order.send("#{event}")
-          flash[:success] = Spree.t(:order_updated)
-        else
-          flash[:error] = Spree.t(:cannot_perform_operation)
-        end
-      rescue Spree::Core::GatewayError => ge
-        flash[:error] = "#{ge.message}"
-      ensure
+      def cancel
+        @order.cancel!
+        flash[:success] = Spree.t(:order_canceled)
+        redirect_to :back
+      end
+
+      def resume
+        @order.resume!
+        flash[:success] = Spree.t(:order_resumed)
+        redirect_to :back
+      end
+
+      def approve
+        @order.approved_by(try_spree_current_user)
+        flash[:success] = Spree.t(:order_approved)
         redirect_to :back
       end
 
@@ -121,7 +123,7 @@ module Spree
 
         # Used for extensions which need to provide their own custom event links on the order details view.
         def initialize_order_events
-          @order_events = %w{cancel resume}
+          @order_events = %w{approve cancel resume}
         end
 
         def model_class

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

@@ -25,7 +25,10 @@ module Spree
         invoke_callbacks(:update, :before)
         payment_method_type = params[:payment_method].delete(:type)
         if @payment_method['type'].to_s != payment_method_type
-          @payment_method.update_column(:type, payment_method_type)
+          @payment_method.update_columns(
+            type: payment_method_type,
+            updated_at: Time.now,
+          )
           @payment_method = PaymentMethod.find(params[:id])
         end
 

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

@@ -24,23 +24,16 @@ module Spree
         end
 
         begin
-          unless @payment.save
-            redirect_to admin_order_payments_path(@order)
-            return
-          end
-
-          if @order.completed?
-            @payment.process!
+          if @payment.save
+            # Transition order as far as it will go.
+            while @order.next; end
+            @payment.process! if @order.completed?
             flash[:success] = flash_message_for(@payment, :successfully_created)
+            redirect_to admin_order_payments_path(@order)
           else
-            #This is the first payment (admin created order)
-            until @order.completed?
-              @order.next!
-            end
-            flash[:success] = Spree.t(:new_order_completed)
+            flash[:error] = Spree.t(:payment_could_not_be_created)
+            render :new
           end
-
-          redirect_to admin_order_payments_path(@order)
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
           redirect_to new_admin_order_payment_path(@order)
@@ -69,6 +62,7 @@ module Spree
         if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
           params[:payment][:source_attributes] = source_params
         end
+        
         params.require(:payment).permit(permitted_payment_attributes)
       end