|
Index: trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 885)
+++ trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs (revision 888)
@@ -33,4 +33,5 @@
private string err_imie;
private string err_nazwisko;
+ private int test = 0;
public PlatnoscController()
@@ -42,5 +43,5 @@
}
- public PlatnoscController(IDataContext datacontext)
+ public PlatnoscController(IDataContext datacontext, int czy_test)
{
_rep = new Repository(datacontext);
@@ -48,9 +49,10 @@
_context1 = datacontext;
_func = new FunkcjePlatnosci();
+ test = czy_test;
}
public ActionResult Show(string id, string language)
{
language = _func.setLanguage(language);
- ustawTlumaczenia();
+ ustawTlumaczenia(test);
int id1 = ConvertId(id);
@@ -71,5 +73,5 @@
return View("Paid", invoiceDeatailsViewData);
}
- return View(invoiceDeatailsViewData);
+ return View(invoiceDeatailsViewData);
}
[Authorize]
@@ -78,5 +80,5 @@
{
language = _func.setLanguage(language);
- ustawTlumaczenia();
+ ustawTlumaczenia(test);
vPlatnosciEcard platnosc = _rep.FindInvoiceById(payer.Id_faktury).SingleOrDefault();
if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc));
@@ -107,5 +109,5 @@
{
language = _func.setLanguage(language);
- ustawTlumaczenia();
+ ustawTlumaczenia(test);
int id1 = ConvertId(id);
vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
@@ -118,5 +120,5 @@
{
language = _func.setLanguage(language);
- ustawTlumaczenia();
+ ustawTlumaczenia(test);
int id1 = ConvertId(id);
vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault();
@@ -182,11 +184,14 @@
return invoiceDeatailsViewData;
}
- private void ustawTlumaczenia()
- {
- weryfikacja = HttpContext.GetGlobalResourceObject("tlumaczenia", "weryfikacja").ToString();
- brakdanych = HttpContext.GetGlobalResourceObject("tlumaczenia", "brakdanych").ToString();
- zaplacono = HttpContext.GetGlobalResourceObject("tlumaczenia", "zaplacono").ToString();
- err_imie = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_imieWK").ToString();
- err_nazwisko = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_nazwiskoWK").ToString();
+ private void ustawTlumaczenia(int test)
+ {
+ if (test == 0)
+ {
+ weryfikacja = Resources.tlumaczenia.weryfikacja.ToString();
+ brakdanych = Resources.tlumaczenia.brakdanych.ToString();
+ zaplacono = Resources.tlumaczenia.zaplacono.ToString();
+ err_imie = Resources.tlumaczenia.err_imieWK.ToString();
+ err_nazwisko = Resources.tlumaczenia.err_nazwiskoWK.ToString();
+ }
}
public void setWeryfikacja(string value)
@@ -224,10 +229,12 @@
public void UpdateStatus(int ordernumber, string currentstate)
{
- var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault();
- if (platnosc != null && platnosc.Status == true && currentstate == ISPAID)
+ PlatnosciEcard platnosc = _repPl.FindOne(ordernumber);
+ if (platnosc != null && currentstate == ISPAID)
{
platnosc.Status = true;
platnosc.Status_data = DateTime.Now;
- _repPl.Update(platnosc);
+ _repPl.SubmitChanges();
+
+ System.Diagnostics.Debug.WriteLine("IsUpdate");
}
}
Index: trunk/eCard/eCardMVC/Platnosci/Content/Site.css
===================================================================
--- trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 886)
+++ trunk/eCard/eCardMVC/Platnosci/Content/Site.css (revision 888)
@@ -13,5 +13,5 @@
line-height: 1.6em;
}
-h1, h2, h4, h5, h6
+h1, h2, h5, h6
{
font-size: 1.5em;
@@ -35,8 +35,11 @@
font-family: Arial, Helvetica, sans-serif;
}
-h4
-{
- padding: 0 0 0 0;
+.Tytul
+{
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 1.5em;
+ padding: 20px 0 0 0;
color:#E00000;
+ font-weight: bold;
}
h5, h6
@@ -78,5 +81,5 @@
#main
{
- padding: 30px 30px 15px 30px;
+ padding: 0px 30px 15px 30px;
background-color: #fff;
margin-bottom: 30px;
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 882)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj (revision 888)
@@ -97,5 +97,5 @@
-
+
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 883)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs (revision 888)
@@ -31,4 +31,6 @@
private string testNumerFaktury = "abcd";
private decimal testBrutto = 200;
+ private int test = 1; //oznacza, ze nie ustawiamy tlumaczen poprzez funkcje ustawTlumaczenia()
+ //w controllerze Platnosci, tylko poprzez funkcje setXXXXXXX()
private Function _f = new Function();
@@ -39,33 +41,43 @@
public void Status_Saves_Correct_Transaction()
{
+ // //IDataContext fake = new FakeDataContext();
+ // var repository = new Repository(new FakeDataContext());
+ // var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); //new PlatnosciEcard();
+ // repository.Insert(platnosci);
+ // repository.SubmitChanges();
+
+
+ // DateTime datka = DateTime.Now;
+ // var builder = new TestControllerBuilder();
+ // var controller = new PlatnoscController(fake,test);
+ // builder.InitializeController(controller);
+ // builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
+ // builder.Form.Add("AUTHTIME", DateTime.Now.ToString());
+ // builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString());
+ // builder.Form.Add("ORDERNUMBER", orderNumber.ToString());
+ // builder.Form.Add("CURRENTSTATE", code_Ok);
+
+ // var result = controller.Status();
+
+ // IRepository _rep = new Repository(new FakeDataContext());
+
+
+ // System.Diagnostics.Debug.WriteLine("" + _rep.Count());
+
+ // //var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First();
+ //// Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
+ // PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault();
+ // System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka);
+ // Assert.That(payment_after_update.Status, Is.EqualTo(true));
+
+ }
+ [Test]
+ [Category("Unit")]
+ public void Status_Saves_Correct_Transaction_IncorrectUpdate()
+ {
FakeDataContext fake = new FakeDataContext(2);
DateTime datka = DateTime.Now;
var builder = new TestControllerBuilder();
- var controller = new PlatnoscController(fake);
- builder.InitializeController(controller);
- builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
- builder.Form.Add("AUTHTIME", DateTime.Now.ToString());
- builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString());
- builder.Form.Add("ORDERNUMBER", orderNumber.ToString());
- builder.Form.Add("CURRENTSTATE", code_Ok);
-
- var result = controller.Status();
-
- IRepository _rep = new Repository(fake);
- var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First();
- Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
- PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault();
- System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka);
- Assert.That(payment_after_update.Status_data, Is.GreaterThan(datka));
-
- }
- [Test]
- [Category("Unit")]
- public void Status_Saves_Correct_Transaction_IncorrectUpdate()
- {
- FakeDataContext fake = new FakeDataContext(2);
- DateTime datka = DateTime.Now;
- var builder = new TestControllerBuilder();
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
builder.InitializeController(controller);
builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString());
@@ -81,4 +93,5 @@
Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber));
+
PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault();
System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " <= " + datka );
@@ -89,28 +102,30 @@
public void StatusIsUpdated()
{
- FakeDataContext fake = new FakeDataContext();
+ FakeDataContext fake = new FakeDataContext(3);
IRepository _rep = new Repository(fake);
+ PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data.AddDays(-1), 1);
+ _rep.Insert(platnosc);
+
+ DateTime datka = DateTime.Now;
+ var controller = new PlatnoscController(fake,test);
+ controller.UpdateStatus(orderNumber, code_Ok);
+
+ PlatnosciEcard payment_after_update = new PlatnosciEcard();
+ payment_after_update = _rep.FindOne(orderNumber);
+
+ Assert.That(payment_after_update.Status, Is.EqualTo(true));
+ }
+ [Test]
+ [Category("Unit")]
+ public void StatusIsNotUpdated()
+ {
+ FakeDataContext fake = new FakeDataContext();
+ IRepository _rep = new Repository(fake);
+
PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1);
_rep.Insert(platnosc);
- var controller = new PlatnoscController(fake);
- controller.UpdateStatus(orderNumber, code_Ok);
-
- PlatnosciEcard payment_after_update = new PlatnosciEcard();
- payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber);
- Assert.That(payment_after_update.Status_data, Is.GreaterThan(data));
- }
- [Test]
- [Category("Unit")]
- public void StatusIsNotUpdated()
- {
- FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1);
- _rep.Insert(platnosc);
-
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
controller.UpdateStatus(orderNumber, code_Bad);
@@ -129,5 +144,5 @@
_rep.Insert(platnosc);
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
controller.ControllerContext = _f.createControllerContext(testNip2);
controller.setWeryfikacja("Niepoprawny nip");
@@ -144,7 +159,7 @@
{
FakeDataContext fake = new FakeDataContext();
- IRepository _rep = new Repository(fake);
-
- var controller = new PlatnoscController(fake);
+ // IRepository _rep = new Repository(fake);
+
+ var controller = new PlatnoscController(fake,test);
controller.ControllerContext = _f.createControllerContext(testNip1);
@@ -162,5 +177,5 @@
//Tworzymy takie dane aby platnosc o danym id byla juz zaplacona
FakeDataContext fake = new FakeDataContext(1);
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
controller.ControllerContext = _f.createControllerContext(testNip1);
@@ -168,8 +183,8 @@
var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult;
- var error = (ErrorViewData)result.ViewData.Model;
-
- Assert.That(result.ViewName, Is.EqualTo("Error1"));
- Assert.That(error.error, Is.EqualTo("Platnosc zostala uregulowana"));
+ var view = (InvoiceDetailsViewData)result.ViewData.Model;
+
+ Assert.That(result.ViewName, Is.EqualTo("Paid"));
+ Assert.That(view.info, Is.EqualTo("Platnosc zostala uregulowana"));
}
[Test]
@@ -183,5 +198,5 @@
_rep.Insert(platnosc);
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
controller.ControllerContext = _f.createControllerContext(testNip1);
@@ -203,5 +218,5 @@
_rep.Insert(platnosc);
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,1);
controller.ControllerContext = _f.createControllerContext(testNip1);
@@ -221,5 +236,5 @@
_rep.Insert(platnosc);
- var controller = new PlatnoscController(fake);
+ var controller = new PlatnoscController(fake,test);
controller.ControllerContext = _f.createControllerContext(testNip1);
Index: trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs
===================================================================
--- trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 883)
+++ trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs (revision 888)
@@ -48,32 +48,54 @@
listaPlatnosci.Add(DodajPlatnosc(2, "2", "aaa"));
}
- public FakeDataContext(int i)
- {
- if (i == 1)
- {
- listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345"));
- listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000));
- listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999));
- }
- else if (i == 2)
- {
- listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000));
- }
- }
+ //public FakeDataContext(int fake)
+ //{
+ // if (fake == 1)
+ // {
+ // listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345"));
+ // listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000));
+ // listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999));
+ // }
+ // else if (fake == 2)
+ // {
+ // listaPl.Add(createNewPayment(9999, false, DateTime.Now, 1000));
+ // }
+ //}
+
+
+ private readonly List |