WTC+SGP: change collect pt ui and member regis QR

inter/sgp/xml/page_collect_point_1.lxml

@@ -1186,6 +1186,11 @@
 	Var DebugBypassCollectPt2 = 1
 	DEBUGVAR DebugBypassCollectPt2
 
+
+	Var TaobinLevel = "2"
+	Var CoffeePoint = 55
+
+
 </EventUnitTest1>
 
 

inter/sgp/xml/page_collect_point_2.lxml

@@ -42,6 +42,10 @@
 		Var TelephoneNumber = TelephoneNumberX
 		Var Seeker.TNumberTaobinMember= TelephoneNumber
 
+        Var TaobinLevel = 2
+        Var CoffeePointRank = 55
+        DEBUGVAR TaobinLevel
+
 		; reset
 		Var DebugBypassCollectPt2 = 0
 
@@ -416,4 +420,3 @@
 
 
 </Popup>
-	

inter/sgp/xml/page_collect_point_3.lxml

@@ -253,119 +253,64 @@
         ;EndIf
 
         If TaobinLevel = "2" Then
-            Var TaobinLevelDesc1 = "Walking turtle level"
+            Var TaobinLevelDesc1 = "CUPPING"
+            Var TaobinLevelDesc1Cont = "GOOD!"
+
+            Var TaobinLevelDesc1More = "BRONZE LEVEL"
 			Var PointDiff = 150 - CoffeePointRank
             Var TaobinLevelDesc2 = "Earn " + PointDiff
             Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
             Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Flying turtle level"
 
-            Var TaobinLeveImg = "/taoLevel2.png"
+            Var TaobinLeveImg = "/WTCLevel1.png"
 
 			If CoffeePointRank > 149 Then
-				;Var TaobinLeveImg = "/taoLevel3.png"
+				Var TaobinLeveImg = "/WTCLevel2.png"
 
-				;Var TaobinLevelDesc1 =  "Flying turtle level "
+				Var TaobinLevelDesc1 =  "CUPPING"
+				Var TaobinLevelDesc1Cont = "BETTER!"
+
+
+				Var TaobinLevelDesc1More = "SILVER LEVEL"
             	Var TaobinLevelDesc2 = ""
-				;Var CoffeePointRank = CoffeePointRank - 150
+				Var CoffeePointRank = CoffeePointRank - 150
 
 			EndIf
 
         EndIf
 
         If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
+            ;Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
 
             Var PointDiff = 350 - CoffeePointRank
             Var TaobinLevelDesc2 = "Earn " + PointDiff
             Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
             Var TaobinLevelDesc2 = TaobinLevelDesc2 + "to move to Master turtle level"
 
-            Var TaobinLeveImg = "/taoLevel3.png"
+            Var TaobinLeveImg = "/WTCLevel2.png"
 
 			If CoffeePointRank > 349 Then
-				;Var TaobinLeveImg = "/taoLevel4.png"
+				Var TaobinLeveImg = "/WTCLevel3.png"
 
-				;Var TaobinLevelDesc1 =  "Master turtle level "
+				Var TaobinLevelDesc1 =  "CUPPING"
+				Var TaobinLevelDesc1Cont = "BEST!"
+
+				Var TaobinLevelDesc1More = "GOLD LEVEL"
             	Var TaobinLevelDesc2 = ""
-				;Var CoffeePointRank = CoffeePointRank - 350
+				Var CoffeePointRank = CoffeePointRank - 350
 
 			EndIf
 
         EndIf
 
 		If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
+            ;Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
 
             Var TaobinLevelDesc2 = ""
 
-            Var TaobinLeveImg = "/taoLevel4.png"
+            Var TaobinLeveImg = "/WTCLevel3.png"
         EndIf
 
