Zbiór zmian 911 dla trunk/eCard

Data:

2009-11-30 16:00:42 (16 years ago)

Autor:

alina

Opis:

re #215 dodano formularz dla potwierdzenia, dodano testy sprawdzajace typy i format zmiennych przesylanych z eCardu

Lokalizacja:

trunk/eCard/eCardMVC

Pliki:

• Platnosci.Tests/Platnosci.Tests.csproj (zmodyfikowane) (1 diff)
• Platnosci.Tests/Web/StatusTest.cs (dodane)
• Platnosci/Content/Site.css (zmodyfikowane) (6 diffs)
• Platnosci/Content/admoto.css (zmodyfikowane) (2 diffs)
• Platnosci/Controllers/PlatnoscController.cs (zmodyfikowane) (3 diffs)
• Platnosci/Views/Account/LogOn.aspx (zmodyfikowane) (1 diff)
• Platnosci/Views/Platnosc/Form.aspx (dodane)
• Platnosci/Views/Platnosc/Paid.aspx (zmodyfikowane) (1 diff)

trunk/eCard/eCardMVC/Platnosci.Tests/Platnosci.Tests.csproj

@@ -83 +83 @@
     <Compile Include="Web\Function.cs" />
     <Compile Include="Web\PlatnosciControllerTests.cs" />
+    <Compile Include="Web\StatusTest.cs" />
     <Compile Include="Web\TestMethods.cs" />
     <Compile Include="Web\UIAccountTest.cs" />

trunk/eCard/eCardMVC/Platnosci/Content/Site.css

@@ -22 +22 @@
     font-family: Arial, Helvetica, sans-serif;
     font-size: 1.5em;
-    padding: 20px 0 0 0;
-    color:#E00000;
-    font-weight: bold;
-}
-
+    color: #E00000;
+    font-weight: bold;
+}
 .wtab
 {
@@ -87 +85 @@
 }
 
-ul#menu li a
+/*ul#menu li a
 {
     padding: 10px 20px;
@@ -96 +94 @@
     color: #034af3;
 }
-
+ul#menu li a:active
+{
+    background-color: #a6e2a6;
+    text-decoration: none;
+}
 ul#menu li a:hover
 {
@@ -102 +104 @@
     text-decoration: none;
 }
-
-ul#menu li a:active
-{
-    background-color: #a6e2a6;
-    text-decoration: none;
-}
-
 ul#menu li.selected a
 {
     background-color: #fff;
     color: #000;
-}
+}*/
 
 input[type="text"] 
 {
-    /*width: 200px;*/
     border: 1px solid #CCC;
 }
@@ -150 +144 @@
     color: #ff0000;
 }
-/*formatowanie tabeli na stronie platnosc.aspx*/
 .img_info
 img{
@@ -239 +232 @@
         color: Gray;
 }
+#link1 a
+{
+    color: #a9a9a9;
+}
 #link1 a:hover
 {
     color: Red;
     text-decoration: none;
-}
-#link1 a
-{
-    color: #a9a9a9;
 }
 #odstep

trunk/eCard/eCardMVC/Platnosci/Content/admoto.css

@@ -1 @@
-#flagi a:link,a:active, a:visited
+#flagi A:link
 {
+    color: #EEEEEE; 
     text-decoration: none;
-    color: #EEEEEE;    
+}
+#flagi A:active,A:visited
+{
+    color: #EEEEEE;
+    text-decoration: none;        
 }
 .pagecontent
@@ -19 +24 @@
 .logo img
 {
-    position:relative;
+    position: relative;
     top: 10px;
 }

trunk/eCard/eCardMVC/Platnosci/Controllers/PlatnoscController.cs

@@ -24 +24 @@
         public const string ISPAID = "payment_deposited";       //transakcja potwierdzona do rozliczenia
         private readonly IRepository<vPlatnosciEcard> _repVPayment;       
-        private readonly IRepository<PlatnosciEcard> _repPayment;
+        private IRepository<PlatnosciEcard> _repPayment;
         private readonly IRepository<PotwierdzeniaEcard> _repConfirm;
         private ITranslate _t;
@@ -124 +124 @@
         public ActionResult Status()
         {
-            string MERCHANTNUMBER = Request.Form["MERCHANTNUMBER"];
-            int ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]);
-            string COMMTYPE = Request.Form["COMMTYPE"];
-            string CURRENTSTATE = Request.Form["CURRENTSTATE"];
-            string PREVIOUSSTATE = Request.Form["PREVIOUSSTATE"];
-            bool PAYMENTTYPE = Convert.ToBoolean(Request.Form["PAYMENTTYPE"]);
-            bool EVENTTYPE = Convert.ToBoolean(Request.Form["EVENTTYPE"]);
-            bool PAYMENTNUMBER = Convert.ToBoolean(Request.Form["PAYMENTNUMBER"]);
-            string APPROVALCODE = Request.Form["APPROVALCODE"];
-            string VALIDATIONCODE = Request.Form["VALIDATIONCODE"];
-            string BIN = Request.Form["BIN"];
-            DateTime AUTHTIME = Convert.ToDateTime(Request.Form["AUTHTIME"]);
-            string TYPE = Request.Form["TYPE"];
-            string WITHCVC = Request.Form["WITHCVC"];
-            DateTime DATATRANSMISJI = Convert.ToDateTime(Request.Form["DATATRANSMISJI"]);
+            string CURRENTSTATE = "";
+            int ORDERNUMBER = 0;
             
             PotwierdzeniaEcard potwierdzenie = new PotwierdzeniaEcard();
