spree_backend 3.4.6 → 3.5.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 738c4ddb399d96fed16d125559d5af5c12b5ff32734a818e1c25f1f58cc115c8
-  data.tar.gz: 14ffa9d8c57ef5565fe37dc31a4b45154d13e60ebf5a62329cc07e20d7ac15fc
+SHA1:
+  metadata.gz: 2abaf3f1c27f9be3bee8cafdca91363f6535665a
+  data.tar.gz: 63934daca736fc690be8336282148c18c8cfab3e
 SHA512:
-  metadata.gz: 3a8b40ac8f20c72311738581672e38c9f0131006a77b5d0f8339391c795397e1cb113df13ca3434c8671ac8c5f82b7d32b699eaca7a46aee155e986877b098e3
-  data.tar.gz: 51648867cd3293ac615d3213b03b8f33256a48e3cc497f9718d2499900f10005aafac9ec0588963fe0d9c9cd2317dc62f40f79916d44ed47e7704ed17cf2d2c0
+  metadata.gz: 8137421d3c391e21e44dba3e38fff09e51698e0b68c484d21104a7809e0fac8101b6e3c892e486dd70aee55766252d4aead2dbe8946319a697a36185f3570475
+  data.tar.gz: 2206c3665bff0cead6c01309c0f0844f0938ae0fa2ae22491b48ac4cc89713751f1efb1437897f532f6eed313686743be68ec39cf8618c7c3b0e249c7c3c0931

data/app/assets/javascripts/spree/backend.js

@@ -10,7 +10,6 @@
 //= require jquery-ui/widgets/autocomplete
 //= require select2
 //= require underscore-min.js
-//= require velocity
 
 //= require spree
 //= require spree/backend/spree-select2
@@ -45,6 +44,7 @@
 //= require spree/backend/taxon_tree_menu
 //= require spree/backend/taxonomy
 //= require spree/backend/taxons
+//= require spree/backend/users/edit
 //= require spree/backend/user_picker
 //= require spree/backend/tag_picker
 //= require spree/backend/variant_autocomplete

data/app/assets/javascripts/spree/backend/shipments.js

@@ -125,6 +125,19 @@ $(document).ready(function () {
   $('a.edit-tracking').click(toggleTrackingEdit);
   $('a.cancel-tracking').click(toggleTrackingEdit);
 
+  var createTrackingValueContent = function (data) {
+    var selected_shipping_method = data.shipping_methods.filter(function (method) {
+      return method.id === data.selected_shipping_rate.shipping_method_id;
+    })[0];
+
+    if (selected_shipping_method && selected_shipping_method.tracking_url) {
+      var shipmentTrackingUrl = selected_shipping_method.tracking_url.replace(/:tracking/, data.tracking);
+      return '<a target="_blank" href="' + shipmentTrackingUrl + '">' + data.tracking + '<a>';
+    }
+
+    return data.tracking;
+  }
+
   // handle tracking save
   $('[data-hook=admin_shipment_form] a.save-tracking').on('click', function (event) {
     event.preventDefault();
@@ -148,7 +161,12 @@ $(document).ready(function () {
 
       var show = link.parents('tbody').find('tr.show-tracking');
       show.toggle();
-      show.find('.tracking-value').html($("<strong>").html(Spree.translations.tracking + ": ")).append(data.tracking);
+
+      if (data.tracking) {
+        show.find('.tracking-value').html($("<strong>").html(Spree.translations.tracking + ": ")).append(createTrackingValueContent(data));
+      } else {
+        show.find('.tracking-value').html(Spree.translations.no_tracking_present);
+      }
     });
   });
 });
@@ -212,6 +230,9 @@ toggleItemEdit = function(){
 
 startItemSplit = function(event){
   event.preventDefault();
+  $('.cancel-split').each(function(){
+    $(this).click()
+  })
   var link = $(this);
   link.parent().find('a.edit-item').toggle();
   link.parent().find('a.split-item').toggle();
@@ -279,7 +300,7 @@ completeItemSplit = function(event) {
             token: Spree.api_key
         }
       }).error(function(msg) {
-          alert(msg.responseJSON['message']);
+          alert(msg.responseJSON.exception);
       }).done(function(msg) {
           window.location.reload();
       });
