spree_backend 4.0.9 → 4.1.0.rc1

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 31f0e610b0a84afd1dc3ba62f9719e6eff5b87bc52ffd9077ea578899b8f0cdb
4
- data.tar.gz: 192db70b304b2c2003a8743cc8417af442c3298d86310989d7e73e746b659585
3
+ metadata.gz: c46720fe0e8b198aa18077a994e64de8e31046d7bcb67c2dd566bf5961705816
4
+ data.tar.gz: b235ef4580ef9d5621cfa7bbba985159b5b06ddbe8c970d4dff170010793004a
5
5
  SHA512:
6
- metadata.gz: c26114ffd6cb6fc510898b99b8100a955caee472159e9cdd830a8dc242c10da6b8669fa6d71a02e307e10790caa4a6682cddc6e111fb85c5d56c536f0653a239
7
- data.tar.gz: c032669c9d212f30163582d94ed076f307ec78b0194da116d69797ce7eeabb22a0ce04439355536c406d738ef4703dda43799d4e4bcff0a26265dcf4151e5e40
6
+ metadata.gz: d9be8ba8dc6f86aab8239a9f74f2b6b94ecbd3ee8d4ad69b8753094ab0d2a8ea297a889c30e0d19fcc90cacd5d870a7653e4b0a0868cc39ef4a068b6df86d4aa
7
+ data.tar.gz: 3cf732494af4971eb513c096d48f743fd59bc4a594d28a789dd7f5bc6c9325d60884560606b94d69eed029b4f24c42d9e660ba88611a9cf1e78fe3f5e39980c1
@@ -2,10 +2,16 @@
2
2
  $(function () {
3
3
  $('[data-hook=general_settings_clear_cache] #clear_cache').click(function () {
4
4
  if (confirm(Spree.translations.are_you_sure)) {
5
- $.post(Spree.routes.clear_cache)
6
- .done(function () {
7
- show_flash('success', 'Cache was flushed.')
8
- })
5
+ $.ajax({
6
+ type: 'POST',
7
+ url: Spree.routes.clear_cache,
8
+ data: {
9
+ authenticity_token: AUTH_TOKEN
10
+ },
11
+ dataType: 'json'
12
+ }).done(function () {
13
+ show_flash('success', 'Cache was flushed.')
14
+ })
9
15
  .fail(function (message) {
10
16
  if (message.responseJSON['error']) {
11
17
  show_flash('error', message.responseJSON['error'])
@@ -12,6 +12,9 @@ function handleMove (e, data) {
12
12
  var newParent = data.rslt.np
13
13
  var url = Spree.url(base_url).clone()
14
14
  url.setPath(url.path() + '/' + node.prop('id'))
15
+ if (newParent.attr('id') === data.rslt.op.attr('id') && position > data.rslt.cop) {
16
+ position = position - 1
17
+ }
15
18
  $.ajax({
16
19
  type: 'POST',
17
20
  dataType: 'json',
@@ -130,3 +130,12 @@
130
130
  }
131
131
  }
132
132
  }
133
+
134
+ // Bugfix for required elements
135
+ select.select2[required="required"] {
136
+ display: inline-block !important;
137
+ width: 0;
138
+ overflow: hidden;
139
+ opacity:0;
140
+ filter:alpha(opacity=0);
141
+ }
@@ -54,6 +54,7 @@ module Spree
54
54
  end
55
55
 
56
56
  def load_data
57
+ @stores = Spree::Store.all
57
58
  @providers = Gateway.providers.sort_by(&:name)
58
59
  end
59
60
 
@@ -15,7 +15,7 @@ module Spree
15
15
  flash[:success] = flash_message_for(@store, :successfully_created)
16
16
  redirect_to admin_stores_path
17
17
  else
18
- flash[:error] = "#{Spree.t('store.errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
18
+ flash[:error] = "#{Spree.t('store_errors.unable_to_create')}: #{@store.errors.full_messages.join(', ')}"
19
19
  render :new
20
20
  end
21
21
  end
@@ -27,7 +27,7 @@ module Spree
27
27
  flash[:success] = flash_message_for(@store, :successfully_updated)
28
28
  redirect_to admin_stores_path
29
29
  else
30
- flash[:error] = "#{Spree.t('store.errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
30
+ flash[:error] = "#{Spree.t('store_errors.unable_to_update')}: #{@store.errors.full_messages.join(', ')}"
31
31
  render :edit
32
32
  end
33
33
  end
@@ -42,7 +42,7 @@ module Spree
42
42
  format.js { render_js_for_destroy }
43
43
  end
44
44
  else
45
- render plain: "#{Spree.t('store.errors.unable_to_delete')}: #{@store.errors.full_messages.join(', ')}", status: :unprocessable_entity
45
+ render plain: "#{Spree.t('store_errors.unable_to_delete')}: #{@store.errors.full_messages.join(', ')}", status: :unprocessable_entity
46
46
  end
47
47
  end
48
48
 
@@ -152,6 +152,10 @@ module Spree
152
152
  def order_time(time)
153
153
  [I18n.l(time.to_date), time.strftime('%l:%M %p').strip].join(' ')
154
154
  end
155
+
156
+ def required_span_tag
157
+ content_tag(:span, ' *', class: 'required')
158
+ end
155
159
  end
156
160
  end
157
161
  end
@@ -10,7 +10,7 @@ module Spree
10
10
  label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
11
11
  links << button_link_to(
12
12
  label.capitalize,
13
- [event.to_sym, :admin, order],
13
+ [event, :admin, order],
14
14
  method: :put,
15
15
  icon: event.to_s,
16
16
  data: { confirm: Spree.t(:order_sure_want_to, event: label) }
@@ -1,11 +1,11 @@
1
1
  <div data-hook="admin_adjustment_form_fields">
2
2
  <%= f.field_container :amount, class: ['form-group'] do %>
3
- <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, " *", class: "required")) %>
3
+ <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
4
4
  <%= text_field :adjustment, :amount, class: 'form-control' %>
5
5
  <%= f.error_message_on :amount %>
6
6
  <% end %>
7
7
  <%= f.field_container :label, class: ['form-group'] do %>
8
- <%= f.label :label, raw(Spree.t(:description) + content_tag(:span, " *", class: "required")) %>
8
+ <%= f.label :label, raw(Spree.t(:description) + required_span_tag) %>
9
9
  <%= text_field :adjustment, :label, class: 'form-control' %>
10
10
  <%= f.error_message_on :label %>
11
11
  <% end %>
@@ -11,7 +11,7 @@
11
11
  <%= Spree.t(:customer_search) %>
12
12
  </h1>
13
13
  </div>
14
- <div class="card-body">
14
+ <div class="card-body" id="customer-search-field">
15
15
  <%= hidden_field_tag :customer_search, nil, class: 'error-message' %>
16
16
  <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
17
17
  </div>
@@ -15,6 +15,10 @@
15
15
  <% end %>
16
16
  <% end %>
17
17
  </div>
18
+ <div data-hook="store" class="form-group">
19
+ <%= label_tag :payment_method_store, Spree.t(:store) %>
20
+ <%= collection_select(:payment_method, :store_id, @stores, :id, :name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
21
+ </div>
18
22
  <div data-hook="display" class="form-group">
19
23
  <%= label_tag :payment_method_display_on, Spree.t(:display) %>
20
24
  <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
@@ -23,7 +23,7 @@
23
23
 
24
24
  <div data-hook="card_number" class="form-group">
25
25
  <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
26
- <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', class: 'required')) %>
26
+ <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>
27
27
  <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
28
28
  <span id="card_type" style="display:none;">
29
29
  ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
@@ -33,17 +33,17 @@
33
33
  </div>
34
34
 
35
35
  <div data-hook="card_name" class="form-group">
36
- <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', class: 'required')) %>
36
+ <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + required_span_tag) %>
37
37
  <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>
38
38
  </div>
39
39
 
40
40
  <div data-hook="card_expiration" class="form-group">
41
- <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', class: 'required')) %><br>
41
+ <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>
42
42
  <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM / YY" %>
43
43
  </div>
44
44
 
45
45
  <div data-hook="card_code" class="form-group">
46
- <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', class: "required")) %>
46
+ <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + required_span_tag) %>
47
47
  <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>
48
48
  <a href="/content/cvv" class="info cvvLink" target="_blank">
49
49
  (<%= Spree.t(:what_is_this) %>)
@@ -6,7 +6,7 @@
6
6
  <div class="col-12 col-md-8" data-hook="admin_product_form_left">
7
7
  <div data-hook="admin_product_form_name">
8
8
  <%= f.field_container :name, class: ['form-group'] do %>
9
- <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', class: 'required')) %>
9
+ <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
10
10
  <%= f.text_field :name, class: 'form-control title' %>
11
11
  <%= f.error_message_on :name %>
12
12
  <% end %>
@@ -14,7 +14,7 @@
14
14
 
15
15
  <div data-hook="admin_product_form_slug">
16
16
  <%= f.field_container :slug, class: ['form-group'] do %>
17
- <%= f.label :slug, raw(Spree.t(:slug) + content_tag(:span, ' *', class: "required")) %>
17
+ <%= f.label :slug, raw(Spree.t(:slug) + required_span_tag) %>
18
18
  <%= f.text_field :slug, class: 'form-control title' %>
19
19
  <%= f.error_message_on :slug %>
20
20
  <% end %>
@@ -32,7 +32,7 @@
32
32
  <div class="col-12 col-md-4" data-hook="admin_product_form_right">
33
33
  <div data-hook="admin_product_form_price">
34
34
  <%= f.field_container :price, class: ['form-group'] do %>
35
- <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
35
+ <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
36
36
  <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, @product.master.default_price) %>
37
37
  <%= f.error_message_on :price %>
38
38
  <% end %>
@@ -30,9 +30,9 @@
30
30
  </li>
31
31
  <% end %>
32
32
 
33
- <% if spree.respond_to? :admin_logout_path %>
33
+ <% if defined?(spree_logout_path) %>
34
34
  <li class="dropdown-item p-0">
35
- <%= link_to spree.admin_logout_path, class: 'd-block text-dark py-2 px-4' do %>
35
+ <%= link_to spree_logout_path, class: 'd-block text-dark py-2 px-4' do %>
36
36
  <i class="glyphicon glyphicon-log-out"></i>
37
37
  &nbsp;
38
38
  <%= Spree.t(:logout) %>
@@ -1,16 +1,16 @@
1
1
  <div data-hook='admin_store_credit_form_fields'>
2
2
  <%= f.field_container :amount, class: %w[form-group] do %>
3
- <%= f.label :amount, raw(Spree.t(:amount) + content_tag(:span, ' *', class: 'required')) %>
3
+ <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
4
4
  <%= f.text_field :amount, class: 'form-control' %>
5
5
  <%= f.error_message_on :amount %>
6
6
  <% end %>
7
7
  <%= f.field_container :currency, class: %w[form-group] do %>
8
- <%= f.label :currency, raw(Spree.t(:currency) + content_tag(:span, ' *', class: 'required')) %>
8
+ <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag) %>
9
9
  <%= f.select :currency, currency_options(f.object.currency) %>
10
10
  <%= f.error_message_on :currency %>
11
11
  <% end %>
12
12
  <%= f.field_container :category, class: %w[form-group] do %>
13
- <%= f.label :category, raw(Spree.t(:category) + content_tag(:span, ' *', class: 'required')) %>
13
+ <%= f.label :category, raw(Spree.t(:category) + required_span_tag) %>
14
14
  <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
15
15
  { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t(:select_a_store_credit_reason) } %>
16
16
  <%= f.error_message_on :category %>
@@ -5,6 +5,10 @@
5
5
  <%= Spree.t(:"admin.user.store_credits") %>
6
6
  <% end %>
7
7
 
8
+ <% content_for :title do %>
9
+ <%= "Spree #{Spree.t('administration')}: #{Spree.t(:"admin.user.store_credits")}" %>
10
+ <% end %>
11
+
8
12
  <% content_for :page_actions do %>
9
13
  <%= button_link_to Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: "btn-success", icon: 'add' if can?(:create, Spree::StoreCredit) %>
10
14
  <% end %>
@@ -1,42 +1,115 @@
1
1
  <div data-hook="admin_store_form_fields">
2
- <%= f.field_container :name, class: ['form-group'] do %>
3
- <%= f.label :name, Spree.t(:name) %>
4
- <%= f.text_field :name, class: 'form-control', required: true %>
5
- <%= f.error_message_on :name %>
6
- <% end %>
7
- <%= f.field_container :url, class: ['form-group'] do %>
8
- <%= f.label :url, Spree.t(:url) %>
9
- <%= f.text_field :url, class: 'form-control', required: true %>
10
- <%= f.error_message_on :url %>
11
- <% end %>
12
- <%= f.field_container :meta_description, class: ['form-group'] do %>
13
- <%= f.label :meta_description, Spree.t(:meta_description) %>
14
- <%= f.text_field :meta_description, class: 'form-control' %>
15
- <%= f.error_message_on :meta_description %>
16
- <% end %>
17
- <%= f.field_container :meta_keywords, class: ['form-group'] do %>
18
- <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
19
- <%= f.text_field :meta_keywords, class: 'form-control' %>
20
- <%= f.error_message_on :meta_keywords %>
21
- <% end %>
22
- <%= f.field_container :seo_title, class: ['form-group'] do %>
23
- <%= f.label :seo_title, Spree.t(:seo_title) %>
24
- <%= f.text_field :seo_title, class: 'form-control' %>
25
- <%= f.error_message_on :seo_title %>
26
- <% end %>
27
- <%= f.field_container :mail_from_address, class: ['form-group'] do %>
28
- <%= f.label :mail_from_address, Spree.t(:mail_from_address) %>
29
- <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
30
- <%= f.error_message_on :mail_from_address %>
31
- <% end %>
32
- <%= f.field_container :default_currency, class: ['form-group'] do %>
33
- <%= f.label :default_currency, Spree.t(:default_currency) %>
34
- <%= f.text_field :default_currency, class: 'form-control' %>
35
- <%= f.error_message_on :default_currency %>
36
- <% end %>
37
- <%= f.field_container :code, class: ['form-group'] do %>
38
- <%= f.label :code, Spree.t(:code) %>
39
- <%= f.text_field :code, class: 'form-control', required: true %>
40
- <%= f.error_message_on :code %>
41
- <% end %>
2
+
3
+ <div class="card">
4
+ <div class="card-header">
5
+ <h1 class="card-title mb-0 h5">
6
+ Basic Information
7
+ </h1>
8
+ </div>
9
+ <div class="card-body">
10
+ <%= f.field_container :name, class: ['form-group'] do %>
11
+ <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
12
+ <%= f.text_field :name, class: 'form-control', required: true %>
13
+ <%= f.error_message_on :name %>
14
+ <% end %>
15
+ <%= f.field_container :url, class: ['form-group'] do %>
16
+ <%= f.label :url, Spree.t(:url) %>
17
+ <%= f.text_field :url, class: 'form-control', required: true %>
18
+ <%= f.error_message_on :url %>
19
+ <% end %>
20
+ </div>
21
+ </div>
22
+
23
+ <br />
24
+
25
+ <div class="card">
26
+ <div class="card-header">
27
+ <h1 class="card-title mb-0 h5">
28
+ SEO
29
+ </h1>
30
+ </div>
31
+ <div class="card-body">
32
+ <%= f.field_container :seo_title, class: ['form-group'] do %>
33
+ <%= f.label :seo_title, Spree.t(:seo_title) %>
34
+ <%= f.text_field :seo_title, class: 'form-control' %>
35
+ <%= f.error_message_on :seo_title %>
36
+ <% end %>
37
+ <%= f.field_container :meta_description, class: ['form-group'] do %>
38
+ <%= f.label :meta_description, Spree.t(:meta_description) %>
39
+ <%= f.text_area :meta_description, class: 'form-control' %>
40
+ <%= f.error_message_on :meta_description %>
41
+ <% end %>
42
+ <%= f.field_container :meta_keywords, class: ['form-group'] do %>
43
+ <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
44
+ <%= f.text_field :meta_keywords, class: 'form-control' %>
45
+ <%= f.error_message_on :meta_keywords %>
46
+ <% end %>
47
+ </div>
48
+ </div>
49
+
50
+ <br />
51
+
52
+ <div class="card">
53
+ <div class="card-header">
54
+ <h1 class="card-title mb-0 h5">
55
+ Emails
56
+ </h1>
57
+ </div>
58
+ <div class="card-body">
59
+ <%= f.field_container :mail_from_address, class: ['form-group'] do %>
60
+ <%= f.label :mail_from_address, Spree.t(:mail_from_address) %>
61
+ <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
62
+ <%= f.error_message_on :mail_from_address %>
63
+ <% end %>
64
+ </div>
65
+ </div>
66
+
67
+ <br />
68
+
69
+ <div class="card">
70
+ <div class="card-header">
71
+ <h1 class="card-title mb-0 h5">
72
+ Internationalization
73
+ </h1>
74
+ </div>
75
+ <div class="card-body">
76
+ <%= f.field_container :default_currency, class: ['form-group'] do %>
77
+ <%= f.label :default_currency, Spree.t(:currency) %>
78
+ <%= f.select :default_currency, currency_options(@store.default_currency) %>
79
+ <%= f.error_message_on :default_currency %>
80
+ <% end %>
81
+ </div>
42
82
  </div>
83
+
84
+ <br />
85
+
86
+ <div class="card">
87
+ <div class="card-header">
88
+ <h1 class="card-title mb-0 h5">
89
+ Social
90
+ </h1>
91
+ </div>
92
+ <div class="card-body">
93
+ <%= f.field_container :facebook, class: ['form-group'] do %>
94
+ <%= f.label :facebook, Spree.t(:facebook) %>
95
+ <%= f.text_field :facebook, class: 'form-control' %>
96
+ <%= f.error_message_on :facebook %>
97
+ <% end %>
98
+ <%= f.field_container :twitter, class: ['form-group'] do %>
99
+ <%= f.label :twitter, Spree.t(:twitter) %>
100
+ <%= f.text_field :twitter, class: 'form-control' %>
101
+ <%= f.error_message_on :twitter %>
102
+ <% end %>
103
+ <%= f.field_container :instagram, class: ['form-group'] do %>
104
+ <%= f.label :instagram, Spree.t(:instagram) %>
105
+ <%= f.text_field :instagram, class: 'form-control' %>
106
+ <%= f.error_message_on :instagram %>
107
+ <% end %>
108
+ </div>
109
+ </div>
110
+
111
+ <br />
112
+
113
+ <script>
114
+ $('#store_default_currency').select2();
115
+ </script>
@@ -12,19 +12,19 @@
12
12
  <th><%= Spree.t(:name) %></th>
13
13
  <th><%= Spree.t(:url) %></th>
14
14
  <th><%= Spree.t(:currency) %></th>
15
+ <th><%= Spree.t(:default) %>?</th>
15
16
  <th data-hook="admin_stores_index_header_actions" class="actions"></th>
16
17
  <thead>
17
18
  <tbody>
18
19
  <% @stores.each do |store| %>
19
20
  <tr>
20
21
  <td><%= store.name %></td>
21
- <td><%= store.url %></td>
22
+ <td><%= link_to store.url, 'https://' + store.url, target: :blank %></td>
22
23
  <td><%= store.default_currency %></td>
23
- <td class="actions actions-2 text-center" data-hook="admin_stores_index_row_actions">
24
- <% if store.default %>
25
- <%= button_link_to(Spree.t(:store_default), '#', class: 'btn-success btn-sm') %>
26
- <% else %>
27
- <%= button_link_to(Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), method: :post, class: 'btn-outline-secondary btn-sm') if can?(:edit, store) %>
24
+ <td><%= store.default ? "<strong>#{Spree.t(:say_yes)}</strong>".html_safe : Spree.t(:say_no) %>
25
+ <td class="actions actions-2 text-right" data-hook="admin_stores_index_row_actions">
26
+ <% if can?(:edit, store) && !store.default %>
27
+ <%= link_to_with_icon('ok', Spree.t(:store_set_default_button), spree.set_default_admin_store_path(store), no_text: true, method: :put, class: 'btn btn-warning btn-sm with-tip') %>
28
28
  <% end %>
29
29
  <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
30
30
  <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
@@ -59,7 +59,7 @@
59
59
  <% end %>
60
60
  <% else %>
61
61
  <% content_for :page_actions do %>
62
- <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { remote: :true, icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
62
+ <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
63
63
  <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
64
64
  <% end %>
65
65
  <% end %>
@@ -1,3 +1,5 @@
1
+ <%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :variants} %>
2
+
1
3
  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
2
4
 
3
5
  <%= form_for [:admin, @product, @variant] do |f| %>
data/config/routes.rb CHANGED
@@ -14,7 +14,7 @@ Spree::Core::Engine.add_routes do
14
14
 
15
15
  resources :stores do
16
16
  member do
17
- post :set_default
17
+ put :set_default
18
18
  end
19
19
  end
20
20
 
@@ -5,22 +5,16 @@ Gem::Specification.new do |s|
5
5
  s.platform = Gem::Platform::RUBY
6
6
  s.name = 'spree_backend'
7
7
  s.version = Spree.version
8
- s.author = 'Sean Schofield'
9
- s.email = 'sean@spreecommerce.com'
10
8
  s.summary = 'backend e-commerce functionality for the Spree project.'
11
9
  s.description = 'Required dependency for Spree'
12
- s.homepage = 'http://spreecommerce.org'
13
- s.license = 'BSD-3-Clause'
14
-
15
- s.metadata = {
16
- "bug_tracker_uri" => "https://github.com/spree/spree/issues",
17
- "changelog_uri" => "https://github.com/spree/spree/releases/tag/v#{s.version}",
18
- "documentation_uri" => "https://guides.spreecommerce.org/",
19
- "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
20
- }
21
10
 
22
11
  s.required_ruby_version = '>= 2.5.0'
23
12
 
13
+ s.author = 'Sean Schofield'
14
+ s.email = 'sean@spreecommerce.com'
15
+ s.homepage = 'http://spreecommerce.org'
16
+ s.license = 'BSD-3-Clause'
17
+
24
18
  s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
25
19
  s.require_path = 'lib'
26
20
  s.requirements << 'none'
@@ -32,5 +26,5 @@ Gem::Specification.new do |s|
32
26
  s.add_dependency 'glyphicons', '~> 1.0.2'
33
27
  s.add_dependency 'jquery-rails', '~> 4.3'
34
28
  s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
35
- s.add_dependency 'select2-rails', '3.5.9.1' # 3.5.9.2 breaks several specs
29
+ s.add_dependency 'select2-rails', '~> 3.5.0'
36
30
  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: 4.0.9
4
+ version: 4.1.0.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2024-04-21 00:00:00.000000000 Z
11
+ date: 2020-01-31 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: 4.0.9
19
+ version: 4.1.0.rc1
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: 4.0.9
26
+ version: 4.1.0.rc1
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: 4.0.9
33
+ version: 4.1.0.rc1
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: 4.0.9
40
+ version: 4.1.0.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
98
98
  name: select2-rails
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '='
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 3.5.9.1
103
+ version: 3.5.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '='
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 3.5.9.1
110
+ version: 3.5.0
111
111
  description: Required dependency for Spree
112
112
  email: sean@spreecommerce.com
113
113
  executables: []
@@ -536,12 +536,8 @@ files:
536
536
  homepage: http://spreecommerce.org
537
537
  licenses:
538
538
  - BSD-3-Clause
539
- metadata:
540
- bug_tracker_uri: https://github.com/spree/spree/issues
541
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.0.9
542
- documentation_uri: https://guides.spreecommerce.org/
543
- source_code_uri: https://github.com/spree/spree/tree/v4.0.9
544
- post_install_message:
539
+ metadata: {}
540
+ post_install_message:
545
541
  rdoc_options: []
546
542
  require_paths:
547
543
  - lib
@@ -552,13 +548,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
552
548
  version: 2.5.0
553
549
  required_rubygems_version: !ruby/object:Gem::Requirement
554
550
  requirements:
555
- - - ">="
551
+ - - ">"
556
552
  - !ruby/object:Gem::Version
557
- version: '0'
553
+ version: 1.3.1
558
554
  requirements:
559
555
  - none
560
- rubygems_version: 3.2.22
561
- signing_key:
556
+ rubygems_version: 3.0.3
557
+ signing_key:
562
558
  specification_version: 4
563
559
  summary: backend e-commerce functionality for the Spree project.
564
560
  test_files: []