solidus_backend 3.3.0 → 3.4.0
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/datepicker.js +2 -1
- data/app/assets/javascripts/spree/backend/navigation.js +13 -3
- data/app/assets/javascripts/spree/backend/shipments.js +1 -1
- data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +1 -1
- data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +2 -2
- data/app/controllers/spree/admin/orders_controller.rb +4 -0
- data/app/controllers/spree/admin/payments_controller.rb +2 -0
- data/app/controllers/spree/admin/resource_controller.rb +3 -1
- data/app/helpers/spree/admin/adjustments_helper.rb +2 -2
- data/app/helpers/spree/admin/base_helper.rb +1 -1
- data/app/helpers/spree/admin/orders_helper.rb +18 -0
- data/app/helpers/spree/admin/stock_movements_helper.rb +1 -1
- data/app/views/spree/admin/adjustment_reasons/index.html.erb +3 -3
- data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +2 -2
- data/app/views/spree/admin/adjustments/_form.html.erb +1 -1
- data/app/views/spree/admin/adjustments/index.html.erb +2 -2
- data/app/views/spree/admin/adjustments/new.html.erb +0 -1
- data/app/views/spree/admin/cancellations/index.html.erb +6 -6
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/new.html.erb +0 -1
- data/app/views/spree/admin/images/_image_row.html.erb +1 -2
- data/app/views/spree/admin/images/edit.html.erb +0 -1
- data/app/views/spree/admin/images/index.html.erb +0 -1
- data/app/views/spree/admin/option_types/_form.html.erb +2 -2
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +0 -1
- data/app/views/spree/admin/option_types/index.html.erb +0 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
- data/app/views/spree/admin/orders/_carton.html.erb +5 -5
- data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_form.html.erb +2 -2
- data/app/views/spree/admin/orders/_line_items.html.erb +6 -6
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +20 -44
- data/app/views/spree/admin/orders/_shipment.html.erb +6 -6
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +2 -3
- data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_line_items.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm.html.erb +0 -1
- data/app/views/spree/admin/orders/confirm_advance.html.erb +1 -2
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +0 -1
- data/app/views/spree/admin/orders/customer_details/show.html.erb +0 -2
- data/app/views/spree/admin/orders/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/index.html.erb +1 -2
- data/app/views/spree/admin/payment_methods/index.html.erb +2 -3
- data/app/views/spree/admin/payment_methods/new.html.erb +0 -1
- data/app/views/spree/admin/payments/_form.html.erb +1 -1
- data/app/views/spree/admin/payments/_list.html.erb +11 -8
- data/app/views/spree/admin/payments/_log_entries.html.erb +3 -3
- data/app/views/spree/admin/payments/credit.html.erb +0 -1
- data/app/views/spree/admin/payments/new.html.erb +0 -1
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +1 -1
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +46 -3
- data/app/views/spree/admin/payments/source_views/_store_credit.html.erb +1 -1
- data/app/views/spree/admin/products/_form.html.erb +60 -63
- data/app/views/spree/admin/products/index.html.erb +1 -1
- data/app/views/spree/admin/promotion_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/promotion_categories/index.html.erb +0 -1
- data/app/views/spree/admin/promotion_categories/new.html.erb +0 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
- data/app/views/spree/admin/promotions/_form.html.erb +4 -4
- data/app/views/spree/admin/promotions/_rules.html.erb +1 -2
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +1 -2
- data/app/views/spree/admin/promotions/index.html.erb +0 -1
- data/app/views/spree/admin/properties/_form.html.erb +2 -2
- data/app/views/spree/admin/properties/edit.html.erb +0 -1
- data/app/views/spree/admin/properties/filtered.html.erb +1 -1
- data/app/views/spree/admin/properties/index.html.erb +0 -1
- data/app/views/spree/admin/refund_reasons/index.html.erb +3 -4
- data/app/views/spree/admin/refund_reasons/new.html.erb +0 -1
- data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +2 -2
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +3 -4
- data/app/views/spree/admin/reimbursement_types/index.html.erb +0 -1
- data/app/views/spree/admin/reimbursements/edit.html.erb +1 -2
- data/app/views/spree/admin/reimbursements/show.html.erb +0 -1
- data/app/views/spree/admin/return_authorizations/edit.html.erb +4 -4
- data/app/views/spree/admin/return_authorizations/index.html.erb +0 -1
- data/app/views/spree/admin/return_authorizations/new.html.erb +0 -1
- data/app/views/spree/admin/shared/_head.html.erb +5 -5
- data/app/views/spree/admin/shared/_js_locale_data.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_tabs.html.erb +0 -1
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +0 -1
- data/app/views/spree/admin/shared/named_types/_form.html.erb +1 -1
- data/app/views/spree/admin/shared/named_types/_index.html.erb +3 -4
- data/app/views/spree/admin/shared/named_types/_new.html.erb +0 -1
- data/app/views/spree/admin/shipping_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +1 -2
- data/app/views/spree/admin/shipping_categories/new.html.erb +0 -1
- data/app/views/spree/admin/shipping_methods/edit.html.erb +0 -1
- data/app/views/spree/admin/shipping_methods/index.html.erb +1 -2
- data/app/views/spree/admin/shipping_methods/new.html.erb +0 -1
- data/app/views/spree/admin/stock_items/_stock_management.html.erb +5 -5
- data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/edit.html.erb +1 -2
- data/app/views/spree/admin/stock_locations/index.html.erb +9 -9
- data/app/views/spree/admin/stock_locations/new.html.erb +0 -1
- data/app/views/spree/admin/stock_movements/index.html.erb +8 -13
- data/app/views/spree/admin/store_credit_reasons/index.html.erb +3 -3
- data/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb +1 -1
- data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -2
- data/app/views/spree/admin/store_credits/edit_validity.html.erb +0 -1
- data/app/views/spree/admin/store_credits/index.html.erb +0 -1
- data/app/views/spree/admin/store_credits/new.html.erb +0 -1
- data/app/views/spree/admin/store_credits/show.html.erb +10 -11
- data/app/views/spree/admin/stores/_form.html.erb +6 -5
- data/app/views/spree/admin/style_guide/topics/components/_modals.html.erb +12 -14
- data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +0 -1
- data/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb +0 -6
- data/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb +1 -1
- data/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb +0 -4
- data/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb +1 -1
- data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +2 -2
- data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +0 -1
- data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/tax_categories/index.html.erb +11 -10
- data/app/views/spree/admin/tax_categories/new.html.erb +0 -2
- data/app/views/spree/admin/tax_rates/_form.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/edit.html.erb +0 -1
- data/app/views/spree/admin/tax_rates/index.html.erb +9 -10
- data/app/views/spree/admin/tax_rates/new.html.erb +0 -1
- data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.html.erb +0 -2
- data/app/views/spree/admin/taxonomies/index.html.erb +0 -1
- data/app/views/spree/admin/taxonomies/new.html.erb +0 -1
- data/app/views/spree/admin/taxons/_form.html.erb +7 -7
- data/app/views/spree/admin/taxons/edit.html.erb +0 -1
- data/app/views/spree/admin/taxons/index.html.erb +1 -1
- data/app/views/spree/admin/users/_form.html.erb +0 -1
- data/app/views/spree/admin/users/_tabs.html.erb +5 -5
- data/app/views/spree/admin/users/addresses.html.erb +0 -1
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +8 -8
- data/app/views/spree/admin/users/orders.html.erb +1 -2
- data/app/views/spree/admin/variants/_form.html.erb +0 -2
- data/app/views/spree/admin/variants/_table.html.erb +5 -5
- data/app/views/spree/admin/variants/edit.html.erb +0 -2
- data/app/views/spree/admin/variants/index.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +4 -4
- data/app/views/spree/admin/zones/edit.html.erb +0 -1
- data/app/views/spree/admin/zones/index.html.erb +4 -4
- data/app/views/spree/admin/zones/new.html.erb +0 -1
- data/app/views/spree/layouts/admin_style_guide.html.erb +1 -1
- data/config/routes.rb +1 -1
- metadata +7 -7
@@ -2,12 +2,10 @@
|
|
2
2
|
|
3
3
|
<% admin_breadcrumb(t('spree.customer_details')) %>
|
4
4
|
|
5
|
-
|
6
5
|
<% content_for :page_actions do %>
|
7
6
|
<li><%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %></li>
|
8
7
|
<% end %>
|
9
8
|
|
10
|
-
|
11
9
|
<main class="col-5">
|
12
10
|
<section>
|
13
11
|
<%= content_tag :h4, t('spree.account') %>
|
@@ -14,8 +14,8 @@
|
|
14
14
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @order } %>
|
15
15
|
</div>
|
16
16
|
|
17
|
-
<% if @order.
|
18
|
-
<%= render 'spree/admin/orders/risk_analysis',
|
17
|
+
<% if @order.is_risky? %>
|
18
|
+
<%= render 'spree/admin/orders/risk_analysis', order: @order %>
|
19
19
|
<% end %>
|
20
20
|
|
21
21
|
<div data-hook="admin_order_edit_sub_header"></div>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
|
3
3
|
<% admin_breadcrumb(plural_resource_name(Spree::Order)) %>
|
4
4
|
|
5
|
-
|
6
5
|
<% content_for :page_actions do %>
|
7
6
|
<li>
|
8
7
|
<%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
|
@@ -158,7 +157,7 @@
|
|
158
157
|
</span>
|
159
158
|
</td>
|
160
159
|
<td>
|
161
|
-
<% if order.payment_state
|
160
|
+
<% if order.payment_state %>
|
162
161
|
<span class="pill pill-<%= order.payment_state %>">
|
163
162
|
<%= t(order.payment_state, scope: 'spree.payment_states') %>
|
164
163
|
</span>
|
@@ -4,7 +4,6 @@
|
|
4
4
|
<% admin_breadcrumb(plural_resource_name(Spree::Payment)) %>
|
5
5
|
<% admin_breadcrumb(plural_resource_name(Spree::PaymentMethod)) %>
|
6
6
|
|
7
|
-
|
8
7
|
<% content_for :page_actions do %>
|
9
8
|
<% if can?(:create, Spree::PaymentMethod) %>
|
10
9
|
<li>
|
@@ -36,7 +35,7 @@
|
|
36
35
|
</tr>
|
37
36
|
</thead>
|
38
37
|
<tbody>
|
39
|
-
<% @payment_methods.each do |method
|
38
|
+
<% @payment_methods.each do |method| %>
|
40
39
|
<tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
|
41
40
|
<td><span class="handle"></span></td>
|
42
41
|
<td><%= method.name %></td>
|
@@ -53,7 +52,7 @@
|
|
53
52
|
<%= link_to_edit method.becomes(Spree::PaymentMethod), no_text: true %>
|
54
53
|
<% end %>
|
55
54
|
<% if can?(:destroy, method.becomes(Spree::PaymentMethod)) %>
|
56
|
-
<%= link_to_delete method.becomes(Spree::PaymentMethod), no_text: true
|
55
|
+
<%= link_to_delete method.becomes(Spree::PaymentMethod), no_text: true %>
|
57
56
|
<% end %>
|
58
57
|
</td>
|
59
58
|
</tr>
|
@@ -26,7 +26,7 @@
|
|
26
26
|
|
27
27
|
<div class="payment-methods" id="payment_method_<%= method.id %>" data-payment-method-id="<%= method.id %>">
|
28
28
|
<% if method.source_required? %>
|
29
|
-
<br
|
29
|
+
<br>
|
30
30
|
<%= render partial: "spree/admin/payments/source_forms/#{method.partial_name}",
|
31
31
|
locals: { payment_method: method, previous_cards: method.reusable_sources(@order) } %>
|
32
32
|
<% end %>
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<table class="index table-responsive" id='payments' data-order-id='<%= @order.number %>'>
|
2
2
|
<colgroup>
|
3
|
-
<col style="width: 15%"
|
4
|
-
<col style="width: 15%"
|
5
|
-
<col style="width: 15%"
|
6
|
-
<col style="width: 10%"
|
7
|
-
<col style="width: 10%"
|
8
|
-
<col style="width: 20%"
|
9
|
-
<col style="width: 15%"
|
3
|
+
<col style="width: 15%">
|
4
|
+
<col style="width: 15%">
|
5
|
+
<col style="width: 15%">
|
6
|
+
<col style="width: 10%">
|
7
|
+
<col style="width: 10%">
|
8
|
+
<col style="width: 20%">
|
9
|
+
<col style="width: 15%">
|
10
10
|
</colgroup>
|
11
11
|
<thead>
|
12
12
|
<tr data-hook="payments_header">
|
@@ -22,7 +22,10 @@
|
|
22
22
|
<tbody>
|
23
23
|
<% payments.each do |payment| %>
|
24
24
|
<tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment vertical-middle" data-payment-id="<%= payment.id %>">
|
25
|
-
<td
|
25
|
+
<td>
|
26
|
+
<%= tag :i, class: "fa fa-warning red", title: t('spree.risky') if payment.risky? %>
|
27
|
+
<%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %>
|
28
|
+
</td>
|
26
29
|
<td><%= l(payment.created_at, format: :short) %></td>
|
27
30
|
<td><%= payment.payment_method.name %></td>
|
28
31
|
<td><%= payment.transaction_id %></td>
|
@@ -3,7 +3,6 @@
|
|
3
3
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
|
4
4
|
<% admin_breadcrumb(Spree::Refund.model_name.human) %>
|
5
5
|
|
6
|
-
|
7
6
|
<%= form_tag do %>
|
8
7
|
<h3><%= Spree::Refund.model_name.human %></h3>
|
9
8
|
<fieldset data-hook="credit">
|
@@ -4,7 +4,7 @@
|
|
4
4
|
<% if previous_cards.any? %>
|
5
5
|
<div class="field" data-hook="previous_cards">
|
6
6
|
<% previous_cards.each do |card| %>
|
7
|
-
<label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br
|
7
|
+
<label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br></label>
|
8
8
|
<% end %>
|
9
9
|
<label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= t('spree.use_new_cc') %></label>
|
10
10
|
</div>
|
@@ -15,10 +15,53 @@
|
|
15
15
|
|
16
16
|
<dt><%= Spree::CreditCard.human_attribute_name(:expiration) %>:</dt>
|
17
17
|
<dd><%= payment.source.month %>/<%= payment.source.year %></dd>
|
18
|
+
|
19
|
+
<% if payment.source.address %>
|
20
|
+
<dt><%= Spree::CreditCard.human_attribute_name(:source_address) %>:</dt>
|
21
|
+
<dd><%= render partial: 'spree/admin/shared/address', locals: {address: payment.source.address} %></dd>
|
22
|
+
<% end %>
|
23
|
+
</dl>
|
24
|
+
</div>
|
25
|
+
|
26
|
+
<div class="col-2">
|
27
|
+
</div>
|
28
|
+
|
29
|
+
<div class="col-4">
|
30
|
+
<dl>
|
31
|
+
<dt><%= Spree::CreditCard.human_attribute_name(:code) %>:</dt>
|
32
|
+
<dd><%= payment.number %></dd>
|
33
|
+
|
34
|
+
<dt><%= t('spree.risk_analysis') %></dt>
|
35
|
+
<dd>
|
36
|
+
<span class="pill pill-<%= payment.risky? ? 'error' : 'complete' %>">
|
37
|
+
<%= "#{t('spree.not') unless payment.risky?} #{t('spree.risky').downcase}".capitalize %>
|
38
|
+
</span>
|
39
|
+
</dd>
|
40
|
+
|
41
|
+
<dt><%= t('spree.status')%></dt>
|
42
|
+
<dd><span class="pill pill-<%= payment.state %>"><%= t(payment.state, scope: 'spree.payment_states') %></span></dd>
|
43
|
+
|
44
|
+
|
45
|
+
<dt><%= Spree::CreditCard.human_attribute_name(:avs_response) %>:</dt>
|
46
|
+
<dd>
|
47
|
+
<%= content_tag(
|
48
|
+
:span,
|
49
|
+
payment.is_avs_risky? ? t('spree.failure') : t('spree.success'),
|
50
|
+
class: "pill pill-#{payment.is_avs_risky? ? 'warning' : 'complete'}",
|
51
|
+
title: avs_response_code[payment.avs_response],
|
52
|
+
) %>
|
53
|
+
</dd>
|
54
|
+
|
55
|
+
<dt><%= Spree::CreditCard.human_attribute_name(:cvv_response_code) %>:</dt>
|
56
|
+
<dd>
|
57
|
+
<%= content_tag(
|
58
|
+
:span,
|
59
|
+
payment.is_cvv_risky? ? t('spree.failure') : t('spree.success'),
|
60
|
+
class: "pill pill-#{payment.is_cvv_risky? ? 'warning' : 'complete'}",
|
61
|
+
title: cvv_response_code[payment.cvv_response_code],
|
62
|
+
) %>
|
63
|
+
</dd>
|
18
64
|
</dl>
|
19
|
-
<% if payment.source.address %>
|
20
|
-
<%= render partial: 'spree/admin/shared/address', locals: {address: payment.source.address} %>
|
21
|
-
<% end %>
|
22
65
|
</div>
|
23
66
|
</div>
|
24
67
|
</fieldset>
|
@@ -5,7 +5,7 @@
|
|
5
5
|
<div class="col-4">
|
6
6
|
<dl>
|
7
7
|
<dt><%= Spree::StoreCreditCategory.model_name.human %>:</dt>
|
8
|
-
<dd><%= payment.source.category.name%></dd>
|
8
|
+
<dd><%= payment.source.category.name %></dd>
|
9
9
|
|
10
10
|
<dt><%= Spree::StoreCredit.human_attribute_name(:memo) %>:</dt>
|
11
11
|
<dd><%= payment.source.memo %></dd>
|
@@ -1,30 +1,70 @@
|
|
1
1
|
<div data-hook="admin_product_form_fields">
|
2
2
|
|
3
3
|
<div class="row">
|
4
|
+
<div class="left col-9">
|
5
|
+
<div data-hook="admin_product_form_left">
|
6
|
+
<div data-hook="admin_product_form_name">
|
7
|
+
<%= f.field_container :name do %>
|
8
|
+
<%= f.label :name, class: 'required' %>
|
9
|
+
<%= f.text_field :name, class: 'fullwidth title', required: true %>
|
10
|
+
<%= f.error_message_on :name %>
|
11
|
+
<% end %>
|
12
|
+
</div>
|
4
13
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
</div>
|
14
|
+
<div data-hook="admin_product_form_slug">
|
15
|
+
<%= f.field_container :slug do %>
|
16
|
+
<%= f.label :slug, class: ('required' if !f.object.new_record?) %>
|
17
|
+
<%= f.text_field :slug, class: 'fullwidth title', required: !f.object.new_record?, disabled: f.object.new_record? %>
|
18
|
+
<%= f.error_message_on :slug %>
|
19
|
+
<% end %>
|
20
|
+
</div>
|
13
21
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
22
|
+
<div data-hook="admin_product_form_description">
|
23
|
+
<%= f.field_container :description do %>
|
24
|
+
<%= f.label :description %>
|
25
|
+
<%= f.text_area :description, {rows: "#{unless @product.has_variants? then '22' else '15' end}", class: 'fullwidth'} %>
|
26
|
+
<%= f.error_message_on :description %>
|
27
|
+
<% end %>
|
28
|
+
</div>
|
20
29
|
</div>
|
21
30
|
|
22
|
-
<div
|
23
|
-
|
24
|
-
<%= f.
|
25
|
-
|
26
|
-
|
27
|
-
|
31
|
+
<div class="mt-4">
|
32
|
+
<div data-hook="admin_product_form_taxons">
|
33
|
+
<%= f.field_container :taxons do %>
|
34
|
+
<%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br>
|
35
|
+
<%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
|
36
|
+
<% end %>
|
37
|
+
</div>
|
38
|
+
|
39
|
+
<div data-hook="admin_product_form_option_types">
|
40
|
+
<%= f.field_container :option_types do %>
|
41
|
+
<%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
|
42
|
+
<%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
|
43
|
+
<% end %>
|
44
|
+
</div>
|
45
|
+
|
46
|
+
<div data-hook="admin_product_form_meta">
|
47
|
+
<div data-hook="admin_product_form_meta_title">
|
48
|
+
<%= f.field_container :meta_title do %>
|
49
|
+
<%= f.label :meta_title %>
|
50
|
+
<%= f.text_field :meta_title, class: 'fullwidth' %>
|
51
|
+
<% end %>
|
52
|
+
</div>
|
53
|
+
|
54
|
+
<div data-hook="admin_product_form_meta_keywords">
|
55
|
+
<%= f.field_container :meta_keywords do %>
|
56
|
+
<%= f.label :meta_keywords %>
|
57
|
+
<%= f.text_field :meta_keywords, class: 'fullwidth' %>
|
58
|
+
<% end %>
|
59
|
+
</div>
|
60
|
+
|
61
|
+
<div data-hook="admin_product_form_meta_description">
|
62
|
+
<%= f.field_container :meta_description do %>
|
63
|
+
<%= f.label :meta_description %>
|
64
|
+
<%= f.text_field :meta_description, class: 'fullwidth' %>
|
65
|
+
<% end %>
|
66
|
+
</div>
|
67
|
+
</div>
|
28
68
|
</div>
|
29
69
|
</div>
|
30
70
|
|
@@ -166,49 +206,6 @@
|
|
166
206
|
|
167
207
|
</div>
|
168
208
|
|
169
|
-
<div class="row">
|
170
|
-
|
171
|
-
<div class="col-9">
|
172
|
-
<div data-hook="admin_product_form_taxons">
|
173
|
-
<%= f.field_container :taxons do %>
|
174
|
-
<%= f.label :taxon_ids, plural_resource_name(Spree::Taxon) %><br />
|
175
|
-
<%= f.hidden_field :taxon_ids, value: @product.taxon_ids.join(',') %>
|
176
|
-
<% end %>
|
177
|
-
</div>
|
178
|
-
|
179
|
-
<div data-hook="admin_product_form_option_types">
|
180
|
-
<%= f.field_container :option_types do %>
|
181
|
-
<%= f.label :option_type_ids, plural_resource_name(Spree::OptionType) %>
|
182
|
-
<%= f.hidden_field :option_type_ids, value: @product.option_type_ids.join(',') %>
|
183
|
-
<% end %>
|
184
|
-
</div>
|
185
|
-
|
186
|
-
<div data-hook="admin_product_form_meta">
|
187
|
-
<div data-hook="admin_product_form_meta_title">
|
188
|
-
<%= f.field_container :meta_title do %>
|
189
|
-
<%= f.label :meta_title %>
|
190
|
-
<%= f.text_field :meta_title, class: 'fullwidth' %>
|
191
|
-
<% end %>
|
192
|
-
</div>
|
193
|
-
|
194
|
-
<div data-hook="admin_product_form_meta_keywords">
|
195
|
-
<%= f.field_container :meta_keywords do %>
|
196
|
-
<%= f.label :meta_keywords %>
|
197
|
-
<%= f.text_field :meta_keywords, class: 'fullwidth' %>
|
198
|
-
<% end %>
|
199
|
-
</div>
|
200
|
-
|
201
|
-
<div data-hook="admin_product_form_meta_description">
|
202
|
-
<%= f.field_container :meta_description do %>
|
203
|
-
<%= f.label :meta_description %>
|
204
|
-
<%= f.text_field :meta_description, class: 'fullwidth' %>
|
205
|
-
<% end %>
|
206
|
-
</div>
|
207
|
-
</div>
|
208
|
-
</div>
|
209
|
-
|
210
|
-
</div>
|
211
|
-
|
212
209
|
<div class="clear"></div>
|
213
210
|
|
214
211
|
<div data-hook="admin_product_form_additional_fields"></div>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
<div data-hook="admin_products_sidebar">
|
17
17
|
<%= search_form_for [:admin, @search] do |f| %>
|
18
18
|
<%- locals = {f: f} %>
|
19
|
-
<div class="row" data-hook="admin_products_index_search"
|
19
|
+
<div class="row" data-hook="admin_products_index_search">
|
20
20
|
<div class="col-6">
|
21
21
|
<div class="field">
|
22
22
|
<%= f.label :name_cont, Spree::Product.human_attribute_name(:name) %>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
|
3
3
|
<% admin_breadcrumb(@promotion_category.name) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= form_for @promotion_category, url: object_url, method: :put do |f| %>
|
7
6
|
<fieldset class="no-border-top">
|
8
7
|
<%= render partial: 'form', locals: { f: f } %>
|
@@ -1,7 +1,6 @@
|
|
1
1
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
|
2
2
|
<% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %>
|
3
3
|
|
4
|
-
|
5
4
|
<% content_for :page_actions do %>
|
6
5
|
<% if can?(:create, Spree::PromotionCategory) %>
|
7
6
|
<li>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_path) %>
|
3
3
|
<% admin_breadcrumb(t('spree.new_promotion_category')) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= form_for :promotion_category, url: collection_url do |f| %>
|
7
6
|
<fieldset class="no-border-top">
|
8
7
|
<%= render partial: 'form', locals: { f: f } %>
|
@@ -6,7 +6,7 @@
|
|
6
6
|
<legend align="center"><%= t('spree.promotion_actions') %></legend>
|
7
7
|
<% if can?(:update, @promotion) %>
|
8
8
|
<div class="field">
|
9
|
-
<%= label_tag :action_type, t('spree.adjustment_type')%>
|
9
|
+
<%= label_tag :action_type, t('spree.adjustment_type') %>
|
10
10
|
<%= admin_hint t('spree.adjustment_type'), t(:promotions, scope: [:spree, :hints, "spree/calculator"]) %>
|
11
11
|
<%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth', required: true %>
|
12
12
|
</div>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<% end %>
|
11
11
|
|
12
12
|
<%= f.field_container :description do %>
|
13
|
-
<%= f.label :description %><br
|
13
|
+
<%= f.label :description %><br>
|
14
14
|
<%= f.text_area :description, rows: 7, class: 'fullwidth' %>
|
15
15
|
<span class="info">
|
16
16
|
<%= t('spree.character_limit') %>
|
@@ -18,7 +18,7 @@
|
|
18
18
|
<% end %>
|
19
19
|
|
20
20
|
<%= f.field_container :category do %>
|
21
|
-
<%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br
|
21
|
+
<%= f.label :promotion_category_id, Spree::PromotionCategory.model_name.human %><br>
|
22
22
|
<%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select fullwidth' }) %>
|
23
23
|
<% end %>
|
24
24
|
</div>
|
@@ -27,7 +27,7 @@
|
|
27
27
|
|
28
28
|
<div id="expiry_fields" class="col-3">
|
29
29
|
<%= f.field_container :overall_usage_limit do %>
|
30
|
-
<%= f.label :usage_limit %><br
|
30
|
+
<%= f.label :usage_limit %><br>
|
31
31
|
<%= f.number_field :usage_limit, min: 0, class: 'fullwidth' %><br>
|
32
32
|
<span class="info">
|
33
33
|
<%= t('spree.current_promotion_usage', count: @promotion.usage_count) %>
|
@@ -36,7 +36,7 @@
|
|
36
36
|
|
37
37
|
<% if @promotion.persisted? %>
|
38
38
|
<%= f.field_container :per_code_usage_limit do %>
|
39
|
-
<%= f.label :per_code_usage_limit %><br
|
39
|
+
<%= f.label :per_code_usage_limit %><br>
|
40
40
|
<%= f.number_field :per_code_usage_limit, min: 0, class: 'fullwidth' %><br>
|
41
41
|
<% end %>
|
42
42
|
<% end %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<fieldset id="rule_fields" class
|
1
|
+
<fieldset id="rule_fields" class="no-border-bottom no-border-top">
|
2
2
|
|
3
3
|
<%= form_tag spree.admin_promotion_promotion_rules_path(@promotion), remote: true, id: 'new_product_rule_form' do %>
|
4
4
|
<fieldset>
|
@@ -16,7 +16,6 @@
|
|
16
16
|
</fieldset>
|
17
17
|
<% end %>
|
18
18
|
|
19
|
-
|
20
19
|
<%= form_for @promotion, url: object_url, method: :put do |f| %>
|
21
20
|
<fieldset class="no-border-top">
|
22
21
|
<% if Spree::Config.allow_promotions_any_match_policy %>
|
@@ -1,2 +1,2 @@
|
|
1
1
|
<%= render partial: 'spree/admin/promotions/actions/promotion_calculators_with_custom_fields',
|
2
|
-
locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
|
2
|
+
locals: { calculators: @calculators, promotion_action: promotion_action, param_prefix: param_prefix } %>
|
@@ -7,5 +7,4 @@
|
|
7
7
|
<%= render "spree/admin/promotions/actions/promotion_calculators_with_custom_fields",
|
8
8
|
calculators: Rails.application.config.spree.calculators.promotion_actions_create_quantity_adjustments,
|
9
9
|
promotion_action: promotion_action,
|
10
|
-
param_prefix: param_prefix
|
11
|
-
%>
|
10
|
+
param_prefix: param_prefix %>
|
@@ -1,14 +1,14 @@
|
|
1
1
|
<div data-hook="admin_property_form" class="align-center row">
|
2
2
|
<div class="col-6">
|
3
3
|
<%= f.field_container :name do %>
|
4
|
-
<%= f.label :name, class: 'required' %><br
|
4
|
+
<%= f.label :name, class: 'required' %><br>
|
5
5
|
<%= f.text_field :name, class: 'fullwidth' %>
|
6
6
|
<%= f.error_message_on :name %>
|
7
7
|
<% end %>
|
8
8
|
</div>
|
9
9
|
<div class="col-6">
|
10
10
|
<%= f.field_container :presentation do %>
|
11
|
-
<%= f.label :presentation, class: 'required' %><br
|
11
|
+
<%= f.label :presentation, class: 'required' %><br>
|
12
12
|
<%= f.text_field :presentation, class: 'fullwidth' %>
|
13
13
|
<%= f.error_message_on :presentation %>
|
14
14
|
<% end %>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Property), spree.admin_properties_path) %>
|
3
3
|
<% admin_breadcrumb(@property.name) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @property } %>
|
7
6
|
|
8
7
|
<%= form_for [:admin, @property] do |f| %>
|
@@ -1 +1 @@
|
|
1
|
-
<%= auto_complete_result @properties, :name %>
|
1
|
+
<%= auto_complete_result @properties, :name %>
|
@@ -1,7 +1,6 @@
|
|
1
1
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
|
2
2
|
<% admin_breadcrumb(plural_resource_name(Spree::Property)) %>
|
3
3
|
|
4
|
-
|
5
4
|
<% content_for :page_actions do %>
|
6
5
|
<% if can?(:create, Spree::Property) %>
|
7
6
|
<li id="new_property_link">
|
@@ -4,7 +4,6 @@
|
|
4
4
|
<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
|
5
5
|
<% admin_breadcrumb(plural_resource_name(Spree::RefundReason)) %>
|
6
6
|
|
7
|
-
|
8
7
|
<% content_for :page_actions do %>
|
9
8
|
<ul class="actions inline-menu">
|
10
9
|
<% if can?(:create, Spree::RefundReason) %>
|
@@ -18,9 +17,9 @@
|
|
18
17
|
<% if @collection.any? %>
|
19
18
|
<table class="index" id='listing_named_types' data-hook>
|
20
19
|
<colgroup>
|
21
|
-
<col style="width: 65%"
|
22
|
-
<col style="width: 20%"
|
23
|
-
<col style="width: 15%"
|
20
|
+
<col style="width: 65%">
|
21
|
+
<col style="width: 20%">
|
22
|
+
<col style="width: 15%">
|
24
23
|
</colgroup>
|
25
24
|
<thead>
|
26
25
|
<tr data-hook="named_types_header">
|
@@ -1,12 +1,12 @@
|
|
1
1
|
<div data-hook="admin_named_type_form_fields" class="row">
|
2
2
|
<div class="col-3">
|
3
3
|
<%= f.field_container :name do %>
|
4
|
-
<%= f.label :name, class: 'required' %><br
|
4
|
+
<%= f.label :name, class: 'required' %><br>
|
5
5
|
<%= f.text_field :name, class: 'fullwidth' %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<%= f.field_container :code do %>
|
9
|
-
<%= f.label :code, class: 'required' %><br
|
9
|
+
<%= f.label :code, class: 'required' %><br>
|
10
10
|
<%= f.text_field :code, class: 'fullwidth' %>
|
11
11
|
|
12
12
|
<% end %>
|
@@ -9,13 +9,13 @@
|
|
9
9
|
<div data-hook="admin_refund_form_fields" class="row">
|
10
10
|
<div class="col-3">
|
11
11
|
<div class="field">
|
12
|
-
<%= f.label :amount %><br
|
12
|
+
<%= f.label :amount %><br>
|
13
13
|
<%= @refund.display_amount %>
|
14
14
|
</div>
|
15
15
|
</div>
|
16
16
|
<div class="col-3">
|
17
17
|
<div class="field">
|
18
|
-
<%= f.label :refund_reason_id %><br
|
18
|
+
<%= f.label :refund_reason_id %><br>
|
19
19
|
<%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'custom-select fullwidth'}) %>
|
20
20
|
</div>
|
21
21
|
</div>
|
@@ -4,7 +4,6 @@
|
|
4
4
|
<% admin_breadcrumb(link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment)) %>
|
5
5
|
<% admin_breadcrumb(t('spree.new_refund')) %>
|
6
6
|
|
7
|
-
|
8
7
|
<%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>
|
9
8
|
<fieldset class="no-border-top">
|
10
9
|
<div data-hook="admin_refund_form_fields" class="row">
|
@@ -16,19 +15,19 @@
|
|
16
15
|
</div>
|
17
16
|
<div class="col-3">
|
18
17
|
<div class="field">
|
19
|
-
<label><%= t('spree.credit_allowed') %></label><br
|
18
|
+
<label><%= t('spree.credit_allowed') %></label><br>
|
20
19
|
<%= Spree::Money.new(@refund.payment.credit_allowed) %>
|
21
20
|
</div>
|
22
21
|
</div>
|
23
22
|
<div class="col-3">
|
24
23
|
<div class="field">
|
25
|
-
<%= f.label :amount %><br
|
24
|
+
<%= f.label :amount %><br>
|
26
25
|
<%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :amount, currency: @refund.currency, required: true %>
|
27
26
|
</div>
|
28
27
|
</div>
|
29
28
|
<div class="col-3">
|
30
29
|
<div class="field">
|
31
|
-
<%= f.label :refund_reason_id %><br
|
30
|
+
<%= f.label :refund_reason_id %><br>
|
32
31
|
<%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
|
33
32
|
</div>
|
34
33
|
</div>
|