fix if and toppling_select7

xml/page_payment_credit3-TopupCash.xml

@@ -61,8 +61,6 @@
 		Var img_popup15 = "/img_popup15-AUS.png"
 	EndIf
 
-	If 
-
     
     
 	Var CreditAmount = SumCreditAmount

xml/page_topping_select7.xml

@@ -1195,6 +1195,8 @@
                     EndIf
                 EndIf
 
+				Var CollagenState = "Enable"
+				
    	            If JemilaToppingFreeFlag = 1 Then
     				Var CollagenToppingBg = "/bg_top_jemila_free.png"
     				Var CollagenToppingPrice = 0
@@ -1206,8 +1208,13 @@
                 Var CollagenState = "Invisible"
             EndIf
         Else
-            Var CollagenState = "Invisible"
-            Var ShowCollagenOnly = "Invisible"
+			If CollagenState != "Invisible" Then
+				Var CollagenState = "Disable"
+			Else
+				Var CollagenState = "Invisible"
+            	Var ShowCollagenOnly = "Invisible"
+			EndIf
+   
         EndIf
 
         DEBUGVAR CollagenState
@@ -7981,16 +7988,19 @@
 		EndIf
 	EndIf
 
+	If SelectDrinkType = 0 Then
 
-	If show_eng = "true" Then
-		Var showname = NameDrink
-		Var showdesc = DrinkDescription
-	Else
-		Var showname = NameDrinkTH
-		Var showdesc = DrinkDescriptionTH
+		If show_eng = "true" Then
+			Var showname = NameDrink
+			Var showdesc = DrinkDescription
+		Else
+			Var showname = NameDrinkTH
+			Var showdesc = DrinkDescriptionTH
+		EndIf
 	EndIf
 
 
+
 	BackslashNToEnter showname
 	BackslashNToEnter showdesc
 	CRLFToSpace showname

xml/page_topup_credit3-TopupCash.xml

@@ -64,17 +64,6 @@
 	EndIf
 
 
-	
-
-	;Var RemainAmountStr !assigned StringFmt( CreditAmount, DisplayFormat, PreScaleConvertShow )
-	;If show_eng = "true" Then
-		;Var RemainAmountStr = "Top-up " + RemainAmountStr
-		;Var RemainAmountStr = RemainAmountStr + "###size=110"
-	;Else
-		;Var RemainAmountStr = "เติม " + RemainAmountStr
-		;Var RemainAmountStr = RemainAmountStr + "###size=90"
-	;EndIf
-
 
     Var CoinInFlag = 0
     Var CoinInOK = 0