spree_backend 4.2.0.beta → 4.2.0.rc5
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 +0 -1
- data/app/assets/javascripts/spree/backend/address_states.js +20 -9
- data/app/assets/javascripts/spree/backend/admin.js +8 -9
- data/app/assets/javascripts/spree/backend/calculator.js +2 -0
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +99 -71
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +1 -1
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +31 -37
- data/app/assets/javascripts/spree/backend/option_value_picker.js +50 -23
- data/app/assets/javascripts/spree/backend/product_picker.js +35 -19
- data/app/assets/javascripts/spree/backend/promotions.js +32 -27
- data/app/assets/javascripts/spree/backend/shipments.js +28 -37
- data/app/assets/javascripts/spree/backend/spree-select2.js +33 -14
- data/app/assets/javascripts/spree/backend/stock_transfer.js +32 -13
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +30 -43
- data/app/assets/javascripts/spree/backend/taxons.js +60 -47
- data/app/assets/javascripts/spree/backend/user_picker.js +16 -18
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js +23 -22
- data/app/assets/stylesheets/spree/backend/components/_badges.scss +1 -1
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +2 -2
- data/app/assets/stylesheets/spree/backend/global/_variables.scss +1 -1
- data/app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss +11 -0
- data/app/assets/stylesheets/spree/backend/plugins/select2_bootstrap4.scss +622 -0
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +4 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +2 -1
- data/app/controllers/spree/admin/adjustments_controller.rb +8 -0
- data/app/controllers/spree/admin/base_controller.rb +1 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
- 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/orders_controller.rb +15 -2
- data/app/controllers/spree/admin/prices_controller.rb +0 -13
- data/app/controllers/spree/admin/products_controller.rb +2 -2
- data/app/controllers/spree/admin/states_controller.rb +1 -1
- data/app/controllers/spree/admin/stores_controller.rb +5 -14
- data/app/controllers/spree/admin/taxons_controller.rb +15 -5
- data/app/helpers/spree/admin/base_helper.rb +67 -5
- data/app/helpers/spree/admin/navigation_helper.rb +11 -1
- data/app/helpers/spree/admin/payments_helper.rb +3 -3
- data/app/helpers/spree/admin/stock_movements_helper.rb +2 -0
- data/app/helpers/spree/admin/stores_helper.rb +9 -0
- 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/countries/index.html.erb +6 -6
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +48 -46
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +3 -1
- data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/new.html.erb +1 -1
- data/app/views/spree/admin/general_settings/edit.html.erb +27 -4
- 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/_form.html.erb +9 -0
- data/app/views/spree/admin/option_types/index.html.erb +3 -1
- data/app/views/spree/admin/orders/_add_line_item.html.erb +1 -1
- data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
- data/app/views/spree/admin/orders/_channel_form.html.erb +18 -0
- 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 +3 -2
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_store_form.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +1 -1
- data/app/views/spree/admin/orders/channel.html.erb +7 -0
- data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb +35 -12
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +3 -3
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/index.html.erb +12 -11
- data/app/views/spree/admin/payment_methods/_form.html.erb +65 -46
- data/app/views/spree/admin/payment_methods/index.html.erb +2 -2
- 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 +2 -2
- 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 +8 -9
- data/app/views/spree/admin/products/index.html.erb +3 -2
- data/app/views/spree/admin/products/new.html.erb +5 -3
- data/app/views/spree/admin/products/stock.html.erb +2 -2
- data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -3
- data/app/views/spree/admin/promotions/_form.html.erb +7 -7
- 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/actions/_create_line_items.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +7 -5
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +8 -7
- data/app/views/spree/admin/promotions/rules/_product.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_user.html.erb +1 -1
- 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 +3 -3
- data/app/views/spree/admin/reimbursements/edit.html.erb +5 -4
- data/app/views/spree/admin/reimbursements/show.html.erb +3 -1
- data/app/views/spree/admin/return_authorizations/_form.html.erb +7 -5
- data/app/views/spree/admin/return_authorizations/index.html.erb +2 -2
- data/app/views/spree/admin/return_index/customer_returns.html.erb +2 -2
- data/app/views/spree/admin/return_index/return_authorizations.html.erb +2 -2
- data/app/views/spree/admin/roles/index.html.erb +1 -1
- data/app/views/spree/admin/shared/_account_nav.html.erb +3 -3
- data/app/views/spree/admin/shared/_address_form.html.erb +9 -9
- data/app/views/spree/admin/shared/_error_messages.html.erb +1 -1
- data/app/views/spree/admin/shared/_head.html.erb +6 -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/_order_summary.html.erb +25 -21
- data/app/views/spree/admin/shared/_order_tabs.html.erb +9 -0
- data/app/views/spree/admin/shared/_refunds.html.erb +2 -2
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +4 -2
- data/app/views/spree/admin/shared/_translations.html.erb +10 -38
- data/app/views/spree/admin/shared/_update_order_state.js.erb +6 -2
- data/app/views/spree/admin/shared/named_types/_index.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/_form.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/index.html.erb +7 -3
- data/app/views/spree/admin/states/index.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/index.html.erb +6 -6
- 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/_stock_movements.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +42 -37
- 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 +92 -23
- data/app/views/spree/admin/stores/index.html.erb +12 -7
- data/app/views/spree/admin/tax_categories/index.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/index.html.erb +8 -8
- 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 +38 -35
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
- data/app/views/spree/admin/taxons/index.html.erb +1 -1
- data/app/views/spree/admin/users/_addresses_form.html.erb +4 -6
- 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 +5 -3
- 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/index.html.erb +1 -1
- 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/config/routes.rb +7 -1
- data/spree_backend.gemspec +2 -2
- metadata +21 -20
- data/app/assets/javascripts/spree/backend/flatpickr_locals.js +0 -37
- data/app/assets/javascripts/spree/backend/tag_picker.js +0 -52
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +0 -190
- data/app/views/spree/admin/general_settings/_form.html.erb +0 -27
@@ -24,7 +24,7 @@
|
|
24
24
|
</td>
|
25
25
|
<td class="line-item-name text-center">
|
26
26
|
<%= link_to item.name, edit_admin_product_path(item.variant.product) %>
|
27
|
-
<br
|
27
|
+
<br>
|
28
28
|
<%= "(#{item.options_text})" if item.options_text.present? %>
|
29
29
|
</td>
|
30
30
|
<td class="line-item-price text-center"><%= item.single_money.to_html %></td>
|
@@ -7,18 +7,15 @@
|
|
7
7
|
<%= render "spree/admin/orders/adjustments",
|
8
8
|
adjustments: @order.line_item_adjustments,
|
9
9
|
order: order,
|
10
|
-
title: Spree.t(:line_item_adjustments)
|
11
|
-
%>
|
10
|
+
title: Spree.t(:line_item_adjustments) %>
|
12
11
|
<%= render "spree/admin/orders/adjustments",
|
13
12
|
adjustments: @order.shipment_adjustments,
|
14
13
|
order: order,
|
15
|
-
title: Spree.t(:shipment_adjustments)
|
16
|
-
%>
|
14
|
+
title: Spree.t(:shipment_adjustments) %>
|
17
15
|
<%= render "spree/admin/orders/adjustments",
|
18
16
|
adjustments: @order.adjustments,
|
19
17
|
order: order,
|
20
|
-
title: Spree.t(:order_adjustments)
|
21
|
-
%>
|
18
|
+
title: Spree.t(:order_adjustments) %>
|
22
19
|
|
23
20
|
<% if order.line_items.exists? %>
|
24
21
|
<div class="alert alert-success" id="order-total" data-hook="order_details_total">
|
@@ -26,7 +23,7 @@
|
|
26
23
|
</div>
|
27
24
|
<% end %>
|
28
25
|
|
29
|
-
|
26
|
+
<script>
|
30
27
|
var order_number = '<%= @order.number %>';
|
31
28
|
var shipments = [];
|
32
29
|
|
@@ -35,5 +32,5 @@
|
|
35
32
|
<% end %>
|
36
33
|
|
37
34
|
<%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
|
38
|
-
|
35
|
+
</script>
|
39
36
|
</div>
|
@@ -3,10 +3,10 @@
|
|
3
3
|
<div class="table-responsive">
|
4
4
|
<table class="table table-condensed table-bordered">
|
5
5
|
<thead>
|
6
|
-
<th><%= Spree.t('risk')%></th>
|
7
|
-
<th><%= Spree.t('status')%></th>
|
6
|
+
<th><%= Spree.t('risk') %></th>
|
7
|
+
<th><%= Spree.t('status') %></th>
|
8
8
|
</thead>
|
9
|
-
<tbody id="risk-analysis" data-hook="order_details_adjustments"
|
9
|
+
<tbody id="risk-analysis" data-hook="order_details_adjustments" class="with-border">
|
10
10
|
<tr class="">
|
11
11
|
<td>
|
12
12
|
<strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
|
@@ -8,7 +8,9 @@
|
|
8
8
|
-
|
9
9
|
<span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
|
10
10
|
<%= Spree.t(:package_from) %>
|
11
|
-
<strong class="stock-location-name" data-hook="stock-location-name">
|
11
|
+
<strong class="stock-location-name" data-hook="stock-location-name">
|
12
|
+
<%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
|
13
|
+
</strong>
|
12
14
|
<% if shipment.ready? and can? :update, shipment %>
|
13
15
|
<%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
|
14
16
|
<div class='clearfix'></div>
|
@@ -69,7 +71,6 @@
|
|
69
71
|
</td>
|
70
72
|
</tr>
|
71
73
|
|
72
|
-
|
73
74
|
<tr class="edit-tracking is-hidden total">
|
74
75
|
<td colspan="5">
|
75
76
|
<label><%= Spree.t(:tracking_number) %>:</label>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
|
7
7
|
<td class="item-name">
|
8
8
|
<%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %>
|
9
|
-
<br
|
9
|
+
<br>
|
10
10
|
<%= "(#{item.variant.options_text})" if item.variant.options_text.present? %>
|
11
11
|
<% if item.variant.sku.present? %>
|
12
12
|
<strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<div data-hook="admin_order_store_field">
|
5
5
|
<%= f.field_container :store_id, class: ['form-group'] do %>
|
6
6
|
<%= f.label :store_id, Spree.t(:store) %>
|
7
|
-
<%= f.collection_select(:store_id, @stores, :id, :
|
7
|
+
<%= f.collection_select(:store_id, @stores, :id, :unique_name, { include_blank: false }, { class: "select2" }) %>
|
8
8
|
<%= f.error_message_on :store_id %>
|
9
9
|
<% end %>
|
10
10
|
</div>
|
@@ -1,19 +1,42 @@
|
|
1
1
|
<script type='text/template' id='customer_autocomplete_template'>
|
2
|
-
<div class='customer-autocomplete-item'>
|
3
|
-
<div class=
|
4
|
-
<
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
2
|
+
<div class='customer-autocomplete-item container'>
|
3
|
+
<div class="row">
|
4
|
+
<div class="col">
|
5
|
+
<h5><strong>Email:</strong> {{customer.email}}</h5>
|
6
|
+
</div>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
<div class="row">
|
10
|
+
<div class='customer-details col-6'>
|
11
|
+
{{#if bill_address.firstname }}
|
12
|
+
<strong>{{t 'bill_address' }}</strong><br>
|
13
|
+
{{bill_address.firstname}} {{bill_address.lastname}}<br>
|
14
|
+
{{bill_address.address1}}, {{bill_address.address2}}<br>
|
15
|
+
{{bill_address.city}}<br>
|
16
|
+
{{#if bill_address.state_id }}
|
17
|
+
{{bill_address.state.name}}
|
18
|
+
{{else}}
|
19
|
+
{{bill_address.state_name}}
|
20
|
+
{{/if}}
|
21
|
+
{{bill_address.country.name}}
|
22
|
+
{{/if}}
|
23
|
+
</div>
|
24
|
+
|
25
|
+
<div class='customer-details col-6'>
|
26
|
+
{{#if ship_address.firstname }}
|
27
|
+
<strong>Shipping Address</strong><br>
|
28
|
+
{{ship_address.firstname}} {{ship_address.lastname}}<br>
|
29
|
+
{{ship_address.address1}}, {{ship_address.address2}}<br>
|
30
|
+
{{ship_address.city}}<br>
|
31
|
+
{{#if ship_address.state_id }}
|
32
|
+
{{ship_address.state.name}}
|
12
33
|
{{else}}
|
13
|
-
{{
|
34
|
+
{{ship_address.state_name}}
|
14
35
|
{{/if}}
|
15
|
-
{{
|
36
|
+
{{ship_address.country.name}}
|
16
37
|
{{/if}}
|
17
38
|
</div>
|
39
|
+
|
18
40
|
</div>
|
41
|
+
</div>
|
19
42
|
</script>
|
@@ -33,7 +33,7 @@
|
|
33
33
|
</span>
|
34
34
|
</div>
|
35
35
|
<% else %>
|
36
|
-
<div class="radio
|
36
|
+
<div class="radio mt-0">
|
37
37
|
<%= label_tag :guest_checkout_true do %>
|
38
38
|
<%= radio_button_tag :guest_checkout, true, guest %>
|
39
39
|
<%= Spree.t(:say_yes) %>
|
@@ -83,8 +83,8 @@
|
|
83
83
|
<%= f.fields_for :ship_address do |sa_form| %>
|
84
84
|
<div class="form-group">
|
85
85
|
<span data-hook="use_billing">
|
86
|
-
<%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address
|
87
|
-
<%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
|
86
|
+
<%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address?, class: 'checkbox' %>
|
87
|
+
<%= label_tag 'order[use_billing]', Spree.t(:use_billing_address), class: 'form-check-label' %>
|
88
88
|
</span>
|
89
89
|
</div>
|
90
90
|
|
@@ -12,7 +12,7 @@
|
|
12
12
|
</h1>
|
13
13
|
</div>
|
14
14
|
<div class="card-body" id="customer-search-field">
|
15
|
-
<%=
|
15
|
+
<%= select_tag :customer_search, nil, class: 'd-block w-100' %>
|
16
16
|
<%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
|
17
17
|
</div>
|
18
18
|
</div>
|
@@ -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-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
|
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-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
|
39
41
|
data-min-date="<%= params[:q][:created_at_gt] %>">
|
40
42
|
|
41
43
|
<%= f.text_field :created_at_lt,
|
@@ -67,21 +69,21 @@
|
|
67
69
|
<%= f.select :state_eq,
|
68
70
|
Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
|
69
71
|
{ include_blank: true },
|
70
|
-
class: 'select2 js-filterable' %>
|
72
|
+
class: 'select2-clear js-filterable' %>
|
71
73
|
</div>
|
72
74
|
</div>
|
73
75
|
|
74
76
|
<div class="col-12 col-lg-4">
|
75
77
|
<div class="form-group">
|
76
78
|
<%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
|
77
|
-
<%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
|
79
|
+
<%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
|
78
80
|
</div>
|
79
81
|
</div>
|
80
82
|
|
81
83
|
<div class="col-12 col-lg-4">
|
82
84
|
<div class="form-group">
|
83
85
|
<%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
|
84
|
-
<%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
|
86
|
+
<%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
|
85
87
|
</div>
|
86
88
|
</div>
|
87
89
|
|
@@ -124,21 +126,21 @@
|
|
124
126
|
<div class="col-12 col-lg-4">
|
125
127
|
<div class="form-group">
|
126
128
|
<%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
|
127
|
-
<%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
|
129
|
+
<%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
|
128
130
|
</div>
|
129
131
|
</div>
|
130
132
|
|
131
133
|
<div class="col-12 col-lg-4">
|
132
134
|
<div class="form-group">
|
133
135
|
<%= label_tag :q_store_id_in, Spree.t(:store) %>
|
134
|
-
<%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
|
136
|
+
<%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
|
135
137
|
</div>
|
136
138
|
</div>
|
137
139
|
|
138
140
|
<div class="col-12 col-lg-4">
|
139
141
|
<div class="form-group">
|
140
142
|
<%= label_tag :q_channel_eq, Spree.t(:channel) %>
|
141
|
-
<%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2 js-filterable' %>
|
143
|
+
<%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
|
142
144
|
</div>
|
143
145
|
</div>
|
144
146
|
|
@@ -206,22 +208,21 @@
|
|
206
208
|
<%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
|
207
209
|
</td>
|
208
210
|
<td>
|
209
|
-
<span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
|
211
|
+
<span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %> text-uppercase">
|
210
212
|
<%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
|
211
213
|
</span>
|
212
214
|
</td>
|
213
215
|
<td class="no-wrap">
|
214
|
-
<span class="badge badge-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state
|
216
|
+
<span class="badge badge-<%= order.state.downcase %> text-uppercase"><%= Spree.t("order_state.#{order.state}") %></span>
|
215
217
|
<span class="filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>">
|
216
218
|
<%= svg_icon name: "filter.svg", width: '14', height: '14' %>
|
217
219
|
</span>
|
218
220
|
</td>
|
219
221
|
<td class="no-wrap">
|
220
222
|
<% if order.payment_state %>
|
221
|
-
|
222
223
|
<%= link_to Spree.t("payment_states.#{order.payment_state}"),
|
223
224
|
admin_order_payments_path(order),
|
224
|
-
class: "badge badge-#{order.payment_state}" %>
|
225
|
+
class: "badge badge-#{order.payment_state} text-uppercase" %>
|
225
226
|
|
226
227
|
<span class="filterable js-add-filter"
|
227
228
|
data-ransack-field="q_payment_state_eq"
|
@@ -233,7 +234,7 @@
|
|
233
234
|
<% if Spree::Order.checkout_step_names.include?(:delivery) %>
|
234
235
|
<td class="no-wrap">
|
235
236
|
<% if order.shipment_state %>
|
236
|
-
<span class="badge badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
|
237
|
+
<span class="badge badge-<%= order.shipment_state %> text-uppercase"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
|
237
238
|
<span class="filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>">
|
238
239
|
<%= svg_icon name: "filter.svg", width: '14', height: '14' %>
|
239
240
|
</span>
|
@@ -2,59 +2,78 @@
|
|
2
2
|
|
3
3
|
<div data-hook="payment_method" class="row">
|
4
4
|
|
5
|
-
<div class="col-12 col-md-
|
6
|
-
<div
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
<% unless @object.new_record? %>
|
11
|
-
<%= preference_fields(@object, f) %>
|
12
|
-
|
13
|
-
<% if @object.respond_to?(:preferences) %>
|
14
|
-
<div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
|
15
|
-
<% end %>
|
16
|
-
<% end %>
|
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>
|
22
|
-
<div data-hook="display" class="form-group">
|
23
|
-
<%= label_tag :payment_method_display_on, Spree.t(:display) %>
|
24
|
-
<%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
|
25
|
-
</div>
|
26
|
-
<div data-hook="auto_capture" class="form-group">
|
27
|
-
<%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
|
28
|
-
<%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
|
29
|
-
</div>
|
30
|
-
<div data-hook="active" class="form-group">
|
31
|
-
<strong><%= Spree.t(:active) %></strong>
|
32
|
-
<div class="radio my-2">
|
33
|
-
<%= label_tag :payment_method_active_true do %>
|
34
|
-
<%= radio_button :payment_method, :active, true %>
|
35
|
-
<%= Spree.t(:say_yes) %>
|
36
|
-
<% end %>
|
5
|
+
<div class="col-12 col-md-6">
|
6
|
+
<div class="card mb-3">
|
7
|
+
<div class="card-header">
|
8
|
+
<h5 class="mb-0"><%= Spree.t(:settings) %></h5>
|
37
9
|
</div>
|
10
|
+
<div class="card-body">
|
11
|
+
<div class="form-group">
|
12
|
+
<%= f.label :type, Spree.t(:provider) %>
|
13
|
+
<%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
|
14
|
+
</div>
|
15
|
+
<hr class="my-4">
|
16
|
+
<%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
|
17
|
+
<%= label_tag :payment_method_name, Spree.t(:name) %>
|
18
|
+
<%= text_field :payment_method, :name, class: 'form-control' %>
|
19
|
+
<%= error_message_on :payment_method, :name %>
|
20
|
+
<% end %>
|
38
21
|
|
39
|
-
|
40
|
-
|
41
|
-
<%=
|
42
|
-
<%= Spree.t(:say_no) %>
|
22
|
+
<%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
|
23
|
+
<%= label_tag :payment_method_description, Spree.t(:description) %>
|
24
|
+
<%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
|
43
25
|
<% end %>
|
26
|
+
|
27
|
+
<div data-hook="store" class="form-group">
|
28
|
+
<%= label_tag :payment_method_stores, Spree.t(:stores) %>
|
29
|
+
<%= collection_select(:payment_method, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
|
30
|
+
</div>
|
31
|
+
|
32
|
+
<div data-hook="display" class="form-group">
|
33
|
+
<%= label_tag :payment_method_display_on, Spree.t(:display) %>
|
34
|
+
<%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
|
35
|
+
</div>
|
36
|
+
<div data-hook="auto_capture" class="form-group">
|
37
|
+
<%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
|
38
|
+
<%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
|
39
|
+
</div>
|
40
|
+
|
41
|
+
<div data-hook="active" class="form-group">
|
42
|
+
<strong><%= Spree.t(:active) %></strong>
|
43
|
+
<div class="radio my-2 form-check">
|
44
|
+
<%= radio_button :payment_method, :active, true, class: 'form-check-input' %>
|
45
|
+
<%= label_tag :payment_method_active_true, Spree.t(:say_yes), class: 'form-check-label' %>
|
46
|
+
</div>
|
47
|
+
|
48
|
+
<div class="radio my-2 form-check">
|
49
|
+
<%= radio_button :payment_method, :active, false, class: 'form-check-input' %>
|
50
|
+
<%= label_tag :payment_method_active_false, Spree.t(:say_no), class: 'form-check-label' %>
|
51
|
+
</div>
|
52
|
+
</div>
|
44
53
|
</div>
|
45
54
|
</div>
|
46
55
|
</div>
|
47
56
|
|
48
|
-
<div class="col-12 col-md-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
57
|
+
<div class="col-12 col-md-6">
|
58
|
+
<div class="card mb-3">
|
59
|
+
<div class="card-header">
|
60
|
+
<h5 class="mb-0"><%= Spree.t(:payment_provider_settings) %></h5>
|
61
|
+
</div>
|
62
|
+
<div class="card-body">
|
63
|
+
<div id="preference-settings" data-hook class="form-group">
|
64
|
+
<% unless @object.new_record? %>
|
65
|
+
<% if preference_fields(@object, f).empty? %>
|
66
|
+
<%= Spree.t('no_payment_provider_settings_message') %>
|
67
|
+
<% end %>
|
68
|
+
<%= preference_fields(@object, f) %>
|
69
|
+
|
70
|
+
<% if @object.respond_to?(:preferences) %>
|
71
|
+
<div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
|
72
|
+
<% end %>
|
73
|
+
<% end %>
|
74
|
+
</div>
|
75
|
+
</div>
|
76
|
+
</div>
|
58
77
|
</div>
|
59
78
|
</div>
|
60
79
|
</div>
|