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

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

Browse source
This commit is contained in:
Pakin 2024-10-16 08:52:02 +07:00
commit d6bbb5b47c
33 changed files with 5923 additions and 5300 deletions
Download patch file Download diff file Expand all files Collapse all files

13
xml/event/tricker.ev
View file

@ -272,6 +272,7 @@ If BoxID = 201729 Then
Var MomCocoaProDiscountEnable = 0
Var RobinsonBeautyPro = 0
Var JemilaPro = 1
Var HalloweenPro = 1
EndIf
If BoxID = 201714 Then
@ -279,6 +280,7 @@ If BoxID = 201714 Then
Var MomCocoaProDiscountEnable = 0
Var RobinsonBeautyPro = 0
Var JemilaPro = 1
Var HalloweenPro = 1
EndIf
If BoxID = 173149 Then
@ -286,6 +288,7 @@ If BoxID = 173149 Then
Var MomCocoaProDiscountEnable = 0
Var RobinsonBeautyPro = 0
Var JemilaPro = 1
Var HalloweenPro = 1
EndIf
@ -467,9 +470,15 @@ If BoxID = 200000 Then
Var NewFlowPaymentCode = 1
EndIf
If BoxID = 176757 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
;
If BoxID > 200000 Then
If BoxID < 200400 Then
If BoxID < 201000 Then
Var New_Payment = 1
Var NewFlowPaymentCode = 1
EndIf
@ -483,7 +492,7 @@ EndIf
; Check POS machine flag
Var ConnectWithPOSMachine = 0
READ_FILE "/mnt/sdcard/coffeevending/POS_MACHINE" POSMachineFlag
READ_FILE "/mnt/sdcard/coffeevending/app_manager/app_list/king_power_service/enable" POSMachineFlag
If POSMachineFlag = 1 Then
Var ConnectWithPOSMachine = 1
EndIf

14
xml/page_NewBrewing3.xml
View file

@ -15,10 +15,18 @@
Var CountUpWhenBREW_CNT = 0
DEBUGVAR TxRef1
SAVELOG "page_Newbrewing3.xml"
SAVELOG "page_Newbrewing3.xml version 2"
DEBUGVAR MachineStage
<<<<<<< HEAD
DEBUGVAR Seeker.ORDER_ID
Machine NewPaymentOpenBrewingXML
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
=======
DEBUGVAR Seeker.ORDER_ID
__CMD "PayWasSent" Seeker.ORDER_ID "-" "-"
>>>>>>> a27f8c94eb6df022194c4c644404ecfa103696c4
Var PictureFileTextDesctionState = "Enable"
@ -695,6 +703,8 @@
Var ShowCountDownBrewing = CountDownBrewing
; TODO
DEBUGVAR EnableDoubleCupNoError
DEBUGVAR HURR_FOREVER
If EnableDoubleCupNoError = 1 Then

3
xml/page_board.xml
View file

@ -640,6 +640,7 @@
;inter-xml-open
If CountryName = "Thailand" Then
Var LangProcess = "Done"
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev"
EndIf
@ -1099,7 +1100,7 @@
Var MinPhoneNumber = 8
Var MaxPhoneNumber = 8
Var ShowCountDownAsPercent = 1
Var ShowCountDownAsPercent = 0
DEBUGVAR ShowButtonClick2
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"

8129
xml/page_catalog_group_pro_halloween.xml
View file

File diff suppressed because it is too large Load diff

2
xml/page_drinkfail2.xml
View file

@ -183,6 +183,8 @@
DEBUGVAR CountryName
DEBUGVAR MaxPhoneNumber
Machine NewPaymentOpenBrewingXML
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>

2
xml/page_drinkfail3.xml
View file

@ -104,7 +104,7 @@
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "Remove cup"
SAVELOG "Remove cup drink fail "
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
Else

16
xml/page_drinkok.xml
View file

@ -202,7 +202,7 @@
EndIf
EndIf
Var SlientRefreshEnable = 2
Var TimeDelayDefault = 1200
@ -216,7 +216,15 @@
AddData 50 dummyPhone param1 param2 param3
EndIf
SAVELOG "drinkok.xml version 1"
SAVELOG "drinkok.xml version 3"
Var DrinkNameOnArm[DrinkArmCupID] = Seeker.showname
Var DrinkImageOnArm[DrinkArmCupID] = Seeker.PictureDrink
DEBUGVAR DrinkArmCupID
DEBUGVAR DrinkImageOnArm[DrinkArmCupID]
DEBUGVAR DrinkNameOnArm[DrinkArmCupID]
</EventOpen>
<Timeout> 500 </Timeout>
@ -240,6 +248,10 @@
Var Timeout = Timeout + 1
If Timeout = 2 Then
Var SlientRefreshEnable = 1
EndIf
If BrewTimeoutExtend = 1 Then
DEBUGVAR BrewTimeoutExtend

25
xml/page_payment_cash-HKG.xml
View file

@ -282,6 +282,31 @@
EndIf
If Seeker.FreeVendingCampaign = 1 Then
Var RemainAmountStr = "Free###size=150"
CoinVending OFF
If Seeker = "curr" Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf
If CoinInOK = 0 Then

38
xml/page_remove_cup.xml
View file

@ -47,6 +47,10 @@
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
Var ShowMenuNameAndImage = "Invisible"
Var RemoveCupOnArmID = -1
Var remove_cup_name = ""
Var remove_cup_image = ""
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -59,13 +63,6 @@
EndIf
;DEBUGVAR HaveCup
;DEBUGVAR CupOnArm
;DEBUGVAR DoorCupPosition
;DEBUGVAR CupChecking
;DEBUGVAR CupArmMove
;DEBUGVAR buttonRemoveCup
; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
@ -73,6 +70,12 @@
EndIf
EndIf
If CupOnArm = "true" Then
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
EndIf
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.xml"
@ -81,6 +84,23 @@
;include=ROOT/taobin_project/inc/remove_cup_step.inc
Var RemoveCupOnArmID = 0
If RemoveCupOnArmID > 0 Then
If DoorCupPosition = "bottom" Then
Var ShowMenuNameAndImage = "Invisible"
Var RemoveCupOnArmID = -1
Else
DEBUGVAR RemoveCupOnArmID
DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
Var ShowMenuNameAndImage = "Enable"
EndIf
EndIf
Refresh
TimerReset
@ -143,7 +163,7 @@
<Height> 300 </Height>
<Width> 320 </Width>
<State> ShowMenuNameAndImage </State>
<Filename> Seeker.PictureDrink </Filename>
<Filename> remove_cup_image </Filename>
</Image>
<Text>
@ -157,7 +177,7 @@
<Color> HeadlineColor </Color>
<Value>
eval(
STRCONTAIN "size" Seeker.showname SizeFromSheet
STRCONTAIN "size" remove_cup_name SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.showname "###" 1 PureName
Var return = PureName

2
xml/page_thankyouConti.xml
View file

@ -125,7 +125,7 @@
;PendingFlag InternationalEnable
;PendingFlag New_Payment
;PendingFlag New_Payment
;PendingFlag