spree_core 1.2.5 → 1.3.0.rc1

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

@@ -1,9 +1,19 @@
 //= require jquery-ui
+//= require modernizr
 //= require jquery.cookie
 //= require jquery.tokeninput
 //= 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 jquery.horizontalNav
 //= require_tree .
 
 var Spree = {};

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

@@ -1,6 +1,6 @@
 function cleanTaxons(data) {
   var taxons = $.map(data['taxons'], function(result) {
-    return result['taxon']
+    return result
   })
   return taxons;
 }

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

@@ -131,48 +131,48 @@ $(document).ready(function(){
             if(type_of_node == "root") {
               menu = {
                 "create" : {
-                  "label"            : Spree.translations.add,
+                  "label"            : "<i class='icon-plus'></i> " + Spree.translations.add,
                   "action"           : function (obj) { this.create(obj); }
                 },
                  "paste" : {
                    "separator_before" : true,
-                   "label"            : Spree.translations.paste,
+                   "label"            : "<i class='icon-paste'></i> " + Spree.translations.paste,
                    "action"           : function (obj) { is_cut = false; this.paste(obj); },
                    "_disabled"        : is_cut == false
                 },
                 "edit" : {
                   "separator_before" : true,
-                  "label"            : Spree.translations.edit,
+                  "label"            : "<i class='icon-edit'></i> " + Spree.translations.edit,
                   "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
                 }
               }
             } else {
               menu =  {
                 "create" : {
-                  "label"            : Spree.translations.add,
+                  "label"            : "<i class='icon-plus'></i> " + Spree.translations.add,
                   "action"           : function (obj) { this.create(obj); }
                 },
                 "rename" : {
-                  "label"            : Spree.translations.rename,
+                  "label"            : "<i class='icon-pencil'></i> " + Spree.translations.rename,
                   "action"           : function (obj) { this.rename(obj); }
                 },
                 "remove" : {
-                  "label"            : Spree.translations.remove,
+                  "label"            : "<i class='icon-trash'></i> " + Spree.translations.remove,
                   "action"           : function (obj) { this.remove(obj); }
                 },
                 "cut" : {
                   "separator_before" : true,
-                  "label"            : Spree.translations.cut,
+                  "label"            : "<i class='icon-cut'></i> " + Spree.translations.cut,
                   "action"           : function (obj) { is_cut = true; this.cut(obj); }
                 },
                 "paste" : {
-                  "label"            : Spree.translations.paste,
+                  "label"            : "<i class='icon-paste'></i> " + Spree.translations.paste,
                   "action"           : function (obj) { is_cut = false; this.paste(obj); },
                   "_disabled"        : is_cut == false
                 },
                 "edit" : {
                   "separator_before" : true,
-                  "label"            : Spree.translations.edit,
+                  "label"            : "<i class='icon-edit'></i> " + Spree.translations.edit,
                   "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
                 }
                     }

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

@@ -0,0 +1,40 @@
+//= require handlebars
+<%#encoding: UTF-8%>
+// variant autocompletion
+
+$(document).ready(function() {
+  window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
+})
+
+formatVariantResult = function(variant) {
+  if (variant["images"][0] != undefined) {
+    variant.image = variant.images[0].image.mini_url
+  }
+  return variantTemplate({ variant: variant, translations: Spree.translations })
+}
+
+$.fn.variantAutocomplete = function() {
+  this.parent().children(".options_placeholder").attr('id', this.parent().data('index'))
+  this.select2({
+    placeholder: "Select a variant",
+    minimumInputLength: 4,
+    ajax: {
+      url: Spree.routes.variants_search,
+      datatype: 'json',
+      data: function(term, page) {
+        return { q: term }
+      },
+      results: function (data, page) {
+        var variants = $.map(data['variants'], function(result) {
+          return result['variant']
+        })
+        return { results: variants }
+      }
+    },
+    formatResult: formatVariantResult,
+    formatSelection: function (variant) {
+      $(this.element).parent().children('.options_placeholder').html(variant.options_text)
+      return variant.name;
+    }
+  })
+}

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

@@ -5,14 +5,24 @@
 $ ->
   if ($ '#checkout_form_address').is('*')
     ($ '#checkout_form_address').validate()
+
+    country_from_region = (region) ->
+      ($ 'p#' + region + 'country' + ' span#' + region + 'country-selection :only-child').val()
+
     get_states = (region) ->
-      country = ($ 'p#' + region + 'country' + ' span#' + region + 'country :only-child').val()
-      state_mapper[country]
+      state_mapper[country_from_region(region)]
+
+    get_states_required = (region) ->
+      states_required_mapper[country_from_region(region)]
 
     update_state = (region) ->
       states = get_states(region)
-      state_select = ($ 'p#' + region + 'state select')
-      state_input = ($ 'p#' + region + 'state input')
+      states_required  = get_states_required(region)
+
+      state_para = ($ 'p#' + region + 'state')
+      state_select = state_para.find('select')
+      state_input = state_para.find('input')
+      state_span_required = state_para.find('state-required')
       if states
         selected = parseInt state_select.val()
         state_select.html ''
@@ -24,9 +34,17 @@ $ ->
 
         state_select.prop('disabled', false).show()
         state_input.hide().prop 'disabled', true
+        state_span_required.show()
       else
-        state_input.prop('disabled', false).show()
         state_select.hide().prop 'disabled', true
+        state_input.show()
+        if states_required
+          state_span_required.show()
+        else
+          state_input.val ''
+          state_span_required.hide()
+        state_para.toggle(!!states_required)
+        state_input.prop('disabled', !states_required)
 
     ($ 'p#bcountry select').change ->
       update_state 'b'

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

@@ -1,26 +1,28 @@
 add_image_handlers = ->
+  thumbnails = ($ '#product-images ul.thumbnails')
   ($ '#main-image').data 'selectedThumb', ($ '#main-image img').attr('src')
-  ($ 'ul.thumbnails li').eq(0).addClass 'selected'
-  ($ 'ul.thumbnails a').on 'click', (event) ->
+  thumbnails.find('li').eq(0).addClass 'selected'
+  thumbnails.find('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'
+      thumbnails.find('li').removeClass 'selected'
       ($ event.currentTarget).parent('li').addClass 'selected'
     false
 
-  ($ 'ul.thumbnails li').on 'mouseenter', (event) ->
+  thumbnails.find('li').on 'mouseenter', (event) ->
     ($ '#main-image img').attr 'src', ($ event.currentTarget).find('a').attr('href')
 
-  ($ 'ul.thumbnails li').on 'mouseleave', (event) ->
+  thumbnails.find('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))
+  if not currentThumb.hasClass('vtmb-' + variant_id)
+    thumb = ($ ($ 'ul.thumbnails li:visible.vtmb').eq(0))
+    thumb = ($ ($ 'ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
     newImg = thumb.find('a').attr('href')
     ($ 'ul.thumbnails li').removeClass 'selected'
     thumb.addClass 'selected'
@@ -28,8 +30,13 @@ show_variant_images = (variant_id) ->
     ($ '#main-image').data 'selectedThumb', newImg
     ($ '#main-image').data 'selectedThumbId', thumb.attr('id')
 
+update_variant_price = (variant) ->
+  variant_price = variant.data('price')
+  ($ '.price.selling').text(variant_price) if variant_price
+
 $ ->
   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
+    show_variant_images @value
+    update_variant_price ($ this)

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

@@ -1,5 +1,4 @@
 //= require jquery.validate/jquery.validate.min
-//= require jquery.formalize.min
 //= require store/checkout
 //= require store/product
 //= require store/cart

data/app/assets/stylesheets/admin/components/_actions.scss

@@ -0,0 +1,31 @@
+table tbody tr {
+  &.highlight {
+
+    @each $action in $actions {
+      &.action-#{$action} td {
+        background-color: get-value($actions, $actions-bg-colors, $action);
+        border-color: get-value($actions, $actions-brd-colors, $action);
+      }
+    }
+
+    &.action-remove td, &.action-void td {          
+      text-decoration: line-through;
+
+      &.actions {
+        text-decoration: none;
+      }
+    }
+  }
+
+  &.before-highlight {
+    @each $action in $actions {
+      &.action-#{$action} td {
+        border-bottom-color: get-value($actions, $actions-brd-colors, $action);
+      }
+    }
+  }
+
+  td.actions {
+    background-color: transparent !important;
+  }
+}

data/app/assets/stylesheets/admin/components/_date-picker.scss

@@ -0,0 +1,154 @@
+.date-range-filter {
+  .range-divider {
+    padding: 0 6px 0 5px;
+  }
+  input.datepicker {
+    width: 96px !important;
+  }
+}
+
+#ui-datepicker-div {
+  @include border-radius($border-radius);
+  border-color: $color-3;
+  padding: 0;
+  margin-top: 10px;
+
+  &:before {
+    content: '';
+    position: absolute;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-bottom: 10px solid $color-3;
+    top: 0px;
+    margin-top: -10px;
+    left: 25px;
+    z-index: 1;
+  }
+
+  .ui-datepicker-header {
+    padding: 0;
+    background-image: none;
+    background-color: $color-3;
+    border: none;
+    border-bottom: none;
+    border-radius: 0;
+    height: 32px;
+
+    .ui-datepicker-prev, .ui-datepicker-next {
+      border-radius: 0;      
+      top: 0;
+      height: 32px;
+
+      &:hover {
+        border: none;
+        background-image: none;
+        background-color: $color-3;
+        cursor: pointer;
+      }
+
+      .ui-icon {
+        background-image: none;
+        text-indent: 0;
+        color: $color-1;
+        width: 10px;
+        margin-left: -5px;
+        @extend [class^="icon-"]:before;
+
+        &:hover {
+          color: very-light($color-2, 25);
+        }
+      }
+    }
+    .ui-datepicker-prev {
+      left: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-left;        
+      }
+    }
+    .ui-datepicker-next {
+      right: 0;
+
+      .ui-icon {
+        @extend .icon-arrow-right;
+      }
+
+      &:hover {
+        .ui-icon {
+          margin-left: -5px;
+        }        
+      }
+    }
+
+    .ui-datepicker-title {
+      color: $color-1;
+      text-transform: uppercase;
+      font-size: 85% !important;
+      padding: 6px 10px;
+    }
+  }
+
+  table.ui-datepicker-calendar {
+    border: none;
+
+    thead {
+      th { 
+        border-bottom: 1px solid $color-border;
+        border-right: 1px solid $color-border;
+        color: $color-body-text;
+        width: 33px;
+
+        &:last-child {
+          border-right: none;
+        }
+      }
+    }
+    tbody {
+      tr:hover {
+        td {
+          background-color: transparent !important;
+        }
+      }
+      &:last-child tr:last-child td {
+        border-bottom: none;
+      }
+      td {
+        a {
+          border: 1px solid transparent;
+          background-color: $color-1;
+          background-image: none;
+          font-size: 85%;
+          color: $color-body-text;
+
+          &.ui-state-active {
+            background-color: $color-2;
+            color: $color-1;
+          }
+
+          &:hover {
+            background-color: $color-2;
+            color: $color-1;
+            border-color: darken($color-2, 5);
+
+          }
+        }
+
+        &.ui-state-disabled {
+          .ui-state-default {
+            border: none;
+            background-image: none;
+            background-color: transparent;
+          }
+        }
+
+        &.ui-datepicker-today {
+          a {
+            background-color: $color-6;
+            color: $color-1;
+            border: 1px solid darken($color-6, 5);
+          }
+        }
+      }      
+    }
+  }
+}

data/app/assets/stylesheets/admin/components/_messages.scss

@@ -0,0 +1,43 @@
+.errorExplanation {
+  padding: 5px;
+  border: 1px solid very-light($color-error, 12);
+  background-color: very-light($color-error, 6);
+  border-radius: 3px;
+  color: very-light($color-error, 30);
+  margin-bottom: 15px;
+
+  h2 {
+    font-size: 140%;
+    color: very-light($color-error, 30);
+    margin-bottom: 5px;
+  }
+
+  p {
+    padding: 10px 0;
+  }
+
+  ul {
+    list-style-position: inside;
+
+    li {
+      font-weight: $font-weight-bold;
+    }
+  }
+}
+
+.flash {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  padding: 16px;
+  text-align: center;
+  z-index: 1000;
+  font-size: 120%;
+  color: $color-1;
+  font-weight: 600;
+
+  &.notice  { background-color: rgba($color-notice,  0.8) }
+  &.success { background-color: rgba($color-success, 0.8) }
+  &.error   { background-color: rgba($color-error,   0.8) }
+}