Prechádzať zdrojové kódy

формирование заказа

unknown 8 mesiacov pred
rodič
commit
619dad7119
34 zmenil súbory, kde vykonal 842 pridanie a 31 odobranie
  1. BIN
      .vs/Sessioa/FileContentIndex/56715510-18a2-41ac-b579-9345193723de.vsidx
  2. BIN
      .vs/Sessioa/FileContentIndex/67dee0f4-82aa-49c3-976e-cc4fec348b27.vsidx
  3. BIN
      .vs/Sessioa/FileContentIndex/6fcfd169-de8d-494f-99b5-0ff7acfb2394.vsidx
  4. BIN
      .vs/Sessioa/FileContentIndex/a608482a-47b0-4308-937a-aac62a3e0b48.vsidx
  5. BIN
      .vs/Sessioa/v17/.suo
  6. 2 0
      Sessioa/MainWindow.xaml.cs
  7. 78 0
      Sessioa/Pages/OrderCard.xaml
  8. 193 0
      Sessioa/Pages/OrderCard.xaml.cs
  9. 4 4
      Sessioa/Pages/OrderNew.xaml
  10. 5 0
      Sessioa/Pages/OrderNew.xaml.cs
  11. 3 2
      Sessioa/Pages/ProductsPage.xaml
  12. 34 6
      Sessioa/Pages/ProductsPage.xaml.cs
  13. 7 0
      Sessioa/Sessioa.csproj
  14. BIN
      Sessioa/bin/Debug/Sessioa.exe
  15. BIN
      Sessioa/bin/Debug/Sessioa.pdb
  16. BIN
      Sessioa/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  17. BIN
      Sessioa/obj/Debug/Pages/OrderCard.baml
  18. 205 0
      Sessioa/obj/Debug/Pages/OrderCard.g.cs
  19. 205 0
      Sessioa/obj/Debug/Pages/OrderCard.g.i.cs
  20. BIN
      Sessioa/obj/Debug/Pages/OrderNew.baml
  21. 19 2
      Sessioa/obj/Debug/Pages/OrderNew.g.cs
  22. 19 2
      Sessioa/obj/Debug/Pages/OrderNew.g.i.cs
  23. BIN
      Sessioa/obj/Debug/Pages/ProductsPage.baml
  24. 24 1
      Sessioa/obj/Debug/Pages/ProductsPage.g.cs
  25. 24 1
      Sessioa/obj/Debug/Pages/ProductsPage.g.i.cs
  26. 1 1
      Sessioa/obj/Debug/Sessioa.csproj.CoreCompileInputs.cache
  27. 2 0
      Sessioa/obj/Debug/Sessioa.csproj.FileListAbsolute.txt
  28. BIN
      Sessioa/obj/Debug/Sessioa.exe
  29. BIN
      Sessioa/obj/Debug/Sessioa.g.resources
  30. BIN
      Sessioa/obj/Debug/Sessioa.pdb
  31. 3 3
      Sessioa/obj/Debug/Sessioa_MarkupCompile.cache
  32. 6 6
      Sessioa/obj/Debug/Sessioa_MarkupCompile.i.cache
  33. 7 3
      Sessioa/obj/Debug/Sessioa_MarkupCompile.i.lref
  34. 1 0
      Sessioa/obj/Debug/Sessioa_MarkupCompile.lref

BIN
.vs/Sessioa/FileContentIndex/56715510-18a2-41ac-b579-9345193723de.vsidx


BIN
.vs/Sessioa/FileContentIndex/67dee0f4-82aa-49c3-976e-cc4fec348b27.vsidx


BIN
.vs/Sessioa/FileContentIndex/6fcfd169-de8d-494f-99b5-0ff7acfb2394.vsidx


BIN
.vs/Sessioa/FileContentIndex/a608482a-47b0-4308-937a-aac62a3e0b48.vsidx


BIN
.vs/Sessioa/v17/.suo


+ 2 - 0
Sessioa/MainWindow.xaml.cs

@@ -29,6 +29,8 @@ namespace Sessioa
             FrameClass.C_Frame = FrameMain;
             BaseClass.C_Base = new BaseU();
             FrameMain.Navigate(new Autorization());
+            Application.Current.Properties["ListOrderUser"] = new List<Product>();
+            Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
         }
     }
 }

+ 78 - 0
Sessioa/Pages/OrderCard.xaml

