spree_backend 3.0.0 → 3.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.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/{admin.js.erb → admin.js} +18 -8
- data/app/assets/javascripts/spree/backend/{line_items_on_order_edit.js.erb → line_items_on_order_edit.js} +0 -0
- data/app/assets/javascripts/spree/backend/{option_type_autocomplete.js.erb → option_type_autocomplete.js} +0 -0
- data/app/assets/javascripts/spree/backend/product_picker.js +2 -1
- data/app/assets/javascripts/spree/backend/{spree-select2.js.erb → spree-select2.js} +1 -1
- data/app/assets/javascripts/spree/backend/{taxon_autocomplete.js.erb → taxon_autocomplete.js} +0 -0
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +2 -0
- data/app/assets/javascripts/spree/backend/{variant_autocomplete.js.coffee.erb → variant_autocomplete.js.coffee} +1 -0
- data/app/assets/javascripts/spree/backend/variant_management.js.coffee +3 -2
- data/app/assets/stylesheets/spree/backend/components/_filters.scss +2 -1
- data/app/assets/stylesheets/spree/backend/components/_main.scss +5 -0
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +5 -0
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +5 -3
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +9 -0
- data/app/controllers/spree/admin/option_types_controller.rb +1 -1
- data/app/controllers/spree/admin/orders_controller.rb +1 -0
- data/app/controllers/spree/admin/resource_controller.rb +6 -2
- data/app/controllers/spree/admin/users_controller.rb +1 -1
- data/app/controllers/spree/admin/variants_including_master_controller.rb +1 -0
- data/app/models/spree/admin/resource.rb +3 -1
- data/app/views/spree/admin/orders/index.html.erb +4 -4
- data/app/views/spree/admin/products/_add_stock_form.html.erb +1 -1
- data/app/views/spree/admin/products/stock.html.erb +4 -4
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +3 -3
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +2 -2
- data/app/views/spree/admin/shared/_header.html.erb +5 -1
- data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
- data/app/views/spree/admin/shared/_table_filter.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +1 -1
- data/app/views/spree/admin/variants/update.js.erb +1 -0
- data/app/views/spree/layouts/admin.html.erb +1 -1
- data/config/routes.rb +0 -1
- metadata +13 -15
- data/app/assets/javascripts/spree/backend/index.html +0 -15
- data/app/views/spree/admin/promotions/actions/_free_shipping.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_first_order.html.erb +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cdfac6051814d68e688db97aee16d9fee95fa568
|
4
|
+
data.tar.gz: 9878011e20e5a5c4274c744ce4dc10c6f9295338
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1523dc6e9d0b7bb472e6db23b6bd2f4b31893637f1fd32d6751ad98d1b65eabfea7deb323b4398c50222c52f97cb510ee535e30043f43b39a228569a64060fdf
|
7
|
+
data.tar.gz: 02adcd5eee07a05a02c136938c8c9fe802430e5fcdf9c8cbcbe0ac5b7d6a3d9b6ade195428de5cc570954b74e3284b929f1e1460e8a371f8dc61de831481dc58
|
@@ -128,14 +128,24 @@ jQuery(function($) {
|
|
128
128
|
$("#table-filter form").submit();
|
129
129
|
});
|
130
130
|
|
131
|
-
$(".js-filterable").each(function(){
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
var
|
136
|
-
|
137
|
-
$("
|
138
|
-
|
131
|
+
$(".js-filterable").each(function() {
|
132
|
+
var $this = $(this);
|
133
|
+
|
134
|
+
if ($this.val()) {
|
135
|
+
var ransack_value, filter;
|
136
|
+
var ransack_field = $this.attr("id");
|
137
|
+
var label = $('label[for="' + ransack_field + '"]');
|
138
|
+
|
139
|
+
if ($this.is("select")) {
|
140
|
+
ransack_value = $this.find('option:selected').text();
|
141
|
+
} else {
|
142
|
+
ransack_value = $this.val();
|
143
|
+
}
|
144
|
+
|
145
|
+
label = label.text() + ': ' + ransack_value;
|
146
|
+
filter = '<span class="js-filter label label-default" data-ransack-field="' + ransack_field + '">' + label + '<span class="icon icon-delete js-delete-filter"></span></span>';
|
147
|
+
|
148
|
+
$(".js-filters").append(filter).show();
|
139
149
|
}
|
140
150
|
});
|
141
151
|
|
File without changes
|
File without changes
|
@@ -10,7 +10,8 @@ $.fn.productAutocomplete = function (options) {
|
|
10
10
|
multiple: multiple,
|
11
11
|
initSelection: function (element, callback) {
|
12
12
|
$.get(Spree.routes.product_search, {
|
13
|
-
ids: element.val().split(',')
|
13
|
+
ids: element.val().split(','),
|
14
|
+
token: Spree.api_key
|
14
15
|
}, function (data) {
|
15
16
|
callback(multiple ? data.products : data.products[0]);
|
16
17
|
});
|
data/app/assets/javascripts/spree/backend/{taxon_autocomplete.js.erb → taxon_autocomplete.js}
RENAMED
File without changes
|
@@ -9,6 +9,7 @@ $(document).ready ->
|
|
9
9
|
method: 'PUT',
|
10
10
|
dataType:'json',
|
11
11
|
data:
|
12
|
+
token: Spree.api_key,
|
12
13
|
product_id: ui.item.data('product-id'),
|
13
14
|
taxon_id: $('#taxon_id').val(),
|
14
15
|
position: ui.item.index()
|
@@ -23,6 +24,7 @@ $(document).ready ->
|
|
23
24
|
data: (term, page) ->
|
24
25
|
per_page: 50,
|
25
26
|
page: page,
|
27
|
+
without_children: true,
|
26
28
|
token: Spree.api_key,
|
27
29
|
q:
|
28
30
|
name_cont: term
|
@@ -1,9 +1,10 @@
|
|
1
1
|
jQuery ->
|
2
2
|
$('.track_inventory_checkbox').on 'click', ->
|
3
|
-
$(
|
3
|
+
$(this).siblings('.variant_track_inventory').val($(this).is(':checked'))
|
4
|
+
$(this).parents('form').submit()
|
4
5
|
$('.toggle_variant_track_inventory').on 'submit', ->
|
5
6
|
$.ajax
|
6
7
|
type: @method
|
7
8
|
url: @action
|
8
|
-
data: $(
|
9
|
+
data: $(this).serialize()
|
9
10
|
false
|
@@ -36,12 +36,17 @@ table.table {
|
|
36
36
|
.table-active-filters {
|
37
37
|
display: none;
|
38
38
|
margin: -0.5em 0 0.9em 0;
|
39
|
+
|
39
40
|
.label {
|
41
|
+
display: inline-block;
|
40
42
|
margin-right: 0.5em;
|
43
|
+
margin-bottom: 0.5em;
|
41
44
|
font-size: 85%;
|
45
|
+
|
42
46
|
&:hover {
|
43
47
|
opacity: 0.8;
|
44
48
|
}
|
49
|
+
|
45
50
|
span.icon {
|
46
51
|
margin: 0.3em 0 0 0.6em;
|
47
52
|
font-size: 80%;
|
@@ -10,6 +10,8 @@ body {
|
|
10
10
|
display: none;
|
11
11
|
}
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
}
|
13
|
+
// No-margin and no-padding helper classes
|
14
|
+
@each $side in top bottom left right {
|
15
|
+
.no-margin-#{$side} { margin-#{side}: 0; }
|
16
|
+
.no-padding-#{$side} { padding-#{side}: 0; }
|
17
|
+
}
|
@@ -11,6 +11,7 @@ module Spree
|
|
11
11
|
params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
|
12
12
|
@show_only_completed = params[:q][:completed_at_not_null] == '1'
|
13
13
|
params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
|
14
|
+
params[:q][:completed_at_not_null] = '' unless @show_only_completed
|
14
15
|
|
15
16
|
# As date params are deleted if @show_only_completed, store
|
16
17
|
# the original date so we can restore them into the params
|
@@ -33,7 +33,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
|
|
33
33
|
flash[:success] = flash_message_for(@object, :successfully_updated)
|
34
34
|
respond_with(@object) do |format|
|
35
35
|
format.html { redirect_to location_after_save }
|
36
|
-
format.js
|
36
|
+
format.js { render layout: false }
|
37
37
|
end
|
38
38
|
else
|
39
39
|
invoke_callbacks(:update, :fails)
|
@@ -125,7 +125,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
|
|
125
125
|
if parent_data
|
126
126
|
parent_model_name = parent_data[:model_name]
|
127
127
|
end
|
128
|
-
@resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name
|
128
|
+
@resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name, object_name
|
129
129
|
end
|
130
130
|
|
131
131
|
def load_resource
|
@@ -240,6 +240,10 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
|
|
240
240
|
end
|
241
241
|
end
|
242
242
|
|
243
|
+
# This method should be overridden when object_name does not match the controller name
|
244
|
+
def object_name
|
245
|
+
end
|
246
|
+
|
243
247
|
# Allow all attributes to be updatable.
|
244
248
|
#
|
245
249
|
# Other controllers can, should, override it to set custom logic
|
@@ -1,10 +1,11 @@
|
|
1
1
|
module Spree
|
2
2
|
module Admin
|
3
3
|
class Resource
|
4
|
-
def initialize(controller_path, controller_name, parent_model)
|
4
|
+
def initialize(controller_path, controller_name, parent_model, object_name = nil)
|
5
5
|
@controller_path = controller_path
|
6
6
|
@controller_name = controller_name
|
7
7
|
@parent_model = parent_model
|
8
|
+
@object_name = object_name
|
8
9
|
end
|
9
10
|
|
10
11
|
def sub_namespace_parts
|
@@ -24,6 +25,7 @@ module Spree
|
|
24
25
|
end
|
25
26
|
|
26
27
|
def object_name
|
28
|
+
return @object_name if @object_name
|
27
29
|
sub_namespace = sub_namespace_parts.join('_')
|
28
30
|
sub_namespace = "#{sub_namespace}_" if sub_namespace.length > 0
|
29
31
|
"#{sub_namespace}#{@controller_name.singularize}"
|
@@ -50,21 +50,21 @@
|
|
50
50
|
<div class="col-md-4">
|
51
51
|
<div class="form-group">
|
52
52
|
<%= label_tag :q_state_eq, Spree.t(:status) %>
|
53
|
-
<%= f.select :state_eq, Spree::Order.state_machines[:state].states.
|
53
|
+
<%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
|
54
54
|
</div>
|
55
55
|
</div>
|
56
56
|
|
57
57
|
<div class="col-md-4">
|
58
58
|
<div class="form-group">
|
59
59
|
<%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
|
60
|
-
<%= f.
|
60
|
+
<%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
|
61
61
|
</div>
|
62
62
|
</div>
|
63
63
|
|
64
64
|
<div class="col-md-4">
|
65
65
|
<div class="form-group">
|
66
66
|
<%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
|
67
|
-
<%= f.
|
67
|
+
<%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, {:include_blank => true}, :class => 'select2 js-filterable' %>
|
68
68
|
</div>
|
69
69
|
</div>
|
70
70
|
|
@@ -100,7 +100,7 @@
|
|
100
100
|
<div class="col-md-4">
|
101
101
|
<div class="form-group">
|
102
102
|
<%= label_tag :q_line_items_variant_id_in, Spree.t(:sku) %>
|
103
|
-
<%= f.select :line_items_variant_id_in, Spree::Variant.pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
|
103
|
+
<%= f.select :line_items_variant_id_in, Spree::Variant.having_orders.order(:sku).pluck(:sku, :id), {:include_blank => true}, :class => 'select2' %>
|
104
104
|
</div>
|
105
105
|
</div>
|
106
106
|
|
@@ -26,17 +26,17 @@
|
|
26
26
|
</td>
|
27
27
|
<td>
|
28
28
|
<%= variant.sku_and_options_text %>
|
29
|
-
<%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :
|
29
|
+
<%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
|
30
30
|
<div class="checkbox">
|
31
31
|
<%= label_tag :track_inventory do %>
|
32
32
|
<%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
|
33
33
|
class: 'track_inventory_checkbox' %>
|
34
34
|
<%= Spree.t(:track_inventory) %>
|
35
|
+
<%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
|
36
|
+
class: 'variant_track_inventory',
|
37
|
+
id: "variant_track_inventory_#{variant.id}" %>
|
35
38
|
<% end %>
|
36
39
|
</div>
|
37
|
-
<%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
|
38
|
-
class: 'variant_track_inventory',
|
39
|
-
id: "variant_track_inventory_#{variant.id}" %>
|
40
40
|
<% end if can?(:update, @product) && can?(:update, variant) %>
|
41
41
|
</td>
|
42
42
|
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %> panel panel-default" id="<%= dom_id promotion_action %>">
|
2
2
|
<% type_name = promotion_action.class.name.demodulize.underscore %>
|
3
3
|
<div class="panel-heading">
|
4
|
-
<%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :
|
4
|
+
<%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete pull-right' %>
|
5
5
|
<h3 class="panel-title promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
|
6
6
|
</div>
|
7
7
|
<% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
|
8
8
|
<%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
|
9
9
|
|
10
|
-
<%= render :
|
11
|
-
:
|
10
|
+
<%= render partial: "spree/admin/promotions/actions/#{type_name}",
|
11
|
+
locals: { promotion_action: promotion_action, param_prefix: param_prefix } rescue nil %>
|
12
12
|
</div>
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<div class="promotion_rule promotion-block panel panel-default" id="<%= dom_id promotion_rule %>">
|
2
2
|
<% type_name = promotion_rule.class.name.demodulize.underscore %>
|
3
3
|
<div class="panel-heading">
|
4
|
-
<%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :
|
4
|
+
<%= link_to_with_icon 'delete', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), remote: true, method: :delete, class: 'delete pull-right' %>
|
5
5
|
<h3 class='panel-title promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h3>
|
6
6
|
</div>
|
7
7
|
<% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
|
8
8
|
<%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
|
9
9
|
|
10
|
-
<%= render :
|
10
|
+
<%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } rescue nil %>
|
11
11
|
</div>
|
@@ -6,7 +6,11 @@
|
|
6
6
|
<div class="container-fluid">
|
7
7
|
<div class="row">
|
8
8
|
<div class="navbar-header col-sm-3 col-md-2">
|
9
|
-
<%= link_to
|
9
|
+
<%= link_to(
|
10
|
+
image_tag(Spree::Config[:admin_interface_logo], id: 'logo'),
|
11
|
+
spree.admin_path,
|
12
|
+
class: "logo navbar-brand"
|
13
|
+
) %>
|
10
14
|
<% if admin %>
|
11
15
|
<span class="navbar-toggle" id="sidebar-toggle">
|
12
16
|
<span class="icon-bar"></span>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
<% refunds.each do |refund| %>
|
17
17
|
<tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
|
18
18
|
<td><%= pretty_time(refund.created_at) %></td>
|
19
|
-
<td><%= refund.payment.
|
19
|
+
<td><%= refund.payment.number %></td>
|
20
20
|
<td class="amount"><%= refund.display_amount %></td>
|
21
21
|
<td><%= payment_method_name(refund.payment) %></td>
|
22
22
|
<td><%= refund.transaction_id %></td>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<div class="row no-marginb">
|
15
15
|
<div class="col-md-4">
|
16
16
|
<div class="form-group">
|
17
|
-
<%= f.label :reference_cont, Spree.t(:
|
17
|
+
<%= f.label :reference_cont, Spree.t(:reference_contains) %>
|
18
18
|
<%= f.text_field :reference_cont, class: 'form-control' %>
|
19
19
|
</div>
|
20
20
|
</div>
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= @object.as_json %>
|
@@ -30,7 +30,7 @@
|
|
30
30
|
<%#-------------------------------------------------%>
|
31
31
|
<%# Sidebar %>
|
32
32
|
<%#-------------------------------------------------%>
|
33
|
-
<div class="col-sm-3 col-md-2 hidden-xs sidebar" id="main-sidebar">
|
33
|
+
<div class="col-sm-3 col-md-2 hidden-xs sidebar" id="main-sidebar" data-hook="admin_tabs">
|
34
34
|
<%= render partial: 'spree/admin/shared/main_menu' %>
|
35
35
|
</div>
|
36
36
|
|
data/config/routes.rb
CHANGED
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.0.
|
4
|
+
version: 3.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: 2015-
|
11
|
+
date: 2015-05-05 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.0.
|
19
|
+
version: 3.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.0.
|
26
|
+
version: 3.0.1
|
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.0.
|
33
|
+
version: 3.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.0.
|
40
|
+
version: 3.0.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: bootstrap-sass
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -120,17 +120,16 @@ files:
|
|
120
120
|
- app/assets/javascripts/spree/backend.js
|
121
121
|
- app/assets/javascripts/spree/backend/address_states.js
|
122
122
|
- app/assets/javascripts/spree/backend/adjustments.js.coffee
|
123
|
-
- app/assets/javascripts/spree/backend/admin.js
|
123
|
+
- app/assets/javascripts/spree/backend/admin.js
|
124
124
|
- app/assets/javascripts/spree/backend/calculator.js
|
125
125
|
- app/assets/javascripts/spree/backend/checkouts/edit.js
|
126
126
|
- app/assets/javascripts/spree/backend/gateway.js
|
127
127
|
- app/assets/javascripts/spree/backend/general_settings.js.coffee
|
128
128
|
- app/assets/javascripts/spree/backend/handlebar_extensions.js
|
129
|
-
- app/assets/javascripts/spree/backend/index.html
|
130
129
|
- app/assets/javascripts/spree/backend/line_items.js.coffee
|
131
|
-
- app/assets/javascripts/spree/backend/line_items_on_order_edit.js
|
130
|
+
- app/assets/javascripts/spree/backend/line_items_on_order_edit.js
|
132
131
|
- app/assets/javascripts/spree/backend/nested-attribute.js
|
133
|
-
- app/assets/javascripts/spree/backend/option_type_autocomplete.js
|
132
|
+
- app/assets/javascripts/spree/backend/option_type_autocomplete.js
|
134
133
|
- app/assets/javascripts/spree/backend/option_value_picker.js
|
135
134
|
- app/assets/javascripts/spree/backend/orders/edit.js
|
136
135
|
- app/assets/javascripts/spree/backend/orders/edit_form.js
|
@@ -143,17 +142,17 @@ files:
|
|
143
142
|
- app/assets/javascripts/spree/backend/returns/return_item_selection.js
|
144
143
|
- app/assets/javascripts/spree/backend/select_payments.js.coffee
|
145
144
|
- app/assets/javascripts/spree/backend/shipments.js.erb
|
146
|
-
- app/assets/javascripts/spree/backend/spree-select2.js
|
145
|
+
- app/assets/javascripts/spree/backend/spree-select2.js
|
147
146
|
- app/assets/javascripts/spree/backend/states.js
|
148
147
|
- app/assets/javascripts/spree/backend/stock_management.js.coffee
|
149
148
|
- app/assets/javascripts/spree/backend/stock_movement.js.coffee
|
150
149
|
- app/assets/javascripts/spree/backend/stock_transfer.js.coffee
|
151
|
-
- app/assets/javascripts/spree/backend/taxon_autocomplete.js
|
150
|
+
- app/assets/javascripts/spree/backend/taxon_autocomplete.js
|
152
151
|
- app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee
|
153
152
|
- app/assets/javascripts/spree/backend/taxonomy.js.coffee
|
154
153
|
- app/assets/javascripts/spree/backend/taxons.js.coffee
|
155
154
|
- app/assets/javascripts/spree/backend/user_picker.js
|
156
|
-
- app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee
|
155
|
+
- app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee
|
157
156
|
- app/assets/javascripts/spree/backend/variant_management.js.coffee
|
158
157
|
- app/assets/javascripts/spree/backend/zone.js.coffee
|
159
158
|
- app/assets/javascripts/spree/frontend/backend.js
|
@@ -341,14 +340,12 @@ files:
|
|
341
340
|
- app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
|
342
341
|
- app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
|
343
342
|
- app/views/spree/admin/promotions/actions/_create_line_items.html.erb
|
344
|
-
- app/views/spree/admin/promotions/actions/_free_shipping.html.erb
|
345
343
|
- app/views/spree/admin/promotions/calculators/_default_fields.html.erb
|
346
344
|
- app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
|
347
345
|
- app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
|
348
346
|
- app/views/spree/admin/promotions/edit.html.erb
|
349
347
|
- app/views/spree/admin/promotions/index.html.erb
|
350
348
|
- app/views/spree/admin/promotions/new.html.erb
|
351
|
-
- app/views/spree/admin/promotions/rules/_first_order.html.erb
|
352
349
|
- app/views/spree/admin/promotions/rules/_item_total.html.erb
|
353
350
|
- app/views/spree/admin/promotions/rules/_landing_page.html.erb
|
354
351
|
- app/views/spree/admin/promotions/rules/_option_value.html.erb
|
@@ -493,6 +490,7 @@ files:
|
|
493
490
|
- app/views/spree/admin/variants/index.html.erb
|
494
491
|
- app/views/spree/admin/variants/new.html.erb
|
495
492
|
- app/views/spree/admin/variants/new.js.erb
|
493
|
+
- app/views/spree/admin/variants/update.js.erb
|
496
494
|
- app/views/spree/admin/zones/_country_members.html.erb
|
497
495
|
- app/views/spree/admin/zones/_form.html.erb
|
498
496
|
- app/views/spree/admin/zones/_state_members.html.erb
|
@@ -1,15 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html>
|
3
|
-
<head>
|
4
|
-
<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
|
5
|
-
<style type="text/css">
|
6
|
-
html { height: 100% }
|
7
|
-
body { height: 100%; margin: 0; padding: 0 }
|
8
|
-
#map-canvas { height: 100% }
|
9
|
-
</style>
|
10
|
-
|
11
|
-
</head>
|
12
|
-
<body>
|
13
|
-
<div id="map-canvas"/>
|
14
|
-
</body>
|
15
|
-
</html>
|
File without changes
|
File without changes
|