Changeset 9641 for branches/OaaS/HeuristicLab.Services.Optimization.Billing/DataAccess

Timestamp:

06/18/13 11:39:31 (12 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

Location:

branches/OaaS/HeuristicLab.Services.Optimization.Billing/DataAccess

Files:

• BillingContext.cs (modified) (3 diffs)
• BillingDao.cs (modified) (1 diff)

branches/OaaS/HeuristicLab.Services.Optimization.Billing/DataAccess/BillingContext.cs

@@ -85 +85 @@
       internal UserConfiguration() {
         this.HasMany(u => u.PaymentInformation).WithRequired(pi => pi.User).HasForeignKey(pi => pi.UserId);
+        this.HasRequired(u => u.ContactInformation).WithMany().HasForeignKey(u => u.ContactInformationId);
       }
     }
@@ -97 +98 @@
       protected override void Seed(BillingContext context) {
         Product p1 = new Product() {
-          Name = "OaaS BAsic Service Charge",
+          Name = "OaaS Basic Service Charge",
           Description = "Create and run your experiments within HeuristicLab Hive",
           Price = 20.0,
@@ -137 +138 @@
           LastName = "Mustermann",
           Email = "max.mustermann@fh-hagenberg.at",
-          OrganizationName = "University of Applied Sciences Upper Austria School of Informatics/Communications/Media",
+          OrganizationName = "University of Applied Sciences Upper Austria " + Environment.NewLine + "School of Informatics/Communications/Media",
           Street = "Softwarepark 11",
           PostalCode = "4232",
-          City = "Hagenberg"
+          City = "Hagenberg",
         };
 
         ci1 = context.ContactInformations.Add(ci1);
+        u1.ContactInformation = ci1;
+
+        ContactInformation ci2 = new ContactInformation() {
+          FirstName = "Max",
+          LastName = "Mustermann",
+          Email = "max.mustermann@fh-hagenberg.at",
+          OrganizationName = "University of Applied Sciences Upper Austria " + Environment.NewLine + "School of Informatics/Communications/Media",
+          Street = "Softwarepark 11",
+          PostalCode = "4232",
+          City = "Hagenberg",
+        };
+
+        ci2 = context.ContactInformations.Add(ci2);
+        u2.ContactInformation = ci2;
 
         Order o1 = new Order() {

branches/OaaS/HeuristicLab.Services.Optimization.Billing/DataAccess/BillingDao.cs

@@ -109 +109 @@
           .Include(o => o.OrderLines)
           .Include(o => o.User)
+          .Include(o => o.User.ContactInformation)
           .Include(o => o.Invoices)
           .Include(o => o.OrderLines.Select(ol => ol.Product))