spree_backend 4.2.0.rc4 → 4.2.3
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.js +1 -1
- data/app/assets/javascripts/spree/backend/admin.js +9 -15
- data/app/assets/stylesheets/spree/backend/global/_mixins.scss +19 -0
- data/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss +94 -76
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +4 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +1 -0
- data/app/controllers/spree/admin/base_controller.rb +2 -0
- data/app/controllers/spree/admin/images_controller.rb +3 -3
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +1 -1
- data/app/controllers/spree/admin/prices_controller.rb +0 -13
- data/app/controllers/spree/admin/stores_controller.rb +6 -13
- data/app/helpers/spree/admin/base_helper.rb +47 -1
- data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb +2 -2
- data/app/views/spree/admin/adjustments/index.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +48 -48
- data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
- data/app/views/spree/admin/general_settings/edit.html.erb +3 -3
- data/app/views/spree/admin/images/edit.html.erb +1 -1
- data/app/views/spree/admin/log_entries/index.html.erb +1 -1
- data/app/views/spree/admin/option_types/index.html.erb +1 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
- data/app/views/spree/admin/orders/_form.html.erb +6 -10
- data/app/views/spree/admin/orders/_line_items.html.erb +1 -1
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +5 -8
- data/app/views/spree/admin/orders/_order_actions.html.erb +1 -2
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +3 -3
- data/app/views/spree/admin/orders/_shipment.html.erb +0 -1
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/index.html.erb +2 -0
- data/app/views/spree/admin/payment_methods/index.html.erb +1 -1
- data/app/views/spree/admin/payments/_form.html.erb +2 -3
- data/app/views/spree/admin/payments/show.html.erb +1 -2
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +3 -4
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +1 -1
- data/app/views/spree/admin/prices/_variant_prices.html.erb +5 -5
- data/app/views/spree/admin/prices/index.html.erb +2 -2
- data/app/views/spree/admin/product_properties/index.html.erb +3 -4
- data/app/views/spree/admin/products/_form.html.erb +5 -6
- data/app/views/spree/admin/products/new.html.erb +3 -1
- data/app/views/spree/admin/products/stock.html.erb +2 -2
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -3
- data/app/views/spree/admin/promotions/_form.html.erb +9 -10
- data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +7 -5
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +2 -2
- data/app/views/spree/admin/prototypes/_form.html.erb +1 -1
- data/app/views/spree/admin/prototypes/show.html.erb +1 -1
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +2 -2
- data/app/views/spree/admin/reimbursements/edit.html.erb +1 -2
- data/app/views/spree/admin/roles/index.html.erb +1 -1
- data/app/views/spree/admin/shared/_account_nav.html.erb +2 -2
- data/app/views/spree/admin/shared/_address_form.html.erb +2 -2
- data/app/views/spree/admin/shared/_error_messages.html.erb +1 -1
- data/app/views/spree/admin/shared/_head.html.erb +2 -2
- data/app/views/spree/admin/shared/_header.html.erb +0 -2
- data/app/views/spree/admin/shared/_main_menu.html.erb +1 -1
- data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +4 -2
- data/app/views/spree/admin/shared/_translations.html.erb +8 -38
- data/app/views/spree/admin/shipping_categories/index.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/index.html.erb +2 -2
- data/app/views/spree/admin/states/index.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/index.html.erb +4 -4
- data/app/views/spree/admin/stock_movements/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_movements/index.html.erb +2 -2
- data/app/views/spree/admin/stock_transfers/new.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/show.html.erb +0 -1
- data/app/views/spree/admin/stores/_form.html.erb +20 -15
- data/app/views/spree/admin/stores/index.html.erb +4 -2
- data/app/views/spree/admin/tax_categories/index.html.erb +2 -2
- data/app/views/spree/admin/tax_rates/index.html.erb +6 -6
- data/app/views/spree/admin/taxonomies/_js_head.html.erb +1 -2
- data/app/views/spree/admin/taxonomies/_list.html.erb +1 -1
- data/app/views/spree/admin/taxons/_form.html.erb +1 -2
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
- data/app/views/spree/admin/users/_form.html.erb +0 -1
- data/app/views/spree/admin/users/edit.html.erb +1 -1
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +1 -1
- data/app/views/spree/admin/variants/_form.html.erb +3 -1
- data/app/views/spree/admin/zones/_country_members.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +2 -2
- data/app/views/spree/admin/zones/new.html.erb +1 -1
- data/app/views/spree/layouts/admin.html.erb +2 -3
- data/config/initializers/assets.rb +1 -1
- data/spree_backend.gemspec +1 -1
- metadata +14 -15
- data/app/assets/javascripts/spree/backend/flatpickr_locals.js +0 -37
- data/app/helpers/spree/admin/currency_helper.rb +0 -14
@@ -23,6 +23,7 @@
|
|
23
23
|
<div class="col-12 col-md-6 mb-3 mb-md-0">
|
24
24
|
<div class="input-group datePickerFrom"
|
25
25
|
data-wrap="true"
|
26
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
|
26
27
|
data-max-date="<%= params[:q][:created_at_lt] %>">
|
27
28
|
<%= f.text_field :created_at_gt,
|
28
29
|
class: 'form-control js-filterable shadow-none',
|
@@ -36,6 +37,7 @@
|
|
36
37
|
<div class="col-12 col-md-6 mt-3 mt-md-0">
|
37
38
|
<div class="input-group datePickerTo"
|
38
39
|
data-wrap="true"
|
40
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
|
39
41
|
data-min-date="<%= params[:q][:created_at_gt] %>">
|
40
42
|
|
41
43
|
<%= f.text_field :created_at_lt,
|
@@ -20,7 +20,7 @@
|
|
20
20
|
</tr>
|
21
21
|
</thead>
|
22
22
|
<tbody id="sortVert">
|
23
|
-
<% @payment_methods.each do |method
|
23
|
+
<% @payment_methods.each do |method| %>
|
24
24
|
<tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
|
25
25
|
<td class="move-handle text-center">
|
26
26
|
<% if can?(:edit, method) %>
|
@@ -19,12 +19,11 @@
|
|
19
19
|
|
20
20
|
<div class="payment-methods my-3" id="payment_method_<%= method.id %>">
|
21
21
|
<% if method.source_required? %>
|
22
|
-
<%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",
|
22
|
+
<%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",
|
23
23
|
locals: {
|
24
24
|
payment_method: method,
|
25
25
|
previous_cards: method.reusable_sources(@order)
|
26
|
-
}
|
27
|
-
%>
|
26
|
+
} %>
|
28
27
|
<% end %>
|
29
28
|
</div>
|
30
29
|
<% end %>
|
@@ -18,8 +18,7 @@
|
|
18
18
|
<%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
|
19
19
|
locals: {
|
20
20
|
payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
|
21
|
-
}
|
22
|
-
%>
|
21
|
+
} %>
|
23
22
|
|
24
23
|
<div class="alert alert-success" data-hook="amount">
|
25
24
|
<%= Spree.t(:amount) %>: <%= @payment.display_amount.to_html %>
|
@@ -6,11 +6,10 @@
|
|
6
6
|
</div>
|
7
7
|
<div class="form-group previous_cards card-body mb-0" data-hook="previous_cards">
|
8
8
|
<ul class="m-0 p-0">
|
9
|
-
|
10
9
|
<% previous_cards.each do |card| %>
|
11
10
|
<li>
|
12
11
|
<label>
|
13
|
-
<%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.
|
12
|
+
<%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_brand + ' - ' + card.display_number %>
|
14
13
|
</label>
|
15
14
|
</li>
|
16
15
|
<% end %>
|
@@ -24,7 +23,7 @@
|
|
24
23
|
</div>
|
25
24
|
</div>
|
26
25
|
<% end %>
|
27
|
-
<div id="card_form<%= payment_method.id %>" class="
|
26
|
+
<div id="card_form<%= payment_method.id %>" class="mt-3 row" data-hook>
|
28
27
|
<% param_prefix = "payment_source[#{payment_method.id}]" %>
|
29
28
|
|
30
29
|
<div data-hook="card_number" class="form-group col-12">
|
@@ -32,7 +31,7 @@
|
|
32
31
|
<%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>
|
33
32
|
<%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
|
34
33
|
<span id="card_type" style="display:none;">
|
35
|
-
( <span id="looks_like"
|
34
|
+
( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
|
36
35
|
<span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
|
37
36
|
)
|
38
37
|
</span>
|
@@ -2,11 +2,11 @@
|
|
2
2
|
<div id="variant_prices-table-wrapper">
|
3
3
|
<table class="table sortable">
|
4
4
|
<colgroup>
|
5
|
-
<col style="width: 15%"
|
6
|
-
<col style="width: 30%"
|
7
|
-
<col style="width: 15%"
|
8
|
-
<col style="width: 20%"
|
9
|
-
<col style="width: 20%"
|
5
|
+
<col style="width: 15%">
|
6
|
+
<col style="width: 30%">
|
7
|
+
<col style="width: 15%">
|
8
|
+
<col style="width: 20%">
|
9
|
+
<col style="width: 20%">
|
10
10
|
</colgroup>
|
11
11
|
<thead>
|
12
12
|
<tr data-hook="variant_prices_header">
|
@@ -6,11 +6,11 @@
|
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<form>
|
9
|
-
<input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"
|
9
|
+
<input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search">
|
10
10
|
</form>
|
11
11
|
|
12
12
|
<%= form_tag nil, { class: 'form-horizontal' } do %>
|
13
|
-
<div class="
|
13
|
+
<div class="my-3">
|
14
14
|
<%= render 'variant_prices', variant: @product.master %>
|
15
15
|
</div>
|
16
16
|
<div class="form-actions" data-hook="buttons">
|
@@ -19,7 +19,7 @@
|
|
19
19
|
<%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
|
20
20
|
<fieldset>
|
21
21
|
<div id="prototypes" data-hook></div>
|
22
|
-
<div class=" table-responsive">
|
22
|
+
<div class=" table-responsive mb-3">
|
23
23
|
<table id="product_properties" class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
|
24
24
|
<thead>
|
25
25
|
<tr data-hook="product_properties_header">
|
@@ -41,7 +41,7 @@
|
|
41
41
|
</fieldset>
|
42
42
|
<% end %>
|
43
43
|
|
44
|
-
|
44
|
+
<script>
|
45
45
|
var properties = <%= raw(@properties.to_json) %>;
|
46
46
|
$('#product_properties').on('keydown', 'input.autocomplete', function() {
|
47
47
|
already_auto_completed = $(this).is('ac_input');
|
@@ -50,8 +50,7 @@
|
|
50
50
|
$(this).focus();
|
51
51
|
}
|
52
52
|
});
|
53
|
-
|
54
|
-
|
53
|
+
</script>
|
55
54
|
|
56
55
|
<style>
|
57
56
|
div.ui-helper-hidden-accessible {display:none;}
|
@@ -1,6 +1,4 @@
|
|
1
|
-
|
2
1
|
<div data-hook="admin_product_form_fields">
|
3
|
-
|
4
2
|
<div class="row">
|
5
3
|
|
6
4
|
<div class="col-12 col-md-8" data-hook="admin_product_form_left">
|
@@ -68,7 +66,8 @@
|
|
68
66
|
|
69
67
|
<div class="input-group datePickerFrom"
|
70
68
|
data-wrap="true"
|
71
|
-
data-
|
69
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
|
70
|
+
data-max-date="<%= @product.discontinue_on %>">
|
72
71
|
|
73
72
|
<%= f.text_field :available_on,
|
74
73
|
value: datepicker_field_value(@product.available_on),
|
@@ -81,7 +80,6 @@
|
|
81
80
|
<% end %>
|
82
81
|
</div>
|
83
82
|
|
84
|
-
|
85
83
|
<div data-hook="admin_product_form_discontinue_on">
|
86
84
|
<%= f.field_container :discontinue_on, class: ['form-group'] do %>
|
87
85
|
<%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
|
@@ -89,7 +87,8 @@
|
|
89
87
|
|
90
88
|
<div class="input-group datePickerTo"
|
91
89
|
data-wrap="true"
|
92
|
-
data-
|
90
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
|
91
|
+
data-min-date="<%= @product.available_on %>">
|
93
92
|
|
94
93
|
<%= f.text_field :discontinue_on,
|
95
94
|
value: datepicker_field_value(@product.discontinue_on),
|
@@ -195,7 +194,7 @@
|
|
195
194
|
<%= f.label :taxon_ids, Spree.t(:taxons) %>
|
196
195
|
|
197
196
|
<% if can? :modify, Spree::Classification %>
|
198
|
-
<%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible'
|
197
|
+
<%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
|
199
198
|
<% elsif @product.taxons.any? %>
|
200
199
|
<ul class="text_list">
|
201
200
|
<% @product.taxons.each do |taxon| %>
|
@@ -44,7 +44,9 @@
|
|
44
44
|
<%= f.label :available_on, Spree.t(:available_on) %>
|
45
45
|
<%= f.error_message_on :available_on %>
|
46
46
|
|
47
|
-
<div class="input-group datepicker"
|
47
|
+
<div class="input-group datepicker"
|
48
|
+
data-wrap="true"
|
49
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>">
|
48
50
|
<%= f.text_field :available_on,
|
49
51
|
value: datepicker_field_value(@product.available_on),
|
50
52
|
placeholder: Spree.t(:select_a_date),
|
@@ -33,8 +33,8 @@
|
|
33
33
|
class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
|
34
34
|
<%= Spree.t(:track_inventory) %>
|
35
35
|
<%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
|
36
|
-
|
37
|
-
|
36
|
+
class: 'variant_track_inventory',
|
37
|
+
id: "variant_track_inventory_#{variant.id}" %>
|
38
38
|
<% end %>
|
39
39
|
</div>
|
40
40
|
<% end if can?(:update, @product) && can?(:update, variant) %>
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<% options = options_for_select( Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
|
9
9
|
|
10
10
|
<div class="form-group">
|
11
|
-
<%= label_tag :action_type, Spree.t(:add_action_of_type)%>
|
11
|
+
<%= label_tag :action_type, Spree.t(:add_action_of_type) %>
|
12
12
|
<%= select_tag 'action_type', options, class: 'select2' %>
|
13
13
|
</div>
|
14
14
|
<div class="form-actions">
|
@@ -18,7 +18,7 @@
|
|
18
18
|
<% end %>
|
19
19
|
|
20
20
|
<%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
|
21
|
-
<div id="actions" class="filter_list
|
21
|
+
<div id="actions" class="filter_list mt-3">
|
22
22
|
<% if @promotion.actions.any? %>
|
23
23
|
<%= render partial: 'promotion_action', collection: @promotion.actions %>
|
24
24
|
<% else %>
|
@@ -31,5 +31,4 @@
|
|
31
31
|
<%= button Spree.t('actions.update'), 'save.svg' %>
|
32
32
|
</div>
|
33
33
|
<% end %>
|
34
|
-
|
35
34
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
|
2
2
|
|
3
|
-
<div class="row" id="general_fields"
|
4
|
-
<div class="col-12 col-
|
3
|
+
<div class="row" id="general_fields">
|
4
|
+
<div class="col-12 col-lg-4">
|
5
5
|
<%= f.field_container :name, class: ['form-group'] do %>
|
6
6
|
<%= f.label :name %>
|
7
7
|
<%= f.text_field :name, class: 'form-control' %>
|
@@ -35,7 +35,7 @@
|
|
35
35
|
<% end %>
|
36
36
|
</div>
|
37
37
|
|
38
|
-
<div class="col-12 col-
|
38
|
+
<div class="col-12 col-lg-4">
|
39
39
|
<%= f.field_container :description, class: ['form-group'] do %>
|
40
40
|
<%= f.label :description %>
|
41
41
|
<%= f.text_area :description, rows: 7, class: 'form-control' %>
|
@@ -47,7 +47,7 @@
|
|
47
47
|
<% end %>
|
48
48
|
</div>
|
49
49
|
|
50
|
-
<div id="expiry_fields" class="col-12 col-
|
50
|
+
<div id="expiry_fields" class="col-12 col-lg-4">
|
51
51
|
<div class="form-group">
|
52
52
|
<%= f.field_container :usage_limit do %>
|
53
53
|
<%= f.label :usage_limit, Spree.t('limit_usage_to') %>
|
@@ -57,14 +57,13 @@
|
|
57
57
|
<%= Spree.t(:current_promotion_usage, count: @promotion.credits_count) %>
|
58
58
|
</small>
|
59
59
|
</div>
|
60
|
-
|
61
60
|
<div id="starts_at_field" class="form-group">
|
62
61
|
<%= f.label :starts_at %>
|
63
62
|
<div class="input-group datePickerFrom"
|
64
63
|
data-wrap="true"
|
65
64
|
data-enable-time="true"
|
66
|
-
data-
|
67
|
-
data-max-date="<%= @promotion.expires_at %>"
|
65
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"
|
66
|
+
data-max-date="<%= @promotion.expires_at %>">
|
68
67
|
<%= f.datetime_field :starts_at,
|
69
68
|
class: 'form-control shadow-none',
|
70
69
|
placeholder: Spree.t('starting_from'),
|
@@ -78,9 +77,9 @@
|
|
78
77
|
<%= f.label :expires_at %>
|
79
78
|
<div class="input-group datePickerTo"
|
80
79
|
data-wrap="true"
|
81
|
-
data-enable-time=
|
82
|
-
data-
|
83
|
-
data-min-date="<%= @promotion.starts_at %>"
|
80
|
+
data-enable-time='true'
|
81
|
+
data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"
|
82
|
+
data-min-date="<%= @promotion.starts_at %>">
|
84
83
|
<%= f.datetime_field :expires_at,
|
85
84
|
placeholder:Spree.t('ends_at'),
|
86
85
|
class: 'form-control shadow-none',
|
@@ -23,7 +23,7 @@
|
|
23
23
|
<% end %>
|
24
24
|
</div>
|
25
25
|
<% if promotion_action.calculator.respond_to?(:preferences) %>
|
26
|
-
<div class="alert alert-info js-warning
|
26
|
+
<div class="alert alert-info js-warning mt-3 mb-0">
|
27
27
|
<%= Spree.t(:calculator_settings_warning) %>
|
28
28
|
</div>
|
29
29
|
<% end %>
|
@@ -21,7 +21,7 @@
|
|
21
21
|
<% end %>
|
22
22
|
</div>
|
23
23
|
<% if promotion_action.calculator.respond_to?(:preferences) %>
|
24
|
-
<div class="alert alert-info js-warning
|
24
|
+
<div class="alert alert-info js-warning mt-3 mb-0">
|
25
25
|
<%= Spree.t(:calculator_settings_warning) %>
|
26
26
|
</div>
|
27
27
|
<% end %>
|
@@ -64,13 +64,15 @@
|
|
64
64
|
<td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td>
|
65
65
|
<td><%= promotion.code %></td>
|
66
66
|
<td><%= promotion.description %></td>
|
67
|
-
<td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit
|
67
|
+
<td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
|
68
68
|
<td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
|
69
69
|
<td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
|
70
|
-
<td class="actions
|
71
|
-
|
72
|
-
|
73
|
-
|
70
|
+
<td class="actions" data-hook="admin_promotions_index_row_actions">
|
71
|
+
<span class="d-flex justify-content-end">
|
72
|
+
<%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
|
73
|
+
<%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
|
74
|
+
<%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
|
75
|
+
</span>
|
74
76
|
</td>
|
75
77
|
</tr>
|
76
78
|
<% end %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class="card-body">
|
2
2
|
<div class="form-group taxons_rule_taxons">
|
3
|
-
<%= label_tag "#{param_prefix}
|
4
|
-
<%= select_tag "#{param_prefix}[
|
3
|
+
<%= label_tag "#{param_prefix}_taxon_ids", Spree.t('taxon_rule.choose_taxons') %>
|
4
|
+
<%= select_tag "#{param_prefix}[taxon_ids]", options_from_collection_for_select(promotion_rule.taxons, :id, :pretty_name, promotion_rule.taxon_ids), class: 'taxon_picker d-block w-100', multiple: true, id: :product_taxon_ids %>
|
5
5
|
</div>
|
6
6
|
<div class="form-group mb-0">
|
7
7
|
<%= label_tag Spree.t('taxon_rule.label') %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div data-hook="admin_prototype_form_fields">
|
2
2
|
<%= f.field_container :name, class: ['form-group'] do %>
|
3
|
-
<%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br
|
3
|
+
<%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
|
4
4
|
<%= f.text_field :name, class: 'form-control' %>
|
5
5
|
<%= f.error_message_on :name %>
|
6
6
|
<% end %>
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<% ot.option_values.each do |ov| %>
|
14
14
|
<li>
|
15
15
|
<%= label_tag "option_value_#{ov.id}" do %>
|
16
|
-
<%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value"
|
16
|
+
<%= check_box_tag "product[option_values_hash[#{ot.id}]][]", ov.id, params[:product] && (params[:product][:option_values_hash] || {}).values.flatten.include?(ov.id.to_s), id: "option_value_#{ov.id}", class: "option-value" %>
|
17
17
|
<div class="option-value__color" style="--presentation: <%= ov.presentation %>"></div>
|
18
18
|
<% end %>
|
19
19
|
</li>
|
@@ -11,11 +11,11 @@
|
|
11
11
|
<fieldset>
|
12
12
|
<div data-hook="admin_refund_form_fields">
|
13
13
|
<div class="form-group">
|
14
|
-
<%= f.label :amount, Spree.t(:amount) %><br
|
14
|
+
<%= f.label :amount, Spree.t(:amount) %><br>
|
15
15
|
<%= @refund.amount %>
|
16
16
|
</div>
|
17
17
|
<div class="form-group">
|
18
|
-
<%= f.label :refund_reason_id, Spree.t(:reason) %><br
|
18
|
+
<%= f.label :refund_reason_id, Spree.t(:reason) %><br>
|
19
19
|
<%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2'}) %>
|
20
20
|
</div>
|
21
21
|
</div>
|
@@ -11,11 +11,11 @@
|
|
11
11
|
<fieldset>
|
12
12
|
<div data-hook="admin_refund_form_fields">
|
13
13
|
<div class="form-group">
|
14
|
-
<%= f.label :payment_amount, Spree.t(:payment_amount) %><br
|
14
|
+
<%= f.label :payment_amount, Spree.t(:payment_amount) %><br>
|
15
15
|
<%= @refund.payment.amount %>
|
16
16
|
</div>
|
17
17
|
<div class="form-group">
|
18
|
-
<%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br
|
18
|
+
<%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>
|
19
19
|
<%= @refund.payment.credit_allowed %>
|
20
20
|
</div>
|
21
21
|
<%= f.field_container :amount, class: ['form-group'] do %>
|
@@ -66,7 +66,7 @@
|
|
66
66
|
</div>
|
67
67
|
<% end %>
|
68
68
|
|
69
|
-
<fieldset class="
|
69
|
+
<fieldset class="mt-3">
|
70
70
|
<legend><%= Spree.t(:calculated_reimbursements) %></legend>
|
71
71
|
<div class="table-responsive">
|
72
72
|
<table class="table table-condensed table-bordered">
|
@@ -93,7 +93,6 @@
|
|
93
93
|
<%= "#{Spree.t('note')}: #{Spree.t('this_order_has_already_received_a_refund')}. #{Spree.t('make_sure_the_above_reimbursement_amount_is_correct')}." %>
|
94
94
|
</div>
|
95
95
|
<% end %>
|
96
|
-
|
97
96
|
<div class="form-actions" data-hook="reimburse-buttons">
|
98
97
|
<% if !@reimbursement.reimbursed? %>
|
99
98
|
<%= button_to [:perform, :admin, @order, @reimbursement], { class: 'btn btn-primary', method: 'post' } do %>
|