goca-spree-backend 3.1.14.rails.5.0 → 3.1.14.rails.5.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/admin/base_controller.rb +0 -11
  3. data/app/controllers/spree/admin/option_types_controller.rb +2 -14
  4. data/app/controllers/spree/admin/option_values_controller.rb +1 -1
  5. data/app/controllers/spree/admin/orders_controller.rb +7 -7
  6. data/app/controllers/spree/admin/payment_methods_controller.rb +11 -2
  7. data/app/controllers/spree/admin/payments_controller.rb +2 -0
  8. data/app/controllers/spree/admin/product_properties_controller.rb +1 -1
  9. data/app/controllers/spree/admin/promotion_actions_controller.rb +5 -5
  10. data/app/controllers/spree/admin/promotion_rules_controller.rb +6 -6
  11. data/app/controllers/spree/admin/promotions_controller.rb +2 -2
  12. data/app/controllers/spree/admin/properties_controller.rb +1 -1
  13. data/app/controllers/spree/admin/prototypes_controller.rb +2 -2
  14. data/app/controllers/spree/admin/refunds_controller.rb +1 -1
  15. data/app/controllers/spree/admin/reimbursement_types_controller.rb +26 -0
  16. data/app/controllers/spree/admin/reimbursements_controller.rb +1 -1
  17. data/app/controllers/spree/admin/reports_controller.rb +1 -1
  18. data/app/controllers/spree/admin/resource_controller.rb +10 -9
  19. data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -2
  20. data/app/controllers/spree/admin/return_index_controller.rb +1 -1
  21. data/app/controllers/spree/admin/shipping_methods_controller.rb +2 -2
  22. data/app/controllers/spree/admin/state_changes_controller.rb +1 -1
  23. data/app/controllers/spree/admin/states_controller.rb +1 -1
  24. data/app/controllers/spree/admin/stock_items_controller.rb +2 -2
  25. data/app/controllers/spree/admin/stock_movements_controller.rb +7 -8
  26. data/app/controllers/spree/admin/store_credits_controller.rb +2 -1
  27. data/app/controllers/spree/admin/taxons_controller.rb +1 -10
  28. data/app/controllers/spree/admin/variants_controller.rb +3 -1
  29. data/app/helpers/spree/admin/base_helper.rb +1 -6
  30. data/config/routes.rb +2 -1
  31. data/lib/spree/backend/engine.rb +2 -6
  32. data/spree_backend.gemspec +1 -1
  33. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fb3cd4b79be5c7d864610d394c7fa08d1d30f777
4
- data.tar.gz: 4878fbc41d1b918ea423bc58415cb9d6a7181d6d
3
+ metadata.gz: 8d2391a735222d87388e713c9a7859397f1854a5
4
+ data.tar.gz: cd2ae33edb7d43cd29b7b5cc614b2243f7ec7d56
5
5
  SHA512:
6
- metadata.gz: d64d8a9f40fe1a22c112ede233667ce0ca9bad33f14b2409ceea528cf902894b87cd4af0a673fa1b724a3392a898e216cb90d7b67916ddec99c49b38f8f3a4f7
7
- data.tar.gz: 482d30da3f2edf7aa476cb607df2ecda2e8f9df756c90d6e2dec2afad838d48737139350b523aaa1120c6bcdce9a644b3e49685a8dbd9a43f8d812cb0078a3f5
6
+ metadata.gz: 2ddec82cc55c343f51ba5d727664f28f732ec7e69f6ced145d1d7a2f5ff2b630926906bd8269b91c059b3f8b3feb2a8dba7d17e794d31b44b01497f1d7c3e85f
7
+ data.tar.gz: 7a0b4d7f7bb779ffe4da9a14a02c56d17b341fc75c7369de252eaaa8ae7bbc1d64764c21ee0e0b2c016af84e8876eca5b5d0070a8f2e54b0f2d8b44ac6fa6c55
@@ -2,7 +2,6 @@ module Spree
2
2
  module Admin
3
3
  class BaseController < Spree::BaseController
4
4
  helper 'spree/admin/navigation'
5
- helper 'spree/admin/tables'
6
5
  layout '/spree/layouts/admin'
7
6
 
8
7
  before_action :authorize_admin
@@ -42,16 +41,6 @@ module Spree
42
41
  render partial: '/spree/admin/shared/destroy'
43
42
  end
44
43
 
45
- # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
46
- def check_json_authenticity
47
- return unless request.format.js? || request.format.json?
48
- return unless protect_against_forgery?
49
- auth_token = params[request_forgery_protection_token]
50
- unless auth_token && form_authenticity_token == URI.unescape(auth_token)
51
- raise(ActionController::InvalidAuthenticityToken)
52
- end
53
- end
54
-
55
44
  def config_locale
56
45
  Spree::Backend::Config[:locale]
57
46
  end
@@ -4,7 +4,7 @@ module Spree
4
4
  before_action :setup_new_option_value, only: :edit
5
5
 
6
6
  def update_values_positions
7
- ActiveRecord::Base.transaction do
7
+ ApplicationRecord.transaction do
8
8
  params[:positions].each do |id, index|
9
9
  Spree::OptionValue.where(id: id).update_all(position: index)
10
10
  end
@@ -12,7 +12,7 @@ module Spree
12
12
 
13
13
  respond_to do |format|
14
14
  format.html { redirect_to admin_product_variants_url(params[:product_id]) }
15
- format.js { render text: 'Ok' }
15
+ format.js { render plain: 'Ok' }
16
16
  end
17
17
  end
18
18
 
@@ -28,21 +28,9 @@ module Spree
28
28
 
29
29
 
30
30
  private
31
- def load_product
32
- @product = Product.friendly.find(params[:product_id])
33
- end
34
-
35
31
  def setup_new_option_value
36
32
  @option_type.option_values.build if @option_type.option_values.empty?
37
33
  end
38
-
39
- def set_available_option_types
40
- @available_option_types = if @product.option_type_ids.any?
41
- OptionType.where.not(id: @product.option_type_ids)
42
- else
43
- OptionType.all
44
- end
45
- end
46
34
  end
47
35
  end
48
36
  end
@@ -4,7 +4,7 @@ module Spree
4
4
  def destroy
5
5
  option_value = Spree::OptionValue.find(params[:id])
6
6
  option_value.destroy
7
- render text: nil
7
+ render plain: nil
8
8
  end
9
9
  end
10
10
  end
@@ -41,7 +41,7 @@ module Spree
41
41
  # see https://github.com/spree/spree/pull/3919
42
42
  @orders = @search.result(distinct: true).
43
43
  page(params[:page]).
44
- per(params[:per_page] || Spree::Config[:orders_per_page])
44
+ per(params[:per_page] || Spree::Config[:admin_orders_per_page])
45
45
 
46
46
  # Restore dates
47
47
  params[:q][:created_at_gt] = created_at_gt
@@ -85,26 +85,26 @@ module Spree
85
85
  def cancel
86
86
  @order.canceled_by(try_spree_current_user)
87
87
  flash[:success] = Spree.t(:order_canceled)
88
- redirect_to :back
88
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
89
89
  end
90
90
 
91
91
  def resume
92
92
  @order.resume!
93
93
  flash[:success] = Spree.t(:order_resumed)
94
- redirect_to :back
94
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
95
95
  end
96
96
 
97
97
  def approve
98
98
  @order.approved_by(try_spree_current_user)
99
99
  flash[:success] = Spree.t(:order_approved)
100
- redirect_to :back
100
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
101
101
  end
102
102
 
103
103
  def resend
104
104
  OrderMailer.confirm_email(@order.id, true).deliver_later
105
105
  flash[:success] = Spree.t(:order_email_resent)
106
106
 
107
- redirect_to :back
107
+ redirect_back fallback_location: spree.edit_admin_order_url(@order)
108
108
  end
109
109
 
110
110
  def open_adjustments
@@ -112,7 +112,7 @@ module Spree
112
112
  adjustments.update_all(state: 'open')
113
113
  flash[:success] = Spree.t(:all_adjustments_opened)
114
114
 
115
- respond_with(@order) { |format| format.html { redirect_to :back } }
115
+ respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
116
116
  end
117
117
 
118
118
  def close_adjustments
@@ -120,7 +120,7 @@ module Spree
120
120
  adjustments.update_all(state: 'closed')
121
121
  flash[:success] = Spree.t(:all_adjustments_closed)
122
122
 
123
- respond_with(@order) { |format| format.html { redirect_to :back } }
123
+ respond_with(@order) { |format| format.html { redirect_back fallback_location: spree.admin_order_adjustments_url(@order) } }
124
124
  end
