spree_backend 3.7.14.1 → 4.0.0.beta
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/app/assets/javascripts/spree/backend.js +2 -1
- data/app/assets/javascripts/spree/backend/admin.js +75 -66
- data/app/assets/javascripts/spree/backend/calculator.js +3 -3
- data/app/assets/javascripts/spree/backend/gateway.js +1 -1
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +23 -24
- data/app/assets/javascripts/spree/backend/promotions.js +4 -4
- data/app/assets/javascripts/spree/backend/shipments.js +32 -33
- data/app/assets/javascripts/spree/backend/taxonomy.js +75 -72
- data/app/assets/stylesheets/spree/backend/components/_badges.scss +46 -0
- data/app/assets/stylesheets/spree/backend/components/_buttons.scss +7 -23
- data/app/assets/stylesheets/spree/backend/components/_filters.scss +16 -6
- data/app/assets/stylesheets/spree/backend/components/_main.scss +4 -6
- data/app/assets/stylesheets/spree/backend/components/_navbar.scss +21 -0
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +2 -10
- data/app/assets/stylesheets/spree/backend/components/_page_header.scss +0 -23
- data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +25 -69
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +53 -12
- data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss +2 -2
- data/app/assets/stylesheets/spree/backend/global/_variables.scss +10 -13
- data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss +33 -20
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +23 -18
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +0 -8
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +5 -38
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +3 -6
- data/app/controllers/spree/admin/customer_returns_controller.rb +2 -2
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +1 -1
- data/app/controllers/spree/admin/orders_controller.rb +2 -2
- data/app/controllers/spree/admin/payment_methods_controller.rb +1 -1
- data/app/controllers/spree/admin/products_controller.rb +2 -2
- data/app/controllers/spree/admin/reimbursement_types_controller.rb +1 -1
- data/app/controllers/spree/admin/resource_controller.rb +1 -1
- data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
- data/app/controllers/spree/admin/stores_controller.rb +5 -0
- data/app/controllers/spree/admin/taxons_controller.rb +1 -1
- data/app/controllers/spree/admin/users_controller.rb +2 -2
- data/app/helpers/spree/admin/base_helper.rb +9 -4
- data/app/helpers/spree/admin/customer_returns_helper.rb +1 -1
- data/app/helpers/spree/admin/navigation_helper.rb +41 -25
- data/app/helpers/spree/admin/orders_helper.rb +2 -2
- data/app/views/kaminari/{_first_page.html.erb → twitter-bootstrap-4/_first_page.html.erb} +5 -3
- data/app/views/kaminari/{_gap.html.erb → twitter-bootstrap-4/_gap.html.erb} +5 -1
- data/app/views/kaminari/{_last_page.html.erb → twitter-bootstrap-4/_last_page.html.erb} +5 -3
- data/app/views/kaminari/{_next_page.html.erb → twitter-bootstrap-4/_next_page.html.erb} +5 -7
- data/app/views/kaminari/{_page.html.erb → twitter-bootstrap-4/_page.html.erb} +8 -2
- data/app/views/kaminari/{_paginator.html.erb → twitter-bootstrap-4/_paginator.html.erb} +3 -1
- data/app/views/kaminari/{_prev_page.html.erb → twitter-bootstrap-4/_prev_page.html.erb} +5 -7
- data/app/views/spree/admin/adjustments/_adjustment.html.erb +14 -4
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +6 -6
- data/app/views/spree/admin/adjustments/index.html.erb +7 -5
- data/app/views/spree/admin/countries/_form.html.erb +13 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +2 -2
- data/app/views/spree/admin/general_settings/edit.html.erb +14 -14
- data/app/views/spree/admin/images/_form.html.erb +2 -2
- data/app/views/spree/admin/images/edit.html.erb +6 -6
- data/app/views/spree/admin/option_types/_form.html.erb +2 -2
- data/app/views/spree/admin/option_types/edit.html.erb +5 -5
- data/app/views/spree/admin/orders/_add_line_item.html.erb +5 -5
- data/app/views/spree/admin/orders/_add_product.html.erb +5 -5
- data/app/views/spree/admin/orders/_adjustments.html.erb +4 -3
- data/app/views/spree/admin/orders/_line_items.html.erb +4 -4
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +3 -3
- data/app/views/spree/admin/orders/_shipment.html.erb +5 -5
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +17 -17
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +4 -4
- data/app/views/spree/admin/orders/index.html.erb +56 -33
- data/app/views/spree/admin/payment_methods/_form.html.erb +4 -4
- data/app/views/spree/admin/payments/_list.html.erb +3 -3
- data/app/views/spree/admin/payments/index.html.erb +1 -1
- data/app/views/spree/admin/product_properties/index.html.erb +10 -2
- data/app/views/spree/admin/products/_add_stock_form.html.erb +6 -6
- data/app/views/spree/admin/products/_form.html.erb +26 -31
- data/app/views/spree/admin/products/edit.html.erb +1 -1
- data/app/views/spree/admin/products/index.html.erb +5 -5
- data/app/views/spree/admin/products/new.html.erb +5 -5
- data/app/views/spree/admin/products/stock.html.erb +3 -3
- data/app/views/spree/admin/promotions/_actions.html.erb +4 -4
- data/app/views/spree/admin/promotions/_form.html.erb +7 -7
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +4 -4
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +12 -5
- data/app/views/spree/admin/promotions/_rules.html.erb +5 -5
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +5 -5
- data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +5 -5
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +3 -3
- data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +10 -6
- data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +10 -6
- data/app/views/spree/admin/promotions/edit.html.erb +5 -5
- data/app/views/spree/admin/promotions/index.html.erb +3 -3
- data/app/views/spree/admin/promotions/rules/_country.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +4 -4
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +8 -8
- data/app/views/spree/admin/promotions/rules/_product.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +2 -2
- data/app/views/spree/admin/promotions/rules/_user.html.erb +2 -2
- data/app/views/spree/admin/properties/_form.html.erb +2 -2
- data/app/views/spree/admin/properties/index.html.erb +3 -3
- data/app/views/spree/admin/prototypes/_prototypes.html.erb +10 -2
- data/app/views/spree/admin/reimbursement_types/_form.html.erb +6 -6
- data/app/views/spree/admin/reports/sales_total.html.erb +4 -2
- data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
- data/app/views/spree/admin/return_index/customer_returns.html.erb +3 -3
- data/app/views/spree/admin/return_index/return_authorizations.html.erb +15 -9
- data/app/views/spree/admin/shared/_account_nav.html.erb +60 -48
- data/app/views/spree/admin/shared/_address_form.html.erb +11 -4
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +4 -4
- data/app/views/spree/admin/shared/_content_header.html.erb +4 -4
- data/app/views/spree/admin/shared/_header.html.erb +18 -21
- data/app/views/spree/admin/shared/_index_table_options.html.erb +4 -5
- data/app/views/spree/admin/shared/_main_menu.html.erb +37 -35
- data/app/views/spree/admin/shared/_order_summary.html.erb +6 -7
- data/app/views/spree/admin/shared/_order_tabs.html.erb +47 -20
- data/app/views/spree/admin/shared/_product_tabs.html.erb +35 -11
- data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
- data/app/views/spree/admin/shared/_table_filter.html.erb +7 -5
- data/app/views/spree/admin/shared/_version.html.erb +4 -2
- data/app/views/spree/admin/shared/named_types/_form.html.erb +1 -1
- data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb +1 -1
- data/app/views/spree/admin/shared/sub_menu/_product.html.erb +1 -1
- data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb +1 -1
- data/app/views/spree/admin/shared/sub_menu/_returns.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +21 -21
- data/app/views/spree/admin/states/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +6 -6
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +4 -4
- data/app/views/spree/admin/stock_movements/index.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +34 -32
- data/app/views/spree/admin/stock_transfers/new.html.erb +13 -11
- data/app/views/spree/admin/stores/_form.html.erb +5 -6
- data/app/views/spree/admin/stores/index.html.erb +3 -1
- data/app/views/spree/admin/tax_categories/_form.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/_form.html.erb +11 -9
- data/app/views/spree/admin/taxons/_form.html.erb +4 -4
- data/app/views/spree/admin/users/_addresses_form.html.erb +10 -10
- data/app/views/spree/admin/users/_form.html.erb +2 -2
- data/app/views/spree/admin/users/_lifetime_stats.html.erb +3 -3
- data/app/views/spree/admin/users/_sidebar.html.erb +26 -11
- data/app/views/spree/admin/users/addresses.html.erb +4 -2
- data/app/views/spree/admin/users/edit.html.erb +8 -8
- data/app/views/spree/admin/users/index.html.erb +3 -3
- data/app/views/spree/admin/users/items.html.erb +2 -2
- data/app/views/spree/admin/users/orders.html.erb +2 -2
- data/app/views/spree/admin/variants/_autocomplete.js.erb +5 -5
- data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +1 -1
- data/app/views/spree/admin/variants/_form.html.erb +2 -2
- data/app/views/spree/admin/variants/_split.js.erb +3 -3
- data/app/views/spree/admin/variants/index.html.erb +2 -2
- data/app/views/spree/admin/variants/new.html.erb +8 -6
- data/app/views/spree/admin/zones/_country_members.html.erb +4 -4
- data/app/views/spree/admin/zones/_form.html.erb +9 -9
- data/app/views/spree/admin/zones/_state_members.html.erb +4 -4
- data/app/views/spree/admin/zones/index.html.erb +2 -2
- data/app/views/spree/layouts/admin.html.erb +9 -6
- data/lib/spree/backend.rb +3 -2
- data/lib/spree_backend.rb +2 -1
- data/spree_backend.gemspec +3 -2
- metadata +39 -27
- data/app/assets/stylesheets/spree/backend/components/_labels.scss +0 -55
- data/app/assets/stylesheets/spree/backend/components/_panels.scss +0 -3
- data/app/assets/stylesheets/spree/backend/components/_wells.scss +0 -3
- data/app/assets/stylesheets/spree/backend/sections/_account.scss +0 -20
@@ -7,7 +7,7 @@
|
|
7
7
|
type: calculator.preference_type(:base_amount)) %>
|
8
8
|
</div>
|
9
9
|
|
10
|
-
<div class="form-group
|
10
|
+
<div class="form-group mb-0">
|
11
11
|
<%= label_tag nil, Spree.t(:tiers) %>
|
12
12
|
<%= content_tag :div, nil, class: "hidden js-original-tiers",
|
13
13
|
data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
|
@@ -21,22 +21,26 @@
|
|
21
21
|
</script>
|
22
22
|
|
23
23
|
<script type="text/x-handlebars-template" id="tier-fields-template">
|
24
|
-
<div class="tier
|
25
|
-
<div class="
|
24
|
+
<div class="tier card mb-3">
|
25
|
+
<div class="card-body p-3">
|
26
26
|
<div class="form-group">
|
27
27
|
<div class="input-group">
|
28
|
-
<
|
28
|
+
<div class="input-group-prepend">
|
29
|
+
<div class="input-group-text">$</div>
|
30
|
+
</div>
|
29
31
|
<input class="js-base-input form-control" type="text" value={{baseField.value}}>
|
30
32
|
</div>
|
31
33
|
</div>
|
32
34
|
<div class="form-group">
|
33
35
|
<div class="input-group">
|
34
|
-
<
|
36
|
+
<div class="input-group-prepend">
|
37
|
+
<div class="input-group-text">$</div>
|
38
|
+
</div>
|
35
39
|
<input class="js-value-input form-control"
|
36
40
|
name="{{valueField.name}}" type="text" value={{valueField.value}}>
|
37
41
|
</div>
|
38
42
|
</div>
|
39
|
-
<a class="js-remove-tier btn btn-
|
43
|
+
<a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
|
40
44
|
</div>
|
41
45
|
</div>
|
42
46
|
</script>
|
@@ -7,7 +7,7 @@
|
|
7
7
|
type: calculator.preference_type(:base_percent)) %>
|
8
8
|
</div>
|
9
9
|
|
10
|
-
<div class="form-group
|
10
|
+
<div class="form-group mb-0">
|
11
11
|
<%= label_tag nil, Spree.t(:tiers) %>
|
12
12
|
<%= content_tag :div, nil, class: "hidden js-original-tiers",
|
13
13
|
data: { :'original-tiers' => Hash[calculator.preferred_tiers.sort] } %>
|
@@ -21,22 +21,26 @@
|
|
21
21
|
</script>
|
22
22
|
|
23
23
|
<script type="text/x-handlebars-template" id="tier-fields-template">
|
24
|
-
<div class="tier
|
25
|
-
<div class="
|
24
|
+
<div class="tier card mb-3">
|
25
|
+
<div class="card-body p-3">
|
26
26
|
<div class="form-group">
|
27
27
|
<div class="input-group">
|
28
|
-
<
|
28
|
+
<div class="input-group-prepend">
|
29
|
+
<div class="input-group-text">$</div>
|
30
|
+
</div>
|
29
31
|
<input class="js-base-input form-control" type="text" value={{baseField.value}}>
|
30
32
|
</div>
|
31
33
|
</div>
|
32
34
|
<div class="form-group">
|
33
35
|
<div class="input-group">
|
34
|
-
<
|
36
|
+
<div class="input-group-prepend">
|
37
|
+
<div class="input-group-text">%</div>
|
38
|
+
</div>
|
35
39
|
<input class="js-value-input form-control"
|
36
40
|
name="{{valueField.name}}" type="text" value={{valueField.value}}>
|
37
41
|
</div>
|
38
42
|
</div>
|
39
|
-
<a class="js-remove-tier btn btn-
|
43
|
+
<a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
|
40
44
|
</div>
|
41
45
|
</div>
|
42
46
|
</script>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
<%= form_for @promotion, url: object_url, method: :put do |f| %>
|
7
7
|
<div class="row">
|
8
|
-
<div class="col-
|
8
|
+
<div class="col-12">
|
9
9
|
<%= render partial: 'form', locals: { f: f } %>
|
10
10
|
<%= render partial: 'spree/admin/shared/edit_resource_links' %>
|
11
11
|
</div>
|
@@ -14,14 +14,14 @@
|
|
14
14
|
<% end %>
|
15
15
|
|
16
16
|
<div id="promotion-filters" class="row">
|
17
|
-
<div id="rules_container" class="col-
|
18
|
-
<div class="
|
17
|
+
<div id="rules_container" class="col-12 col-md-6">
|
18
|
+
<div class="card ">
|
19
19
|
<%= render partial: 'rules' %>
|
20
20
|
</div>
|
21
21
|
</div>
|
22
22
|
|
23
|
-
<div id="actions_container" class="col-
|
24
|
-
<div class="
|
23
|
+
<div id="actions_container" class="col-12 col-md-6">
|
24
|
+
<div class="card ">
|
25
25
|
<%= render partial: 'actions' %>
|
26
26
|
</div>
|
27
27
|
</div>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<div data-hook="admin_promotions_index_search">
|
11
11
|
<%= search_form_for [:admin, @search] do |f| %>
|
12
12
|
<div class="row">
|
13
|
-
<div class="col-
|
13
|
+
<div class="col-12 col-lg-6">
|
14
14
|
<div class="form-group">
|
15
15
|
<%= label_tag :q_name_cont, Spree.t(:name) %>
|
16
16
|
<%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target js-filterable" %>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
</div>
|
23
23
|
</div>
|
24
24
|
|
25
|
-
<div class="col-
|
25
|
+
<div class="col-12 col-lg-6">
|
26
26
|
<div class="form-group">
|
27
27
|
<%= label_tag :q_path_cont, Spree.t(:path) %>
|
28
28
|
<%= f.text_field :path_cont, tabindex: 1, class: "form-control js-filterable" %>
|
@@ -42,7 +42,7 @@
|
|
42
42
|
</div>
|
43
43
|
<% end %>
|
44
44
|
|
45
|
-
<%= paginate @promotions %>
|
45
|
+
<%= paginate @promotions, theme: 'twitter-bootstrap-4' %>
|
46
46
|
|
47
47
|
<% if @promotions.any? %>
|
48
48
|
<table class="table">
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="form-group
|
1
|
+
<div class="card-body">
|
2
|
+
<div class="form-group mb-0">
|
3
3
|
<%= label_tag Spree.t('country_rule.label') %>
|
4
4
|
<%= select_tag("#{param_prefix}[preferred_country_id]", options_for_select(Spree::Country.pluck(:name, :id), promotion_rule.preferred_country_id), { class: 'select_product form-control' }) %>
|
5
5
|
</div>
|
@@ -1,10 +1,10 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="row
|
3
|
-
<div class="form-group col-
|
1
|
+
<div class="card-body">
|
2
|
+
<div class="row mb-0">
|
3
|
+
<div class="form-group col-12 col-md-6 mb-0">
|
4
4
|
<%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'select2 select_item_total marginb' } %>
|
5
5
|
<%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'select2 select_item_total' } %>
|
6
6
|
</div>
|
7
|
-
<div class="form-group col-
|
7
|
+
<div class="form-group col-12 col-md-6 mb-0">
|
8
8
|
<%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'form-control marginb' %>
|
9
9
|
<%= text_field_tag "#{param_prefix}[preferred_amount_max]", promotion_rule.preferred_amount_max, class: 'form-control' %>
|
10
10
|
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<div class="
|
1
|
+
<div class="card-body">
|
2
2
|
<div class="promo-rule-option-values">
|
3
3
|
<div class="js-promo-rule-option-values"></div>
|
4
4
|
|
@@ -17,24 +17,24 @@
|
|
17
17
|
</script>
|
18
18
|
|
19
19
|
<script type="text/x-handlebars-template" id="promo-rule-option-value-template">
|
20
|
-
<div class="promo-rule-option-value panel
|
21
|
-
<div class="
|
20
|
+
<div class="promo-rule-option-value panel ">
|
21
|
+
<div class="card-header">
|
22
22
|
<a class="js-remove-promo-rule-option-value delete pull-right">
|
23
23
|
<span class="icon icon-delete"></span>
|
24
24
|
</a>
|
25
|
-
<div class="col-
|
25
|
+
<div class="col-12 col-md-6">
|
26
26
|
<label><%= Spree.t(:product) %></label>
|
27
27
|
</div>
|
28
|
-
<div class="col-
|
28
|
+
<div class="col-12 col-md-5">
|
29
29
|
<label><%= Spree.t(:option_values) %></label>
|
30
30
|
</div>
|
31
31
|
<div class="clearfix"></div>
|
32
32
|
</div>
|
33
|
-
<div class="
|
34
|
-
<div class="col-
|
33
|
+
<div class="card-body row">
|
34
|
+
<div class="col-12 col-md-6">
|
35
35
|
<input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
|
36
36
|
</div>
|
37
|
-
<div class="col-
|
37
|
+
<div class="col-12 col-md-6">
|
38
38
|
<input class="js-promo-rule-option-value-option-values-select fullwidth" name="<%= param_prefix %>[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
|
39
39
|
</div>
|
40
40
|
</div>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<div class="
|
1
|
+
<div class="card-body">
|
2
2
|
<div class="form-group products_rule_products">
|
3
3
|
<%= label_tag "#{param_prefix}_product_ids_string", Spree.t('product_rule.choose_products') %>
|
4
4
|
<%= hidden_field_tag "#{param_prefix}[product_ids_string]", promotion_rule.product_ids.join(","), class: "product_picker" %>
|
5
5
|
</div>
|
6
|
-
<div class="form-group
|
6
|
+
<div class="form-group mb-0">
|
7
7
|
<%= label_tag Spree.t('product_rule.label') %>
|
8
8
|
<%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Product::MATCH_POLICIES.map{|s| [Spree.t("product_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_product form-control'}) %>
|
9
9
|
</div>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<div class="
|
1
|
+
<div class="card-body">
|
2
2
|
<div class="form-group taxons_rule_taxons">
|
3
3
|
<%= label_tag "#{param_prefix}_taxon_ids_string", Spree.t('taxon_rule.choose_taxons') %>
|
4
4
|
<%= hidden_field_tag "#{param_prefix}[taxon_ids_string]", promotion_rule.taxon_ids.join(","), class: "taxon_picker", id: 'product_taxon_ids' %>
|
5
5
|
</div>
|
6
|
-
<div class="form-group
|
6
|
+
<div class="form-group mb-0">
|
7
7
|
<%= label_tag Spree.t('taxon_rule.label') %>
|
8
8
|
<%= select_tag("#{param_prefix}[preferred_match_policy]", options_for_select(Spree::Promotion::Rules::Taxon::MATCH_POLICIES.map{|s| [Spree.t("taxon_rule.match_#{s}"),s] }, promotion_rule.preferred_match_policy), {class: 'select_taxon form-control'}) %>
|
9
9
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="
|
2
|
-
<div class="form-group
|
1
|
+
<div class="card-body">
|
2
|
+
<div class="form-group mb-0">
|
3
3
|
<%= label_tag Spree.t('user_rule.choose_users') %>
|
4
4
|
<input type='hidden' name='<%= param_prefix %>[user_ids_string]' class='user_picker' value='<%= promotion_rule.user_ids.join(",") %>'>
|
5
5
|
</div>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<div data-hook="admin_property_form" class="row">
|
2
|
-
<div class="col-
|
2
|
+
<div class="col-12 col-md-6">
|
3
3
|
<%= f.field_container :name, class: ['form-group'] do %>
|
4
4
|
<%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
|
5
5
|
<%= f.text_field :name, class: 'form-control' %>
|
6
6
|
<%= f.error_message_on :name %>
|
7
7
|
<% end %>
|
8
8
|
</div>
|
9
|
-
<div class="col-
|
9
|
+
<div class="col-12 col-md-6">
|
10
10
|
<%= f.field_container :presentation, class: ['form-group'] do %>
|
11
11
|
<%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
|
12
12
|
<%= f.text_field :presentation, class: 'form-control' %>
|
@@ -13,14 +13,14 @@
|
|
13
13
|
<%- locals = {f: f} %>
|
14
14
|
|
15
15
|
<div class="row">
|
16
|
-
<div class="col-
|
16
|
+
<div class="col-12 col-lg-6">
|
17
17
|
<div data-hook="admin_property_index_search" class="form-group">
|
18
18
|
<%= f.label :name_cont, Spree.t(:name) %>
|
19
19
|
<%= f.text_field :name_cont, class: "form-control js-quick-search-target js-filterable" %>
|
20
20
|
</div>
|
21
21
|
</div>
|
22
22
|
|
23
|
-
<div class="col-
|
23
|
+
<div class="col-12 col-lg-6">
|
24
24
|
<div class="form-group">
|
25
25
|
<%= f.label :presentation_cont, Spree.t(:presentation) %>
|
26
26
|
<%= f.text_field :presentation_cont, class: "form-control js-filterable" %>
|
@@ -65,4 +65,4 @@
|
|
65
65
|
</div>
|
66
66
|
<% end %>
|
67
67
|
|
68
|
-
<%= paginate @collection %>
|
68
|
+
<%= paginate @collection, theme: 'twitter-bootstrap-4' %>
|
@@ -10,12 +10,20 @@
|
|
10
10
|
<tr id="row_<%= prototype.id %>" data-hook="available_row">
|
11
11
|
<td><%= prototype.name %></td>
|
12
12
|
<td class="actions actions-1">
|
13
|
-
<%= link_to_with_icon 'save',
|
13
|
+
<%= link_to_with_icon 'save',
|
14
|
+
Spree.t(:select),
|
15
|
+
select_admin_prototype_url(prototype),
|
16
|
+
class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
|
17
|
+
no_text: true %>
|
14
18
|
</td>
|
15
19
|
</tr>
|
16
20
|
<% end %>
|
17
21
|
<% if @prototypes.empty? %>
|
18
|
-
|
22
|
+
<tr data-hook="available_none">
|
23
|
+
<td colspan="2">
|
24
|
+
<% Spree.t(:none) %>.
|
25
|
+
</td>
|
26
|
+
</tr>
|
19
27
|
<% end %>
|
20
28
|
</tbody>
|
21
29
|
</table>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<div data-hook="admin_reimbursement_type_form_fields" class="row">
|
2
|
-
<div class="col-
|
2
|
+
<div class="col-12 col-md-8">
|
3
3
|
<%= f.field_container :name, class: ['form-group'] do %>
|
4
4
|
<%= f.label :name, Spree.t(:name) %>
|
5
5
|
<%= f.text_field :name, class:'form-control' %>
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<% end %>
|
8
8
|
</div>
|
9
9
|
<%- if @reimbursement_type.new_record? %>
|
10
|
-
<div class="col-
|
10
|
+
<div class="col-12 col-md-8">
|
11
11
|
<%= f.field_container :type, class: ['form-group'] do %>
|
12
12
|
<%= f.label :type, Spree.t(:type) %>
|
13
13
|
<%= f.select :type, options_for_select(Spree::ReimbursementType::KINDS), {:include_blank => false}, { :class => 'select2' } %>
|
@@ -15,16 +15,16 @@
|
|
15
15
|
<% end %>
|
16
16
|
</div>
|
17
17
|
<% end %>
|
18
|
-
<div class="col-
|
18
|
+
<div class="col-12 col-md-5">
|
19
19
|
<%= f.field_container :active, class: ['form-inline'] do %>
|
20
|
-
<%= f.check_box :active, class: 'form-control' %>
|
20
|
+
<%= f.check_box :active, class: 'form-control mr-1' %>
|
21
21
|
<%= f.label :active, Spree.t(:active) %>
|
22
22
|
<%= f.error_message_on :active %>
|
23
23
|
<% end %>
|
24
24
|
</div>
|
25
|
-
<div class="col-
|
25
|
+
<div class="col-12 col-md-5">
|
26
26
|
<%= f.field_container :mutable, class: ['form-inline'] do %>
|
27
|
-
<%= f.check_box :mutable, class: 'form-control' %>
|
27
|
+
<%= f.check_box :mutable, class: 'form-control mr-1' %>
|
28
28
|
<%= f.label :mutable, Spree.t(:mutable) %>
|
29
29
|
<%= f.error_message_on :mutable %>
|
30
30
|
<% end %>
|
@@ -3,8 +3,10 @@
|
|
3
3
|
<%= Spree.t(:sales_totals) %>
|
4
4
|
<% end %>
|
5
5
|
|
6
|
-
<div class="
|
7
|
-
|
6
|
+
<div class="card bg-light mb-3">
|
7
|
+
<div class="card-body">
|
8
|
+
<%= render partial: 'spree/admin/shared/report_order_criteria' %>
|
9
|
+
</div>
|
8
10
|
</div>
|
9
11
|
|
10
12
|
<table class="table table-bordered admin-report" data-hook="sales_total">
|
@@ -26,7 +26,7 @@
|
|
26
26
|
<tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
|
27
27
|
<td><%= return_authorization.number %></td>
|
28
28
|
<td>
|
29
|
-
<span class="
|
29
|
+
<span class="badge badge-<%= return_authorization.state %>">
|
30
30
|
<%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
|
31
31
|
</span>
|
32
32
|
</td>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<div data-hook="admin_return_authorisations_index_filters">
|
7
7
|
<%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path do |f| %>
|
8
8
|
<div class="row">
|
9
|
-
<div class="col-
|
9
|
+
<div class="col-12">
|
10
10
|
<div class="form-group">
|
11
11
|
<%= f.label :number_cont, Spree.t(:number) %>
|
12
12
|
<%= f.text_field :number_cont, class: "form-control js-quick-search-target js-filterable" %>
|
@@ -42,9 +42,9 @@
|
|
42
42
|
<td><%= link_to customer_return.order.number, spree.edit_admin_order_path(customer_return.order) %></td>
|
43
43
|
<td>
|
44
44
|
<% if customer_return.fully_reimbursed? %>
|
45
|
-
<span class="
|
45
|
+
<span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
|
46
46
|
<% else %>
|
47
|
-
<span class="
|
47
|
+
<span class="badge badge-info"><%= Spree.t(:incomplete) %></span>
|
48
48
|
<% end %>
|
49
49
|
</td>
|
50
50
|
<td><%= customer_return.display_pre_tax_total.to_html %></td>
|
@@ -3,14 +3,20 @@
|
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<% content_for :page_tabs do %>
|
6
|
-
<li class="
|
7
|
-
<%= link_to Spree.t(:all),
|
6
|
+
<li class="nav-item">
|
7
|
+
<%= link_to Spree.t(:all),
|
8
|
+
spree.admin_return_authorizations_path,
|
9
|
+
class: "nav-link #{'active' if params[:q][:state_eq].blank?}" %>
|
8
10
|
</li>
|
9
|
-
<li class="
|
10
|
-
<%= link_to Spree.t(:authorized),
|
11
|
+
<li class="nav-item">
|
12
|
+
<%= link_to Spree.t(:authorized),
|
13
|
+
params.merge({q: {state_eq: :authorized}}).permit!,
|
14
|
+
class: "nav-link #{'active' if params[:q][:state_eq] == 'authorized'}" %>
|
11
15
|
</li>
|
12
|
-
<li class="
|
13
|
-
<%= link_to Spree.t(:canceled),
|
16
|
+
<li class="nav-item">
|
17
|
+
<%= link_to Spree.t(:canceled),
|
18
|
+
params.merge({q: {state_eq: :canceled}}).permit!,
|
19
|
+
class: "nav-link #{'active' if params[:q][:state_eq] == 'canceled'}" %>
|
14
20
|
</li>
|
15
21
|
<% end %>
|
16
22
|
|
@@ -18,13 +24,13 @@
|
|
18
24
|
<div data-hook="admin_return_authorisations_index_filters">
|
19
25
|
<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path do |f| %>
|
20
26
|
<div class="row">
|
21
|
-
<div class="col-
|
27
|
+
<div class="col-12 col-lg-6">
|
22
28
|
<div class="form-group">
|
23
29
|
<%= f.label :number_cont, Spree.t(:number) %>
|
24
30
|
<%= f.text_field :number_cont, class: "form-control js-quick-search-target js-filterable" %>
|
25
31
|
</div>
|
26
32
|
</div>
|
27
|
-
<div class="col-
|
33
|
+
<div class="col-12 col-lg-6">
|
28
34
|
<div class="form-group">
|
29
35
|
<%= label_tag :q_state_eq, Spree.t(:status) %>
|
30
36
|
<%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
|
@@ -58,7 +64,7 @@
|
|
58
64
|
<td><%= link_to return_authorization.number, spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization) %></td>
|
59
65
|
<td><%= link_to return_authorization.order.number, spree.edit_admin_order_path(return_authorization.order) %></td>
|
60
66
|
<td>
|
61
|
-
<span class="
|
67
|
+
<span class="badge badge-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
|
62
68
|
</td>
|
63
69
|
<td class="actions actions-1 text-right">
|
64
70
|
<%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
|
@@ -1,61 +1,73 @@
|
|
1
1
|
<% if try_spree_current_user %>
|
2
|
-
<ul class="nav navbar-nav">
|
3
|
-
<li class="dropdown user user-menu">
|
4
|
-
<
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
2
|
+
<ul class="nav navbar-nav align-items-end h-100 justify-content-center">
|
3
|
+
<li class="dropdown user user-menu h-100">
|
4
|
+
<div class="dropdown d-flex align-items-center h-100">
|
5
|
+
<button class="dropdown-toggle btn btn-link text-white h-100" data-toggle="dropdown">
|
6
|
+
<i class="glyphicon glyphicon-user"></i>
|
7
|
+
<span>
|
8
|
+
<%= try_spree_current_user.email %> <i class="caret"></i>
|
9
|
+
</span>
|
10
|
+
</button>
|
11
|
+
|
12
|
+
<ul class="dropdown-menu position-absolute mt-0 rounded-0 border-top-0">
|
13
|
+
<% if spree.respond_to? :root_path %>
|
14
|
+
<li class="dropdown-item p-0">
|
15
|
+
<%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-2 px-4' do %>
|
16
|
+
<i class="glyphicon glyphicon-new-window"></i>
|
17
|
+
|
18
|
+
<%= Spree.t(:back_to_store) %>
|
19
|
+
<% end %>
|
20
|
+
</li>
|
21
|
+
<% end %>
|
22
|
+
|
23
|
+
<% if can?(:manage, try_spree_current_user) %>
|
24
|
+
<li class="dropdown-item p-0">
|
25
|
+
<%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block text-dark py-2 px-4' do %>
|
26
|
+
<i class="glyphicon glyphicon-user"></i>
|
27
|
+
|
28
|
+
<%= Spree.t(:account) %>
|
29
|
+
<% end %>
|
30
|
+
</li>
|
31
|
+
<% end %>
|
32
|
+
|
33
|
+
<% if spree.respond_to? :admin_logout_path %>
|
34
|
+
<li class="dropdown-item p-0">
|
35
|
+
<%= link_to spree.admin_logout_path, class: 'd-block text-dark py-2 px-4' do %>
|
36
|
+
<i class="glyphicon glyphicon-log-out"></i>
|
37
|
+
|
38
|
+
<%= Spree.t(:logout) %>
|
39
|
+
<% end %>
|
40
|
+
</li>
|
41
|
+
<% end %>
|
42
|
+
|
43
|
+
<div class="dropdown-divider"></div>
|
44
|
+
|
45
|
+
<li class="dropdown-item p-0">
|
46
|
+
<%= link_to 'http://guides.spreecommerce.org', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
|
47
|
+
<i class="glyphicon glyphicon-info-sign"></i>
|
13
48
|
|
14
|
-
<%= Spree.t(:
|
49
|
+
<%= Spree.t(:help_center) %>
|
15
50
|
<% end %>
|
16
51
|
</li>
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
<i class="glyphicon glyphicon-user"></i>
|
52
|
+
|
53
|
+
<li class="dropdown-item p-0">
|
54
|
+
<%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
|
55
|
+
<i class="glyphicon glyphicon-comment"></i>
|
22
56
|
|
23
|
-
<%= Spree.t(:
|
57
|
+
<%= Spree.t(:join_slack) %>
|
24
58
|
<% end %>
|
25
59
|
</li>
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
<i class="glyphicon glyphicon-log-out"></i>
|
60
|
+
|
61
|
+
<li class="dropdown-item p-0">
|
62
|
+
<%= link_to 'https://github.com/spree-contrib', target: :blank, class: 'd-block text-dark py-2 px-4' do %>
|
63
|
+
<i class="glyphicon glyphicon-download"></i>
|
31
64
|
|
32
|
-
<%= Spree.t(:
|
65
|
+
<%= Spree.t(:extensions_directory) %>
|
33
66
|
<% end %>
|
34
67
|
</li>
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
<%= link_to 'http://guides.spreecommerce.org', target: :blank do %>
|
39
|
-
<i class="glyphicon glyphicon-info-sign"></i>
|
40
|
-
|
41
|
-
<%= Spree.t(:help_center) %>
|
42
|
-
<% end %>
|
43
|
-
</li>
|
44
|
-
<li>
|
45
|
-
<%= link_to 'http://slack.spreecommerce.org', target: :blank do %>
|
46
|
-
<i class="glyphicon glyphicon-comment"></i>
|
47
|
-
|
48
|
-
<%= Spree.t(:join_slack) %>
|
49
|
-
<% end %>
|
50
|
-
</li>
|
51
|
-
<li>
|
52
|
-
<%= link_to 'https://github.com/spree-contrib', target: :blank do %>
|
53
|
-
<i class="glyphicon glyphicon-download"></i>
|
54
|
-
|
55
|
-
<%= Spree.t(:extensions_directory) %>
|
56
|
-
<% end %>
|
57
|
-
</li>
|
58
|
-
</ul>
|
68
|
+
</ul>
|
69
|
+
</div>
|
70
|
+
|
59
71
|
</li>
|
60
72
|
</ul>
|
61
73
|
<% end %>
|