Merge remote-tracking branch 'origin/master'

Administrator
2 parents ea57d22a e408c6f2
Showing 2 changed files with 15 additions and 8 deletions Show diff stats
models/Order.php
views/category/_form_language.php
@@ -141,7 +141,10 @@
                     'required',
                 ],
                 [
-                    [ 'comment' ],
+                    [
+                        'comment',
+                        'body',
+                    ],
                     'string',
                 ],
                 [
@@ -161,7 +164,6 @@
                         'deadline',
                         'name',
                         'numbercard',
-                        'body',
                         'declaration',
                         'stock',
                         'consignment',
@@ -183,7 +185,7 @@
         public function afterFind()
         {
             parent::afterFind();
-            $this->deadline = !empty($this->deadline) ? date('d.m.Y', $this->deadline) : '';
+            $this->deadline = !empty( $this->deadline ) ? date('d.m.Y', $this->deadline) : '';
  
         }
  
@@ -200,7 +202,7 @@
  
         protected function convertDate()
         {
-            if (!empty($this->deadline)) {
+            if (!empty( $this->deadline )) {
                 $date = new \DateTime();
                 $date->setTimestamp(strtotime($this->deadline));
                 $date->format("d.m.Y");
@@ -289,8 +291,8 @@
          */
         public function getDeliveryString()
         {
-            if (!empty($this->orderDelivery)) {
-                if (!empty($this->orderDelivery->parent)) {
+            if (!empty( $this->orderDelivery )) {
+                if (!empty( $this->orderDelivery->parent )) {
                     return $this->orderDelivery->parent->lang->title . ': ' . $this->orderDelivery->lang->title;
                 } else {
                     return $this->orderDelivery->lang->title;
@@ -308,7 +310,7 @@
          */
         public function getWasted()
         {
-            if (empty($this->deadline)) {
+            if (empty( $this->deadline )) {
                 return false;
             } else {
                 return time() > strtotime($this->deadline);
 <?php
     use artweb\artbox\language\models\Language;
     use artweb\artbox\ecommerce\models\CategoryLang;
+    use mihaildev\ckeditor\CKEditor;
     use yii\web\View;
     use yii\widgets\ActiveForm;
  
@@ -30,7 +31,11 @@
          ->textInput([ 'maxlength' => true ]) ?>
  
 <?= $form->field($model_lang, '[' . $language->id . ']seo_text')
-         ->textarea([ 'rows' => 6 ]) ?>
+         ->widget(CKEditor::className(), [
+             'editorOptions' => [
+                 'preset' => 'standard',
+             ]
+                                      ]) ?>
  
 <?= $form->field($model_lang, '[' . $language->id . ']h1')
          ->textInput([ 'maxlength' => true ]) ?>
 \ No newline at end of file