125
125
 
126
126
  private
@@ -32,8 +32,7 @@ module Spree
32
32
  @payment_method = PaymentMethod.find(params[:id])
33
33
  end
34
34
 
35
- update_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
36
- attributes = payment_method_params.merge(update_params)
35
+ attributes = payment_method_params.merge(preferences_params)
37
36
  attributes.each do |k,v|
38
37
  if k.include?("password") && attributes[k].blank?
39
38
  attributes.delete(k)
@@ -52,6 +51,10 @@ module Spree
52
51
 
53
52
  private
54
53
 
54
+ def collection
55
+ @collection = super.order(position: :asc)
56
+ end
57
+
55
58
  def load_data
56
59
  @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
57
60
  end
@@ -67,6 +70,12 @@ module Spree
67
70
  def payment_method_params
68
71
  params.require(:payment_method).permit!
69
72
  end
73
+
74
+ def preferences_params
75
+ key = ActiveModel::Naming.param_key(@payment_method)
76
+ return {} unless params.key? key
77
+ params.require(key).permit!
78
+ end
70
79
  end
71
80
  end
72
81
  end
@@ -17,6 +17,8 @@ module Spree
17
17
  end
18
18
 
19
19
  def new
20
+ # Move order to payment state in order to capture tax generated on shipments
21
+ @order.next if @order.can_go_to_state?('payment')
20
22
  @payment = @order.payments.build
21
23
  end
22
24
 
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  module Admin
3
3
  class ProductPropertiesController < ResourceController
4
- belongs_to 'spree/product', :find_by => :slug
4
+ belongs_to 'spree/product', find_by: :slug
5
5
  before_action :find_properties
6
6
  before_action :setup_property, only: :index
7
7
 
@@ -7,22 +7,22 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
7
7
  @promotion_action = params[:action_type].constantize.new(params[:promotion_action])
8
8
  @promotion_action.promotion = @promotion
9
9
  if @promotion_action.save
10
- flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:promotion_action))
10
+ flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_action))
11
11
  end
12
12
  respond_to do |format|
13
13
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
14
- format.js { render :layout => false }
14
+ format.js { render layout: false }
15
15
  end
16
16
  end
17
17
 
18
18
  def destroy
19
19
  @promotion_action = @promotion.promotion_actions.find(params[:id])
20
20
  if @promotion_action.destroy
21
- flash[:success] = Spree.t(:successfully_removed, :resource => Spree.t(:promotion_action))
21
+ flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_action))
22
22
  end
23
23
  respond_to do |format|
24
24
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
25
- format.js { render :layout => false }
25
+ format.js { render layout: false }
26
26
  end
27
27
  end
28
28
 
@@ -38,7 +38,7 @@ class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
38
38
  flash[:error] = Spree.t(:invalid_promotion_action)
39
39
  respond_to do |format|
40
40
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
41
- format.js { render :layout => false }
41
+ format.js { render layout: false }
42
42
  end
43
43
  end
44
44
  end
@@ -1,5 +1,5 @@
1
1
  class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
2
- helper 'spree/promotion_rules'
2
+ helper 'spree/admin/promotion_rules'
3
3
 
4
4
  before_action :load_promotion, only: [:create, :destroy]
5
5
  before_action :validate_promotion_rule_type, only: :create
@@ -12,22 +12,22 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
12
12
  @promotion_rule = promotion_rule_type.constantize.new(params[:promotion_rule])
13
13
  @promotion_rule.promotion = @promotion
14
14
  if @promotion_rule.save
15
- flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:promotion_rule))
15
+ flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:promotion_rule))
16
16
  end
17
17
  respond_to do |format|
18
18
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
19
- format.js { render :layout => false }
19
+ format.js { render layout: false }
20
20
  end
21
21
  end
22
22
 
23
23
  def destroy
24
24
  @promotion_rule = @promotion.promotion_rules.find(params[:id])
25
25
  if @promotion_rule.destroy
26
- flash[:success] = Spree.t(:successfully_removed, :resource => Spree.t(:promotion_rule))
26
+ flash[:success] = Spree.t(:successfully_removed, resource: Spree.t(:promotion_rule))
27
27
  end
28
28
  respond_to do |format|
29
29
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
30
- format.js { render :layout => false }
30
+ format.js { render layout: false }
31
31
  end
32
32
  end
33
33
 
@@ -43,7 +43,7 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
43
43
  flash[:error] = Spree.t(:invalid_promotion_rule)
44
44
  respond_to do |format|
45
45
  format.html { redirect_to spree.edit_admin_promotion_path(@promotion)}
46
- format.js { render :layout => false }
46
+ format.js { render layout: false }
47
47
  end
48
48
  end
49
49
  end
@@ -3,7 +3,7 @@ module Spree
3
3
  class PromotionsController < ResourceController
4
4
  before_action :load_data
5
5
 
6
- helper 'spree/promotion_rules'
6
+ helper 'spree/admin/promotion_rules'
7
7
 
8
8
  protected
9
9
  def location_after_save
@@ -25,7 +25,7 @@ module Spree
25
25
  @collection = @search.result(distinct: true).
26
26
  includes(promotion_includes).
27
27
  page(params[:page]).
28
- per(params[:per_page] || Spree::Config[:promotions_per_page])
28
+ per(params[:per_page] || Spree::Config[:admin_promotions_per_page])
29
29
  end
30
30
 
31
31
  def promotion_includes
@@ -16,7 +16,7 @@ module Spree
16
16
  @search = @collection.ransack(params[:q])
17
17
  @collection = @search.result.
18
18
  page(params[:page]).
19
- per(Spree::Config[:properties_per_page])
19
+ per(Spree::Config[:admin_properties_per_page])
20
20
  end
21
21
  end
22
22
  end
@@ -3,7 +3,7 @@ module Spree
3
3
  class PrototypesController < ResourceController
4
4
  def show
5
5
  if request.xhr?
6
- render :layout => false
6
+ render layout: false
7
7
  else
8
8
  redirect_to admin_prototypes_path
9
9
  end
@@ -12,7 +12,7 @@ module Spree
12
12
  def available
13
13
  @prototypes = Prototype.order('name asc')
14
14
  respond_with(@prototypes) do |format|
15
- format.html { render :layout => !request.xhr? }
15
+ format.html { render layout: !request.xhr? }
16
16
  format.js
17
17
  end
18
18
  end
@@ -6,7 +6,7 @@ module Spree
6
6
 
7
7
  helper_method :refund_reasons
8
8
 
9
- rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :create
9
+ rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
10
10
 
11
11
  private
12
12
 
@@ -1,6 +1,32 @@
1
1
  module Spree
2
2
  module Admin
3
3
  class ReimbursementTypesController < ResourceController
4
+ def update
5
+ invoke_callbacks(:update, :before)
6
+ if @object.update_attributes(permitted_resource_params_for_update)
7
+ invoke_callbacks(:update, :after)
8
+ respond_with(@object) do |format|
9
+ format.html do
10
+ flash[:success] = flash_message_for(@object, :successfully_updated)
11
+ redirect_to location_after_save
12
+ end
13
+ format.js { render layout: false }
14
+ end
15
+ else
16
+ invoke_callbacks(:update, :fails)
17
+ respond_with(@object) do |format|
18
+ format.html { render action: :edit }
19
+ format.js { render layout: false }
20
+ end
21
+ end
22
+ end
23
+
24
+ private
25
+
26
+ def permitted_resource_params_for_update
27
+ params_hash = @object.type.underscore.remove('spree/').tr('/', '_')
28
+ params.require(params_hash.to_s).permit(:name, :active, :mutable)
29
+ end
4
30
  end
5
31
  end
6
32
  end
@@ -5,7 +5,7 @@ module Spree
5
5
 
6
6
  before_action :load_simulated_refunds, only: :edit
7
7
 
8
- rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :perform
8
+ rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error
9
9
 
10
10
  def perform
11
11
  @reimbursement.perform!
@@ -45,7 +45,7 @@ module Spree
45
45
 
46
46
  @totals = {}
47
47
  @orders.each do |order|
48
- @totals[order.currency] = { :item_total => ::Money.new(0, order.currency), :adjustment_total => ::Money.new(0, order.currency), :sales_total => ::Money.new(0, order.currency) } unless @totals[order.currency]
48
+ @totals[order.currency] = { item_total: ::Money.new(0, order.currency), adjustment_total: ::Money.new(0, order.currency), sales_total: ::Money.new(0, order.currency) } unless @totals[order.currency]
49
49
  @totals[order.currency][:item_total] += order.display_item_total.money
