diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index 7b05da6..db0b8de 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -412,7 +412,8 @@ class TgBot: return if update.effective_message.text == "/inv": - del context.chat_data["inv"] + if 'inv' in context.chat_data: + del context.chat_data["inv"] context.chat_data["step"] = "name" current_ter_id = context.chat_data.get("terdeep_value", None) current_ter = await TerritoryItem.objects.aget(id=current_ter_id) @@ -423,6 +424,7 @@ class TgBot: ), reply_markup=ReplyKeyboardMarkup([[KeyboardButton(current_ter.name)]]), ) + return if current_step == "name": if not context.chat_data.get("inv", None): diff --git a/front/components/sidebar.vue b/front/components/sidebar.vue index 51d66f0..2ef778d 100644 --- a/front/components/sidebar.vue +++ b/front/components/sidebar.vue @@ -2,11 +2,6 @@ const route = useRoute() const links = [ - { - label: 'DEV Связь с 1с', - icon: 'i-heroicons-beaker', - to: '/organization' - }, { label: 'Список ТМЦ (шаблоны)', icon: 'i-heroicons-archive-box', diff --git a/front/pages/organization/index.vue b/front/pages/organization/index.vue deleted file mode 100644 index 0159f85..0000000 --- a/front/pages/organization/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - \ No newline at end of file diff --git a/front/pages/organization/new.vue b/front/pages/organization/new.vue deleted file mode 100644 index ea3497c..0000000 --- a/front/pages/organization/new.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue b/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue deleted file mode 100644 index 63e2c87..0000000 --- a/front/pages/organization/p_[org_id]/i_[inv_id]/edit.vue +++ /dev/null @@ -1,15 +0,0 @@ - - \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue b/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue deleted file mode 100644 index c26496b..0000000 --- a/front/pages/organization/p_[org_id]/i_[inv_id]/index.vue +++ /dev/null @@ -1,42 +0,0 @@ - - \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/index.vue b/front/pages/organization/p_[org_id]/index.vue deleted file mode 100644 index fde30ae..0000000 --- a/front/pages/organization/p_[org_id]/index.vue +++ /dev/null @@ -1,57 +0,0 @@ - - \ No newline at end of file diff --git a/front/pages/organization/p_[org_id]/new/index.vue b/front/pages/organization/p_[org_id]/new/index.vue deleted file mode 100644 index b087aa7..0000000 --- a/front/pages/organization/p_[org_id]/new/index.vue +++ /dev/null @@ -1,22 +0,0 @@ - - \ No newline at end of file