merged bonus

2020-11-02 21:30:39 +07:00 · 2020-11-02 21:30:39 +07:00 · f7ac3a74a8
commit f7ac3a74a8
parent ae15637ebb 203889dc03
209 changed files with 1888 additions and 1685 deletions
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@ -118,12 +118,19 @@
 			Var PayState2 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
+
 		If CoinAmount > 0 Then
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var CoinInFlag = 1
 		EndIf
-		Var showRemaining = charOfBaht + RemainAmountStr
+
+		If show_eng = "true" Then 
+			Var showRemaining = charOfBaht + RemainAmountStr
+		Else
+			Var showRemaining = RemainAmountStr + " บาท"
+		EndIf
+
 	EndIf

 	
@ -131,13 +138,23 @@

 	Var 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"
+		
+		EndIf

-	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
 	If RoadShow = "true" Then
-
-	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash_2.png"
-	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png"
+		If show_eng = "true" Then 
+			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash_2.png"
+			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash_2.png"
+		Else
+			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash_2.png"
+			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash_2.png"
+		EndIf
 	EndIf

 	If IntVendingCampaign >= PayAmount Then 
@ -180,6 +197,14 @@
 	
 	EndIf

+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf

 </EventOpen>

@ -453,43 +478,31 @@
 <X> 0 </X>
 <Y> 0 </Y>
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
-<EventClick>
-	Var MachineStage = "make-drink"
-	Var CountDownBrewing = 120
-
-	;Var BrewingTextThai = "เตรียมแก้ว"
-	;MakeDrinkV1  SelectDrink SelectSugarID
-	
-	;Open "ROOT/taobin_project/xml/page_thankyou.xml" 
-	
-	Open "ROOT/taobin_project/xml/page_payment_code.xml" 
-
-</EventClick>
 </Image>



 <Image>
-<X> 166 </X>
-<Y> 501 </Y>
-<Filename> "ROOT/taobin_project/image/page_payment/text_1.png" </Filename>
+<X> 199 </X>
+<Y> 413 </Y>
+<Filename> Var( DirImage + "/text_1.png" ) </Filename>
 </Image>



 ; back
-<Button>
-<X> 19 </X>
-<Y> 420 </Y>
-<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
-	
-</EventClick>
-</Button>
+;<Button>
+;<X> 19 </X>
+;<Y> 420 </Y>
+;<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+;<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+;	
+;</EventClick>
+;</Button>



@ -504,7 +517,7 @@

 <Button>
 <X> 287 </X>
-<Y> 1282 </Y>
+<Y> 1254 </Y>
 <State> PayState1</State>
 <Filename>  FilenameShowbuttonCashBN </Filename>
 <FilenamePress> FilenameShowbuttonCashBP </FilenamePress>
@ -530,10 +543,10 @@

 <Button>
 <X> 287 </X>
-<Y> 1430 </Y>
+<Y>  1549</Y>
 <State> PayState2</State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_pay_with_code.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_pay_with_code.png" </FilenamePress>
+<Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@ -550,10 +563,10 @@

 <Button>
 <X> 287 </X>
-<Y> 1578 </Y>
+<Y> 1400 </Y>
 <State> PayState3</State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_prompt_pay.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_prompt_pay.png" </FilenamePress>
+<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@ -589,9 +602,9 @@
 <X> 438 </X>
 <Y> 1786 </Y>
 <State>CancleState</State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_cancel.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cancel.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/page_payment/bp_cancel.png" </FilenameDisable>
+<Filename> Var( DirImage + "/bn_cancel.png"  )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel.png"  ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_cancel.png" ) </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@ -649,7 +662,7 @@
 <Size> 72 </Size>
 <Font> KanitMediumTTF </Font>
 <Color> 0x513C2F </Color>
-<Value> NameDrink </Value>
+<Value> showname </Value>
 </Text>

 <Text>
@ -660,7 +673,7 @@
 <Size> 24 </Size>
 <Font> KanitLightTTF </Font>
 <Color> 0x6F5F51 </Color>
-<Value> DrinkDescription </Value>
+<Value> showdesc </Value>
 </Text>


@ -675,15 +688,15 @@
 <X> 249 </X>
 <Y> 748 </Y>
 <State> alphaState </State>
-<Filename> "ROOT/taobin_project/image/page_payment/img_popup1.png" </Filename>
+<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
 </Image>
 		
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
 <State> alphaState </State>
-<Filename> "ROOT/taobin_project/image/page_payment/bn_cancel.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/page_payment/bp_cancel.png" </FilenamePress>
+<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@ -736,7 +749,31 @@
 	EndIf

 	If countClick2 = 5 Then
-		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
+
+		Var MachineStage = "make-drink"
+		; make drink
+		;MakeDrinkV1  SelectDrink SelectSugarID
+
+		;Var UnitTestType = "1"
+		Var UnitTestType = "2"
+		
+		Open "ROOT/taobin_project/xml/page_id_card_result.xml"
+		
+		;Open "ROOT/taobin_project/xml/page_payment_code.xml"
+		
+		;Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+		;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+		
+		; show consent
+		;Open "ROOT/taobin_project/xml/page_show_consent.xml"
+		;Open "ROOT/taobin_project/xml/page_drinkok.xml"
+
+		
+		;Var CoffeePoint = 11
+		;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+		
+		;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_error.xml"
 	EndIf
 	Refresh
 </EventClick>