Merge branch 'sgp_blue' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue

inc/video.inc

@@ -90,18 +90,33 @@
         DEBUGVAR a_video_menu[ads_idx]
         If CountryName = "Singapore" Then
             If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
-                    Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
+                Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
+                Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+                DEBUGVAR PreviseXMLFileName2
+
+                If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then
+
+                    DEBUGVAR CurrentXMLFileName2
+                    DEBUGVAR CurrentXMLFileName2
+                    DEBUGVAR PreviseXMLFileName2
+
+                    Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
+                EndIf
+
             Else
                 Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                 Var DisplayAds = AdvTaobinMenu + ".mp4"
             EndIf
             If CurrentXMLFileName2 = "" Then
+                DEBUGVAR CountDownPauseVideo2
                  If CountDownPauseVideo2 < 2 Then
                     Var AdvTaobinMenu = "/mnt/sdcard
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 Else
+                    DEBUGVAR CurrentXMLFileName2
                     Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" +  a_video_menu[ads_idx]
                     Var DisplayAds = AdvTaobinMenu + ".mp4"
                 EndIf

inter/aus/xml/page_brewing3.lxml

@@ -449,6 +449,7 @@
 	DEBUGVAR Seeker
 	If game_mode_enable = "true" Then
 		
+		CheckApp "com.NDF.taobin" GameInstalled
 		
 		DEBUGVAR GameInstalled
 		
@@ -721,14 +722,15 @@
 	Var Timeout = Timeout + 1
 	
 	If Timeout < 2 Then
-		If Game01Enable = 0 Then
+		If GameInstalled = "true" Then
-			If game_mode_enable = "true" Then
+			If Game01Enable = 0 Then
-				If BREW_CNT > 75 Then
+				If game_mode_enable = "true" Then
-					SAVELOG "Button game enable from EventTimeout"
+					If BREW_CNT > 75 Then
-					Var Game01Enable = 1
+						SAVELOG "Button game enable from EventTimeout"
-					Var ButtonGameCountDownState = "Invisible"
+						Var Game01Enable = 1
-					Var ButtonGamePressToPlayState = "Enable"
+						Var ButtonGameCountDownState = "Invisible"
-			
+						Var ButtonGamePressToPlayState = "Enable"
+					EndIf
 				EndIf
 			EndIf
 		EndIf

inter/sgp/menu/lang.tsv

@@ -146,8 +146,8 @@ TextID	Note	English	Thai
 
 
 	Page brewing
+		Font=Kanit,Type=Regular,Size=36,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=30
 		Font=Kanit,Type=Regular,Size=36,Color=0xFFFFFF,Align=Center,LineHeight=30
-		Font=Kanit,Type=Regular,Size=36,Color=0xDE794E,Align=Centerr,LineHeight=30
 000400		Notify us about lid problem	แจ้งเตือนฝาติด
 000401		Notify us about straw problem	แจ้งเตือนหลอดติด
 
@@ -851,9 +851,9 @@ TextID	Note	English	Thai
 800771		Type number.	ใส่ตัวเลข
 800772
 800773		Exhaust Fan Test	ทดสอบพัดลมดูดอากาศ
-800774
+800774			ตรวจสอบลูกเบี้ยว
-800775
+800775		Cam powder test pass	ทดสอบผ่าน
-800776
+800776		Cam powder test fail	ทดสอบไม่ผ่าน
 810000
 810001		Start	เริ่มทำงาน
 810002		Stop	หยุดทำงาน
@@ -957,8 +957,8 @@ TextID	Note	English	Thai
 810150		Volume	ปริมาณ
 810151		Water Tank	ถังน้ำดี
 810152		Day	วันที่
-810153
+810153		Weight	น้ำหนัก
-810154
+810154		calibrate	calibrate
 810155
 810156
 810157

inter/uae_dubai/xml/page_topping_select6.lxml

@@ -113,22 +113,14 @@
 		Var text_x_add_oreo_price = 510
 		Var text_show_normal_x = 408
 		Var SugarZeroCalPrice_X = 540
-	Else
+	EndIf
-	
-		Var DirImage = "ROOT/taobin_project/image/topping2"
-		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
-		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
-		Var showname = NameDrinkTH
-		Var showdesc = DrinkDescriptionTH
 
