spree_backend 3.3.0.rc2 → 3.3.0.rc3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/spree/backend/components/_labels.scss +1 -0
- data/app/controllers/spree/admin/payments_controller.rb +1 -1
- data/app/controllers/spree/admin/state_changes_controller.rb +1 -1
- data/app/controllers/spree/admin/store_credits_controller.rb +1 -1
- data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb +19 -0
- data/app/views/spree/admin/promotions/rules/_first_order.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb +0 -0
- data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb +1 -1
- data/app/views/spree/admin/trackers/_form.html.erb +15 -8
- data/app/views/spree/admin/trackers/index.html.erb +2 -0
- data/spree_backend.gemspec +1 -1
- metadata +12 -9
- data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +0 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c66cca5bda36fa73f859fd3d8fdafc0c6e06b95d
|
|
4
|
+
data.tar.gz: f3f65f7e81fea0575ee31b196cf40dc57bd22efb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bf2227704d8bfbe822faa9b0fa6dad95c0501ba90eaac53b088b66ed167a724369bc3f5b707484dfaafe9385fa4f059e20af71f9a02c762adee5ada80f356485
|
|
7
|
+
data.tar.gz: d1aa7ef46bf241efce65841a51d67ba3e6d9781e9cf942d5f29c11550d6822d1f0de21c0faab250dfd432e84b16fbd15c844a3e95d07b25b271aa61d6f8e1e13
|
|
@@ -31,7 +31,7 @@ module Spree
|
|
|
31
31
|
else
|
|
32
32
|
@payment ||= @order.payments.build(object_params)
|
|
33
33
|
if @payment.payment_method.source_required? && params[:card].present? && params[:card] != 'new'
|
|
34
|
-
@payment.source = @payment.payment_method.payment_source_class.
|
|
34
|
+
@payment.source = @payment.payment_method.payment_source_class.find_by(id: params[:card])
|
|
35
35
|
end
|
|
36
36
|
@payment.save
|
|
37
37
|
payments = [@payment]
|
|
@@ -82,7 +82,7 @@ module Spree
|
|
|
82
82
|
end
|
|
83
83
|
|
|
84
84
|
def load_store_credit
|
|
85
|
-
@store_credit = Spree::StoreCredit.
|
|
85
|
+
@store_credit = Spree::StoreCredit.find_by(id: params[:id]) || Spree::StoreCredit.new
|
|
86
86
|
end
|
|
87
87
|
|
|
88
88
|
def ensure_unused_store_credit
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
<script type='text/template' id='customer_autocomplete_template'>
|
|
2
|
+
<div class='customer-autocomplete-item'>
|
|
3
|
+
<div class='customer-details'>
|
|
4
|
+
<h5>{{customer.email}}</h5>
|
|
5
|
+
{{#if bill_address.firstname }}
|
|
6
|
+
<strong>{{t 'bill_address' }}</strong>
|
|
7
|
+
{{bill_address.firstname}} {{bill_address.lastname}}<br>
|
|
8
|
+
{{bill_address.address1}}, {{bill_address.address2}}<br>
|
|
9
|
+
{{bill_address.city}}<br>
|
|
10
|
+
{{#if bill_address.state_id }}
|
|
11
|
+
{{bill_address.state.name}}
|
|
12
|
+
{{else}}
|
|
13
|
+
{{bill_address.state_name}}
|
|
14
|
+
{{/if}}
|
|
15
|
+
{{bill_address.country.name}}
|
|
16
|
+
{{/if}}
|
|
17
|
+
</div>
|
|
18
|
+
</div>
|
|
19
|
+
</script>
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
|
|
6
6
|
<%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
|
|
7
7
|
|
|
8
|
-
<% if country = Spree::Country.
|
|
8
|
+
<% if country = Spree::Country.find_by(id: Spree::Config[:default_country_id]) || Spree::Country.first %>
|
|
9
9
|
<%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
|
|
10
10
|
<% end %>
|
|
11
11
|
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<div data-hook="admin_tracker_form_fields" class="row">
|
|
2
|
-
<div class="col-xs-12 col-md-4" data-hook="
|
|
3
|
-
<%= f.field_container :
|
|
4
|
-
<%= f.label :
|
|
5
|
-
<%= f.
|
|
6
|
-
<%= f.error_message_on :
|
|
2
|
+
<div class="col-xs-12 col-md-4" data-hook="analytics_engine">
|
|
3
|
+
<%= f.field_container :engine, class: ["form-group"], "data-hook" => "analytics_engine" do %>
|
|
4
|
+
<%= f.label :engine, Spree.t(:analytics_engine) %>
|
|
5
|
+
<%= f.select :engine, Spree::Tracker.engines.keys.sort.map { |k| [k.humanize, k] }, {}, { class: 'select2' } %>
|
|
6
|
+
<%= f.error_message_on :engine %>
|
|
7
7
|
<% end %>
|
|
8
8
|
</div>
|
|
9
|
-
<div class="col-xs-12 col-md-
|
|
9
|
+
<div class="col-xs-12 col-md-8">
|
|
10
10
|
<div data-hook="active" class="form-group">
|
|
11
11
|
<%= label_tag nil, Spree.t(:active) %>
|
|
12
12
|
<div class="radio">
|
|
@@ -23,7 +23,14 @@
|
|
|
23
23
|
</div>
|
|
24
24
|
</div>
|
|
25
25
|
</div>
|
|
26
|
-
|
|
26
|
+
<div class="col-xs-12 col-md-4" data-hook="analytics_id">
|
|
27
|
+
<%= f.field_container :analytics_id, class: ["form-group"], "data-hook" => "analytics_id" do %>
|
|
28
|
+
<%= f.label :analytics_id, Spree.t(:google_analytics_id) %>
|
|
29
|
+
<%= f.text_field :analytics_id, class: 'form-control' %>
|
|
30
|
+
<%= f.error_message_on :analytics_id %>
|
|
31
|
+
<% end %>
|
|
32
|
+
</div>
|
|
27
33
|
<div data-hook="additional_tracker_fields"></div>
|
|
28
|
-
|
|
34
|
+
</div>
|
|
35
|
+
<div data-hook="admin_tracker_form_fields" class="row">
|
|
29
36
|
</div>
|
|
@@ -17,6 +17,7 @@
|
|
|
17
17
|
<thead>
|
|
18
18
|
<tr data-hook="admin_trackers_index_headers">
|
|
19
19
|
<th><%= Spree.t(:google_analytics_id) %></th>
|
|
20
|
+
<th><%= Spree.t(:analytics_engine) %></th>
|
|
20
21
|
<th class="text-center"><%= Spree.t(:active) %></th>
|
|
21
22
|
<th class="actions"></th>
|
|
22
23
|
</tr>
|
|
@@ -25,6 +26,7 @@
|
|
|
25
26
|
<% @trackers.each do |tracker|%>
|
|
26
27
|
<tr id="<%= spree_dom_id tracker %>" data-hook="admin_trackers_index_rows">
|
|
27
28
|
<td><%= tracker.analytics_id %></td>
|
|
29
|
+
<td><%= tracker.engine.humanize %></td>
|
|
28
30
|
<td class="text-center"><%= tracker.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
|
|
29
31
|
<td class="actions text-right">
|
|
30
32
|
<%= link_to_edit(tracker, no_text: true) if can? :edit, tracker %>
|
data/spree_backend.gemspec
CHANGED
|
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
|
|
|
23
23
|
s.add_dependency 'spree_core', s.version
|
|
24
24
|
|
|
25
25
|
s.add_dependency 'bootstrap-sass', '~> 3.3'
|
|
26
|
-
s.add_dependency 'jquery-rails', '~> 4.
|
|
26
|
+
s.add_dependency 'jquery-rails', '~> 4.3'
|
|
27
27
|
s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
|
|
28
28
|
s.add_dependency 'select2-rails', '3.5.9.1' # 3.5.9.2 breaks several specs
|
|
29
29
|
end
|
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.rc3
|
|
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-
|
|
11
|
+
date: 2017-08-03 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.rc3
|
|
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.rc3
|
|
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.rc3
|
|
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.rc3
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: bootstrap-sass
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -58,14 +58,14 @@ dependencies:
|
|
|
58
58
|
requirements:
|
|
59
59
|
- - "~>"
|
|
60
60
|
- !ruby/object:Gem::Version
|
|
61
|
-
version: '4.
|
|
61
|
+
version: '4.3'
|
|
62
62
|
type: :runtime
|
|
63
63
|
prerelease: false
|
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
65
65
|
requirements:
|
|
66
66
|
- - "~>"
|
|
67
67
|
- !ruby/object:Gem::Version
|
|
68
|
-
version: '4.
|
|
68
|
+
version: '4.3'
|
|
69
69
|
- !ruby/object:Gem::Dependency
|
|
70
70
|
name: jquery-ui-rails
|
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -278,6 +278,7 @@ files:
|
|
|
278
278
|
- app/views/spree/admin/orders/_shipment.html.erb
|
|
279
279
|
- app/views/spree/admin/orders/_shipment_manifest.html.erb
|
|
280
280
|
- app/views/spree/admin/orders/cart.html.erb
|
|
281
|
+
- app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
|
|
281
282
|
- app/views/spree/admin/orders/customer_details/_form.html.erb
|
|
282
283
|
- app/views/spree/admin/orders/customer_details/edit.html.erb
|
|
283
284
|
- app/views/spree/admin/orders/edit.html.erb
|
|
@@ -331,12 +332,14 @@ files:
|
|
|
331
332
|
- app/views/spree/admin/promotions/index.html.erb
|
|
332
333
|
- app/views/spree/admin/promotions/new.html.erb
|
|
333
334
|
- app/views/spree/admin/promotions/rules/_country.html.erb
|
|
335
|
+
- app/views/spree/admin/promotions/rules/_first_order.html.erb
|
|
334
336
|
- app/views/spree/admin/promotions/rules/_item_total.html.erb
|
|
335
|
-
- app/views/spree/admin/promotions/rules/
|
|
337
|
+
- app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
|
|
336
338
|
- app/views/spree/admin/promotions/rules/_option_value.html.erb
|
|
337
339
|
- app/views/spree/admin/promotions/rules/_product.html.erb
|
|
338
340
|
- app/views/spree/admin/promotions/rules/_taxon.html.erb
|
|
339
341
|
- app/views/spree/admin/promotions/rules/_user.html.erb
|
|
342
|
+
- app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
|
|
340
343
|
- app/views/spree/admin/properties/_form.html.erb
|
|
341
344
|
- app/views/spree/admin/properties/edit.html.erb
|
|
342
345
|
- app/views/spree/admin/properties/index.html.erb
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
<div class="panel-body">
|
|
2
|
-
<div class="form-group">
|
|
3
|
-
<label for="<%= "#{param_prefix}_preferred_path" %>"><%= Spree.t('promotion_rule_types.landing_page.description') %>:</label>
|
|
4
|
-
<%= text_field_tag "#{param_prefix}[preferred_path]", promotion_rule.preferred_path, class: 'form-control' %>
|
|
5
|
-
<p class="help-block">
|
|
6
|
-
<%= Spree.t('landing_page_rule.must_have_visited_path') %>
|
|
7
|
-
</p>
|
|
8
|
-
</div>
|
|
9
|
-
</div>
|