raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Report filtering on completion date, not creation date

Browse Source
This commit is contained in:
Rohan Mitchell
2012-11-09 20:31:08 +11:00
parent b4120b1028
commit 9a9bef5304
6 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/controllers/spree/admin/reports_controller_decorator.rb
View File

@@ -14,16 +14,16 @@ Spree::Admin::ReportsController.class_eval do
def orders_and_distributors
params[:q] = {} unless params[:q]
if params[:q][:created_at_gt].blank?
params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
if params[:q][:completed_at_gt].blank?
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
else
params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
end
if params[:q] && !params[:q][:created_at_lt].blank?
params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
if params[:q] && !params[:q][:completed_at_lt].blank?
params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
end
params[:q][:meta_sort] ||= "created_at.desc"
params[:q][:meta_sort] ||= "completed_at.desc"
@search = Spree::Order.complete.search(params[:q])
orders = @search.result
@@ -43,16 +43,16 @@ Spree::Admin::ReportsController.class_eval do
def group_buys
params[:q] = {} unless params[:q]
if params[:q][:created_at_gt].blank?
params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
if params[:q][:completed_at_gt].blank?
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
else
params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
end
if params[:q] && !params[:q][:created_at_lt].blank?
params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
if params[:q] && !params[:q][:completed_at_lt].blank?
params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
end
params[:q][:meta_sort] ||= "created_at.desc"
params[:q][:meta_sort] ||= "completed_at.desc"
@search = Spree::Order.complete.search(params[:q])
orders = @search.result
@@ -74,16 +74,16 @@ Spree::Admin::ReportsController.class_eval do
def bulk_coop
params[:q] = {} unless params[:q]
if params[:q][:created_at_gt].blank?
params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
if params[:q][:completed_at_gt].blank?
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
else
params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
end
if params[:q] && !params[:q][:created_at_lt].blank?
params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
if params[:q] && !params[:q][:completed_at_lt].blank?
params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
end
params[:q][:meta_sort] ||= "created_at.desc"
params[:q][:meta_sort] ||= "completed_at.desc"
@search = Spree::Order.complete.search(params[:q])
orders = @search.result
@@ -180,7 +180,7 @@ Spree::Admin::ReportsController.class_eval do
proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.payment_total } } ]
rules = [ { group_by: proc { |li| li.order },
sort_by: proc { |order| order.created_at } } ]
sort_by: proc { |order| order.completed_at } } ]
else # List all line items
@@ -226,16 +226,16 @@ Spree::Admin::ReportsController.class_eval do
def payments
params[:q] = {} unless params[:q]
if params[:q][:created_at_gt].blank?
params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
if params[:q][:completed_at_gt].blank?
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
else
params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
end
if params[:q] && !params[:q][:created_at_lt].blank?
params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
if params[:q] && !params[:q][:completed_at_lt].blank?
params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
end
params[:q][:meta_sort] ||= "created_at.desc"
params[:q][:meta_sort] ||= "completed_at.desc"
@search = Spree::Order.complete.search(params[:q])
orders = @search.result
@@ -330,16 +330,16 @@ Spree::Admin::ReportsController.class_eval do
def order_cycles
params[:q] = {} unless params[:q]
if params[:q][:created_at_gt].blank?
params[:q][:created_at_gt] = Time.zone.now.beginning_of_month
if params[:q][:completed_at_gt].blank?
params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month
else
params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month
end
if params[:q] && !params[:q][:created_at_lt].blank?
params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
if params[:q] && !params[:q][:completed_at_lt].blank?
params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue ""
end
params[:q][:meta_sort] ||= "created_at.desc"
params[:q][:meta_sort] ||= "completed_at.desc"
@search = Spree::Order.complete.search(params[:q])
orders = @search.result

6
app/views/spree/admin/reports/bulk_coop.html.haml
View File

@@ -3,11 +3,11 @@
%br
.date-range-filter
%div{"class" => "left sub-field"}
= f.text_field :created_at_gt, :class => 'datepicker'
= f.text_field :completed_at_gt, :class => 'datepicker'
%br
= label_tag nil, t(:start), :class => 'sub'
%div{"class" => "right sub-field"}
= f.text_field :created_at_lt, :class => 'datepicker'
= f.text_field :completed_at_lt, :class => 'datepicker'
%br
= label_tag nil, t(:stop)
%br
@@ -36,4 +36,4 @@
%td= column
- if @table.empty?
%tr
%td{:colspan => "2"}= t(:none)
%td{:colspan => "2"}= t(:none)

4
app/views/spree/admin/reports/group_buys.html.haml
View File

@@ -3,11 +3,11 @@
%br
.date-range-filter
%div{"class" => "left sub-field"}
= f.text_field :created_at_gt, :class => 'datepicker'
= f.text_field :completed_at_gt, :class => 'datepicker'
%br
= label_tag nil, t(:start), :class => 'sub'
%div{"class" => "right sub-field"}
= f.text_field :created_at_lt, :class => 'datepicker'
= f.text_field :completed_at_lt, :class => 'datepicker'
%br
= label_tag nil, t(:stop)
%br

6
app/views/spree/admin/reports/order_cycles.html.haml
View File

@@ -3,11 +3,11 @@
%br
.date-range-filter
%div{"class" => "left sub-field"}
= f.text_field :created_at_gt, :class => 'datepicker'
= f.text_field :completed_at_gt, :class => 'datepicker'
%br
= label_tag nil, t(:start), :class => 'sub'
%div{"class" => "right sub-field"}
= f.text_field :created_at_lt, :class => 'datepicker'
= f.text_field :completed_at_lt, :class => 'datepicker'
%br
= label_tag nil, t(:stop)
%br
@@ -36,4 +36,4 @@
%td= column
- if @table.empty?
%tr
%td{:colspan => "2"}= t(:none)
%td{:colspan => "2"}= t(:none)

4
app/views/spree/admin/reports/orders_and_distributors.html.haml
View File

@@ -3,11 +3,11 @@
%br
.date-range-filter
%div{"class" => "left sub-field"}
= s.text_field :created_at_gt, :class => 'datepicker'
= s.text_field :completed_at_gt, :class => 'datepicker'
%br
= label_tag nil, t(:start), :class => 'sub'
%div{"class" => "right sub-field"}
= s.text_field :created_at_lt, :class => 'datepicker'
= s.text_field :completed_at_lt, :class => 'datepicker'
%br
= label_tag nil, t(:stop)
= check_box_tag :csv

6
app/views/spree/admin/reports/payments.html.haml
View File

@@ -3,11 +3,11 @@
%br
.date-range-filter
%div{"class" => "left sub-field"}
= f.text_field :created_at_gt, :class => 'datepicker'
= f.text_field :completed_at_gt, :class => 'datepicker'
%br
= label_tag nil, t(:start), :class => 'sub'
%div{"class" => "right sub-field"}
= f.text_field :created_at_lt, :class => 'datepicker'
= f.text_field :completed_at_lt, :class => 'datepicker'
%br
= label_tag nil, t(:stop)
%br
@@ -36,4 +36,4 @@
%td= column
- if @table.empty?
%tr
%td{:colspan => "2"}= t(:none)
%td{:colspan => "2"}= t(:none)