fix conflict

This commit is contained in:
miggaze 2024-07-01 16:13:02 +07:00
commit 1aa230bc9f
313 changed files with 104942 additions and 5139 deletions

File diff suppressed because it is too large Load diff

View file

@ -1336,13 +1336,13 @@
</Block>
; menu_new_li;TAGESP
; ==================> Len = 12
; - 12-05-03-0092
; - - 12-05-03-0092
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-03-0092.Button,Disable=Invisible,$Sum1205030092) </State>
<State> Flag( 12-05-03-0092.Button,Disable=Invisible,$Sum1205030092) </State>
<Button>
<State> $Sum1205030092 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_smoothie_coconut.png" </Filename>
@ -1359,7 +1359,7 @@
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_coconut.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $.Price
Var PriceD2 = $-.Price
Var PriceD3 = $12-05-03-0092.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
@ -1384,7 +1384,7 @@
Var DefaultDrinkType = 3
EndIf
If PD_STAGE_2 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
@ -1498,7 +1498,7 @@
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 146 </X>

View file

@ -0,0 +1,32 @@
[
{
"name": "cocoa_77",
"template": "/event/promotion_video_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"normal_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"press_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"press_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"disable_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"disable_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.png",
"video_eng": "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4",
"video_thai": "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4",
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
}
},
{
"name": "nam_hom_coconut",
"template": "/event/promotion_video_template.inc",
"config": {
"normal_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
"normal_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
"press_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
"press_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
"disable_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png",
"disable_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.png",
"video_eng": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.mp4",
"video_thai": "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4",
"event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
}
}
]

View file

@ -107,6 +107,11 @@
;Var TumbleBottleOutOfStock = 1
;Var ClearGelOutOfStock = 1
Var E_GiftCard100BathOutOfStock = 1
Var TumbleBottleOutOfStock = 1
DEBUGVAR SuperSetOutOfStock
DEBUGVAR BalanceEssenceTonerOutOfStock

View file

@ -45,56 +45,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If TumbleBottleOutOfStock = 0 Then
@ -108,26 +58,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "tumble_bottle"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If CleansingGelOutOfStock = 0 Then
@ -147,6 +77,30 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "cleansing_gel"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If BalanceEssenceTonerOutOfStock = 0 Then
@ -160,6 +114,46 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "balance_essence_toner"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If SuperSetOutOfStock = 0 Then
@ -167,6 +161,62 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "super_set"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If E_GiftCard100BathOutOfStock = 0 Then
@ -180,26 +230,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "e_gift_card_100bath"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf
If ClearGel4mlOutOfStock = 0 Then
@ -223,16 +253,6 @@
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
Var rewardList[MaxRandomIndex] = "clear_gel_4ml"
Var MaxRandomIndex = MaxRandomIndex + 1
EndIf

View file

@ -1 +1 @@
/event/promotion_energy_drink_1_bath.xml
/event/promotion_cocoa77.xml

File diff suppressed because it is too large Load diff

View file

@ -3629,9 +3629,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button>
<State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -3640,7 +3640,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

View file

@ -32,7 +32,7 @@
)
</FilenameDisable>
<EventOnClick>
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
Open "ROOT/taobin_project/xml/page_catalog_group_pro_cocoa_77_ignore.xml"
</EventOnClick>
@ -52,7 +52,7 @@
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_th.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
</Video>
<Video>
@ -70,7 +70,7 @@
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/energy_drink_1_bath_en.mp4" </Filename>
<Filename> "ROOT/taobin_project/image/event/cocoa77/cocoa77.mp4" </Filename>
</Video>
</Button>

View file

@ -4,15 +4,9 @@ DEBUGVAR PayOfflineMode
DEBUGVAR CocktailShow
DEBUGVAR OpenFromPageBoard
DEBUGVAR LipitPro
DEBUGVAR MondayBananaPro
DEBUGVAR PepsiSecondCup30Enable
DEBUGVAR FreeEnergyDrink
DEBUGVAR EnergyDrinkEnable
DEBUGVAR EnergyDrink1BathPro
DEBUGVAR CoffeeDrink1BathPro
DEBUGVAR WednesdayMelonPro
DEBUGVAR NamHomCoconutPro
DEBUGVAR Cocoa77Pro
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -39,75 +33,27 @@ Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
; zone promote
If NamHomCoconutPro = 1 Then
If Cocoa77Pro = 1 Then
Var PromotionState1 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
If EnergyDrink1BathPro = 1 Then
If NamHomCoconutPro = 1 Then
Var PromotionState2 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If WednesdayMelonPro = 1 Then
Var PromotionState3 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If CountEnablePromotion > 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_cocoa_77_and_nam_hom_coconut.xml"
Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/ignore_gen_promotion_nam_hom_coconut.xml"
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_cocoa77.xml"
EndIf
Else
If EnergyDrink1BathPro = 1 Then
Var PromotionState1 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
If MondayBananaPro = 1 Then
Var PromotionState2 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If WednesdayMelonPro = 1 Then
Var PromotionState3 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If CountEnablePromotion > 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_energy_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_energy_drink_1_bath.xml"
EndIf
Else
If CoffeeDrink1BathPro = 1 Then
Var PromotionState1 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
If MondayBananaPro = 1 Then
Var PromotionState2 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If WednesdayMelonPro = 1 Then
Var PromotionState3 = "Enable"
Var CountEnablePromotion = CountEnablePromotion + 1
EndIf
If CountEnablePromotion > 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/triple_promotion_coffee_drink_1_bath_and_monday_banana_and_wednesday_melon.xml"
Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_coffee_drink_1_bath.xml"
EndIf
Else
If MondayBananaPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_monday_banana.xml"
EndIf
If WednesdayMelonPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_wednesday_melon.xml"
EndIf
EndIf
If NamHomCoconutPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/ignore_gen_promotion_nam_hom_coconut.xml"
EndIf
EndIf

View file

@ -108,6 +108,10 @@ Var NamHomCoconutPro = 0
Var FromNamHomCoconutPro = 0
Var NamHomCoconutRewardOutOfStock = 0
; Enable Cocoa 7.7 promotion, 7 - 9 July
Var Cocoa77Pro = 0
Var FromCocoa77Pro = 0
Var NewCollectPoint = 1
Var ShouldCollectPromotionPoint = 0
@ -164,9 +168,7 @@ EndIf
If SystemDateMonthInt = 6 Then
If SystemDateDayInt >= 3 Then
If SystemDateDayInt <= 30 Then
Var NamHomCoconutPro = 1
EndIf
Var NamHomCoconutPro = 1
EndIf
If SystemDateDayInt <= 15 Then
@ -189,6 +191,18 @@ If SystemDateMonthInt = 6 Then
EndIf
EndIf
If SystemDateMonthInt = 7 Then
If SystemDateDayInt <= 10 Then
Var NamHomCoconutPro = 1
EndIf
If SystemDateDayInt >= 7 Then
If SystemDateDayInt <= 9 Then
Var Cocoa77Pro = 1
EndIf
EndIf
EndIf
If SystemDateMonthInt >= 7 Then
Var CheckMemberPageCampaign = 1
EndIf
@ -212,17 +226,8 @@ EndIf
If BoxID = 105005 Then
Var NewFlowPaymentCode = 1
Var EnergyDrink1BathPro = 1
Var CoffeeDrink1BathPro = 0
Var NamHomCoconutPro = 1
Var CheckMemberPageCampaign = 1
EndIf
If BoxID = 200001 Then
Var NewFlowPaymentCode = 1
Var NamHomCoconutPro = 1
Var EnergyDrink1BathPro = 1
Var CoffeeDrink1BathPro = 0
Var Cocoa77Pro = 1
EndIf
@ -347,55 +352,10 @@ Else
Var WednesdayMelonPro = 0
EndIf
If BananaSyrupEnable = "true" Then
If CocoaPowderEnable = "true" Then
Else
Var ProBadValentineEnable = 0
Var MondayBananaPro = 0
EndIf
If PeachSyrupEnable = "true" Then
Else
Var ProPeachEnable = 0
EndIf
If EnergyDrinkEnable = "true" Then
Else
Var EnergyDrink1BathPro = 0
Var FreeEnergyDrink = 0
EndIf
If FreeFirePro = 1 Then
Var FreeFireMenuState1 = $12-99-03-0026.Button
Var FreeFireMenuState2 = $12-99-03-0067.Button
Var FreeFireMenuState3 = $12-99-03-0066.Button
Else
Var FreeFireMenuState1 = "Invisible"
Var FreeFireMenuState2 = "Invisible"
Var FreeFireMenuState3 = "Invisible"
EndIf
If LipitPro = 1 Then
READ_FILE "/mnt/sdcard/lipit_reward_out_of_stock" lipitOutOfStock
STRCONTAIN "1" lipitOutOfStock LipitOutOfStockContain
If LipitOutOfStockContain = "true" Then
Var LipitRewardOutOfStock = 1
EndIf
Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
Var CountDownShowButton = 0
;Var MainPageEventWithTimeout = 25
Var ShowButtonClickFull = "Invisible"
Var img_rest_main_page = "ROOT/taobin_project/image/main_page/bn_main_page_start.png"
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png"
Var img_reset_topup = "ROOT/taobin_project/image/main_page/bn_main_page_topup.png"
Var WebAppShow = "Invisible"
Var Cocoa77Pro = 0
EndIf

View file

@ -236,6 +236,13 @@
else:
from_nam_hom_coconut = False
if current_file_name == "page_catalog_group_pro_cocoa_77.skt":
from_cocoa77 = True
cocoa77_fix_price = True
else:
from_cocoa77 = False
cocoa77_fix_price = False
#print ("######################################################################################################")
idx_of_eng = 2
out_xml('<FrameScroll> \r\n')
@ -445,6 +452,13 @@
out_xml( '\t\tVar OriginalPriceD1 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_1)) + '\r\n')
out_xml( '\t\tVar OriginalPriceD2 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_2)) + '\r\n')
out_xml( '\t\tVar OriginalPriceD3 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_3)) + '\r\n')
elif cocoa77_fix_price:
out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price - 7\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price - 7\r\n')
out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price - 7\r\n')
out_xml( '\t\tVar OriginalPriceD1 = $' + spl[4] + '.Price\r\n')
out_xml( '\t\tVar OriginalPriceD2 = $' + spl[5] + '.Price\r\n')
out_xml( '\t\tVar OriginalPriceD3 = $' + spl[6] + '.Price\r\n')
else:
out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
@ -556,6 +570,9 @@
if from_nam_hom_coconut:
out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n')
if from_cocoa77:
out_xml( '\t\tVar FromCocoa77Pro = 1 \r\n')
out_xml( '\t\t\r\n')
@ -693,6 +710,8 @@
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(monday_banana_prices, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif wednesday_melon_prices:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[4])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' + spl[4] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
@ -704,6 +723,8 @@
out_xml( '\t<Value> "฿' + str(GetPrice(monday_banana_prices, spl[4])) + '" </Value>\r\n')
elif wednesday_melon_prices:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[4])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
@ -760,6 +781,8 @@
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(monday_banana_prices, spl[5])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif wednesday_melon_fix_price:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[5])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
@ -771,6 +794,8 @@
out_xml( '\t<Value> "฿' + str(GetPrice(monday_banana_prices, spl[5])) + '" </Value>\r\n')
elif wednesday_melon_fix_price:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[5])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
@ -843,6 +868,8 @@
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(monday_banana_prices, spl[6])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif wednesday_melon_fix_price:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[6])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' + spl[6] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
@ -854,6 +881,8 @@
out_xml( '\t<Value> "฿' + str(GetPrice(monday_banana_prices, spl[6])) + '" </Value>\r\n')
elif wednesday_melon_fix_price:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[6])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
out_xml( '\t</Text>\r\n')
@ -1050,6 +1079,13 @@
out_xml( '\t\tVar OriginalPriceD1 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_1)) + '\r\n')
out_xml( '\t\tVar OriginalPriceD2 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_2)) + '\r\n')
out_xml( '\t\tVar OriginalPriceD3 = ' + str(GetOriginalPrice(wednesday_melon_original_prices, pd_code_3)) + '\r\n')
elif cocoa77_fix_price:
out_xml( '\t\tVar PriceD1 = $' + spl[8] + '.Price - 7\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[9] + '.Price - 7\r\n')
out_xml( '\t\tVar PriceD3 = $' + spl[10] + '.Price - 7\r\n')
out_xml( '\t\tVar OriginalPriceD1 = $' + spl[8] + '.Price\r\n')
out_xml( '\t\tVar OriginalPriceD2 = $' + spl[9] + '.Price\r\n')
out_xml( '\t\tVar OriginalPriceD3 = $' + spl[10] + '.Price\r\n')
else:
out_xml( '\t\tVar PriceD1 = $' + spl[8] + '.Price\r\n')
out_xml( '\t\tVar PriceD2 = $' + spl[9] + '.Price\r\n')
@ -1151,6 +1187,9 @@
if from_nam_hom_coconut:
out_xml( '\t\tVar FromNamHomCoconutPro = 1 \r\n')
if from_cocoa77:
out_xml( '\t\tVar FromCocoa77Pro = 1 \r\n')
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
@ -1262,11 +1301,15 @@
else:
if wednesday_melon_prices:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[8])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' +spl[8] + '.Price - 7 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' +spl[8] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
if wednesday_melon_prices:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[8])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[8] + '.Price ) </Value>\r\n')
@ -1315,11 +1358,15 @@
else:
if wednesday_melon_prices:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[9])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' +spl[9] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' +spl[9] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
if wednesday_melon_prices:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[9])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[9] + '.Price ) </Value>\r\n')
@ -1367,11 +1414,15 @@
else:
if wednesday_melon_prices:
out_xml( '\t<Value> StringFmt( ' + str(GetPrice(wednesday_melon_prices, spl[10])) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> StringFmt( $' +spl[10] + '.Price - 7, DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
out_xml( '\t<Value> StringFmt( $' +spl[10] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
else:
if wednesday_melon_prices:
out_xml( '\t<Value> "฿' + str(GetPrice(wednesday_melon_prices, spl[10])) + '" </Value>\r\n')
elif cocoa77_fix_price:
out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price - 7 ) </Value>\r\n')
else:
out_xml( '\t<Value> Var( "฿" + $' + spl[10] + '.Price ) </Value>\r\n')

View file

@ -4177,9 +4177,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button>
<State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -4188,7 +4188,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -3200,9 +3200,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button>
<State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -3211,7 +3211,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2
GetInstanceIDMenuTab OpenFromInstMenuTab
Var PriceD1 = $-.Price

View file

@ -208,6 +208,7 @@
STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable
STRCONTAIN "1206" MaterialAvailable EnergyDrinkEnable
STRCONTAIN "1216" MaterialAvailable CoconutSyrupEnable
STRCONTAIN "1042" MaterialAvailable CocoaPowderEnable
;Var AppFastEnable = "false"
If AppFastEnable = "true" Then
@ -757,8 +758,8 @@
Var cups_sold_text = "CUPS SOLD"
Var MinPhoneNumber = 8
Var MaxPhoneNumber = 8
Var MinPhoneNumber = 10
Var MaxPhoneNumber = 10
EndIf
@ -1205,13 +1206,16 @@
</EventUnitTest2>
<EventUnitTest3>
Var XMLProfile = "AllPriceUp10"
Open CurrentXMLFileName0
;Var XMLProfile = "AllPriceUp10"
;Open CurrentXMLFileName0
__CMD "SetPay" "Coffee" "123456789123456789" "3000100617001201234"
;PRICE "Reload" "-"
</EventUnitTest3>
<EventUnitTest4>
Var XMLProfile = "Discount50"
Open CurrentXMLFileName0
PRICE "Load" "-"
PRICE "Check" XMLProfile
</EventUnitTest4>
<EventDrink>

View file

@ -439,59 +439,14 @@
DEBUGVAR NeedUpgrade
DEBUGVAR NeedReboot
DEBUGVAR SELLSTATUS
; copy stage
Var bg_lidProblem_ST2 = bg_lidProblem_ST
DEBUGVAR bg_lidProblem_ST2
; zone Language
If LanguageObjectShow = "Enable" Then
Var XStraw = 350
Var SelectMenuBetweenBrewEnable2 = SelectMenuBetweenBrewEnable1
Var SelectMenuBetweenBrewEnable1 = "Invisible"
DEBUGVAR bg_lidProblem_ST
Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
Var bg_lidProblem_ST = "Invisible"
Var GetLidButtonState = "Invisible"
Var bg_strawProblem_ST = "Invisible"
var EnableGetMoreStrawFileName = "Invisible"
var EnableGetMoreStrawFileName2 = "Enable"
Var bg_strawProblem_ST2 = "Invisible"
If bg_lidProblem_ST2 = "Invisible" Then
Var GetLidButtonState2 = "Enable"
Else
Var GetLidButtonState2 = "Invisible"
EndIf
If bg_lidProblem_ST = "Invisible" Then
Var GetLidButtonState = "Enable"
;Var XStraw = 265
EndIf
If NoLangObjectShow = "Enable" Then
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var bg_lidProblem_ST2 = "Invisible"
Var GetLidButtonState2 = "Invisible"
Var bg_strawProblem_ST2 = "Invisible"
var EnableGetMoreStrawFileName2 = "Invisible"
DEBUGVAR bg_lidProblem_ST
If bg_lidProblem_ST = "Invisible" Then
Var GetLidButtonState = "Enable"
;Var XStraw = 265
EndIf
EndIf
DEBUGVAR LanguageObjectShow
DEBUGVAR NoLangObjectShow
Var CreditCardVoid = 0
@ -515,10 +470,17 @@
; language instance
If bg_lidProblem_ST = "Enable" Then
Var EnableTopupCreditBetweenBrew = "Invisible"
Var EnableGetMore
End
If bg_strawProblem_ST = "Enable" Then
Var EnableGetMoreStrawFileName = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
DEBUGVAR SelectMenuBetweenBrewEnable1
DEBUGVAR SelectMenuBetweenBrewEnable2
Var SelectMenuBetweenBrewEnable1Text = SelectMenuBetweenBrewEnable1
@ -1465,7 +1427,6 @@
If CLOSE_ORDER_NOW = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
@ -1484,16 +1445,7 @@
EndIf
Else
If SelectMenuBetweenBrewEnable2 = "Enable" Then
If SelectMenuBetweenBrewEnable1Blink = "Enable" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Else
Var SelectMenuBetweenBrewEnable1Blink = "Enable"
EndIf
Else
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
EndIf
DEBUGVAR CountUpBrewing
@ -1682,34 +1634,17 @@
EndIf
EndIf
If EnableGetMoreStrawFileName2 = "PressForever" Then
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount > 0 Then
If EnableGetMoreStrawFileNameCountDown > 0 Then
Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
If EnableGetMoreStrawFileNameCountDown = 0 Then
Var EnableGetMoreStrawFileName2 = "Enable"
EndIf
EndIf
EndIf
EndIf
If GetMoreStrawCount <= 0 Then
If StrawProblemStatus = 1 Then
Var StrawProblemStatus = 2
If NoLangObjectShow = "Enable" Then
Var bg_strawProblem_ST = "Enable"
Else
Var bg_strawProblem_ST2 = "Enable"
EndIf
Var bg_strawProblem_ST = "Enable"
Var EnableTopupCreditBetweenBrew = "Invisible"
Var EnableGetMoreStrawFileName = "Invisible"
EndIf
EndIf
DEBUGVAR bg_lidProblem_ST2
If GetLidButtonCountDown > 0 Then
@ -1724,26 +1659,16 @@
Var GetLidButtonCountDown = 0
EndIf
If NoLangObjectShow = "Enable" Then
If GetLidButtonCountDown = 1 Then
Var GetLidButtonState = "Invisible"
Var bg_lidProblem_ST = "Enable"
;Var XStraw = 356
If GetLidButtonCountDown = 1 Then
Var GetLidButtonState = "Invisible"
Var bg_lidProblem_ST = "Enable"
Var EnableTopupCreditBetweenBrew = "Invisible"
;Var XStraw = 356
If EnableGetMoreStrawFileName = "Enable" Then
Var XStraw = 280
EndIf
EndIf
Var bg_lidProblem_ST = "Invisible"
If LanguageObjectShow = "Enable" Then
If GetLidButtonCountDown = 1 Then
Var GetLidButtonState2 = "Invisible"
Var bg_lidProblem_ST2 = "Enable"
Var XStraw = 365
EndIf
EndIf
If ButtonGameCountDown > 0 Then
@ -1849,16 +1774,6 @@
<Filename> text_next_order </Filename>
</Image>
<Text>
<X> 0 </X>
<Y> 1655 </Y>
<Width> 1080 </Width>
<State> SelectMenuBetweenBrewEnable2 </State>
<Language>
<ID> 000408 </ID>
</Language>
</Text>
<Image>
<X> 835 </X>
@ -1887,23 +1802,6 @@
<Value> ShowCountDownBrewing </Value>
</Text>
<Text>
<X> 816 </X>
<Y> 429 </Y>
<State> LanguageObjectShow </State>
<Language>
<ID> 000405 </ID>
</Language>
</Text>
<Text>
<X> 941 </X>
<Y> 518 </Y>
<State> LanguageObjectShow </State>
<Language>
<ID> 000406 </ID>
</Language>
</Text>
<EventUnitTest1>
Var BREW_COUNT_DOWN_FROM_APP = "off"
Var CountDownBrewing = 121
@ -1968,32 +1866,6 @@
</EventClick>
</Button>
<Button>
<X> 733 </X>
<Y> 1787 </Y>
<State>SelectMenuBetweenBrewEnable2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_next_order.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_next_order.png" </FilenamePress>
<EventClick>
If MachineState_Result = 0 Then
SAVELOG "User click next button"
Var Seeker = "next"
Var MultiPayEnable = "false"
CoinPause
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
<Language>
<X> 0 </X>
<Y> 20 </Y>
<Width> 297 </Width>
<Height> 96 </Height>
<ID> 000407 </ID>
</Language>
</Button>
;
;
@ -2024,8 +1896,8 @@
</Button>
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<X> 270 </X>
<Y> 1788 </Y>
<State>bg_strawProblem_ST</State>
<Filename> bnStrawProblemReport </Filename>
<FilenamePress> bpStrawProblemReport </FilenamePress>
@ -2097,8 +1969,8 @@
; Lid button, Get one and report
;
<Button>
<X> 22 </X>
<Y> 1787 </Y>
<X> 20 </X>
<Y> 1788 </Y>
<State>bg_lidProblem_ST</State>
<Filename> bnLidProblemReport </Filename>
<FilenamePress> bpLidProblemReport </FilenamePress>
@ -2134,114 +2006,6 @@
</EventClick>
</Button>
;====================================================================
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<State> EnableGetMoreStrawFileName2 </State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_more_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bp_get_more_straw.png" </FilenamePress>
<Mode> "No" </Mode>
<EventClick>
Var EnableGetMoreStrawFileNameCountDown = 5
Var EnableGetMoreStrawFileName2 = "PressForever"
Var GetMoreStrawCount = GetMoreStrawCount - 1
DEBUGVAR GetMoreStrawCount
If GetMoreStrawCount > 0 Then
Machine Straw
Else
Var EnableGetMoreStrawFileName2 = "Invisible"
EndIf
</EventClick>
<Language>
<X> 50 </X>
<Y> 20 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000402 </ID>
</Language>
</Button>
<Button>
<X> XStraw </X>
<Y> 1787 </Y>
<Height> 96 </Height>
<State>bg_strawProblem_ST2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
<EventClick>
Var strawStr = "แจ้งปัญหาไม่ได้รับหลอด"
__CMD "straw-alert-disable" 0 strawStr "-"
__CMD "send-error-code" 1231 "-" "-"
Var bg_strawProblem_ST2 = "Invisible"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 12 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000401 </ID>
</Language>
</Button>
;-------------------------
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<Height> 96 </Height>
<State>bg_lidProblem_ST2</State>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bn_send_report.png" </FilenamePress>
<EventClick>
Var lidStr = "แจ้งปัญหาไม่ได้รับฝา"
__CMD "lid-alert-disable" 0 lidStr "-"
__CMD "send-error-code" 1343 "-" "-"
Var bg_lidProblem_ST2 = "Invisible"
Refresh
</EventClick>
<Language>
<X> 0 </X>
<Y> 12 </Y>
<Width> 331 </Width>
<Height> 96 </Height>
<ID> 000400 </ID>
</Language>
</Button>
<Button>
<X> 14 </X>
<Y> 1787 </Y>
<State>GetLidButtonState2</State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/page_doing_inter/bn_get_lid.png" </Filename>
<FilenamePress>"ROOT/taobin_project/image/page_doing_inter/bp_get_lid.png" </FilenamePress>
<EventClick>
If GetLidButtonState2 = "Enable" Then
Machine Lid
Var GetLidButtonCountDown = 12
EndIf
Var GetLidButtonState2 = "Press"
Refresh
</EventClick>
<Language>
<X> 40 </X>
<Y> 20 </Y>
<Width> 232 </Width>
<Height> 96 </Height>
<ID> 000403 </ID>
</Language>
</Button>
<EventUnitTest4>
; test drinkfail with phone number

View file

@ -6,11 +6,22 @@
<Volume> SoundVolume </Volume>
<EventOpen>
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
EndIf
If InternationalEnable = 1 Then
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
DEBUGVAR Brewing3ContiXMLFile
Open Brewing3ContiXMLFile
EndIf
Var ActionOKCase = 0
Var Seeker = "curr"

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -128,7 +128,7 @@
; soda and other
Var Menu6Selected = "PressForever"
Var Menu62Selected = "PressForever"
SAVELOG PreviseXMLFileName2

View file

@ -13,7 +13,7 @@
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu6Selected = "PressForever"
Var Menu62Selected = "PressForever"
SAVELOG PreviseXMLFileName2

View file

@ -1,32 +1,32 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu6Selected = "PressForever"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
; soda and other
Var Menu62Selected = "PressForever"
SAVELOG PreviseXMLFileName2
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<FrameScroll>
<X> 10 </X>
<Y> 497 </Y>
@ -893,7 +893,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "เครื่องดื่มเต่าทรงพลัง โซดา
<Value> "เครื่องดื่มเต่าทรงพลัง โซดา
(มีคาเฟอีน)" </Value>
</Text>
<Text>
@ -905,7 +905,7 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "TAO POWER
<Value> "TAO POWER
DRINK SODA" </Value>
</Text>
<Text>
@ -1146,7 +1146,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมเมล่อน โซดา
<Value> "น้ำเชื่อมเมล่อน โซดา
และน้ำแข็ง" </Value>
</Text>
<Text>
@ -1398,7 +1398,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมยูซุ โซดา
<Value> "น้ำเชื่อมยูซุ โซดา
และน้ำแข็ง" </Value>
</Text>
<Text>
@ -1661,7 +1661,7 @@ DRINK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LIMENADE
<Value> "LIMENADE
SODA" </Value>
</Text>
<Text>
@ -2153,7 +2153,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมลิ้นจี่ มะนาว
<Value> "น้ำเชื่อมลิ้นจี่ มะนาว
โซดา " </Value>
</Text>
<Text>
@ -2165,7 +2165,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LYCHEE
<Value> "LYCHEE
LIMENADE SODA" </Value>
</Text>
<Text>
@ -2176,7 +2176,7 @@ LIMENADE SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup,
<Value> "Lychee Syrup,
Limenade, Soda & Ice" </Value>
</Text>
<Image>
@ -3171,7 +3171,7 @@ Limenade, Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "LIME
<Value> "LIME
SALAK SODA" </Value>
</Text>
<Text>
@ -3182,7 +3182,7 @@ SALAK SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Salak Syrup, Limenade,
<Value> "Salak Syrup, Limenade,
Soda & Ice" </Value>
</Text>
<Image>
@ -3675,7 +3675,7 @@ Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PLUM
<Value> "PLUM
LIMENADE SODA" </Value>
</Text>
<Text>
@ -3686,7 +3686,7 @@ LIMENADE SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Ume Syrup, Limenade,
<Value> "Ume Syrup, Limenade,
Soda & Ice" </Value>
</Text>
<Image>
@ -4821,19 +4821,19 @@ Soda & Ice" </Value>
</Block>
; - - -
; ==================> Len = 12
; 12-05-02-0105 12-05-03-0105
; - 12-05-02-0105 12-05-03-0105
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<Button>
<State> $Sum12050201051205030105 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -4843,7 +4843,7 @@ Soda & Ice" </Value>
Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0105.Price
Var PriceD3 = $12-05-03-0105.Price
Var PD_CODE1 = "##-##-##-####"
@ -4852,7 +4852,7 @@ Soda & Ice" </Value>
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0105.Button
Var PD_STAGE_3 = $12-05-03-0105.Button
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -4872,7 +4872,7 @@ Soda & Ice" </Value>
Topping "Load" "12-05-02-0105"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
Topping "Load" "12-05-03-0105"
EndIf
@ -4965,7 +4965,7 @@ Soda & Ice" </Value>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -5574,19 +5574,19 @@ Soda & Ice" </Value>
</Block>
; - - -
; ==================> Len = 12
; 12-05-02-0106 -
; - 12-05-02-0106 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State>
<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
<Button>
<State> $Sum1205020106 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -5596,7 +5596,7 @@ Soda & Ice" </Value>
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0106.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
@ -5605,7 +5605,7 @@ Soda & Ice" </Value>
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0106.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -5625,7 +5625,7 @@ Soda & Ice" </Value>
Topping "Load" "12-05-02-0106"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
Topping "Load" "-"
EndIf
@ -5718,7 +5718,7 @@ Soda & Ice" </Value>
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -7191,7 +7191,7 @@ Soda & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "GINGER LIME
<Value> "GINGER LIME
SODA" </Value>
</Text>
<Text>
@ -7694,7 +7694,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "GINGER LIME
<Value> "GINGER LIME
SODA" </Value>
</Text>
<Text>
@ -8176,7 +8176,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "สตรอเบอร์รี่
<Value> "สตรอเบอร์รี่
มินต์โซดา" </Value>
</Text>
<Text>
@ -8198,7 +8198,7 @@ SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "STRAWBERRY
<Value> "STRAWBERRY
MINT SODA" </Value>
</Text>
<Text>
@ -8680,7 +8680,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "บ๊วยมะนาว
<Value> "บ๊วยมะนาว
มินต์โซดา" </Value>
</Text>
<Text>
@ -8702,7 +8702,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "PLUM LIMENADE
<Value> "PLUM LIMENADE
MINT SODA" </Value>
</Text>
<Text>
@ -8933,7 +8933,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "มินต์ลิ้นจี่
<Value> "มินต์ลิ้นจี่
มะนาวโซดา" </Value>
</Text>
<Text>
@ -8955,7 +8955,7 @@ MINT SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "MINT LYCHEE
<Value> "MINT LYCHEE
LEMON SODA" </Value>
</Text>
<Text>
@ -12198,7 +12198,7 @@ LEMON SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showthaiText </State>
<Value> "มะพร้าวน้ำหอม
<Value> "มะพร้าวน้ำหอม
ลิ้นจี่โซดา" </Value>
</Text>
<Text>
@ -12220,7 +12220,7 @@ LEMON SODA" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "Coconut
<Value> "Coconut
Lychee Soda" </Value>
</Text>
<Text>
@ -12963,7 +12963,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "เครื่องดื่มเต่าทรงพลัง
<Value> "เครื่องดื่มเต่าทรงพลัง
(มีคาเฟอีน)" </Value>
</Text>
<Text>
@ -13215,7 +13215,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำแดงกลิ่นสละ น้ำมะนาว
<Value> "น้ำแดงกลิ่นสละ น้ำมะนาว
" </Value>
</Text>
<Text>
@ -13237,7 +13237,7 @@ Lychee Soda" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Salak Syrup, Limenade,
<Value> "Salak Syrup, Limenade,
Water & Ice" </Value>
</Text>
<Image>
@ -13489,7 +13489,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup, Sugar,
<Value> "Lychee Syrup, Sugar,
Water & Ice" </Value>
</Text>
<Image>
@ -13720,7 +13720,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำแดงกลิ่นสละ
<Value> "น้ำแดงกลิ่นสละ
" </Value>
</Text>
<Text>
@ -13972,7 +13972,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showthaiText </State>
<Value> "น้ำเชื่อมสตอเบอร์รี่ น้ำ
<Value> "น้ำเชื่อมสตอเบอร์รี่ น้ำ
" </Value>
</Text>
<Text>
@ -13994,7 +13994,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Strawberry Syrup,
<Value> "Strawberry Syrup,
Water & Ice" </Value>
</Text>
<Image>
@ -14752,7 +14752,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Lychee Syrup, Sugar,
<Value> "Lychee Syrup, Sugar,
Water & Ice" </Value>
</Text>
<Image>
@ -15004,7 +15004,7 @@ Water & Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<State> showengText </State>
<Value> "Strawberry Syrup,
<Value> "Strawberry Syrup,
Water, Ice" </Value>
</Text>
<Image>
@ -15496,7 +15496,7 @@ Water, Ice" </Value>
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<State> showengText </State>
<Value> "CONGEE WITH
<Value> "CONGEE WITH
PLANT PROTEIN" </Value>
</Text>
<Text>
@ -16666,7 +16666,7 @@ PLANT PROTEIN" </Value>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
</Popup>
</Popup>

View file

@ -1796,19 +1796,19 @@
</Block>
; - - -
; ==================> Len = 12
; 12-05-02-0105 12-05-03-0105
; - 12-05-02-0105 12-05-03-0105
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<State> Flag( 12-05-02-0105.Button,12-05-03-0105.Button,$Sum12050201051205030105) </State>
<Button>
<State> $Sum12050201051205030105 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Melon.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Melon.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Melon.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -1818,7 +1818,7 @@
Var DrinkDescription = "Pepsi, Melon Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Melon.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0105.Price
Var PriceD3 = $12-05-03-0105.Price
Var PD_CODE1 = "##-##-##-####"
@ -1827,7 +1827,7 @@
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0105.Button
Var PD_STAGE_3 = $12-05-03-0105.Button
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-05-03-0105, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -1847,7 +1847,7 @@
Topping "Load" "12-05-02-0105"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
Topping "Load" "12-05-03-0105"
EndIf
@ -1940,7 +1940,7 @@
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>
@ -2549,19 +2549,19 @@
</Block>
; - - -
; ==================> Len = 12
; 12-05-02-0106 -
; - 12-05-02-0106 -
<Block>
<MarginLeft> 33 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 225 </Width>
<Height> 296 </Height>
<State> Flag( .Button,12-05-02-0106.Button,$Sum1205020106) </State>
<State> Flag( 12-05-02-0106.Button,$Sum1205020106) </State>
<Button>
<State> $Sum1205020106 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_yuzu.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_yuzu.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_yuzu.png" </FilenameDisable>
<OverlayImage> xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<OverlayImage> xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
@ -2571,7 +2571,7 @@
Var DrinkDescription = "Pepsi, Yuzu Syrup& Ice"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_yuzu.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $.Price
Var PriceD1 = $-.Price
Var PriceD2 = $12-05-02-0106.Price
Var PriceD3 = $-.Price
Var PD_CODE1 = "##-##-##-####"
@ -2580,7 +2580,7 @@
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = $12-05-02-0106.Button
Var PD_STAGE_3 = "Disable2"
Var OverlayMenuFilter !assigned xmlpro( , "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
Var OverlayMenuFilter !assigned xmlpro( 12-05-02-0106, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
DEBUGVAR OverlayMenuFilter
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
@ -2600,7 +2600,7 @@
Topping "Load" "12-05-02-0106"
Else
If PD_STAGE_1 = "Enable" Then
Topping "Load" ""
Topping "Load" "-"
Else
Topping "Load" "-"
EndIf
@ -2693,7 +2693,7 @@
<Color> 0x6F5F51 </Color>
<ColorDisable> 0xEAE6E1 </ColorDisable>
<State> "Invisible" </State>
<Value> StringFmt( $.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
</Text>
<Image>
<X> 81 </X>

View file

@ -0,0 +1,60 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Timeout = 0
Var FromWednesdayMelonPro = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
If show_eng = "true" Then
Var extension = "_en.png"
Else
Var extension = ".png"
EndIf
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -2650,9 +2650,9 @@ Sugar, Biscof" </Value>
<State> Flag( 12-03-03-0061.Button,Disable=Invisible,$Sum1203030061) </State>
<Button>
<State> $Sum1203030061 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_cocoa_MILK_BISCOFF.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_cocoa_MILK_BISCOFF.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_cocoa_MILK_BISCOFF.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-03-03-0061, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -2661,7 +2661,7 @@ Sugar, Biscof" </Value>
Var NameDrinkTH = "โกโก้ บิสคอฟ"
Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล บิสคอฟ"
Var DrinkDescription = "Cocoa, Milk, Sugar, Biscof"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_cocoa_MILK_BISCOFF.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price

View file

@ -10,9 +10,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
<?hurr
#include=menu_catalog_default_init.xml
?>
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Menu1Selected = "PressForever"
@ -40,9 +38,7 @@
EndIf
<?hurr
#include=menu_catalog_new_menu.xml
?>
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>

View file

@ -8,113 +8,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var NextPage = "-"
DEBUGVAR ICE_PROCESS_STATUS
DEBUGVAR ICE_PROCESS_TXT
If show_eng = "true" Then
Var showthaiText = "Invisible"
Var showengText = "Enable"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
Var ice_tab_text = "Ice will be ready at "
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var showengText = "Invisible"
Var showthaiText = "Enable"
Var DirImage = "ROOT/taobin_project/image/page3"
Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
Var text_unavailable = "หมด###size=32"
EndIf
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
; SpiralOnline
Var MenuVSelected2 = "Invisible"
Var Menu1Selected2 = "Invisible"
Var Menu2Selected2 = "Invisible"
Var Menu3Selected2 = "Invisible"
Var Menu4Selected2 = "Invisible"
Var Menu6Selected2 = "Invisible"
Var Menu7Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
Var Menu11Selected2 = "Invisible"
Var Menu21Selected2 = "Invisible"
Var MenuVSelected2 = "Invisible"
If SpiralOnline = "true" Then
If Seeker = "curr" Then
Var MenuVSelected2 = "Enable"
EndIf
EndIf
; init default
Var Menu1Selected = "Enable"
Var Menu2Selected = "Enable"
Var Menu3Selected = "Enable"
Var Menu4Selected = "Enable"
; 5 fruit
Var Menu5Selected = "Invisible"
Var Menu6Selected = "Enable"
Var Menu7Selected = "Enable"
; 8 cocktail
Var Menu8Selected = "Invisible"
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
Var Menu8Selected = "Enable"
EndIf
If AppFastEnable = "true" Then
Var Menu11Selected = "Enable"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Invisible"
Else
If MenuKidEnable = "true" Then
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Enable"
Var Menu7Selected = "Invisible"
Else
Var Menu11Selected = "Invisible"
Var Menu21Selected = "Invisible"
Var Menu7Selected = "Enable"
EndIf
EndIf
If CocktailShow = "true" Then
Var Menu7Selected = "Invisible"
EndIf
If RecipeTag1 = "HealthTurnOn" Then
Var Menu22Selected = "Enable"
Else
Var Menu22Selected = "Invisible"
EndIf
;
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Menu1Selected = "PressForever"
@ -142,406 +36,12 @@
EndIf
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Else
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
; notice enable heathy menu
<Image>
<X> 0 </X>
<Y> 380 </Y>
<Width> 1080 </Width>
<Height> 1540 </Height>
<Color> "0xeae6e1" </Color>
</Image>
<Timeout> 1000 </Timeout>
<EventTimeout>
;DEBUGVAR ICE_PROCESS_STATUS
If ICE_PROCESS_STATUS = 2 Then
Var ice_tab_process_show = "Enable"
Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
Else
Var ice_tab_process_show = "Invisible"
EndIf
If NextPage = "-" Then
Else
If CupOnArm = "true" Then
If Timeout > 9 Then
SAVELOG "COA9"
Open NextPage
EndIf
Else
If Timeout > 30 Then
SAVELOG "COA30"
Open NextPage
EndIf
EndIf
EndIf
If Timeout > 60 Then
SAVELOG "Timeout"
If Seeker = "next" Then
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
SAVELOG "Back"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
If BrewCommand = "RefreshAll" Then
Var BrewCommand = "-"
Open CurrentXMLFileName2
EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
If IgnoreNetCore = "true" Then
Else
;stop_now
EndIf
; zone cup on arm
If CupOnArm = "true" Then
If CheckCupStateDoorCupClose = "" Then
If buttonRemoveCup = "Enable" Then
Else
Refresh
EndIf
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
If buttonRemoveCup = "Enable" Then
Else
Refresh
EndIf
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
Refresh
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
</EventTimeout>
; under line
<Image>
<X> 0 </X>
<Y> 494 </Y>
<Filename> "ROOT/taobin_project/image/page3/tab_line_bottom.png" </Filename>
</Image>
; under line
<Image>
<X> 0 </X>
<Y> 358 </Y>
<Filename> "ROOT/taobin_project/image/page3/bg1.png" </Filename>
</Image>
; back
<Button>
<X> 19 </X>
<Y> 381 </Y>
<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If SpiralOnline = "true" Then
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
</EventClick>
</Button>
<Button>
<X> 1000 </X>
<Y> 381 </Y>
<Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
If show_eng = "true" Then
Var show_eng = "false"
Var text_unavailable = "หมด###size=32"
Else
Var show_eng = "true"
Var text_unavailable = "UNAVAILABLE###size=16"
EndIf
Open CurrentXMLFileName2
</EventClick>
</Button>
;
<ListView1>
<Width> 1080 </Width>
<Height> "auto" </Height>
<X> 0 </X>
<Y> 395 </Y>
<Row2>
<State>"Enable"</State>
<Width> 896 </Width>
<Height> 102 </Height>
<Button>
<Layout> "linear" </Layout>
<State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Click rec"
Var NextPage = "-"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu2Selected </State>
<Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu3Selected </State>
<Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu4Selected </State>
<Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu7Selected </State>
<Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu11Selected </State>
<Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu21Selected </State>
<Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml"
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu22Selected </State>
<Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_health.xml"
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu8Selected </State>
<Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml"
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> Menu6Selected </State>
<Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
EndIf
</EventClick>
</Button>
<Button>
<Layout> "linear" </Layout>
<State> MenuVSelected2 </State>
<Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var NextPage = "-"
Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
</EventClick>
</Button>
</Row2>
</ListView1>
<EventWebApp>
DEBUGVAR web_ready
If web_ready = "true" Then
If web_ref = QRCODE99x Then
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Var web_app_prepar = "true"
; Handle penetrator
If Only18 = "true" Then
Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
Else
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
Else
EndIf
</EventWebApp>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"

View file

@ -1051,9 +1051,9 @@
</Text>
<Text>
<X> 654 </X>
<X> 620 </X>
<Y> 1076 </Y>
<Width> 120 </Width>
<Width> 164 </Width>
<Height> 80 </Height>
<Font> RobotoBold </Font>
<Size> 64 </Size>

View file

@ -96,6 +96,7 @@
EndIf
DEBUGVAR PriceDrink
DEBUGVAR PromotionPriceDrink
@ -296,6 +297,12 @@
DEBUGVAR PriceDrink
DEBUGVAR PriceDrinkTmp
If FromCocoa77Pro = 1 Then
Var PriceDiff = OriginalPrice - PromotionPriceDrink
Var DiscountDrink = PriceDiff
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
If FromRerunPro = 1 Then
Var PriceDiff = PriceDrink - PromoPriceDrink
Var Seeker.VendingCode = RerunProCode

View file

@ -697,7 +697,9 @@
EndIf
Var Seeker.CreditCard = 1
Var Seeker.CreditCardRef = CreditCardRef
CashlessReq SUCCESS
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

View file

@ -178,6 +178,7 @@
SAVELOG QRCODE99
DEBUGVAR QRCODE99
SAVELOG Seeker.VendingDiscount
SAVELOG VendingCampaign
SAVELOG Seeker.VendingCode
SAVELOG Seeker.CodeChannel

View file

@ -56,6 +56,7 @@
Var PayState2 = "Enable"
Var QRChannel = 0
;Var Seeker.CodeChannel = 0
Seeker.TNumberTaobinCredit = ""
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
@ -182,6 +183,7 @@
Var QRChannel = 0
;Var Seeker.CodeChannel = 0
SAVELOG "payment_credit3-p121."
Var Seeker.TNumberTaobinCredit = ""
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else

View file

@ -76,17 +76,6 @@
EndIf
If show_eng = "true" Then
Else
If Timeout = 0 Then
If CupChecking = "false" Then
If DoorCupPosition = "bottom" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1
@ -155,6 +144,21 @@
EndIf
EndIf
EndIf
If show_eng = "true" Then
Else
If Timeout = 0 Then
If buttonRemoveCup = "Enable" Then
If CupChecking = "false" Then
If DoorCupPosition = "bottom" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
EndIf
EndIf
EndIf
EndIf
Refresh
TimerReset

View file

@ -789,11 +789,6 @@
<Y> info_11Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
OpenInst 2 "ROOT/taobin_project/xml/sometime/top_spender.xml"
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
</EventClick>
</Image>