Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inter/sgp/xml/page_drinkfail_sg.lxml

@@ -188,7 +188,7 @@ EndIf
 
 <Image>
 <X> 329 </X>
-<Y> 1301 </Y>
+<Y> 1351 </Y>
 <State> ShowQRByNoMember </State>
 <Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
 </Image>

inter/tha/xml/multi/page_catalog.lxml

@@ -1047,7 +1047,7 @@
 <Button>
 <X> 225 </X>
 <Y> 424 </Y>
-<State> "Enable" </State>
+<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>
@@ -1071,7 +1071,7 @@
 <Button>
 <X> 696 </X>
 <Y> 424 </Y>
-<State> "Enable" </State>
+<State> ButtontoTopupMenu </State>
 <Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
 <FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>

inter/tha/xml/multi/v3/page_catalog_group_other.lxml

@@ -4439,9 +4439,9 @@
 		; - 12-05-02-0150 - 
 		<Menu>
 		<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@@ -4533,7 +4533,7 @@
 			<Value> $Sum1205020150TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price

inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml

@@ -4454,9 +4454,9 @@
 		; - 12-05-02-0150 - 
 		<Menu>
 		<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@@ -4548,7 +4548,7 @@
 			<Value> $Sum1205020150TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price

inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml

@@ -1714,9 +1714,9 @@
 		; - 12-05-02-0150 - 
 		<Menu>
 		<State> Flag( 12-05-02-0150.Button,DateTimeStart="2025/04/01T00:00:00",Var=KingdomThaiTeaPro,$Sum1205020150) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@@ -1808,7 +1808,7 @@
 			<Value> $Sum1205020150TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price

inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml

@@ -1440,9 +1440,9 @@
 		; - 12-05-02-0150 - 
 		<Menu>
 		<State> Flag( 12-05-02-0150.Button,$Sum1205020150) </State>
-		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi Caramel.png" </IdleImage>
-		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi Caramel.png" </PressImage>
-		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi Caramel.png" </DisableImage>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_Pepsi_Caramel.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_Pepsi_Caramel.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_Pepsi_Caramel.png" </DisableImage>
 		<Name>
 			<LanguageGroup>
 				<LanguageSlot1>Pepsi Caramel</LanguageSlot1>
@@ -1534,7 +1534,7 @@
 			<Value> $Sum1205020150TextValue </Value>
 		</ConditionalDisable>
 		<EventOnClick>
-			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi Caramel.png"
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_Pepsi_Caramel.png"
 			GetInstanceIDMenuTab OpenFromInstMenuTab
 			Var OpenFromXML = CurrentXMLFileName2
 			Var PriceD1 = $##-##-##-####.Price

inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml

@@ -91,6 +91,7 @@
 
 	;SAVELOG PreviseXMLFileName2
 
+	Var MenuReady = "-"
 
 	Var topping1 = "1"
 	Var topping2 = "31"
@@ -385,6 +386,120 @@
 		;include="ROOT/taobin_project/inc/return_condition.ev"
 	EndIf
 
