dev

Author: skeeks-semenov

src/filters/FilterField.php

@@ -59,19 +59,22 @@ class FilterField extends Field
      */
     public $modes = [];
 
+    /**
+     * Вызывается перед применением определенного мода
+     * @var callable|null
+     */
+    public $beforeModeApplyCallback = null;
+
+    /**
+     * @var bool Добавлять название таблицы к атрибуту?
+     */
+    public $isAddAttributeTableName = true;
+
     public function getBaseModes()
     {
         return [
             FilterModeEmpty::class,
             FilterModeNotEmpty::class,
-
-            /*FilterModeEq::class,
-            FilterModeNe::class,
-            FilterModeGt::class,
-            FilterModeLt::class,
-            FilterModeGte::class,
-            FilterModeLte::class,
-            FilterModeLike::class,*/
         ];
     }
     /**
@@ -102,6 +105,7 @@ public function init()
 
         $this->on('apply', [$this, '_applyEvent']);
     }
+
     public function _applyEvent(QueryFiltersEvent $queryFiltersEvent)
     {
         $value = $queryFiltersEvent->field->value;
@@ -132,22 +136,24 @@ public function _applyEvent(QueryFiltersEvent $queryFiltersEvent)
         $fullFilterAttribute = $this->filterAttribute;
 
         $query = $queryFiltersEvent->query;
-        if (!strpos($this->filterAttribute, ".") && $query->modelClass && !$query->from) {
-            $modelClass = $query->modelClass;
-            $tableName = $modelClass::tableName();
-            $fullFilterAttribute = "{$tableName}.{$fullFilterAttribute}";
-            
+
+        if ($this->isAddAttributeTableName) {
+            if (!strpos($this->filterAttribute, ".") && $query->modelClass && !$query->from) {
+                $modelClass = $query->modelClass;
+                $tableName = $modelClass::tableName();
+                $fullFilterAttribute = "{$tableName}.{$fullFilterAttribute}";
+            }
         }
-        /*if ($queryFiltersEvent->widget && $queryFiltersEvent->widget->asModelTable && !strpos(".", $fullFilterAttribute)) {
-            $fullFilterAttribute = $queryFiltersEvent->widget->asModelTable . "." . $fullFilterAttribute;
-        }*/
-        /*
-        $modelClassName = $queryFiltersEvent->widget->modelClassName;
-        $tableName = $modelClassName::tableName();
-        $fullFilterAttribute = $tableName . "." . $this->filterAttribute;*/
+
 
         $filterMode->attributeName = $fullFilterAttribute;
 
+        if ($this->beforeModeApplyCallback && is_callable($this->beforeModeApplyCallback)) {
+            $userCallback = call_user_func($this->beforeModeApplyCallback, $queryFiltersEvent, $this);
+            if (!$userCallback) {
+                return true;
+            }
+        }
         $filterMode->applyQuery($queryFiltersEvent->query);
     }
     /**

src/filters/NumberFilterField.php

@@ -20,6 +20,36 @@
 use skeeks\cms\queryfilters\filters\modes\FilterModeRange;
 
 /**
+ *
+ *
+ * 'marginality_per_filter' => [
+    'label'           => 'Маржинальность, %',
+    'class'           => NumberFilterField::class,
+    'field'           => [
+        'class' => NumberField::class
+    ],
+    'isAddAttributeTableName' => false,
+    'beforeModeApplyCallback' => function(QueryFiltersEvent $e, NumberFilterField $field) {
+        /**
+         * @var $query ActiveQuery
+        $query = $e->dataProvider->query;
+
+        if (ArrayHelper::getValue($e->field->value, "value.0") || ArrayHelper::getValue($e->field->value, "value.1")) {
+
+            $field->setIsHaving();
+
+            $query->addSelect([
+                'marginality_per_filter' => new Expression("(selling_price - purchase_price) / selling_price * 100"),
+            ]);
+            $query->groupBy([ShopStoreProduct::tableName().'.id']);
+        }
+
+
+        return true;
+    },
+],
+
+
  * @author Semenov Alexander <[email protected]>
  */
 class NumberFilterField extends FilterField
@@ -29,6 +59,7 @@ class NumberFilterField extends FilterField
     public $modes = [
         FilterModeEmpty::class,
         FilterModeNotEmpty::class,
+
         FilterModeEq::class,
         FilterModeNe::class,
         FilterModeGt::class,
@@ -37,4 +68,17 @@ class NumberFilterField extends FilterField
         FilterModeLte::class,
         FilterModeRange::class,
     ];
+
+    /**
+     * @param bool $value
+     */
+    public function setIsHaving($value = true)
+    {
+        foreach ($this->modes as $mode)
+        {
+            if (isset($mode->isHaving)) {
+                $mode->isHaving = $value;
+            }
+        }
+    }
 }

src/filters/modes/FilterModeEq.php

@@ -15,7 +15,7 @@
 use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeEq extends FilterMode
+class FilterModeEq extends NumberFilterMode
 {
     const ID = 'eq';
 
@@ -42,7 +42,7 @@ public function applyQuery(ActiveQuery $activeQuery)
             return;
         }
 