-            potwierdzenie.APPROVALCODE = APPROVALCODE;
-            potwierdzenie.AUTHTIME = AUTHTIME;
-            potwierdzenie.BIN = BIN;
-            potwierdzenie.COMMTYPE = COMMTYPE;
-            potwierdzenie.CURRENTSTATE = CURRENTSTATE;
-            potwierdzenie.DATATRANSMISJI = DATATRANSMISJI;
-            potwierdzenie.EVENTTYPE = EVENTTYPE;
-            potwierdzenie.MERCHANTNUMBER = MERCHANTNUMBER;
-            potwierdzenie.ORDERNUMBER = ORDERNUMBER;
-            potwierdzenie.PAYMENTNUMBER = PAYMENTNUMBER;
-            potwierdzenie.PAYMENTTYPE = PAYMENTTYPE;
-            potwierdzenie.PREVIOUSSTATE = PREVIOUSSTATE;
-            potwierdzenie.TYPE = TYPE;
-            potwierdzenie.VALIDATIONCODE = VALIDATIONCODE;
-            potwierdzenie.WITHCVC = WITHCVC;
-
-            _repConfirm.Insert(potwierdzenie);
-            UpdateStatus(ORDERNUMBER, CURRENTSTATE);
             var content = new ContentResult();
-            content.Content = "OK";
+            try
+            {
+                if (!String.IsNullOrEmpty(Request.Form["APPROVALCODE"])) potwierdzenie.APPROVALCODE = Request.Form["APPROVALCODE"];
+                if (!String.IsNullOrEmpty(Request.Form["AUTHTIME"])) potwierdzenie.AUTHTIME = Convert.ToDateTime(Request.Form["AUTHTIME"]);
+                if (!String.IsNullOrEmpty(Request.Form["BIN"])) potwierdzenie.BIN = Request.Form["BIN"];
+                if (!String.IsNullOrEmpty(Request.Form["COMMTYPE"])) potwierdzenie.COMMTYPE = Request.Form["COMMTYPE"];
+                if (!String.IsNullOrEmpty(Request.Form["CURRENTSTATE"]))
+                {
+                    CURRENTSTATE = Request.Form["CURRENTSTATE"];
+                    potwierdzenie.CURRENTSTATE = CURRENTSTATE;
+                }
+                if (!String.IsNullOrEmpty(Request.Form["DATATRANSMISJI"])) potwierdzenie.DATATRANSMISJI = Convert.ToDateTime(Request.Form["DATATRANSMISJI"]);
+                if (!String.IsNullOrEmpty(Request.Form["EVENTTYPE"])) potwierdzenie.EVENTTYPE = Convert.ToBoolean(Request.Form["EVENTTYPE"]);
+                if (!String.IsNullOrEmpty(Request.Form["MERCHANTNUMBER"])) potwierdzenie.MERCHANTNUMBER = Request.Form["MERCHANTNUMBER"];
+                if (!String.IsNullOrEmpty(Request.Form["ORDERNUMBER"]))
+                {
+                    ORDERNUMBER = Convert.ToInt32(Request.Form["ORDERNUMBER"]);
+                    potwierdzenie.ORDERNUMBER = ORDERNUMBER;
+                }
+                if (!String.IsNullOrEmpty(Request.Form["PAYMENTNUMBER"])) potwierdzenie.PAYMENTNUMBER = Convert.ToBoolean(Request.Form["PAYMENTNUMBER"]);
+                if (!String.IsNullOrEmpty(Request.Form["PAYMENTTYPE"])) potwierdzenie.PAYMENTTYPE = Convert.ToBoolean(Request.Form["PAYMENTTYPE"]);
+                if (!String.IsNullOrEmpty(Request.Form["PREVIOUSSTATE"])) potwierdzenie.PREVIOUSSTATE = Request.Form["PREVIOUSSTATE"];
+                if (!String.IsNullOrEmpty(Request.Form["TYPE"])) potwierdzenie.TYPE = Request.Form["TYPE"];
+                if (!String.IsNullOrEmpty(Request.Form["VALIDATIONCODE"])) potwierdzenie.VALIDATIONCODE = Request.Form["VALIDATIONCODE"];
+                if (!String.IsNullOrEmpty(Request.Form["WITHCVC"])) potwierdzenie.WITHCVC = Request.Form["WITHCVC"];
+
+                _repConfirm.Insert(potwierdzenie);
+                UpdateStatus(ORDERNUMBER, CURRENTSTATE);
+                content.Content = "OK";
+            }
+            catch(Exception ex)
+            {
+                content.Content = "NOTOK " + ex.Message + " " + ex.GetType();
+            }       
+            
             return content;
         }
@@ -211 +214 @@
                 System.Diagnostics.Debug.WriteLine("IsUpdate");
             }
-        }               
+        }
+        public IRepository<vPlatnosciEcard> getRepVPayment()
+        {
+            return this._repVPayment;
+        }
+        public IRepository<PlatnosciEcard> getRepPayment()
+        {
+            return this._repPayment;
+        }
+        public IRepository<PotwierdzeniaEcard> getRepConfirm()
+        {
+            return this._repConfirm;
+        }   
     }
 }

trunk/eCard/eCardMVC/Platnosci/Views/Account/LogOn.aspx

@@ -19 +19 @@
     <%string info = HttpContext.GetGlobalResourceObject("tlumaczenia", "validateInfo").ToString(); %>
     <%= Html.ValidationSummary(info) %>
-
+    
     <% using (Html.BeginForm()) { %>
         <table class="tablelogin" border="0" cellpadding="0" cellspacing="0">

trunk/eCard/eCardMVC/Platnosci/Views/Platnosc/Paid.aspx

@@ -7 +7 @@
 <asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
 
-    <div class="Tytul">
+    <div class="SzczegolyZlecenia">
         <asp:Label ID="Szczegó³y" runat="server" Text="<%$Resources:tlumaczenia,Szczegoly%>"></asp:Label>
     </div>