+
+
+	If SelectDrinkType = 1 Then
+
+		If MenuReady = "YES" Then
+			DEBUGVAR ToppingDetail
+
+			; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
+
+			READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
+			DEBUGVAR menu_blend_free
+			DEBUGVAR blend_button_state
+			DEBUGVAR DoorCupPosition
+			DEBUGVAR show_eng
+
+			If menu_blend_free = "true" Then
+				If blend_button_state = "PressForever" Then
+					Var PriceDrinkNoTop = 0
+					Var PriceDrink = 0
+					Var PriceDrinkTmpShow = "Free"
+				EndIf
+			EndIf
+
+
+
+			If  Seeker = "next" Then
+				If CupRemain > 0 Then
+
+					If Only18 = "true" Then
+						DEBUGVAR SelectDrink
+						MenuProfile SelectDrink "IsMenuInProfile"
+
+						; disable old verification
+						Var AdultState1 = "Invisible"
+
+						DEBUGVAR IsMenuInProfile
+
+						If IsMenuInProfile = "true" Then
+
+							; Check profile
+
+							If EnableLiveness = "true" Then
+								DEBUGVAR EnableLiveness
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+								; full
+								Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+							Else
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+								; Only IDCard
+								Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+							EndIf
+
+						Else
+							OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+							Open "ROOT/taobin_project/xml/page_payment.xml"
+						EndIf
+					Else
+						OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+						Open "ROOT/taobin_project/xml/page_payment.xml"
+					EndIf
+				EndIf
+
+			Else
+				If DoorCupPosition = "bottom" Then
+					OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+					If FromEnergyDrink1BathPro = 1 Then
+						Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
+					EndIf
+
+						If Only18 = "true" Then
+							DEBUGVAR SelectDrink
+							MenuProfile SelectDrink "IsMenuInProfile"
+
+							; disable old verification
+							Var AdultState1 = "Invisible"
+
+							DEBUGVAR IsMenuInProfile
+
+							If IsMenuInProfile = "true" Then
+
+								; Check profile
+
+								If EnableLiveness = "true" Then
+									DEBUGVAR EnableLiveness
+									OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+									; full
+									Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+								Else
+									OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+									; Only IDCard
+									Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+								EndIf
+
+							Else
+								OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+								Open "ROOT/taobin_project/xml/page_payment.xml"
+							EndIf
+						Else
+							OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+							Open "ROOT/taobin_project/xml/page_payment.xml"
+						EndIf
+				EndIf
+			EndIf
+
+
+
+
+
+		EndIf
+		If MenuReady = "YES" Then
+
+		EndIf
+	EndIf
+
 	Var Timeout = Timeout + 1
 
 	If Timeout > 40 Then
@@ -3485,7 +3600,25 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
+	;Var Seeker = "curr"
+
+	Var Timeout = 0
+
+
+	Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
+
+	__CMD "statement" 0 StatementCheckMenu "-"
+
+	DEBUGVAR StatementCheckMenu
+	DEBUGVAR PriceDrinkTmp
+
+	;Var Seeker.PriceDrink = PriceDrinkTmp
+
 	Var PriceDrink = PriceDrinkTmp
+	Var PromotionPriceDrink = PriceDrink
+
+	DEBUGVAR PriceDrink
+
 	SAVELOG "USER press next ( topping ) - new"
 	DEBUGVAR topping1
 	DEBUGVAR topping2
@@ -3505,6 +3638,13 @@
 	If LidState = "Press" Then
 		Machine LidOrder
 		Var LedLidBlink = "true"
+		Var bg_lidProblem_ST = "Enable"
+	Else
+		If LidState = "Disable" Then
+			Var bg_lidProblem_ST = "Disable"
+		Else
+			Var bg_lidProblem_ST = "Invisible"
+		EndIf
 	EndIf
 
 	Var StrawState = "Enable"
@@ -3566,6 +3706,12 @@
 
 	;Var Seeker = "curr"
 
+	Var StatementCheckMenu = "ProductCodeCheck=" + UserSelectProductCode
+
+	__CMD "statement" 0 StatementCheckMenu "-"
+
+	DEBUGVAR StatementCheckMenu
+
 
 	DEBUGVAR PriceDrinkTmp
 
@@ -3675,7 +3821,11 @@
 		Var LedLidBlink = "true"
 		Var bg_lidProblem_ST = "Enable"
 	Else
-		Var bg_lidProblem_ST = "Invisible"
+		If LidState = "Disable" Then
+			Var bg_lidProblem_ST = "Disable"
+		Else
+			Var bg_lidProblem_ST = "Invisible"
+		EndIf
 	EndIf
 
 	If SelectDrinkType = 0 Then