50
50
  @totals[order.currency][:adjustment_total] += order.display_adjustment_total.money
51
51
  @totals[order.currency][:sales_total] += order.display_total.money
@@ -3,25 +3,25 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
3
3
 
4
4
  helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
5
5
  before_action :load_resource, except: :update_positions
6
- rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
6
+ rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
7
7
 
8
8
  respond_to :html
9
9
 
10
10
  def new
11
11
  invoke_callbacks(:new_action, :before)
12
12
  respond_with(@object) do |format|
13
- format.html { render :layout => !request.xhr? }
13
+ format.html { render layout: !request.xhr? }
14
14
  if request.xhr?
15
- format.js { render :layout => false }
15
+ format.js { render layout: false }
16
16
  end
17
17
  end
18
18
  end
19
19
 
20
20
  def edit
21
21
  respond_with(@object) do |format|
22
- format.html { render :layout => !request.xhr? }
22
+ format.html { render layout: !request.xhr? }
23
23
  if request.xhr?
24
- format.js { render :layout => false }
24
+ format.js { render layout: false }
25
25
  end
26
26
  end
27
27
  end
@@ -54,7 +54,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
54
54
  flash[:success] = flash_message_for(@object, :successfully_created)
55
55
  respond_with(@object) do |format|
56
56
  format.html { redirect_to location_after_save }
57
- format.js { render :layout => false }
57
+ format.js { render layout: false }
58
58
  end
59
59
  else
60
60
  invoke_callbacks(:create, :fails)
@@ -66,14 +66,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
66
66
  end
67
67
 
68
68
  def update_positions
69
- ActiveRecord::Base.transaction do
69
+ ApplicationRecord.transaction do
70
70
  params[:positions].each do |id, index|
71
71
  model_class.find(id).set_list_position(index)
72
72
  end
73
73
  end
74
74
 
75
75
  respond_to do |format|
76
- format.js { render text: 'Ok' }
76
+ format.js { render plain: 'Ok' }
77
77
  end
78
78
  end
79
79
 
@@ -158,7 +158,8 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
158
158
  def parent
159
159
  if parent_data.present?
160
160
  @parent ||= parent_data[:model_class].
161
- send("find_by_#{parent_data[:find_by]}", params["#{resource.model_name}_id"])
161
+ # Don't use `find_by_attribute_name` to workaround globalize/globalize#423 bug
162
+ send(:find_by, parent_data[:find_by].to_s => params["#{resource.model_name}_id"])
162
163
  instance_variable_set("@#{resource.model_name}", @parent)
163
164
  else
164
165
  nil
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  module Admin
3
3
  class ReturnAuthorizationsController < ResourceController
4
- belongs_to 'spree/order', :find_by => :number
4
+ belongs_to 'spree/order', find_by: :number
5
5
 
6
6
  before_action :load_form_data, only: [:new, :edit]
7
7
  create.fails :load_form_data
@@ -40,7 +40,7 @@ module Spree
40
40
  end
41
41
 
42
42
  def load_return_authorization_reasons
43
- @reasons = Spree::ReturnAuthorizationReason.active
43
+ @reasons = Spree::ReturnAuthorizationReason.active.to_a
44
44
  # Only allow an inactive reason if it's already associated to the RMA
45
45
  if @return_authorization.reason && !@return_authorization.reason.active?
46
46
  @reasons << @return_authorization.reason
@@ -20,7 +20,7 @@ module Spree
20
20
  @collection = resource.all
21
21
  # @search needs to be defined as this is passed to search_form_for
22
22
  @search = @collection.ransack(params[:q])
23
- per_page = params[:per_page] || Spree::Config[:admin_products_per_page]
23
+ per_page = params[:per_page] || Spree::Config[:admin_customer_returns_per_page]
24
24
  @collection = @search.result.order(created_at: :desc).page(params[:page]).per(per_page)
25
25
  end
26
26
  end
@@ -20,14 +20,14 @@ module Spree
20
20
 
21
21
  def set_shipping_category
22
22
  return true if params["shipping_method"][:shipping_categories] == ""
23
- @shipping_method.shipping_categories = Spree::ShippingCategory.where(:id => params["shipping_method"][:shipping_categories])
23
+ @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params["shipping_method"][:shipping_categories])
24
24
  @shipping_method.save
