diff --git a/TicketSystem/Order.cs b/TicketSystem/Order.cs index 4fa585d..936bdd5 100644 --- a/TicketSystem/Order.cs +++ b/TicketSystem/Order.cs @@ -38,7 +38,7 @@ namespace TicketSystem price += t.price; break; case TicketType.Adult: - t = new Adult(); + t = new Ticket(); tickets.Add(t); price += t.price; break; diff --git a/TicketSystem/TicketSystem.csproj b/TicketSystem/TicketSystem.csproj index dd1b6ab..2952e6b 100644 --- a/TicketSystem/TicketSystem.csproj +++ b/TicketSystem/TicketSystem.csproj @@ -42,7 +42,6 @@ - diff --git a/TicketSystem/Tickets/Adult.cs b/TicketSystem/Tickets/Adult.cs deleted file mode 100644 index 311d415..0000000 --- a/TicketSystem/Tickets/Adult.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace TicketSystem.Tickets -{ - public class Adult: Ticket - { - public int price { get; } - - public Adult() - { - price = 20; - } - - public int PriceWithReduction() - { - return price - price/100*20; - } - } -} \ No newline at end of file diff --git a/TicketSystem/Tickets/Ticket.cs b/TicketSystem/Tickets/Ticket.cs index 339d42c..7fac2c3 100644 --- a/TicketSystem/Tickets/Ticket.cs +++ b/TicketSystem/Tickets/Ticket.cs @@ -7,9 +7,17 @@ Adult } - public interface Ticket + public class Ticket { - int price { get; } - int PriceWithReduction(); + public int price { get; } + public Ticket() + { + price = 20; + } + + public int PriceWithReduction() + { + return price - price/100*20; + } } } \ No newline at end of file