@@ -3755,7 +3905,8 @@
 		Else
 			If SelectDrinkType = 1 Then
 				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-				Open "ROOT/taobin_project/xml/page_payment.xml"
+				;Open "ROOT/taobin_project/xml/page_payment.xml"
+				DEBUGVAR "WaitCheckMenu"
 			EndIf
 		EndIf
 

menu/new-layout.tsv

@@ -345,7 +345,7 @@ Name=Other,file=page_catalog_group_other.skt
 		เป๊ปซี่ลิ้นจี่	Pepsi  Lychee	เป๊ปซี่ โซดา ลิ้นจี่	Pepsi Lychee Soda	-	12-05-02-0057	12-05-03-0057	bn_Pepsi_Lychee.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่สตรอเบอรี	Pepsi Strawberry	เป๊ปซี่ โซดา สตรอเบอรี	Pepsi Strawberry Soda	-	12-05-02-0058	12-05-03-0058	bn_Pepsi_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะนาว	Pepsi Lime	เป๊ปซี่ โซดา มะนาว	Pepsi Lime Soda	-	12-05-02-0149	12-05-03-0149	bn_Pepsi_Lime.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
-		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
+		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi_Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะพร้าว	Pepsi Coconut	เป๊ปซี่ มะพร้าว โซดา	Pepsi Coconut Soda	-	12-05-02-0114	12-05-03-0114	bn_Pepsi_Coconut.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0104	12-05-03-0104	bn_iced_pepsi_plum.png	-	-	-	posi1	-	-	-	-
 
@@ -460,7 +460,7 @@ IGNORE		-	Pepsi Max	-	-	-	12-05-02-0062	12-05-03-0062	-	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่สตรอเบอรี	Pepsi Strawberry	เป๊ปซี่ โซดา สตรอเบอรี	Pepsi Strawberry Soda	-	12-05-02-0058	12-05-03-0058	bn_Pepsi_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	12-05-03-0148	bn_Pepsi_Tropical.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะนาว	Pepsi Lime	เป๊ปซี่ โซดา มะนาว	Pepsi Lime Soda	-	12-05-02-0149	12-05-03-0149	bn_Pepsi_Lime.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
-		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
+		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi_Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะพร้าว	Pepsi Coconut	เป๊ปซี่ มะพร้าว โซดา	Pepsi Coconut Soda	-	12-05-02-0114	12-05-03-0114	bn_Pepsi_Coconut.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0046	12-05-03-0046	bn_Pepsi_Plum.png	-	-	-	posi1	-	-	-	-	-	#REF!	#REF!	#REF!	#REF!
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0104	12-05-03-0104	bn_Pepsi_Plum.png	-	-	-	posi1	-	-	-	-
@@ -508,7 +508,7 @@ Name=Other,file=page_catalog_group_other_other.skt
 		เป๊ปซี่มะนาว	Pepsi Lime	เป๊ปซี่ โซดา มะนาว	Pepsi Lime Soda	-	12-05-02-0149	12-05-03-0149	bn_Pepsi_Lime.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่สตรอเบอรี	Pepsi Strawberry	เป๊ปซี่ โซดา สตรอเบอรี	Pepsi Strawberry Soda	-	12-05-02-0058	12-05-03-0058	bn_Pepsi_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	12-05-03-0148	bn_Pepsi_Tropical.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
