Zbiór zmian 952 dla trunk/eCard/eCardMVC/Platnosci.Core/Linq

Data:

2009-12-15 14:06:23 (16 years ago)

Autor:

alina

Opis:

re #215 testy i male przerobki (zmiana logo itp.)

Pliki:

• trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs (zmodyfikowane) (2 diffs)

trunk/eCard/eCardMVC/Platnosci.Core/Linq/Merchant.cs

@@ -21 +21 @@
             else if (Payment != null)
             {
-                if (Payment.AMOUNT == null) Error = "amount";
+                if (Payment.AMOUNT < 0) Error = "amount";
                 else if (Payment.AUTODEPOSIT != true) Error = "autodeposit";
                 else if (String.IsNullOrEmpty(Payment.ORDERDESCRIPTION)) Error = "orderdescription";
@@ -28 +28 @@
                 else if (String.IsNullOrEmpty(Payment.SURNAME)) Error = "surname";
                 else if (String.IsNullOrEmpty(Payment.LANGUAGE)) Error = "language";
-                else if (Payment.ORDERNUMBER < 1) Error = "ordernumber";
             }
-            else if (Hash == BAD_HASH || Hash == "" || Hash == HASH_ERROR_INFO) Error = "hash";
-            else if (String.IsNullOrEmpty(Id)) Error = "id";
-            else if (String.IsNullOrEmpty(Password)) Error = "password";
-            else if (String.IsNullOrEmpty(Hash)) Error = "hash";
-            else if (String.IsNullOrEmpty(LinkFail)) Error = "linkfail";
-            else if (String.IsNullOrEmpty(LinkOk)) Error = "linkok";
+            if (String.IsNullOrEmpty(Error))
+            {
+                if (Hash == BAD_HASH || Hash == "" || Hash == HASH_ERROR_INFO) Error = "hash";
+                else if (String.IsNullOrEmpty(Id)) Error = "id";
+                else if (String.IsNullOrEmpty(Password)) Error = "password";
+                else if (String.IsNullOrEmpty(Hash)) Error = "hash";
+                else if (String.IsNullOrEmpty(LinkFail)) Error = "linkfail";
+                else if (String.IsNullOrEmpty(LinkOk)) Error = "linkok";
+            }
         }
     }