Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
7852508838
566 changed files with 234638 additions and 69991 deletions
|
|
@ -151,8 +151,12 @@
|
|||
; ================= Video thankyou =============================
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
|
||||
TRY script_thankyou
|
||||
If CountryName = "Thailand" Then
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
|
||||
Else
|
||||
Var script_thankyou = CountryRootPath + "video/script_thank.ev"
|
||||
TRY script_thankyou
|
||||
EndIf
|
||||
Else
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
|
||||
EndIf
|
||||
|
|
@ -198,16 +202,16 @@
|
|||
DEBUGVAR Seeker.CreditCardRef
|
||||
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/script_thankyou.ev"
|
||||
|
||||
|
||||
SAVELOG "============================================== Thankyou.xml ====================================="
|
||||
Var TimeoutThankyou = 0
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
Var CountDownBrewing = BREW_CNT
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout = TimeoutToNext Then
|
||||
Var TimeoutThankyou = TimeoutThankyou + 1
|
||||
If TimeoutThankyou = TimeoutToNext Then
|
||||
|
||||
If CART_INDEX = 0 Then
|
||||
Else
|
||||
|
|
@ -288,6 +292,9 @@
|
|||
|
||||
EndIf
|
||||
|
||||
DEBUGVAR CountDownThankyou
|
||||
DEBUGVAR PayOfflineMode
|
||||
DEBUGVAR CleanFeedbackFlag
|
||||
|
||||
; run test;
|
||||
If CountDownThankyou = 0 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue