closed #2415

yupe · May 5, 2016 · 484dc61 · 484dc61
1 parent 35a0b4c
commit 484dc61
Show file tree

Hide file tree

Showing 17 changed files with 212 additions and 155 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 - #2407: В формах авторизации поле "Запомнить меня" активно по-умолчанию (@sabian, @ilvval)
 - #2409: Можно создавать атрибуты товара типа "Файл" (@yupe)
 - #2414: Назначение ответственного за заказ менеджера (@yupe, @sabian)
+- #2415: Новый тип атрибута "Список чекбоксов" (@syrexby, @Divan4ik, @yupe)
 - #2417: ZendSearch поиск по цифрам (@gaidar, @sabian)
 - #2419: Убрана лишняя вложенность пункта меню "Юпи!" (@Divan4ik, @yupe)
 - #2423: Исправлены стили главного меню темы default для мобильной версии (@ilvval, @sabian)

diff --git a/composer.lock b/composer.lock
diff --git a/protected/modules/store/components/AttributeFilter.php b/protected/modules/store/components/AttributeFilter.php
@@ -154,7 +154,7 @@ public function isFieldChecked(Attribute $attribute, $value = null)
      */
     public function getDropdownOptionName(AttributeOption $option)
     {
-        if ((int)$option->parent->type === Attribute::TYPE_DROPDOWN) {
+        if ((int)$option->parent->isMultipleValues()) {
             return sprintf($this->dropdownTemplate, $option->parent->name, $option->id);
         }
 

diff --git a/protected/modules/store/components/AttributeRender.php b/protected/modules/store/components/AttributeRender.php
@@ -35,6 +35,7 @@ public static function renderField($attribute, $value = null, $name = null, $htm
                 return CHtml::dropDownList($name, $value, $data, array_merge($htmlOptions, (['empty' => '---'])));
                 break;
             case Attribute::TYPE_CHECKBOX_LIST:
+
                 $data = CHtml::listData($attribute->options, 'id', 'value');
 
                 return CHtml::checkBoxList($name.'[]', $value, $data, $htmlOptions);
@@ -58,10 +59,10 @@ public static function renderField($attribute, $value = null, $name = null, $htm
      * @param $value
      * @return string
      */
-    public static function renderValue(Attribute $attribute, $value)
+    public static function renderValue(Attribute $attribute, $value, $template = '<p>{item}</p>')
     {
         $unit = $attribute->unit ? ' '.$attribute->unit : '';
-        $res = '';
+        $res = null;
         switch ($attribute->type) {
             case Attribute::TYPE_TEXT:
             case Attribute::TYPE_SHORT_TEXT:
@@ -71,7 +72,13 @@ public static function renderValue(Attribute $attribute, $value)
             case Attribute::TYPE_DROPDOWN:
                 $data = CHtml::listData($attribute->options, 'id', 'value');
                 if (!is_array($value) && isset($data[$value])) {
-                    $res = $data[$value];
+                    $res .= $data[$value];
+                }
+                break;
+            case Attribute::TYPE_CHECKBOX_LIST:
+                $data = CHtml::listData($attribute->options, 'id', 'value');
+                foreach (array_intersect(array_keys($data), $value) as $val) {
+                    $res .= strtr($template, ['{item}' => $data[$val]]);
                 }
                 break;
             case Attribute::TYPE_CHECKBOX:

diff --git a/protected/modules/store/components/repository/ProductRepository.php b/protected/modules/store/components/repository/ProductRepository.php
@@ -30,6 +30,7 @@ public function getByFilter(array $mainSearchAttributes, array $typeSearchAttrib
         $criteria->params = [];
         $criteria->addCondition('t.status = :status');
         $criteria->params['status'] = Product::STATUS_ACTIVE;
+        $criteria->distinct = true;
 
 
         //поиск по категории, производителю и цене

diff --git a/protected/modules/store/controllers/AttributeBackendController.php b/protected/modules/store/controllers/AttributeBackendController.php
@@ -99,7 +99,7 @@ public function actionCreate()
             $model->setAttributes($data);
 
             if ($model->save() && $model->setTypes(Yii::app()->getRequest()->getPost('types',
-                    [])) && $model->setDropDownAttributes(explode(PHP_EOL, $model->rawOptions))
+                    [])) && $model->setMultipleValuesAttributes(explode(PHP_EOL, $model->rawOptions))
             ) {
                 Yii::app()->getUser()->setFlash(
                     yupe\widgets\YFlashMessages::SUCCESS_MESSAGE,

diff --git a/protected/modules/store/controllers/ProductBackendController.php b/protected/modules/store/controllers/ProductBackendController.php
@@ -362,24 +362,28 @@ public function actionTypeAttributes($id)
             throw new CHttpException(404);
         }
 
-        $out = [];
+        $types = [];
+
+        $noSupported = [Attribute::TYPE_FILE, Attribute::TYPE_TEXT, Attribute::TYPE_CHECKBOX_LIST];
 
         foreach ($type->typeAttributes as $attr) {
-            if ($attr->type == Attribute::TYPE_FILE || $attr->type === Attribute::TYPE_TEXT) {
+
+            if (in_array($attr->type, $noSupported)) {
                 continue;
             }
+
             if ($attr->type == Attribute::TYPE_DROPDOWN) {
-                $out[] = array_merge($attr->attributes, ['options' => $attr->options]);
+                $types[] = array_merge($attr->attributes, ['options' => $attr->options]);
             } else {
                 if (in_array($attr->type, [Attribute::TYPE_CHECKBOX, Attribute::TYPE_SHORT_TEXT])) {
-                    $out[] = array_merge($attr->attributes, ['options' => []]);
+                    $types[] = array_merge($attr->attributes, ['options' => []]);
                 } else {
-                    $out[] = $attr->attributes;
+                    $types[] = $attr->attributes;
                 }
             }
         }
 
-        Yii::app()->ajax->raw($out);
+        Yii::app()->ajax->raw($types);
     }
 
     /**

diff --git a/protected/modules/store/messages/ru/store.php b/protected/modules/store/messages/ru/store.php
@@ -1,5 +1,6 @@
 <?php
 return [
+    'Checkbox list' => 'Список чекбоксов (множественный)',
     'or' => 'или',
     'Download' => 'Скачать',
     'Use in types' => 'Использовать в следующих типах товаров:',

diff --git a/protected/modules/store/models/Attribute.php b/protected/modules/store/models/Attribute.php
@@ -190,6 +190,7 @@ public function getTypesList()
             self::TYPE_CHECKBOX => Yii::t('StoreModule.store', 'Checkbox'),
             self::TYPE_NUMBER => Yii::t('StoreModule.store', 'Number'),
             self::TYPE_FILE => Yii::t('StoreModule.store', 'File'),
+            self::TYPE_CHECKBOX_LIST => Yii::t('StoreModule.store', 'Checkbox list')
         ];
     }
 
@@ -239,20 +240,6 @@ public function isRequired()
         return $this->required;
     }
 
-
-    /**
-     * @return string Список опций, разделенных переносом строки
-     */
-    public function getRawOptions()
-    {
-        $tmp = '';
-        foreach ((array)$this->options as $option) {
-            $tmp .= $option->value."\n";
-        }
-
-        return $tmp;
-    }
-
     /**
      * @param $currentType
      * @param $newType
@@ -365,9 +352,9 @@ public function getTypes()
      * @return bool
      * @throws CDbException
      */
-    public function setDropDownAttributes(array $attributes)
+    public function setMultipleValuesAttributes(array $attributes)
     {
-        if(!$this->isDropDown()){
+        if(!$this->isMultipleValues()){
             return true;
         }
 
@@ -400,8 +387,8 @@ public function setDropDownAttributes(array $attributes)
     /**
      * @return bool
      */
-    public function isDropDown()
+    public function isMultipleValues()
     {
-        return $this->type == self::TYPE_DROPDOWN;
+         return $this->type == self::TYPE_DROPDOWN || $this->type == self::TYPE_CHECKBOX_LIST;
     }
 }