@@ -297,7 +318,7 @@ completeItemSplit = function(event) {
                 token: Spree.api_key
             }
         }).error(function(msg) {
-            alert(msg.responseJSON['message']);
+            alert(msg.responseJSON.exception);
         }).done(function(msg) {
             window.location.reload();
         });

data/app/assets/javascripts/spree/backend/taxonomy.js.coffee

@@ -1,6 +1,6 @@
-handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
+handle_ajax_error = (last_rollback) ->
   $.jstree.rollback(last_rollback)
-  $("#ajax_error").show().html("<strong>" + Spree.translations.server_error + "</strong><br />" + Spree.translations.taxonomy_tree_error)
+  show_flash("error", "<strong>" + Spree.translations.server_error + "</strong><br />" + Spree.translations.taxonomy_tree_error)
 
 handle_move = (e, data) ->
   last_rollback = data.rlbk
@@ -20,7 +20,8 @@ handle_move = (e, data) ->
       "taxon[child_index]": position,
       token: Spree.api_key
     },
-    error: handle_ajax_error
+    error: (XMLHttpRequest, textStatus, errorThrown) ->
+      handle_ajax_error(last_rollback)
 
   true
 
@@ -41,7 +42,8 @@ handle_create = (e, data) ->
       "taxon[child_index]": position,
       token: Spree.api_key
     },
-    error: handle_ajax_error,
+    error: (XMLHttpRequest, textStatus, errorThrown) ->
+      handle_ajax_error(last_rollback)
     success: (data,result) ->
       node.prop('id', data.id)
 
@@ -62,7 +64,8 @@ handle_rename = (e, data) ->
       "taxon[name]": name,
       token: Spree.api_key
     },
-    error: handle_ajax_error
+    error: (XMLHttpRequest, textStatus, errorThrown) ->
+      handle_ajax_error(last_rollback)
 
 handle_delete = (e, data) ->
   last_rollback = data.rlbk
@@ -79,7 +82,8 @@ handle_delete = (e, data) ->
         _method: "delete",
         token: Spree.api_key
       },
-      error: handle_ajax_error
+      error: (XMLHttpRequest, textStatus, errorThrown) ->
+        handle_ajax_error(last_rollback)
   else
     $.jstree.rollback(last_rollback)
     last_rollback = null

data/app/assets/javascripts/spree/backend/users/edit.js

@@ -0,0 +1,18 @@
+$( document ).ready(function() {
+  var use_billing = $('#user_use_billing');
+
+  if(use_billing.is(':checked')) {
+    $('#shipping').hide();
+  }
+
+  use_billing.change(function() {
+    if(this.checked){
+       $('#shipping').hide();
+       return $('#shipping input, #shipping select').prop('disabled', true);
+     }
+     else {
+       $('#shipping').show();
+       $('#shipping input, #shipping select').prop('disabled', false);
+     }
+  });
+});

data/app/assets/stylesheets/spree/backend/components/_buttons.scss

