Замена шорткода

diff --git a/erp24/controllers/UsersMessageManagementController.php b/erp24/controllers/UsersMessageManagementController.php
index 3ef1eb497c493318971611ed8d9f2d8bc4f3741f..d08be7ecbe041590cc830b0daec2688cb127a5f7 100644 (file)
--- a/erp24/controllers/UsersMessageManagementController.php
+++ b/erp24/controllers/UsersMessageManagementController.php
@@ -109,11 +109,7 @@ class UsersMessageManagementController extends Controller
             $model->updated_at = date('Y-m-d H:i:s');
             $model->updated_by = Yii::$app->user->id;
             if ($model->validate()) {
-                $model->offer_1 = $model->replaceShortcodes($model->offer_1);
-                $model->offer_2 = $model->replaceShortcodes($model->offer_2);
-                //$model->offer_3 = $model->replaceShortcodes($model->offer_3);
-                $model->offer_whatsapp = $model->replaceShortcodes($model->offer_whatsapp);
-                $model->offer_text = $model->replaceShortcodes($model->offer_text);
+
                 $model->save();
                 $newAttributes = $model->getAttributes();
                 self::saveLogs($oldAttributes, $newAttributes);
@@ -288,7 +284,9 @@ class UsersMessageManagementController extends Controller
         $messagesSettings = UsersMessageManagement::find()
             ->where(['active' => 1])
             ->one();
-        $message = $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]} ?? '';
+        $message = $messagesSettings->replaceShortcodes(
+            $messagesSettings->{UsersMessageManagement::TYPE_MESSAGE[$type]} ?? ''
+        );
 
         $dataProvider = new ArrayDataProvider([
             'allModels' => $data,