spree_backend 2.0.8 → 2.0.9

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/admin/stock_transfer.js.coffee +1 -3
  3. data/app/controllers/spree/admin/reports_controller.rb +6 -12
  4. data/app/views/spree/admin/reports/sales_total.html.erb +1 -1
  5. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c3c7d240755279b9b1986b47039266db4ca6b87f
4
- data.tar.gz: 1967d9b543c924495c3d8ec0155a56aa5b6e5822
3
+ metadata.gz: 1dbaf2539854c0a6416fb280010fb9269c49f068
4
+ data.tar.gz: 1d91fd337756ec008429c816b8121fa3f18b4cc4
5
5
  SHA512:
6
- metadata.gz: 9f775eddc2be3f07de1afc10dc055aca996de2a9e7414d49147d99016c9653a54a469f66b7943503cacaa89c34653556904fe088c43866bc5d16fa4f8772c3b2
7
- data.tar.gz: 4d1a6db7a3b72b22d5438e1d9fbc5f63f2823387c4bad175827d57e963b328fd767b26f740436e6ec81f7aefde47a6d0745cfee135ed5562c1e44dc60171bb96
6
+ metadata.gz: 25ec90e57dfe0c3a4b5b683d6d86aa9f603533a796ab94744eb63fae8a9efc96b2b1e8f14567b8416f6b08d3577346b40c389a132729127513f07a7eb2671915
7
+ data.tar.gz: 2a83524ae3c2a428853ecba5806083480c91b220886173fdaed38e648e51ff501ee779178b93921ce36a101f3b798e75e6aa4aeba6083f82ad1a636b5fa9586b
data/app/assets/javascripts/admin/stock_transfer.js.coffee CHANGED
@@ -69,9 +69,7 @@ $ ->
69
69
  populate_select: (select, except=0) ->
70
70
  select.children('option').remove()
71
71
  for location in @locations when location.id isnt except
72
- select.append $('<option></option>')
73
- .text(location.name)
74
- .attr('value', location.id)
72
+ select.append $('<option></option>').text(location.name).attr('value', location.id)
75
73
  select.select2()
76
74
 
77
75
  # Populates variants drop down
data/app/controllers/spree/admin/reports_controller.rb CHANGED
@@ -28,23 +28,17 @@ module Spree
28
28
  def sales_total
29
29
  params[:q] = {} unless params[:q]
30
30
 
31
- if params[:q][:created_at_gt].blank?
32
- params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
31
+ if params[:q][:completed_at_gt].blank?
32
+ params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
33
33
  else
34
- params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
34
+ params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
35
35
  end
36
36
 
37
- if params[:q] && !params[:q][:created_at_lt].blank?
38
- params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
37
+ if params[:q] && !params[:q][:completed_at_lt].blank?
38
+ params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
39
39
  end
40
40
 
41
- if params[:q].delete(:completed_at_not_null) == "1"
42
- params[:q][:completed_at_not_null] = true
43
- else
44
- params[:q][:completed_at_not_null] = false
45
- end
46
-
47
- params[:q][:s] ||= "created_at desc"
41
+ params[:q][:s] ||= "completed_at desc"
48
42
 
49
43
  @search = Order.complete.ransack(params[:q])
50
44
  @orders = @search.result
data/app/views/spree/admin/reports/sales_total.html.erb CHANGED
@@ -12,7 +12,7 @@
12
12
  <% end %>
13
13
 
14
14
  <% content_for :table_filter do %>
15
- <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
15
+ <%= render :partial => 'spree/admin/shared/report_order_criteria', :locals => {} %>
16
16
  <% end %>
17
17
 
18
18
  <table class="admin-report" data-hook="sales_total">
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.0.8
4
+ version: 2.0.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-22 00:00:00.000000000 Z
11
+ date: 2014-02-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.0.8
19
+ version: 2.0.9
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.0.8
26
+ version: 2.0.9
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_api
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 2.0.8
33
+ version: 2.0.9
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.0.8
40
+ version: 2.0.9
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement