FIX: exclude canceled orders from reports

interchange · Mar 4, 2018 · 5aa1333 · 5aa1333
1 parent ef4856e
commit 5aa1333
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html b/dist/lib/UI/pages/admin/reports/order/ByAffiliate.html
@@ -64,7 +64,7 @@
 	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
@@ -124,7 +124,7 @@
 	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
@@ -108,7 +108,7 @@
 	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
@@ -102,7 +102,7 @@
 	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]