spree_backend 2.0.3 → 2.0.4

data/app/assets/stylesheets/admin/plugins/_jstree.scss

@@ -26,7 +26,6 @@
       width: 90%;
       height: auto;
       line-height: inherit;
-      text-transform: uppercase;
       padding: 5px 0 5px 10px;
       margin-bottom: 10px;
 

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -27,23 +27,6 @@
       @extend [class^="icon-"]:before;
       margin-top: 2px;
     }
-
-    div {
-      background-image: none !important;
-      background-color: transparent !important;
-      border-radius: 0 !important;
-      border: none !important;
-
-      b {
-        background-image: none !important;
-        display: inherit !important;
-        width: auto !important;
-        height: auto !important;
-        margin-top: 10px;
-        @extend .icon-caret-down;
-        @extend [class^="icon-"]:before;
-      }
-    }
   }
 
   &.select2-container-active {
@@ -68,19 +51,25 @@
 }
 
 .select2-search {
-  @extend [class^="icon-"]:before;
   @extend .icon-search;
+
   font-size: 100%;
-  padding-left: 15px;
   color: darken($color-border, 15);
+  padding: 0 9px 0 0;
+
+  &:before {
+    @extend [class^="icon-"]:before;
+
+    position: absolute;
+    top: 13px;
+    left: 13px;
+  }
 
   input {
     @extend input[type="text"];
-    margin-top: 5px;
-    margin-left: -23px;
-    padding-left: 25px;
-    padding-top: 6px;
-    padding-bottom: 6px;
+
+    padding: 6px 0 6px 25px;
+    margin: 5px 0 0 5px;
     font-family: $base-font-family;
     font-size: 90%;
     box-shadow: none;
@@ -88,7 +77,27 @@
   }
 }
 
-.select2-results {    
+.select2-container .select2-choice .select2-arrow {
+  background-image: none;
+  background: transparent;
+  border: 0;
+
+  b {
+    padding-top: 7px;
+    display: block;
+    width: 100%;
+    height: 100%;
+    background: none;
+    font-family: FontAwesome;
+    font-weight: 200 !important;
+
+    &:before {
+      content: "\f0d7";
+    }
+  }
+}
+
+.select2-results {
   padding-left: 0 !important;
 
   li {
@@ -113,7 +122,7 @@
       padding: 5px;
       background-color: transparent;
       color: $color-body-text;
-      text-align: center; 
+      text-align: center;
       font-weight: $font-weight-bold;
       text-transform: uppercase;
     }
@@ -137,7 +146,7 @@
     @extend input[type="text"];
     padding: 6px 3px 3px 3px;
     box-shadow: none;
-    background-image: none;
+    background-image: none !important;
 
     .select2-search-choice {
       @include border-radius($border-radius);
@@ -145,9 +154,9 @@
       background-image: none;
       background-color: $color-sel-bg;
       border: none;
-      box-shadow: none;      
-      color: $color-1 !important;    
-      font-size: 85%;            
+      box-shadow: none;
+      color: $color-1 !important;
+      font-size: 85%;
 
       &:hover {
         background-color: $color-sel-hover-bg;
@@ -173,4 +182,4 @@ label .select2-container {
       font-weight: normal;
     }
   }
-}
+}

data/app/assets/stylesheets/admin/shared/_forms.scss

@@ -61,8 +61,11 @@ button, .button {
   background-color: $color-btn-bg;
   color: $color-btn-text;
   text-transform: uppercase;
-  font-size: 85%;
-  font-weight: 600;
+  font-weight: 600 !important;
+
+  &:before {
+    font-weight: normal !important;
+  }
 
   &:visited, &:active, &:focus { color: $color-btn-text }
 
@@ -179,7 +182,9 @@ fieldset {
     text-transform: uppercase;
     text-align: center;
     padding: 8px 15px;
+
     -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 
     i {
       color: $color-link;

data/app/assets/stylesheets/admin/shared/_icons.scss

@@ -1,22 +1,23 @@
 // Some fixes for fontwesome stylesheets
 [class^="icon-"], [class*=" icon-"] {
+  &:before {
+    padding-right: 5px;
+  }
+
   &.button, &.icon_link {
     width: auto;
 
     &:before {
-      padding-right: 5px;
+      padding-top: 3px;
     }
   }
 }
 
-[class^="icon-"]:before, [class*=" icon-"]:before {
-  -webkit-font-smoothing: antialiased;
-}
 .icon-email:before    { @extend .icon-envelope:before }
 .icon-resume:before   { @extend .icon-refresh:before  }
 
-.icon-cancel:before, 
+.icon-cancel:before,
 .icon-void:before     { @extend .icon-remove:before   }
 
 .icon-capture:before  { @extend .icon-ok:before       }
-.icon-credit:before   { @extend .icon-ok:before       }
+.icon-credit:before   { @extend .icon-ok:before       }

data/app/assets/stylesheets/admin/shared/_layout.scss

@@ -69,16 +69,15 @@
 
   .page-title {
     font-size: 20px;
+
     -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
   }
   .page-actions {
     text-align: right;
     form {
       display: inline-block;
     }
-    .button {
-      font-size: 85%;
-    }
   }
 }
 

data/app/assets/stylesheets/admin/shared/_tables.scss

@@ -26,6 +26,12 @@ table {
       }
     }
 
+    .handle {
+      display: block !important;
+      text-align: center;
+      padding-right: 0;
+    }
+
     &.actions {
       background-color: transparent;
       border: none !important;
@@ -126,6 +132,7 @@ table {
 
   tbody {
     tr {
+      &:first-child th,
       &:first-child td {
         border-top: 1px solid $color-border;
       }

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

@@ -8,7 +8,7 @@
  *= require responsive-tables
  *= require normalize
  *= require skeleton
- *= require jquery-ui.datepicker
+ *= require jquery.ui.datepicker
  *= require jquery.powertip
  *= require select2
 

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

@@ -17,6 +17,9 @@ module Spree
 
         def update
           if @order.update_attributes(params[:order])
+            if params[:guest_checkout] == "false"
+              @order.associate_user!(Spree.user_class.find_by_email(@order.email))
+            end
             while @order.next; end
 
             @order.shipments.map &:refresh_rates

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

@@ -46,11 +46,19 @@ module Spree
 
       def new
         @order = Order.create
+        @order.created_by = try_spree_current_user
+        @order.save
         redirect_to edit_admin_order_url(@order)
       end
 
       def edit
         @order.shipments.map &:refresh_rates
+        # Transition as far as we can go
+        while @order.next; end
+        # The payment step shows an error of 'No pending payments'
+        # Clearing the errors from the order object will stop this error
+        # appearing on the edit page where we don't want it to.
+        @order.errors.clear
       end
 
       def update

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

@@ -76,7 +76,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = PaymentMethod.available
+        @payment_methods = PaymentMethod.available(:back_end)
         if @payment and @payment.payment_method
           @payment_method = @payment.payment_method
         else
@@ -101,6 +101,7 @@ module Spree
       def load_order
         @order = Order.find_by_number!(params[:order_id])
         authorize! action, @order
+        @order
       end
 
       def load_payment

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

@@ -29,7 +29,7 @@ module Spree
 
       def destroy
         @product = Product.find_by_permalink!(params[:id])
-        @product.delete
+        @product.destroy
 
         flash[:success] = Spree.t('notice_messages.product_deleted')
 
@@ -55,6 +55,10 @@ module Spree
         @variants = @product.variants
         @variants = [@product.master] if @variants.empty?
         @stock_locations = StockLocation.accessible_by(current_ability, :read)
+        if @stock_locations.empty?
+          flash[:error] = Spree.t(:stock_management_requires_a_stock_location)
+          redirect_to admin_stock_locations_path
+        end
       end
 
       protected
@@ -80,8 +84,10 @@ module Spree
           params[:q][:deleted_at_null] ||= "1"
 
           params[:q][:s] ||= "name asc"
-
-          @search = super.ransack(params[:q])
+          @collection = super
+          @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null).blank?
+          # @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).

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class StockItemsController < Spree::Admin::BaseController
-      before_filter :determine_backorderable
+      before_filter :determine_backorderable, only: :update
 
       def update
         stock_item.save
@@ -10,15 +10,38 @@ module Spree
         end
       end
 
-      private
+      def create
+        variant = Variant.find(params[:variant_id])
+        stock_location = StockLocation.find(params[:stock_location_id])
+        stock_movement = stock_location.stock_movements.build(params[:stock_movement])
+        stock_movement.stock_item = stock_location.set_up_stock_item(variant)
+
+        if stock_movement.save
+          flash[:success] = flash_message_for(stock_movement, :successfully_created)
+        else
+          flash[:error] = Spree.t(:could_not_create_stock_movement)
+        end
 
-      def stock_item
-        @stock_item ||= StockItem.find(params[:id])
+        redirect_to :back
       end
 
-      def determine_backorderable
-        stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present? ? true : false
+      def destroy
+        stock_item.destroy
+
+        respond_with(@stock_item) do |format|
+          format.html { redirect_to :back }
+          format.js
+        end
       end
+
+      private
+        def stock_item
+          @stock_item ||= StockItem.find(params[:id])
+        end
+
+        def determine_backorderable
+          stock_item.backorderable = params[:stock_item].present? && params[:stock_item][:backorderable].present?
+        end
     end
   end
 end

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

@@ -2,6 +2,18 @@ module Spree
   module Admin
     class StockLocationsController < ResourceController
 
+      new_action.before :set_country
+
+      private
+
+      def set_country
+        if Spree::Config[:default_country_id].present?
+          @stock_location.country = Spree::Country.find(Spree::Config[:default_country_id])
+        else
+          @stock_location.country = Spree::Country.find_by_iso('US')
+        end
+      end
+
     end
   end
 end

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

@@ -13,42 +13,16 @@ module Spree
       end
 
       def create
-        if params[:stock_movement][:stock_location_id].present?
-          variant = Variant.find(params[:stock_item].delete(:variant_id))
-          location = StockLocation.find(params[:stock_movement].delete(:stock_location_id))
-          @stock_movement = location.stock_movements.build(params[:stock_movement])
-          @stock_movement.stock_item = location.stock_items.where(variant_id: variant).first_or_create
-          @stock_movement.save ? flash[:success] = flash_message_for(@stock_movement, :successfully_created) : flash[:error] = Spree.t(:could_not_create_stock_movement)
-          redirect_to :back
-        else
-          @stock_movement = stock_location.stock_movements.build(params[:stock_movement])
-          @stock_movement.save
-          flash[:success] = flash_message_for(@stock_movement, :successfully_created)
-          redirect_to admin_stock_location_stock_movements_path(stock_location)
-        end
+        @stock_movement = stock_location.stock_movements.build(params[:stock_movement])
+        @stock_movement.save
+        flash[:success] = flash_message_for(@stock_movement, :successfully_created)
+        redirect_to admin_stock_location_stock_movements_path(stock_location)
       end
 
       def edit
         @stock_movement = StockMovement.find(params[:id])
       end
 
-      def update
-        @stock_movement = StockMovement.find(params[:id])
-        if @stock_movement.update_attributes(params[:stock_movement])
-          flash[:success] = flash_message_for(@stock_movement, :successfully_updated)
-          redirect_to admin_stock_location_stock_movements_path(stock_location)
-        else
-          render :edit
-        end
-      end
-
-      def destroy
-        stock_movement = StockMovement.find(params[:id])
-        flash[:success] = flash_message_for(stock_movement, :successfully_removed)
-        stock_movement.destroy
-        redirect_to admin_stock_location_stock_movements_path(stock_location)
-      end
-
       private
 
       def stock_location
@@ -57,4 +31,3 @@ module Spree
     end
   end
 end
-

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

@@ -31,7 +31,7 @@ module Spree
                                 destination_location,
                                 variants)
 
-        flash[:success] = t(:stock_successfully_transferred)
+        flash[:success] = Spree.t(:stock_successfully_transferred)
         redirect_to admin_stock_transfer_path(stock_transfer)
       end