Артем Гавриленко 3 anos atrás
pai
commit
2956f27894

+ 18 - 10
TerminalKFC/Windows/OrderWindow.xaml

@@ -13,8 +13,9 @@
         ResizeMode="NoResize">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="27*"/>
+            <RowDefinition Height="171*"/>
+            <RowDefinition Height="500*"/>
+            <RowDefinition Height="75*"/>
         </Grid.RowDefinitions>
         <Image
             Grid.Row="0"
@@ -53,7 +54,7 @@
                                 Source="/TerminalKFC;component/Images/img7.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_2" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -63,7 +64,7 @@
                                 Source="/TerminalKFC;component/Images/img7.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_3" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -92,7 +93,7 @@
                     Margin="5">
                     <StackPanel Orientation="Horizontal">
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_4" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -102,7 +103,7 @@
                                 Source="/TerminalKFC;component/Images/img8.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_5" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -112,7 +113,7 @@
                                 Source="/TerminalKFC;component/Images/img8.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_6" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -141,7 +142,7 @@
                     Margin="5">
                     <StackPanel Orientation="Horizontal">
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_7" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -151,7 +152,7 @@
                                 Source="/TerminalKFC;component/Images/img9.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_8" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -161,7 +162,7 @@
                                 Source="/TerminalKFC;component/Images/img9.png"/>
                         </Button>
                         <Button 
-                            Click="Button_Click_1" 
+                            Click="Button_Click_9" 
                             HorizontalAlignment="Left" 
                             VerticalAlignment="Top" 
                             Width="100" 
@@ -174,5 +175,12 @@
                 </Grid>
             </TabItem>
         </TabControl>
+        <Button
+            Name="BuyButton"
+            Grid.Row="2"
+            Content="Оплатить: 0руб"
+            FontSize="20"
+            Click="BuyButton_Click">
+        </Button>
     </Grid>
 </Window>

+ 27 - 54
TerminalKFC/Windows/OrderWindow.xaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Windows;
 
 namespace TerminalKFC.Windows
@@ -8,113 +9,85 @@ namespace TerminalKFC.Windows
     /// </summary>
     public partial class OrderWindow : Window
     {
-        public string bracket = "";
+        public List<string> list = new List<string>();
         public int sum = 0;
         public OrderWindow()
         {
             InitializeComponent();
         }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            menu.Visibility = Visibility.Hidden;
-        }
-
-        public void Update()
+        void Update()
         {
-            //itog.Content = "Итог: " + sum;
+            BuyButton.Content = $"Оплатить: {sum}руб";
         }
         private void Button_Click_1(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 150);
-            //tbfin.AppendText(Environment.NewLine + "Шефбургер\t\t\t150 p.");
+            list.Add("Шефбургер - 150р.");
             Update();
         }
-
         private void Button_Click_2(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 175);
-            //tbfin.AppendText(Environment.NewLine + "Шефбургер Делюкс\t\t175 p.");
+            list.Add("Шефбургер делюкс - 175р.");
             Update();
         }
-
         private void Button_Click_3(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 100);
-            //tbfin.AppendText(Environment.NewLine + "Чизкейк\t\t\t\t100 p.");
+            list.Add("Шефбургер маленький - 100р.");
             Update();
         }
-
         private void Button_Click_4(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 300);
-            //tbfin.AppendText(Environment.NewLine + "Два твистера\t\t\t300 p.");
+            list.Add("Твистер большой - 300р.");
             Update();
         }
-
         private void Button_Click_5(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 70);
-            //tbfin.AppendText(Environment.NewLine + "Твистер\t\t\t\t70 p.");
+            list.Add("Твистер маленький - 70р.");
             Update();
         }
-
         private void Button_Click_6(object sender, RoutedEventArgs e)
         {
-            sum = GetNewSum(sum, 70);
-            //tbfin.AppendText(Environment.NewLine + "Стандартный\t\t\t70 p.");
+            sum = GetNewSum(sum, 175);
+            list.Add("Твистер стандартный - 175р.");
             Update();
         }
-
         private void Button_Click_7(object sender, RoutedEventArgs e)
         {
-            sum = GetNewSum(sum, 100);
-            //tbfin.AppendText(Environment.NewLine + "Стандартный\t\t\t100 p.");
+            sum = GetNewSum(sum, 20);
+            list.Add("Мороженое - 20р.");
             Update();
         }
-
         private void Button_Click_8(object sender, RoutedEventArgs e)
         {
-            sum = GetNewSum(sum, 350);
-            //tbfin.AppendText(Environment.NewLine + "Шефбургер острый\t\t350 p.");
+            sum = GetNewSum(sum, 35);
+            list.Add("Мороженое с шок. крошкой - 35р.");
             Update();
         }
-
         private void Button_Click_9(object sender, RoutedEventArgs e)
         {
             sum = GetNewSum(sum, 150);
-            //tbfin.AppendText(Environment.NewLine + "Шефбургер средний\t\t150 p.");
+            list.Add("Мороженое Mars - 150р.");
             Update();
         }
-
-        private void Button_Click_10(object sender, RoutedEventArgs e)
-        {
-            sum = GetNewSum(sum, 100);
-            //tbfin.AppendText(Environment.NewLine + "Мороженое\t\t\t\t100 p.");
-            Update();
-        }
-
-        private void Button_Click_11(object sender, RoutedEventArgs e)
-        {
-            sum = GetNewSum(sum, 145);
-            //tbfin.AppendText(Environment.NewLine + "Твистер\t\t\t\t145 p.");
-            Update();
-        }
-
-        private void Button_Click_12(object sender, RoutedEventArgs e)
-        {
-            sum = GetNewSum(sum, 150);
-            //tbfin.AppendText(Environment.NewLine + "Картошка для двоих\t\t\t\t150 p.");
-            Update();
-        }
-
         public int GetNewSum(int sum, int price)
         {
             return (sum + price);
         }
-        public void AddNewProduct(string ProductName)
-        {
-            bracket += Environment.NewLine + ProductName;
+        private void BuyButton_Click(object sender, RoutedEventArgs e)
+        {
+            ResultOrderWindow row = new ResultOrderWindow();
+            row.BlockOfGoods.AppendText($"Ваш заказ:" + "\n");
+            foreach (string elem in list)
+            {
+                row.BlockOfGoods.AppendText(elem + "\n");
+            }
+            row.BlockOfGoods.AppendText($"Сумма: {sum}");
+            row.Show();
+            this.Close();
         }
     }
 }

+ 17 - 2
TerminalKFC/Windows/ResultOrderWindow.xaml

@@ -5,12 +5,27 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:TerminalKFC.Windows"
         mc:Ignorable="d"
-        Title="ResultOrderWindow" Height="750" 
-        Width="500" 
+        Title="ResultOrderWindow" 
+        Height="400" 
+        Width="350" 
         WindowStartupLocation="CenterScreen" 
         WindowStyle="None" 
         ResizeMode="NoResize">
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="100*"/>
+            <RowDefinition Height="300*"/>
+        </Grid.RowDefinitions>
+        <Image Source="/TerminalKFC;component/Images/img6.jpg"/>
         
+        <TextBox 
+            Name="BlockOfGoods" 
+            Grid.Row="1"
+            Width="300"
+            Height="300"
+            VerticalAlignment="Bottom" 
+            HorizontalAlignment="Center"
+            IsReadOnly="True">
+        </TextBox>
     </Grid>
 </Window>