-
-
-	Else
-
-		Var TaobinLevelDesc3 = "ตอนนี้คุณมีคูปองแลกเครื่องดื่มฟรีเหลืออยู่ "
-		Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
-		Var TaobinLevelDesc3 = TaobinLevelDesc3 + " ใบ"
-
-		;If TaobinLevel = "1" Then
-        ;    Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าขี้อาย"
-        ;    Var TaobinLevelDesc2 = ""
-
-        ;    Var TaobinLeveImg = "/taoLevel1.png"
-        ;EndIf
-
-        If TaobinLevel = "2" Then
-            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าเตาะแตะ"
-			Var PointDiff = 150 - CoffeePointRank
-            Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นเต่าติดปีก"
-
-            Var TaobinLeveImg = "/taoLevel2.png"
-
-			If CoffeePointRank > 149 Then
-				;Var TaobinLeveImg = "/taoLevel3.png"
-
-				;Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก "
-            	Var TaobinLevelDesc2 = ""
-				;Var CoffeePointRank = CoffeePointRank - 150
-
-			EndIf
-
-        EndIf
-
-        If TaobinLevel = "3" Then
-            Var TaobinLevelDesc1 = "ระดับสมาชิก เต่าติดปีก จนถึง " + ExpireStrTmp
-
-			Var PointDiff = 350 - CoffeePointRank
-            Var TaobinLevelDesc2 = "สะสมกระดองอีก " + PointDiff
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + " กระดอง "
-            Var TaobinLevelDesc2 = TaobinLevelDesc2 + "เพื่อเลื่อนขั้นเป็นผู้เฒ่าเต่า"
-
-            Var TaobinLeveImg = "/taoLevel3.png"
-
-			If CoffeePointRank > 349 Then
-				;Var TaobinLeveImg = "/taoLevel4.png"
-
-				;Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า "
-            	Var TaobinLevelDesc2 = ""
-				;Var CoffeePointRank = CoffeePointRank - 350
-
-			EndIf
-
-        EndIf
-
-		If TaobinLevel = "4" Then
-            Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp
-        
-            Var TaobinLevelDesc2 = ""
-
-            Var TaobinLeveImg = "/taoLevel4.png"
-        EndIf
-
-
 	EndIf
 
 
@@ -380,24 +325,24 @@
 	Var ShellXCol3 = 365
 	Var ShellXCol4 = 462
 	Var ShellXCol5 = 557
-	Var ShellXCol6 = 652
-	Var ShellXCol7 = 747
-	Var ShellXCol8 = 842
+	Var ShellXCol6 = 662
+	Var ShellXCol7 = 757
+	Var ShellXCol8 = 852
 
 	; 1-8
-	Var ShellYRow1 = 1037
+	Var ShellYRow1 = 1047
 	; 9-16
-	Var ShellYRow2 = 1120
+	Var ShellYRow2 = 1130
 	; 17-24
-	Var ShellYRow3 = 1203
+	Var ShellYRow3 = 1213
 	; 25-32
-	Var ShellYRow4 = 1282
+	Var ShellYRow4 = 1292
 	; 33-40
-	Var ShellYRow5 = 1365
+	Var ShellYRow5 = 1375
 	; 41-48
-	Var ShellYRow6 = 1448
+	Var ShellYRow6 = 1458
 	; 49-55
-	Var ShellYRow7 = 1531
+	Var ShellYRow7 = 1541
 
 
 	Var taobinP1 = "Invisible"
@@ -1095,7 +1040,6 @@
 ;
 
 
-
 <Image>
 <X> 108 </X>
 <Y> 665 </Y>
@@ -1109,24 +1053,50 @@
 </Image>
 
 
-<Image>
-<X> 243 </X>
-<Y> 722 </Y>
-<Filename> Var( DirImage + "/text7.png" )</Filename>
-</Image>
+;<Image>
+;<X> 483 </X>
+;<Y> 700 </Y>
+;<Filename> Var( DirImage + "/text7.png" )</Filename>
+;</Image>
+
+
+;<Text>
+;<X> 483 </X>
+;<Y> 750 </Y>
+;<Size> 38 </Size>
+;<Font> PepsiExtend </Font>
+;<Color> HeadlineColor </Color>
+;<Value> TaobinLevelDesc1 </Value>
+;</Text>
+
+<Text>
+<X> 483 </X>
+<Y> 730 </Y>
+<Size> 20 </Size>
+<Font> PepsiExtend </Font>
+<Color> WTCMediumBlueColor </Color>
+<Value> "MEMBERSHIP\nSTATUS:" </Value>
+</Text>
+
+
+;<Image>
+;<X> 483 </X>
+;<Y> 900 </Y>
+;<Filename> Var( DirImage + "/text4.png" )</Filename>
+;</Image>
+
+<Text>
+<X> 483 </X>
+<Y> 930 </Y>
+<Size> 20 </Size>
+<Font> PepsiExtend </Font>
+<Color> WTCMediumBlueColor </Color>
+<Value> "TOTAL BALANCE:" </Value>
+</Text>
 
 
 <Image>
 <X> 243 </X>