@@ -1,4 +1,5 @@
-.btn, .nav-pills > li > a {
+.btn,
+.nav-pills > li > a {
   letter-spacing: 1px;
   vertical-align: middle;
   transition: color 0.1s linear 0s,background-color 0.1s linear 0s,opacity 0.2s linear 0s !important;
@@ -9,25 +10,28 @@
   -webkit-font-feature-settings: "kern" 1;
   -moz-font-feature-settings: "kern" 1;
 }
+
 .btn {
   text-align: center;
 
   &:focus {
     outline: 0 !important;
   }
-  
+
   &:hover,
   &:focus,
   &:active,
   &.active,
   &.disabled,
   &[disabled] {
-      box-shadow: none;
+    box-shadow: none;
   }
 
   .glyphicon {
     padding-right: 3px;
   }
+
+  .ship { color: $btn-success-color; }
 }
 
 .btn-sm .glyphicon { padding: 0; }

data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss

@@ -41,7 +41,9 @@
         }
       }
       .image {
+	height: 191px;
         .thumbnail {
+	  max-height: 180px;
           margin-bottom: 8px;
           display: inline-block;
           width: 100%;

data/app/assets/stylesheets/spree/backend/global/_variables.scss

@@ -19,7 +19,7 @@
 /*------------------------------------------
   Fonts
   -----------------------------------------*/
-  $headings-font-family: "Segoe UI", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  $headings-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   $headings-font-weight: 300;
 
 /*------------------------------------------
@@ -34,4 +34,4 @@
 /*------------------------------------------
   Wells
   -----------------------------------------*/
-  $well-bg: #fbfbfb;
+  $well-bg: #fbfbfb;

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

@@ -12,7 +12,7 @@ module Spree
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
       def index
-        @adjustments = @order.all_adjustments.order(created_at: :asc)
+        @adjustments = @order.all_adjustments.eligible.order(created_at: :asc)
       end
 
       private

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

@@ -3,8 +3,6 @@ module Spree
     class GeneralSettingsController < Spree::Admin::BaseController
       include Spree::Backend::Callbacks
 
-      before_action :set_store
-
       def edit
         @preferences_security = []
       end
@@ -15,8 +13,6 @@ module Spree
           Spree::Config[name] = value
         end
 
-        current_store.update_attributes store_params
-
         flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings))
         redirect_to edit_admin_general_settings_path
       end
@@ -26,16 +22,6 @@ module Spree
         invoke_callbacks(:clear_cache, :after)
         head :no_content
       end
-
-      private
-
-      def store_params
-        params.require(:store).permit(permitted_store_attributes)
-      end
-
-      def set_store
-        @store = current_store
-      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart]
+      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :store, :set_store]
 
       respond_to :html
 
@@ -75,6 +75,10 @@ module Spree
         end
       end
 
+      def store
+        @stores = Spree::Store.all
+      end
+
       def update
         if @order.update_attributes(params[:order]) && @order.line_items.present?
           @order.update_with_updater!
@@ -130,6 +134,16 @@ module Spree
         respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
       end
 
+      def set_store
+        if @order.update_attributes(store_id: params[:order][:store_id])
+          flash[:success] = flash_message_for(@order, :successfully_updated)
+        else
+          flash[:error] = @order.errors.full_messages.join(', ')
+        end
+
+        redirect_to store_admin_order_url(@order)
+      end
+
       private
 
       def order_params

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

@@ -50,7 +50,7 @@ module Spree
           if @product.destroy
             flash[:success] = Spree.t('notice_messages.product_deleted')
           else
-            flash[:error] = Spree.t('notice_messages.product_not_deleted', error: @product.errors.full_messages.join(', '))
+            flash[:error] = Spree.t('notice_messages.product_not_deleted', error: @product.errors.full_messages.to_sentence)
           end
         rescue ActiveRecord::RecordNotDestroyed => e
           flash[:error] = Spree.t('notice_messages.product_not_deleted', error: e.message)
@@ -69,12 +69,12 @@ module Spree
           flash[:success] = Spree.t('notice_messages.product_cloned')
           redirect_to edit_admin_product_url(@new)
         else
-          flash[:error] = Spree.t('notice_messages.product_not_cloned')
+          flash[:error] = Spree.t('notice_messages.product_not_cloned', error: @new.errors.full_messages.to_sentence)
           redirect_to admin_products_url
         end
-      rescue ActiveRecord::RecordInvalid
+      rescue ActiveRecord::RecordInvalid => e
         # Handle error on uniqueness validation on product fields
-        flash[:error] = Spree.t('notice_messages.product_not_cloned')
+        flash[:error] = Spree.t('notice_messages.product_not_cloned', error: e.message)
         redirect_to admin_products_url
       end
 

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

@@ -1,10 +1,25 @@
 module Spree
   module Admin
     class PromotionsController < ResourceController
-      before_action :load_data
+      before_action :load_data, except: :clone
 
       helper 'spree/admin/promotion_rules'
 
+      def clone
+        promotion = Spree::Promotion.find(params[:id])
+        duplicator = Spree::PromotionHandler::PromotionDuplicator.new(promotion)
+
+        @new_promo = duplicator.duplicate
+
+        if @new_promo.errors.empty?
+          flash[:success] = Spree.t('promotion_cloned')
+          redirect_to edit_admin_promotion_url(@new_promo)
+        else
+          flash[:error] = Spree.t('promotion_not_cloned', error: @new_promo.errors.full_messages.to_sentence)
+          redirect_to admin_promotions_url(@new_promo)
+        end
+      end
+
       protected
 
       def location_after_save

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

@@ -19,14 +19,14 @@ module Spree
       private
 
       def set_shipping_category
-        return true if params['shipping_method'][:shipping_categories] == ''
+        return true if params['shipping_method'][:shipping_categories].blank?
         @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params['shipping_method'][:shipping_categories])
         @shipping_method.save
         params[:shipping_method].delete(:shipping_categories)
       end
 
       def set_zones
-        return true if params['shipping_method'][:zones] == ''
+        return true if params['shipping_method'][:zones].blank?
         @shipping_method.zones = Spree::Zone.where(id: params['shipping_method'][:zones])
         @shipping_method.save
         params[:shipping_method].delete(:zones)

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

@@ -7,9 +7,10 @@ module Spree
 
       def set_country
         @stock_location.country = Spree::Country.default
-      rescue ActiveRecord::RecordNotFound
-        flash[:error] = Spree.t(:stock_locations_need_a_default_country)
-        redirect_to admin_stock_locations_path
+        unless @stock_location.country
+          flash[:error] = Spree.t(:stock_locations_need_a_default_country)
+          redirect_to admin_stock_locations_path
+        end
       end
     end
   end

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

@@ -0,0 +1,79 @@
+module Spree
+  module Admin
+    class StoresController < Spree::Admin::BaseController
+      before_action :load_store, only: [:new, :edit, :update]
+
+      def index
+        @stores = Spree::Store.all
+      end
+
+      def create
+        @store = Spree::Store.new(permitted_store_params)
+
+        if @store.save
+          flash[:success] = flash_message_for(@store, :successfully_created)
+          redirect_to admin_stores_path
+        else
+          flash[:error] = "#{Spree.t('store.errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
+          render :new
+        end
+      end
+
+      def update
+        @store.assign_attributes(permitted_store_params)
+
+        if @store.save
+          flash[:success] = flash_message_for(@store, :successfully_updated)
+          redirect_to admin_stores_path
+        else
+          flash[:error] = "#{Spree.t('store.errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
+          render :edit
+        end
+      end
+
+      def destroy
+        @store = Spree::Store.find(params[:id])
+
+        if @store.destroy
+          flash[:success] = flash_message_for(@store, :successfully_removed)
+          respond_with(@store) do |format|
+            format.html { redirect_to admin_stores_path }
+            format.js { render_js_for_destroy }
+          end
+        else
+          render plain: "#{Spree.t('store.errors.unable_to_delete')}: #{@store.errors.full_messages.join(', ')}", status: :unprocessable_entity
+        end
+      end
+
+      def set_default
+        store = Spree::Store.find(params[:id])
+        stores = Spree::Store.where.not(id: params[:id])
+
+        ApplicationRecord.transaction do
+          store.update(default: true)
+          stores.update_all(default: false)
+        end
+
+        if store.errors.empty?
+          flash[:success] = Spree.t(:store_set_as_default, store: store.name)
+        else
+          flash[:error] = "#{Spree.t(:store_not_set_as_default, store: store.name)} #{store.errors.full_messages.join(', ')}"
+        end
+
+        redirect_to admin_stores_path
+      end
+
+      protected
+
+      def permitted_store_params
+        params.require(:store).permit(permitted_store_attributes)
+      end
+
+      private
+
+      def load_store
+        @store = Spree::Store.find_by(id: params[:id]) || Spree::Store.new
+      end
+    end
+  end
+end