25
25
  params[:shipping_method].delete(:shipping_categories)
26
26
  end
27
27
 
28
28
  def set_zones
29
29
  return true if params["shipping_method"][:zones] == ""
30
- @shipping_method.zones = Spree::Zone.where(:id => params["shipping_method"][:zones])
30
+ @shipping_method.zones = Spree::Zone.where(id: params["shipping_method"][:zones])
31
31
  @shipping_method.save
32
32
  params[:shipping_method].delete(:zones)
33
33
  end
@@ -4,7 +4,7 @@ module Spree
4
4
  before_action :load_order, only: [:index]
5
5
 
6
6
  def index
7
- @state_changes = @order.state_changes.includes(:user)
7
+ @state_changes = @order.state_changes.includes(:user).order(created_at: :desc)
8
8
  end
9
9
 
10
10
  private
@@ -7,7 +7,7 @@ module Spree
7
7
  def index
8
8
  respond_with(@collection) do |format|
9
9
  format.html
10
- format.js { render :partial => 'state_list' }
10
+ format.js { render partial: 'state_list' }
11
11
  end
12
12
  end
13
13
 
@@ -22,14 +22,14 @@ module Spree
22
22
  flash[:error] = Spree.t(:could_not_create_stock_movement)
23
23
  end
24
24
 
25
- redirect_to :back
25
+ redirect_back fallback_location: spree.stock_admin_product_url(variant.product)
26
26
  end
27
27
 
28
28
  def destroy
29
29
  stock_item.destroy
30
30
 
31
31
  respond_with(@stock_item) do |format|
32
- format.html { redirect_to :back }
32
+ format.html { redirect_back fallback_location: spree.stock_admin_product_url(stock_item.product) }
33
33
  format.js
34
34
  end
35
35
  end
@@ -6,7 +6,7 @@ module Spree
6
6
 
7
7
  def index
8
8
  @stock_movements = stock_location.stock_movements.recent.
9
- includes(:stock_item => { :variant => :product }).
9
+ includes(stock_item: { variant: :product }).
10
10
  page(params[:page])
11
11
  end
12
12
 
@@ -16,13 +16,12 @@ module Spree
16
16
 
17
17
  def create
18
18
  @stock_movement = stock_location.stock_movements.build(stock_movement_params)
19
- @stock_movement.save
20
- flash[:success] = flash_message_for(@stock_movement, :successfully_created)
21
- redirect_to admin_stock_location_stock_movements_path(stock_location)
22
- end
23
-
24
- def edit
25
- @stock_movement = StockMovement.find(params[:id])
19
+ if @stock_movement.save
20
+ flash[:success] = flash_message_for(@stock_movement, :successfully_created)
21
+ redirect_to admin_stock_location_stock_movements_path(stock_location)
22
+ else
23
+ render :new
24
+ end
26
25
  end
27
26
 
28
27
  private
@@ -49,12 +49,13 @@ module Spree
49
49
  ensure_unused_store_credit
50
50
 
51
51
  if @store_credit.destroy
52
+ flash[:success] = flash_message_for(@store_credit, :successfully_removed)
52
53
  respond_with(@store_credit) do |format|
53
54
  format.html { redirect_to admin_user_store_credits_path(@user) }
54
55
  format.js { render_js_for_destroy }
55
56
  end
56
57
  else
57
- render text: Spree.t('store_credit.errors.unable_to_delete'), status: :unprocessable_entity
58
+ render plain: Spree.t('store_credit.errors.unable_to_delete'), status: :unprocessable_entity
58
59
  end
59
60
  end
60
61
 
@@ -4,18 +4,9 @@ module Spree
4
4
 
5
5
  before_action :load_taxonomy, only: [:create, :edit, :update]
6
6
  before_action :load_taxon, only: [:edit, :update]
7
- respond_to :html, :json, :js
7
+ respond_to :html, :js
8
8
 
9
9
  def index
10
-
11
- end
12
-
13
- def search
14
- if params[:ids]
15
- @taxons = Spree::Taxon.where(id: params[:ids].split(','))
16
- else
17
- @taxons = Spree::Taxon.limit(20).ransack(name_cont: params[:q]).result
18
- end
19
10
  end
20
11
 
21
12
  def create
