Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
31f3de5285
1150 changed files with 4372 additions and 3921 deletions
|
|
@ -597,7 +597,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203020081) </State>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203020081) </State>
|
||||
<Button>
|
||||
<State> $Sum1203020081 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_santa_ginger.png" </Filename>
|
||||
|
|
@ -848,7 +848,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203030088) </State>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203030088) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030088 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_choco_snow_flake_smoothie.png" </Filename>
|
||||
|
|
@ -1101,7 +1101,7 @@ CARAMEL SYRUP , OREO AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203030089) </State>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203030089) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030089 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_reindeer_peppermint_smoothie.png" </Filename>
|
||||
|
|
@ -1355,7 +1355,7 @@ STRAWBERRY SYRUP AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1201020084) </State>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1201020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1201020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
@ -1608,7 +1608,7 @@ CARAMEL SYRUP AND WATER" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1221020084) </State>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1221020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1221020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
|
|||
|
|
@ -313,15 +313,6 @@ If SystemDateMonthInt = 11 Then
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If SystemDateMonthInt > 11 Then
|
||||
Var JemilaToppingFlag = 1
|
||||
Var SugarZeroCalFreeFlag = 1
|
||||
|
||||
If SystemDateDayOfWeek = "Wednesday" Then
|
||||
Var JemilaToppingFreeFlag = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If SystemDateMonthInt = 12 Then
|
||||
|
||||
|
|
@ -335,6 +326,12 @@ If SystemDateMonthInt = 12 Then
|
|||
EndIf
|
||||
|
||||
|
||||
Var JemilaToppingFlag = 1
|
||||
If SystemDateDayOfWeek = "Wednesday" Then
|
||||
Var JemilaToppingFreeFlag = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var NewFlowPaymentCode = 1
|
||||
Var New_Payment = 1
|
||||
|
|
@ -344,7 +341,7 @@ If BoxID = 105005 Then
|
|||
Var WeekdayDiscountProEventOn = 0
|
||||
Var OreoDiscount11Pro = 0
|
||||
Var HappyTriosPro = 0
|
||||
Var 12Day12MenuPro = 1
|
||||
Var 12Day12MenuPro = 0
|
||||
Var WinterWonderPro = 1
|
||||
Var ThickTeaByBrewerPro = 1
|
||||
|
||||
|
|
@ -387,13 +384,15 @@ If BoxID = 201729 Then
|
|||
Var MomCocoaPro = 0
|
||||
Var MomCocoaProDiscountEnable = 0
|
||||
Var RobinsonBeautyPro = 0
|
||||
Var JemilaPro = 0
|
||||
Var JemilaToppingFlag = 0
|
||||
Var JemilaToppingFlag = 1
|
||||
Var JemilaToppingFreeFlag = 1
|
||||
|
||||
|
||||
Var 12Day12MenuPro = 0
|
||||
Var WinterWonderPro = 1
|
||||
Var ThickTeaByBrewerPro = 1
|
||||
Var ThickTeaByBrewerBanner = 1
|
||||
|
||||
EndIf
|
||||
|
||||
If BoxID = 201193 Then
|
||||
|
|
@ -411,9 +410,10 @@ If BoxID = 201714 Then
|
|||
Var MomCocoaPro = 0
|
||||
Var MomCocoaProDiscountEnable = 0
|
||||
Var RobinsonBeautyPro = 0
|
||||
Var JemilaPro = 1
|
||||
|
||||
Var JemilaToppingFlag = 1
|
||||
Var ThickTeaByBrewerPro = 1
|
||||
Var ThickTeaByBrewerBanner = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 173149 Then
|
||||
|
|
@ -423,6 +423,7 @@ If BoxID = 173149 Then
|
|||
Var JemilaPro = 1
|
||||
|
||||
Var JemilaToppingFlag = 1
|
||||
|
||||
EndIf
|
||||
|
||||
If BoxID = 172644 Then
|
||||
|
|
@ -435,24 +436,22 @@ If BoxID = 172644 Then
|
|||
|
||||
Var New_Payment = 1
|
||||
Var NewFlowPaymentCode = 1
|
||||
|
||||
|
||||
Var 12Day12MenuPro = 0
|
||||
Var WinterWonderPro = 1
|
||||
Var ThickTeaByBrewerPro = 1
|
||||
|
||||
Var JemilaToppingFlag = 1
|
||||
EndIf
|
||||
|
||||
Var XMLLiveInfoEnable = 1
|
||||
|
||||
|
||||
; Override
|
||||
Var JemilaToppingFlag = 0
|
||||
Var JemilaToppingFreeFlag = 0
|
||||
|
||||
|
||||
Var GameEnableFromTrickerEv = 1
|
||||
|
||||
Var MayDayRunEnable = 0
|
||||
|
||||
DEBUGVAR JemilaToppingFlag
|
||||
|
||||
|
||||
; This var for overide video play when brew
|
||||
Var adver_brewing_video_full_file_name = ""
|
||||
|
|
|
|||
|
|
@ -480,8 +480,18 @@
|
|||
|
||||
Var DEE = PayDetail
|
||||
|
||||
|
||||
DEBUGVAR PayDetail
|
||||
DEBUGVAR PayDetail2
|
||||
DEBUGVAR SVT
|
||||
DEBUGVAR ACC
|
||||
DEBUGVAR VendingTSIDTmp
|
||||
|
||||
|
||||
|
||||
PAYEXT SVT ACC VendingTSIDTmp DEE
|
||||
|
||||
|
||||
Var ActionOKCase = 1
|
||||
If Seeker.CodeChannel = 0 Then
|
||||
SAVELOG "back_to_main from line > 391."
|
||||
|
|
|
|||
|
|
@ -1117,6 +1117,9 @@
|
|||
If EnableMultiInstance = "true" Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
||||
Var InternationalEnable = 1
|
||||
DEBUGVAR InternationalEnable
|
||||
|
||||
|
|
@ -1135,7 +1138,7 @@
|
|||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
EnableLanguage "MYANMAR"
|
||||
;EnableLanguage "MYANMAR"
|
||||
|
||||
If MyanmarLangEnable = "true" Then
|
||||
EnableLanguage "MYANMAR"
|
||||
|
|
@ -1154,6 +1157,7 @@
|
|||
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
Var CurrentPageShowError = 0
|
||||
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
|
@ -1415,8 +1419,10 @@
|
|||
EnableLanguage "THAI"
|
||||
;EnableLanguage "MYANMAR"
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
If MyanmarLangEnable = "true" Then
|
||||
EnableLanguage "MYANMAR"
|
||||
Var RedirectToNormalVersion = 0
|
||||
EndIf
|
||||
|
||||
SetLanguage "THAI"
|
||||
|
|
@ -1457,7 +1463,7 @@
|
|||
Var MinPhoneNumber = 10
|
||||
Var MaxPhoneNumber = 10
|
||||
|
||||
Var RedirectToNormalVersion = 1
|
||||
|
||||
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||
|
||||
|
|
|
|||
|
|
@ -569,14 +569,14 @@
|
|||
|
||||
|
||||
If NextOrderStatus = "Disable" Then
|
||||
Var PayDetail="1/F:1221/0/"
|
||||
Var PayDetail="2/F:1221/0/"
|
||||
Var PayDetail = PayDetail + "/XML|"
|
||||
Var PayDetail = PayDetail + Seeker.OrderChanel
|
||||
|
||||
Else
|
||||
DEBUGVAR error_code_stop_now
|
||||
If error_code_stop_now > 0 Then
|
||||
Var PayDetail="1/F:" + error_code_stop_now
|
||||
Var PayDetail="2/F:" + error_code_stop_now
|
||||
Var PayDetail = PayDetail + "/0/"
|
||||
Var PayDetail = PayDetail + "/XML|"
|
||||
Var PayDetail = PayDetail + Seeker.OrderChanel
|
||||
|
|
@ -585,7 +585,7 @@
|
|||
|
||||
|
||||
|
||||
Var PayDetail = "1/" + HURR_FOREVER
|
||||
Var PayDetail = "2/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + ""
|
||||
Var PayDetail = PayDetail + "/"
|
||||
|
|
|
|||
|
|
@ -2078,7 +2078,7 @@ MILK" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",$Sum1203020081) </State>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203020081) </State>
|
||||
<Button>
|
||||
<State> $Sum1203020081 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_santa_ginger.png" </Filename>
|
||||
|
|
@ -2329,7 +2329,7 @@ MILK" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",$Sum1203030088) </State>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203030088) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030088 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_choco_snow_flake_smoothie.png" </Filename>
|
||||
|
|
@ -2582,7 +2582,7 @@ CARAMEL SYRUP , OREO AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",$Sum1203030089) </State>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1203030089) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030089 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_reindeer_peppermint_smoothie.png" </Filename>
|
||||
|
|
@ -2836,7 +2836,7 @@ STRAWBERRY SYRUP AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",$Sum1201020084) </State>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1201020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1201020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
@ -3089,7 +3089,7 @@ CARAMEL SYRUP AND WATER" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",$Sum1221020084) </State>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",$Sum1221020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1221020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
Var block_index_move = 0
|
||||
</Script>
|
||||
;dummy_layout.inc
|
||||
; menu_new_list 78
|
||||
; menu_new_list 79
|
||||
; ==================> Len = 19
|
||||
; - 12-05-02-0007 12-05-03-0007
|
||||
<Block>
|
||||
|
|
|
|||
|
|
@ -3401,13 +3401,8 @@ Sugar, Oreo" </Value>
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOnClick>
|
||||
Var NameDrink = "GINGER MILK TEA OREO SMOOTHIE"
|
||||
<<<<<<< HEAD
|
||||
Var NameDrinkTH = "ชานมขิงโอริโอ้ปั่น"
|
||||
Var DrinkDescriptionTH = "ขิง นม น้ำตาล Oreo"
|
||||
=======
|
||||
Var NameDrinkTH = "ชานมขิงโอรีโอปั่น"
|
||||
Var DrinkDescriptionTH = "ขิง นม น้ำตาล โอรีโอ"
|
||||
>>>>>>> 60d7978f96f90bf627023963827e19d9b7d9a52a
|
||||
Var DrinkDescription = "Ginger, Milk, Sugar, Oreo"
|
||||
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ginger_milk_Oreo_smoothie_oreo_11"
|
||||
Var PictureDrink = PictureDrink + Extension
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203020081) </State>
|
||||
<State> Flag( 12-03-02-0081.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203020081) </State>
|
||||
<Button>
|
||||
<State> $Sum1203020081 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_santa_ginger.png" </Filename>
|
||||
|
|
@ -830,7 +830,7 @@
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203030088) </State>
|
||||
<State> Flag( 12-03-03-0088.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203030088) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030088 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_choco_snow_flake_smoothie.png" </Filename>
|
||||
|
|
@ -1083,7 +1083,7 @@ CARAMEL SYRUP , OREO AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1203030089) </State>
|
||||
<State> Flag( 12-03-03-0089.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1203030089) </State>
|
||||
<Button>
|
||||
<State> $Sum1203030089 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_reindeer_peppermint_smoothie.png" </Filename>
|
||||
|
|
@ -1337,7 +1337,7 @@ STRAWBERRY SYRUP AND ICE" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1201020084) </State>
|
||||
<State> Flag( 12-01-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1201020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1201020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
@ -1590,7 +1590,7 @@ CARAMEL SYRUP AND WATER" </Value>
|
|||
<MarginTop> 22 </MarginTop>
|
||||
<Width> 225 </Width>
|
||||
<Height> 296 </Height>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2024/12/31T23:59:59",Disable=Invisible,$Sum1221020084) </State>
|
||||
<State> Flag( 12-21-02-0084.Button,DateTimeStart="2024/12/01T00:00:00",DateTimeEnd="2025/01/06T23:59:59",Disable=Invisible,$Sum1221020084) </State>
|
||||
<Button>
|
||||
<State> $Sum1221020084 </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_christmas_cafe_latte.png" </Filename>
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/collectiing/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
StopLongPlay
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
<EventOpen>
|
||||
; On open
|
||||
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/collectiing/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var GetFreeFlag = 0
|
||||
|
|
|
|||
|
|
@ -126,14 +126,18 @@
|
|||
|
||||
If Seeker = "next" Then
|
||||
;CoinBack
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Else
|
||||
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
||||
Var Brew3ConInter = CountryRootPath + "/xml/page_brewing3Conti.xml"
|
||||
|
||||
|
||||
If Seeker = "next" Then
|
||||
;CoinBack
|
||||
Open Brew3ConInter
|
||||
|
|
|
|||
|
|
@ -344,6 +344,7 @@
|
|||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 900 </Timeout>
|
||||
|
|
|
|||
|
|
@ -803,12 +803,12 @@
|
|||
|
||||
; Member not found
|
||||
If ErrorCause = "failed_fromoper_1001" Then
|
||||
Var QRErrorText = "Member cannot be found"
|
||||
Var QRErrorText = "Number not found"
|
||||
EndIf
|
||||
|
||||
; Not enough balance
|
||||
If ErrorCause = "failed_fromoper_1002" Then
|
||||
Var QRErrorText = "Not having enough\nbalance"
|
||||
Var QRErrorText = "Insufficient Balance"
|
||||
EndIf
|
||||
|
||||
Var QR_POPUP = "/img_popup8-2.png"
|
||||
|
|
|
|||
|
|
@ -1233,10 +1233,11 @@
|
|||
Var PayState2 = "Disable"
|
||||
EndIf
|
||||
|
||||
Var PayState2 = "Enable"
|
||||
Var PayState3 = "Enable"
|
||||
Var PayState4 = "Enable"
|
||||
Var PayState5 = "Enable"
|
||||
;for test
|
||||
;Var PayState2 = "Enable"
|
||||
;Var PayState3 = "Enable"
|
||||
;Var PayState4 = "Enable"
|
||||
;Var PayState5 = "Enable"
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,11 @@
|
|||
Var countClick = 0
|
||||
Var countClick2 = 0
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var CurrentPageShowError = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR stop_now
|
||||
|
|
@ -198,7 +203,7 @@
|
|||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
RefreshAll
|
||||
</EventLanguageOnChange>
|
||||
|
||||
<Function2>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
|
|
|||
|
|
@ -48,15 +48,22 @@
|
|||
Var BottomText = PicturePath + "text_bottom_thai2.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
|
||||
EndIf
|
||||
|
||||
;DEBUGVAR StarwState
|
||||
;DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
||||
;If StarwState = "Press" Then
|
||||
;I f StarwState = "Press" Then
|
||||
; Machine StrawWithDelay
|
||||
; LED LedDoorLid Blink 255 255 255 255
|
||||
;EndIf
|
||||
;If LidState = "Press" Then
|
||||
;I f LidState = "Press" Then
|
||||
; Machine LidWithDelay
|
||||
; LED LedDoorLid Blink 255 255 255 255
|
||||
;EndIf
|
||||
|
|
@ -108,6 +115,10 @@
|
|||
Var DirImage2 = "ROOT/taobin_project/image/complete/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
|
||||
EndIf
|
||||
|
||||
Var txtDrinkOKState = "Invisible"
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
|
|
@ -282,12 +293,20 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Please take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -295,6 +314,9 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@
|
|||
Var BottomText = PicturePath + "text_bottom_thai2.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
|
|
|||
|
|
@ -512,6 +512,23 @@
|
|||
|
||||
DEBUGVAR $12-02-03-0043.Name
|
||||
DEBUGVAR $12-02-03-0043.NameE
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var showname = NameDrink
|
||||
Var showdesc = DrinkDescription
|
||||
Else
|
||||
Var showname = NameDrinkTH
|
||||
Var showdesc = DrinkDescriptionTH
|
||||
EndIf
|
||||
|
||||
BackslashNToEnter showname
|
||||
BackslashNToEnter showdesc
|
||||
CRLFToSpace showname
|
||||
CRLFToSpace showdesc
|
||||
DEBUGVAR showname
|
||||
DEBUGVAR showdesc
|
||||
|
||||
|
||||
|
||||
Strlen showname show_name_len
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -526,7 +543,6 @@
|
|||
|
||||
Var MenuReasonStage = "Invisible"
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -797,6 +813,7 @@
|
|||
Var MenuReasonStage = "Enable"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR CollagenState
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
@ -1151,6 +1168,8 @@
|
|||
DEBUGVAR SubMenuGroupIDSlot6_1
|
||||
|
||||
DEBUGVAR TOPPING3
|
||||
DEBUGVAR JemilaToppingFlag
|
||||
|
||||
If TOPPING3 = "Collagen(mix)" Then
|
||||
If JemilaToppingFlag = 1 Then
|
||||
|
||||
|
|
@ -1192,7 +1211,9 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR CollagenState
|
||||
|
||||
If CollagenState = "Enable" Then
|
||||
Var ExtraTopping = "Enable"
|
||||
EndIf
|
||||
|
||||
Var PriceCustomCoffeeFormat = "%.0f฿"
|
||||
|
||||
|
|
@ -7960,12 +7981,23 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var showname = NameDrink
|
||||
Var showdesc = DrinkDescription
|
||||
Else
|
||||
Var showname = NameDrinkTH
|
||||
Var showdesc = DrinkDescriptionTH
|
||||
EndIf
|
||||
|
||||
|
||||
BackslashNToEnter showname
|
||||
BackslashNToEnter showdesc
|
||||
CRLFToSpace showname
|
||||
CRLFToSpace showdesc
|
||||
DEBUGVAR showname
|
||||
DEBUGVAR showdesc
|
||||
|
||||
|
||||
Strlen showname show_name_len
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -8169,7 +8201,7 @@
|
|||
<Width> 1080 </Width>
|
||||
<Align> end </Align>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> "#7"</Value>
|
||||
<Value> "#7+"</Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
|
|
@ -8190,6 +8222,7 @@
|
|||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
RefreshAll
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest4>
|
||||
|
|
|
|||
|
|
@ -219,17 +219,21 @@
|
|||
DEBUGVAR BrewCommand
|
||||
Var BrewCommand = "-"
|
||||
If EnableMultiInstance = "true" Then
|
||||
InstanceOverSetString "RefreshNow" 5
|
||||
InstanceOverSetString "RefreshNow" 6
|
||||
InstanceOverSetString "RefreshNow" 7
|
||||
InstanceOverSetString "RefreshNow" 8
|
||||
InstanceOverSetString "RefreshNow" 9
|
||||
InstanceOverSetString "RefreshNow" 10
|
||||
InstanceOverSetString "RefreshNow" 11
|
||||
; TODO
|
||||
If CurrentPageShowError = 1 Then
|
||||
;do not thing
|
||||
Else
|
||||
InstanceOverSetString "RefreshNow" 5
|
||||
InstanceOverSetString "RefreshNow" 6
|
||||
InstanceOverSetString "RefreshNow" 7
|
||||
InstanceOverSetString "RefreshNow" 8
|
||||
InstanceOverSetString "RefreshNow" 9
|
||||
InstanceOverSetString "RefreshNow" 10
|
||||
InstanceOverSetString "RefreshNow" 11
|
||||
; TODO
|
||||
|
||||
; Trick Refresh First
|
||||
Var SlientRefreshIndex = 2
|
||||
; Trick Refresh First
|
||||
Var SlientRefreshIndex = 2
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If Not#CountDownForMulti = 99 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue