Allow order country filters to apply to models that belong to the sho…

…p order model
damanic · Sep 6, 2021 · 35010a6 · 35010a6
1 parent 54b127f
commit 35010a6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 12 deletions.
diff --git a/classes/shop_orderbillingcountryfilter.php b/classes/shop_orderbillingcountryfilter.php
@@ -8,10 +8,19 @@ class Shop_OrderBillingCountryFilter extends Db_DataFilter
 
 		public function applyToModel($model, $keys, $context = null)
 		{
-			if ($context != 'product_report')
-				$model->where('billing_country_id in (?)', array($keys));
-			else
-				$model->where('shop_orders.billing_country_id in (?)', array($keys));
+			if(is_a($model,'Shop_Order')){
+				$model->where('shop_orders.billing_country_id IN (?)', array($keys));
+			} else if ($model->belongs_to) {
+				foreach($model->belongs_to as $field => $belongs_to_info){
+					$class_name = isset($belongs_to_info['class_name']) ? $belongs_to_info['class_name'] : null;
+					if($class_name == 'Shop_Order'){
+						$foreign_key = $belongs_to_info['foreign_key'];
+						if($foreign_key){
+							$model->where($field.'_calculated_join.billing_country_id IN (?)', array($keys));
+						}
+					}
+				}
+			}
 		}
 
 		public function asString($keys, $context = null)

diff --git a/classes/shop_ordershippingcountryfilter.php b/classes/shop_ordershippingcountryfilter.php
@@ -8,10 +8,19 @@ class Shop_OrderShippingCountryFilter extends Db_DataFilter
 
 		public function applyToModel($model, $keys, $context = null)
 		{
-			if ($context != 'product_report')
-				$model->where('shipping_country_id in (?)', array($keys));
-			else
-				$model->where('shop_orders.shipping_country_id in (?)', array($keys));
+			if(is_a($model,'Shop_Order')){
+				$model->where('shop_orders.shipping_country_id IN (?)', array($keys));
+			} else if ($model->belongs_to) {
+				foreach($model->belongs_to as $field => $belongs_to_info){
+					$class_name = isset($belongs_to_info['class_name']) ? $belongs_to_info['class_name'] : null;
+					if($class_name == 'Shop_Order'){
+						$foreign_key = $belongs_to_info['foreign_key'];
+						if($foreign_key){
+							$model->where($field.'_calculated_join.shipping_country_id IN (?)', array($keys));
+						}
+					}
+				}
+			}
 		}
 
 		public function asString($keys, $context = null)

diff --git a/classes/shop_ordershippingzonefilter.php b/classes/shop_ordershippingzonefilter.php
@@ -11,10 +11,19 @@ public function applyToModel($model, $keys, $context = null)
 			if(!$country_ids){
 				$country_ids = array('0'); //no countries, no results
 			}
-			if ( $context != 'product_report' ) {
-				$model->where( 'shipping_country_id in (?)', array( $country_ids ) );
-			} else {
-				$model->where( 'shop_orders.shipping_country_id in (?)', array( $country_ids ) );
+
+			if(is_a($model,'Shop_Order')){
+				$model->where('shop_orders.shipping_country_id IN (?)', array($country_ids));
+			} else if ($model->belongs_to) {
+				foreach($model->belongs_to as $field => $belongs_to_info){
+					$class_name = isset($belongs_to_info['class_name']) ? $belongs_to_info['class_name'] : null;
+					if($class_name == 'Shop_Order'){
+						$foreign_key = $belongs_to_info['foreign_key'];
+						if($foreign_key){
+							$model->where($field.'_calculated_join.shipping_country_id IN (?)', array($country_ids));
+						}
+					}
+				}
 			}
 
 		}