spree_core 1.3.1 → 1.3.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2012, Spree Commerce, Inc. and other contributors
+Copyright (c) 2007-2013, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/app/assets/javascripts/admin/admin.js.erb

@@ -271,7 +271,7 @@ $(document).ready(function(){
           $("table.sortable tr:odd").removeClass("odd even").addClass("odd");
         }
 
-      }).disableSelection();
+      });
   });
 
   $('a.dismiss').click(function() {

data/app/assets/javascripts/admin/shipping_methods.js.coffee

@@ -1,5 +1,5 @@
 $ ->
-  ($ 'input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
+  ($ 'fieldset.categories input[type=checkbox]:not(:checked)').attr 'disabled', true  if ($ '.categories input:checked').length > 0
   categoryCheckboxes = '.categories input[type=checkbox]'
   $(categoryCheckboxes).change ->
     if ($ this).is(':checked')

data/app/assets/javascripts/admin/spree_core.js

@@ -1,3 +1,4 @@
+//= require jquery-migrate-1.0.0
 //= require jquery-ui
 //= require modernizr
 //= require jquery.cookie

data/app/assets/javascripts/admin/variant_autocomplete.js.erb

@@ -6,7 +6,7 @@ $(document).ready(function() {
 })
 
 formatVariantResult = function(variant) {
-  if (variant["images"][0] != undefined) {
+  if (variant["images"][0] != undefined && variant["images"][0].image != undefined) {
     variant.image = variant.images[0].image.mini_url
   }
   return variantTemplate({ variant: variant })

data/app/assets/stylesheets/admin/globals/_variables.scss

@@ -12,7 +12,7 @@ $base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial,
 // Basic color palette for admin
 $color-1:                     #FFFFFF !default;    // White
 $color-2:                     #9FC820 !default;    // Green
-$color-3:                     #5FA5E8 !default;    // Light Blue
+$color-3:                     #5498DA !default;    // Light Blue
 $color-4:                     #6788A2 !default;    // Dark Blue
 $color-5:                     #C60F13 !default;    // Red
 $color-6:                     #FF9300 !default;    // Yellow
@@ -26,7 +26,7 @@ $color-link-hover:            $color-2 !default;
 $color-link-active:           $color-2 !default;
 $color-link-focus:            $color-2 !default;
 $color-link-visited:          $color-3 !default;
-$color-border:                very-light($color-3, 8) !default;
+$color-border:                very-light($color-3, 12) !default;
 
 // Basic flash colors
 $color-success:               $color-2 !default;
@@ -35,8 +35,8 @@ $color-error:                 $color-5 !default;
 
 // Table colors
 $color-tbl-odd:               $color-1 !default;
-$color-tbl-even:              very-light($color-3) !default;
-$color-tbl-thead:             very-light($color-3) !default;
+$color-tbl-even:              very-light($color-3, 4) !default;
+$color-tbl-thead:             very-light($color-3, 4) !default;
 
 // Button colors
 $color-btn-bg:                $color-3 !default;
@@ -66,8 +66,8 @@ $color-sel-hover-text:        $color-1 !default;
 
 // Text inputs colors
 $color-txt-brd:               $color-border !default;
-$color-txt-text:              $color-4 !default;
-$color-txt-hover-brd:         very-light($color-2, 20) !default;
+$color-txt-text:              $color-3 !default;
+$color-txt-hover-brd:         $color-2 !default;
 
 // States label colors
 $color-ste-complete-bg:       $color-success !default;
@@ -131,4 +131,4 @@ $h1-size:                     $h2-size + 2 !default;
 $border-radius:               3px !default;
 
 $font-weight-bold:            600 !default;
-$font-weight-normal:          400 !default;
+$font-weight-normal:          400 !default;

data/app/assets/stylesheets/admin/plugins/font-awesome.scss

@@ -23,8 +23,8 @@
     */
 @font-face {
   font-family: "FontAwesome";
-  src: url('/assets/fontawesome-webfont.eot');
-  src: url('/assets/fontawesome-webfont.eot?#iefix') format('eot'), url('/assets/fontawesome-webfont.woff') format('woff'), url('/assets/fontawesome-webfont.ttf') format('truetype'), url('/assets/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: font-url('fontawesome-webfont.eot');
+  src: font-url('fontawesome-webfont.eot?#iefix') format('eot'),font-url('fontawesome-webfont.woff') format('woff'), font-url('fontawesome-webfont.ttf') format('truetype'), font-url('fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }

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

@@ -9,9 +9,9 @@ input[type="number"],
 input[type="tel"],
 textarea, fieldset {
   @include border-radius($border-radius);
-  padding: 7px 10px;  
+  padding: 7px 10px;
   border: 1px solid $color-txt-brd;
-  color: $color-body-text;
+  color: $color-txt-text;
   font-size: 90%;
 
   &:focus {
@@ -47,13 +47,13 @@ label {
 
 .label-block label { display: block }
 
-input[type="submit"], 
-input[type="button"], 
+input[type="submit"],
+input[type="button"],
 button, .button {
   @include border-radius($border-radius);
   display: inline-block;
   padding: 8px 15px;
-  border: none;  
+  border: none;
   background-color: $color-btn-bg;
   color: $color-btn-text;
   text-transform: uppercase;
@@ -67,7 +67,7 @@ button, .button {
     color: $color-btn-hover-text;
   }
 
-  &:active:focus {    
+  &:active:focus {
     box-shadow: 0 0 8px 0 darken($color-btn-hover-bg, 5) inset;
   }
 
@@ -91,7 +91,7 @@ span.info {
 
   &.checkbox {
     min-height: 73px;
-    
+
     input[type="checkbox"] {
       display: inline-block;
       width: auto;
@@ -117,13 +117,16 @@ span.info {
         font-weight: normal;
         text-transform: none;
       }
+      &.white-space-nowrap {
+        white-space: nowrap;
+      }
     }
   }
 
   &.withError {
     .field_with_errors {
-      label { 
-        color: very-light($color-error, 30); 
+      label {
+        color: very-light($color-error, 30);
       }
 
       input {
@@ -145,14 +148,14 @@ fieldset {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   margin-left: 0;
-  margin-right: 0;  
-  position: relative;  
+  margin-right: 0;
+  position: relative;
   margin-bottom: 35px;
   padding: 10px 0 15px 0;
   background-color: transparent;
   border-left: none;
   border-right: none;
-  border-radius: 0;    
+  border-radius: 0;
 
   &.no-border-bottom {
     border-bottom: none;
@@ -165,8 +168,8 @@ fieldset {
   }
 
   legend {
-    background-color: $color-1;    
-    color: $color-2;    
+    background-color: $color-1;
+    color: $color-2;
     font-size: 14px;
     font-weight: 600;
     text-transform: uppercase;
@@ -175,7 +178,7 @@ fieldset {
   }
 
   label {
-    color: lighten($color-body-text, 15);
+    color: lighten($color-body-text, 5);
   }
 
   .filter-actions {
@@ -189,7 +192,7 @@ fieldset {
 
     button, .button, input[type="submit"], input[type="button"], span.or {
       @include border-radius($border-radius);
-      
+
       -webkit-box-shadow: 0 0 0 15px $color-1;
          -moz-box-shadow: 0 0 0 15px $color-1;
           -ms-box-shadow: 0 0 0 15px $color-1;

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

@@ -60,7 +60,7 @@
 
 #content-header {
   padding: 15px 0;
-  background-color: very-light($color-3);
+  background-color: very-light($color-3, 4);
   border-bottom: 1px solid $color-border;
 
   .page-title {

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

@@ -22,7 +22,7 @@ strong, b {
 
 // links
 //--------------------------------------------------------------
-a { 
+a {
   color: $color-link;
   text-decoration: none;
   line-height: inherit;
@@ -31,18 +31,18 @@ a {
     outline: none;
   }
 
-  &:hover {
-    color: $color-link-hover;
-  }
-  &:active {
-    color: $color-link-active;
-  }
   &:visited {
     color: $color-link-visited;
   }
   &:focus {
     color: $color-link-focus;
   }
+  &:active {
+    color: $color-link-active;
+  }
+  &:hover {
+    color: $color-link-hover;
+  }
 }
 
 // Headings
@@ -50,8 +50,8 @@ a {
 
 h1,h2,h3,h4,h5,h6 {
   font-weight: 600;
-  color: $color-headers; 
-  line-height: 1.1; 
+  color: $color-headers;
+  line-height: 1.1;
 }
 
 h1 { font-size: $h1-size; line-height: $h1-size + 6 }
@@ -129,4 +129,4 @@ dl {
   text-transform: uppercase;
   padding: 40px 0px;
   color: lighten($color-body-text, 15);
-}
+}

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

@@ -1,14 +1,14 @@
 @import "./variables.css.scss"; // Must call explicit path or else extension integration tests cannot import file.
 
 /*--------------------------------------*/
-/* Basic styles 
+/* Basic styles
 /*--------------------------------------*/
 body {
   font-family: $ff_base;
   font-size: $base_font_size;
   font-weight: 400;
   color: $body_text_color;
-  line-height: 18px;  
+  line-height: 18px;
   background-color: $layout_background_color;
   -webkit-font-smoothing: antialiased;
 }
@@ -24,10 +24,10 @@ hr {
 
 /* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
 ::-moz-selection{background: $link_text_color; color: $layout_background_color; text-shadow: none;}
-::selection {background: $link_text_color; color: $layout_background_color; text-shadow: none;} 
+::selection {background: $link_text_color; color: $layout_background_color; text-shadow: none;}
 
 /*  j.mp/webkit-tap-highlight-color */
-a:link {-webkit-tap-highlight-color: $link_text_color;} 
+a:link {-webkit-tap-highlight-color: $link_text_color;}
 
 ins {background-color: $link_text_color; color: $layout_background_color; text-decoration: none;}
 mark {background-color: $link_text_color; color: $layout_background_color; font-style: italic; font-weight: bold;}
@@ -40,7 +40,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     color: $link_text_color;
 
     &:hover {
-      color: darken($link_text_color, 10) !important;
+      color: darken($link_text_color, 10);
     }
 
     &:active, &:focus {
@@ -64,7 +64,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       }
     }
   }
-  
+
   dl {
     dt, dd {
       display: inline-block;
@@ -77,7 +77,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     }
     dt {
       font-weight: bold;
-      text-transform: uppercase;      
+      text-transform: uppercase;
     }
     dd {
       margin-left: -23px;
@@ -94,7 +94,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   h5 { font-size: $sub_heading_font_size;     line-height: $sub_heading_font_size + 10;     }
   h6 { font-size: $sub_heading_font_size - 2; line-height: $sub_heading_font_size - 2 + 10; }
 
-  h1, h2, h3, h4, h5, h6 {    
+  h1, h2, h3, h4, h5, h6 {
     font-weight: 700;
     color: $title_text_color;
     -webkit-margin-before: 0;
@@ -106,14 +106,14 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   /*--------------------------------------*/
   /* Forms
   /*--------------------------------------*/
-  textarea, input[type="date"], 
+  textarea, input[type="date"],
   input[type="datetime"], input[type="datetime-local"],
   input[type="email"], input[type="month"], input[type="number"],
   input[type="password"], input[type="search"], input[type="tel"],
-  input[type="text"], input[type="time"], input[type="url"], 
+  input[type="text"], input[type="time"], input[type="url"],
   input[type="week"] {
     border: $default_border;
-    padding: 5px 10px;    
+    padding: 5px 10px;
     font-family: $ff_base;
     font-size: $input_box_font_size;
 
@@ -189,7 +189,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       background-image: none;
       background-color: $body_text_color;
       border-color: $body_text_color;
-      color: $layout_background_color !important;
+      color: $layout_background_color;
     }
   }
 
@@ -197,7 +197,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     a.button {
       line-height: 16px;
     }
-  } 
+  }
 
   input[type="checkbox"], label {
     vertical-align: middle;
@@ -271,7 +271,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
         a{
           font-weight: bold;
           font-size: $header_navigation_font_size;
-          text-transform: uppercase;          
+          text-transform: uppercase;
         }
       }
     }
@@ -285,7 +285,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     padding-bottom: 6px;
 
     li {
-      
+
       a {
         font-size: $horizontal_navigation_font_size;
         padding: 5px;
@@ -439,7 +439,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     }
     &.diff {
       font-weight: bold;
-    }  
+    }
   }
 
   .taxon-title {
@@ -480,7 +480,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
       .product-image {
         border: $default_border;
-        padding: 5px;        
+        padding: 5px;
         min-height: 110px;
         background-color: $product_background_color;
 
@@ -508,7 +508,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
     a {
       color: $link_text_color;
-    }    
+    }
   }
 
   .search-results-title {
@@ -656,7 +656,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
             color: $layout_background_color;
 
             &:hover {
-              color: $layout_background_color !important;              
+              color: $layout_background_color;
             }
           }
         }
@@ -705,11 +705,11 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       #summary-order-total {
         @extend span.price;
         font-size: $base_font_size + 2;
-      }      
+      }
     }
   }
 
-  #billing, #shipping, #shipping_method, 
+  #billing, #shipping, #shipping_method,
   #payment, #order_details, #order_summary {
     margin-top: 10px;
     border: $default_border;
@@ -759,11 +759,11 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
         font-size: $base_font_size + 4;
         color: $body_text_color;
 
-        tr { 
+        tr {
           border-top: 1px solid lighten($body_text_color, 60);
-          
+
           td {
-            padding: 10px; 
+            padding: 10px;
           }
         }
       }
@@ -789,7 +789,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   #shipping_method {
     p {
       label {
-        float: left; 
+        float: left;
         font-weight: bold;
         font-size: $base_font_size + 2;
         margin-right: 40px;
@@ -837,7 +837,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       margin-top: 15px;
       text-align: right;
     }
-    
+
     #subtotal {
       text-align: right;
       text-transform: uppercase;
@@ -846,12 +846,12 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       span.order-total {
         @extend span.price;
       }
-    } 
+    }
   }
 
   #empty-cart {
-    margin-top: -75px !important;
-    float: left !important;
+    margin-top: -75px;
+    float: left;
   }
 
   /*--------------------------------------*/
@@ -865,7 +865,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
 
   #registration {
     h6 {
-      text-transform: uppercase;      
+      text-transform: uppercase;
     }
 
     #existing-customer {
@@ -931,17 +931,17 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     }
     p[data-hook="use_billing"] {
       margin-top: -15px;
-    }    
+    }
   }
 
   /* All Mobile Sizes (devices and browser) */
-  @media only screen and (max-width: 767px) {        
+  @media only screen and (max-width: 767px) {
 
     html {
       -webkit-text-size-adjust: none;
     }
 
-    #order_details .steps-data div.columns, 
+    #order_details .steps-data div.columns,
     #order_summary .steps-data div.columns {
       padding: 0;
       margin: 0;
@@ -955,8 +955,8 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       text-align: center;
 
       ul {
-        padding-left: 0 !important;
-        list-style: none !important;
+        padding-left: 0;
+        list-style: none;
       }
     }
 
@@ -972,7 +972,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     #order_details, #order {
       table[data-hook="order_details"] {
         width: 100%;
-      } 
+      }
     }
 
     #update-cart {
@@ -991,11 +991,11 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   @media only screen and (min-width: 480px) and (max-width: 767px) {
 
     footer#footer {
-      width: auto !important;
+      width: auto;
     }
 
     input, select {
-      vertical-align: baseline !important;
+      vertical-align: baseline;
     }
 
     figure#logo {
@@ -1042,7 +1042,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
           }
           td[data-hook="cart_item_price"], td[data-hook="cart_item_total"],
           td[data-hook="order_item_price"], td[data-hook="order_item_total"]  {
-            font-size: $base_font_size !important; 
+            font-size: $base_font_size;
           }
           td[data-hook="cart_item_image"], td[data-hook="order_item_image"] {
             img {
@@ -1050,7 +1050,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
             }
           }
         }
-      }  
+      }
     }
 
   }
@@ -1058,21 +1058,21 @@ 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;
+      margin-top: 0;
+      float: none;
     }
   }
-  
+
   @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) {
-    
+
     .progress-steps li {
       padding: 0;
       margin: 0;
@@ -1113,10 +1113,10 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
             }
           }
           td[data-hook="cart_item_price"], td[data-hook="cart_item_total"] {
-            font-size: $base_font_size + 2 !important; 
+            font-size: $base_font_size + 2 !important;
           }
         }
-      }  
+      }
     }
 
     table.order-summary {
@@ -1129,7 +1129,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       tbody tr { display: inline-block; vertical-align: top; }
       td { display: block; min-height: 1.25em; }
     }
-    
+
 
     figure#logo {
       text-align: center;
@@ -1153,7 +1153,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       text-align: center;
 
       ul {
-        padding-left: 0 !important;
+        padding-left: 0;
 
         li {
           list-style-type: none;
@@ -1178,5 +1178,5 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     #content {
       text-align: center;
     }
-        
+
   }

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

@@ -17,7 +17,6 @@ module Spree
           rescue
             record = Object.new
           end
-          authorize! :admin, record
           authorize! params[:action].to_sym, record
         end
 

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

@@ -14,7 +14,7 @@ module Spree
         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

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

@@ -46,6 +46,7 @@ module Spree
 
         def load_order
           @order = Order.find_by_number!(params[:order_id])
+          authorize! params[:action], @order
         end
 
         def load_line_item

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

@@ -34,7 +34,7 @@ module Spree
           params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @search = Order.ransack(params[:q])
+        @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
         @orders = @search.result.includes([:user, :shipments, :payments]).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])
@@ -111,6 +111,7 @@ module Spree
 
         def load_order
           @order = Order.find_by_number!(params[:id], :include => :adjustments) if params[:id]
+          authorize! params[:action], @order
         end
 
         # Used for extensions which need to provide their own custom event links on the order details view.
@@ -118,6 +119,9 @@ module Spree
           @order_events = %w{cancel resume}
         end
 
+        def model_class
+          Spree::Order
+        end
     end
   end
 end