pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

THAI INTER: Fix drink_fail, page_thank_you before credit, fix show_error machine state, New_payment [Myanmar layout], Add ImageDoing

Browse source
This commit is contained in:
Ittipat Lusuk 2024-12-12 16:28:09 +07:00
parent afb0dc5b8c
commit 1a455f3e83
99 changed files with 369 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

19
inter/tha/xml/multi/page_catalog.lxml
View file

@ -193,12 +193,12 @@
RootLayoutVisible 3 "show"
;for test!!!!!!!!!!!!!!!
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Var ShowButtonClick2 = "Enable"
Var ButtontoTopupMenu = "Enable"
EndIf
EndIf
;If InternationalEnable = 1 Then
;If CountryName = "Thailand" Then
;Var ShowButtonClick2 = "Enable"
;Var ButtontoTopupMenu = "Enable"
;EndIf
;EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -793,20 +793,19 @@
</EventUnitTest2>
; Initial for jump to page_brewing3.xml
<EventUnitTest3>
;Open "ROOT/taobin_project/inter/tha/xml/page_collect_point_1.lxml"
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
</EventUnitTest3>
<EventUnitTest5>
Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
</EventUnitTest5>
<EventUnitTest6>
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
Open "ROOT/taobin_project/xml/page_show_error.lxml"
</EventUnitTest6>
<EventUnitTest7>

282
inter/tha/xml/page_topping_select6.lxml
View file

@ -880,134 +880,6 @@
<Color> "0xeae6e1" </Color>
</Image>
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_show_blend_x = 892
Var SugarZeroCalPrice_X = 540
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "Please wait a moment"
EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Var SugarZeroCalPrice_X = 495
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
EndIf
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 568
Var text_show_blend_x = 903
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Var DirImage = "ROOT/taobin_project/image/topping_mmr"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
EndIf
EndIf
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
;Var showname = aliasName[LanguageShowByIndex]
;Var showdesc = aliasName[LanguageShowByIndex]
If SelectDrinkType = 1 Then
Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
Else
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
DEBUGVAR showname
DEBUGVAR showdesc
BackslashNToEnter showname
BackslashNToEnter showdesc
CRLFToSpace showname
CRLFToSpace showdesc
Var Timeout = 0
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Button>
<X> 990 </X>
<Y> 438 </Y>
@ -1177,6 +1049,139 @@
</EventClick>
</LangSwitch>
<EventLanguageOnChange>
DEBUGVAR LanguageShowByIndex
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 408
Var text_show_blend_x = 892
Var SugarZeroCalPrice_X = 540
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var OatMilkPrice_X = 260
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
EndIf
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "Please wait a moment"
EndIf
EndIf
If LanguageShow = "THAI" Then
Var topping_shot_price_x = 600
Var text_x_add_oreo_price = 420
Var text_show_normal_x = 386
Var text_show_blend_x = 852
Var SugarZeroCalPrice_X = 495
Var text_cancel_xc = 53
Var text_cancel_yc = 16
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 75
Var OatMilkPrice_X = 220
If show_name_len > 0 Then
Var showname = showname + "###size=68"
EndIf
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
EndIf
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var topping_shot_price_x = 630
Var text_x_add_oreo_price = 430
Var text_show_normal_x = 568
Var text_show_blend_x = 903
Var SugarZeroCalPrice_X = 540
Var Text_SugarZeroCalPrice_X = 360
Var Text_SugarNormalPrice_Y = 80
Var text_cancel_xc = 5
Var text_cancel_yc = 30
Var show_eng = "true"
Var OatMilkPrice_X = 210
If show_name_len > 24 Then
Var showname = showname + "###size=54"
EndIf
Var DirImage = "ROOT/taobin_project/image/topping_mmr"
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။ (" + MACHINE_SELF_TEST_COUNT_DOWN
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
Else
Var ShowTextSelfTestCountDown = "ခဏစောင့်ပါ။"
EndIf
EndIf
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000113, LanguageShowByIndex)
;DEBUGVAR StringToppingOatMilkWithPrice
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
;DEBUGVAR StringToppingOatMilkWithPrice
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
;Var StringToppingShotWithPrice !assigned GetLanguageID( 000100, LanguageShowByIndex)
;Var StringToppingShotWithPrice = StringToppingShotWithPrice + text_price_topping
Var StringCoffeeLevelWithPrice0 !assigned GetLanguageID( 000108, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice0 = StringCoffeeLevelWithPrice0 + CustomCoffeeLevelAdditionalPrice[0]
Var StringCoffeeLevelWithPrice1 !assigned GetLanguageID( 000109, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice1 = StringCoffeeLevelWithPrice1 + CustomCoffeeLevelAdditionalPrice[1]
Var StringCoffeeLevelWithPrice2 !assigned GetLanguageID( 000110, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice2 = StringCoffeeLevelWithPrice2 + CustomCoffeeLevelAdditionalPrice[2]
Var StringCoffeeLevelWithPrice3 !assigned GetLanguageID( 000111, LanguageShowByIndex)
Var StringCoffeeLevelWithPrice3 = StringCoffeeLevelWithPrice3 + CustomCoffeeLevelAdditionalPrice[3]
;Var showname = aliasName[LanguageShowByIndex]
;Var showdesc = aliasName[LanguageShowByIndex]
If SelectDrinkType = 1 Then
Var showname = NameLang[IndexDrinktType][LanguageShowByIndex]
Var showdesc = DescLang[IndexDrinktType][LanguageShowByIndex]
Else
Var showname = aliasName[LanguageShowByIndex]
Var showdesc = aliasName[LanguageShowByIndex]
EndIf
DEBUGVAR showname
DEBUGVAR showdesc
DEBUGVAR IndexDrinktType
BackslashNToEnter showname
BackslashNToEnter showdesc
CRLFToSpace showname
CRLFToSpace showdesc
Var Timeout = 0
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
; back
<Button>
<X> 19 </X>
@ -2217,7 +2222,7 @@
If SugarZeroCalEnable = "true" Then
Var SugarZeroCalPrice = 10
Var priceFormat = "(+฿%.0f)"
Var priceFormat = " (+฿%.0f)"
Var SugarZeroCalPriceStr !assigned StringFmt( SugarZeroCalPrice , priceFormat, PreScaleConvertShow)
Var SugarNormalCheck = "PressForever"
@ -2812,7 +2817,7 @@
Var high_light_drink_type = "Invisible"
Var IndexDrinktType = 0
</EventClick>
@ -2870,7 +2875,7 @@
Var topping_price_refresh = 0
Topping "Load" PD_CODE2
Var IndexDrinktType = 1
</EventClick>
<Language>
@ -2928,7 +2933,7 @@
Topping "Load" PD_CODE3
Var IndexDrinktType = 2
</EventClick>
<Language>
@ -6073,6 +6078,16 @@
</Language>
</Text>
<Text>
<X> OatMilkPrice_X </X>
<Y> 77 </Y>
<Font> KanitRegularTTF </Font>
<State> "Enable" </State>
<Size> 28 </Size>
<Color> 0x84776F </Color>
<Value> OatMilkPrice </Value>
</Text>
</Block>
;
;
@ -8435,12 +8450,15 @@
If SelectCountDrinkType = 1 Then
If DefaultDrinkType = 1 Then
Var hot_button_state = "PressForever"
Var IndexDrinktType = 0
EndIf
If DefaultDrinkType = 2 Then
Var cold_button_state = "PressForever"
Var IndexDrinktType = 1
EndIf
If DefaultDrinkType = 3 Then
Var blend_button_state = "PressForever"
Var IndexDrinktType = 2
EndIf
EndIf