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

This commit is contained in:
Ittipat Lusuk 2025-05-06 16:26:51 +07:00
commit 9335726267
5 changed files with 1512 additions and 1538 deletions

File diff suppressed because it is too large Load diff

View file

@ -143,38 +143,6 @@
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
</EventOnClick>
</Banner>
<Banner>
<State> KingdomThaiTeaProState </State>
<Type> IMAGE </Type>
<Media>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
Else
Var return = "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png"
EndIf
)
</Media>
<EventOnClick>
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_kingdom_thai_tea.lxml"
</EventOnClick>
</Banner>
<Banner>
<State> PepsiXTaobinProState </State>
<Type> VIDEO </Type>
<Media>
eval(
If show_eng = "true" Then
Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
Else
Var return = "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4"
EndIf
)
</Media>
<EventOnClick>
Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml"
</EventOnClick>
</Banner>
; ==================> Len = 3
; - 12-02-02-0099 -

View file

@ -67,9 +67,9 @@
<AdjustStep> 1 </AdjustStep>
</AutoResizeConfiguration>
</MenuPriceTextConfiguration>
<MenuHotPriceLabel> "Hot" </MenuHotPriceLabel>
<MenuIcePriceLabel> "Ice" </MenuIcePriceLabel>
<MenuBlendPriceLabel> "Blend" </MenuBlendPriceLabel>
<MenuHotPriceLabel> 000081 </MenuHotPriceLabel>
<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
</Configuration>
<Menus>

View file

@ -130,9 +130,9 @@
<AdjustStep> 1 </AdjustStep>
</AutoResizeConfiguration>
</MenuPriceTextConfiguration>
<MenuHotPriceLabel> "Hot" </MenuHotPriceLabel>
<MenuIcePriceLabel> "Ice" </MenuIcePriceLabel>
<MenuBlendPriceLabel> "Blend" </MenuBlendPriceLabel>
<MenuHotPriceLabel> 000081 </MenuHotPriceLabel>
<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>
<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>
<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
</Configuration>
<Menus>
@ -156,8 +156,8 @@
</Name>
<Description>
<LanguageGroup>
<LanguageSlot1>Mango Frozen</LanguageSlot1>
<LanguageSlot2>มะม่วงสุขแช่แข็ง</LanguageSlot2>
<LanguageSlot1>Frozen mango smoothies</LanguageSlot1>
<LanguageSlot2>มะม่วงปั่น แช่แข็ง</LanguageSlot2>
<LanguageSlot3>-</LanguageSlot3>
<LanguageSlot4>-</LanguageSlot4>
<LanguageSlot5>-</LanguageSlot5>
@ -228,9 +228,9 @@
Var PD_CODE3 = "12-00-07-0000"
; begin lang
Var aliasName[0] = "Mango Smoothie"
Var aliasDesc[0] = "Mango Frozen"
Var aliasDesc[0] = "Frozen mango smoothies"
Var aliasName[1] = "มะม่วงปั่น"
Var aliasDesc[1] = "มะม่วงสุขแช่แข็ง"
Var aliasDesc[1] = "มะม่วงปั่น แช่แข็ง"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
@ -263,18 +263,18 @@
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "Mango Smoothie"
Var NameLang[2][1] = "มะม่วงปั่น"
Var NameLang[2][2] = "-"
Var NameLang[2][3] = "-"
Var NameLang[2][4] = "-"
Var NameLang[2][5] = "-"
Var DescLang[2][0] = "Mango Frozen"
Var DescLang[2][1] = "มะม่วงสุขแช่แข็ง"
Var DescLang[2][2] = "-"
Var DescLang[2][3] = "-"
Var DescLang[2][4] = "-"
Var DescLang[2][5] = "-"
Var NameLang[2][0] = ""
Var NameLang[2][1] = ""
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = ""
Var DescLang[2][1] = ""
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""
Var DescLang[2][5] = ""
; end lang
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"

View file

@ -14,6 +14,9 @@
CRLFToSpace showname
CRLFToSpace showdesc
Var MachineEvent = 0
Var MatchineSpiralStage = "-"
;- Begin
Var PriceDrinkNoTop = PriceDrink
Var PriceDrinkTmp = PriceDrink
@ -173,14 +176,16 @@
EndIf
EndIf
If MatchineSpiralStage = "spiral-valid" Then
Function 2
Else
; Verify error
DEBUGVAR MachineSpiralErrorCode
Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
EndIf
If MachineEvent = 1 Then
If MatchineSpiralStage = "spiral-valid" Then
Function 2
Else
; Verify error
DEBUGVAR MachineSpiralErrorCode
Open "ROOT/taobin_project/xml/page_spiral_invalid_failed.xml"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
@ -322,11 +327,12 @@
Else
Var MachineEvent = 1
DEBUGVAR LinkProductCodeAnotherMachine[0]
DEBUGVAR LinkProductCodeAnotherMachine[1]
DEBUGVAR LinkProductCodeAnotherMachine[2]
Var MatchinePrialStage = "-"
Var MatchineSpiralStage = "-"
GenHashWithTimeStamp SpiralRef
SPIRAL_VERIFY LinkProductCodeAnotherMachine[0] SpiralRef