Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

xml/page_member_topupCash.xml

@@ -69,11 +69,11 @@
     Var PayAmount = 0
 	Var RemainAmountStr !assigned StringFmt( PayAmount, DisplayFormat, PreScaleConvertShow )
 	If show_eng = "true" Then
-		Var RemainAmountStr = "เติม " + RemainAmountStr
-		Var RemainAmountStr = RemainAmountStr + "###size=90"
-	Else
 		Var RemainAmountStr = "Top-up " + RemainAmountStr
 		Var RemainAmountStr = RemainAmountStr + "###size=110"
+	Else
+		Var RemainAmountStr = "เติม " + RemainAmountStr
+		Var RemainAmountStr = RemainAmountStr + "###size=90"
 	EndIf
 
 

xml/page_payment_credit3-1.xml

@@ -39,6 +39,7 @@
 	GenHashWithTimeStamp PointCrm
 
 	Var TopupWithCashState = "Enable"
+	Var NotEnoughPayment = 0
 
 	If SELLSTATUS = "SELLNOCASH" Then
 		Var TopupWithCashState = "Disable"
@@ -133,6 +134,9 @@
 <EventClick> 
 
 	Var TopupFromPage = "payment"
+	If ShowNotEnoughText = "Enable" Then
+		Var NotEnoughPayment = 1
+	EndIf
 	Open "ROOT/taobin_project/xml/page_topup_credit3_cash_warning.xml" 
 
 </EventClick>

xml/page_topup_credit3_cash_warning.xml

@@ -110,13 +110,17 @@
                 Open "ROOT/taobin_project/xml/page_member_topupCash.xml"
             Else
                 If TopupFromPage = "payment" Then
-                    If ReqPayWithCash = 0 Then
-                        Var TelephoneNumber = Seeker.TNumberTaobinCredit
-                        Var useCreditAmount = SumCreditAmount
-                        Var BmiYear = useCreditAmount
-                        Var GetScore = "useCredit"
-                        AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
-                        Var ReqPayWithCash = 1
+                    If NotEnoughPayment = 1 Then
+                        If ReqPayWithCash = 0 Then
+                            Var TelephoneNumber = Seeker.TNumberTaobinCredit
+                            Var useCreditAmount = SumCreditAmount
+                            Var BmiYear = useCreditAmount
+                            Var GetScore = "useCredit"
+                            AddData 22 TelephoneNumber  BmiYear PointCrm GetScore
+                            Var ReqPayWithCash = 1
+                        EndIf
+                    Else
+                        Open "ROOT/taobin_project/xml/page_payment_credit3-TopupCash.xml"
                     EndIf
                 Else
 	                Open "ROOT/taobin_project/xml/page_topup_credit3-TopupCash.xml"