SGP: member page & reward pt check

xml/page_board.xml

@@ -832,12 +832,13 @@
 		Var TextPriceMenuY = 264
 		Var TextPriceMenuBlendX = 180
 		Var TextPriceMenuHotX = 48
-		Var ShowButtonClick2 = "Invisible"
+		Var ShowButtonClick2 = "Enable"
 		Var ButtontoTopupMenu = "Invisible"
 
 		Var PriceUnitText = "Price in SGD"
 
 		Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
+		Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
 		Var show_eng_button_stage = "Invisible"
 
 		Var CountDownShowButton = 35
@@ -852,7 +853,7 @@
 		STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
 
 		Var SettingDisableTaobinCredit = "true"
-		Var SettingDisableTaobinCode = "false"
+		;Var SettingDisableTaobinCode = "false"
 
 		; Singapore disable point
 		;Var SettingIgnoreCollectPoint = 1
@@ -864,6 +865,8 @@
 
 		Var ShowCountDownAsPercent = 1
 
+		DEBUGVAR ShowButtonClick2
+
 
 	EndIf
 
@@ -1104,9 +1107,14 @@
 
 	Var CurrentMainVideo = CurrentMainVideoTemp
 
+	DEBUGVAR SettingDisableTaobinCredit
 	If SettingDisableTaobinCredit = "true" Then
 		Var ShowButtonClick2 = "Invisible"
+		If CountryName = "Singapore" Then
+			Var ShowButtonClick2 = "Enable"
+		EndIf
 	EndIf
+	DEBUGVAR ShowButtonClick2
 
 	DEBUGVAR CLOSE_ORDER_NOW
 
@@ -1377,12 +1385,18 @@
 		If CountDownShowButton = 31 Then
 			Var ShowButtonClickFull = "Enable"
 			Var ShowButtonClick = "Invisible"
+			If CountryName = "Singapore" Then
+				Var ShowButtonClick2 = "Invisible"
+			EndIf
 			Refresh
 		EndIf
 
 		If CountDownShowButton = 3 Then
 			
 			Var ShowButtonClick = "Enable"
+			If CountryName = "Singapore" Then
+				Var ShowButtonClick2 = "Enable"
+			EndIf
 			Var ShowButtonClickFull = "Invisible"	
 			Refresh
 		EndIf
@@ -1677,16 +1691,14 @@
 
 	If InternationalEnable = 1 Then
 		;inter-xml-open
-		If CountryName = "Australia" Then
+
+		DEBUGVAR CountryName
+
+		If CountryName = "UnitedArabEmirates Dubai" Then
+			OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
+		Else
 			Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
 			OpenInst 2 ChackMemberPage
-		Else
-			If CountryName = "Malaysia" Then
-				Var ChackMemberPage = CountryRootPath + "xml/page_check_member.lxml"
-				OpenInst 2 ChackMemberPage
-			Else
-				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"
-			EndIf
 		EndIf
 	Else
 		OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_check_member.xml"

xml/page_payment_cash-SGP.xml

@@ -470,9 +470,7 @@
 	Var TopRowY = 1276
 	Var BotRowY = 1499
 
-	If SettingDisableTaobinCredit = "true" Then
-		Var PayState4 = "Invisible"
-	EndIf
+	Var PayState4 = "Invisible"
 
 	If SettingDisableTaobinCode = "true" Then
 		Var PayState2 = "Invisible"