spree_backend 2.4.10 → 3.0.0.rc1

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -1,307 +1,45 @@
-input[type="text"],
-input[type="password"],
-input[type="email"],
-input[type="date"],
-input[type="datetime"],
-input[type="time"],
-input[type="url"],
-input[type="number"],
-input[type="tel"],
-textarea, fieldset {
-  @include border-radius($border-radius);
-  padding: 7px 10px;
-  border: 1px solid $color-txt-brd;
-  color: $color-txt-text;
-  font-size: 90%;
-
-  &:focus {
-    outline: none;
-    border-color: $color-txt-hover-brd;
-  }
-
-  &[disabled] {
-    opacity: 0.7;
-  }
-}
-
-textarea {
-  line-height: 19px;
-}
-
-.fullwidth {
-  width: 100%;
-}
-
-.input-group {
-  position: relative;
-  display: table;
-  border-collapse: separate;
-
-  .form-control,
-  .input-group-addon {
-    display: table-cell;
-
-    &:first-child {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-    &:last-child {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-  }
-
-  .form-control {
-    width: 100%;
-  }
-
-  .input-group-addon {
-    padding: 6px 10px;
-    border: 1px solid #cee1f4;
-    background: #eff5fc;
-    border-radius: 3px;
-
-    &:first-child {
-      border-right: none;
-    }
-
-    &:last-child {
-      border-left: none;
-    }
-  }
+.form-control {
+  box-shadow: none;
 }
 
 label {
-  font-weight: 600;
   text-transform: uppercase;
-  font-size: 85%;
-  display: inline;
-  margin-bottom: 5px;
-  color: $color-4;
+  font-size: $font-size-base - 3;
+  letter-spacing: 1px;
+  color: $gray;
+  font-weight: 500;
 
-  &.inline {
-    display: inline-block !important;
-  }
-
-  &.block {
-    display: block !important;
+  input[type="radio"], input[type="checkbox"] {
+    margin-top: 2px;
   }
 }
 
-.label-block label { display: block }
-
-input[type="submit"],
-input[type="button"],
-button, .button {
-  @include border-radius($border-radius);
-  display: inline-block;
-  padding: 8px 15px;
-  border: none;
-  background-color: $color-btn-bg;
-  color: $color-btn-text;
-  text-transform: uppercase;
-  font-weight: 600 !important;
-  white-space: nowrap;
-
-  &:before {
-    font-weight: normal !important;
-  }
-
-  &:visited, &:active, &:focus { color: $color-btn-text }
-
-  &:hover {
-    background-color: $color-btn-hover-bg;
-    color: $color-btn-hover-text;
-  }
-
-  &:active:focus {
-    box-shadow: 0 0 8px 0 darken($color-btn-hover-bg, 5) inset;
-  }
+span.or {
+  @extend label;
 
-  &.fullwidth {
-    width: 100%;
-    text-align: center;
-  }
+  padding: 0 10px;
 }
 
-span.info {
-  font-style: italic;
-  font-size: 85%;
-  color: lighten($color-body-text, 15);
-  display: block;
-  line-height: 20px;
-  margin: 5px 0;
-}
-
-.field {
-  padding: 10px 0;
-
-  &.checkbox {
-    min-height: 73px;
-
-    input[type="checkbox"] {
-      display: inline-block;
-      width: auto;
-    }
-
-    label {
-      cursor: pointer;
-      display: block;
-    }
-  }
-
-  ul {
-    border-top: 1px solid $color-border;
-    list-style: none;
-    padding-top: 5px;
-
-    li {
-      display: inline-block;
-      padding-right: 10px;
-
-
-      label {
-        font-weight: normal;
-        text-transform: none;
-      }
-      &.white-space-nowrap {
-        white-space: nowrap;
-      }
-    }
-  }
-
-  &.withError {
-    .field_with_errors {
-      label {
-        color: very-light($color-error, 30);
-      }
-
-      input {
-        border-color: very-light($color-error, 15);
-      }
-    }
-    .formError {
-      color: very-light($color-error, 30);
-      font-style: italic;
-      font-size: 85%;
-    }
+input.form-control {
+  &:active, &:focus {
+    border-color: lighten($brand-success, 20);
+    box-shadow: none;
   }
 }
 
-fieldset {
-  box-shadow: none;
-  box-sizing: border-box;
-  border-color: $color-border;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  margin-left: 0;
-  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;
-
-  &.no-border-bottom {
-    border-bottom: none;
-    margin-bottom: 0;
-  }
-
-  &.no-border-top {
-    border-top: none;
-    padding-top: 0;
-  }
-
-  legend {
-    background-color: $color-1;
-    color: $color-2;
-    font-size: 14px;
-    font-weight: 600;
-    text-transform: uppercase;
-    text-align: center;
-    padding: 8px 15px;
-
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-
-    i {
-      color: $color-link;
-    }
-  }
-
-  label {
-    color: lighten($color-body-text, 8);
-  }
-
-  .filter-actions {
-    margin-bottom: -32px;
-    margin-top: 15px;
-    text-align: center;
-
-    form {
-      display: inline-block;
-    }
-
-    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;
-           -o-box-shadow: 0 0 0 15px $color-1;
-              box-shadow: 0 0 0 15px $color-1;
-
-      &:hover {
-        border-color: $color-1;
-      }
-    }
-
-    span.or {
-      background-color: $color-1;
-      border-width: 5px;
-      margin-left: 5px;
-      margin-right: 5px;
-      position: relative;
-
-      -webkit-box-shadow: 0 0 0 5px $color-1;
-         -moz-box-shadow: 0 0 0 5px $color-1;
-          -ms-box-shadow: 0 0 0 5px $color-1;
-           -o-box-shadow: 0 0 0 5px $color-1;
-              box-shadow: 0 0 0 5px $color-1;
+.form-group {
+  &.withError {
+    label, .formError, .required {
+      color: $brand-danger
     }
-  }
-
-  &.labels-inline {
-    .field {
-      margin-bottom: 0;
-      display: table;
-      width: 100%;
-
-      label, input {
-        display: table-cell !important;
-      }
-      input {
-        width: 100%;
-      }
 
-      &.checkbox {
-        input {
-          width: auto !important
-        }
-      }
-    }
-    .actions {
-      padding: 0;
-      text-align: right;
+    input {
+      border-color: $brand-danger;
     }
   }
 }
 
-.form-actions {
-  margin-top: 18px;
-}
-.form-buttons {
-  text-align: center;
-}
+.fullwidth-input {
+  display: block;
+  width: 100%;
+}

data/app/assets/stylesheets/spree/backend/shared/_typography.scss

@@ -1,138 +1,5 @@
-// Base
-//--------------------------------------------------------------
-body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, p, blockquote, th, td { margin: 0; padding: 0; font-size: 13px; }
-
-body {
-  font-family: $base-font-family;
-  font-size: $body-font-size;
-  font-weight: 400;
-  color: $color-body-text;
-  text-rendering: optimizeLegibility;
-}
-
-hr {
-  border-top: 1px solid $color-border;
-  border-bottom: 1px solid white;
-  border-left: none;
-}
-
-strong, b {
-  font-weight: 600;
-}
-
-// links
-//--------------------------------------------------------------
-a {
-  color: $color-link;
-  text-decoration: none;
-  line-height: inherit;
-
-  &, &:hover, &:active, &:visited, &:focus {
-    outline: none;
-  }
-
-  &:visited {
-    color: $color-link-visited;
-  }
-  &:focus {
-    color: $color-link-focus;
-  }
-  &:active {
-    color: $color-link-active;
-  }
-  &:hover {
-    color: $color-link-hover;
-  }
-}
-
-// Headings
-//--------------------------------------------------------------
-
-h1,h2,h3,h4,h5,h6 {
-  font-weight: 600;
-  color: $color-headers;
-  line-height: 1.1;
-}
-
-h1 { font-size: $h1-size; line-height: $h1-size + 6 }
-h2 { font-size: $h2-size; line-height: $h1-size + 4 }
-h3 { font-size: $h3-size; line-height: $h1-size + 2 }
-h4 { font-size: $h4-size; line-height: $h1-size }
-h5 { font-size: $h5-size; line-height: $h1-size }
-h6 { font-size: $h6-size; line-height: $h1-size }
-
-
-// Lists
-//--------------------------------------------------------------
-ul {
-  &.inline-menu {
-    li {
-      display: inline-block;
-    }
-  }
-  &.fields {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-  }
-}
-
-ul.text_list {
-  border-top: none;
-  margin: 0;
-  list-style: disc inside none;
-}
-
-dl {
-  width: 100%;
-  overflow: hidden;
-  margin: 5px 0;
-  color: lighten($color-body-text, 15);
-
-  dt, dd {
-    float: left;
-    line-height: 16px;
-    padding: 5px;
-    text-align: justify;
-  }
-
-  dt {
-    width: 40%;
-    font-weight: 600;
-    padding-left: 0;
-    text-transform: uppercase;
-    font-size: 85%;
-  }
-
-  dd {
-    width: 60%;
-    padding-right: 0;
-  }
-
-  dd:after {
-    content: '';
-    clear: both;
-  }
-
-}
-
-// Helpers
-.align-center  { text-align: center  }
-.align-right   { text-align: right   }
-.align-left    { text-align: left    }
-.align-justify { text-align: justify }
-
-.uppercase     { text-transform: uppercase }
-
-.green  { color: $color-2 }
-.blue   { color: $color-3 }
-.red    { color: $color-5 }
-.yellow { color: $color-6 }
-
-.no-objects-found {
-  text-align: center;
-  font-size: 120%;
-  text-transform: uppercase;
-  padding: 40px 0px;
-  color: lighten($color-body-text, 15);
-}
+h1, h2, h3, h4, h5, h6 {
+  -webkit-font-smoothing: antialiased;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}

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

@@ -0,0 +1,26 @@
+@import 'global/variables';
+
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+
+@import 'components/sidebar';
+@import 'components/tables';
+@import 'components/labels';
+@import 'components/main';
+@import 'components/page_header';
+@import 'components/icons';
+@import 'components/buttons';
+@import 'components/wells';
+@import 'components/filters';
+@import 'components/panels';
+@import 'components/navigation';
+@import 'components/taxon_products_view';
+
+@import 'sections/account';
+
+@import 'plugins/select2';
+@import 'plugins/jquery_ui';
+@import 'plugins/js_tree';
+
+@import 'shared/base';
+@import 'shared/forms';

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

@@ -3,15 +3,9 @@
  * 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 animate
  *= require spree/backend/spree_admin
 */

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

@@ -1,8 +1,6 @@
 module Spree
   module Admin
     class BaseController < Spree::BaseController
-      ssl_required
-
       helper 'spree/admin/navigation'
       helper 'spree/admin/tables'
       layout '/spree/layouts/admin'

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

@@ -44,7 +44,7 @@ module Spree
 
       def load_form_data
         return_items = @order.inventory_units.map(&:current_or_new_return_item).reject(&:customer_return_id)
-        @rma_return_items = return_items.select(&:return_authorization_id)
+        @rma_return_items, @new_return_items = return_items.partition(&:return_authorization_id)
       end
 
       def permitted_resource_params

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

@@ -6,10 +6,7 @@ module Spree
       before_action :set_store
 
       def edit
-        @preferences_security = [:allow_ssl_in_production,
-                        :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
-                        :check_for_spree_alerts]
-        @preferences_currency = [:display_currency, :hide_cents]
+        @preferences_security = [:check_for_spree_alerts]
       end
 
       def update
@@ -20,16 +17,16 @@ module Spree
 
         current_store.update_attributes store_params
 
-        flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
+        flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:general_settings))
         redirect_to edit_admin_general_settings_path
       end
 
       def dismiss_alert
         if request.xhr? and params[:alert_id]
           dismissed = Spree::Config[:dismissed_spree_alerts] || ''
-          Spree::Config.set dismissed_spree_alerts: dismissed.split(',').push(params[:alert_id]).join(',')
+          Spree::Config.set :dismissed_spree_alerts => dismissed.split(',').push(params[:alert_id]).join(',')
           filter_dismissed_alerts
-          render nothing: true
+          render :nothing => true
         end
       end
 
@@ -41,11 +38,7 @@ module Spree
 
       private
       def store_params
-        params.require(:store).permit(permitted_params)
-      end
-
-      def permitted_params
-        Spree::PermittedAttributes.store_attributes
+        params.require(:store).permit(permitted_store_attributes)
       end
 
       def set_store

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

@@ -1,34 +1,50 @@
 module Spree
   module Admin
     class ImagesController < ResourceController
-      before_action :load_data
+      before_action :load_edit_data, except: :index
+      before_action :load_index_data, only: :index
 
       create.before :set_viewable
       update.before :set_viewable
 
       private
 
-        def location_after_destroy
-          admin_product_images_url(@product)
-        end
+      def location_after_destroy
+        admin_product_images_url(@product)
+      end
 
-        def location_after_save
-          admin_product_images_url(@product)
-        end
+      def location_after_save
+        admin_product_images_url(@product)
+      end
 
-        def load_data
-          @product = Product.friendly.find(params[:product_id])
-          @variants = @product.variants.collect do |variant|
-            [variant.sku_and_options_text, variant.id]
-          end
-          @variants.insert(0, [Spree.t(:all), @product.master.id])
-        end
+      def load_index_data
+        @product = Product.friendly.includes(*variant_index_includes).find(params[:product_id])
+      end
 
-        def set_viewable
-          @image.viewable_type = 'Spree::Variant'
-          @image.viewable_id = params[:image][:viewable_id]
+      def load_edit_data
+        @product = Product.friendly.includes(*variant_edit_includes).find(params[:product_id])
+        @variants = @product.variants.map do |variant|
+          [variant.sku_and_options_text, variant.id]
         end
+        @variants.insert(0, [Spree.t(:all), @product.master.id])
+      end
+
+      def set_viewable
+        @image.viewable_type = 'Spree::Variant'
+        @image.viewable_id = params[:image][:viewable_id]
+      end
+
+      def variant_index_includes
+        [
+          variant_images: [viewable: { option_values: :option_type }]
+        ]
+      end
 
+      def variant_edit_includes
+        [
+          variants_including_master: { option_values: :option_type, images: :viewable }
+        ]
+      end
     end
   end
 end

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

@@ -11,8 +11,8 @@ module Spree
       private
 
       def find_order_and_payment
-        @order = Spree::Order.where(:number => params[:order_id]).first!
-        @payment = @order.payments.find(params[:payment_id])
+        @order = Spree::Order.friendly.find(params[:order_id])
+        @payment = @order.payments.friendly.find(params[:payment_id])
       end
     end
   end

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

@@ -4,13 +4,15 @@ module Spree
       before_action :setup_new_option_value, only: :edit
 
       def update_values_positions
-        params[:positions].each do |id, index|
-          OptionValue.where(:id => id).update_all(:position => index)
+        ActiveRecord::Base.transaction do
+          params[:positions].each do |id, index|
+            Spree::OptionValue.where(id: id).update_all(position: index)
+          end
         end
 
         respond_to do |format|
           format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render :text => 'Ok' }
+          format.js { render text: 'Ok' }
         end
       end