@@ -0,0 +1,78 @@
+<Page x:Class="Sessioa.Pages.OrderCard"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:Sessioa.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="OrderCard">
+    <Page.Resources>
+        <BitmapImage x:Key="defaultImage" UriSource="/Resources/picture.png"/>
+    </Page.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="8.5*"/>
+            <RowDefinition/>
+            <RowDefinition/>
+        </Grid.RowDefinitions>
+        <Button Name="B_Back" Content="Назад" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Back_Click"  VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <ListBox Name="LB_ProductsOrder" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Grid.Row="1">
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="0.2*"/>
+                        </Grid.ColumnDefinitions>
+                        <Border BorderBrush="#498C51" BorderThickness="3" CornerRadius="5" Margin="10,0,0,0">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="0.3*"/>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="0.2*"/>
+                                </Grid.ColumnDefinitions>
+                                <Image Source="{Binding ProductPhoto, TargetNullValue={StaticResource defaultImage}}" Margin="5" MaxWidth="80"/>
+                                <StackPanel Grid.Column="1">
+                                    <TextBlock Text="{Binding ProductName}" Style="{StaticResource TextBlockBold}"/>
+                                    <TextBlock Text="{Binding ProductDescription}" Style="{StaticResource TextBlock}"/>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="Производитель:" Style="{StaticResource TextBlock}" Margin="0,0,5,0"/>
+                                        <TextBlock Text="{Binding Manufacturer.Manufacturer1}" Style="{StaticResource TextBlock}"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="Цена: " Style="{StaticResource TextBlock}" Margin="0,0,5,0"/>
+                                        <TextBlock Name="countPr" Text="{Binding ProductCost, StringFormat={}{0:C}}" Language="ru-Ru" Style="{StaticResource TextBlock}" Uid="{Binding ProductArticleNumber}" Loaded="countPr_Loaded"/>
+                                        <TextBlock Name="countDPr" Style="{StaticResource TextBlock}" Language="ru-Ru" Uid="{Binding ProductArticleNumber}" Visibility="Collapsed" Loaded="countDPr_Loaded" Margin="5,0,0,0"/>
+                                    </StackPanel>
+                                </StackPanel>
+                                <TextBlock Name="Discount" Loaded="Discount_Loaded" Uid="{Binding ProductArticleNumber}" Style="{StaticResource TextBlock}" Grid.Column="2" VerticalAlignment="Center"/>
+                            </Grid>
+                        </Border>
+                        <Border BorderBrush="#498C51" BorderThickness="3" CornerRadius="5" Grid.Column="1" Margin="20,0,10,0">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Button Name="Back_B" Content="-" Style="{StaticResource ButtonAct}" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Back_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center"/>
+                                <TextBlock x:Name="CountProduct" Grid.Column="1" Text="1" Style="{StaticResource TextBlockBold}" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="22" Loaded="CountProduct_Loaded" Uid="{Binding ProductArticleNumber}"/>
+                                <Button Name="Next_B" Content="+" Style="{StaticResource ButtonAct}" Grid.Column="2" MaxHeight="30" MinWidth="30" MaxWidth="50" Click="Next_B_Click" Uid="{Binding ProductArticleNumber}" HorizontalAlignment="Center"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
+        <StackPanel Orientation="Vertical" Grid.Row="2" HorizontalAlignment="Right" Margin="20,0">
+            <TextBlock x:Name="TB_ItogoSkidka" Style="{StaticResource TextBlockMain}"/>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="ИТОГО: " Style="{StaticResource TextBlockMain}"/>
+                <TextBlock x:Name="TB_Itogo" Style="{StaticResource TextBlockMain}" />
+            </StackPanel>
+        </StackPanel>
+        <Button Name="B_Save" Content="Оформить заказ" Style="{StaticResource ButtonSt}" Margin="10,5" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Save_Click" Grid.Row="3"/>
+    </Grid>
+</Page>

+ 193 - 0
Sessioa/Pages/OrderCard.xaml.cs