@@ -1,7 +1,7 @@
1
1
  module Spree
2
2
  module Admin
3
3
  class VariantsController < ResourceController
4
- belongs_to 'spree/product', :find_by => :slug
4
+ belongs_to 'spree/product', find_by: :slug
5
5
  new_action.before :new_before
6
6
  before_action :load_data, only: [:new, :create, :edit, :update]
7
7
 
@@ -28,6 +28,7 @@ module Spree
28
28
  @object.attributes = master.attributes.except(
29
29
  'id', 'created_at', 'deleted_at', 'sku', 'is_master'
30
30
  )
31
+
31
32
  # Shallow Clone of the default price to populate the price field.
32
33
  @object.default_price = master.default_price.clone if master.default_price.present?
33
34
  end
@@ -38,6 +39,7 @@ module Spree
38
39
 
39
40
  def collection
40
41
  @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
42
+
41
43
  @collection ||=
42
44
  if @deleted.blank?
43
45
  super.includes(:default_price, option_values: :option_type)
@@ -145,13 +145,8 @@ module Spree
145
145
  end
146
146
 
147
147
  def order_time(time)
148
- [I18n.l(time.to_date), time.strftime("%l:%M %p")].join('')
148
+ [I18n.l(time.to_date), time.strftime("%l:%M %p").strip].join(' ')
149
149
  end
150
-
151
- private
152
- def attribute_name_for(field_name)
153
- field_name.gsub(' ', '_').downcase
154
- end
155
150
  end
156
151
  end
157
152
  end
data/config/routes.rb CHANGED
@@ -181,5 +181,6 @@ Spree::Core::Engine.add_routes do
181
181
  end
182
182
  end
183
183
 
184
- get Spree.admin_path, to: 'admin/root#index', as: :admin
184
+ spree_path = Rails.application.routes.url_helpers.try(:spree_path, trailing_slash: true) || '/'
185
+ get Spree.admin_path, to: redirect((spree_path + Spree.admin_path + '/orders').gsub('//', '/')), as: :admin
185
186
  end
@@ -3,7 +3,7 @@ module Spree
3
3
  class Engine < ::Rails::Engine
4
4
  config.middleware.use "Spree::Backend::Middleware::SeoAssist"
5
5
 
6
- initializer "spree.backend.environment", :before => :load_config_initializers do |app|
6
+ initializer "spree.backend.environment", before: :load_config_initializers do |app|
7
7
  Spree::Backend::Config = Spree::BackendConfiguration.new
8
8
  end
9
9
 
@@ -13,20 +13,16 @@ module Spree
13
13
  end
14
14
 
15
15
  # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
16
- initializer "spree.assets.precompile", :group => :all do |app|
16
+ initializer "spree.assets.precompile", group: :all do |app|
17
17
  app.config.assets.paths << "#{Rails.root}/app/assets/fonts"
18
18
  app.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
19
19
 
20
20
  app.config.assets.precompile += %w[
21
21
  spree/backend/all*
22
- spree/backend/orders/edit_form.js
23
22
  spree/backend/address_states.js
24
- jqPlot/excanvas.min.js
25
- spree/backend/images/new.js
26
23
  jquery.jstree/themes/spree/*
27
24
  fontawesome-webfont*
28
25
  select2_locale*
29
- jquery.alerts/images/*
30
26
  ]
31
27
  end
32
28
  end
@@ -3,7 +3,7 @@ require_relative '../core/lib/spree/core/version.rb'
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.platform = Gem::Platform::RUBY
6
- s.name = 'goca-spree-backend'
6
+ s.name = 'spree_backend'
7
7
  s.version = Spree.version
8
8
  s.summary = 'backend e-commerce functionality for the Spree project.'
9
9
  s.description = 'Required dependency for Spree'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: goca-spree-backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.14.rails.5.0
4
+ version: 3.1.14.rails.5.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-02-05 00:00:00.000000000 Z
11
+ date: 2025-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: goca-spree-api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.1.14.rails.5.0
19
+ version: 3.1.14.rails.5.0.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.1.14.rails.5.0
26
+ version: 3.1.14.rails.5.0.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: goca-spree-core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.1.14.rails.5.0
33
+ version: 3.1.14.rails.5.0.1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.1.14.rails.5.0
40
+ version: 3.1.14.rails.5.0.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement