update discount widget

Author: skeeks-semenov

src/helpers/DiscountConditionHelper.php

@@ -116,7 +116,8 @@ public function getIsTrue()
 
         } else {
 
-            if ($this->field && strpos("element.", $this->field) != -1) {
+            if ($this->field && strpos($this->field, "element.") !== false) {
+
                 $field = str_replace("element.", "", $this->field);
 
                 return $this->isTrue($this->value, $this->shopCmsContentElement->{$field});
@@ -142,6 +143,10 @@ public function getIsTrue()
                         }
                     }
                 }
+            } elseif ($this->field && strpos($this->field, "shop.") !== false) {
+                $field = str_replace("shop.", "", $this->field);
+
+                return $this->isTrue($this->value, $this->shopCmsContentElement->shopProduct->{$field});
             }
 
             return true;

src/widgets/discount/DiscountConditionsWidget.php

@@ -72,6 +72,11 @@ public function getAvailableConditions()
             }
         }
 
+        $fields["Свойства магазина"] = [
+            'shop.brand_id' => 'Бренд'
+        ];
+        $this->allConditions['shop.brand_id'] = "Бренд";
+
         $fields["Основные свойства"] = $elementOptions;
 
         $props = CmsContentProperty::find()->all();
@@ -88,6 +93,9 @@ public function getAvailableConditions()
 
         $fields["Свойства"] = $propsOptions;
 
+
+
+
         return $fields;
     }
 }

src/widgets/discount/views/discount-rule.php

@@ -112,6 +112,20 @@
                         ],
                     ]);
                     ?>
+                <? elseif (in_array(\yii\helpers\ArrayHelper::getValue($rule, 'field'), ['shop.brand_id'])) : ?>
+                    <?
+                    echo \skeeks\cms\backend\widgets\SelectModelDialogWidget::widget([
+                        'name'     => 'value',
+                        'dialogRoute'     => ["/shop/admin-shop-brand"],
+                        'modelClassName'     => \skeeks\cms\shop\models\ShopBrand::class,
+                        'multiple' => true,
+                        'value'    => \yii\helpers\ArrayHelper::getValue($rule, 'value'),
+                        'options'  => [
+                            'data-no-update' => 'true',
+                            'class'          => 'sx-value-element',
+                        ],
+                    ]);
+                    ?>
                 <? elseif (in_array(\yii\helpers\ArrayHelper::getValue($rule, 'field'), ['element.name', 'element.id'])) : ?>
                     <?
                     echo \yii\helpers\Html::textInput('value', \yii\helpers\ArrayHelper::getValue($rule, 'value'), [
@@ -123,7 +137,7 @@
                 <? else : ?>
                     <?
                     $value = \yii\helpers\ArrayHelper::getValue($rule, 'value');
-                    if (is_string($value)) {
+                    if (is_string($value) || !$value) {
                         echo \yii\helpers\Html::textInput('value', \yii\helpers\ArrayHelper::getValue($rule, 'value'), [
                             'size'           => 1,
                             'class'          => 'form-control sx-value-element',