[interchange: 1/2] FIX: exclude canceled orders from reports
David Christensen <[email protected]> Sun, 04 Mar 2018 22:49:04 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 5aa13339669e12515c1fef63c9d950b07a544a33 Author: Andrew Baerg <[email protected]> Date: Sat Mar 3 23:09:33 2018 -0700 FIX: exclude canceled orders from reports .../UI/pages/admin/reports/order/ByAffiliate.html | 2 +- dist/lib/UI/pages/admin/reports/order/BySKU.html | 2 +- dist/lib/UI/pages/admin/reports/order/Detail.html | 2 +- dist/lib/UI/pages/admin/reports/order/Monthly.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- diff --git a/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html b/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html index d15fadb..6f7bab6 100644 --- a/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html +++ b/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html @@ -64,7 +64,7 @@ EOF sql=" select affiliate, campaign, total_cost, order_date from transactions - WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit] + WHERE deleted <> '1' AND status <> 'canceled' [scratch date_limit] [scratch synd_limit] order by affiliate, campaign, order_date "][/query] [tmp ALL][L]ALL[/L][/tmp] diff --git a/dist/lib/UI/pages/admin/reports/order/BySKU.html b/dist/lib/UI/pages/admin/reports/order/BySKU.html index e9f5561..6b7063d 100644 --- a/dist/lib/UI/pages/admin/reports/order/BySKU.html +++ b/dist/lib/UI/pages/admin/reports/order/BySKU.html @@ -124,7 +124,7 @@ EOF sql=" select affiliate, campaign, total_cost, order_date, order_number from transactions - WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit] + WHERE deleted <> '1' and status <> 'canceled' [scratch date_limit] [scratch synd_limit] order by affiliate, campaign, order_date "][/query] diff --git a/dist/lib/UI/pages/admin/reports/order/Detail.html b/dist/lib/UI/pages/admin/reports/order/Detail.html index 5080039..1b7866e 100644 --- a/dist/lib/UI/pages/admin/reports/order/Detail.html +++ b/dist/lib/UI/pages/admin/reports/order/Detail.html @@ -108,7 +108,7 @@ EOF sql=" select order_number, affiliate, campaign, total_cost, payment_method, state, city, status, order_date from transactions - WHERE deleted <> '1' + WHERE deleted <> '1' and status <> 'canceled' [scratch date_limit] [scratch synd_limit] order by order_number "][/query] diff --git a/dist/lib/UI/pages/admin/reports/order/Monthly.html b/dist/lib/UI/pages/admin/reports/order/Monthly.html index afd12e0..a67b432 100644 --- a/dist/lib/UI/pages/admin/reports/order/Monthly.html +++ b/dist/lib/UI/pages/admin/reports/order/Monthly.html @@ -102,7 +102,7 @@ EOF sql=" select affiliate, campaign, total_cost, order_date, order_number FROM transactions - WHERE deleted <> '1' [scratch date_limit] [scratch synd_limit] + WHERE deleted <> '1' AND status <> 'canceled' [scratch date_limit] [scratch synd_limit] "][/query] [tmp ALL][L]ALL[/L][/tmp] [tmp TOTAL][L]GRAND TOTAL[/L][/tmp]