Index: branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18007)
+++ branches/version-2/data/class/pages/shopping/LC_Page_Shopping_Payment.php	(revision 18025)
@@ -408,5 +408,5 @@
             }
         }
-        if ($pay_flag) {
+        if ($pay_flag && $arrRet['payment_id'] != "" ) {
             SC_Utils_Ex::sfDispSiteError(CUSTOMER_ERROR);
         }