0.4.6

Исправление ошибок

Author: baranov-nt

common/models/extend/DocumentExtend.php

@@ -146,7 +146,7 @@ public function getDataItemList($url = null)
     /*
      * @return string
      * */
-    private function genereteView($templateData, $view, $type) {
+    private function genereteView($templateData, $view, $type) { 
         // Указан используется ли карусель
         if (strpos($view, '{^[') !== false) {
             $parsed = $this->getStringBetween($view, '{^[', ']^}');
@@ -189,7 +189,7 @@ private function genereteView($templateData, $view, $type) {
                 }
                 // цена без скидки
                 if (strpos($view, '{$=' . $field['title'] . '=$}') !== false) {
-                    if (isset($field['value']['price'])) {
+                    if (isset($field['value']['price']) && $field['value']['price'] != $field['value']['discount_price']) {
                         $view = str_replace('{$=' . $field['title'] . '=$}', $field['value']['price'], $view);
                     } else {
                         $view = str_replace('{$=' . $field['title'] . '=$}', Yii::t('app', ''), $view);
@@ -198,7 +198,7 @@ private function genereteView($templateData, $view, $type) {
                 // процент скидки
                 if (strpos($view, '{$%' . $field['title'] . '%$}') !== false) {
                     if (isset($field['value']['percent'])) {
-                        $view = str_replace('{$%' . $field['title'] . '%$}', $field['value']['percent'], $view);
+                        $view = str_replace('{$%' . $field['title'] . '%$}', $field['value']['percent'] . '%', $view);
                     } else {
                         $view = str_replace('{$%' . $field['title'] . '%$}', Yii::t('app', ''), $view);
                     }

common/models/search/DocumentSearch.php

@@ -182,6 +182,7 @@ public function setSearchFieldsQuery($query) {
                         $query->leftJoin('value_int AS checkbox' . $key, 'document.id = checkbox' . $key . '.document_id');
                         $query->andWhere(['and',
                             ['checkbox' . $key . '.type' => Constants::FIELD_TYPE_CHECKBOX],
+                            ['checkbox' . $key . '.title' => $field['name']],
                             ['checkbox' . $key . '.value' => $this->elements_fields[$key][0]]
                         ]);
                     }
@@ -191,6 +192,7 @@ public function setSearchFieldsQuery($query) {
                         $query->leftJoin('value_int AS list_multy' . $key, 'document.id = list_multy' . $key . '.document_id');
                         $query->andWhere(['and',
                             ['list_multy' . $key . '.type' => Constants::FIELD_TYPE_LIST_MULTY],
+                            ['list_multy' . $key . '.title' => $field['name']],
                             ['list_multy' . $key . '.value' => $this->elements_fields[$key][0]]
                         ]);
                     }
@@ -200,6 +202,7 @@ public function setSearchFieldsQuery($query) {
                         $query->leftJoin('value_int AS radio' . $key, 'document.id = radio' . $key . '.document_id');
                         $query->andWhere(['and',
                             ['radio' . $key . '.type' => Constants::FIELD_TYPE_RADIO],
+                            ['radio' . $key . '.title' => $field['name']],
                             ['radio' . $key . '.value' => $this->elements_fields[$key][0]]
                         ]);
                     }
@@ -209,6 +212,7 @@ public function setSearchFieldsQuery($query) {
                         $query->leftJoin('value_int AS list' . $key, 'document.id = list' . $key . '.document_id');
                         $query->andWhere(['and',
                             ['list' . $key . '.type' => Constants::FIELD_TYPE_LIST],
+                            ['list' . $key . '.title' => $field['name']],
                             ['list' . $key . '.value' => $this->elements_fields[$key][0]]
                         ]);
                     }

common/widgets/TemplateOfElement/components/FieldsManage.php

@@ -899,7 +899,7 @@ public function getIntRange($field_id, $document_id)
             $result = [];
             foreach ($values as $value) {
                 /* @var $modelValueIntForm ValueIntForm */
-                $result[] = $values['value'];
+                $result[] = $value['value'];
             }
             return $result;
         }