Zbiór zmian 760 dla branches

Data:

2009-07-21 16:28:24 (17 years ago)

Autor:

marek

Opis:

re #184 - poprawiono model i fakturowanie

Lokalizacja:

branches/Abonament/BazaReklam

Pliki:

• Classes/Model/Subscription.cs (zmodyfikowane) (1 diff)
• Classes/Model/SubscriptionDetail.cs (zmodyfikowane) (3 diffs)
• Classes/Repositories/CustomerRepository.cs (zmodyfikowane) (3 diffs)
• Classes/Repositories/ProductRepository.cs (zmodyfikowane) (1 diff)
• SubscriptionForm.cs (zmodyfikowane) (3 diffs)
• ZamowieniaForm.cs (zmodyfikowane) (5 diffs)

branches/Abonament/BazaReklam/Classes/Model/Subscription.cs

@@ -35 +35 @@
         }
 
-        public Subscription(int id, Guid guid, int customerId, int titleId, int subscriptionTypeId, int subscriptionItems, decimal basePrice, decimal totalPrice, decimal discount, decimal vat, string currency, int orderId, DateTime createdOn, int createdBy, DateTime updatedOn, int updatedBy, DateTime startDate)
-        {
-            _id = id;
-            _titleId = titleId;
-            _startDate = startDate;
-            _updatedBy = updatedBy;
-            _updatedOn = updatedOn;
-            _createdBy = createdBy;
-            _createdOn = createdOn;
-            _orderId = orderId;
-            _currency = currency;
-            _basePrice = basePrice;
-            _totalPrice = totalPrice;
-            _vat = vat;
-            _discount = discount;
-            _subscriptionItems = subscriptionItems;
-            _subscriptionTypeId = subscriptionTypeId;
-            _customerId = customerId;
-            _guid = guid;
-        }
-
         public int Id
         {
             get { return _id; }
             //set { _id = value; }
-        }
-
-        public int TitleId
-        {
-            get { return _titleId; }
-            set { _titleId = value; }
         }
 

branches/Abonament/BazaReklam/Classes/Model/SubscriptionDetail.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Baza_Reklam.Classes.Model
 {
@@ -11 +7 @@
         private decimal _price;
         private decimal _pricePln;
-        private decimal _vat;
         private int _year;
         private int _month;
-
-        public SubscriptionDetail () { }
-
-        public SubscriptionDetail(int id, int subscriptionId, decimal price, decimal pricePln, decimal vat, int year, int month)
-        {
-            _id = id;
-            _month = month;
-            _year = year;
-            _vat = vat;
-            _pricePln = pricePln;
-            _price = price;
-            _subscriptionId = subscriptionId;
-        }
 
         public int Id
@@ -51 +33 @@
         }
 
-        public decimal Vat
-        {
-            get { return _vat; }
-            set { _vat = value; }
-        }
-
         public int Year
         {

branches/Abonament/BazaReklam/Classes/Repositories/CustomerRepository.cs

@@ -3 +3 @@
 using System.Data;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using Baza_Reklam.Classes.Interfaces;
 using Baza_Reklam.Classes.Model;
@@ -45 +44 @@
                                  + "SELECT SCOPE_IDENTITY();";
 
-            const string insertSubscriptionDetailQuery = "INSERT INTO SubscriptionDetail(SubscriptionId, Price, PricePln, Vat, [Year], [Month]) "
-                                                         + "VALUES(@subscriptionId, @price, @pricePln, @vat, @year, @month) "
+            const string insertSubscriptionDetailQuery = "INSERT INTO SubscriptionDetail(SubscriptionId, Price, PricePln, [Year], [Month]) "
+                                                         + "VALUES(@subscriptionId, @price, @pricePln, @year, @month) "
                                                          + "SELECT SCOPE_IDENTITY();";
 
@@ -91 +90 @@
                         sqlCommand.Parameters.AddWithValue("@price", subscriptionDetail.Price);
                         sqlCommand.Parameters.AddWithValue("@pricePln", subscriptionDetail.PricePln);
-                        sqlCommand.Parameters.AddWithValue("@vat", subscriptionDetail.Vat);
                         sqlCommand.Parameters.AddWithValue("@year", subscriptionDetail.Year);
                         sqlCommand.Parameters.AddWithValue("@month", subscriptionDetail.Month);

branches/Abonament/BazaReklam/Classes/Repositories/ProductRepository.cs

@@ -41 +41 @@
         public List<IProduct> FindProductsToInvoice(List<IProduct> products, InvoicingType invoicingType, DateTime date)
         {
-            string query = "SELECT PD.Id, P.Id, PD.Price, PD.PricePLN, PD.Vat, PD.InvoiceId, [Year], [Month] FROM SubscriptionDetail PD "
+            string query = "SELECT PD.Id, P.Id, PD.Price, PD.PricePLN, P.Vat, PD.InvoiceId, [Year], [Month] FROM SubscriptionDetail PD "
                            + "INNER JOIN Subscription P ON P.Id=PD.SubscriptionId "
                            + "WHERE PD.InvoiceId IS NULL ";

branches/Abonament/BazaReklam/SubscriptionForm.cs

@@ -133 +133 @@
             subscription.Guid = Guid.NewGuid();
             subscription.SubscriptionTypeId = CurrentSubscriptionType.Id;
-            subscription.TitleId = CurrentSubscriptionType.TitleId;
             subscription.SubscriptionItems = (int)numSubscriptionCount.Value;
-
-            subscription.BasePrice = cbCurrency.SelectedItem.ToString() == "PLN"
+            subscription.Currency = cbCurrency.SelectedItem.ToString();
+            subscription.BasePrice = subscription.Currency == "PLN"
                                           ? Decimal.Parse(txtPricePln.Text)
                                           : Decimal.Parse(txtPriceEur.Text);
@@ -146 +145 @@
                                           : (decimal) VatHelper.EU00;
 
-            subscription.TotalPrice = cbCurrency.SelectedItem.ToString() == "PLN"
+            subscription.TotalPrice = subscription.Currency == "PLN"
                                           ? Decimal.Parse(txtTotalPricePln.Text)
                                           : Decimal.Parse(txtTotalPriceEur.Text);
 
-            subscription.Currency = cbCurrency.SelectedItem.ToString();
             subscription.CreatedBy = User.Instance().Id;
             subscription.CreatedOn = DateTime.Now;
@@ -164 +162 @@
                 subscriptionDetail.Price = subscription.BasePrice * (1 - subscription.Discount);
                 subscriptionDetail.PricePln = Decimal.Parse(txtPricePln.Text) * (1 - subscription.Discount);
-
-                subscriptionDetail.Vat = subscription.Vat;
-
                 subscription.AddSubscriptionDetail(subscriptionDetail);
             }

branches/Abonament/BazaReklam/ZamowieniaForm.cs

@@ -304 +304 @@
                 }
 
-                List<IProduct> subscriptionsToInvoice = GetSubscriptionsToInvoice(productsWithOrder);
+                InvoicingType invoicingType = GetInvoicingType(zamowienie);
+
+                List<IProduct> subscriptionsToInvoice = GetSubscriptionsToInvoice(productsWithOrder, invoicingType);
 
                 WystawFakture(zamowienie, klient, subscriptionsToInvoice, false);
@@ -317 +319 @@
             {
                 Cursor = Cursors.Default;
+            }
+        }
+
+        private static InvoicingType GetInvoicingType(REKLAMADataSet.zamowieniaRow zamowienie)
+        {
+            switch (zamowienie.rodzajFakturowania)
+            {
+                case 0:
+                    return InvoicingType.OneMonth;
+                case 1:
+                    return InvoicingType.ThreeMonths;
+                default:
+                    return InvoicingType.All;
+
             }
         }
@@ -1399 +1415 @@
             try
             {
-                List<IProduct> subscriptionsToInvoice = GetSubscriptionsToInvoice(productsWithOrder);
+                InvoicingType invoicingType = GetInvoicingType(zamowienie);
+
+                List<IProduct> subscriptionsToInvoice = GetSubscriptionsToInvoice(productsWithOrder, invoicingType);
 
                 id = WystawFakture(zamowienie, klient, subscriptionsToInvoice, true);
@@ -1426 +1444 @@
         }
 
-        private List<IProduct> GetSubscriptionsToInvoice(List<IProduct> products)
+        private List<IProduct> GetSubscriptionsToInvoice(List<IProduct> products, InvoicingType invoicingType)
         {
             ProductRepository productRepository = new ProductRepository(ConnString.getConnString().Value);
@@ -1434 +1452 @@
             
             DateTime date = productRepository.FindFirstDateForInvoice(subscriptions);
-            List<IProduct> subscriptionsToInvoice = productRepository.FindProductsToInvoice(subscriptions, InvoicingType.ThreeMonths, date);
+            List<IProduct> subscriptionsToInvoice = productRepository.FindProductsToInvoice(subscriptions, invoicingType, date);
             return subscriptionsToInvoice;
         }