spree_backend 2.3.13 → 2.4.0.rc1
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/address_states.js +1 -3
- data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend/admin.js.erb +11 -1
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -20
- data/app/assets/javascripts/spree/backend/line_items.js.coffee +2 -5
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb +50 -0
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -4
- data/app/assets/javascripts/spree/backend/orders/edit_form.js +2 -3
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +5 -5
- data/app/assets/javascripts/spree/backend/product_picker.js +2 -4
- data/app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee +4 -0
- data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +35 -0
- data/app/assets/javascripts/spree/backend/shipments.js.erb +39 -52
- data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +8 -6
- data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +5 -24
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +2 -4
- data/app/assets/javascripts/spree/backend/user_picker.js +2 -3
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +2 -2
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +0 -5
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +5 -2
- data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss +8 -0
- data/app/assets/stylesheets/spree/backend/sections/_products.scss +4 -0
- data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +24 -0
- data/app/assets/stylesheets/spree/backend/sections/_taxons.scss +1 -7
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +8 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.scss +2 -0
- data/app/assets/stylesheets/spree/backend.css +1 -1
- data/app/controllers/spree/admin/adjustments_controller.rb +1 -7
- data/app/controllers/spree/admin/base_controller.rb +8 -2
- data/app/controllers/spree/admin/customer_returns_controller.rb +67 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
- data/app/controllers/spree/admin/images_controller.rb +1 -1
- data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
- data/app/controllers/spree/admin/option_types_controller.rb +1 -1
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -2
- data/app/controllers/spree/admin/orders_controller.rb +21 -10
- data/app/controllers/spree/admin/payment_methods_controller.rb +3 -3
- data/app/controllers/spree/admin/payments_controller.rb +6 -12
- data/app/controllers/spree/admin/product_properties_controller.rb +2 -2
- data/app/controllers/spree/admin/products_controller.rb +1 -1
- data/app/controllers/spree/admin/promotion_actions_controller.rb +2 -2
- data/app/controllers/spree/admin/promotion_categories_controller.rb +6 -0
- data/app/controllers/spree/admin/promotion_rules_controller.rb +2 -2
- data/app/controllers/spree/admin/promotions_controller.rb +2 -1
- data/app/controllers/spree/admin/refund_reasons_controller.rb +6 -0
- data/app/controllers/spree/admin/refunds_controller.rb +31 -0
- data/app/controllers/spree/admin/reimbursement_types_controller.rb +6 -0
- data/app/controllers/spree/admin/reimbursements_controller.rb +44 -0
- data/app/controllers/spree/admin/resource_controller.rb +2 -2
- data/app/controllers/spree/admin/return_authorization_reasons_controller.rb +6 -0
- data/app/controllers/spree/admin/return_authorizations_controller.rb +35 -5
- data/app/controllers/spree/admin/return_items_controller.rb +9 -0
- data/app/controllers/spree/admin/search_controller.rb +1 -1
- data/app/controllers/spree/admin/shipping_methods_controller.rb +3 -3
- data/app/controllers/spree/admin/states_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_items_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_transfers_controller.rb +2 -2
- data/app/controllers/spree/admin/tax_rates_controller.rb +1 -1
- data/app/controllers/spree/admin/users_controller.rb +4 -4
- data/app/controllers/spree/admin/variants_controller.rb +2 -2
- data/app/controllers/spree/admin/zones_controller.rb +1 -1
- data/app/helpers/spree/admin/customer_returns_helper.rb +9 -0
- data/app/helpers/spree/admin/navigation_helper.rb +1 -1
- data/app/helpers/spree/admin/reimbursement_type_helper.rb +9 -0
- data/app/helpers/spree/admin/reimbursements_helper.rb +14 -0
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +7 -3
- data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +36 -0
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +50 -0
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +43 -0
- data/app/views/spree/admin/customer_returns/edit.html.erb +65 -0
- data/app/views/spree/admin/customer_returns/index.html.erb +60 -0
- data/app/views/spree/admin/customer_returns/new.html.erb +60 -0
- data/app/views/spree/admin/general_settings/edit.html.erb +6 -0
- data/app/views/spree/admin/images/_form.html.erb +6 -6
- data/app/views/spree/admin/log_entries/_credit_card.html.erb +4 -0
- data/app/views/spree/admin/log_entries/index.html.erb +2 -5
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +5 -7
- data/app/views/spree/admin/option_types/edit.html.erb +9 -2
- data/app/views/spree/admin/orders/_add_line_item.html.erb +18 -0
- data/app/views/spree/admin/orders/_form.html.erb +7 -7
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +40 -0
- data/app/views/spree/admin/orders/_shipment.html.erb +1 -1
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +5 -4
- data/app/views/spree/admin/orders/cart.html.erb +39 -0
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/index.html.erb +8 -14
- data/app/views/spree/admin/payment_methods/_form.html.erb +7 -7
- data/app/views/spree/admin/payments/_list.html.erb +11 -3
- data/app/views/spree/admin/payments/index.html.erb +13 -1
- data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +4 -6
- data/app/views/spree/admin/products/_form.html.erb +20 -6
- data/app/views/spree/admin/products/new.html.erb +3 -3
- data/app/views/spree/admin/products/stock.html.erb +1 -1
- data/app/views/spree/admin/promotion_categories/_form.html.erb +10 -0
- data/app/views/spree/admin/promotion_categories/edit.html.erb +17 -0
- data/app/views/spree/admin/promotion_categories/index.html.erb +34 -0
- data/app/views/spree/admin/promotion_categories/new.html.erb +16 -0
- data/app/views/spree/admin/promotion_rules/create.js.erb +2 -0
- data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
- data/app/views/spree/admin/promotions/_form.html.erb +5 -0
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +7 -7
- data/app/views/spree/admin/promotions/index.html.erb +16 -6
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +4 -2
- data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -0
- data/app/views/spree/admin/prototypes/_form.html.erb +2 -2
- data/app/views/spree/admin/refund_reasons/edit.html.erb +4 -0
- data/app/views/spree/admin/refund_reasons/index.html.erb +5 -0
- data/app/views/spree/admin/refund_reasons/new.html.erb +4 -0
- data/app/views/spree/admin/refunds/edit.html.erb +31 -0
- data/app/views/spree/admin/refunds/new.html.erb +43 -0
- data/app/views/spree/admin/reimbursement_types/index.html.erb +33 -0
- data/app/views/spree/admin/reimbursements/edit.html.erb +108 -0
- data/app/views/spree/admin/reimbursements/index.html.erb +34 -0
- data/app/views/spree/admin/reimbursements/show.html.erb +94 -0
- data/app/views/spree/admin/return_authorization_reasons/edit.html.erb +4 -0
- data/app/views/spree/admin/return_authorization_reasons/index.html.erb +5 -0
- data/app/views/spree/admin/return_authorization_reasons/new.html.erb +4 -0
- data/app/views/spree/admin/return_authorizations/_form.html.erb +62 -50
- data/app/views/spree/admin/return_authorizations/edit.html.erb +6 -8
- data/app/views/spree/admin/return_authorizations/index.html.erb +3 -4
- data/app/views/spree/admin/return_authorizations/new.html.erb +1 -1
- data/app/views/spree/admin/shared/_configuration_menu.html.erb +5 -2
- data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
- data/app/views/spree/admin/shared/_head.html.erb +1 -2
- data/app/views/spree/admin/shared/_order_submenu.html.erb +17 -3
- data/app/views/spree/admin/shared/_order_summary.html.erb +7 -0
- data/app/views/spree/admin/shared/_product_tabs.html.erb +1 -0
- data/app/views/spree/admin/shared/_refunds.html.erb +32 -0
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +12 -12
- data/app/views/spree/admin/shared/_tabs.html.erb +2 -2
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +17 -0
- data/app/views/spree/admin/shared/named_types/_form.html.erb +16 -0
- data/app/views/spree/admin/shared/named_types/_index.html.erb +52 -0
- data/app/views/spree/admin/shared/named_types/_new.html.erb +16 -0
- data/app/views/spree/admin/shipping_categories/_form.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +8 -0
- data/app/views/spree/admin/stock_locations/_form.html.erb +77 -59
- data/app/views/spree/admin/stock_transfers/new.html.erb +2 -2
- data/app/views/spree/admin/tax_categories/_form.html.erb +9 -2
- data/app/views/spree/admin/tax_categories/index.html.erb +4 -1
- data/app/views/spree/admin/taxons/index.html.erb +4 -0
- data/app/views/spree/admin/trackers/_form.html.erb +4 -4
- data/app/views/spree/admin/users/_form.html.erb +1 -1
- data/app/views/spree/admin/users/index.html.erb +1 -1
- data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +49 -0
- data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +0 -1
- data/app/views/spree/admin/variants/_split.js.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +1 -1
- data/config/initializers/assets.rb +1 -1
- data/config/routes.rb +22 -1
- metadata +62 -32
- data/app/controllers/spree/admin/inventory_units_controller.rb +0 -6
- data/app/controllers/spree/admin/line_items_controller.rb +0 -49
- data/app/controllers/spree/admin/overview_controller.rb +0 -11
- data/app/views/spree/admin/inventory_units/adjust.html.erb +0 -31
- data/app/views/spree/test_mailer/test_email.text.erb +0 -4
- data/config/locales/en.yml +0 -6
@@ -1,30 +1,60 @@
|
|
1
|
+
<% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
|
2
|
+
|
1
3
|
<div data-hook="admin_return_authorization_form_fields">
|
2
|
-
<table class="index">
|
4
|
+
<table class="index return-items-table">
|
3
5
|
<thead>
|
4
6
|
<tr data-hook="rma_header">
|
7
|
+
<th>
|
8
|
+
<% if allow_return_item_changes %>
|
9
|
+
<%= check_box_tag 'select-all' %>
|
10
|
+
<% end %>
|
11
|
+
</th>
|
5
12
|
<th><%= Spree.t(:product) %></th>
|
6
|
-
<th><%= Spree.t(:
|
7
|
-
<th><%= Spree.t(:
|
8
|
-
<th><%= Spree.t(:
|
13
|
+
<th><%= Spree.t(:state) %></th>
|
14
|
+
<th><%= Spree.t(:charged) %></th>
|
15
|
+
<th><%= Spree.t(:pre_tax_refund_amount) %></th>
|
16
|
+
<th><%= Spree.t(:reimbursement_type) %></th>
|
17
|
+
<th><%= Spree.t(:exchange_for) %></th>
|
9
18
|
</tr>
|
10
19
|
</thead>
|
11
20
|
<tbody>
|
12
|
-
|
13
|
-
|
21
|
+
<%= f.fields_for :return_items, @form_return_items do |item_fields| %>
|
22
|
+
<% return_item = item_fields.object %>
|
23
|
+
<% inventory_unit = return_item.inventory_unit %>
|
24
|
+
<tr>
|
25
|
+
<td class="align-center" class="inventory-unit-checkbox">
|
26
|
+
<% if inventory_unit.shipped? && allow_return_item_changes %>
|
27
|
+
<%= item_fields.hidden_field :inventory_unit_id %>
|
28
|
+
<%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '0', '1' %>
|
29
|
+
<% end %>
|
30
|
+
</td>
|
14
31
|
<td>
|
15
|
-
<div class="variant-name"><%= variant.name %></div>
|
16
|
-
<div class="variant-options"><%= variant.options_text %></div>
|
32
|
+
<div class="variant-name"><%= inventory_unit.variant.name %></div>
|
33
|
+
<div class="variant-options"><%= inventory_unit.variant.options_text %></div>
|
17
34
|
</td>
|
18
|
-
<td class="align-center"><%=
|
19
|
-
<td class="align-center"
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
<%
|
24
|
-
|
35
|
+
<td class="align-center"><%= inventory_unit.state.humanize %></td>
|
36
|
+
<td class="align-center">
|
37
|
+
<%= return_item.display_pre_tax_amount %>
|
38
|
+
</td>
|
39
|
+
<td class="align-center">
|
40
|
+
<% if inventory_unit.shipped? && allow_return_item_changes %>
|
41
|
+
<%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
|
25
42
|
<% else %>
|
26
|
-
<%=
|
27
|
-
|
43
|
+
<%= return_item.display_pre_tax_amount %>
|
44
|
+
<% end %>
|
45
|
+
</td>
|
46
|
+
<td>
|
47
|
+
<% if inventory_unit.shipped? && allow_return_item_changes %>
|
48
|
+
<%= item_fields.select :preferred_reimbursement_type_id, @reimbursement_types.collect{|r|[r.name.humanize, r.id]}, {include_blank: true}, {class: 'select2 fullwidth'} %>
|
49
|
+
<% end %>
|
50
|
+
</td>
|
51
|
+
<td class="align-center">
|
52
|
+
<% if inventory_unit.shipped? && allow_return_item_changes %>
|
53
|
+
<% if return_item.exchange_processed? %>
|
54
|
+
<%= return_item.exchange_variant.options_text %>
|
55
|
+
<% else %>
|
56
|
+
<%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
|
57
|
+
<% end %>
|
28
58
|
<% end %>
|
29
59
|
</td>
|
30
60
|
</tr>
|
@@ -33,46 +63,28 @@
|
|
33
63
|
</table>
|
34
64
|
|
35
65
|
<%= f.field_container :amount do %>
|
36
|
-
<%=
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
66
|
+
<%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
|
67
|
+
<% end %>
|
68
|
+
|
69
|
+
<%= f.field_container :stock_location do %>
|
70
|
+
<%= f.label :stock_location, Spree.t(:stock_location) %>
|
71
|
+
<%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
|
72
|
+
<%= f.error_message_on :stock_location_id %>
|
43
73
|
<% end %>
|
44
74
|
|
45
75
|
<%= f.field_container :reason do %>
|
46
76
|
<%= f.label :reason, Spree.t(:reason) %>
|
47
|
-
<%= f.
|
77
|
+
<%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
|
48
78
|
<%= f.error_message_on :reason %>
|
49
79
|
<% end %>
|
50
80
|
|
51
|
-
<%= f.field_container :
|
52
|
-
<%= f.label :
|
53
|
-
<%= f.
|
54
|
-
<%= f.error_message_on :
|
81
|
+
<%= f.field_container :memo do %>
|
82
|
+
<%= f.label :memo, Spree.t(:memo) %>
|
83
|
+
<%= f.text_area :memo, {:style => 'height:100px;', :class => 'fullwidth'} %>
|
84
|
+
<%= f.error_message_on :memo %>
|
55
85
|
<% end %>
|
56
86
|
</div>
|
57
87
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
line_item_prices[<%= variant.id.to_s %>] = <%= items.first.price %>;
|
62
|
-
<% end %>
|
63
|
-
|
64
|
-
$(document).ready(function(){
|
65
|
-
var rma_amount = 0;
|
66
|
-
$("td.return_quantity input").on('change', function() {
|
67
|
-
var rma_amount = 0;
|
68
|
-
$.each($("td.return_quantity input"), function(i, input) {
|
69
|
-
var variant_id = $(input).prop('id').replace("return_quantity_", "");
|
70
|
-
rma_amount += line_item_prices[variant_id] * $(input).val()
|
71
|
-
});
|
72
|
-
|
73
|
-
if(!isNaN(rma_amount)){
|
74
|
-
$("span#rma_value").html(rma_amount.toFixed(2));
|
75
|
-
}
|
76
|
-
})
|
77
|
-
});
|
78
|
-
</script>
|
88
|
+
<% if Spree::Config[:expedited_exchanges] %>
|
89
|
+
<div class="expedited-exchanges-warning"><%= Spree.t(:expedited_exchanges_warning, days_window: Spree::Config[:expedited_exchanges_days_window]) %></div>
|
90
|
+
<% end %>
|
@@ -1,13 +1,11 @@
|
|
1
1
|
<% content_for :page_actions do %>
|
2
|
+
<% if @return_authorization.can_cancel? %>
|
3
|
+
<li>
|
4
|
+
<%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, e: 'cancel'), method: :put, data: { confirm: Spree.t(:are_you_sure) }, icon: 'remove' %>
|
5
|
+
</li>
|
6
|
+
<% end %>
|
2
7
|
<li>
|
3
|
-
|
4
|
-
<%= button_link_to Spree.t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'download-alt' %>
|
5
|
-
<% end %>
|
6
|
-
</li>
|
7
|
-
<li>
|
8
|
-
<% if @return_authorization.can_cancel? %>
|
9
|
-
<%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'remove' %>
|
10
|
-
<% end %>
|
8
|
+
<%= button_link_to Spree.t(:back), spree.admin_order_return_authorizations_url(@order), icon: 'arrow-left' %>
|
11
9
|
</li>
|
12
10
|
<% end %>
|
13
11
|
|
@@ -19,7 +19,7 @@
|
|
19
19
|
<tr>
|
20
20
|
<th><%= Spree.t(:rma_number) %></th>
|
21
21
|
<th><%= Spree.t(:status) %></th>
|
22
|
-
<th><%= Spree.t(:
|
22
|
+
<th><%= Spree.t(:pre_tax_total) %></th>
|
23
23
|
<th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
|
24
24
|
<th class="actions"></th>
|
25
25
|
</tr>
|
@@ -29,12 +29,11 @@
|
|
29
29
|
<tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row" class="<%= cycle('odd', 'even')%>">
|
30
30
|
<td><%= return_authorization.number %></td>
|
31
31
|
<td><%= Spree.t(return_authorization.state.downcase) %></td>
|
32
|
-
<td><%= return_authorization.
|
32
|
+
<td><%= return_authorization.display_pre_tax_total.to_html %></td>
|
33
33
|
<td><%= pretty_time(return_authorization.created_at) %></td>
|
34
34
|
<td class="actions">
|
35
35
|
<%= link_to_edit return_authorization, :no_text => true, :class => 'edit' %>
|
36
|
-
<% unless return_authorization.
|
37
|
-
|
36
|
+
<% unless return_authorization.customer_returned_items? %>
|
38
37
|
<%= link_to_delete return_authorization, :no_text => true %>
|
39
38
|
<% end %>
|
40
39
|
</td>
|
@@ -14,7 +14,7 @@
|
|
14
14
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
15
15
|
|
16
16
|
<div class="form-buttons filter-actions actions" data-hook="buttons">
|
17
|
-
<%= button Spree.t(:
|
17
|
+
<%= button Spree.t(:create), 'ok' %>
|
18
18
|
<span class="or"><%= Spree.t(:or) %></span>
|
19
19
|
<%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
|
20
20
|
</div>
|
@@ -10,8 +10,8 @@
|
|
10
10
|
<%= configurations_sidebar_menu_item Spree.t(:tax_rates), admin_tax_rates_path %>
|
11
11
|
<%= configurations_sidebar_menu_item Spree.t(:zones), admin_zones_path %>
|
12
12
|
<%= configurations_sidebar_menu_item Spree.t(:countries), admin_countries_path %>
|
13
|
-
<% if
|
14
|
-
<%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(
|
13
|
+
<% if Spree::Config[:default_country_id] %>
|
14
|
+
<%= configurations_sidebar_menu_item Spree.t(:states), admin_country_states_path(Spree::Config[:default_country_id]) %>
|
15
15
|
<% end %>
|
16
16
|
<%= configurations_sidebar_menu_item Spree.t(:payment_methods), admin_payment_methods_path %>
|
17
17
|
<%= configurations_sidebar_menu_item Spree.t(:taxonomies), admin_taxonomies_path %>
|
@@ -20,6 +20,9 @@
|
|
20
20
|
<%= configurations_sidebar_menu_item Spree.t(:stock_transfers), admin_stock_transfers_path %>
|
21
21
|
<%= configurations_sidebar_menu_item Spree.t(:stock_locations), spree.admin_stock_locations_path %>
|
22
22
|
<%= configurations_sidebar_menu_item Spree.t(:analytics_trackers), admin_trackers_path %>
|
23
|
+
<%= configurations_sidebar_menu_item Spree.t(:refund_reasons), admin_refund_reasons_path %>
|
24
|
+
<%= configurations_sidebar_menu_item Spree.t(:reimbursement_types), admin_reimbursement_types_path %>
|
25
|
+
<%= configurations_sidebar_menu_item Spree.t(:return_authorization_reasons), admin_return_authorization_reasons_path %>
|
23
26
|
</ul>
|
24
27
|
</nav>
|
25
28
|
<% end %>
|
@@ -23,7 +23,6 @@
|
|
23
23
|
<%= javascript_tag do -%>
|
24
24
|
jQuery.alerts.dialogClass = 'spree';
|
25
25
|
<%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
|
26
|
-
|
27
|
-
<% end %>
|
26
|
+
<% end -%>
|
28
27
|
|
29
28
|
<%= yield :head %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<nav class="menu">
|
2
2
|
<ul data-hook="admin_order_tabs">
|
3
|
-
<% if can? :update, @order %>
|
4
|
-
<li<%== ' class="active"' if current == '
|
5
|
-
<%= link_to_with_icon '
|
3
|
+
<% if ((can? :update, @order) && (@order.shipments.count == 0 || @order.shipped_shipments.count == 0)) %>
|
4
|
+
<li<%== ' class="active"' if current == 'Cart' %> data-hook='admin_order_tabs_order_details'>
|
5
|
+
<%= link_to_with_icon 'shopping-cart', Spree.t(:cart), cart_admin_order_url(@order) %>
|
6
6
|
</li>
|
7
7
|
<% end %>
|
8
8
|
|
@@ -12,6 +12,12 @@
|
|
12
12
|
</li>
|
13
13
|
<% end %>
|
14
14
|
|
15
|
+
<% if can? :update, @order %>
|
16
|
+
<li<%== ' class="active"' if current == 'Shipments' %> data-hook='admin_order_tabs_order_details'>
|
17
|
+
<%= link_to_with_icon 'edit', Spree.t(:shipments), edit_admin_order_url(@order) %>
|
18
|
+
</li>
|
19
|
+
<% end %>
|
20
|
+
|
15
21
|
<% if can? :index, Spree::Adjustment %>
|
16
22
|
<li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
|
17
23
|
<%= link_to_with_icon 'cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
|
@@ -31,5 +37,13 @@
|
|
31
37
|
</li>
|
32
38
|
<% end %>
|
33
39
|
<% end %>
|
40
|
+
|
41
|
+
<% if can? :index, Spree::CustomerReturn %>
|
42
|
+
<% if @order.completed? %>
|
43
|
+
<li<%== ' class="active"' if current == 'Customer Returns' %>>
|
44
|
+
<%= link_to_with_icon 'download', Spree.t(:customer_returns), admin_order_customer_returns_url(@order) %>
|
45
|
+
</li>
|
46
|
+
<% end %>
|
47
|
+
<% end %>
|
34
48
|
</ul>
|
35
49
|
</nav>
|
@@ -37,5 +37,12 @@
|
|
37
37
|
<dt><%= Spree.t(:approved_at) %></dt>
|
38
38
|
<dd><%= pretty_time(@order.approved_at) %></dd>
|
39
39
|
<% end %>
|
40
|
+
|
41
|
+
<% if @order.canceled? && @order.canceler && @order.canceled_at %>
|
42
|
+
<dt><%= Spree.t(:canceler) %></dt>
|
43
|
+
<dd><%= @order.canceler.email %></td>
|
44
|
+
<dt><%= Spree.t(:canceled_at) %></dt>
|
45
|
+
<dd><%= pretty_time(@order.canceled_at) %></dd>
|
46
|
+
<% end %>
|
40
47
|
</dl>
|
41
48
|
</header>
|
@@ -0,0 +1,32 @@
|
|
1
|
+
<table class="index" id='payments' data-order-id='<%= @order.number %>'>
|
2
|
+
<thead>
|
3
|
+
<tr data-hook="refunds_header">
|
4
|
+
<th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
|
5
|
+
<th><%= Spree.t(:payment_identifier) %></th>
|
6
|
+
<th><%= Spree.t(:amount) %></th>
|
7
|
+
<th><%= Spree.t(:payment_method) %></th>
|
8
|
+
<th><%= Spree.t(:transaction_id) %></th>
|
9
|
+
<th><%= Spree.t(:reason) %></th>
|
10
|
+
<% if show_actions %>
|
11
|
+
<th class="actions"></th>
|
12
|
+
<% end %>
|
13
|
+
</tr>
|
14
|
+
</thead>
|
15
|
+
<tbody>
|
16
|
+
<% refunds.each do |refund| %>
|
17
|
+
<tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
|
18
|
+
<td><%= pretty_time(refund.created_at) %></td>
|
19
|
+
<td class="align-center"><%= refund.payment.identifier %></td>
|
20
|
+
<td class="align-center amount"><%= refund.display_amount %></td>
|
21
|
+
<td class="align-center"><%= payment_method_name(refund.payment) %></td>
|
22
|
+
<td class="align-center"><%= refund.transaction_id %></td>
|
23
|
+
<td class="align-center"><%= truncate(refund.reason.name, length: 100) %></td>
|
24
|
+
<% if show_actions %>
|
25
|
+
<td class="actions">
|
26
|
+
<%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true %>
|
27
|
+
</td>
|
28
|
+
<% end %>
|
29
|
+
</tr>
|
30
|
+
<% end %>
|
31
|
+
</tbody>
|
32
|
+
</table>
|
@@ -1,17 +1,17 @@
|
|
1
1
|
<%= search_form_for @search, :url => spree.sales_total_admin_reports_path do |s| %>
|
2
|
-
|
3
|
-
|
4
|
-
|
2
|
+
<div class="date-range-filter field align-center">
|
3
|
+
<%= label_tag :q_completed_at_gt, Spree.t(:start), :class => 'inline' %>
|
4
|
+
<%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
|
5
5
|
|
6
|
-
|
7
|
-
|
8
|
-
|
6
|
+
<span class="range-divider">
|
7
|
+
<i class="fa fa-arrow-right"></i>
|
8
|
+
</span>
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
|
10
|
+
<%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
|
11
|
+
<%= label_tag :q_completed_at_lt, Spree.t(:end), :class => 'inline' %>
|
12
|
+
</div>
|
13
13
|
|
14
|
-
|
15
|
-
|
16
|
-
|
14
|
+
<div class="actions filter-actions">
|
15
|
+
<%= button Spree.t(:search), 'search' %>
|
16
|
+
</div>
|
17
17
|
<% end %>
|
@@ -1,8 +1,8 @@
|
|
1
1
|
<% if can? :admin, Spree::Order %>
|
2
|
-
<%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'shopping-cart' %>
|
2
|
+
<%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :customer_returns, :icon => 'shopping-cart' %>
|
3
3
|
<% end %>
|
4
4
|
<% if can? :admin, Spree::Product %>
|
5
|
-
<%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :icon => 'th-large' %>
|
5
|
+
<%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :taxons, :icon => 'th-large' %>
|
6
6
|
<% end %>
|
7
7
|
<% if can? :admin, Spree::Admin::ReportsController %>
|
8
8
|
<%= tab :reports, :icon => 'file' %>
|
@@ -0,0 +1,17 @@
|
|
1
|
+
<% content_for :page_title do %>
|
2
|
+
<%= page_title %> <i class="fa fa-arrow-right"></i>
|
3
|
+
<%= @object.name %>
|
4
|
+
<% end %>
|
5
|
+
|
6
|
+
<% content_for :page_actions do %>
|
7
|
+
<li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
|
8
|
+
<% end %>
|
9
|
+
|
10
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
|
11
|
+
|
12
|
+
<%= form_for [:admin, @object] do |f| %>
|
13
|
+
<fieldset class="no-border-top">
|
14
|
+
<%= render :partial => 'spree/admin/shared/named_types/form', :locals => { :f => f } %>
|
15
|
+
<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
|
16
|
+
</fieldset>
|
17
|
+
<% end %>
|
@@ -0,0 +1,16 @@
|
|
1
|
+
<div data-hook="admin_named_type_form_fields" class="row">
|
2
|
+
<div class="row">
|
3
|
+
<div class="alpha four columns">
|
4
|
+
<%= f.field_container :name do %>
|
5
|
+
<%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
|
6
|
+
<%= f.text_field :name, :class => 'fullwidth' %>
|
7
|
+
<% end %>
|
8
|
+
<div class="checkbox">
|
9
|
+
<label>
|
10
|
+
<%= f.check_box :active %>
|
11
|
+
<%= Spree.t(:active) %>
|
12
|
+
</label>
|
13
|
+
</div>
|
14
|
+
</div>
|
15
|
+
</div>
|
16
|
+
</div>
|
@@ -0,0 +1,52 @@
|
|
1
|
+
<%= render partial: 'spree/admin/shared/configuration_menu' %>
|
2
|
+
|
3
|
+
<% content_for :page_title do %>
|
4
|
+
<%= page_title %>
|
5
|
+
<% end %>
|
6
|
+
|
7
|
+
<% content_for :page_actions do %>
|
8
|
+
<ul class="actions inline-menu">
|
9
|
+
<li>
|
10
|
+
<%= button_link_to new_button_text, new_object_url, { icon: 'plus', id: 'admin_new_named_type' } %>
|
11
|
+
</li>
|
12
|
+
</ul>
|
13
|
+
<% end %>
|
14
|
+
|
15
|
+
<% if @collection.any? %>
|
16
|
+
<table class="index" id='listing_named_types' data-hook>
|
17
|
+
<colgroup>
|
18
|
+
<col style="width: 65%" />
|
19
|
+
<col style="width: 20%" />
|
20
|
+
<col style="width: 15%" />
|
21
|
+
</colgroup>
|
22
|
+
<thead>
|
23
|
+
<tr data-hook="named_types_header">
|
24
|
+
<th><%= Spree.t(:name) %></th>
|
25
|
+
<th><%= Spree.t(:state) %></th>
|
26
|
+
<th class="actions"></th>
|
27
|
+
</tr>
|
28
|
+
</thead>
|
29
|
+
<tbody>
|
30
|
+
<% @collection.each do |named_type| %>
|
31
|
+
<tr id="<%= spree_dom_id named_type %>" data-hook="named_type_row" class="<%= cycle('odd', 'even')%>">
|
32
|
+
<td class="align-center">
|
33
|
+
<%= named_type.name %>
|
34
|
+
</td>
|
35
|
+
<td class="align-center">
|
36
|
+
<%= Spree.t(named_type.active? ? :active : :inactive) %>
|
37
|
+
</td>
|
38
|
+
<td class="actions">
|
39
|
+
<% if named_type.mutable? %>
|
40
|
+
<%= link_to_edit named_type, no_text: true %>
|
41
|
+
<% end %>
|
42
|
+
</td>
|
43
|
+
</tr>
|
44
|
+
<% end %>
|
45
|
+
</tbody>
|
46
|
+
</table>
|
47
|
+
<% else %>
|
48
|
+
<div class="alpha twelve columns no-objects-found">
|
49
|
+
<%= Spree.t(:no_resource_found, resource: resource_name) %>,
|
50
|
+
<%= link_to Spree.t(:add_one), new_object_url %>!
|
51
|
+
</div>
|
52
|
+
<% end %>
|
@@ -0,0 +1,16 @@
|
|
1
|
+
<% content_for :page_title do %>
|
2
|
+
<%= page_title %>
|
3
|
+
<% end %>
|
4
|
+
|
5
|
+
<% content_for :page_actions do %>
|
6
|
+
<li><%= link_to_with_icon 'arrow-left', back_button_text, collection_url, :class => 'button' %></li>
|
7
|
+
<% end %>
|
8
|
+
|
9
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
|
10
|
+
|
11
|
+
<%= form_for [:admin, @object] do |f| %>
|
12
|
+
<fieldset class="no-border-top">
|
13
|
+
<%= render :partial => 'spree/admin/shared/named_types/form', :locals => { :f => f } %>
|
14
|
+
<%= render :partial => 'spree/admin/shared/new_resource_links' %>
|
15
|
+
</fieldset>
|
16
|
+
<% end %>
|
@@ -23,6 +23,14 @@
|
|
23
23
|
<%= error_message_on :shipping_method, :admin_name %>
|
24
24
|
<% end %>
|
25
25
|
</div>
|
26
|
+
|
27
|
+
<div data-hook="admin_shipping_method_form_code" class="omega six columns">
|
28
|
+
<%= f.field_container :code do %>
|
29
|
+
<%= f.label :code, Spree.t(:code) %><br />
|
30
|
+
<%= f.text_field :code, :class => 'fullwidth', :label => false %>
|
31
|
+
<%= error_message_on :shipping_method, :code %>
|
32
|
+
<% end %>
|
33
|
+
</div>
|
26
34
|
</div>
|
27
35
|
|
28
36
|
<div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
|