@@ -0,0 +1,193 @@
+using Sessioa.BaseModel;
+using Sessioa.Classes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Sessioa.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для OrderCard.xaml
+    /// </summary>
+    public partial class OrderCard : Page
+    {
+        List<Product> products = (List<Product>)Application.Current.Properties["ListOrderUser"];
+        Dictionary<string, int> keyValuePairs = (Dictionary<string, int>)(Application.Current.Properties["ListOrderCountUser"]);
+        //{
+        //    {"djkdkla", 19 }
+        //};
+        User user = null;
+        public OrderCard(User userSign)
+        {
+            InitializeComponent();
+            user = userSign;
+            LB_ProductsOrder.ItemsSource = products;
+            if (keyValuePairs.Count == 0)
+            {
+                foreach (Product product in products)
+                {
+                    keyValuePairs.Add($"{product.ProductArticleNumber}", 1);
+                }
+            }
+            else
+            {
+                foreach (Product product in products)
+                {
+                    try
+                    {
+                        keyValuePairs.Add($"{product.ProductArticleNumber}", 1);
+                    }
+                    catch { }
+                }
+            }
+            ItogoSkidka();
+            //keyValuePairs.Add("dawlk", 2718);
+            //foreach(KeyValuePair<string, int> pair in keyValuePairs)
+            //{
+            //    pair.Key; //1
+            //    pair.Value; //2
+            //}
+        }
+
+        private void countPr_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock textBlock = (TextBlock)sender;
+            Product product = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == textBlock.Uid);
+            if (product.ProductDiscountAmount != null)
+                textBlock.TextDecorations = TextDecorations.Strikethrough;
+        }
+
+        private void countDPr_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock textBlock = (TextBlock)sender;
+            Product product = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == textBlock.Uid);
+            if (product.ProductDiscountAmount != null)
+            {
+                textBlock.Visibility = Visibility.Visible;
+                textBlock.Text = $" {(double)(product.ProductCost - product.ProductCost * product.ProductDiscountAmount / 100)} ₽";
+            }
+        }
+
+        private void Discount_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock textBlock = (TextBlock)sender;
+            Product product = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == textBlock.Uid);
+            if (product.ProductDiscountAmount != null)
+            {
+                textBlock.Visibility = Visibility.Visible;
+                textBlock.Text = $"Скидка {product.ProductDiscountAmount}%";
+            }
+        }
+
+        private void B_Back_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.Properties["ListOrderCountUser"] = keyValuePairs;
+            FrameClass.C_Frame.Navigate(new ProductsPage(user));
+        }
+
+        private void B_Save_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.Properties["ListOrderUser"] = new List<Product>();
+            Application.Current.Properties["ListOrderCountUser"] = new Dictionary<string, int>();
+            MessageBoxResult mbr = MessageBox.Show("Заказ оформлен.", "Уведомление", MessageBoxButton.OK, MessageBoxImage.Information);
+            if (mbr == MessageBoxResult.OK)
+                FrameClass.C_Frame.Navigate(new ProductsPage(user));
+        }
+
+        private void Back_B_Click(object sender, RoutedEventArgs e)
+        {
+            Button bBack = (Button)sender;
+            Grid grid = (Grid)bBack.Parent;
+            TextBlock textBlock = (TextBlock)grid.FindName("CountProduct");
+            Product pr = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == bBack.Uid);
+            if (pr != null)
+            {
+                foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                {
+                    if (pair.Key == bBack.Uid)
+                    {
+                        if (pair.Value > 1)
+                        {
+                            keyValuePairs[pair.Key]--;
+                            textBlock.Text = keyValuePairs[pair.Key].ToString();
+                            break;
+                        }
+                    }
+                }
+            }
+            ItogoSkidka();
+        }
+
+        private void Next_B_Click(object sender, RoutedEventArgs e)
+        {
+            Button bNext = (Button)sender;
+            Grid grid = (Grid)bNext.Parent;
+            TextBlock textBlock = (TextBlock)grid.FindName("CountProduct");
+            Product pr = BaseClass.C_Base.Product.FirstOrDefault(x => x.ProductArticleNumber == bNext.Uid);
+            if (pr != null)
+            {
+                foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                {
+                    if (pair.Key == bNext.Uid)
+                    {
+                        keyValuePairs[pair.Key]++;
+                        textBlock.Text = keyValuePairs[pair.Key].ToString();
+                        break;
+                    }
+                }
+            }
+            ItogoSkidka();
+        }
+
+        private void CountProduct_Loaded(object sender, RoutedEventArgs e)
+        {
+            TextBlock tb = (TextBlock)sender;
+            if (keyValuePairs.Count > 0)
+            {
+                foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                {
+                    if (pair.Key == tb.Uid)
+                    {
+                        tb.Text = keyValuePairs[pair.Key].ToString();
+                        break;
+                    }
+                }
+            }
+        }
+        public void ItogoSkidka()
+        {
+            decimal itogoBezSkidki = 0;
+            foreach(Product item in products)
+            {
+                foreach(KeyValuePair<string, int> pair in keyValuePairs)
+                {
+                    if(pair.Key == item.ProductArticleNumber)
+                    {
+                        itogoBezSkidki += item.ProductCost * pair.Value;
+                    }
+                }
+            }
+            decimal itogoSoSkidkoy = 0;
+            foreach (Product item in products)
+            {
+                foreach (KeyValuePair<string, int> pair in keyValuePairs)
+                {
+                    if (pair.Key == item.ProductArticleNumber)
+                    {
+                        if(item.ProductDiscountAmount != null)
+                        {
+                            itogoSoSkidkoy += (item.ProductCost - (item.ProductCost * ((decimal)item.ProductDiscountAmount / 100))) * pair.Value;
+                        }
+                        else
+                            itogoSoSkidkoy += item.ProductCost * pair.Value;
+                    }
+                }
+            }
+            decimal ITOGO = Math.Round((1 - (itogoSoSkidkoy / itogoBezSkidki)) * 100, 2);
+            TB_ItogoSkidka.Text = $"Скидка {ITOGO}%";
+            TB_Itogo.Text = $"{(double)itogoSoSkidkoy} ₽";
+        }
+    }
+}

+ 4 - 4
Sessioa/Pages/OrderNew.xaml

@@ -13,9 +13,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
-            <RowDefinition Height="0.1*"/>
         </Grid.RowDefinitions>
-        <ListBox x:Name="LB_OrderProduct" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="200,0">
+        <Button Name="B_Back" Content="Назад" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="B_Back_Click"  VerticalAlignment="Top" HorizontalAlignment="Left"/>
+        <ListBox x:Name="LB_OrderProduct" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Margin="200,30">
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Border BorderBrush="Black" BorderThickness="2" CornerRadius="5">
@@ -24,12 +24,12 @@
                                 <ColumnDefinition Width="0.3*"/>
                                 <ColumnDefinition Width="2*"/>
                             </Grid.ColumnDefinitions>
-                            <StackPanel>
+                            <StackPanel Margin="10">
                                 <TextBlock Text="{Binding OrderID, StringFormat=Заказ #{0}}" Style="{StaticResource TextBlockBold}"/>
                                 <TextBlock Name="UserOrder" Loaded="UserOrder_Loaded" Style="{StaticResource TextBlock}" Uid="{Binding User.UserID}"/>
                             </StackPanel>
                             <StackPanel Grid.Column="1" HorizontalAlignment="Right" Margin="15,0">
-                                <TextBlock Text="{Binding OrderDate, StringFormat=Дата создания заказа: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#eb9c00" Language="ru-RU"/>
+                                <TextBlock Text="{Binding OrderDate, StringFormat=Дата создания заказа: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#eb9c00" Language="ru-RU" Margin="0,0,0,10"/>
                                 <TextBlock Text="{Binding OrderDeliveryDate, StringFormat=Дата выдачи: {0:d}}" Style="{StaticResource TextBlock}" Foreground="#498C51" Language="ru-RU"/>
                             </StackPanel>
                         </Grid>

+ 5 - 0
Sessioa/Pages/OrderNew.xaml.cs

@@ -45,5 +45,10 @@ namespace Sessioa.Pages
                 tb.Text = $"Заказчик: {us.UserSurname} {us.UserName[0]}.{(us.UserPatronymic != null && us.UserPatronymic != string.Empty ? $"{us.UserPatronymic[0]}." : "")}";
             }
         }
+
+        private void B_Back_Click(object sender, RoutedEventArgs e)
+        {
+            FrameClass.C_Frame.Navigate(new ProductsPage(user));
+        }
     }
 }

+ 3 - 2
Sessioa/Pages/ProductsPage.xaml

@@ -49,7 +49,7 @@
             </ListBox.ItemTemplate>
             <ListBox.ContextMenu>
                 <ContextMenu Loaded="ContextMenu_Loaded">
-                    <MenuItem Name="AddOrder" Header="Добавить к заказу"/>
+                    <MenuItem Name="AddOrder" Header="Добавить к заказу" Click="AddOrder_Click"/>
                     <MenuItem Name="EditProduct" Header="Редактировать" Loaded="EditProduct_Loaded" Click="EditProduct_Click"/>
                     <MenuItem Name="DeleteProduct" Header="Удалить" Loaded="DeleteProduct_Loaded" Click="DeleteProduct_Click"/>
                 </ContextMenu>
@@ -74,7 +74,8 @@
         <StackPanel Orientation="Horizontal">
             <Button Name="SignOf" Content="Выйти" Style="{StaticResource ButtonAct}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="SignOf_Click" HorizontalAlignment="Left"/>
             <Button Name="NewProduct" Content="Добавить продукт" Style="{StaticResource ButtonSt}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="NewProduct_Click" HorizontalAlignment="Left" Visibility="Collapsed" Loaded="NewProduct_Loaded"/>
-            <Button Name="OrdersUser" Content="Корзина" Style="{StaticResource ButtonSt}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="OrdersUser_Click" HorizontalAlignment="Left" Visibility="Collapsed" Loaded="OrdersUser_Loaded"/>
+            <Button Name="OrdersUser" Content="Заказы" Style="{StaticResource ButtonSt}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="OrdersUser_Click" HorizontalAlignment="Left" Visibility="Collapsed" Loaded="OrdersUser_Loaded"/>
+            <Button Name="OrderActUser" Content="Корзина" Style="{StaticResource ButtonSt}" Margin="10,0" MaxHeight="50" MinWidth="90" MaxWidth="150" Click="OrderActUser_Click"  HorizontalAlignment="Left" Visibility="Collapsed"/>
         </StackPanel>    
     </Grid>
 </Page>

+ 34 - 6
Sessioa/Pages/ProductsPage.xaml.cs

@@ -1,11 +1,11 @@
 using Sessioa.BaseModel;
 using Sessioa.Classes;
 using System.Collections.Generic;
+using System.Data.Entity;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using System.Data.Entity;
 
 namespace Sessioa.Pages
 {
@@ -15,6 +15,7 @@ namespace Sessioa.Pages
     public partial class ProductsPage : Page
     {
         List<Product> listProduct = BaseClass.C_Base.Product.Include(x => x.Manufacturer).ToList();
+        List<Product> listOrder = new List<Product>();
         User user = null;
         List<string> sort = new List<string>() { "Без сортировки", "По возрастанию", "По убыванию" };
         List<string> filtr = new List<string>() { "Все диапазоны", "0 - 9,99%", "10 - 14,99%", "15% >" };
@@ -30,9 +31,15 @@ namespace Sessioa.Pages
         public ProductsPage(User userSign)
         {
             InitializeComponent();
+            listOrder = (List<Product>)Application.Current.Properties["ListOrderUser"];
             user = userSign;
             UserSign.Text = $"Вход выолнен: {user.UserSurname} {user.UserName} {user.UserPatronymic}";
             Init();
+            if(listOrder.Count > 0)
+            {
+                OrderActUser.Visibility = Visibility.Visible;
+                OrderActUser.Content = $"Корзина({listOrder.Count})";
+            }
         }
         private void Init()
         {
@@ -96,11 +103,11 @@ namespace Sessioa.Pages
             {
                 if (CB_Sort.SelectedIndex == 1)
                 {
-                    listProduct = listProduct.OrderBy(x => x.ProductCost).ToList();
+                    listProduct = listProduct.OrderBy(x => (x.ProductDiscountAmount != null ? x.ProductCost - x.ProductCost * x.ProductDiscountAmount / 100 : x.ProductCost)).ToList();
                 }
                 if (CB_Sort.SelectedIndex == 2)
                 {
-                    listProduct = listProduct.OrderByDescending(x => x.ProductCost).ToList();
+                    listProduct = listProduct.OrderByDescending(x => (x.ProductDiscountAmount != null ? x.ProductCost - x.ProductCost * x.ProductDiscountAmount / 100 : x.ProductCost)).ToList();
                 }
             }
             if (CB_Filtr.SelectedIndex != 0)
@@ -135,6 +142,7 @@ namespace Sessioa.Pages
 
         private void SignOf_Click(object sender, RoutedEventArgs e)
         {
+            Application.Current.Properties["ListOrderUser"] = new List<Product>();
             FrameClass.C_Frame.Navigate(new Autorization());
         }
         private void ContextMenu_Loaded(object sender, RoutedEventArgs e)
@@ -165,7 +173,7 @@ namespace Sessioa.Pages
 
         private void NewProduct_Click(object sender, RoutedEventArgs e)
         {
-            FrameClass.C_Frame.Navigate (new ProductCard(user));
+            FrameClass.C_Frame.Navigate(new ProductCard(user));
         }
 
         private void NewProduct_Loaded(object sender, RoutedEventArgs e)
@@ -181,7 +189,7 @@ namespace Sessioa.Pages
             {
                 FrameClass.C_Frame.Navigate(new ProductCard(user, (Product)LB_Product.SelectedItem));
             }
-            catch 
+            catch
             {
                 MessageBox.Show("Непредвиденная ошибка.", "Ошибка", MessageBoxButton.OK, MessageBoxImage.Information);
             }
@@ -211,7 +219,9 @@ namespace Sessioa.Pages
             Button button = (Button)sender;
             if (user != null)
             {
-                if (BaseClass.C_Base.Order.Where(x=>x.UserID == user.UserID).Count() > 0)
+                if (user.UserRole == 2)
+                    button.Visibility = Visibility.Visible;
+                else if (BaseClass.C_Base.Order.Where(x => x.UserID == user.UserID).Count() > 0)
                     button.Visibility = Visibility.Visible;
             }
         }
@@ -220,5 +230,23 @@ namespace Sessioa.Pages
         {
             FrameClass.C_Frame.Navigate(new OrderNew(user));
         }
+
+        private void AddOrder_Click(object sender, RoutedEventArgs e)
+        {
+            if (listOrder.Contains((Product)LB_Product.SelectedItem))
+                MessageBox.Show("Данный товар уже находится в корзине", "Предупреждение", MessageBoxButton.OK, MessageBoxImage.Warning);
+            else
+            {
+                listOrder.Add((Product)LB_Product.SelectedItem);
+                OrderActUser.Content = $"Корзина({listOrder.Count})";
+            }
+            OrderActUser.Visibility = Visibility.Visible;
+        }
+
+        private void OrderActUser_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.Properties["ListOrderUser"] = listOrder;
+            FrameClass.C_Frame.Navigate(new OrderCard(user));
+        }
     }
 }

