Merge branch 'masterpiece' into new_flow_payment
This commit is contained in:
commit
42272ff488
184 changed files with 176187 additions and 377 deletions
|
|
@ -1 +1 @@
|
|||
/event/promotion_pepween.xml
|
||||
/event/promotion_rerun.xml
|
||||
|
|
@ -1,2 +1 @@
|
|||
Var BigButtonEnable = "Invisible"
|
||||
|
||||
|
|
|
|||
10891
xml/event/promotion_rerun.xml
Normal file
10891
xml/event/promotion_rerun.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -7,39 +7,33 @@
|
|||
<Filename>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_en.png"
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_th.png"
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</Filename>
|
||||
<FilenamePress>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_en.png"
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_th.png"
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenamePress>
|
||||
<FilenameDisable>
|
||||
eval(
|
||||
If show_eng = "true" Then
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_en.png"
|
||||
Var return = ###normal_eng
|
||||
Else
|
||||
Var return = "ROOT/taobin_project/image/event/pepween/pro_pepween_th.png"
|
||||
Var return = ###normal_thai
|
||||
EndIf
|
||||
)
|
||||
</FilenameDisable>
|
||||
<EventOnClick>
|
||||
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween.xml"
|
||||
|
||||
; test random page
|
||||
;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_pro_rerun.xml"
|
||||
|
||||
</EventOnClick>
|
||||
|
||||
|
|
@ -59,7 +53,7 @@
|
|||
EndIf
|
||||
)
|
||||
</State>
|
||||
<Filename> "ROOT/taobin_project/image/event/pepween/bn_pepween_videoTH.mp4" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_rerun.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
<Video>
|
||||
|
|
@ -77,7 +71,7 @@
|
|||
)
|
||||
</State>
|
||||
<Loop> "true" </Loop>
|
||||
<Filename> "ROOT/taobin_project/image/event/pepween/bn_pepween_videoEN.mp4" </Filename>
|
||||
<Filename> "ROOT/taobin_project/image/event/pro_rerun.mp4" </Filename>
|
||||
</Video>
|
||||
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -16,15 +16,15 @@ Else
|
|||
; zone promote
|
||||
If OpenFromPageBoard = 1 Then
|
||||
|
||||
If pro15THBEnable = 1 Then
|
||||
If RerunProEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_rerun.xml"
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
If MyMintEnable = 1 Then
|
||||
If pro15THBEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_mymint.xml"
|
||||
OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
Var OpenFromPageBoard = 0
|
||||
|
||||
Else
|
||||
|
|
@ -33,16 +33,16 @@ Else
|
|||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If pro15THBEnable = 1 Then
|
||||
If RerunProEnable = 1 Then
|
||||
|
||||
; Temporary debug
|
||||
Var BigButtonEnable = "Enable"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_rerun.xml"
|
||||
|
||||
Else
|
||||
If MyMintEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_mymint.xml"
|
||||
If pro15THBEnable = 1 Then
|
||||
Var BigButtonEnable = "Enable"
|
||||
Open "ROOT/taobin_project/xml/event/promotion_15THB.xml"
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
|
||||
|
|
|
|||
|
|
@ -53,6 +53,10 @@ Var From15THBPro = 0
|
|||
Var MyMintEnable = 0
|
||||
Var FromMyMintPro = 0
|
||||
|
||||
; Enable pro Rerun, Jan 22-26/29-31
|
||||
Var RerunProEnable = 0
|
||||
Var FromRerunPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
|
||||
If SystemDateMonthInt = 10 Then
|
||||
|
|
@ -85,51 +89,56 @@ If SystemDateMonthInt = 1 Then
|
|||
If SystemDateDayInt < 15 Then
|
||||
Var MyMintEnable = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 22 Then
|
||||
If SystemDateDayInt <= 26 Then
|
||||
Var RerunProEnable = 1
|
||||
Else
|
||||
If SystemDateDayInt >= 29 Then
|
||||
If SystemDateDayInt <= 31 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
If BoxID = 173149 Then
|
||||
Var MyMintEnable = 1
|
||||
Var pro15THBEnable = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 176757 Then
|
||||
Var MyMintEnable = 1
|
||||
Var pro15THBEnable = 0
|
||||
EndIf
|
||||
|
||||
If BoxID = 172053 Then
|
||||
Var MyMintEnable = 1
|
||||
Var pro15THBEnable = 0
|
||||
EndIf
|
||||
|
||||
If MintSyrupEnable = "false" Then
|
||||
Var MyMintEnable = 0
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 172053 Then
|
||||
Var PepweenEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 172644 Then
|
||||
Var MyMintEnable = 1
|
||||
EndIf
|
||||
|
||||
If ConfigNumer = 1581 Then
|
||||
Var PepweenEnable = 0
|
||||
Var pro15THBEnable = 0
|
||||
Var MyMintEnable = 0
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var NewCollectPoint = 1
|
||||
Var MyMintEnable = 1
|
||||
Var pro15THBEnable = 0
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 175668 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 173969 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 176128 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 175937 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 175038 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 175045 Then
|
||||
Var RerunProEnable = 1
|
||||
EndIf
|
||||
|
||||
|
||||
Var GameEnableFromTrickerEv = 1
|
||||
|
||||
Var MayDayRunEnable = 0
|
||||
|
|
@ -140,6 +149,7 @@ If BoxID = 33170 Then
|
|||
Var PepsiProCodeEnable = 0
|
||||
Var MysteryProEnable = 0
|
||||
Var OreoWelcomeDrinkEnable = 0
|
||||
Var RerunProEnable = 0
|
||||
EndIf
|
||||
|
||||
; This var for overide video play when brew
|
||||
|
|
@ -158,6 +168,7 @@ If InternationalEnable = 1 Then
|
|||
Var PepsiProCodeEnable = 0
|
||||
Var MysteryProEnable = 0
|
||||
Var PepweenEnable = 0
|
||||
Var RerunProEnable = 0
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,95 @@
|
|||
else:
|
||||
fixed_price = 0
|
||||
|
||||
if current_file_name == "page_catalog_group_pro_rerun.skt":
|
||||
def GetPrice(product_code_1, product_code_2, product_code_3):
|
||||
prices = {
|
||||
"12-02-02-0043": 15,
|
||||
"12-99-05-0057": 15,
|
||||
"12-99-05-0059": 15,
|
||||
"12-02-02-0044": 20,
|
||||
"12-99-03-0046": 20,
|
||||
"12-99-02-0050": 20,
|
||||
"12-99-02-0011": 25,
|
||||
"12-99-02-0015": 25,
|
||||
"12-99-02-0003": 30,
|
||||
"12-99-02-0001": 30,
|
||||
"12-03-02-0036": 30,
|
||||
"12-03-03-0035": 35,
|
||||
"12-99-03-0066": 30
|
||||
}
|
||||
|
||||
|
||||
|
||||
if product_code_1 in prices:
|
||||
return prices[product_code_1]
|
||||
elif product_code_2 in prices:
|
||||
return prices[product_code_2]
|
||||
elif product_code_3 in prices:
|
||||
return prices[product_code_3]
|
||||
else:
|
||||
return ""
|
||||
|
||||
def GetOriginalPrice(product_code_1, product_code_2, product_code_3):
|
||||
original_prices = {
|
||||
"12-02-02-0043": 35,
|
||||
"12-99-05-0057": 20,
|
||||
"12-99-05-0059": 20,
|
||||
"12-02-02-0044": 25,
|
||||
"12-99-03-0046": 25,
|
||||
"12-99-02-0050": 25,
|
||||
"12-99-02-0011": 30,
|
||||
"12-99-02-0015": 30,
|
||||
"12-99-02-0003": 35,
|
||||
"12-99-02-0001": 35,
|
||||
"12-03-02-0036": 40,
|
||||
"12-03-03-0035": 45,
|
||||
"12-99-03-0066": 60
|
||||
}
|
||||
|
||||
if product_code_1 in original_prices:
|
||||
return original_prices[product_code_1]
|
||||
elif product_code_2 in original_prices:
|
||||
return original_prices[product_code_2]
|
||||
elif product_code_3 in original_prices:
|
||||
return original_prices[product_code_3]
|
||||
else:
|
||||
return ""
|
||||
|
||||
def GetTricker(product_code_1, product_code_2, product_code_3):
|
||||
trickers = {
|
||||
"12-02-02-0043": "PMD20",
|
||||
"12-99-05-0057": "PMD05",
|
||||
"12-99-05-0059": "PMD05",
|
||||
"12-02-02-0044": "PMD05",
|
||||
"12-99-03-0046": "PMD05",
|
||||
"12-99-02-0011": "PMD05",
|
||||
"12-99-02-0015": "PMD05",
|
||||
"12-99-02-0003": "PMD05",
|
||||
"12-99-02-0001": "PMD05",
|
||||
"12-03-02-0036": "PMD10",
|
||||
"12-03-03-0035": "PMD10",
|
||||
"12-99-03-0066": "PMD30"
|
||||
}
|
||||
|
||||
if product_code_1 in trickers:
|
||||
return trickers[product_code_1]
|
||||
elif product_code_2 in trickers:
|
||||
return trickers[product_code_2]
|
||||
elif product_code_3 in trickers:
|
||||
return trickers[product_code_3]
|
||||
else:
|
||||
return ""
|
||||
get_price = GetPrice
|
||||
get_original_price = GetOriginalPrice
|
||||
get_tricker = GetTricker
|
||||
rerun_fix_price = True
|
||||
else:
|
||||
get_price = None
|
||||
get_original_price = None
|
||||
get_tricker = None
|
||||
rerun_fix_price = False
|
||||
|
||||
if current_file_name == "page_catalog_group_pro_mymint.skt":
|
||||
from_my_mint_promotion = True
|
||||
menu_white_color_catalog = True
|
||||
|
|
@ -201,9 +290,15 @@
|
|||
|
||||
out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
|
||||
|
||||
out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
|
||||
out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
|
||||
out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n')
|
||||
if rerun_fix_price:
|
||||
out_xml( '\t\tVar PriceD1 = ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '\r\n')
|
||||
out_xml( '\t\tVar PriceD2 = ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '\r\n')
|
||||
out_xml( '\t\tVar PriceD3 = ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '\r\n')
|
||||
out_xml( '\t\tVar OldPrice = ' + str(get_original_price(pd_code_1, pd_code_2, pd_code_3)) + '\r\n')
|
||||
else:
|
||||
out_xml( '\t\tVar PriceD1 = $' + spl[4] + '.Price\r\n')
|
||||
out_xml( '\t\tVar PriceD2 = $' + spl[5] + '.Price\r\n')
|
||||
out_xml( '\t\tVar PriceD3 = $' + spl[6] + '.Price\r\n')
|
||||
|
||||
out_xml( '\t\tVar PD_CODE1 = "' + pd_code_1 + '"\r\n')
|
||||
out_xml( '\t\tVar PD_CODE2 = "' + pd_code_2 + '"\r\n')
|
||||
|
|
@ -284,6 +379,10 @@
|
|||
if fixed_price > 0:
|
||||
out_xml( '\t\tVar From15THBPro = 1 \r\n')
|
||||
|
||||
if rerun_fix_price:
|
||||
out_xml( '\t\tVar FromRerunPro = 1 \r\n')
|
||||
out_xml( '\t\tVar RerunProCode = "' + get_tricker(pd_code_1, pd_code_2, pd_code_3) + '"\r\n')
|
||||
|
||||
if from_my_mint_promotion:
|
||||
out_xml( '\t\tVar FromMyMintPro = 1 \r\n')
|
||||
|
||||
|
|
@ -412,11 +511,15 @@
|
|||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> StringFmt( ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[4] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> "฿' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[4] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
|
@ -463,11 +566,15 @@
|
|||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> StringFmt( ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[5] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> "฿' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[5] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
|
@ -516,11 +623,15 @@
|
|||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> StringFmt( 15 , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> StringFmt( ' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + ' , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> StringFmt( $' + spl[6] + '.Price , DisplayFormat, PreScaleConvertShow) </Value>; test\r\n')
|
||||
else:
|
||||
if fixed_price > 0:
|
||||
out_xml( '\t<Value> "฿15" </Value>\r\n')
|
||||
elif rerun_fix_price:
|
||||
out_xml( '\t<Value> "฿' + str(get_price(pd_code_1, pd_code_2, pd_code_3)) + '" </Value>\r\n')
|
||||
else:
|
||||
out_xml( '\t<Value> Var( "฿" + $' + spl[6] + '.Price ) </Value>\r\n')
|
||||
out_xml( '\t</Text>\r\n')
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
<Height> 1920 </Height>
|
||||
|
||||
<EventOpen>
|
||||
Var InstanceTabOpenFile12 = "ROOT/taobin_project/xml/menutab/start_up_inst_dummy.xml"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 10000 </Timeout>
|
||||
|
|
|
|||
|
|
@ -722,6 +722,10 @@
|
|||
Var CountryName = "Australia"
|
||||
EndIf
|
||||
|
||||
If StrCountryShort = "SGP" Then
|
||||
Var CountryName = "Singapore"
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -745,6 +749,10 @@
|
|||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR CountDownShowButton
|
||||
DEBUGVAR EventTurnOn
|
||||
|
|
@ -894,6 +902,46 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/video/script_video.ev"
|
||||
|
||||
Var WebAppShow = "Invisible"
|
||||
EnableLanguage "ENG"
|
||||
SetLanguage "ENG"
|
||||
LanguageControl "UpdateList" "-"
|
||||
|
||||
Var InternationalEnable = 1
|
||||
Var show_eng = "true"
|
||||
Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
|
||||
|
||||
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||
|
||||
Var CountryRootPath = "ROOT/taobin_project/inter/sgp/"
|
||||
|
||||
ar TextPriceMenuSize = 12
|
||||
Var TextPriceMenuY = 264
|
||||
Var TextPriceMenuBlendX = 180
|
||||
Var TextPriceMenuHotX = 48
|
||||
Var ShowButtonClick2 = "Enable"
|
||||
Var ButtontoTopupMenu = "Invisible"
|
||||
|
||||
Var PriceUnitText = "Price in SGD"
|
||||
|
||||
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
|
||||
Var CountDownShowButton = 35
|
||||
|
||||
Var XButtonMember = 384
|
||||
Var YButtonMember = 1695
|
||||
|
||||
If Not#LanguageLoaded = "" Then
|
||||
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/menu/lang.tsv"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR InternationalEnable
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1127,6 +1127,7 @@
|
|||
Var Cid = 39
|
||||
Else
|
||||
Var Cid = 40
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -1240,6 +1241,7 @@
|
|||
Var Cid = 39
|
||||
Else
|
||||
Var Cid = 40
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -602,6 +602,7 @@
|
|||
Var Cid = 39
|
||||
Else
|
||||
Var Cid = 40
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -721,6 +722,7 @@
|
|||
Var Cid = 39
|
||||
Else
|
||||
Var Cid = 40
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
47
xml/page_catalog_group_pro_rerun.skt
Normal file
47
xml/page_catalog_group_pro_rerun.skt
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
<?hurr
|
||||
#include=menu_head.py
|
||||
?>
|
||||
|
||||
<Popup>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1920 </Height>
|
||||
;<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
; On open
|
||||
<?hurr
|
||||
#include=menu_catalog_default_init.py
|
||||
?>
|
||||
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var RerunProCode = ""
|
||||
Var FromRerunPro = 0
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_catalog_new_menu.py
|
||||
?>
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_catalog_new.py
|
||||
?>
|
||||
|
||||
|
||||
|
||||
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen_v2.py
|
||||
?>
|
||||
<?hurr
|
||||
#include=menu_new_layout_gen.py
|
||||
?>
|
||||
|
||||
|
||||
|
||||
</Popup>
|
||||
3617
xml/page_catalog_group_pro_rerun.xml
Normal file
3617
xml/page_catalog_group_pro_rerun.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -61,11 +61,6 @@
|
|||
Var PointDiff = 0
|
||||
|
||||
|
||||
|
||||
|
||||
Var Discount15Timeout = 0
|
||||
|
||||
|
||||
Var TaobinExpireDay = ""
|
||||
Var TaobinExpireMonth = ""
|
||||
Var TaobinExpireMonthX = ""
|
||||
|
|
@ -607,28 +602,39 @@
|
|||
|
||||
Var PreviousSeeker = "tempSeeker"
|
||||
Var Seeker.UseGet15Discount = 0
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
Var GetDrink5Bath = 0
|
||||
|
||||
If Seeker = "curr" Then
|
||||
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
|
||||
Var PreviousSeeker.UseGet15Discount = 0
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
Else
|
||||
|
||||
If PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit Then
|
||||
If PreviousSeeker.UseGet15Discount = 1 Then
|
||||
Var Get15DiscountState = "Disable2"
|
||||
EndIf
|
||||
If PreviousSeeker.UseGetDrink5Bath = 1 Then
|
||||
Var Get15DiscountState = "Disable2"
|
||||
EndIf
|
||||
Else
|
||||
Var PreviousSeeker.TNumberTaobinCredit = Seeker.TNumberTaobinCredit
|
||||
Var PreviousSeeker.UseGet15Discount = 0
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If CoffeePoint >= 28 Then
|
||||
Var KeepBnBtnImage = "/bn_close.png"
|
||||
Var KeepBpBtnImage = "/bp_close.png"
|
||||
Var Get15DiscountState = "Disable"
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 1
|
||||
If Get15DiscountState = "Disable2" Then
|
||||
Var GetDrink5Bath = 0
|
||||
Else
|
||||
Var Get15DiscountState = "Disable2"
|
||||
Var GetDrink5Bath = 1
|
||||
Var PreviousSeeker.UseGetDrink5Bath = 1
|
||||
EndIf
|
||||
Else
|
||||
If PreviousSeeker.UseGetDrink5Bath = 1 Then
|
||||
Var Get15DiscountState = "Disable2"
|
||||
|
|
@ -673,18 +679,13 @@
|
|||
|
||||
|
||||
If CoffeePoint >= 28 Then
|
||||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
Else
|
||||
If CoffeePoint >= 15 Then
|
||||
If Get15DiscountState = "Disable2" Then
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
Else
|
||||
Var Discount15Timeout = 1
|
||||
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
|
||||
EndIf
|
||||
If GetDrink5Bath = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -828,7 +829,11 @@
|
|||
; goto lid straw
|
||||
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
If CoffeePoint >= 28 Then
|
||||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
If GetDrink5Bath = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_display_get_drink_5_baht.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
|
@ -849,8 +854,6 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var Seeker.UseGet15Discount = 1
|
||||
Var PreviousSeeker.UseGet15Discount = 1
|
||||
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
|
||||
|
||||
</EventClick>
|
||||
|
|
|
|||
|
|
@ -14,17 +14,10 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/display_get_discount"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR Discount15Timeout
|
||||
|
||||
Var PopUpState1 = "Enable"
|
||||
Var PopUpState2 = "Invisible"
|
||||
Var PopUpState1 = "Invisible"
|
||||
Var PopUpState2 = "Enable"
|
||||
Var PopUpErrorState = "Invisible"
|
||||
|
||||
If Discount15Timeout = 1 Then
|
||||
Var PopUpState2 = "Enable"
|
||||
Var PopUpState1 = "Invisible"
|
||||
EndIf
|
||||
|
||||
If PayOfflineMode = 1 Then
|
||||
Var PopUpErrorState = "Enable"
|
||||
Var PopUpState1 = "Invisible"
|
||||
|
|
@ -119,8 +112,10 @@
|
|||
; goto lid straw
|
||||
Var Seeker.UseGet15Discount = 1
|
||||
Var PreviousSeeker.UseGet15Discount = 1
|
||||
Var Discount15Timeout = 0
|
||||
Open "ROOT/taobin_project/xml/page_display_get_15_discount.xml"
|
||||
Var PopUpState2 = "Invisible"
|
||||
Var PopUpState1 = "Enable"
|
||||
Var Timeout = 0
|
||||
Refresh
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
|
|
@ -224,6 +224,7 @@
|
|||
|
||||
Else
|
||||
Var error_code_stop_now = 1296
|
||||
__CMD "error-code-1296" 0 "-" "-"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
|
|
|
|||
|
|
@ -76,6 +76,14 @@
|
|||
Var PriceDrink = OriginalPrice
|
||||
EndIf
|
||||
|
||||
If FromRerunPro = 1 Then
|
||||
Var PromoPriceDrink = PriceDrink
|
||||
Var PriceDrink = OldPrice
|
||||
|
||||
DEBUGVAR PriceDrink
|
||||
DEBUGVAR PromoPriceDrink
|
||||
EndIf
|
||||
|
||||
;Var AdultFlag = 1
|
||||
|
||||
|
||||
|
|
@ -270,6 +278,20 @@
|
|||
DEBUGVAR PriceDrink
|
||||
DEBUGVAR PriceDrinkTmp
|
||||
|
||||
If FromRerunPro = 1 Then
|
||||
Var PriceDiff = PriceDrink - PromoPriceDrink
|
||||
Var Seeker.VendingCode = RerunProCode
|
||||
Var Seeker.IntVendingCampaign = PriceDiff
|
||||
Var Seeker.FreeVendingCampaign = 0
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var Seeker.CodeNumber = IDNum
|
||||
Var Seeker.VendingCampaignRI3 = PriceDiff
|
||||
Var Seeker.CampaignPPrice = PromoPriceDrink
|
||||
|
||||
; reset
|
||||
Var RerunProCode = ""
|
||||
EndIf
|
||||
|
||||
If NightTime = 1 Then
|
||||
If SelectDrink = "12-99-03-0066" Then
|
||||
Var PriceDrink = 60
|
||||
|
|
|
|||
2003
xml/page_payment_cash-SGP.xml
Normal file
2003
xml/page_payment_cash-SGP.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -8,6 +8,8 @@
|
|||
<EventOpen>
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
DEBUGVAR CountryName
|
||||
|
||||
Var cash_disable = "0"
|
||||
READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
|
||||
DEBUGVAR cash_disable
|
||||
|
|
@ -28,6 +30,10 @@
|
|||
Open "ROOT/taobin_project/xml/page_payment_cash-AUS.xml"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/xml/page_payment_cash-SGP.xml"
|
||||
EndIf
|
||||
|
||||
Var PreScaleCanculate = 1
|
||||
|
||||
|
||||
|
|
@ -235,6 +241,9 @@
|
|||
Var PayState4 = "Enable"
|
||||
EndIf
|
||||
|
||||
If FromRerunPro = 1 Then
|
||||
Var PayState4 = "Enable"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
Var PayState3 = "Enable"
|
||||
|
|
|
|||
|
|
@ -348,6 +348,14 @@
|
|||
If ErrorCause = "failed_fromoper_0006" Then
|
||||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
|
|
|
|||
|
|
@ -203,6 +203,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -203,6 +203,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -203,6 +203,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -206,6 +206,14 @@
|
|||
Var text_show_error = DirImage + "/text_show_error4.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0007" Then
|
||||
Var text_show_error = DirImage + "/text_show_error7.png"
|
||||
EndIf
|
||||
|
||||
If ErrorCause = "failed_fromoper_0008" Then
|
||||
Var text_show_error = DirImage + "/text_show_error8.png"
|
||||
EndIf
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var Seeker.CodeChannel = 0
|
||||
Var Tel_Confirm_State = "Disable"
|
||||
|
|
|
|||
|
|
@ -193,6 +193,7 @@
|
|||
|
||||
Else
|
||||
Var error_code_stop_now = 1296
|
||||
__CMD "error-code-1296" 0 "-" "-"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
|
||||
SAVELOG "Event Open Select 6 inter"
|
||||
|
||||
Var OpenFileXML = CountryRootPath + "xml/page_topping_select6.lxml"
|
||||
Open OpenFileXML
|
||||
|
||||
Var y_topping_bg = 912
|
||||
|
||||
Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1
|
||||
|
|
|
|||
|
|
@ -671,7 +671,13 @@
|
|||
Var TelephoneNumber = "0859586589"
|
||||
WRITE_FILE "/mnt/sdcard/config_taobingame.yaml" ""
|
||||
;APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.233:30487/taobingame"\r\n"
|
||||
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n"
|
||||
If CountryName = "Australia" Then
|
||||
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://nlb-taobingame-service-40430a2f6317ba2f.elb.ap-southeast-1.amazonaws.com:26969"\r\n"
|
||||
Else
|
||||
APPEND_FILE "/mnt/sdcard/config_taobingame.yaml" "API_ENDPOINT: "http://10.0.16.231:30460"\r\n"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var ACCString !assigned SprintFmt("ACC: "%s"\r\n", TelephoneNumber)
|
||||
DEBUGVAR ACCString
|
||||
|
|
@ -680,7 +686,10 @@
|
|||
Var LangString = "LANG: "EN"\r\n"
|
||||
Else
|
||||
Var LangString = "LANG: "TH"\r\n"
|
||||
|
||||
EndIf
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
Var LangString = "LANG: "EN"\r\n"
|
||||
EndIf
|
||||
|
||||
; reset
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue