spree_core 1.1.6 → 1.2.0.rc1

data/app/assets/javascripts/store/cart.js.coffee

@@ -0,0 +1,7 @@
+$ ->
+  if ($ 'form#update-cart').is('*')
+    ($ 'form#update-cart a.delete').show().on 'click', (e) ->
+      $(this).parents('.line-item').first().find('input.line_item_quantity').val 0
+      $(this).parents('form').first().submit()
+      e.preventDefault()
+      return

data/app/assets/javascripts/store/checkout.js.coffee

@@ -0,0 +1,57 @@
+disableSaveOnClick = ->
+  ($ 'form.edit_spree_order').submit ->
+    ($ this).find(':submit, :image').attr('disabled', true).removeClass('primary').addClass 'disabled'
+
+$ ->
+  if ($ '#checkout_form_address').is('*')
+    ($ '#checkout_form_address').validate()
+    get_states = (region) ->
+      country = ($ 'p#' + region + 'country' + ' span#' + region + 'country :only-child').val()
+      state_mapper[country]
+
+    update_state = (region) ->
+      states = get_states(region)
+      state_select = ($ 'p#' + region + 'state select')
+      state_input = ($ 'p#' + region + 'state input')
+      if states
+        selected = state_select.val()
+        state_select.html ''
+        states_with_blank = [ [ '', '' ] ].concat(states)
+        $.each states_with_blank, (pos, id_nm) ->
+          opt = ($ document.createElement('option')).attr('value', id_nm[0]).html(id_nm[1])
+          opt.prop 'selected', true if selected is id_nm[0]
+          state_select.append opt
+
+        state_select.prop('disabled', false).show()
+        state_input.hide().prop 'disabled', true
+      else
+        state_input.prop('disabled', false).show()
+        state_select.hide().prop 'disabled', true
+
+    ($ 'p#bcountry select').change ->
+      update_state 'b'
+
+    ($ 'p#scountry select').change ->
+      update_state 's'
+
+    update_state 'b'
+    update_state 's'
+
+    ($ 'input#order_use_billing').click(->
+      if ($ this).is(':checked')
+        ($ '#shipping .inner').hide()
+        ($ '#shipping .inner input, #shipping .inner select').prop 'disabled', true
+      else
+        ($ '#shipping .inner').show()
+        ($ '#shipping .inner input, #shipping .inner select').prop 'disabled', false
+        if get_states('s')
+          ($ 'span#sstate input').hide().prop 'disabled', true
+        else
+          ($ 'span#sstate select').hide().prop 'disabled', true
+    ).triggerHandler 'click'
+
+  if ($ '#checkout_form_payment').is('*')
+    ($ 'input[type="radio"][name="order[payments_attributes][][payment_method_id]"]').click(->
+      ($ '#payment-methods li').hide()
+      ($ '#payment_method_' + @value).show() if @checked
+    ).triggerHandler 'click'

data/app/assets/javascripts/store/product.js.coffee

@@ -0,0 +1,36 @@
+add_image_handlers = ->
+  ($ '#main-image').data 'selectedThumb', ($ '#main-image img').attr('src')
+  ($ 'ul.thumbnails li').eq(0).addClass 'selected'
+  ($ 'ul.thumbnails a').on 'click', (event) ->
+    ($ '#main-image').data 'selectedThumb', ($ event.currentTarget).attr('href')
+    ($ '#main-image').data 'selectedThumbId', ($ event.currentTarget).parent().attr('id')
+    ($ this).mouseout ->
+      ($ 'ul.thumbnails li').removeClass 'selected'
+      ($ event.currentTarget).parent('li').addClass 'selected'
+
+    false
+
+  ($ 'ul.thumbnails li').on 'mouseenter', (event) ->
+    ($ '#main-image img').attr 'src', ($ event.currentTarget).find('a').attr('href')
+
+  ($ 'ul.thumbnails li').on 'mouseleave', (event) ->
+    ($ '#main-image img').attr 'src', ($ '#main-image').data('selectedThumb')
+
+show_variant_images = (variant_id) ->
+  ($ 'li.vtmb').hide()
+  ($ 'li.vtmb-' + variant_id).show()
+  currentThumb = ($ '#' + ($ '#main-image').data('selectedThumbId'))
+  if not currentThumb.hasClass('vtmb-' + variant_id) and not currentThumb.hasClass('tmb-all')
+    thumb = ($ ($ 'ul.thumbnails li:visible').eq(0))
+    newImg = thumb.find('a').attr('href')
+    ($ 'ul.thumbnails li').removeClass 'selected'
+    thumb.addClass 'selected'
+    ($ '#main-image img').attr 'src', newImg
+    ($ '#main-image').data 'selectedThumb', newImg
+    ($ '#main-image').data 'selectedThumbId', thumb.attr('id')
+
+$ ->
+  add_image_handlers()
+  show_variant_images ($ '#product-variants input[type="radio"]').eq(0).attr('value') if ($ '#product-variants input[type=radio]').length > 0
+  ($ '#product-variants input[type="radio"]').click (event) ->
+    show_variant_images @value

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

@@ -670,3 +670,8 @@ span.handle{
   padding-left: 3px;
   padding-right: 5px;
 }
+
+/* Select2 select box styles */
+select.select2 {
+  width: 30em;
+}

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

@@ -11,5 +11,6 @@
  *= require admin/edit_checkouts.css
  *= require admin/token-input.css
  *= require jquery-ui.datepicker
+ *= require select2
  *= require admin/admin
 */

data/app/assets/stylesheets/store/screen.css.scss

@@ -1,4 +1,4 @@
-@import "./variables.css.scss";
+@import "store/variables";
 
 /*--------------------------------------*/
 /* Basic styles 
@@ -1021,6 +1021,20 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
   }
 
+  @media only screen and (max-width: 767px) {
+    #empty-cart {
+      clear: both;
+      margin-top: 0 !important;
+      float: none !important;
+    }
+  }
+  
+  @media only screen and (min-width: 768px) and (max-width: 959px) {
+    .container .offset-by-nine.coupon-code-field {
+      padding-left: 380px;
+    }
+  }
+  
 
   /* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */
   @media only screen and (max-width: 479px) {

data/app/assets/stylesheets/store/variables.css.scss

@@ -1,18 +1,18 @@
 /*--------------------------------------*/
 /* Colors
 /*--------------------------------------*/
-$c_green:       #8dba53;  /* Spree green    */
-$c_red:         #e45353;  /* Error red      */
+$c_green:       #8dba53 !default;  /* Spree green    */
+$c_red:         #e45353 !default;  /* Error red      */
 
-$layout_background_color:   #FFFFFF;
-$title_text_color:          #404042;
-$body_text_color:           #404042;
-$link_text_color:           #00ADEE;
+$layout_background_color:   #FFFFFF !default;
+$title_text_color:          #404042 !default;
+$body_text_color:           #404042 !default;
+$link_text_color:           #00ADEE !default;
 
-$product_background_color:  #FFFFFF;
-$product_title_text_color:  #404042;
-$product_body_text_color:   #404042;
-$product_link_text_color:   #BBBBBB;
+$product_background_color:  #FFFFFF !default;
+$product_title_text_color:  #404042 !default;
+$product_body_text_color:   #404042 !default;
+$product_link_text_color:   #BBBBBB !default;
 
 /*--------------------------------------*/
 /* Fonts import from remote
@@ -22,37 +22,37 @@ $product_link_text_color:   #BBBBBB;
 /*--------------------------------------*/
 /* Font families
 /*--------------------------------------*/
-$ff_base:       'Ubuntu', sans-serif;
+$ff_base:       'Ubuntu', sans-serif !default;
 
 /*--------------------------------------
   | Font sizes
   |--------------------------------------
   |- Navigation                         
   |                                    */
-      $header_navigation_font_size:           14px;
-      $horizontal_navigation_font_size:       16px;
-      $main_navigation_header_font_size:      14px;
-      $main_navigation_font_size:             12px;
+      $header_navigation_font_size:           14px !default;
+      $horizontal_navigation_font_size:       16px !default;
+      $main_navigation_header_font_size:      14px !default;
+      $main_navigation_font_size:             12px !default;
 /*|------------------------------------
   |- Product Listing                         
   |                                  */
-      $product_list_name_font_size:           12px;
-      $product_list_price_font_size:          16px;
-      $product_list_header_font_size:         20px;
-      $product_list_search_font_size:         14px;
+      $product_list_name_font_size:           12px !default;
+      $product_list_price_font_size:          16px !default;
+      $product_list_header_font_size:         20px !default;
+      $product_list_search_font_size:         14px !default;
 /*|------------------------------------
   |- Product Details
   |                                  */
-      $product_detail_name_font_size:         24px;
-      $product_detail_description_font_size:  12px;
-      $product_detail_price_font_size:        20px;
-      $product_detail_title_font_size:        14px;
+      $product_detail_name_font_size:         24px !default;
+      $product_detail_description_font_size:  12px !default;
+      $product_detail_price_font_size:        20px !default;
+      $product_detail_title_font_size:        14px !default;
 /*|------------------------------------
   |- Basic
   |                                  */
-      $heading_font_size:                     24px;
-      $sub_heading_font_size:                 14px;
-      $button_font_size:                      12px;
-      $input_box_font_size:                   13px;
-      $base_font_size:                        12px;
-      $button_border_color:                   rgba(0, 138, 189, .75);
+      $heading_font_size:                     24px !default;
+      $sub_heading_font_size:                 14px !default;
+      $button_font_size:                      12px !default;
+      $input_box_font_size:                   13px !default;
+      $base_font_size:                        12px !default;
+      $button_border_color:                   rgba(0, 138, 189, .75) !default;

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

@@ -0,0 +1,14 @@
+module Spree
+  module Admin
+    class BannersController < Spree::Admin::BaseController
+      def dismiss
+        if request.xhr? and params[:id]
+          if user = try_spree_current_user
+            user.dismiss_banner(params[:id])
+          end
+          render :nothing => true
+        end
+      end
+    end
+  end
+end

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

@@ -8,8 +8,19 @@ module Spree
       layout '/spree/layouts/admin'
 
       before_filter :check_alerts
+      before_filter :authorize_admin
 
       protected
+        def authorize_admin
+          begin
+            record = model_class.new
+          rescue
+            record = Object.new
+          end
+          authorize! :admin, record
+          authorize! params[:action].to_sym, record
+        end
+
         def check_alerts
           return unless should_check_alerts?
 

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

@@ -19,22 +19,30 @@ module Spree
 
 
       private
-
+  
         def location_after_save
           admin_product_images_url(@product)
         end
 
         def load_data
-          @product = Product.where(:permalink => params[:product_id]).first
+          @product = Product.find_by_permalink(params[:product_id])
           @variants = @product.variants.collect do |variant|
             [variant.options_text, variant.id]
           end
-          @variants.insert(0, [I18n.t(:all), @product.master.id])
+          @variants.insert(0, [I18n.t(:all), 'All'])
         end
 
         def set_viewable
-          @image.viewable_type = 'Spree::Variant'
-          @image.viewable_id = params[:image][:viewable_id]
+          if params[:image].has_key? :viewable_id
+            if params[:image][:viewable_id] == 'All'
+              @image.viewable = @product.master
+            else
+              @image.viewable_type = 'Spree::Variant'
+              @image.viewable_id = params[:image][:viewable_id]
+            end
+          else
+            @image.viewable = @product.master
+          end
         end
 
         def destroy_before

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

@@ -1,6 +1,7 @@
 module Spree
   module Admin
     class LineItemsController < Spree::Admin::BaseController
+      layout nil, :only => [:create, :destroy, :update]
 
       before_filter :load_order
       before_filter :load_line_item, :only => [:destroy, :update]
@@ -13,53 +14,43 @@ module Spree
 
         if @order.save
           respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload }, :layout => false }
+            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
           end
         else
           respond_with(@line_item) do |format|
-            format.js { render :action => 'create', :locals => { :order => @order.reload }, :layout => false }
+            format.js { render :action => 'create', :locals => { :order => @order.reload } }
           end
         end
       end
 
       def destroy
-        if @line_item.destroy
-          @order.reload
-          respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order }, :layout => false }
-          end
-        else
-          respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order }, :layout => false }
-          end
-        end
-      end
-
-      def new
-        respond_with do |format|
-          format.html { render :action => :new, :layout => false }
+        @line_item.destroy
+        respond_with(@line_item) do |format|
+          format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
         end
       end
 
       def update
         if @line_item.update_attributes(params[:line_item])
           respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload }, :layout => false}
+            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
           end
         else
           respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload }, :layout => false}
+            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
           end
         end
       end
 
-      def load_order
-        @order = Order.find_by_number! params[:order_id]
-      end
+      private
 
-      def load_line_item
-        @line_item = @order.line_items.find params[:id]
-      end
+        def load_order
+          @order = Order.find_by_number!(params[:order_id])
+        end
+
+        def load_line_item
+          @line_item = @order.line_items.find(params[:id])
+        end
     end
   end
 end

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

@@ -3,16 +3,9 @@ module Spree
     class MailMethodsController < ResourceController
       after_filter :initialize_mail_settings
 
-      def update
-        if params[:mail_method][:preferred_smtp_password].blank?
-          params[:mail_method].delete(:preferred_smtp_password)
-        end
-        super
-      end
-
       def testmail
         @mail_method = Spree::MailMethod.find(params[:id])
-        if TestMailer.test_email(@mail_method, respond_to?(:current_user) ? current_user : nil).deliver
+        if TestMailer.test_email(@mail_method, try_spree_current_user).deliver
           flash.notice = t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = t('admin.mail_methods.testmail.delivery_error')

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

@@ -1,25 +1,8 @@
 module Spree
   module Admin
     class OptionTypesController < ResourceController
-      before_filter :load_product, :only => [:select, :selected, :available, :remove]
       before_filter :setup_new_option_value, :only => [:edit]
 
-      def available
-        set_available_option_types
-        render :layout => false
-      end
-
-      def selected
-        @option_types = @product.option_types
-      end
-
-      def remove
-        @product.option_types.delete(@option_type)
-        @product.save
-        flash.notice = I18n.t('notice_messages.option_type_removed')
-        redirect_to selected_admin_product_option_types_url(@product)
-      end
-
       def update_positions
         params[:positions].each do |id, index|
           OptionType.where(:id => id).update_all(:position => index)
@@ -42,14 +25,6 @@ module Spree
         end
       end
 
-      # AJAX method for selecting an existing option type and associating with the current product
-      def select
-        @product.option_types << OptionType.find(params[:id])
-        @product.reload
-        @option_types = @product.option_types
-        set_available_option_types
-      end
-
       protected
     
         def location_after_save