+ 7 - 0
Sessioa/Sessioa.csproj

@@ -129,6 +129,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\OrderCard.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\OrderNew.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -146,6 +150,9 @@
     <Compile Include="Pages\Autorization.xaml.cs">
       <DependentUpon>Autorization.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\OrderCard.xaml.cs">
+      <DependentUpon>OrderCard.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\OrderNew.xaml.cs">
       <DependentUpon>OrderNew.xaml</DependentUpon>
     </Compile>

BIN
Sessioa/bin/Debug/Sessioa.exe


BIN
Sessioa/bin/Debug/Sessioa.pdb


BIN
Sessioa/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


BIN
Sessioa/obj/Debug/Pages/OrderCard.baml


+ 205 - 0
Sessioa/obj/Debug/Pages/OrderCard.g.cs

@@ -0,0 +1,205 @@
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D391515CA45B2C79684D90E280978511C4FFF6BCE60B081F8F0B35197087B400"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Sessioa.Pages;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Sessioa.Pages {
+    
+    
+    /// <summary>
+    /// OrderCard
+    /// </summary>
+    public partial class OrderCard : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
+        
+        
+        #line 20 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Back;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 21 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListBox LB_ProductsOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 70 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_Itogo;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Save;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/Sessioa;component/pages/ordercard.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\..\Pages\OrderCard.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.B_Back = ((System.Windows.Controls.Button)(target));
+            
+            #line 20 "..\..\..\Pages\OrderCard.xaml"
+            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
+            this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
+            return;
+            case 9:
+            this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 10:
+            this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 11:
+            this.B_Save = ((System.Windows.Controls.Button)(target));
+            
+            #line 76 "..\..\..\Pages\OrderCard.xaml"
+            this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 3:
+            
+            #line 46 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 4:
+            
+            #line 47 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 5:
+            
+            #line 50 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 6:
+            
+            #line 60 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
+            
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 61 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 8:
+            
+            #line 62 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
+            
+            #line default
+            #line hidden
+            break;
+            }
+        }
+    }
+}
+

+ 205 - 0
Sessioa/obj/Debug/Pages/OrderCard.g.i.cs

@@ -0,0 +1,205 @@
+#pragma checksum "..\..\..\Pages\OrderCard.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D391515CA45B2C79684D90E280978511C4FFF6BCE60B081F8F0B35197087B400"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using Sessioa.Pages;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace Sessioa.Pages {
+    
+    
+    /// <summary>
+    /// OrderCard
+    /// </summary>
+    public partial class OrderCard : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
+        
+        
+        #line 20 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Back;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 21 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ListBox LB_ProductsOrder;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 70 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_ItogoSkidka;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 73 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBlock TB_Itogo;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 76 "..\..\..\Pages\OrderCard.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Save;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/Sessioa;component/pages/ordercard.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\..\Pages\OrderCard.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.B_Back = ((System.Windows.Controls.Button)(target));
+            
+            #line 20 "..\..\..\Pages\OrderCard.xaml"
+            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
+            this.LB_ProductsOrder = ((System.Windows.Controls.ListBox)(target));
+            return;
+            case 9:
+            this.TB_ItogoSkidka = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 10:
+            this.TB_Itogo = ((System.Windows.Controls.TextBlock)(target));
+            return;
+            case 11:
+            this.B_Save = ((System.Windows.Controls.Button)(target));
+            
+            #line 76 "..\..\..\Pages\OrderCard.xaml"
+            this.B_Save.Click += new System.Windows.RoutedEventHandler(this.B_Save_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 3:
+            
+            #line 46 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countPr_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 4:
+            
+            #line 47 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.countDPr_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 5:
+            
+            #line 50 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.Discount_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 6:
+            
+            #line 60 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Back_B_Click);
+            
+            #line default
+            #line hidden
+            break;
+            case 7:
+            
+            #line 61 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.CountProduct_Loaded);
+            
+            #line default
+            #line hidden
+            break;
+            case 8:
+            
+            #line 62 "..\..\..\Pages\OrderCard.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Next_B_Click);
+            
+            #line default
+            #line hidden
+            break;
+            }
+        }
+    }
+}
+

BIN
Sessioa/obj/Debug/Pages/OrderNew.baml


+ 19 - 2
Sessioa/obj/Debug/Pages/OrderNew.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "377D98C5E84B78305410BA6AFCB6B27FA26D2A1516779CEC5CB1DBEAF5C49ACD"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "35B21B75EB849F87A79AC8BC9A864EB5C2CE2FD2ABF3634C074A4FE53BA47216"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,6 +41,14 @@ namespace Sessioa.Pages {
     public partial class OrderNew : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
+        #line 17 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Back;
+        
+        #line default
+        #line hidden
+        
+        
         #line 18 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
@@ -79,6 +87,15 @@ namespace Sessioa.Pages {
             switch (connectionId)
             {
             case 1:
+            this.B_Back = ((System.Windows.Controls.Button)(target));
+            
+            #line 17 "..\..\..\Pages\OrderNew.xaml"
+            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
             this.LB_OrderProduct = ((System.Windows.Controls.ListBox)(target));
             return;
             }
@@ -94,7 +111,7 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 2:
+            case 3:
             
             #line 29 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);

+ 19 - 2
Sessioa/obj/Debug/Pages/OrderNew.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "377D98C5E84B78305410BA6AFCB6B27FA26D2A1516779CEC5CB1DBEAF5C49ACD"
+#pragma checksum "..\..\..\Pages\OrderNew.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "35B21B75EB849F87A79AC8BC9A864EB5C2CE2FD2ABF3634C074A4FE53BA47216"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -41,6 +41,14 @@ namespace Sessioa.Pages {
     public partial class OrderNew : System.Windows.Controls.Page, System.Windows.Markup.IComponentConnector, System.Windows.Markup.IStyleConnector {
         
         
+        #line 17 "..\..\..\Pages\OrderNew.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button B_Back;
+        
+        #line default
+        #line hidden
+        
+        
         #line 18 "..\..\..\Pages\OrderNew.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.ListBox LB_OrderProduct;
@@ -79,6 +87,15 @@ namespace Sessioa.Pages {
             switch (connectionId)
             {
             case 1:
+            this.B_Back = ((System.Windows.Controls.Button)(target));
+            
+            #line 17 "..\..\..\Pages\OrderNew.xaml"
+            this.B_Back.Click += new System.Windows.RoutedEventHandler(this.B_Back_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 2:
             this.LB_OrderProduct = ((System.Windows.Controls.ListBox)(target));
             return;
             }
@@ -94,7 +111,7 @@ namespace Sessioa.Pages {
         void System.Windows.Markup.IStyleConnector.Connect(int connectionId, object target) {
             switch (connectionId)
             {
-            case 2:
+            case 3:
             
             #line 29 "..\..\..\Pages\OrderNew.xaml"
             ((System.Windows.Controls.TextBlock)(target)).Loaded += new System.Windows.RoutedEventHandler(this.UserOrder_Loaded);

BIN
Sessioa/obj/Debug/Pages/ProductsPage.baml


+ 24 - 1
Sessioa/obj/Debug/Pages/ProductsPage.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "86C100D66E9C50140F19AB0C4114506A3771BE22BB329E547D1909148A22D59A"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "847F414E763CB014DA97A4CD88D3CEAF3CBA2C00BB7347758B122722CDA23B72"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -144,6 +144,14 @@ namespace Sessioa.Pages {
         #line default
         #line hidden
         
+        
+        #line 78 "..\..\..\Pages\ProductsPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button OrderActUser;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -187,6 +195,12 @@ namespace Sessioa.Pages {
             return;
             case 7:
             this.AddOrder = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 52 "..\..\..\Pages\ProductsPage.xaml"
+            this.AddOrder.Click += new System.Windows.RoutedEventHandler(this.AddOrder_Click);
+            
+            #line default
+            #line hidden
             return;
             case 8:
             this.EditProduct = ((System.Windows.Controls.MenuItem)(target));
@@ -290,6 +304,15 @@ namespace Sessioa.Pages {
             #line 77 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Loaded += new System.Windows.RoutedEventHandler(this.OrdersUser_Loaded);
             
+            #line default
+            #line hidden
+            return;
+            case 19:
+            this.OrderActUser = ((System.Windows.Controls.Button)(target));
+            
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
+            this.OrderActUser.Click += new System.Windows.RoutedEventHandler(this.OrderActUser_Click);
+            
             #line default
             #line hidden
             return;

+ 24 - 1
Sessioa/obj/Debug/Pages/ProductsPage.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "86C100D66E9C50140F19AB0C4114506A3771BE22BB329E547D1909148A22D59A"
+#pragma checksum "..\..\..\Pages\ProductsPage.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "847F414E763CB014DA97A4CD88D3CEAF3CBA2C00BB7347758B122722CDA23B72"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     Этот код создан программой.
@@ -144,6 +144,14 @@ namespace Sessioa.Pages {
         #line default
         #line hidden
         
+        
+        #line 78 "..\..\..\Pages\ProductsPage.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button OrderActUser;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -187,6 +195,12 @@ namespace Sessioa.Pages {
             return;
             case 7:
             this.AddOrder = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 52 "..\..\..\Pages\ProductsPage.xaml"
+            this.AddOrder.Click += new System.Windows.RoutedEventHandler(this.AddOrder_Click);
+            
+            #line default
+            #line hidden
             return;
             case 8:
             this.EditProduct = ((System.Windows.Controls.MenuItem)(target));
@@ -290,6 +304,15 @@ namespace Sessioa.Pages {
             #line 77 "..\..\..\Pages\ProductsPage.xaml"
             this.OrdersUser.Loaded += new System.Windows.RoutedEventHandler(this.OrdersUser_Loaded);
             
+            #line default
+            #line hidden
+            return;
+            case 19:
+            this.OrderActUser = ((System.Windows.Controls.Button)(target));
+            
+            #line 78 "..\..\..\Pages\ProductsPage.xaml"
+            this.OrderActUser.Click += new System.Windows.RoutedEventHandler(this.OrderActUser_Click);
+            
             #line default
             #line hidden
             return;

+ 1 - 1
Sessioa/obj/Debug/Sessioa.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-76c483d856c1514e502e18a24cd165e7142de0a3
+6c6e7fb39e0f59fb2f88d11695db3d7bac652f97

+ 2 - 0
Sessioa/obj/Debug/Sessioa.csproj.FileListAbsolute.txt

@@ -62,3 +62,5 @@ C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.Co
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.csproj.CopyComplete
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.exe
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Sessioa.pdb
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.g.cs
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\Pages\OrderCard.baml

BIN
Sessioa/obj/Debug/Sessioa.exe


BIN
Sessioa/obj/Debug/Sessioa.g.resources


BIN
Sessioa/obj/Debug/Sessioa.pdb


+ 3 - 3
Sessioa/obj/Debug/Sessioa_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml
-5-748272788
+6-99224500
 2-1121443055
-24728438797
+251484281289
 20-1197076445
-MainWindow.xaml;Pages\Autorization.xaml;Pages\OrderNew.xaml;Pages\ProductCard.xaml;Pages\ProductsPage.xaml;
+MainWindow.xaml;Pages\Autorization.xaml;Pages\OrderCard.xaml;Pages\OrderNew.xaml;Pages\ProductCard.xaml;Pages\ProductsPage.xaml;
 
 False
 

+ 6 - 6
Sessioa/obj/Debug/Sessioa_MarkupCompile.i.cache

@@ -4,17 +4,17 @@
 winexe
 C#
 .cs
-\\main\RDP\43П\шечковано\Desktop\gg\Sessioa\Sessioa\obj\Debug\
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\obj\Debug\
 Sessioa
 none
 false
 DEBUG;TRACE
-\\main\RDP\43П\шечковано\Desktop\gg\Sessioa\Sessioa\App.xaml
-5-748272788
+C:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml
+6-99224500
 2-1121443055
-25-1353649821
-20-1101847567
-MainWindow.xaml;Pages\Autorization.xaml;Pages\OrderNew.xaml;Pages\ProductCard.xaml;Pages\ProductsPage.xaml;
+26-597807329
+20-1197076445
+MainWindow.xaml;Pages\Autorization.xaml;Pages\OrderCard.xaml;Pages\OrderNew.xaml;Pages\ProductCard.xaml;Pages\ProductsPage.xaml;
 
 True
 

+ 7 - 3
Sessioa/obj/Debug/Sessioa_MarkupCompile.i.lref

@@ -1,5 +1,9 @@
 
-
-F\\main\RDP\43П\шечковано\Desktop\gg\Sessioa\Sessioa\Pages\ProductCard.xaml;;
-F\\main\RDP\43П\шечковано\Desktop\gg\Sessioa\Sessioa\Pages\ProductsPage.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\App.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\MainWindow.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\Autorization.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderCard.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderNew.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductCard.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductsPage.xaml;;
 

+ 1 - 0
Sessioa/obj/Debug/Sessioa_MarkupCompile.lref

@@ -5,4 +5,5 @@ FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\Autorization.xaml;;
 FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderNew.xaml;;
 FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductCard.xaml;;
 FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\ProductsPage.xaml;;
+FC:\Users\шечковано\Downloads\UP_wpf\Sessioa\Pages\OrderCard.xaml;;