Merge remote-tracking branch 'origin/master' into permissions

Alexey Boroda
2 parents e86ffb35 3f7ce0d0
Showing 5 changed files with 37 additions and 4 deletions Show diff stats
controllers/OrderController.php
models/Product.php
models/TaxOptionLang.php
views/brand/_form_language.php
views/tax-option/_form_language.php
@@ -5,6 +5,7 @@
     use artweb\artbox\components\SmsSender;
     use artweb\artbox\ecommerce\models\OrderLabelHistory;
     use artweb\artbox\ecommerce\models\OrderSearch;
+    use backend\models\SmsLog;
     use common\components\CreditHelper;
     use common\models\Permissions;
     use common\models\User;
@@ -508,6 +509,15 @@
         {
             $phone = \Yii::$app->request->post('phone');
             $content = \Yii::$app->request->post('content');
+    
+            $smsLog = new SmsLog();
+    
+            $smsLog->type = 1;
+            $smsLog->text = $content;
+            $smsLog->number = $phone;
+    
+            $smsLog->save();
+            
             $sender = \Yii::$app->sender;
             $result = $sender->send($phone, $content);
             return $phone . $content . $result;
@@ -586,7 +596,7 @@
                 //$date = new \DateTime("NOW"/*date('D, d M Y H:i:s', $model->edit_time)*/, new \DateTimeZone('Europe/Kiev'));
                 $date = \Yii::$app->formatter->asDatetime($model->edit_time + 7200, 'php:G : i');
-                if ($model->save()) {
+                if ($model->save(false, ['edit_time', 'edit_id'])) {
                     return [
                         'time' => $date,
                         'user' => !empty($user) ? $user->username : '',
@@ -606,7 +616,7 @@
             $model->edit_time = 0;
             $model->edit_id = 0;
-            $model->save();
+            $model->save(false, ['edit_time', 'edit_id']);
         }
         public function actionPublishOrder($id, $phone)
@@ -416,7 +416,11 @@
                                         )
                                         ->one();
             if ($groupName != NULL) {
-                $groupName = $groupName[ 'value' ];
+                if(!empty($groupName['synonym'])) {
+                    $groupName = $groupName['synonym'];
+                } else {
+                    $groupName = $groupName[ 'value' ];
+                }
             } else {
                 $groupName = '';
             }
@@ -13,6 +13,7 @@
      * @property integer   $language_id
      * @property string    $value
      * @property string    $alias
+     * @property string    $synonym
      * @property Language  $language
      * @property TaxOption $taxOption
      */
@@ -59,6 +60,7 @@
                     [
                         'value',
                         'alias',
+                        'synonym',
                     ],
                     'string',
                     'max' => 255,
@@ -102,6 +104,7 @@
                 'language_id'   => Yii::t('app', 'Language ID'),
                 'value'         => Yii::t('app', 'Value'),
                 'alias'         => Yii::t('app', 'Alias'),
+                'synonym'         => Yii::t('app', 'Synonym'),
             ];
         }
@@ -2,6 +2,7 @@
     use artweb\artbox\language\models\Language;
     use artweb\artbox\ecommerce\models\BrandLang;
     use mihaildev\ckeditor\CKEditor;
+    use mihaildev\elfinder\ElFinder;
     use yii\web\View;
     use yii\widgets\ActiveForm;
@@ -31,4 +32,17 @@
          ->textarea([ 'rows' => 6 ]) ?>
 <?= $form->field($model_lang, '[' . $language->id . ']history')
-         ->widget(CKEditor::className()) ?>
+         ->widget(
+             CKEditor::className(),
+             [
+                 'editorOptions' => ElFinder::ckeditorOptions(
+                     'elfinder',
+                     [
+                         'preset'               => 'full',
+                         'inline'               => false,
+                         'filebrowserUploadUrl' => Yii::$app->getUrlManager()
+                                                            ->createUrl('file/uploader/images-upload'),
+                     ]
+                 ),
+             ]
+         ) ?>
@@ -15,3 +15,5 @@
          ->textInput([ 'maxlength' => true ]); ?>
 <?= $form->field($model_lang, '[' . $language->id . ']alias')
          ->textInput([ 'maxlength' => true ]); ?>
+<?= $form->field($model_lang, '[' . $language->id . ']synonym')
+         ->textInput([ 'maxlength' => true ]); ?>