From dfc64f00c482fccd90e79aae37c65c553fe5587d Mon Sep 17 00:00:00 2001 From: Alexander Smirnov Date: Fri, 11 Oct 2024 14:20:08 +0300 Subject: [PATCH] =?utf8?q?[ERP-222]=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82?= =?utf8?q?=D0=BE=D1=80=20weekly=5Freport=5Fsubscription=20=D0=B2=20tg=5Fsu?= =?utf8?q?bscription?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../{weeklyReport => tg}/SubscriptionAction.php | 10 +++++----- .../api3/modules/v1/controllers/TgController.php | 12 ++++++++++++ .../v1/controllers/WeeklyReportController.php | 12 ------------ erp24/controllers/TgController.php | 15 +++++++++++++++ erp24/controllers/WeeklyReportController.php | 15 --------------- ...10_create_table_weekly_report_subscribtion.php | 2 +- ...yReportSubscription.php => TgSubscription.php} | 6 +++--- .../views/{weekly-report => tg}/subscription.php | 4 ++-- 8 files changed, 38 insertions(+), 38 deletions(-) rename erp24/actions/{weeklyReport => tg}/SubscriptionAction.php (82%) create mode 100644 erp24/api3/modules/v1/controllers/TgController.php delete mode 100644 erp24/api3/modules/v1/controllers/WeeklyReportController.php create mode 100644 erp24/controllers/TgController.php delete mode 100644 erp24/controllers/WeeklyReportController.php rename erp24/records/{WeeklyReportSubscription.php => TgSubscription.php} (84%) rename erp24/views/{weekly-report => tg}/subscription.php (95%) diff --git a/erp24/actions/weeklyReport/SubscriptionAction.php b/erp24/actions/tg/SubscriptionAction.php similarity index 82% rename from erp24/actions/weeklyReport/SubscriptionAction.php rename to erp24/actions/tg/SubscriptionAction.php index a960a502..9a99f044 100644 --- a/erp24/actions/weeklyReport/SubscriptionAction.php +++ b/erp24/actions/tg/SubscriptionAction.php @@ -1,11 +1,11 @@ request->post('name'); $chatId = Yii::$app->request->post('chat_id'); - $sub = new WeeklyReportSubscription; + $sub = new TgSubscription; $sub->name = $name; $sub->chat_id = $chatId; $sub->active = 0; @@ -34,7 +34,7 @@ class SubscriptionAction extends Action $chatId = Yii::$app->request->post('chatId'); $active = Yii::$app->request->post('active'); - $sub = WeeklyReportSubscription::findOne($subId); + $sub = TgSubscription::findOne($subId); $sub->name = $name; $sub->chat_id = $chatId; $sub->active = $active; @@ -47,7 +47,7 @@ class SubscriptionAction extends Action } } - $subscriptions = WeeklyReportSubscription::find()->orderBy(['id' => SORT_DESC])->all(); + $subscriptions = TgSubscription::find()->orderBy(['id' => SORT_DESC])->all(); return $this->controller->render('subscription', compact('subscriptions')); } diff --git a/erp24/api3/modules/v1/controllers/TgController.php b/erp24/api3/modules/v1/controllers/TgController.php new file mode 100644 index 00000000..6b83bde6 --- /dev/null +++ b/erp24/api3/modules/v1/controllers/TgController.php @@ -0,0 +1,12 @@ +where(['active' => 1])->all(); + } +} \ No newline at end of file diff --git a/erp24/api3/modules/v1/controllers/WeeklyReportController.php b/erp24/api3/modules/v1/controllers/WeeklyReportController.php deleted file mode 100644 index d114d78d..00000000 --- a/erp24/api3/modules/v1/controllers/WeeklyReportController.php +++ /dev/null @@ -1,12 +0,0 @@ -where(['active' => 1])->all(); - } -} \ No newline at end of file diff --git a/erp24/controllers/TgController.php b/erp24/controllers/TgController.php new file mode 100644 index 00000000..61750e04 --- /dev/null +++ b/erp24/controllers/TgController.php @@ -0,0 +1,15 @@ + \yii_app\actions\tg\SubscriptionAction::class, + ]; + } +} \ No newline at end of file diff --git a/erp24/controllers/WeeklyReportController.php b/erp24/controllers/WeeklyReportController.php deleted file mode 100644 index 377ee09d..00000000 --- a/erp24/controllers/WeeklyReportController.php +++ /dev/null @@ -1,15 +0,0 @@ - \yii_app\actions\weeklyReport\SubscriptionAction::class, - ]; - } -} \ No newline at end of file diff --git a/erp24/migrations/m241010_150710_create_table_weekly_report_subscribtion.php b/erp24/migrations/m241010_150710_create_table_weekly_report_subscribtion.php index eadf9016..6b007b86 100755 --- a/erp24/migrations/m241010_150710_create_table_weekly_report_subscribtion.php +++ b/erp24/migrations/m241010_150710_create_table_weekly_report_subscribtion.php @@ -7,7 +7,7 @@ use yii\db\Migration; */ class m241010_150710_create_table_weekly_report_subscribtion extends Migration { - const TABLE_NAME = 'erp24.weekly_report_subscription'; + const TABLE_NAME = 'erp24.tg_subscription'; /** * {@inheritdoc} diff --git a/erp24/records/WeeklyReportSubscription.php b/erp24/records/TgSubscription.php similarity index 84% rename from erp24/records/WeeklyReportSubscription.php rename to erp24/records/TgSubscription.php index a4522d06..00bc9d33 100644 --- a/erp24/records/WeeklyReportSubscription.php +++ b/erp24/records/TgSubscription.php @@ -5,21 +5,21 @@ namespace yii_app\records; use Yii; /** - * This is the model class for table "weekly_report_subscription". + * This is the model class for table "tg_subscription". * * @property int $id * @property string $name Имя пользователя * @property int $chat_id chat_id пользователя * @property int $active 0 - не активен, 1 - активен */ -class WeeklyReportSubscription extends \yii\db\ActiveRecord +class TgSubscription extends \yii\db\ActiveRecord { /** * {@inheritdoc} */ public static function tableName() { - return 'weekly_report_subscription'; + return 'tg_subscription'; } /** diff --git a/erp24/views/weekly-report/subscription.php b/erp24/views/tg/subscription.php similarity index 95% rename from erp24/views/weekly-report/subscription.php rename to erp24/views/tg/subscription.php index 36a13ce1..f784b38a 100644 --- a/erp24/views/weekly-report/subscription.php +++ b/erp24/views/tg/subscription.php @@ -3,7 +3,7 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; -use yii_app\records\WeeklyReportSubscription; +use yii_app\records\TgSubscription; /** @var $subscriptions []WeeklyReportSubscription */ @@ -40,7 +40,7 @@ $this->registerJsFile('/js/weekly-report/subscription.js', ['position' => \yii\w - + -- 2.39.5