Merged

xml/page_payment_cash.xml

@@ -14,6 +14,15 @@
 	READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
 	DEBUGVAR cash_disable
 
+	;Cash for any lang
+	;include="ROOT/taobin_project/xml/payment_cash.ev" 
+
+	DEBUGVAR show_eng
+	DEBUGVAR LanguageShow
+
+
+
+
 	;If AdultFlag = 1 Then
 	;	Open "ROOT/taobin_project/xml/page_payment_camera.xml"
 	;EndIf
@@ -49,8 +58,6 @@
 	EndIf
 
 	;inter-xml-open
-
-
 	Var  PreScaleCanculate = 1
 
 
@@ -328,6 +335,9 @@
 		Else
 			Var showRemaining = RemainAmountStr + " บาท"
 		EndIf
+		If LanguageShow = "MYANMAR" Then 
+			Var showRemaining = RemainAmountStr + " Bath"
+		EndIf
 
 	EndIf
 
@@ -336,14 +346,14 @@
 
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
-		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
-		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
+		;If show_eng = "true" Then
+			;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
+			;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
+		;Else
+			;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
+			;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
 
-		EndIf
+		;EndIf
 
 	Var X_CASH1 = 216
 	Var X_CASH2 = 439
@@ -359,16 +369,16 @@
 	EndIf
 
 
-	If RoadShow = "true" Then
-		Var X_CASH1 = 287
-		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
-		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
-		EndIf
-	EndIf
+	;If RoadShow = "true" Then
+		;Var X_CASH1 = 287
+		;If show_eng = "true" Then
+			;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
+			;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
+		;Else
+			;Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
+			;Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
+		;EndIf
+	;EndIf
 
 	If GetFreeFromError = 1 Then
 		Var Seeker.FreeVendingCampaign = 1
@@ -447,6 +457,10 @@
 					Var FlagalphaState2 = 1
 					Var RemainAmountStr = "ทอน " + Canout
 				EndIf
+				If LanguageShow = "MYANMAR" Then 
+					Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
+					Var RemainAmountStr = RemainAmountStr + "###size=90"
+				EndIf
 			EndIf
 
 
@@ -469,16 +483,16 @@
 
 	EndIf
 
-	If show_eng = "true" Then
-		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
-		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+	;If show_eng = "true" Then
+		;Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		;Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
+		;Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
 
-	Else
-		Var DirImage = "ROOT/taobin_project/image/page_payment"
-		Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
-		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
-	EndIf
+	;Else
+		;Var DirImage = "ROOT/taobin_project/image/page_payment"
+		;Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
+		;Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+	;EndIf
 
 
 	Var EnoughChange = "yes"
@@ -1219,6 +1233,10 @@
 		Var PayState2 = "Disable"
 	EndIf
 
+	Var PayState2 = "Enable"
+	Var PayState3 = "Enable"
+	Var PayState4 = "Enable"
+	Var PayState5 = "Enable"
 </EventOpen>
 
 <EventActionOk>
@@ -2494,6 +2512,10 @@
 						Var FlagalphaState2 = 1
 						Var RemainAmountStr = "ทอน " + Canout
 					EndIf
+					If LanguageShow = "MYANMAR" Then 
+						Var RemainAmountStr = "ငွေပြောင်းပါ။ " + Canout
+						Var RemainAmountStr = RemainAmountStr + "###size=90"
+					EndIf
 				EndIf
 
 
@@ -2548,6 +2570,9 @@
 				Else
 					Var showRemaining = "คืนเงิน"
 				EndIf
+				If LanguageShow = "MYANMAR" Then 
+					Var showRemaining = "ပြန်အမ်းငွေ"
+				EndIf
 				;Open "ROOT/taobin_project/xml/page_catalog.xml"
 
 				If FlagQROpened = 1 Then
@@ -2579,6 +2604,9 @@
 		Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink.png"
 
 	EndIf
+	If LanguageShow = "MYANMAR" Then 
+	Var return = "ROOT/taobin_project/image/warning/image_warning_energy_drink_mmr.png"
+	EndIf
 )
 </Filename>
 </Image>
@@ -3101,13 +3129,16 @@ eval(
     Else
         Var return = "กำลังยกเลิก..."
     EndIf
+	If LanguageShow = "MYANMAR" Then 
+		Var return = "ပယ်ဖျက်ပါ။..."
+	EndIf
 )
 </Value>
 <Align> center-vertical-horizontal </Align>
 </Text>
 
 <Image>
-<X> 267 </X>
+<X> LOADING_STATE_X </X>
 <Y> 1065 </Y>
 <State> LOADING_STATE </State>
 <Filename> Var( DirImage + "/loadingText.png" )</Filename>
@@ -3541,7 +3572,12 @@ eval(
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
+<EventUnitTest1>
 
+	MakeDrinkV1  SelectDrink SelectSugarID
+	Open "ROOT/taobin_project/xml/page_thankyou.xml"
+	
+</EventUnitTest1>