-<Y> 860 </Y>
-<Filename> Var( DirImage + "/text4.png" )</Filename>
-</Image>
-
-
-
-
-<Image>
-<X> 625 </X>
 <Y> 734 </Y>
 <Filename> Var( DirImage + TaobinLeveImg )</Filename>
 </Image>
@@ -1555,8 +1525,8 @@
 
 ; free
 <Button>
-<X> 747 </X>
-<Y> 1528 </Y>
+<X> 740 </X>
+<Y> 1535 </Y>
 <Filename> Free1 </Filename>
 </Button>
 
@@ -1567,24 +1537,24 @@
 <Filename> Var( DirImage + taobinImgP55 )</Filename>
 </Button>
 
-<Text>
-<X> 250 </X>
-<Y> 790 </Y>
-<Size> 20 </Size>
-<Width> 1000 </Width>
-<Font> KanitRegularTTF </Font>
-<Color> 0x746253 </Color>
-<Value> TNumberTaobinMemberXXX </Value>
-<Format> Telnum-mask-3 </Format>
-</Text>
+;<Text>
+;<X> 250 </X>
+;<Y> 790 </Y>
+;<Size> 20 </Size>
+;<Width> 1000 </Width>
+;<Font> KanitRegularTTF </Font>
+;<Color> 0x746253 </Color>
+;<Value> TNumberTaobinMemberXXX </Value>
+;<Format> Telnum-mask-3 </Format>
+;</Text>
 
 <Text>
-<X> 250 </X>
-<Y> 890 </Y>
-<Size> 50 </Size>
+<X> 720 </X>
+<Y> 930 </Y>
+<Size> 20 </Size>
 <Width> 120 </Width>
-<Font> KanitRegularTTF </Font>
-<Color> 0xDE794E </Color>
+<Font> PepsiExtend </Font>
+<Color> WTCMediumBlueColor </Color>
 <Value> CoffeePointRank </Value>
 </Text>
 
@@ -1595,15 +1565,37 @@
 <Filename> Var( DirImage + "/pointMask.png" )</Filename>
 </Button>
 
-;<Text>
-;<X> 250 </X>
-;<Y> 990 </Y>
-;<Size> 25 </Size>
-;<Width> 1000 </Width>
-;<Font> KanitRegularTTF </Font>
-;<Color> 0xDE794E </Color>
-;<Value> TaobinLevelDesc1 </Value>
-;</Text>
+<Text>
+<X> 483 </X>
+<Y> 800 </Y>
+<Size> 50 </Size>
+<Font> PepsiExtend </Font>
+<Color> HeadlineColor </Color>
+<Value> TaobinLevelDesc1 </Value>
+</Text>
+
+; TaobinLevelDesc1Cont
+<Text>
+<X> 483 </X>
+<Y> 838 </Y>
+<Size> 50 </Size>
+<Font> PepsiExtend </Font>
+<Color> HeadlineColor </Color>
+<Value> TaobinLevelDesc1Cont </Value>
+</Text>
+
+
+; TaobinLevelDesc1More
+<Text>
+<X> 483 </X>
+<Y> 898 </Y>
+<Size> 20 </Size>
+<Font> PepsiExtend </Font>
+<Color> HeadlineColor </Color>
+<Value> TaobinLevelDesc1More </Value>
+</Text>
+
+
 
 ;<Text>
 ;<X> 250 </X>
@@ -1703,8 +1695,9 @@
 	Var taobinP42 = "Enable"
 
 	Var taobinP50 = "Enable"
+
+	Var taobinP55 = "Enable"
 </EventUnitTest1>
 
 
 </Popup>
-	

inter/sgp/xml/page_member_prompt.lxml

@@ -151,7 +151,7 @@
 
 
 <Image>
-<X> 400 </X>
+<X> 300 </X>
 <Y> 1065 </Y>
 <State> DisplayQR </State>
 <Filename> QRImg </Filename>

inter/whatthecup/sgp/xml/page_display_get_free.xml