-		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
+		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi_Caramel.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	12-05-03-0148	bn_Pepsi_Tropical.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่มะพร้าว	Pepsi Coconut	เป๊ปซี่ มะพร้าว โซดา	Pepsi Coconut Soda	-	12-05-02-0114	12-05-03-0114	bn_Pepsi_Coconut.png	-	-	-	posi1	2025/04/01T00:00:00	-	KingdomThaiTeaPro	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0104	12-05-03-0104	bn_Pepsi_Plum.png	-	-	-	posi1	-	-	-	3
@@ -1267,7 +1267,7 @@ Name=PepsiXTaobin,file=page_catalog_group_pro_pepsi_x_taobin.skt
 		เป๊ปซี่สตรอเบอรี	Pepsi Strawberry	เป๊ปซี่ โซดา สตรอเบอรี	Pepsi Strawberry Soda	-	12-05-02-0058	12-05-03-0058	bn_Pepsi_Strawberry.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่ทรอปิคอล	Pepsi Tropical	เป๊ปซี่ เครื่องดื่มเต่าทรงพลัง มะพร้าว/n(มีคาเฟอีน)	Pepsi Medicine Drink Coconut Soda	-	12-05-02-0148	12-05-03-0148	bn_Pepsi_Tropical.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่มะนาว	Pepsi Lime	เป๊ปซี่ โซดา มะนาว	Pepsi Lime Soda	-	12-05-02-0149	12-05-03-0149	bn_Pepsi_Lime.png	-	-	-	posi1	-	-	-	-
-		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi Caramel.png	-	-	-	posi1	-	-	-	-
+		เป๊ปซี่คาราเมล	Pepsi Caramel	เป๊ปซี่ โซดา คาราเมล	Pepsi Caramel Soda	-	12-05-02-0150	12-05-03-0150	bn_Pepsi_Caramel.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่มะพร้าว	Pepsi Coconut 	เป๊ปซี่ มะพร้าว โซดา	Pepsi Coconut Soda	-	12-05-02-0114	12-05-03-0114	bn_Pepsi_Coconut.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0046	12-05-03-0046	bn_PEPSI_PLUM.png	-	-	-	posi1	-	-	-	-
 		เป๊ปซี่บ๊วย	Pepsi Plum	เป๊ปซี่ บ๊วย โซดา  	Pepsi, Ume & Ice	-	12-05-02-0104	12-05-03-0104	bn_PEPSI_PLUM.png	-	-	-	posi1	-	-	-	-

xml/page_board.xml

@@ -1021,12 +1021,6 @@
 
 		; Singapore disable point
 		Var SettingIgnoreCollectPoint = 1
-		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

xml/page_payment_cash.xml

@@ -9,7 +9,7 @@
 	RootLayoutVisible 3 "hide"
 
 	DEBUGVAR CountryName
-	
+
 	SAVELOG "cash version 1.1"
 
 	Var cash_disable = "0"
@@ -1392,6 +1392,8 @@
 			If VendingQRTypeResult = "KBA:2" Then
 				Var CashTextWarning = ""
 				Var QRErrorState = "Invisible"
+				Var PopupTimeoutEnable = "Enable"
+				Var PopupTimeout = 15
 				Var QRCODE99KBANK = SessionID
 				Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
 				SAVELOG Ext1a
@@ -1949,6 +1951,7 @@
 			If alphaState = "Enable" Then
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
+				Var PopupTimeoutEnable = "Invisible"
 				Var QRCODE99 = ""
 			EndIf
 		EndIf
@@ -2445,19 +2448,19 @@
 						EndIf
 					EndIf
 				EndIf
-
-				If PopupTimeoutEnable = "Enable" Then
-					If PopupTimeout > 0 Then
-						Var PopupTimeout = PopupTimeout - 1
-					Else
-						Var PopupTimeoutEnable = "Invisible"
-						Var cancelButtonQRPopupState = "Enable"
-					EndIf
-				EndIf
 			EndIf
 		EndIf
 	EndIf
 
+	If PopupTimeoutEnable = "Enable" Then
+		If PopupTimeout > 0 Then
+			Var PopupTimeout = PopupTimeout - 1
+		Else
+			Var PopupTimeoutEnable = "Invisible"
+			Var cancelButtonQRPopupState = "Enable"
+		EndIf
+	EndIf
+
 	Refresh
 	TimerReset
 </EventTimeout>
@@ -2996,7 +2999,7 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
-				Var cancelButtonQRPopupState = "Enable"
+				Var cancelButtonQRPopupState = "Invisible"
 				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
@@ -3270,7 +3273,7 @@
 <Y> 938 </Y>
 <Width> 1080 </Width>
 <Align> Center </Align>
-<MaxSize> 66 </MaxSize> 
+<MaxSize> 66 </MaxSize>
 <Size> Auto </Size>
 <MaxLine> 1 </MaxLine>
 <Font> KanitMediumTTF </Font>

xml/page_topping_select7.xml

@@ -2380,7 +2380,14 @@
 					Var showShotEnable = "Invisible"
 					Var ExtraTopping = "Enable"
 				Else
-					Var EnableLightRoast = "Enable"
+					If toppingID2index3 = 0 Then
+						Var EnableLightRoast = "Invisible"
+						Var ShotCoffeePremium = "Enable"
+						Var showShotEnable = "Invisible"
+						Var ExtraTopping = "Enable"
+					Else
+						Var EnableLightRoast = "Enable"
+					EndIf
 				EndIf
 
 				DEBUGVAR TOPPING2
@@ -2438,16 +2445,16 @@
 					Var CustomCoffeeQuantityAdditionalPrice[0] = ""
 				EndIf
 
-				If toppingID2price2 > 0 Then
-					Var priceFormated !assigned StringFmt( toppingID2price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
+				If toppingID2price3 > 0 Then
+					Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
 					Var CustomCoffeeQuantityAdditionalPrice[1] = "(+" + priceFormated
 					Var CustomCoffeeQuantityAdditionalPrice[1] = CustomCoffeeQuantityAdditionalPrice[1] + ")"
 				Else
 					Var CustomCoffeeQuantityAdditionalPrice[1] = ""
 				EndIf
 
-				If toppingID2price3 > 0 Then
-					Var priceFormated !assigned StringFmt( toppingID2price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
+				If toppingID2price4 > 0 Then
+					Var priceFormated !assigned StringFmt( toppingID2price4 , PriceCustomCoffeeFormat, PreScaleConvertShow)
 					Var CustomCoffeeQuantityAdditionalPrice[2] = "(+" + priceFormated
 					Var CustomCoffeeQuantityAdditionalPrice[2] = CustomCoffeeQuantityAdditionalPrice[2] + ")"
 				Else
@@ -2455,6 +2462,18 @@
 				EndIf
 			EndIf
 
+			If CustomCoffeeQuantityAdditionalPrice[1] = "" Then
+				Var CustomCoffeeQuantityTextX[1] = 809
+			Else
+				Var CustomCoffeeQuantityTextX[1] = 784
+			EndIf
+
+			If CustomCoffeeQuantityAdditionalPrice[2] = "" Then
+				Var CustomCoffeeQuantityTextX[2] = 922
+			Else
+				Var CustomCoffeeQuantityTextX[2] = 892
+			EndIf
+
 		;-END
 
 
@@ -6096,7 +6115,7 @@
 	</Button>
 
 	<Text>
-		<X> 694 </X>
+		<X> 699 </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -6106,7 +6125,8 @@
 	</Text>
 
 	<Text>
-		<X> 784 </X>
+		<Refresh> "Enable" </Refresh>
+		<X> CustomCoffeeQuantityTextX[1] </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -6116,7 +6136,8 @@
 	</Text>
 
 	<Text>
-		<X> 892 </X>
+		<Refresh> "Enable" </Refresh>
+		<X> CustomCoffeeQuantityTextX[2] </X>
 		<Y> CustomCoffeeTextY </Y>
 		<Font> KanitRegularTTF </Font>
 		<State> showCoffeeQuantity </State>
@@ -7907,10 +7928,10 @@
 			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price1
 		EndIf
 		If CustomCoffeeQuantityState[1] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
 		EndIf
 		If CustomCoffeeQuantityState[2] = "PressForever" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price3
+			Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price4
 		EndIf
 
 		If CustomCoffeeLevelState[0] = "PressForever" Then