-		Var text_show_thai = "Enable"
+	If LanguageShow = "UAE_DUBAI" Then
-		Var text_show_eng = "Invisible"
+		Var topping_shot_price_x = 630
-
+		Var text_x_add_oreo_price = 620
-		Var topping_shot_price_x = 600
+		Var text_show_normal_x = 535
-		Var text_x_add_oreo_price = 490
+		Var text_milk_choice_price_x = 325
-		Var text_show_normal_x = 386
+		Var SugarZeroCalPrice_X = 540
-		Var SugarZeroCalPrice_X = 482
-	
 	EndIf
 
 	Var bg_strawlid = DirImage + "/bg_strawlid.png"
@@ -491,13 +483,14 @@
 		If SugarSoundFlag = 1 Then
 			Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
 		EndIf
+	EndIf
 	
 
 	If LanguageShow = "UAE_DUBAI" Then
 		Var topping_shot_price_x = 630
-		Var text_x_add_oreo_price = 600
+		Var text_x_add_oreo_price = 620
-		Var text_show_normal_x = 528
+		Var text_show_normal_x = 535
-		Var text_milk_choice_price_x = 295
+		Var text_milk_choice_price_x = 325
 		Var SugarZeroCalPrice_X = 540
 	EndIf
 	

inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml

@@ -0,0 +1,207 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> BackgroundColor </Background>
+;<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	
+	Var Timeout = 0 
+	Var LangButtonEnable = "Enable"
+
+	If CountryName = "Singapore" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
+
+	If CountryName = "HongKong" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
+		
+	DEBUGVAR LangButtonEnable
+
+	If show_eng = "true" Then 
+		
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+		If CountryName = "Singapore" Then
+			Var show_btp = ""
+			Var show_btn = ""
+
+		EndIf
+
+	
+
+		Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_thankyou_en"
+	Else
+		
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+
+		If CountryName = "Singapore" Then
+			Var show_btp = ""
+			Var show_btn = ""
+
+		EndIf
+	
+
+		Var DirImage = "ROOT/taobin_project/image/page_thankyou"
+	EndIf
+
+	If show_eng = "true" Then 
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Dont_forget_your_changes_below.mp3"
+	Else
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Dont_forget_your_changes_below.mp3"
+	EndIf
+
+	Var imgGetChange = "/imgGetChange.png"
+	
+	;inter-image
+    If CountryName = "Malaysia" Then
+		Var imgGetChange = "/imgGetChange-MYR.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "Indonesia" Then
+		Var imgGetChange = "/imgGetChange-IDR.png"
+	EndIf 
+
+	;inter-image
+	If CountryName = "Singapore" Then
+		Var imgGetChange = "/imgGetChange-SGP.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "HongKong" Then
+		Var imgGetChange = "/imgGetChange-HKG.png"
+	EndIf
+
+	;inter-image
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var imgGetChange = "/imgGetChange-UAE_DUBAI.png"
+	EndIf
+
+	;INT StoreCreditAmount
+	Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )
+
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	Var Timeout = Timeout + 1 
+
+    If Timeout >= 2 Then 
+
+        If ChangeStatus = "payout-end" Then 
+            Var Timeout = 30
+        EndIf
+
+        If Seeker = "curr" Then
+            Var Timeout = 30
+        EndIf 
+
+        If Timeout >= 30 Then
+
+         	If Seeker.PayWithQR = 0 Then
+				DEBUGVAR TxRef1
+				Var PayDetail2 = ToppingDetail
+				DEBUGVAR PayDetail
+				DEBUGVAR PayDetail2
+
+				UpdateTxRef2 TxRef1  ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate PayO2 PdpaAccept VendingDiscount VendingCampaign PayReference PayType CreditReference PayDetail PayDetail2
+			EndIf
+
+			If InternationalEnable = 1 Then
+				Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
+				Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
+
+				If Seeker = "next" Then
+					;CoinBack
+				    Open Brew3ConInter 
+				Else
+				    Open Brew3Inter 
+				EndIf
+			Else
+
+				If New_Payment = 1 Then
+					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+				EndIf
+
+				If Seeker = "next" Then
+					;CoinBack
+				    Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+				Else
+				    Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+				EndIf
+
+				
+			EndIf	
+
+			;If New_Payment = 1 Then
+			;	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/payment.ev"
+			;EndIf
+
+            ;If Seeker = "next" Then
+                ;CoinBack
+            ;    Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+            ;Else
+            ;    Open "ROOT/taobin_project/xml/page_brewing3.xml"  
+            ;EndIf
+
+        EndIf
+
+    EndIf
+
+  
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+<Button>
+<X> 990 </X>
+<Y> 416 </Y>
+<State> LangButtonEnable </State>
+<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> 932 </Y>
+<Filename> Var( DirImage + imgGetChange ) </Filename>
+</Image>
+
+
+<Text>
+<X> 0 </X>
+<Y> 1123 </Y>
+<Size> 144 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> PopupBodyTextColor </Color>
+<Value> StoreCreditAmountStr </Value>
+</Text>
+
+</Popup>

inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml

@@ -2484,6 +2484,8 @@ Var SELLONLINE = 1
 Var EnoughChange = "yes"
 Var PayState1 = "Enable"
 
+Var CoinAmount = 300
+
 </EventUnitTest2>
 
 <EventUnitTest3>

xml/page_board.xml

@@ -924,7 +924,7 @@
 		Var UsePepsiTheme = 1
 		Var TargetThemeNum = 2
 
-		; Var VideoAdvert = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		; Var  = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 	
 

xml/page_get_yourchange.xml

@@ -18,6 +18,10 @@
 	If CountryName = "HongKong" Then
 		Var LangButtonEnable = "Invisible"
 	EndIf
+
+	If CountryName = "UnitedArabEmirates Dubai" Then
+		Var LangButtonEnable = "Invisible"
+	EndIf
 		
 	DEBUGVAR LangButtonEnable
 

xml/page_lid_straw.xml

@@ -150,7 +150,16 @@
 			EndIf
 
 		Else
-			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
+
+			If UsePepsiTheme = 1 Then
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
+				EndIf
+			Else
+				Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
+			EndIf
+
+			
 		EndIf
 	Else
 
@@ -180,7 +189,13 @@
 				Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 			EndIf	
 		Else
-			Open "ROOT/taobin_project/xml/page_get_yourchange.xml"  
+			If UsePepsiTheme = 1 Then
+				If CountryName = "Singapore" Then
+					Open "ROOT/taobin_project/inter/whatthecup/sgp/xml/page_get_yourchange-SGP_blue.xml"
+				EndIf
+			Else
+				Open "ROOT/taobin_project/xml/page_get_yourchange.xml"
+			EndIf
 		EndIf
 	EndIf
 		

xml/page_payment_cash-AUS.xml

@@ -1646,7 +1646,7 @@ EndIf
 <Y> 748 </Y>
 ;inter-image
 <State> alphaState2 </State>
-<Filename> Var( DirImage2 + "/img_popup11-MYR.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
 </Image>
 
 

xml/page_payment_cash-UAE.xml

@@ -1266,11 +1266,11 @@
 					Var alphaState3_offline = "Enable"
 				EndIf
 
-				If show_eng = "true" Then 
+				;If show_eng = "true" Then 
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/The_change_has_run_out.mp3"
-				Else
+				;Else
-					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
+				;	PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/The_change_has_run_out.mp3"
-				EndIf
+				;EndIf
 
 			EndIf
 			
@@ -1949,22 +1949,22 @@ EndIf
 <X> 182 </X>
 <Y> 748 </Y>
 <State> alphaState3 </State>
-<Filename> Var( DirImage + "/img_popup12.png" )</Filename>
+<Filename> Var( DirImage2 + "/img_popup12_uae.png" )</Filename>
 </Image>
 
-<Button>
+;<Button>
-<X> 327 </X>
+;<X> 327 </X>
-<Y> 1208 </Y>
+;<Y> 1208 </Y>
-<State> alphaState3 </State>
+;<State> alphaState3 </State>
-<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
+;<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
-<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
+;<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
+;<Volume> SoundVolume </Volume>
-<EventClick> 
+;<EventClick> 
-
+;
-		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
+;		Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
-</EventClick>
+;</EventClick>
-</Button>
+;</Button>
 
 <Button>
 <X> 327 </X>

xml/page_payment_credit3-TopupCash.xml

@@ -67,6 +67,12 @@
 		Var img_popup15 = "/img_popup15-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+		Var img_popup15 = "/img_popup15-AUS.png"
+	EndIf
+
     
     
 	Var CreditAmount = SumCreditAmount

xml/page_payment_credit3.xml

@@ -105,6 +105,11 @@
 		Var img_popup11 = "/img_popup11-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 

xml/page_topup_credit3-TopupCash.xml

@@ -69,6 +69,12 @@
 		Var img_popup15 = "/img_popup15-HKG.png"
 	EndIf
 
+	;inter-image
+	If CountryName = "Australia" Then
+		Var img_popup11 = "/img_popup11-AUS.png"
+		Var img_popup15 = "/img_popup15-AUS.png"
+	EndIf
+
 
 	Var CreditAmount = 0