spree_backend 3.3.0.rc1 → 3.3.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/general_settings.js.coffee +12 -10
- data/app/controllers/spree/admin/orders_controller.rb +3 -4
- data/app/controllers/spree/admin/payments_controller.rb +2 -2
- data/app/controllers/spree/admin/products_controller.rb +3 -3
- data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
- data/app/helpers/spree/admin/base_helper.rb +4 -1
- data/app/helpers/spree/admin/navigation_helper.rb +1 -1
- data/app/views/spree/admin/products/_form.html.erb +8 -8
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +4 -2
- data/app/views/spree/admin/shared/_translations.html.erb +1 -0
- data/spree_backend.gemspec +1 -1
- metadata +7 -98
- data/spec/controllers/spree/admin/base_controller_spec.rb +0 -46
- data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +0 -185
- data/spec/controllers/spree/admin/general_settings_controller_spec.rb +0 -41
- data/spec/controllers/spree/admin/missing_products_controller_spec.rb +0 -18
- data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +0 -199
- data/spec/controllers/spree/admin/orders_controller_spec.rb +0 -296
- data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +0 -64
- data/spec/controllers/spree/admin/payments_controller_spec.rb +0 -97
- data/spec/controllers/spree/admin/products_controller_spec.rb +0 -137
- data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +0 -21
- data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +0 -21
- data/spec/controllers/spree/admin/promotions_controller_spec.rb +0 -44
- data/spec/controllers/spree/admin/refunds_controller_spec.rb +0 -32
- data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +0 -74
- data/spec/controllers/spree/admin/reports_controller_spec.rb +0 -42
- data/spec/controllers/spree/admin/resource_controller_spec.rb +0 -252
- data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +0 -225
- data/spec/controllers/spree/admin/return_index_controller_spec.rb +0 -37
- data/spec/controllers/spree/admin/return_items_controller_spec.rb +0 -27
- data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +0 -14
- data/spec/controllers/spree/admin/stock_items_controller_spec.rb +0 -19
- data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +0 -41
- data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +0 -41
- data/spec/controllers/spree/admin/tax_categories_controller_spec.rb +0 -34
- data/spec/controllers/spree/admin/users_controller_spec.rb +0 -161
- data/spec/controllers/spree/admin/variants_controller_spec.rb +0 -32
- data/spec/features/admin/configuration/analytics_tracker_spec.rb +0 -47
- data/spec/features/admin/configuration/countries_spec.rb +0 -24
- data/spec/features/admin/configuration/general_settings_spec.rb +0 -44
- data/spec/features/admin/configuration/payment_methods_spec.rb +0 -63
- data/spec/features/admin/configuration/roles_spec.rb +0 -47
- data/spec/features/admin/configuration/shipping_methods_spec.rb +0 -62
- data/spec/features/admin/configuration/states_spec.rb +0 -68
- data/spec/features/admin/configuration/stock_locations_spec.rb +0 -48
- data/spec/features/admin/configuration/store_credit_categories_spec.rb +0 -50
- data/spec/features/admin/configuration/tax_categories_spec.rb +0 -56
- data/spec/features/admin/configuration/tax_rates_spec.rb +0 -18
- data/spec/features/admin/configuration/zones_spec.rb +0 -39
- data/spec/features/admin/homepage_spec.rb +0 -89
- data/spec/features/admin/locale_spec.rb +0 -31
- data/spec/features/admin/orders/adjustments_promotions_spec.rb +0 -53
- data/spec/features/admin/orders/adjustments_spec.rb +0 -124
- data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +0 -47
- data/spec/features/admin/orders/customer_details_spec.rb +0 -154
- data/spec/features/admin/orders/line_items_spec.rb +0 -51
- data/spec/features/admin/orders/listing_spec.rb +0 -224
- data/spec/features/admin/orders/log_entries_spec.rb +0 -55
- data/spec/features/admin/orders/new_order_spec.rb +0 -186
- data/spec/features/admin/orders/order_details_spec.rb +0 -660
- data/spec/features/admin/orders/payments_spec.rb +0 -244
- data/spec/features/admin/orders/risk_analysis_spec.rb +0 -48
- data/spec/features/admin/orders/shipments_spec.rb +0 -64
- data/spec/features/admin/orders/state_changes_spec.rb +0 -21
- data/spec/features/admin/products/edit/images_spec.rb +0 -86
- data/spec/features/admin/products/edit/products_spec.rb +0 -56
- data/spec/features/admin/products/edit/taxons_spec.rb +0 -41
- data/spec/features/admin/products/edit/variants_spec.rb +0 -56
- data/spec/features/admin/products/option_types_spec.rb +0 -114
- data/spec/features/admin/products/products_spec.rb +0 -445
- data/spec/features/admin/products/properties_spec.rb +0 -147
- data/spec/features/admin/products/prototypes_spec.rb +0 -112
- data/spec/features/admin/products/stock_management_spec.rb +0 -124
- data/spec/features/admin/products/taxonomies_spec.rb +0 -52
- data/spec/features/admin/products/variant_spec.rb +0 -50
- data/spec/features/admin/promotions/adjustments_spec.rb +0 -258
- data/spec/features/admin/promotions/option_value_rule_spec.rb +0 -70
- data/spec/features/admin/promotions/tiered_calculator_spec.rb +0 -70
- data/spec/features/admin/refund_reasons/refund_reasons_spec.rb +0 -57
- data/spec/features/admin/reimbursement_type/edit_reimbursement_type_spec.rb +0 -36
- data/spec/features/admin/reimbursement_type/new_reimbursement_type_spec.rb +0 -62
- data/spec/features/admin/reports_spec.rb +0 -61
- data/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb +0 -63
- data/spec/features/admin/returns/customer_returns_spec.rb +0 -80
- data/spec/features/admin/returns/return_authorizations_spec.rb +0 -152
- data/spec/features/admin/stock_transfer_spec.rb +0 -91
- data/spec/features/admin/store_credits_spec.rb +0 -93
- data/spec/features/admin/taxons_spec.rb +0 -53
- data/spec/features/admin/users_spec.rb +0 -286
- data/spec/helpers/admin/base_helper_spec.rb +0 -30
- data/spec/helpers/admin/navigation_helper_spec.rb +0 -111
- data/spec/helpers/admin/promotion_rules_helper_spec.rb +0 -12
- data/spec/helpers/admin/stock_movements_helper_spec.rb +0 -30
- data/spec/models/spree/resource_spec.rb +0 -48
- data/spec/routing/admin_path_spec.rb +0 -22
- data/spec/spec_helper.rb +0 -144
- data/spec/support/appear_before_matcher.rb +0 -8
- data/spec/support/ror_ringer.jpeg +0 -0
- data/spec/test_views/spree/admin/submodule/posts/edit.html.erb +0 -1
- data/spec/test_views/spree/admin/submodule/posts/new.html.erb +0 -1
- data/spec/test_views/spree/admin/widgets/edit.html.erb +0 -1
- data/spec/test_views/spree/admin/widgets/new.html.erb +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8f78424a9f9bcb1c433eaea0670f16df7a05662d
|
4
|
+
data.tar.gz: c190d631e58a7fa519aa83b5a1a29265f71635e1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3f9af0667399c780e423efb856a1e6773330efa7d24db2270f4083cc08a5eb6d4903a70c64e67cd3c7832a2769e22d2317d94d9d8924afed180393d3f281f0ea
|
7
|
+
data.tar.gz: dee7bbdbdad0568e465771faa9bc4f80c1944966b18c1d6a3b9089b873b96ca45d7f9762d524f27c67c8be3cb8066006e74acabd266019237d4fb95eb109aed3
|
@@ -1,13 +1,15 @@
|
|
1
1
|
$(@).ready( ->
|
2
2
|
$('[data-hook=general_settings_clear_cache] #clear_cache').click ->
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
3
|
+
response = confirm(Spree.translations.are_you_sure)
|
4
|
+
if response
|
5
|
+
$.ajax
|
6
|
+
type: 'POST'
|
7
|
+
url: Spree.routes.clear_cache
|
8
|
+
success: ->
|
9
|
+
show_flash 'success', "Cache was flushed."
|
10
|
+
error: (msg) ->
|
11
|
+
if msg.responseJSON["error"]
|
12
|
+
show_flash 'error', msg.responseJSON["error"]
|
13
|
+
else
|
14
|
+
show_flash 'error', "There was a problem while flushing cache."
|
13
15
|
)
|
@@ -56,13 +56,12 @@ module Spree
|
|
56
56
|
def edit
|
57
57
|
can_not_transition_without_customer_info
|
58
58
|
|
59
|
-
@order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END)
|
59
|
+
@order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END) unless @order.completed?
|
60
60
|
end
|
61
61
|
|
62
62
|
def cart
|
63
|
-
unless @order.completed?
|
64
|
-
|
65
|
-
end
|
63
|
+
@order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END) unless @order.completed?
|
64
|
+
|
66
65
|
if @order.shipments.shipped.count > 0
|
67
66
|
redirect_to edit_admin_order_url(@order)
|
68
67
|
end
|
@@ -89,11 +89,11 @@ module Spree
|
|
89
89
|
|
90
90
|
def load_data
|
91
91
|
@amount = params[:amount] || load_order.total
|
92
|
-
@payment_methods =
|
92
|
+
@payment_methods = @order.collect_backend_payment_methods
|
93
93
|
if @payment and @payment.payment_method
|
94
94
|
@payment_method = @payment.payment_method
|
95
95
|
else
|
96
|
-
@payment_method = @payment_methods.
|
96
|
+
@payment_method = @payment_methods.find { |payment_method| payment_method.id == params[:payment][:payment_method_id].to_i } if params[:payment]
|
97
97
|
@payment_method ||= @payment_methods.first
|
98
98
|
end
|
99
99
|
end
|
@@ -65,14 +65,14 @@ module Spree
|
|
65
65
|
def clone
|
66
66
|
@new = @product.duplicate
|
67
67
|
|
68
|
-
if @new.
|
68
|
+
if @new.persisted?
|
69
69
|
flash[:success] = Spree.t('notice_messages.product_cloned')
|
70
|
+
redirect_to edit_admin_product_url(@new)
|
70
71
|
else
|
71
72
|
flash[:error] = Spree.t('notice_messages.product_not_cloned')
|
73
|
+
redirect_to admin_products_url
|
72
74
|
end
|
73
75
|
|
74
|
-
redirect_to edit_admin_product_url(@new)
|
75
|
-
|
76
76
|
rescue ActiveRecord::RecordInvalid
|
77
77
|
# Handle error on uniqueness validation on product fields
|
78
78
|
flash[:error] = Spree.t('notice_messages.product_not_cloned')
|
@@ -10,7 +10,7 @@ module Spree
|
|
10
10
|
def fire
|
11
11
|
@return_authorization.send("#{params[:e]}!")
|
12
12
|
flash[:success] = Spree.t(:return_authorization_updated)
|
13
|
-
|
13
|
+
redirect_back fallback_location: spree.edit_admin_order_return_authorization_path(@order, @return_authorization)
|
14
14
|
end
|
15
15
|
|
16
16
|
private
|
@@ -21,7 +21,10 @@ module Spree
|
|
21
21
|
if error_message_on(model, method).present?
|
22
22
|
css_classes << 'withError'
|
23
23
|
end
|
24
|
-
content_tag(
|
24
|
+
content_tag(
|
25
|
+
:div, capture(&block),
|
26
|
+
options.merge(class: css_classes.join(' '), id: "#{model}_#{method}_field")
|
27
|
+
)
|
25
28
|
end
|
26
29
|
|
27
30
|
def error_message_on(object, method, options = {})
|
@@ -167,7 +167,7 @@ module Spree
|
|
167
167
|
icon = content_tag(:span, '', class: "icon icon-#{icon_name}")
|
168
168
|
text.insert(0, icon + ' ')
|
169
169
|
end
|
170
|
-
button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", data
|
170
|
+
button_tag(text.html_safe, options.merge(type: button_type, class: "btn btn-primary #{options[:class]}", 'data-disable-with' => "#{ Spree.t(:saving) }..."))
|
171
171
|
end
|
172
172
|
|
173
173
|
def button_link_to(text, url, html_options = {})
|
@@ -69,6 +69,14 @@
|
|
69
69
|
<% end %>
|
70
70
|
</div>
|
71
71
|
|
72
|
+
<div data-hook="admin_product_form_promotionable">
|
73
|
+
<%= f.field_container :promotionable, class: ['form-group'] do %>
|
74
|
+
<%= f.label :promotionable, Spree.t(:promotionable) %>
|
75
|
+
<%= f.error_message_on :promotionable %>
|
76
|
+
<%= f.check_box :promotionable, class: 'form-control' %>
|
77
|
+
<% end %>
|
78
|
+
</div>
|
79
|
+
|
72
80
|
<% if @product.has_variants? %>
|
73
81
|
<div data-hook="admin_product_form_multiple_variants" class="well">
|
74
82
|
<%= f.label :skus, Spree.t(:sku).pluralize %>
|
@@ -99,14 +107,6 @@
|
|
99
107
|
<% end %>
|
100
108
|
</div>
|
101
109
|
|
102
|
-
<div data-hook="admin_product_form_promotionable">
|
103
|
-
<%= f.field_container :promotionable, class: ['form-group'] do %>
|
104
|
-
<%= f.label :promotionable, Spree.t(:promotionable) %>
|
105
|
-
<%= f.error_message_on :promotionable %>
|
106
|
-
<%= f.check_box :promotionable, class: 'form-control' %>
|
107
|
-
<% end %>
|
108
|
-
</div>
|
109
|
-
|
110
110
|
<div id="shipping_specs" class="row">
|
111
111
|
<div class="col-xs-12 col-md-6">
|
112
112
|
<div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
|
@@ -1,7 +1,9 @@
|
|
1
1
|
<div class="panel-body calculator-fields">
|
2
2
|
<% promotion_action.promotion_action_line_items.each do |item| %>
|
3
|
-
|
4
|
-
|
3
|
+
<% variant = item.variant %>
|
4
|
+
|
5
|
+
<strong><%= item.quantity %> x <%= variant.name %></strong>
|
6
|
+
<%= variant.options_text %>
|
5
7
|
<% end %>
|
6
8
|
|
7
9
|
<% if promotion_action.promotion_action_line_items.empty? %>
|
@@ -2,6 +2,7 @@
|
|
2
2
|
Spree.translations = <%==
|
3
3
|
{ abbr_day_names: I18n.t(:abbr_day_names, scope: :date),
|
4
4
|
add: Spree.t(:add),
|
5
|
+
are_you_sure: Spree.t(:are_you_sure),
|
5
6
|
are_you_sure_delete: Spree.t(:are_you_sure_delete),
|
6
7
|
bill_address: Spree.t(:bill_address),
|
7
8
|
cancel: Spree.t(:cancel, scope: :actions),
|
data/spree_backend.gemspec
CHANGED
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
|
|
15
15
|
s.homepage = 'https://spreecommerce.com'
|
16
16
|
s.license = 'BSD-3-Clause'
|
17
17
|
|
18
|
-
s.files = `git ls-files`.split("\n")
|
18
|
+
s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) }
|
19
19
|
s.require_path = 'lib'
|
20
20
|
s.requirements << 'none'
|
21
21
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_backend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.0.
|
4
|
+
version: 3.3.0.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-07-
|
11
|
+
date: 2017-07-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: spree_api
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.3.0.
|
19
|
+
version: 3.3.0.rc2
|
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.3.0.
|
26
|
+
version: 3.3.0.rc2
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: spree_core
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 3.3.0.
|
33
|
+
version: 3.3.0.rc2
|
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.3.0.
|
40
|
+
version: 3.3.0.rc2
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: bootstrap-sass
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -501,97 +501,6 @@ files:
|
|
501
501
|
- lib/spree/backend/engine.rb
|
502
502
|
- lib/spree_backend.rb
|
503
503
|
- script/rails
|
504
|
-
- spec/controllers/spree/admin/base_controller_spec.rb
|
505
|
-
- spec/controllers/spree/admin/customer_returns_controller_spec.rb
|
506
|
-
- spec/controllers/spree/admin/general_settings_controller_spec.rb
|
507
|
-
- spec/controllers/spree/admin/missing_products_controller_spec.rb
|
508
|
-
- spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
|
509
|
-
- spec/controllers/spree/admin/orders_controller_spec.rb
|
510
|
-
- spec/controllers/spree/admin/payment_methods_controller_spec.rb
|
511
|
-
- spec/controllers/spree/admin/payments_controller_spec.rb
|
512
|
-
- spec/controllers/spree/admin/products_controller_spec.rb
|
513
|
-
- spec/controllers/spree/admin/promotion_actions_controller_spec.rb
|
514
|
-
- spec/controllers/spree/admin/promotion_rules_controller_spec.rb
|
515
|
-
- spec/controllers/spree/admin/promotions_controller_spec.rb
|
516
|
-
- spec/controllers/spree/admin/refunds_controller_spec.rb
|
517
|
-
- spec/controllers/spree/admin/reimbursements_controller_spec.rb
|
518
|
-
- spec/controllers/spree/admin/reports_controller_spec.rb
|
519
|
-
- spec/controllers/spree/admin/resource_controller_spec.rb
|
520
|
-
- spec/controllers/spree/admin/return_authorizations_controller_spec.rb
|
521
|
-
- spec/controllers/spree/admin/return_index_controller_spec.rb
|
522
|
-
- spec/controllers/spree/admin/return_items_controller_spec.rb
|
523
|
-
- spec/controllers/spree/admin/shipping_methods_controller_spec.rb
|
524
|
-
- spec/controllers/spree/admin/stock_items_controller_spec.rb
|
525
|
-
- spec/controllers/spree/admin/stock_locations_controller_spec.rb
|
526
|
-
- spec/controllers/spree/admin/stock_transfers_controller_spec.rb
|
527
|
-
- spec/controllers/spree/admin/tax_categories_controller_spec.rb
|
528
|
-
- spec/controllers/spree/admin/users_controller_spec.rb
|
529
|
-
- spec/controllers/spree/admin/variants_controller_spec.rb
|
530
|
-
- spec/features/admin/configuration/analytics_tracker_spec.rb
|
531
|
-
- spec/features/admin/configuration/countries_spec.rb
|
532
|
-
- spec/features/admin/configuration/general_settings_spec.rb
|
533
|
-
- spec/features/admin/configuration/payment_methods_spec.rb
|
534
|
-
- spec/features/admin/configuration/roles_spec.rb
|
535
|
-
- spec/features/admin/configuration/shipping_methods_spec.rb
|
536
|
-
- spec/features/admin/configuration/states_spec.rb
|
537
|
-
- spec/features/admin/configuration/stock_locations_spec.rb
|
538
|
-
- spec/features/admin/configuration/store_credit_categories_spec.rb
|
539
|
-
- spec/features/admin/configuration/tax_categories_spec.rb
|
540
|
-
- spec/features/admin/configuration/tax_rates_spec.rb
|
541
|
-
- spec/features/admin/configuration/zones_spec.rb
|
542
|
-
- spec/features/admin/homepage_spec.rb
|
543
|
-
- spec/features/admin/locale_spec.rb
|
544
|
-
- spec/features/admin/orders/adjustments_promotions_spec.rb
|
545
|
-
- spec/features/admin/orders/adjustments_spec.rb
|
546
|
-
- spec/features/admin/orders/cancelling_and_resuming_spec.rb
|
547
|
-
- spec/features/admin/orders/customer_details_spec.rb
|
548
|
-
- spec/features/admin/orders/line_items_spec.rb
|
549
|
-
- spec/features/admin/orders/listing_spec.rb
|
550
|
-
- spec/features/admin/orders/log_entries_spec.rb
|
551
|
-
- spec/features/admin/orders/new_order_spec.rb
|
552
|
-
- spec/features/admin/orders/order_details_spec.rb
|
553
|
-
- spec/features/admin/orders/payments_spec.rb
|
554
|
-
- spec/features/admin/orders/risk_analysis_spec.rb
|
555
|
-
- spec/features/admin/orders/shipments_spec.rb
|
556
|
-
- spec/features/admin/orders/state_changes_spec.rb
|
557
|
-
- spec/features/admin/products/edit/images_spec.rb
|
558
|
-
- spec/features/admin/products/edit/products_spec.rb
|
559
|
-
- spec/features/admin/products/edit/taxons_spec.rb
|
560
|
-
- spec/features/admin/products/edit/variants_spec.rb
|
561
|
-
- spec/features/admin/products/option_types_spec.rb
|
562
|
-
- spec/features/admin/products/products_spec.rb
|
563
|
-
- spec/features/admin/products/properties_spec.rb
|
564
|
-
- spec/features/admin/products/prototypes_spec.rb
|
565
|
-
- spec/features/admin/products/stock_management_spec.rb
|
566
|
-
- spec/features/admin/products/taxonomies_spec.rb
|
567
|
-
- spec/features/admin/products/variant_spec.rb
|
568
|
-
- spec/features/admin/promotions/adjustments_spec.rb
|
569
|
-
- spec/features/admin/promotions/option_value_rule_spec.rb
|
570
|
-
- spec/features/admin/promotions/tiered_calculator_spec.rb
|
571
|
-
- spec/features/admin/refund_reasons/refund_reasons_spec.rb
|
572
|
-
- spec/features/admin/reimbursement_type/edit_reimbursement_type_spec.rb
|
573
|
-
- spec/features/admin/reimbursement_type/new_reimbursement_type_spec.rb
|
574
|
-
- spec/features/admin/reports_spec.rb
|
575
|
-
- spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
|
576
|
-
- spec/features/admin/returns/customer_returns_spec.rb
|
577
|
-
- spec/features/admin/returns/return_authorizations_spec.rb
|
578
|
-
- spec/features/admin/stock_transfer_spec.rb
|
579
|
-
- spec/features/admin/store_credits_spec.rb
|
580
|
-
- spec/features/admin/taxons_spec.rb
|
581
|
-
- spec/features/admin/users_spec.rb
|
582
|
-
- spec/helpers/admin/base_helper_spec.rb
|
583
|
-
- spec/helpers/admin/navigation_helper_spec.rb
|
584
|
-
- spec/helpers/admin/promotion_rules_helper_spec.rb
|
585
|
-
- spec/helpers/admin/stock_movements_helper_spec.rb
|
586
|
-
- spec/models/spree/resource_spec.rb
|
587
|
-
- spec/routing/admin_path_spec.rb
|
588
|
-
- spec/spec_helper.rb
|
589
|
-
- spec/support/appear_before_matcher.rb
|
590
|
-
- spec/support/ror_ringer.jpeg
|
591
|
-
- spec/test_views/spree/admin/submodule/posts/edit.html.erb
|
592
|
-
- spec/test_views/spree/admin/submodule/posts/new.html.erb
|
593
|
-
- spec/test_views/spree/admin/widgets/edit.html.erb
|
594
|
-
- spec/test_views/spree/admin/widgets/new.html.erb
|
595
504
|
- spree_backend.gemspec
|
596
505
|
- vendor/assets/javascripts/handlebars.js
|
597
506
|
- vendor/assets/javascripts/jquery.cookie.js
|
@@ -624,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
624
533
|
requirements:
|
625
534
|
- none
|
626
535
|
rubyforge_project:
|
627
|
-
rubygems_version: 2.6.
|
536
|
+
rubygems_version: 2.6.10
|
628
537
|
signing_key:
|
629
538
|
specification_version: 4
|
630
539
|
summary: backend e-commerce functionality for the Spree project.
|
@@ -1,46 +0,0 @@
|
|
1
|
-
# Spree's rpsec controller tests get the Spree::ControllerHacks
|
2
|
-
# we don't need those for the anonymous controller here, so
|
3
|
-
# we call process directly instead of get
|
4
|
-
require 'spec_helper'
|
5
|
-
|
6
|
-
describe Spree::Admin::BaseController, type: :controller do
|
7
|
-
controller(Spree::Admin::BaseController) do
|
8
|
-
def index
|
9
|
-
authorize! :update, Spree::Order
|
10
|
-
render plain: 'test'
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
context "unauthorized request" do
|
15
|
-
before do
|
16
|
-
allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(nil)
|
17
|
-
end
|
18
|
-
|
19
|
-
it "redirects to root" do
|
20
|
-
allow(controller).to receive_message_chain(:spree, :root_path).and_return('/root')
|
21
|
-
get :index
|
22
|
-
expect(response).to redirect_to '/root'
|
23
|
-
end
|
24
|
-
end
|
25
|
-
|
26
|
-
context "#generate_api_key" do
|
27
|
-
let(:user) { mock_model(Spree.user_class, has_spree_role?: true) }
|
28
|
-
|
29
|
-
before do
|
30
|
-
allow(controller).to receive(:authorize_admin) { true }
|
31
|
-
allow(controller).to receive(:try_spree_current_user) { user }
|
32
|
-
end
|
33
|
-
|
34
|
-
it "generates the API key for a user when they visit" do
|
35
|
-
expect(user).to receive(:spree_api_key).and_return(nil)
|
36
|
-
expect(user).to receive(:generate_spree_api_key!)
|
37
|
-
get :index
|
38
|
-
end
|
39
|
-
|
40
|
-
it "does not attempt to regenerate the API key if the key is already set" do
|
41
|
-
expect(user).to receive(:spree_api_key).and_return('fake')
|
42
|
-
expect(user).not_to receive(:generate_spree_api_key!)
|
43
|
-
get :index
|
44
|
-
end
|
45
|
-
end
|
46
|
-
end
|
@@ -1,185 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
module Spree
|
4
|
-
module Admin
|
5
|
-
describe CustomerReturnsController, type: :controller do
|
6
|
-
stub_authorization!
|
7
|
-
|
8
|
-
describe "#index" do
|
9
|
-
let(:order) { customer_return.order }
|
10
|
-
let(:customer_return) { create(:customer_return) }
|
11
|
-
|
12
|
-
subject do
|
13
|
-
spree_get :index, { order_id: customer_return.order.to_param }
|
14
|
-
end
|
15
|
-
|
16
|
-
before { subject }
|
17
|
-
|
18
|
-
it "loads the order" do
|
19
|
-
expect(assigns(:order)).to eq order
|
20
|
-
end
|
21
|
-
|
22
|
-
it "loads the customer return" do
|
23
|
-
expect(assigns(:customer_returns)).to include(customer_return)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
|
27
|
-
describe "#new" do
|
28
|
-
let(:order) { create(:shipped_order, line_items_count: 1) }
|
29
|
-
let!(:rma) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.first)] }
|
30
|
-
let!(:inactive_reimbursement_type) { create(:reimbursement_type, active: false) }
|
31
|
-
let!(:first_active_reimbursement_type) { create(:reimbursement_type) }
|
32
|
-
let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
|
33
|
-
|
34
|
-
subject do
|
35
|
-
spree_get :new, { order_id: order.to_param }
|
36
|
-
end
|
37
|
-
|
38
|
-
it "loads the order" do
|
39
|
-
subject
|
40
|
-
expect(assigns(:order)).to eq order
|
41
|
-
end
|
42
|
-
|
43
|
-
it "creates a new customer return" do
|
44
|
-
subject
|
45
|
-
expect(assigns(:customer_return)).to_not be_persisted
|
46
|
-
end
|
47
|
-
|
48
|
-
context "with previous customer return" do
|
49
|
-
let(:order) { create(:shipped_order, line_items_count: 4) }
|
50
|
-
let(:rma) { create(:return_authorization, order: order) }
|
51
|
-
|
52
|
-
let!(:rma_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.first) }
|
53
|
-
let!(:customer_return_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.last) }
|
54
|
-
|
55
|
-
context "there is a return item associated with an rma but not a customer return" do
|
56
|
-
let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [customer_return_return_item]) }
|
57
|
-
|
58
|
-
before do
|
59
|
-
subject
|
60
|
-
end
|
61
|
-
|
62
|
-
it "loads the persisted rma return items" do
|
63
|
-
expect(assigns(:rma_return_items).all? { |return_item| return_item.persisted? }).to eq true
|
64
|
-
end
|
65
|
-
|
66
|
-
it "has one rma return item" do
|
67
|
-
expect(assigns(:rma_return_items)).to include(rma_return_item)
|
68
|
-
end
|
69
|
-
end
|
70
|
-
end
|
71
|
-
end
|
72
|
-
|
73
|
-
describe "#edit" do
|
74
|
-
let(:order) { customer_return.order }
|
75
|
-
let(:customer_return) { create(:customer_return, line_items_count: 3) }
|
76
|
-
|
77
|
-
let!(:accepted_return_item) { customer_return.return_items.order('id').first.tap(&:accept!) }
|
78
|
-
let!(:rejected_return_item) { customer_return.return_items.order('id').second.tap(&:reject!)}
|
79
|
-
let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
|
80
|
-
|
81
|
-
subject do
|
82
|
-
spree_get :edit, { order_id: order.to_param, id: customer_return.to_param }
|
83
|
-
end
|
84
|
-
|
85
|
-
before do
|
86
|
-
subject
|
87
|
-
end
|
88
|
-
|
89
|
-
it "loads the order" do
|
90
|
-
expect(assigns(:order)).to eq order
|
91
|
-
end
|
92
|
-
|
93
|
-
it "loads the customer return" do
|
94
|
-
expect(assigns(:customer_return)).to eq customer_return
|
95
|
-
end
|
96
|
-
|
97
|
-
it "loads the accepted return items" do
|
98
|
-
expect(assigns(:accepted_return_items)).to eq [accepted_return_item]
|
99
|
-
end
|
100
|
-
|
101
|
-
it "loads the rejected return items" do
|
102
|
-
expect(assigns(:rejected_return_items)).to eq [rejected_return_item]
|
103
|
-
end
|
104
|
-
|
105
|
-
it "loads the return items that require manual intervention" do
|
106
|
-
expect(assigns(:manual_intervention_return_items)).to eq [manual_intervention_return_item]
|
107
|
-
end
|
108
|
-
|
109
|
-
it "loads the return items that are still pending" do
|
110
|
-
expect(assigns(:pending_return_items)).to eq []
|
111
|
-
end
|
112
|
-
|
113
|
-
it "loads the reimbursements that are still pending" do
|
114
|
-
expect(assigns(:pending_reimbursements)).to eq []
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
|
-
describe "#create" do
|
119
|
-
let(:order) { create(:shipped_order, line_items_count: 1) }
|
120
|
-
let!(:return_authorization) { create :return_authorization, order: order, return_items: [create(:return_item, inventory_unit: order.inventory_units.shipped.last)] }
|
121
|
-
|
122
|
-
subject do
|
123
|
-
spree_post :create, customer_return_params
|
124
|
-
end
|
125
|
-
|
126
|
-
context "valid customer return" do
|
127
|
-
let(:stock_location) { order.shipments.last.stock_location }
|
128
|
-
|
129
|
-
let!(:customer_return_params) do
|
130
|
-
{
|
131
|
-
order_id: order.to_param,
|
132
|
-
customer_return: {
|
133
|
-
stock_location_id: stock_location.id,
|
134
|
-
return_items_attributes: {
|
135
|
-
"0" => {
|
136
|
-
id: return_authorization.return_items.first.id,
|
137
|
-
returned: "1",
|
138
|
-
"pre_tax_amount"=>"15.99",
|
139
|
-
inventory_unit_id: order.inventory_units.shipped.last.id
|
140
|
-
}
|
141
|
-
}
|
142
|
-
}
|
143
|
-
}
|
144
|
-
end
|
145
|
-
|
146
|
-
it "creates a customer return" do
|
147
|
-
expect{ subject }.to change { Spree::CustomerReturn.count }.by(1)
|
148
|
-
end
|
149
|
-
|
150
|
-
it "redirects to the index page" do
|
151
|
-
subject
|
152
|
-
expect(response).to redirect_to(spree.edit_admin_order_customer_return_path(order, assigns(:customer_return)))
|
153
|
-
end
|
154
|
-
end
|
155
|
-
|
156
|
-
context "invalid customer return" do
|
157
|
-
let!(:customer_return_params) do
|
158
|
-
{
|
159
|
-
order_id: order.to_param,
|
160
|
-
customer_return: {
|
161
|
-
stock_location_id: "",
|
162
|
-
return_items_attributes: {
|
163
|
-
"0" => {
|
164
|
-
returned: "1",
|
165
|
-
"pre_tax_amount"=>"15.99",
|
166
|
-
inventory_unit_id: order.inventory_units.shipped.last.id
|
167
|
-
}
|
168
|
-
}
|
169
|
-
}
|
170
|
-
}
|
171
|
-
end
|
172
|
-
|
173
|
-
it "doesn't create a customer return" do
|
174
|
-
expect{ subject }.to_not change { Spree::CustomerReturn.count }
|
175
|
-
end
|
176
|
-
|
177
|
-
it "renders the new page" do
|
178
|
-
subject
|
179
|
-
expect(response).to render_template(:new)
|
180
|
-
end
|
181
|
-
end
|
182
|
-
end
|
183
|
-
end
|
184
|
-
end
|
185
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe Spree::Admin::GeneralSettingsController, type: :controller do
|
4
|
-
let(:user) { create(:user) }
|
5
|
-
|
6
|
-
before do
|
7
|
-
allow(controller).to receive_messages spree_current_user: user
|
8
|
-
user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
|
9
|
-
end
|
10
|
-
|
11
|
-
describe '#clear_cache' do
|
12
|
-
subject { spree_post :clear_cache }
|
13
|
-
|
14
|
-
shared_examples 'a HTTP 204 response' do
|
15
|
-
it 'grant access to users with an admin role' do
|
16
|
-
subject
|
17
|
-
expect(response.status).to eq(204)
|
18
|
-
end
|
19
|
-
end
|
20
|
-
|
21
|
-
context 'when no callback' do
|
22
|
-
it_behaves_like 'a HTTP 204 response'
|
23
|
-
end
|
24
|
-
|
25
|
-
context 'when callback implemented' do
|
26
|
-
Spree::Admin::GeneralSettingsController.class_eval do
|
27
|
-
custom_callback(:clear_cache).after :foo
|
28
|
-
|
29
|
-
def foo
|
30
|
-
# Make a call to Akamai, CloudFlare, etc invalidation....
|
31
|
-
end
|
32
|
-
end
|
33
|
-
|
34
|
-
before do
|
35
|
-
expect(controller).to receive(:foo).once
|
36
|
-
end
|
37
|
-
|
38
|
-
it_behaves_like 'a HTTP 204 response'
|
39
|
-
end
|
40
|
-
end
|
41
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
# This test exists in this file because in the standard admin/products_controller spec
|
3
|
-
# There is the stub_authorization call. This call is not triggered for this test because
|
4
|
-
# the load_resource filter in Spree::Admin::ResourceController is prepended to the filter chain
|
5
|
-
# this means this call is triggered before the authorize_admin call and in this case
|
6
|
-
# the load_resource filter halts the request meaning authorize_admin is not called at all.
|
7
|
-
describe Spree::Admin::ProductsController, type: :controller do
|
8
|
-
stub_authorization!
|
9
|
-
|
10
|
-
# Regression test for GH #538
|
11
|
-
it "cannot find a non-existent product" do
|
12
|
-
spree_get :edit, id: "non-existent-product"
|
13
|
-
expect(response).to redirect_to(spree.admin_products_path)
|
14
|
-
expect(flash[:error]).to eql("Product is not found")
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
|