Zbiór zmian 888 dla trunk/eCard
- Data:
- 2009-11-23 16:27:53 (16 years ago)
- Lokalizacja:
- trunk/eCard/eCardMVC
- Pliki:
-
- 12 zmodyfikowane
-
Platnosci.Core/Interface/IRepository.cs (zmodyfikowane) (1 diff)
-
Platnosci.Core/Linq/Repository.cs (zmodyfikowane) (1 diff)
-
Platnosci.Tests/Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
-
Platnosci.Tests/Web/FakeDataContext.cs (zmodyfikowane) (2 diffs)
-
Platnosci.Tests/Web/Function.cs (zmodyfikowane) (1 diff)
-
Platnosci.Tests/Web/PlatnosciControllerTests.cs (zmodyfikowane) (11 diffs)
-
Platnosci/Content/Site.css (zmodyfikowane) (3 diffs)
-
Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (9 diffs)
-
Platnosci/Views/Platnosc/Paid.aspx (zmodyfikowane) (1 diff)
-
Platnosci/Views/Platnosc/Show.aspx (zmodyfikowane) (1 diff)
-
Platnosci/Views/Shared/Site.Master (zmodyfikowane) (1 diff)
-
Platnosci/Web.config (zmodyfikowane) (1 diff)
Legenda:
- Bez zmian
- Dodane
- Usunięte
-
trunk/eCard/eCardMVC/Platnosci.Core/Interface/IRepository.cs
r877 r888 18 18 void Delete(T entity); 19 19 20 void Update(T entity);20 void SubmitChanges(); 21 21 22 22 T FindOne(int id); -
trunk/eCard/eCardMVC/Platnosci.Core/Linq/Repository.cs
r877 r888 66 66 public void Delete(T entity) 67 67 { 68 _dataContext.Insert(entity);68 throw new NotImplementedException(); 69 69 } 70 public void Update(T entity)70 public void SubmitChanges() 71 71 { 72 72 _dataContext.SubmitChanges(); -
trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj
r882 r888 97 97 </ItemGroup> 98 98 <ItemGroup> 99 < ContentInclude="app.config" />99 <None Include="app.config" /> 100 100 </ItemGroup> 101 101 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/FakeDataContext.cs
r883 r888 48 48 listaPlatnosci.Add(DodajPlatnosc(2, "2", "aaa")); 49 49 } 50 public FakeDataContext(int i) 51 { 52 if (i == 1) 53 { 54 listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345")); 55 listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); 56 listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999)); 57 } 58 else if (i == 2) 59 { 60 listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); 61 } 62 } 50 //public FakeDataContext(int fake) 51 //{ 52 // if (fake == 1) 53 // { 54 // listaPlatnosci.Add(DodajPlatnosc(1000, "abcd", "12345")); 55 // listaPl.Add(createNewPayment(9999, true, DateTime.Now, 1000)); 56 // listaPotwierdzenia.Add(DodajPotwierdzenie(code_Ok, 9999)); 57 // } 58 // else if (fake == 2) 59 // { 60 // listaPl.Add(createNewPayment(9999, false, DateTime.Now, 1000)); 61 // } 62 //} 63 64 65 private readonly List<object> _dataStore = new List<object>(); 66 63 67 public IQueryable<T> GetTable<T>() where T : class 64 68 { 65 var query = from objects in lista 66 where typeof(T).IsAssignableFrom(objects.GetType()) 67 select objects; 68 return query.Select(o => (T)o).AsQueryable(); 69 var query = _dataStore.Where(objects => typeof(T).IsAssignableFrom(objects.GetType())); 70 return query.Select(o => (T)o).AsQueryable(); 69 71 } 72 70 73 public void Insert<T>(T item) where T : class 71 74 { 72 lista.Add(item);75 _dataStore.Add(item); 73 76 } 77 74 78 public void Delete<T>(T item) where T : class 75 79 { 76 lista.Remove(item);80 _dataStore.Remove(item); 77 81 } 82 83 public void SubmitChanges() 84 { 85 InvokeCompleted(EventArgs.Empty); 86 } 87 88 public event EventHandler Completed; 89 90 private void InvokeCompleted(EventArgs e) 91 { 92 var completedHandler = Completed; 93 if (completedHandler != null) completedHandler(this, e); 94 } 95 96 public void Dispose() 97 { 98 } 99 78 100 public IQueryable<vPlatnosciEcard> FindInvoiceById(int id) 79 101 { … … 132 154 return query.AsQueryable(); 133 155 } 134 public void SubmitChanges()135 {136 137 }138 139 156 } 140 157 } -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/Function.cs
r882 r888 48 48 mock.SetupGet(m => m.HttpContext.User.Identity.Name).Returns(UserIdentity); 49 49 mock.SetupGet(m => m.HttpContext.Request.IsAuthenticated).Returns(true); 50 50 51 51 return mock.Object; 52 52 } -
trunk/eCard/eCardMVC/Platnosci.Tests/Web/PlatnosciControllerTests.cs
r883 r888 31 31 private string testNumerFaktury = "abcd"; 32 32 private decimal testBrutto = 200; 33 private int test = 1; //oznacza, ze nie ustawiamy tlumaczen poprzez funkcje ustawTlumaczenia() 34 //w controllerze Platnosci, tylko poprzez funkcje setXXXXXXX() 33 35 34 36 private Function _f = new Function(); … … 39 41 public void Status_Saves_Correct_Transaction() 40 42 { 43 // //IDataContext fake = new FakeDataContext(); 44 // var repository = new Repository<PlatnosciEcard>(new FakeDataContext()); 45 // var platnosci = _f.createNewPayment(orderNumber, false, DateTime.Now, 12345); //new PlatnosciEcard(); 46 // repository.Insert(platnosci); 47 // repository.SubmitChanges(); 48 49 50 // DateTime datka = DateTime.Now; 51 // var builder = new TestControllerBuilder(); 52 // var controller = new PlatnoscController(fake,test); 53 // builder.InitializeController(controller); 54 // builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); 55 // builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); 56 // builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); 57 // builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); 58 // builder.Form.Add("CURRENTSTATE", code_Ok); 59 60 // var result = controller.Status(); 61 62 // IRepository<PotwierdzeniaEcard> _rep = new Repository<PotwierdzeniaEcard>(new FakeDataContext()); 63 64 65 // System.Diagnostics.Debug.WriteLine("" + _rep.Count()); 66 67 // //var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); 68 //// Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); 69 // PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); 70 // System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka); 71 // Assert.That(payment_after_update.Status, Is.EqualTo(true)); 72 73 } 74 [Test] 75 [Category("Unit")] 76 public void Status_Saves_Correct_Transaction_IncorrectUpdate() 77 { 41 78 FakeDataContext fake = new FakeDataContext(2); 42 79 DateTime datka = DateTime.Now; 43 80 var builder = new TestControllerBuilder(); 44 var controller = new PlatnoscController(fake); 45 builder.InitializeController(controller); 46 builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); 47 builder.Form.Add("AUTHTIME", DateTime.Now.ToString()); 48 builder.Form.Add("DATATRANSMISJI", DateTime.Now.ToString()); 49 builder.Form.Add("ORDERNUMBER", orderNumber.ToString()); 50 builder.Form.Add("CURRENTSTATE", code_Ok); 51 52 var result = controller.Status(); 53 54 IRepository<PotwierdzeniaEcard> _rep = new Repository<PotwierdzeniaEcard>(fake); 55 var potwierdzeniaEcard = _rep.Find(p => p.ORDERNUMBER == orderNumber).First(); 56 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); 57 PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); 58 System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " > " + datka); 59 Assert.That(payment_after_update.Status_data, Is.GreaterThan(datka)); 60 61 } 62 [Test] 63 [Category("Unit")] 64 public void Status_Saves_Correct_Transaction_IncorrectUpdate() 65 { 66 FakeDataContext fake = new FakeDataContext(2); 67 DateTime datka = DateTime.Now; 68 var builder = new TestControllerBuilder(); 69 var controller = new PlatnoscController(fake); 81 var controller = new PlatnoscController(fake,test); 70 82 builder.InitializeController(controller); 71 83 builder.Form.Add("MERCHANTNUMBER", merchantNumber.ToString()); … … 81 93 Assert.That(potwierdzeniaEcard.MERCHANTNUMBER, Is.EqualTo(merchantNumber)); 82 94 95 83 96 PlatnosciEcard payment_after_update = _rep.FindPaymentByOrdernumber(orderNumber).SingleOrDefault(); 84 97 System.Diagnostics.Debug.WriteLine(payment_after_update.Status_data + " <= " + datka ); … … 89 102 public void StatusIsUpdated() 90 103 { 91 FakeDataContext fake = new FakeDataContext( );104 FakeDataContext fake = new FakeDataContext(3); 92 105 IRepository<PlatnosciEcard> _rep = new Repository<PlatnosciEcard>(fake); 93 106 107 PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, false, data.AddDays(-1), 1); 108 _rep.Insert(platnosc); 109 110 DateTime datka = DateTime.Now; 111 var controller = new PlatnoscController(fake,test); 112 controller.UpdateStatus(orderNumber, code_Ok); 113 114 PlatnosciEcard payment_after_update = new PlatnosciEcard(); 115 payment_after_update = _rep.FindOne(orderNumber); 116 117 Assert.That(payment_after_update.Status, Is.EqualTo(true)); 118 } 119 [Test] 120 [Category("Unit")] 121 public void StatusIsNotUpdated() 122 { 123 FakeDataContext fake = new FakeDataContext(); 124 IRepository<PlatnosciEcard> _rep = new Repository<PlatnosciEcard>(fake); 125 94 126 PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); 95 127 _rep.Insert(platnosc); 96 128 97 var controller = new PlatnoscController(fake); 98 controller.UpdateStatus(orderNumber, code_Ok); 99 100 PlatnosciEcard payment_after_update = new PlatnosciEcard(); 101 payment_after_update = _rep.FindOne(i => i.ORDERNUMBER == orderNumber); 102 Assert.That(payment_after_update.Status_data, Is.GreaterThan(data)); 103 } 104 [Test] 105 [Category("Unit")] 106 public void StatusIsNotUpdated() 107 { 108 FakeDataContext fake = new FakeDataContext(); 109 IRepository<PlatnosciEcard> _rep = new Repository<PlatnosciEcard>(fake); 110 111 PlatnosciEcard platnosc = _f.createNewPayment(orderNumber, true, data, 1); 112 _rep.Insert(platnosc); 113 114 var controller = new PlatnoscController(fake); 129 var controller = new PlatnoscController(fake,test); 115 130 controller.UpdateStatus(orderNumber, code_Bad); 116 131 … … 129 144 _rep.Insert(platnosc); 130 145 131 var controller = new PlatnoscController(fake );146 var controller = new PlatnoscController(fake,test); 132 147 controller.ControllerContext = _f.createControllerContext(testNip2); 133 148 controller.setWeryfikacja("Niepoprawny nip"); … … 144 159 { 145 160 FakeDataContext fake = new FakeDataContext(); 146 IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake);147 148 var controller = new PlatnoscController(fake );161 // IRepository<vPlatnosciEcard> _rep = new Repository<vPlatnosciEcard>(fake); 162 163 var controller = new PlatnoscController(fake,test); 149 164 150 165 controller.ControllerContext = _f.createControllerContext(testNip1); … … 162 177 //Tworzymy takie dane aby platnosc o danym id byla juz zaplacona 163 178 FakeDataContext fake = new FakeDataContext(1); 164 var controller = new PlatnoscController(fake );179 var controller = new PlatnoscController(fake,test); 165 180 166 181 controller.ControllerContext = _f.createControllerContext(testNip1); … … 168 183 169 184 var result = controller.Show(testIdFaktury.ToString(), "pl") as ViewResult; 170 var error = (ErrorViewData)result.ViewData.Model;171 172 Assert.That(result.ViewName, Is.EqualTo(" Error1"));173 Assert.That( error.error, Is.EqualTo("Platnosc zostala uregulowana"));185 var view = (InvoiceDetailsViewData)result.ViewData.Model; 186 187 Assert.That(result.ViewName, Is.EqualTo("Paid")); 188 Assert.That(view.info, Is.EqualTo("Platnosc zostala uregulowana")); 174 189 } 175 190 [Test] … … 183 198 _rep.Insert(platnosc); 184 199 185 var controller = new PlatnoscController(fake );200 var controller = new PlatnoscController(fake,test); 186 201 controller.ControllerContext = _f.createControllerContext(testNip1); 187 202 … … 203 218 _rep.Insert(platnosc); 204 219 205 var controller = new PlatnoscController(fake );220 var controller = new PlatnoscController(fake,1); 206 221 controller.ControllerContext = _f.createControllerContext(testNip1); 207 222 … … 221 236 _rep.Insert(platnosc); 222 237 223 var controller = new PlatnoscController(fake );238 var controller = new PlatnoscController(fake,test); 224 239 controller.ControllerContext = _f.createControllerContext(testNip1); 225 240 -
trunk/eCard/eCardMVC/Platnosci/Content/Site.css
r886 r888 13 13 line-height: 1.6em; 14 14 } 15 h1, h2, h 4, h5, h615 h1, h2, h5, h6 16 16 { 17 17 font-size: 1.5em; … … 35 35 font-family: Arial, Helvetica, sans-serif; 36 36 } 37 h4 38 { 39 padding: 0 0 0 0; 37 .Tytul 38 { 39 font-family: Arial, Helvetica, sans-serif; 40 font-size: 1.5em; 41 padding: 20px 0 0 0; 40 42 color:#E00000; 43 font-weight: bold; 41 44 } 42 45 h5, h6 … … 78 81 #main 79 82 { 80 padding: 30px 30px 15px 30px;83 padding: 0px 30px 15px 30px; 81 84 background-color: #fff; 82 85 margin-bottom: 30px; -
trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs
r885 r888 33 33 private string err_imie; 34 34 private string err_nazwisko; 35 private int test = 0; 35 36 36 37 public PlatnoscController() … … 42 43 43 44 } 44 public PlatnoscController(IDataContext datacontext )45 public PlatnoscController(IDataContext datacontext, int czy_test) 45 46 { 46 47 _rep = new Repository<PotwierdzeniaEcard>(datacontext); … … 48 49 _context1 = datacontext; 49 50 _func = new FunkcjePlatnosci(); 51 test = czy_test; 50 52 } 51 53 public ActionResult Show(string id, string language) 52 54 { 53 55 language = _func.setLanguage(language); 54 ustawTlumaczenia( );56 ustawTlumaczenia(test); 55 57 int id1 = ConvertId(id); 56 58 … … 71 73 return View("Paid", invoiceDeatailsViewData); 72 74 } 73 return View(invoiceDeatailsViewData); 75 return View(invoiceDeatailsViewData); 74 76 } 75 77 [Authorize] … … 78 80 { 79 81 language = _func.setLanguage(language); 80 ustawTlumaczenia( );82 ustawTlumaczenia(test); 81 83 vPlatnosciEcard platnosc = _rep.FindInvoiceById(payer.Id_faktury).SingleOrDefault(); 82 84 if (!String.IsNullOrEmpty(Iserror(platnosc).error)) return View("Error1", Iserror(platnosc)); … … 107 109 { 108 110 language = _func.setLanguage(language); 109 ustawTlumaczenia( );111 ustawTlumaczenia(test); 110 112 int id1 = ConvertId(id); 111 113 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); … … 118 120 { 119 121 language = _func.setLanguage(language); 120 ustawTlumaczenia( );122 ustawTlumaczenia(test); 121 123 int id1 = ConvertId(id); 122 124 vPlatnosciEcard platnosc = _rep.FindInvoiceById(id1).SingleOrDefault(); … … 182 184 return invoiceDeatailsViewData; 183 185 } 184 private void ustawTlumaczenia() 185 { 186 weryfikacja = HttpContext.GetGlobalResourceObject("tlumaczenia", "weryfikacja").ToString(); 187 brakdanych = HttpContext.GetGlobalResourceObject("tlumaczenia", "brakdanych").ToString(); 188 zaplacono = HttpContext.GetGlobalResourceObject("tlumaczenia", "zaplacono").ToString(); 189 err_imie = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_imieWK").ToString(); 190 err_nazwisko = HttpContext.GetGlobalResourceObject("tlumaczenia", "err_nazwiskoWK").ToString(); 186 private void ustawTlumaczenia(int test) 187 { 188 if (test == 0) 189 { 190 weryfikacja = Resources.tlumaczenia.weryfikacja.ToString(); 191 brakdanych = Resources.tlumaczenia.brakdanych.ToString(); 192 zaplacono = Resources.tlumaczenia.zaplacono.ToString(); 193 err_imie = Resources.tlumaczenia.err_imieWK.ToString(); 194 err_nazwisko = Resources.tlumaczenia.err_nazwiskoWK.ToString(); 195 } 191 196 } 192 197 public void setWeryfikacja(string value) … … 224 229 public void UpdateStatus(int ordernumber, string currentstate) 225 230 { 226 var platnosc = _rep.FindPaymentByOrdernumber(ordernumber).SingleOrDefault();227 if (platnosc != null && platnosc.Status == true &¤tstate == ISPAID)231 PlatnosciEcard platnosc = _repPl.FindOne(ordernumber); 232 if (platnosc != null && currentstate == ISPAID) 228 233 { 229 234 platnosc.Status = true; 230 235 platnosc.Status_data = DateTime.Now; 231 _repPl.Update(platnosc); 236 _repPl.SubmitChanges(); 237 238 System.Diagnostics.Debug.WriteLine("IsUpdate"); 232 239 } 233 240 } -
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx
r883 r888 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 8 9 < h4>9 <div class="Tytul"> 10 10 <asp:Label ID="Szczegó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label> 11 </ h4>11 </div> 12 12 <p class="InfoPaid"><%=Model.info%></p> 13 13 <table cellpadding="0" cellspacing="0" border="0"> -
trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Show.aspx
r883 r888 7 7 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server"> 8 8 9 < h4>10 <asp:Label ID="Szczeg ó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>11 </ h4>9 <div class="Tytul"> 10 <asp:Label ID="Szczegoly" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label> 11 </div> 12 12 13 13 <p class="bold"><asp:Label ID="SprDane" runat ="server" Text="<%$Resources:tlumaczenia,SprawdzDane%>"></asp:Label></p> -
trunk/eCard/eCardMVC/Platnosci/Views/Shared/Site.Master
r886 r888 10 10 </head> 11 11 <body> 12 <table class="wtab cellpadding="0" cellspacing="0" border="0">12 <table class="wtab" cellpadding="0" cellspacing="0" border="0"> 13 13 <tr> 14 14 <td class="tlo"> -
trunk/eCard/eCardMVC/Platnosci/Web.config
r881 r888 36 36 <add key="StatusLink" value="http://platnosci.admoto.pl/info.aspx"/> 37 37 <add key="Css" value="admoto"/> 38 38 39 39 <add key="Strona" value="http://pay.truck-expo.com"/> 40 40 <add key="Strona" value="http://platnosci.admoto.pl"/>
