spree_backend 2.4.7 → 2.4.8
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/payments/edit.js.coffee +4 -4
- data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
- data/app/controllers/spree/admin/products_controller.rb +6 -3
- data/app/views/spree/admin/customer_returns/new.html.erb +1 -11
- data/app/views/spree/admin/reimbursement_types/index.html.erb +1 -2
- metadata +6 -7
- data/app/assets/javascripts/spree/backend/select_payments.js.coffee +0 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 75a87af9401db21789596e5d8e90ccffcced22c9
|
4
|
+
data.tar.gz: 3a4af68b7b456debe896962441b00cb60c97873e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 14477d8d2975b5e0aa3c119cd13eae05b410afa9814e37467b6383c520f8ebcc6ab2511a399784fc5b5347ae293a44ff01e0309fb240dba0b421170f3eec8d12
|
7
|
+
data.tar.gz: aaa19e8071e3344a03e7a4a46f482a1583dff2af72d067c7208450dbd752667e5469b01cbeb1f5b1c6754a4d9b4f36b7db52f38de36cd223d60fcb366b051d36
|
@@ -7,9 +7,9 @@ jQuery ($) ->
|
|
7
7
|
@json = $.getJSON @url.toString(), (data) =>
|
8
8
|
@data = data
|
9
9
|
|
10
|
-
|
10
|
+
if_editable: (callback) ->
|
11
11
|
@json.done (data) ->
|
12
|
-
callback() if data.state
|
12
|
+
callback() if data.state in ['checkout', 'pending']
|
13
13
|
|
14
14
|
update: (attributes, success) ->
|
15
15
|
jqXHR = $.ajax
|
@@ -142,8 +142,8 @@ jQuery ($) ->
|
|
142
142
|
separator = Spree.translations.currency_separator
|
143
143
|
amount.replace(///[^\d#{separator}]///g, '')
|
144
144
|
|
145
|
-
# Attach ShowPaymentView to each
|
145
|
+
# Attach ShowPaymentView to each editable payment in the table
|
146
146
|
$('.admin tr[data-hook=payments_row]').each ->
|
147
147
|
$el = $(@)
|
148
148
|
payment = new Payment($el.prop('id').match(/\d+$/))
|
149
|
-
payment.
|
149
|
+
payment.if_editable -> new ShowPaymentView($el, payment)
|
@@ -44,7 +44,7 @@ module Spree
|
|
44
44
|
|
45
45
|
def load_form_data
|
46
46
|
return_items = @order.inventory_units.map(&:current_or_new_return_item).reject(&:customer_return_id)
|
47
|
-
@rma_return_items
|
47
|
+
@rma_return_items = return_items.select(&:return_authorization_id)
|
48
48
|
end
|
49
49
|
|
50
50
|
def permitted_resource_params
|
@@ -100,17 +100,20 @@ module Spree
|
|
100
100
|
|
101
101
|
params[:q][:s] ||= "name asc"
|
102
102
|
@collection = super
|
103
|
-
|
103
|
+
# Don't delete params[:q][:deleted_at_null] here because it is used in view to check the
|
104
|
+
# checkbox for 'q[deleted_at_null]'. This also messed with pagination when deleted_at_null is checked.
|
105
|
+
if params[:q][:deleted_at_null] == '0'
|
104
106
|
@collection = @collection.with_deleted
|
105
107
|
end
|
106
108
|
# @search needs to be defined as this is passed to search_form_for
|
107
|
-
|
109
|
+
# Temporarily remove params[:q][:deleted_at_null] from params[:q] to ransack products.
|
110
|
+
# This is to include all products and not just deleted products.
|
111
|
+
@search = @collection.ransack(params[:q].reject { |k, _v| k.to_s == 'deleted_at_null' })
|
108
112
|
@collection = @search.result.
|
109
113
|
distinct_by_product_ids(params[:q][:s]).
|
110
114
|
includes(product_includes).
|
111
115
|
page(params[:page]).
|
112
116
|
per(params[:per_page] || Spree::Config[:admin_products_per_page])
|
113
|
-
|
114
117
|
@collection
|
115
118
|
end
|
116
119
|
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
|
9
9
|
<% end %>
|
10
10
|
|
11
|
-
<% if @rma_return_items.any?
|
11
|
+
<% if @rma_return_items.any? %>
|
12
12
|
|
13
13
|
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
|
14
14
|
<%= form_for [:admin, @order, @customer_return] do |f| %>
|
@@ -23,21 +23,11 @@
|
|
23
23
|
<% end %>
|
24
24
|
</fieldset>
|
25
25
|
|
26
|
-
<fieldset class='no-border-bottom'>
|
27
|
-
<legend align='center'><%= Spree.t(:other_items_in_other) %></legend>
|
28
|
-
<% if @new_return_items.any? %>
|
29
|
-
<%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
|
30
|
-
<% else %>
|
31
|
-
<div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
|
32
|
-
<% end %>
|
33
|
-
</fieldset>
|
34
|
-
|
35
26
|
<%= f.field_container :stock_location do %>
|
36
27
|
<%= f.label :stock_location, Spree.t(:stock_location) %>
|
37
28
|
<%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
|
38
29
|
<%= f.error_message_on :stock_location_id %>
|
39
30
|
<% end %>
|
40
|
-
|
41
31
|
</div>
|
42
32
|
|
43
33
|
<div class="form-buttons filter-actions actions" data-hook="buttons">
|
@@ -27,7 +27,6 @@
|
|
27
27
|
</table>
|
28
28
|
<% else %>
|
29
29
|
<div class="alpha twelve columns no-objects-found">
|
30
|
-
<%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/reimbursement_type'))
|
31
|
-
<%= link_to Spree.t(:add_one), new_object_url %>!
|
30
|
+
<%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/reimbursement_type')) %>
|
32
31
|
</div>
|
33
32
|
<% end %>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_backend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.4.
|
4
|
+
version: 2.4.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-07-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: spree_api
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 2.4.
|
19
|
+
version: 2.4.8
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 2.4.
|
26
|
+
version: 2.4.8
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: spree_core
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 2.4.
|
33
|
+
version: 2.4.8
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 2.4.
|
40
|
+
version: 2.4.8
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: jquery-rails
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -113,7 +113,6 @@ files:
|
|
113
113
|
- app/assets/javascripts/spree/backend/promotions.js
|
114
114
|
- app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee
|
115
115
|
- app/assets/javascripts/spree/backend/returns/return_item_selection.js
|
116
|
-
- app/assets/javascripts/spree/backend/select_payments.js.coffee
|
117
116
|
- app/assets/javascripts/spree/backend/shipments.js.erb
|
118
117
|
- app/assets/javascripts/spree/backend/spree-select2.js.erb
|
119
118
|
- app/assets/javascripts/spree/backend/states.js
|
@@ -1,7 +0,0 @@
|
|
1
|
-
$ ->
|
2
|
-
if $('.new_payment').is('*')
|
3
|
-
$('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
|
4
|
-
$('input[name="payment[payment_method_id]"]').click ()->
|
5
|
-
$('.payment-method-settings fieldset').addClass('hidden')
|
6
|
-
id = $(this).parents('li').data('id')
|
7
|
-
$("fieldset[data-id='#{id}']").removeClass('hidden')
|