@@ -0,0 +1,201 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> BackgroundColor </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	Var Timeout = 0
+	If show_eng = "true" Then
+		Var DirImage = CountryWTCRootPath + "/image/display_get_free_en"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_free"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+
+	Var MemberState1 = "Enable"
+	Var MemberState2 = "Invisible"
+	Var MemberState3 = "Invisible"
+
+	;Var TaobinLevel = "3"
+
+	DEBUGVAR TaobinLevel
+
+	If TaobinLevel = "1" Then
+    	Var MemberState1 = "Invisible"
+		Var MemberState2 = "Enable"
+		Var MemberState3 = "Invisible"
+
+		If show_eng = "true" Then
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Get_free_drink_faster.mp3"
+		Else
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Get_free_drink_faster.mp3"
+		EndIf
+
+	Else
+
+		If show_eng = "true" Then
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/You_mode_it.mp3"
+		Else
+			PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/You_mode_it.mp3"
+		EndIf
+
+    EndIf
+
+	If Seeker.FromConsent = 1 Then
+		Var MemberState1 = "Invisible"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Enable"
+	EndIf
+
+
+	Var img_popup2 = "/img_popup2.png"
+	Var img_popup3 = "/img_popup3.png"
+
+	;inter-condition
+	;inter-image not use. because customer auto assige member.
+	If InternationalEnable = 1 Then
+
+		Var MemberState1 = "Enable"
+		Var MemberState2 = "Invisible"
+		Var MemberState3 = "Invisible"
+	EndIf
+
+
+
+
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+	Var CountDownBrewing = BREW_CNT
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+
+	Var Timeout = Timeout + 1
+	If Timeout > 5 Then
+    	; goto lid straw
+
+
+
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		;Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout>
+
+
+
+
+
+<EventSecurity>
+	Open "/media/bt/xml/security_alarm.xml"
+</EventSecurity>
+
+<EventActionOk>
+	;
+
+</EventActionOk>
+
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/display_point/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> MemberState1 </State>
+<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> MemberState2 </State>
+<Filename> Var( DirImage + img_popup2 )</Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<State> MemberState3 </State>
+<Filename> Var( DirImage + img_popup3 )</Filename>
+</Image>
+
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	; goto lid straw
+
+
+
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+;
+;<Image>
+;<X> 751 </X>
+;<Y> 413 </Y>
+;<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+;</Image>
+;
+;<Text>
+;<X> XPosiShowCountDownBrew </X>
+;<Y> 470 </Y>
+;<Align> End </Align>
+;<Width> 153 </Width>
+;<Size> 88 </Size>
+;<Font> RobotoBold </Font>
+;<Color> 0x513C2F </Color>
+;<Value> ShowCountDownBrewing </Value>
+;</Text>
+
+
+</Popup>

xml/page_board.xml

@@ -108,6 +108,9 @@
 	Var InterRegular = "ROOT/taobin_project/font/Inter/Inter-Regular.ttf"
 
 
+	Var PepsiExtend = "ROOT/taobin_project/font/PepsiOwners2/PepsiOwners2-Extended220909.ttf"
+
+
 	Var countClick = 0
 
 	Var RoadShow = "false"
@@ -907,6 +910,9 @@
 		If BoxID = 210604 Then
 			Var SettingIgnoreCollectPoint = 0
 		EndIf
+		If BoxID = 210699 Then
+			Var SettingIgnoreCollectPoint = 0
+		EndIf
 
 		READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev
 		STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg
@@ -994,8 +1000,8 @@
 		Var MinPhoneNumber = 9
 		Var MaxPhoneNumber = 9
 
-		Var UsePepsiTheme = 1
-		Var TargetThemeNum = 2
+		;Var UsePepsiTheme = 0
+		;Var TargetThemeNum = 2
 
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
 
@@ -1157,7 +1163,9 @@
 		EndIf
 	EndIf
 
+	If ProYuzu250Enable = 0 Then
 		TRY "ROOT/taobin_project/xml/profile/run.ev"
+	EndIf
 
 	Var NETCORE_LOST_COUNT_UP = 0
 

xml/page_display_get_free.xml

@@ -2,10 +2,17 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+<Background> BackgroundColor </Background>
 <Volume> SoundVolume </Volume>
 
 <EventOpen>
+
+    If UsePepsiTheme = 1 Then
+        Var WTCGetFree = CountryWTCRootPath + "/xml/page_display_get_free.xml"
+        Open WTCGetFree
+    EndIf
+
+
 	; On open
 	Var Timeout = 0
 	If show_eng = "true" Then
@@ -199,4 +206,3 @@
 
 
 </Popup>
-