Tigran 4 年之前
父节点
当前提交
42404d6d95

+ 3 - 9
CardCollector/Commands/CallbackQuery/BackToFiltersMenu.cs

@@ -17,19 +17,13 @@ namespace CardCollector.Commands.CallbackQuery
             User.Session.SelectedSticker = null;
             User.Session.CombineList.Clear();
             /* Очищаем чат, если был передан параметр очистки */
-            var clearChat = CallbackData.Contains(Command.clear_chat);
-            if (clearChat) await User.ClearChat();
+            await User.ClearChat();
             /* Формируем сообщение с имеющимися фильтрами у пользователя */
             var text = User.Session.Filters.ToMessage(User.Session.State);
             /* Редактируем сообщение */
-            if (!clearChat) 
-                await MessageController.EditMessage(User, CallbackMessageId, 
+            var message = await MessageController.EditMessage(User, CallbackMessageId, 
                     text, Keyboard.GetSortingMenu(User.Session.State));
-            else
-            {
-                var message = await MessageController.SendMessage(User, text, Keyboard.GetSortingMenu(User.Session.State));
-                User.Session.Messages.Add(message.MessageId);
-            }
+            User.Session.Messages.Add(message.MessageId);
         }
         
         public BackToFiltersMenu() { }

+ 3 - 0
CardCollector/Commands/CallbackQuery/BuyStickerQuery.cs

@@ -26,8 +26,11 @@ namespace CardCollector.Commands.CallbackQuery
                 var coinsPrice = selectedSticker.GetCoinsPrice();
                 var gemsPrice = selectedSticker.GetGemsPrice();
                 if (count < selectedSticker.Count && count != -1)
+                {
                     await MessageController.AnswerCallbackQuery(User, Update.CallbackQuery!.Id,
                         Messages.not_enougth_stickers);
+                    await new BackToFiltersMenu(User, Update).Execute();
+                }
                 else if (coinsPrice > User.Cash.Coins)
                     await MessageController.AnswerCallbackQuery(User, Update.CallbackQuery!.Id,
                         Messages.not_enougth_coins);

+ 3 - 1
CardCollector/Commands/CallbackQuery/ConfirmBuyingQuery.cs

@@ -20,7 +20,9 @@ namespace CardCollector.Commands.CallbackQuery
             else
             {
                 var text = $"{Messages.confirm_buying}\n{User.Session.SelectedSticker.Count}{Text.items}" +
-                           $" {Text.per} {coinsPrice}{Text.coin} / {gemsPrice}{Text.gem}\n{Messages.are_you_sure}";
+                           $" {Text.per} {coinsPrice}{Text.coin} / {gemsPrice}{Text.gem}" +
+                           $"\n{Text.total}: {coinsPrice*User.Session.SelectedSticker.Count}{Text.coin} / {gemsPrice*User.Session.SelectedSticker.Count}{Text.gem}" +
+                           $"\n{Messages.are_you_sure}";
                 await MessageController.EditMessage(User, CallbackMessageId, text, Keyboard.GetConfirmationKeyboard(Command.buy_sticker));
             }
         }

+ 9 - 0
CardCollector/Resources/Text.Designer.cs

@@ -501,6 +501,15 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Всего.
+        /// </summary>
+        internal static string total {
+            get {
+                return ResourceManager.GetString("total", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Да.
         /// </summary>

+ 3 - 0
CardCollector/Resources/Text.resx

@@ -168,4 +168,7 @@
     <data name="delete" xml:space="preserve">
         <value>Удалить</value>
     </data>
+    <data name="total" xml:space="preserve">
+        <value>Всего</value>
+    </data>
 </root>