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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-11-01 12:58:02 +07:00
commit 759708226c
154 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
xml/page_topping_select7.xml
View file

@ -159,9 +159,6 @@
Var BugFlag = 0
Var Seeker.NameDrinkEN = NameDrink
Var Seeker.NameDrinkTH = NameDrinkTH
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/topping2_en"
@ -7425,6 +7422,10 @@
Var showname = menu_name_thai_hot
Var showdesc = menu_desc_thai_hot
EndIf
Var Seeker.NameDrinkEN = menu_name_eng_hot
Var Seeker.NameDrinkTH = menu_name_thai_hot
Var text_hot_color = "0xFFFFFF"
Var text_cold_color = "0x84776F"
Var text_blender_color = "0x84776F"
@ -7461,6 +7462,9 @@
Var showdesc = menu_desc_thai_cold
EndIf
Var Seeker.NameDrinkEN = menu_name_eng_cold
Var Seeker.NameDrinkTH = menu_name_thai_cold
Var text_hot_color = "0x84776F"
Var text_cold_color = "0xFFFFFF"
Var text_blender_color = "0x84776F"
@ -7505,6 +7509,9 @@
Var showdesc = menu_desc_thai_blender
EndIf
Var Seeker.NameDrinkEN = menu_name_eng_blender
Var Seeker.NameDrinkTH = menu_name_thai_blender
Var text_hot_color = "0x84776F"
Var text_cold_color = "0x84776F"
Var text_blender_color = "0xFFFFFF"
@ -7968,7 +7975,7 @@
;
<EventUnitTest1>
__CMD "UpdateCupOnArm" UserSelectProductCode "-"
__CMD "UpdateCupOnArm" UserSelectProductCode "-"
</EventUnitTest1>
<EventUnitTest2>

20
xml/process/payext_setup.ev
View file

@ -1,8 +1,26 @@
If Seeker.PayWithQR = 0 Then
If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
If Seeker.TNumberTaobinMember = "" Then
Else
Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
EndIf
EndIf
DEBUGVAR TelephoneNumber
Var TelephoneNumberExt = TelephoneNumber
If TelephoneNumberExt = "" Then
Var TelephoneNumberExt = "0899999999"
EndIf
__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
__CMD "SetTelNum" TelephoneNumberExt Seeker.ORDER_ID Seeker.VendingTSID
Var payOrderChannel = "/XML|" + Seeker.OrderChanel
__CMD "SetPayType" Seeker.ORDER_ID payOrderChannel ""