Images fix

Yarik
1 parent 3d4c8f83
Showing 2 changed files with 22 additions and 2 deletions Show diff stats
common/behaviors/MultipleImgBehavior.php
common/modules/product/models/Product.php
@@ -23,6 +23,13 @@
          * @var array
          */
         public $links = [];
+    
+        /**
+         * Will be passed to get image and get images queries
+         *
+         * @var array
+         */
+        public $conditions = [];
  
         /**
          * Full namespaced image model
@@ -51,7 +58,12 @@
              * @var ActiveRecord $owner
              */
             $owner = $this->owner;
-            return $owner->hasOne($this->model, $this->links);
+            $query = $owner->hasOne($this->model, $this->links);
+            $conditions = $this->conditions;
+            foreach($conditions as $condition) {
+                $query->andWhere($condition);
+            }
+            return $query;
         }
  
         /**
@@ -65,7 +77,12 @@
              * @var ActiveRecord $owner
              */
             $owner = $this->owner;
-            return $owner->hasMany($this->model, $this->links);
+            $query = $owner->hasMany($this->model, $this->links);
+            $conditions = $this->conditions;
+            foreach($conditions as $left => $right) {
+                $query->andWhere([$left => $right]);
+            }
+            return $query;
         }
  
         /**
@@ -109,6 +109,9 @@
                     'links'  => [
                         'product_id' => 'product_id',
                     ],
+                    'conditions' => [
+                        'product_variant_id' => NULL,
+                    ],
                     'model'  => ProductImage::className(),
                     'config' => [
                         'caption'       => 'image',