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

Merge branch 'smoothie_tbp' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into smoothie_tbp

Browse source
This commit is contained in:
wanlop run 2025-05-07 16:57:08 +07:00
commit fb9ded93c0
8 changed files with 80 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

132
inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml
View file

@ -166,11 +166,11 @@
</Description> </Description>
<BlendState> $12-06-03-0001.Button </BlendState> <BlendState> $12-06-03-0001.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0001.Price = -1 Then If $12-06-03-0001.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0001.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -228,17 +228,17 @@
Var PD_CODE3 = "12-06-03-0001" Var PD_CODE3 = "12-06-03-0001"
; begin lang ; begin lang
Var aliasName[0] = "Mango Tao Pun" Var aliasName[0] = "Mango Tao Pun"
Var aliasDesc[0] = "Real Mango" Var aliasDesc[0] = "Real Mango"
Var aliasName[1] = "มะม่วงเต่าปั่น" Var aliasName[1] = "มะม่วงเต่าปั่น"
Var aliasDesc[1] = "มะม่วง" Var aliasDesc[1] = "มะม่วง"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -375,11 +375,11 @@
</Description> </Description>
<BlendState> $12-06-03-0002.Button </BlendState> <BlendState> $12-06-03-0002.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0002.Price = -1 Then If $12-06-03-0002.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0002.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -437,17 +437,17 @@
Var PD_CODE3 = "12-06-03-0002" Var PD_CODE3 = "12-06-03-0002"
; begin lang ; begin lang
Var aliasName[0] = "Mango Lychee Tao Pun" Var aliasName[0] = "Mango Lychee Tao Pun"
Var aliasDesc[0] = "Real Mango Lychee" Var aliasDesc[0] = "Real Mango Lychee"
Var aliasName[1] = "มะม่่วงลิ้นจี่เต่าปั่น" Var aliasName[1] = "มะม่่วงลิ้นจี่เต่าปั่น"
Var aliasDesc[1] = "มะม่วง ลิ้นจี่" Var aliasDesc[1] = "มะม่วง ลิ้นจี่"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -584,11 +584,11 @@
</Description> </Description>
<BlendState> $12-06-03-0003.Button </BlendState> <BlendState> $12-06-03-0003.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0003.Price = -1 Then If $12-06-03-0003.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0003.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -646,17 +646,17 @@
Var PD_CODE3 = "12-06-03-0003" Var PD_CODE3 = "12-06-03-0003"
; begin lang ; begin lang
Var aliasName[0] = "Mango Strawberry Tao Pun" Var aliasName[0] = "Mango Strawberry Tao Pun"
Var aliasDesc[0] = "Real Mango Strawberry" Var aliasDesc[0] = "Real Mango Strawberry"
Var aliasName[1] = "มะม่วงสตรอเบอรีเต่าปั่น" Var aliasName[1] = "มะม่วงสตรอเบอรีเต่าปั่น"
Var aliasDesc[1] = "มะม่วง สตรอเบอรี" Var aliasDesc[1] = "มะม่วง สตรอเบอรี"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -793,11 +793,11 @@
</Description> </Description>
<BlendState> $12-06-03-0004.Button </BlendState> <BlendState> $12-06-03-0004.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0004.Price = -1 Then If $12-06-03-0004.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0004.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -855,17 +855,17 @@
Var PD_CODE3 = "12-06-03-0004" Var PD_CODE3 = "12-06-03-0004"
; begin lang ; begin lang
Var aliasName[0] = "Mango Salak Tao Pun" Var aliasName[0] = "Mango Salak Tao Pun"
Var aliasDesc[0] = "Real Mango Salak" Var aliasDesc[0] = "Real Mango Salak"
Var aliasName[1] = "มะม่วงสละเต่าปั่น" Var aliasName[1] = "มะม่วงสละเต่าปั่น"
Var aliasDesc[1] = "มะม่วง สละ" Var aliasDesc[1] = "มะม่วง สละ"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -1002,11 +1002,11 @@
</Description> </Description>
<BlendState> $12-06-03-0005.Button </BlendState> <BlendState> $12-06-03-0005.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0005.Price = -1 Then If $12-06-03-0005.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0005.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -1064,17 +1064,17 @@
Var PD_CODE3 = "12-06-03-0005" Var PD_CODE3 = "12-06-03-0005"
; begin lang ; begin lang
Var aliasName[0] = "Mango Pure Matcha Tao Pun" Var aliasName[0] = "Mango Pure Matcha Tao Pun"
Var aliasDesc[0] = "Real Mango Matcha" Var aliasDesc[0] = "Real Mango Matcha"
Var aliasName[1] = "มะม่วงมัทฉะเต่าปั่น" Var aliasName[1] = "มะม่วงมัทฉะเต่าปั่น"
Var aliasDesc[1] = "มะม่วง มัทฉะ" Var aliasDesc[1] = "มะม่วง มัทฉะ"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""
@ -1211,11 +1211,11 @@
</Description> </Description>
<BlendState> $12-06-03-0006.Button </BlendState> <BlendState> $12-06-03-0006.Button </BlendState>
<BlendPrice> eval( <BlendPrice> eval(
If $12-06-03-0006.Price = -1 Then If $12-06-03-0006.Price = -1 Then
Var return = "Free" Var return = "Free"
Else Else
Var return !assigned StringFmt( $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow) Var return !assigned StringFmt( $12-06-03-0006.Price , DisplayFormat, PreScaleConvertShow)
EndIf EndIf
) </BlendPrice> ) </BlendPrice>
<IceProcessingState> <IceProcessingState>
eval( eval(
@ -1273,17 +1273,17 @@
Var PD_CODE3 = "12-06-03-0006" Var PD_CODE3 = "12-06-03-0006"
; begin lang ; begin lang
Var aliasName[0] = "Mango Taiwanese Tea Tao Pun" Var aliasName[0] = "Mango Taiwanese Tea Tao Pun"
Var aliasDesc[0] = "Real Mango TaiwaneseTea" Var aliasDesc[0] = "Real Mango TaiwaneseTea"
Var aliasName[1] = "มะม่วงชาไต้หวันเต่าปั่น" Var aliasName[1] = "มะม่วงชาไต้หวันเต่าปั่น"
Var aliasDesc[1] = "มะม่วง ชาไต้หวัน" Var aliasDesc[1] = "มะม่วง ชาไต้หวัน"
Var aliasName[2] = "-" Var aliasName[2] = "-"
Var aliasDesc[2] = "-" Var aliasDesc[2] = "-"
Var aliasName[3] = "-" Var aliasName[3] = "-"
Var aliasDesc[3] = "-" Var aliasDesc[3] = "-"
Var aliasName[4] = "-" Var aliasName[4] = "-"
Var aliasDesc[4] = "-" Var aliasDesc[4] = "-"
Var aliasName[5] = "-" Var aliasName[5] = "-"
Var aliasDesc[5] = "-" Var aliasDesc[5] = "-"
Var NameLang[0][0] = "" Var NameLang[0][0] = ""
Var NameLang[0][1] = "" Var NameLang[0][1] = ""
Var NameLang[0][2] = "" Var NameLang[0][2] = ""

2
inter/tha/xml/page_help_center.lxml
View file

@ -104,6 +104,8 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
; back ; back
<Button> <Button>

1
inter/tha/xml/page_help_center_sending.lxml
View file

@ -86,6 +86,7 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
; back ; back
<Button> <Button>

2
inter/tha/xml/page_smoothie_suggest_and_process.xml
View file

@ -308,6 +308,8 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
; ;

4
inter/tha/xml/page_smoothie_suggest_and_process_2.xml
View file

@ -220,6 +220,8 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
@ -300,7 +302,7 @@
Var TimeOutSmoothiesProcess = 120 Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/xml/page_back_to_main.xml" ;include="ROOT/taobin_project/inc/return_condition.ev"
</EventClick> </EventClick>
</Button> </Button>

4
inter/tha/xml/page_smoothie_suggest_and_process_3.xml
View file

@ -190,6 +190,8 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
<Image> <Image>
<X> 0 </X> <X> 0 </X>
<Y> 380 </Y> <Y> 380 </Y>
@ -269,7 +271,7 @@
Var TimeOutSmoothiesProcess = 120 Var TimeOutSmoothiesProcess = 120
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/xml/page_back_to_main.xml" ;include="ROOT/taobin_project/inc/return_condition.ev"
</EventClick> </EventClick>
</Button> </Button>

1
inter/tha/xml/page_topping_frozen_fruit_select.lxml
View file

@ -262,6 +262,7 @@
RefreshAll RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
;include="ROOT/taobin_project/inc/video.inc"
<Image> <Image>
<X> 0 </X> <X> 0 </X>

2
xml/page_spiral_before_conti.xml
View file

@ -28,6 +28,8 @@
<EventActionOk> <EventActionOk>
</EventActionOk> </EventActionOk>
;include="ROOT/taobin_project/inc/video.inc"
<Video> <Video>
<X> 0 </X> <X> 0 </X>
<Y> 0 </Y> <Y> 0 </Y>