0.4.7

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

Author: baranov-nt

backend/modules/document/views/template-view-manage/_form-template-view.php

@@ -44,15 +44,18 @@
                 'enterHtml' => '',
                 /* Панель управления */
                 'toolbar' => [
-                    ['font', ['fontname', 'fontsize', 'color', 'forecolor', 'backcolor', 'bold', 'italic', 'underline', 'strikethrough', 'superscript', 'subscript', 'clear']],
-                    ['insert', ['table', 'hr']],
-                    ['para', ['style', 'ol', 'ul', 'paragraph', 'height']],
-                    ['misc', ['codeview', 'undo', 'redo', 'help']],
+                    ['codeview'],
                 ],
                 'callbacks' => [
-                    'onBlur' => new \yii\web\JsExpression(
+                    'onInit' => new \yii\web\JsExpression(
                         'function (data) {
-                            
+                            $("#summernote").summernote("codeview.activate");
+                            $("#summernote").trigger("focus");
+                        }'
+                    ),
+                    'onFocus' => new \yii\web\JsExpression(
+                        'function (data) {
+                            $("#summernote").summernote("codeview.activate");
                         }'
                     ),
                 ],

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, '{^[', ']^}');
@@ -178,7 +178,14 @@ private function genereteView($templateData, $view, $type) {
                 } else {
                     $view = str_replace('{=' . $field['title'] . '=}', Yii::t('app', '(не задано)'), $view);
                 }
-
+                // валюта
+                if (strpos($view, '{$#' . $field['title'] . '#$}') !== false) {
+                    if (isset($field['value']['currency'])) {
+                        $view = str_replace('{$#' . $field['title'] . '#$}', $field['value']['currency'], $view);
+                    } else {
+                        $view = str_replace('{$#' . $field['title'] . '#$}', Yii::t('app', ''), $view);
+                    }
+                }
                 // название скидки
                 if (strpos($view, '{$_' . $field['title'] . '_$}') !== false) {
                     if (isset($field['value']['name'])) {
@@ -187,6 +194,7 @@ private function genereteView($templateData, $view, $type) {
                         $view = str_replace('{$_' . $field['title'] . '_$}', Yii::t('app', ''), $view);
                     }
                 }
+
                 // цена без скидки
                 if (strpos($view, '{$=' . $field['title'] . '=$}') !== false) {
                     if (isset($field['value']['price']) && $field['value']['price'] != $field['value']['discount_price']) {
@@ -203,14 +211,6 @@ private function genereteView($templateData, $view, $type) {
                         $view = str_replace('{$%' . $field['title'] . '%$}', Yii::t('app', ''), $view);
                     }
                 }
-                // валюта
-                if (strpos($view, '{$#' . $field['title'] . '#$}') !== false) {
-                    if (isset($field['value']['currency'])) {
-                        $view = str_replace('{$#' . $field['title'] . '#$}', $field['value']['currency'], $view);
-                    } else {
-                        $view = str_replace('{$#' . $field['title'] . '#$}', Yii::t('app', ''), $view);
-                    }
-                }
                 // дата окончания скидки
                 if (strpos($view, '{$!' . $field['title'] . '!$}') !== false) {
                     if (isset($field['value']['date_end'])) {

common/widgets/TemplateOfElement/components/FieldsManage.php

@@ -480,7 +480,9 @@ public function getUserValueByName($name, $user_id)
 
     /**
      * Получает поля и значения документа с шаблоном
-     * */
+     *
+     * @throws \yii\db\Exception
+     */
     public function getData($document_id, $template_id)
     {
         $modelTemplateForm = TemplateForm::findOne($template_id);
@@ -610,6 +612,7 @@ public function getData($document_id, $template_id)
                             'document_id' => $document_id,
                         ])
                         ->one();
+
                     if ($dataPrice) {
                         if ($dataPrice['discount_id']) {
                             $dataDiscount = (new \yii\db\Query())
@@ -627,11 +630,25 @@ public function getData($document_id, $template_id)
                                             $dataDiscount['percent'] = $dataDiscountValue['value'];
                                         }
                                         if ($dataDiscountValue['type'] == Constants::FIELD_TYPE_DATE) {
-                                            $dataDiscount['date_end'] = $dataDiscountValue['value'];
+                                            if (strtotime($dataDiscountValue['value']) < strtotime(Yii::$app->formatter->asDate(time()))) {
+                                                Yii::$app->db->createCommand()
+                                                    ->update('value_price', [
+                                                        'discount_price' => $dataPrice['price'],
+                                                        'discount_id' => null,
+                                                    ], [
+                                                        'id' => $dataPrice['id']
+                                                    ])
+                                                    ->execute();
+                                                $dataPrice['discount_price'] = $dataPrice['price'];
+                                            } else {
+                                                $dataDiscount['date_end'] = $dataDiscountValue['value'];
+                                            }
                                         }
                                     }
                                 }
-                                $dataPrice = ArrayHelper::merge($dataPrice, $dataDiscount);
+                                if (isset($dataDiscount['date_end'])) {
+                                    $dataPrice = ArrayHelper::merge($dataPrice, $dataDiscount);
+                                }
                             }
 
                         }