Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_catalog.xml

@@ -247,7 +247,7 @@
 
 
 <Button>
-<X> 392 </X>
+<X> 225 </X>
 <Y> 424 </Y>
 <State> ShowButtonClick2 </State>
 <Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
@@ -324,4 +324,7 @@
 </EventClick>
 </Button>
 
+
+
+
 </Popup>

xml/page_catalog_free.xml

@@ -0,0 +1,304 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	TopView "show"
+	; On open
+
+	Var timeout = 0
+
+	If CocktailShow = "true" Then 
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"	
+	EndIf
+	
+	If TermTemOnline = "true" Then
+		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
+	EndIf
+	 	
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
+		Play PlaySoundLag
+	
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page2"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+		Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
+		Play PlaySoundLag
+	EndIf
+
+
+	Var StrawAutoRelease1 = "false"
+	Var StrawAutoRelease2 = "false"
+
+	
+
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowButtonClick2 = "Enable"
+	Else
+		Var ShowButtonClick2 = "Invisible"
+	EndIf
+
+	If NetworkStatus = "ACTIVATE" Then
+		Var ShowNetworkProblem = "Invisible"
+		Var ShowNetworkProblemText = ""
+		
+	Else
+		Var ShowNetworkProblem = "Enable"
+		Var ShowButtonClick2 = "Invisible"
+		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
+	EndIf
+
+	
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	;SAVELOG SoundPlaying
+
+	Var timeout = timeout + 1
+
+	If timeout > 15 Then
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+
+	
+	
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventChangeStatus>
+</EventChangeStatus>
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+
+</Video>
+
+
+
+; 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> 
+	
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 990 </X>
+<Y> 438 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+
+
+<Image>
+<X> 70 </X>
+<Y> 583 </Y>
+<Filename> Var(DirImage + "/text1.png")  </Filename>
+</Image>
+
+
+
+; menu row 1
+<Button>
+<X> 205 </X>
+<Y> 849 </Y>
+<Filename> Var(DirImage + "/bn_diy.png")   </Filename>
+<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 849 </Y>
+<Filename> Var(DirImage + "/bn_coffee.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+; menu row 2
+<Button>
+<X> 205 </X>
+<Y> 1191 </Y>
+<Filename> Var(DirImage + "/bn_tea.png") </Filename>
+<FilenamePress>  Var(DirImage + "/bp_tea.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 579 </X>
+<Y> 1191 </Y>
+<Filename> Var(DirImage + "/bn_cho_caramel.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+; menu row 3
+;<Button>
+;<X> 205 </X>
+;<Y> 1533 </Y>
+;<Filename> Var(DirImage + "/bn_fruit.png") </Filename>
+;<FilenamePress> Var(DirImage + "/bp_fruit.png") </FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick> 
+;	
+;</EventClick>
+;</Button>
+
+<Button>
+<X> 205 </X>
+<Y> 1533 </Y>
+<Filename> Var(DirImage + "/bn_protein.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 579 </X>
+<Y> 1533 </Y>
+<Filename> bnSodaAndOther </Filename>
+<FilenamePress> bpSodaAndOther </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 225 </X>
+<Y> 424 </Y>
+<State> ShowButtonClick2 </State>
+<Filename>  Var(DirImage + "/bn_main_page_member.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_member.png")  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 696 </X>
+<Y> 424 </Y>
+<State> ShowButtonClick2 </State>
+<Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 0 </X>
+<Y> 1870 </Y>
+<State> ShowNetworkProblem </State>
+<Color> "0xFF0000" </Color>
+<Width> 1080 </Width>
+<Height> 60 </Height>
+</Button>
+
+<Text>
+<X> 5 </X>
+<Y> 1880 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xFFFFFF </Color>
+<Value> ShowNetworkProblemText </Value>
+</Text>
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+</EventClick>
+</Button>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> alphaState3 </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+<Button>
+<X> 87 </X>
+<Y> 798 </Y>
+<Filename> Var(DirImage + "/DrinkFree.png") </Filename>
+<FilenamePress> Var(DirImage + "/DrinkFree.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	
+</EventClick>
+</Button>
+
+</Popup>

xml/page_drinkfail4.xml

@@ -90,7 +90,7 @@
                 Var GetFreeFromError = 1
                 Var TelephoneNumberGOTFree = TelephoneNumberProblem
                 Var ShowPrice = "Invisible"
-                Open "ROOT/taobin_project/xml/page_catalog.xml" 
+                Open "ROOT/taobin_project/xml/page_catalog_free.xml" 
             EndIf
         EndIf
 

xml/page_payment_storeCredit2-2.xml

@@ -656,7 +656,7 @@
             Var StoreCreditFlag = 1
 		    Var CoffeePinNumber = PinNumber
             If pageStoreCredit0 = 1 Then 
-                Var CoffeeCreditKeep = StoreCreditAmount + 0
+                Var CoffeeCreditKeep = StoreCreditAmount + CoffeeCredit
 			    Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml" 
 
 		    Else
@@ -670,7 +670,7 @@
 
                     CoinVending BILLSTACKALL
 
-                    Var CoffeeCreditKeep = RemainAmountKeep + 0
+                    Var CoffeeCreditKeep = RemainAmountKeep + CoffeeCredit
                     Open "ROOT/taobin_project/xml/page_payment_storeCredit3.xml" 
 
                 EndIf

xml_main/startup.xml

@@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.58"
+	Var XMLPageVersion = "5.59"
 
 </EventOpen>