Changeset 9641 for branches/OaaS/HeuristicLab.Services.Optimization.Billing/BillingEngine/BillingEngine.cs

Timestamp:

06/18/13 11:39:31 (11 years ago)

Author:

spimming

Message:

#1888:

• Users now contain ContactInformation
• Fixed formatting in invoice template
• Fixed calculation for next invoice date
• Worked on indentation for invoice fields

File:

• branches/OaaS/HeuristicLab.Services.Optimization.Billing/BillingEngine/BillingEngine.cs (modified) (6 diffs)

branches/OaaS/HeuristicLab.Services.Optimization.Billing/BillingEngine/BillingEngine.cs

@@ -53 +53 @@
         try {
           Trace.WriteLine("[BillingEngine] Start billing cycle");
-          //currentDate = DateTime.Parse(DateTime.Now.ToShortDateString());
           currentDate = DateTime.Now.Date;
           Trace.WriteLine(string.Format("[BillingEngine] Current date: {0}", currentDate));
@@ -60 +59 @@
           foreach (Order order in activeOrders) {
             if (!order.NextBillableDay.HasValue) {
-              // there has never been an invoice generated from this order 
+              // An invoice has never been generated from this order 
               order.NextBillableDay = currentDate;
             }
@@ -83 +82 @@
                 invoiceLine.Product = orderLine.Product;
                 invoiceLine.ProductPrice = orderLine.ProductPrice;
-                invoiceLine.Quantity = invoiceLine.Quantity;
+                invoiceLine.Quantity = orderLine.Quantity;
                 invoice.InvoiceLines.Add(invoiceLine);
               }
@@ -90 +89 @@
               usageCharges.Invoice = invoice;
               usageCharges.Product = billingService.GetProductByName("Oaas Usage Charges").First();
-              usageCharges.ProductPrice = 999.99;
+              usageCharges.ProductPrice = -999.99;
               usageCharges.Quantity = 1;
               invoice.InvoiceLines.Add(usageCharges);
 
               // Bill Post Processing: Apply Discounts or Promotions
-              // eg. add discounts
-              // sum up items to sub-total, calc. tax -> total current charges
+              // add discounts, sum up items to sub-total, calc. tax -> total current charges
+              // maybe use windows workflow foundation for this task 
 
               // Invoice Formatting Engine: Generate Invoice 
@@ -117 +116 @@
 
     private void UpdateBillingState(Order order) {
-      if (order.ActiveUntil != null && order.ActiveUntil == order.NextBillableDay) {
-        order.NextBillableDay = null;
-        order.State = OrderState.Finished;
+      if (order.BillingType == BillingType.Pre) {
+        throw new Exception("This billing type is currently not supported: " + order.BillingType);
       }
 
       DateTime nextBillingDay = CalculateNextBillingDate(order);
 
-      if (order.ActiveUntil != null && order.ActiveUntil < nextBillingDay) {
+      if (order.ActiveUntil.HasValue && order.ActiveUntil == currentDate) {
+        order.State = OrderState.Finished;
+        order.NextBillableDay = null;
+      } else if (order.ActiveUntil.HasValue && order.ActiveUntil < nextBillingDay) {
+        order.NextBillableDay = order.ActiveUntil;
+      } else {
         order.NextBillableDay = nextBillingDay;
       }
@@ -133 +136 @@
 
       if (order.BillingPeriod == BillingPeriod.Weekly) {
-        nextBillingDay = nextBillingDay.AddDays(7);
+        nextBillingDay = Next(currentDate, DayOfWeek.Sunday);
       } else if (order.BillingPeriod == BillingPeriod.Monthly) {
-        if (order.BillingType == BillingType.Pre) {
-          nextBillingDay = nextBillingDay.AddDays(DateTime.DaysInMonth(nextBillingDay.Year, nextBillingDay.Month) + 1);
-        } else if (order.BillingType == BillingType.Post) {
-          if (nextBillingDay.Month == 12) {
-            nextBillingDay = nextBillingDay.AddDays(DateTime.DaysInMonth(nextBillingDay.Year + 1, 1) + 1);
-          } else {
-            nextBillingDay = nextBillingDay.AddDays(DateTime.DaysInMonth(nextBillingDay.Year, nextBillingDay.Month + 1) + 1);
-          }
-        }
+        DateTime endOfNextMonth = new DateTime(
+          currentDate.AddMonths(1).Year,
+          currentDate.AddMonths(1).Month,
+          DateTime.DaysInMonth(currentDate.AddMonths(1).Year, currentDate.AddMonths(1).Month));
+        nextBillingDay = endOfNextMonth;
       } else if (order.BillingPeriod == BillingPeriod.Yearly) {
-        if (order.BillingType == BillingType.Pre) {
-          nextBillingDay = new DateTime(DateTime.Now.Year + 1, 1, 1);
-        } else if (order.BillingType == BillingType.Post) {
-          nextBillingDay = new DateTime(DateTime.Now.Year + 1, 12, 31);
-        }
+        nextBillingDay = new DateTime(currentDate.AddYears(1).Year, 12, 31);
       }
 
       return nextBillingDay;
     }
+
+    private DateTime Next(DateTime from, DayOfWeek dayOfWeek) {
+      int start = (int)from.DayOfWeek;
+      int target = (int)dayOfWeek;
+      if (target <= start)
+        target += 7;
+      return from.AddDays(target - start);
+    }
   }
 }