fix another filter issue in customer report

damanic · Nov 27, 2020 · 40eb7de · 40eb7de
1 parent 9c43b18
commit 40eb7de
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/controllers/shop_customers_report.php b/controllers/shop_customers_report.php
@@ -51,8 +51,8 @@ public function index() {
 	public function listPrepareData() {
 		$obj                                            = Shop_Customer::create();
 		$this->add_calculated_columns($obj);
-		$this->filterApplyToModel( $obj );
 		$this->applyIntervalToModel( $obj );
+		$this->filterApplyToModel( $obj );
 		$obj->where('shop_customers.deleted_at is null');
 
 		return $obj;
@@ -183,7 +183,7 @@ protected function getChartData(){
 		}
 
     	$chartType = $this->viewData['chart_type'] = $this->getChartType();
-		$filterStr = $this->filterAsString();
+		$filterStr = null;
 		$paidFilter = null;
 		$whereFilter = null;
 
@@ -201,6 +201,7 @@ protected function getChartData(){
 			if($this->get_interval_context() == 'orders_paid'){
 				$paidFilter = 'AND '.$this->getOrderPaidStatusFilter();
 			}
+			$filterStr = $this->filterAsString();
 		}