-        $activeQuery->andWhere([$this->attributeName => $this->value]);
+        $activeQuery->{$this->getAndWhereQuery()}([$this->attributeName => $this->value]);
     }
 
 

src/filters/modes/FilterModeGt.php

@@ -15,7 +15,7 @@
 use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeGt extends FilterMode
+class FilterModeGt extends NumberFilterMode
 {
     const ID = 'gt';
 
@@ -45,7 +45,7 @@ public function applyQuery(ActiveQuery $activeQuery)
             return;
         }
 
-        $activeQuery->andWhere([">", $this->attributeName, $this->value]);
+        $activeQuery->{$this->getAndWhereQuery()}([">", $this->attributeName, $this->value]);
     }
 
 

src/filters/modes/FilterModeGte.php

@@ -15,7 +15,7 @@
 use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeGte extends FilterMode
+class FilterModeGte extends NumberFilterMode
 {
     const ID = 'gte';
 
@@ -45,7 +45,7 @@ public function applyQuery(ActiveQuery $activeQuery)
             return;
         }
 
-        $activeQuery->andWhere([">=", $this->attributeName, $this->value]);
+        $activeQuery->{$this->getAndWhereQuery()}([">=", $this->attributeName, $this->value]);
     }
 
 

src/filters/modes/FilterModeLt.php

@@ -15,7 +15,7 @@
 use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeLt extends FilterMode
+class FilterModeLt extends NumberFilterMode
 {
     const ID = 'lt';
 
@@ -45,7 +45,7 @@ public function applyQuery(ActiveQuery $activeQuery)
             return;
         }
 
-        $activeQuery->andWhere(["<", $this->attributeName, $this->value]);
+        $activeQuery->{$this->getAndWhereQuery()}(["<", $this->attributeName, $this->value]);
     }
 
 

src/filters/modes/FilterModeLte.php

@@ -15,7 +15,7 @@
 use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeLte extends FilterMode
+class FilterModeLte extends NumberFilterMode
 {
     const ID = 'lte';
 
@@ -45,7 +45,7 @@ public function applyQuery(ActiveQuery $activeQuery)
             return;
         }
 
-        $activeQuery->andWhere(["<=", $this->attributeName, $this->value]);
+        $activeQuery->{$this->getAndWhereQuery()}(["<=", $this->attributeName, $this->value]);
     }
 
 

src/filters/modes/FilterModeNe.php

@@ -8,14 +8,10 @@
 
 namespace skeeks\cms\queryfilters\filters\modes;
 
-use skeeks\cms\IHasImage;
-use skeeks\cms\IHasName;
 use skeeks\cms\queryfilters\filters\FilterField;
-use skeeks\cms\traits\THasName;
-use yii\base\Component;
 use yii\db\ActiveQuery;
 
-class FilterModeNe extends FilterMode
+class FilterModeNe extends NumberFilterMode
 {
     const ID = 'ne';
 
@@ -41,8 +37,8 @@ public function applyQuery(ActiveQuery $activeQuery)
         if (is_string($this->value) && $this->value == '') {
             return;
         }
-        
-        $activeQuery->andWhere(["!=", $this->attributeName, $this->value]);
+
+        $activeQuery->{$this->getAndWhereQuery()}(["!=", $this->attributeName, $this->value]);
     }
 
 

src/filters/modes/FilterModeRange.php

@@ -11,7 +11,7 @@
 use skeeks\cms\queryfilters\filters\FilterField;
 use yii\db\ActiveQuery;
 
-class FilterModeRange extends FilterMode
+class FilterModeRange extends NumberFilterMode
 {
     const ID = 'range';
 
@@ -39,10 +39,10 @@ public function init()
     public function applyQuery(ActiveQuery $activeQuery)
     {
         if ($this->value) {
-            $activeQuery->andWhere([">=", $this->attributeName, $this->value]);
+            $activeQuery->{$this->getAndWhereQuery()}([">=", $this->attributeName, $this->value]);
         }
         if ($this->value2) {
-            $activeQuery->andWhere(["<=", $this->attributeName, $this->value2]);
+            $activeQuery->{$this->getAndWhereQuery()}(["<=", $this->attributeName, $this->value2]);
         }
     }
 

src/filters/modes/NumberFilterMode.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * @link https://cms.skeeks.com/
+ * @copyright Copyright (c) 2010 SkeekS
+ * @license https://cms.skeeks.com/license/
+ * @author Semenov Alexander <[email protected]>
+ */
+
+namespace skeeks\cms\queryfilters\filters\modes;
+
+use skeeks\cms\IHasImage;
+use skeeks\cms\IHasName;
+use skeeks\cms\queryfilters\filters\FilterField;
+use skeeks\cms\traits\THasName;
+use yii\base\Component;
+use yii\db\ActiveQuery;
+
+abstract class NumberFilterMode extends FilterMode
+{
+
+    /**
+     * @var bool
+     */
+    public $isHaving = false;
+
+    /**
+     * @return string
+     */
+    public function getAndWhereQuery()
+    {
+        return $this->isHaving ? "andHaving" : "andWhere";
+    }
+}