spree_backend 2.2.1 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/admin.js.erb +1 -1
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +2 -2
- data/app/assets/javascripts/spree/backend/shipments.js.erb +11 -12
- data/app/assets/javascripts/spree/backend/spree-select2.js.erb +1 -1
- data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +4 -4
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js.erb +2 -2
- data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +2 -2
- data/app/assets/stylesheets/spree/backend/hacks/_ie.scss +2 -2
- data/app/assets/stylesheets/spree/backend/hacks/_mozilla.scss +1 -1
- data/app/assets/stylesheets/spree/backend/hacks/_opera.scss +1 -1
- data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +6 -6
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +5 -7
- data/app/assets/stylesheets/spree/backend/shared/_icons.scss +17 -7
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +9 -9
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +1 -1
- data/app/controllers/spree/admin/products_controller.rb +1 -1
- data/app/controllers/spree/admin/promotions_controller.rb +1 -0
- data/app/controllers/spree/admin/resource_controller.rb +1 -1
- data/app/controllers/spree/admin/variants_controller.rb +1 -1
- data/app/helpers/spree/admin/adjustments_helper.rb +1 -1
- data/app/helpers/spree/admin/base_helper.rb +3 -3
- data/app/helpers/spree/admin/navigation_helper.rb +8 -8
- data/app/helpers/spree/admin/orders_helper.rb +1 -1
- data/app/views/spree/admin/adjustments/edit.html.erb +4 -4
- data/app/views/spree/admin/adjustments/index.html.erb +5 -5
- data/app/views/spree/admin/adjustments/new.html.erb +4 -4
- data/app/views/spree/admin/countries/edit.html.erb +1 -1
- data/app/views/spree/admin/countries/index.html.erb +1 -1
- data/app/views/spree/admin/countries/new.html.erb +1 -1
- data/app/views/spree/admin/general_settings/edit.html.erb +2 -2
- data/app/views/spree/admin/images/edit.html.erb +3 -3
- data/app/views/spree/admin/images/index.html.erb +2 -2
- data/app/views/spree/admin/images/new.html.erb +2 -2
- data/app/views/spree/admin/log_entries/index.html.erb +5 -5
- data/app/views/spree/admin/option_types/edit.html.erb +2 -2
- data/app/views/spree/admin/option_types/index.html.erb +1 -1
- data/app/views/spree/admin/orders/_line_items.html.erb +4 -4
- data/app/views/spree/admin/orders/_shipment.html.erb +16 -15
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +5 -5
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +2 -4
- data/app/views/spree/admin/orders/edit.html.erb +2 -3
- data/app/views/spree/admin/orders/index.html.erb +3 -3
- data/app/views/spree/admin/payment_methods/edit.html.erb +3 -3
- data/app/views/spree/admin/payment_methods/index.html.erb +1 -1
- data/app/views/spree/admin/payment_methods/new.html.erb +2 -2
- data/app/views/spree/admin/payments/_form.html.erb +1 -1
- data/app/views/spree/admin/payments/_list.html.erb +1 -1
- data/app/views/spree/admin/payments/credit.html.erb +1 -1
- data/app/views/spree/admin/payments/index.html.erb +3 -3
- data/app/views/spree/admin/payments/new.html.erb +3 -3
- data/app/views/spree/admin/payments/show.html.erb +4 -4
- data/app/views/spree/admin/product_properties/index.html.erb +2 -2
- data/app/views/spree/admin/products/_add_stock_form.html.erb +2 -2
- data/app/views/spree/admin/products/edit.html.erb +2 -2
- data/app/views/spree/admin/products/index.html.erb +3 -3
- data/app/views/spree/admin/products/stock.html.erb +2 -2
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -2
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +1 -1
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +1 -1
- data/app/views/spree/admin/promotions/_rules.html.erb +2 -2
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +7 -3
- data/app/views/spree/admin/promotions/edit.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +2 -2
- data/app/views/spree/admin/promotions/new.html.erb +1 -1
- data/app/views/spree/admin/properties/edit.html.erb +1 -1
- data/app/views/spree/admin/properties/index.html.erb +1 -1
- data/app/views/spree/admin/prototypes/_prototypes.html.erb +1 -1
- data/app/views/spree/admin/prototypes/edit.html.erb +1 -1
- data/app/views/spree/admin/prototypes/index.html.erb +1 -1
- data/app/views/spree/admin/reports/sales_total.html.erb +1 -1
- data/app/views/spree/admin/return_authorizations/edit.html.erb +5 -5
- data/app/views/spree/admin/return_authorizations/index.html.erb +4 -4
- data/app/views/spree/admin/return_authorizations/new.html.erb +4 -4
- data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +2 -2
- data/app/views/spree/admin/shared/_order_submenu.html.erb +5 -5
- data/app/views/spree/admin/shared/_product_tabs.html.erb +5 -5
- data/app/views/spree/admin/shared/_report_criteria.html.erb +2 -2
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +2 -2
- data/app/views/spree/admin/shared/_routes.html.erb +1 -0
- data/app/views/spree/admin/shared/_tabs.html.erb +6 -6
- data/app/views/spree/admin/shipping_categories/edit.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/new.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_form.html.erb +6 -5
- data/app/views/spree/admin/shipping_methods/edit.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/index.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/new.html.erb +1 -1
- data/app/views/spree/admin/states/_state_list.html.erb +1 -1
- data/app/views/spree/admin/states/edit.html.erb +2 -2
- data/app/views/spree/admin/states/index.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/edit.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/index.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/new.html.erb +1 -1
- data/app/views/spree/admin/stock_movements/edit.html.erb +1 -1
- data/app/views/spree/admin/stock_movements/index.html.erb +3 -3
- data/app/views/spree/admin/stock_movements/new.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +3 -3
- data/app/views/spree/admin/stock_transfers/new.html.erb +4 -4
- data/app/views/spree/admin/stock_transfers/show.html.erb +4 -4
- data/app/views/spree/admin/tax_categories/edit.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/index.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/new.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/edit.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/index.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/new.html.erb +1 -1
- data/app/views/spree/admin/tax_settings/edit.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.erb +3 -3
- data/app/views/spree/admin/taxonomies/index.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/new.html.erb +2 -2
- data/app/views/spree/admin/taxons/edit.html.erb +3 -3
- data/app/views/spree/admin/trackers/edit.html.erb +1 -1
- data/app/views/spree/admin/trackers/index.html.erb +1 -1
- data/app/views/spree/admin/trackers/new.html.erb +1 -1
- data/app/views/spree/admin/users/_sidebar.html.erb +4 -4
- data/app/views/spree/admin/users/_user_page_actions.html.erb +1 -1
- data/app/views/spree/admin/users/edit.html.erb +3 -3
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/new.html.erb +1 -1
- data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +2 -2
- data/app/views/spree/admin/variants/_split.js.erb +2 -2
- data/app/views/spree/admin/variants/index.html.erb +2 -2
- data/app/views/spree/admin/zones/edit.html.erb +1 -1
- data/app/views/spree/admin/zones/index.html.erb +1 -1
- data/app/views/spree/admin/zones/new.html.erb +1 -1
- data/config/routes.rb +1 -2
- metadata +7 -9
- data/app/assets/javascripts/spree/backend/spree_backend.js +0 -20
- data/app/assets/stylesheets/spree/backend/spree_backend.css +0 -17
|
@@ -24,11 +24,11 @@
|
|
|
24
24
|
<% unless shipment.shipped? %>
|
|
25
25
|
<td class="cart-item-delete actions" data-hook="cart_item_delete">
|
|
26
26
|
<% if can? :update, item %>
|
|
27
|
-
<%= link_to '', '#', :class => 'save-item
|
|
28
|
-
<%= link_to '', '#', :class => 'cancel-item
|
|
29
|
-
<%= link_to '', '#', :class => 'edit-item
|
|
30
|
-
<%= link_to '', '#', :class => 'split-item icon_link
|
|
31
|
-
<%= link_to '', '#', :class => 'delete-item
|
|
27
|
+
<%= link_to '', '#', :class => 'save-item fa fa-check no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
|
|
28
|
+
<%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
|
|
29
|
+
<%= link_to '', '#', :class => 'edit-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
|
|
30
|
+
<%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
|
|
31
|
+
<%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
|
|
32
32
|
<% end %>
|
|
33
33
|
</td>
|
|
34
34
|
<% end %>
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
<div class="clear"></div>
|
|
65
65
|
|
|
66
66
|
<div class="form-buttons filter-actions actions" data-hook="buttons">
|
|
67
|
-
<%= button Spree.t('actions.update'), '
|
|
67
|
+
<%= button Spree.t('actions.update'), 'refresh' %>
|
|
68
68
|
</div>
|
|
69
69
|
|
|
70
70
|
<% content_for :head do %>
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Details' } %>
|
|
2
2
|
|
|
3
|
-
<%= csrf_meta_tags %>
|
|
4
|
-
|
|
5
3
|
<% content_for :page_title do %>
|
|
6
|
-
<i class="
|
|
4
|
+
<i class="fa fa-arrow-right"></i> <%= Spree.t(:customer_details) %>
|
|
7
5
|
<% end %>
|
|
8
6
|
|
|
9
7
|
<% content_for :page_actions do %>
|
|
10
|
-
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => '
|
|
8
|
+
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
|
|
11
9
|
<% end %>
|
|
12
10
|
|
|
13
11
|
<div id="select-customer" data-hook>
|
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
<%= csrf_meta_tags %>
|
|
2
1
|
<% content_for :page_actions do %>
|
|
3
2
|
<% if can?(:fire, @order) %>
|
|
4
3
|
<li><%= event_links %></li>
|
|
5
4
|
<% end %>
|
|
6
5
|
<% if can?(:resend, @order) %>
|
|
7
|
-
<li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => '
|
|
6
|
+
<li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li>
|
|
8
7
|
<% end %>
|
|
9
8
|
<% if can?(:admin, Spree::Order) %>
|
|
10
|
-
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => '
|
|
9
|
+
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
|
|
11
10
|
<% end %>
|
|
12
11
|
<% end %>
|
|
13
12
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<li>
|
|
7
|
-
<%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => '
|
|
7
|
+
<%= button_link_to Spree.t(:new_order), new_admin_order_url, :icon => 'plus', :id => 'admin_new_order' %>
|
|
8
8
|
</li>
|
|
9
9
|
<% end if can? :edit, Spree::Order.new %>
|
|
10
10
|
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
<%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
|
|
23
23
|
|
|
24
24
|
<span class="range-divider">
|
|
25
|
-
<i class="
|
|
25
|
+
<i class="fa fa-arrow-right"></i>
|
|
26
26
|
</span>
|
|
27
27
|
|
|
28
28
|
<%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
|
|
76
76
|
<div class="actions filter-actions">
|
|
77
77
|
<div data-hook="admin_orders_index_search_buttons">
|
|
78
|
-
<%= button Spree.t(:filter_results), '
|
|
78
|
+
<%= button Spree.t(:filter_results), 'search' %>
|
|
79
79
|
</div>
|
|
80
80
|
</div>
|
|
81
81
|
<% end %>
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<%= render :partial => 'spree/admin/shared/configuration_menu' %>
|
|
2
2
|
|
|
3
3
|
<% content_for :page_title do %>
|
|
4
|
-
<%= Spree.t(:editing_payment_method) %> <i class="
|
|
4
|
+
<%= Spree.t(:editing_payment_method) %> <i class="fa fa-arrow-right"></i> <%= @payment_method.name %>
|
|
5
5
|
<% end %>
|
|
6
6
|
|
|
7
7
|
<% content_for :page_actions do %>
|
|
8
8
|
<li>
|
|
9
|
-
<%= button_link_to Spree.t(:back_to_payment_methods_list), spree.admin_payment_methods_path, :icon => '
|
|
9
|
+
<%= button_link_to Spree.t(:back_to_payment_methods_list), spree.admin_payment_methods_path, :icon => 'arrow-left' %>
|
|
10
10
|
</li>
|
|
11
11
|
<% end %>
|
|
12
12
|
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
<fieldset class="no-border-top">
|
|
17
17
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
18
18
|
<div data-hook="buttons" class="filter-actions actions">
|
|
19
|
-
<%= button Spree.t('actions.update'), '
|
|
19
|
+
<%= button Spree.t('actions.update'), 'refresh' %>
|
|
20
20
|
</div>
|
|
21
21
|
</fieldset>
|
|
22
22
|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
<% content_for :page_actions do %>
|
|
8
8
|
<li>
|
|
9
|
-
<%= button_link_to Spree.t(:new_payment_method), new_object_url, :icon => '
|
|
9
|
+
<%= button_link_to Spree.t(:new_payment_method), new_object_url, :icon => 'plus', :id => 'admin_new_payment_methods_link' %>
|
|
10
10
|
</li>
|
|
11
11
|
<% end %>
|
|
12
12
|
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
<% content_for :page_actions do %>
|
|
8
8
|
<li>
|
|
9
|
-
<%= button_link_to Spree.t(:back_to_payment_methods_list), admin_payment_methods_path, :icon => '
|
|
9
|
+
<%= button_link_to Spree.t(:back_to_payment_methods_list), admin_payment_methods_path, :icon => 'arrow-left' %>
|
|
10
10
|
</li>
|
|
11
11
|
<% end %>
|
|
12
12
|
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
<fieldset class="no-border-top">
|
|
17
17
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
18
18
|
<div data-hook="buttons" class="filter-actions actions">
|
|
19
|
-
<%= button Spree.t(:create), '
|
|
19
|
+
<%= button Spree.t(:create), 'ok' %>
|
|
20
20
|
</div>
|
|
21
21
|
</fieldset>
|
|
22
22
|
<% end %>
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
<% if method.source_required? %>
|
|
27
27
|
<br />
|
|
28
28
|
<%= render :partial => "spree/admin/payments/source_forms/#{method.method_type}",
|
|
29
|
-
:locals => { :payment_method => method, previous_cards: method.
|
|
29
|
+
:locals => { :payment_method => method, previous_cards: method.reusable_sources(@order) } %>
|
|
30
30
|
<% end %>
|
|
31
31
|
</div>
|
|
32
32
|
<% end %>
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
|
|
18
18
|
<td class="actions">
|
|
19
19
|
<% payment.actions.each do |action| %>
|
|
20
|
-
<%= link_to_with_icon
|
|
20
|
+
<%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
|
|
21
21
|
<% end %>
|
|
22
22
|
</td>
|
|
23
23
|
</tr>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
|
|
2
2
|
|
|
3
3
|
<% content_for :page_title do %>
|
|
4
|
-
<i class="
|
|
4
|
+
<i class="fa fa-arrow-right"></i> <%= Spree.t(:refund) %>
|
|
5
5
|
<% end %>
|
|
6
6
|
|
|
7
7
|
<%= form_tag do %>
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
<% content_for :page_actions do %>
|
|
4
4
|
<% if @order.outstanding_balance? %>
|
|
5
5
|
<li id="new_payment_section">
|
|
6
|
-
<%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), :icon => '
|
|
6
|
+
<%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), :icon => 'plus' %>
|
|
7
7
|
</li>
|
|
8
8
|
<% end %>
|
|
9
|
-
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => '
|
|
9
|
+
<li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
|
|
10
10
|
<% end %>
|
|
11
11
|
|
|
12
12
|
<% content_for :page_title do %>
|
|
13
|
-
<i class="
|
|
13
|
+
<i class="fa fa-arrow-right"></i> <%= Spree.t(:payments) %>
|
|
14
14
|
<% end %>
|
|
15
15
|
|
|
16
16
|
<% if @order.outstanding_balance? %>
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
|
|
2
2
|
|
|
3
3
|
<% content_for :page_title do %>
|
|
4
|
-
<i class="
|
|
4
|
+
<i class="fa fa-arrow-right"></i> <%= Spree.t(:new_payment) %>
|
|
5
5
|
<% end %>
|
|
6
6
|
|
|
7
7
|
<% content_for :page_actions do %>
|
|
8
|
-
<li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => '
|
|
8
|
+
<li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
11
11
|
<% if @payment_methods.any? %>
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
|
17
17
|
|
|
18
18
|
<div class="filter-actions actions" data-hook="buttons">
|
|
19
|
-
<%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? '
|
|
19
|
+
<%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'refresh' %>
|
|
20
20
|
</div>
|
|
21
21
|
</fieldset>
|
|
22
22
|
<% end %>
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
|
|
2
2
|
|
|
3
3
|
<% content_for :page_title do %>
|
|
4
|
-
<i class="
|
|
4
|
+
<i class="fa fa-arrow-right"></i>
|
|
5
5
|
<%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
|
|
6
|
-
<i class="
|
|
6
|
+
<i class="fa fa-arrow-right"></i>
|
|
7
7
|
<%= payment_method_name(@payment) %>
|
|
8
8
|
|
|
9
9
|
<span class="state <%= @payment.state %>">
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
<% end %>
|
|
13
13
|
|
|
14
14
|
<% content_for :page_actions do %>
|
|
15
|
-
<li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => '
|
|
16
|
-
<li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => '
|
|
15
|
+
<li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
|
|
16
|
+
<li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
|
|
17
17
|
<% end %>
|
|
18
18
|
|
|
19
19
|
<%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
|
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<ul class="tollbar inline-menu">
|
|
7
7
|
<li>
|
|
8
|
-
<%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => '
|
|
8
|
+
<%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
|
|
9
9
|
</li>
|
|
10
10
|
<li>
|
|
11
11
|
<span id="new_ptype_link">
|
|
12
|
-
<%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button
|
|
12
|
+
<%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button fa fa-copy' %>
|
|
13
13
|
</span>
|
|
14
14
|
</li>
|
|
15
15
|
</ul>
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
</div>
|
|
28
28
|
|
|
29
29
|
<div class="form-buttons filter-actions actions" data-hook="buttons">
|
|
30
|
-
<%= button Spree.t(:add_stock), '
|
|
30
|
+
<%= button Spree.t(:add_stock), 'plus' %>
|
|
31
31
|
<span class="or"><%= Spree.t(:or) %></span>
|
|
32
|
-
<%= link_to_with_icon '
|
|
32
|
+
<%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
|
|
33
33
|
</div>
|
|
34
34
|
</fieldset>
|
|
35
35
|
<% end %>
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
<% content_for :page_actions do %>
|
|
2
|
-
<li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => '
|
|
2
|
+
<li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'arrow-left' %></li>
|
|
3
3
|
<% if can?(:create, Spree::Product) %>
|
|
4
4
|
<li id="new_product_link">
|
|
5
|
-
<%= button_link_to Spree.t(:new_product), new_object_url, { :icon => '
|
|
5
|
+
<%= button_link_to Spree.t(:new_product), new_object_url, { :icon => 'plus', :id => 'admin_new_product' } %>
|
|
6
6
|
</li>
|
|
7
7
|
<% end %>
|
|
8
8
|
<% end %>
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<li id="new_product_link">
|
|
7
|
-
<%= button_link_to Spree.t(:new_product), new_object_url, { :remote => true, :icon => '
|
|
7
|
+
<%= button_link_to Spree.t(:new_product), new_object_url, { :remote => true, :icon => 'plus', :id => 'admin_new_product' } %>
|
|
8
8
|
</li>
|
|
9
9
|
<% end if can?(:create, Spree::Product) %>
|
|
10
10
|
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
<div class="three columns omega">
|
|
38
38
|
<div class="field checkbox">
|
|
39
39
|
<label>
|
|
40
|
-
<%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null]
|
|
40
|
+
<%= f.check_box :deleted_at_null, {:checked => params[:q][:deleted_at_null] == '0'}, '0', '1' %>
|
|
41
41
|
<%= Spree.t(:show_deleted) %>
|
|
42
42
|
</label>
|
|
43
43
|
</div>
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
<div class="clear"></div>
|
|
48
48
|
|
|
49
49
|
<div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
|
|
50
|
-
<%= button Spree.t(:search), '
|
|
50
|
+
<%= button Spree.t(:search), 'search' %>
|
|
51
51
|
</div>
|
|
52
52
|
<% end %>
|
|
53
53
|
</div>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<% content_for :page_actions do %>
|
|
2
|
-
<li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => '
|
|
2
|
+
<li><%= button_link_to Spree.t(:back_to_products_list), session[:return_to] || admin_products_url, :icon => 'arrow-left' %></li>
|
|
3
3
|
<% end %>
|
|
4
4
|
|
|
5
5
|
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
<td class="actions">
|
|
76
76
|
<%= link_to(icon('delete'), [:admin, item],
|
|
77
77
|
method: :delete, remote: true,
|
|
78
|
-
class: 'icon_link with-tip
|
|
78
|
+
class: 'icon_link with-tip fa fa-trash no-text',
|
|
79
79
|
title: Spree.t(:remove), data: { action: :remove, confirm: Spree.t(:are_you_sure) }) %>
|
|
80
80
|
</td>
|
|
81
81
|
</tr>
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<%= select_tag 'action_type', options, :class => 'select2 fullwidth' %>
|
|
10
10
|
</div>
|
|
11
11
|
<div class="filter-actions actions">
|
|
12
|
-
<%= button Spree.t(:add), '
|
|
12
|
+
<%= button Spree.t(:add), 'plus', :class => 'fullwidth' %>
|
|
13
13
|
</div>
|
|
14
14
|
</fieldset>
|
|
15
15
|
<% end %>
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
<% end %>
|
|
26
26
|
</div>
|
|
27
27
|
<div class="filter-actions actions promotion-update">
|
|
28
|
-
<%= button Spree.t('actions.update'), '
|
|
28
|
+
<%= button Spree.t('actions.update'), 'refresh' %>
|
|
29
29
|
</div>
|
|
30
30
|
<% end %>
|
|
31
31
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<div class="promotion_action promotion-block <%= promotion_action.type.to_s.demodulize.underscore %>" id="<%= dom_id promotion_action %>">
|
|
2
2
|
<% type_name = promotion_action.class.name.demodulize.underscore %>
|
|
3
3
|
<h6 class="promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h6>
|
|
4
|
-
<%= link_to_with_icon '
|
|
4
|
+
<%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), :remote => true, :method => :delete, :class => 'delete' %>
|
|
5
5
|
|
|
6
6
|
<% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
|
|
7
7
|
<%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<div class="promotion_rule promotion-block alpha omega eight columns" id="<%= dom_id promotion_rule %>">
|
|
2
2
|
<% type_name = promotion_rule.class.name.demodulize.underscore %>
|
|
3
3
|
<h6 class='promotion-title <%= 'no-text' if type_name == 'user_logged_in' || type_name == 'first_order'%>'><%= Spree.t("promotion_rule_types.#{type_name}.description") %></h6>
|
|
4
|
-
<%= link_to_with_icon '
|
|
4
|
+
<%= link_to_with_icon 'trash', '', spree.admin_promotion_promotion_rule_path(@promotion, promotion_rule), :remote => true, :method => :delete, :class => 'delete' %>
|
|
5
5
|
|
|
6
6
|
<% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
|
|
7
7
|
<%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), :class => 'select2 fullwidth') %>
|
|
10
10
|
</div>
|
|
11
11
|
<div class="filter-actions actions">
|
|
12
|
-
<%= button Spree.t(:add), '
|
|
12
|
+
<%= button Spree.t(:add), 'plus' %>
|
|
13
13
|
</div>
|
|
14
14
|
</fieldset>
|
|
15
15
|
<% end %>
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
</div>
|
|
37
37
|
|
|
38
38
|
<div class="promotion-update filter-actions actions">
|
|
39
|
-
<%= button Spree.t('actions.update'), '
|
|
39
|
+
<%= button Spree.t('actions.update'), 'refresh' %>
|
|
40
40
|
</div>
|
|
41
41
|
</fieldset>
|
|
42
42
|
<% end %>
|
|
@@ -8,15 +8,19 @@
|
|
|
8
8
|
<% line_items.build %>
|
|
9
9
|
|
|
10
10
|
<% line_items.each_with_index do |line_item, index| %>
|
|
11
|
-
<div class="add-line-item
|
|
12
|
-
|
|
11
|
+
<div class="add-line-item">
|
|
12
|
+
<div class="row">
|
|
13
|
+
<div class="field alpha eight columns">
|
|
13
14
|
<% line_item_prefix = "#{param_prefix}[promotion_action_line_items_attributes][#{index}]" %>
|
|
14
15
|
<%= hidden_field_tag "#{line_item_prefix}[variant_id]", line_item.variant_id, :class => "variant_autocomplete fullwidth" %>
|
|
15
16
|
<div class='options_placeholder'></div>
|
|
16
17
|
</div>
|
|
17
|
-
|
|
18
|
+
</div>
|
|
19
|
+
<div class="row">
|
|
20
|
+
<div class="field omega eight columns">
|
|
18
21
|
<%= number_field_tag "#{line_item_prefix}[quantity]", line_item.quantity, :min => 1, :class => 'fullwidth' %>
|
|
19
22
|
</div>
|
|
23
|
+
</div>
|
|
20
24
|
</div>
|
|
21
25
|
<% end %>
|
|
22
26
|
<% end %>
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<li>
|
|
7
|
-
<%= button_link_to Spree.t(:back_to_promotions_list), admin_promotions_path, :icon => '
|
|
7
|
+
<%= button_link_to Spree.t(:back_to_promotions_list), admin_promotions_path, :icon => 'arrow-left' %>
|
|
8
8
|
</li>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<li>
|
|
7
|
-
<%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path, :icon => '
|
|
7
|
+
<%= button_link_to Spree.t(:new_promotion), spree.new_admin_promotion_path, :icon => 'plus' %>
|
|
8
8
|
</li>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
|
|
41
41
|
<div class="actions filter-actions">
|
|
42
42
|
<div data-hook="admin_promotions_index_search_buttons">
|
|
43
|
-
<%= button Spree.t(:filter_results), '
|
|
43
|
+
<%= button Spree.t(:filter_results), 'search' %>
|
|
44
44
|
</div>
|
|
45
45
|
</div>
|
|
46
46
|
<% end %>
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
<% content_for :page_actions do %>
|
|
6
6
|
<li>
|
|
7
|
-
<%= button_link_to Spree.t(:back_to_promotions_list), spree.admin_promotions_path, :icon => '
|
|
7
|
+
<%= button_link_to Spree.t(:back_to_promotions_list), spree.admin_promotions_path, :icon => 'arrow-left' %>
|
|
8
8
|
</li>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<% end %>
|
|
6
6
|
|
|
7
7
|
<% content_for :page_actions do %>
|
|
8
|
-
<li><%= button_link_to Spree.t(:back_to_properties_list), admin_properties_url, :icon => '
|
|
8
|
+
<li><%= button_link_to Spree.t(:back_to_properties_list), admin_properties_url, :icon => 'arrow-left'%></li>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
11
11
|
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
|