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

This commit is contained in:
Pakin 2024-08-02 13:44:36 +07:00
commit 361f205771
153 changed files with 52720 additions and 2131 deletions

259
xml/checkin.xml Normal file
View file

@ -0,0 +1,259 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Volume> SoundVolume </Volume>
<Background> "0x2c2928" </Background>
<EventOpen>
DEBUGVAR SystemDate
Var sdate = ""
Var sdate = SystemDate
Var sdateday = ""
Var sdatemonth = ""
Var sdateyear = ""
SPLIT sdate "/" 1 sdateday
SPLIT sdate "/" 2 sdatemonth
SPLIT sdate "/" 3 sdateyear
DEBUGVAR sdateday
DEBUGVAR sdatemonth
DEBUGVAR sdateyear
Var KornCamDisplayX = 285
Var KornCamDisplayY = 250
Var KornCamDisplayW = 500
Var KornCamDisplayH = 680
Var KornCamYHidden = 208
Var KornCameraXOffsetX = 150
Var TimerbacktoHome = 60
Var KornCameraXX = KornCamDisplayX - KornCameraXOffsetX
Var KornCameraXY = KornCamDisplayY
Var KornCameraXW = 800
Var KornCameraXH = 800
Var startCapture = "false"
Var timerCoundown = 10
Var showTimeCounter = "Invisible"
Var showTakePictureBtn = "Enable"
Var showTexttakingPicture = "Invisible"
Var strOnpageLogtext = tmpPassPhrase + " on page checkin"
Var strOnstartLogtext = tmpPassPhrase + " start capture checkin"
Var strOnCancelLogtext = tmpPassPhrase + " cancel capture checkin"
DEBUGVAR SystemTimeHour
DEBUGVAR SystemTimeMinute
DEBUGVAR SystemTimeSecond
Var filepushname = ""
Var filepushname = "" + BoxID
Var filepushname = filepushname + "_"
Var filepushname = filepushname + sdateyear
Var filepushname = filepushname + "_"
Var filepushname = filepushname + sdatemonth
Var filepushname = filepushname + "_"
Var filepushname = filepushname + sdateday
Var filepushname = filepushname + "_"
Var filepushname = filepushname + SystemTimeHour
Var filepushname = filepushname + "_"
Var filepushname = filepushname + SystemTimeMinute
Var filepushname = filepushname + "_"
Var filepushname = filepushname + tmpPassPhrase
Var filepushname = filepushname + ".png"
Var filesavepath = "/mnt/sdcard/" + filepushname
DEBUGVAR tmpPassPhrase
DEBUGVAR filepushname
DEBUGVAR BoxID
SAVELOG strOnpageLogtext
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR startCapture
DEBUGVAR timerCoundown
If startCapture = "true" Then
Var TimerbacktoHome = 60
Var timerCoundown = timerCoundown - 1
EndIf
If timerCoundown = 0 Then
Var showTimeCounter = "Invisible"
Var showTexttakingPicture = "Enable"
CameraCmd "usbfront" "shutter" filesavepath
EndIf
If timerCoundown = -3 Then
Var startCapture = "false"
Var timerCoundown = 10
Open "ROOT/taobin_project/xml/page_checkin_result.xml"
EndIf
Var TimerbacktoHome = TimerbacktoHome - 1
If TimerbacktoHome = 0 Then
SAVELOG "timeout"
SAVELOG "back_to_page_board"
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
Refresh
TimerReset
</EventTimeout>
; header
<Image>
<X> 0 </X>
<Y> 0 </Y>
<Height> 80 </Height>
<Width> 1080 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
</Image>
;back
<Button>
<X> 40 </X>
<Y> 20 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
</EventClick>
</Button>
<Text>
<X> 800 </X>
<Y> 20 </Y>
<Size> 19 </Size>
<Font> fontType1 </Font>
<Color> 0xe2e2e2 </Color>
<Value> Text1_9 </Value>
</Text>
;task
<Image>
<X> 250 </X>
<Y> 150 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/checkinheader.png" </Filename>
</Image>
<CameraX>
<X> KornCameraXX </X>
<Y> KornCameraXY </Y>
<Name>"usbfront"</Name>
<Width> KornCameraXW </Width>
<Height> KornCameraXH </Height>
<State> "Enable" </State>
</CameraX>
<Image>
<X> 280 </X>
<Y> 250 </Y>
<Height> 510 </Height>
<Width> 510 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/personguildline.png" </Filename>
</Image>
<GIF>
<X> 440 </X>
<Y> 450 </Y>
<State> showTexttakingPicture </State>
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
</GIF>
<Image>
<X> 230 </X>
<Y> 990 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/checkinplasewait.png" </Filename>
<State> showTimeCounter </State>
</Image>
<Image>
<X> 230 </X>
<Y> 990 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/checkinplasewait2.png" </Filename>
<State> showTexttakingPicture </State>
</Image>
<Text>
<X> 690 </X>
<Y> 980 </Y>
<Size> 40 </Size>
<Font> fontType1 </Font>
<Color> 0xe2e2e2 </Color>
<State> showTimeCounter </State>
<Value> timerCoundown </Value>
</Text>
<Button>
<X> 400 </X>
<Y> 980 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/startcapture.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/startcapture.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Var TimerbacktoHome = 60
Var startCapture = "true"
Var showTimeCounter = "Enable"
Var showTakePictureBtn = "Invisible"
SAVELOG strOnstartLogtext
StatusLog "start capture checkin"
</EventClick>
<State> showTakePictureBtn </State>
</Button>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
SAVELOG strOnCancelLogtext
StatusLog "cancel capture checkin"
</EventClick>
</Button>
</Page>

View file

@ -1 +1 @@
/event/promotion_passion_mint.xml
/event/promotion_mom_cocoa.xml

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,3 +1,15 @@
<EventActionOk>
If GettingDiscountStatus = 1 Then
If Ext1a = "ok" Then
Else
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
EndIf
</EventActionOk>
<Button>
<X> 42 </X>
@ -7,73 +19,67 @@
<Filename>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
If SystemDateDayInt >= 13 Then
Var return = ###normal_eng + "13-16.png"
Else
Var return = ###normal_eng + "10-12.png"
EndIf
Else
Var return = ###normal_thai
If SystemDateDayInt >= 13 Then
Var return = ###normal_thai + "13-16.png"
Else
Var return = ###normal_thai + "10-12.png"
EndIf
EndIf
)
</Filename>
<FilenamePress>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
If SystemDateDayInt >= 13 Then
Var return = ###normal_eng + "13-16.png"
Else
Var return = ###normal_eng + "10-12.png"
EndIf
Else
Var return = ###normal_thai
If SystemDateDayInt >= 13 Then
Var return = ###normal_thai + "13-16.png"
Else
Var return = ###normal_thai + "10-12.png"
EndIf
EndIf
)
</FilenamePress>
<FilenameDisable>
eval(
If show_eng = "true" Then
Var return = ###normal_eng
If SystemDateDayInt >= 13 Then
Var return = ###normal_eng + "13-16.png"
Else
Var return = ###normal_eng + "10-12.png"
EndIf
Else
Var return = ###normal_thai
If SystemDateDayInt >= 13 Then
Var return = ###normal_thai + "13-16.png"
Else
Var return = ###normal_thai + "10-12.png"
EndIf
EndIf
)
</FilenameDisable>
<EventOnClick>
If MomCocoaProDiscountEnable = 1 Then
If GettingDiscountStatus = 0 Then
Var GettingDiscountStatus = 1
Var AC = "1/0899999999"
GETACCEXT AC 38
EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog_group_pro_mom_cocoa_ignore.xml"
EndIf
Open "ROOT/taobin_project/xml/page_catalog_group_pro_passion_mint.xml"
</EventOnClick>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<Loop> "true" </Loop>
<State>
eval(
If show_eng = "true" Then
Var return = "Invisible"
Else
Var return = "Enable"
EndIf
)
</State>
<Filename> "ROOT/taobin_project/image/event/passion_mint/passion_mint_th.mp4" </Filename>
</Video>
<Video>
<X> 42 </X>
<Y> 518 </Y>
<Width> 484 </Width>
<Height> 616 </Height>
<State>
eval(
If show_eng = "true" Then
Var return = "Enable"
Else
Var return = "Invisible"
EndIf
)
</State>
<Loop> "true" </Loop>
<Filename> "ROOT/taobin_project/image/event/passion_mint/passion_mint_en.mp4" </Filename>
</Video>
</Button>
<EventUnitTest1>

View file

@ -4,8 +4,8 @@ DEBUGVAR PayOfflineMode
DEBUGVAR CocktailShow
DEBUGVAR OpenFromPageBoard
DEBUGVAR PassionMintPro
DEBUGVAR 7UpLuckyDrawX2Pro
DEBUGVAR MomCocoaPro
Var PromotionState1 = "Invisible"
Var PromotionState2 = "Invisible"
@ -26,8 +26,8 @@ Else
Var FileRecommendToOpen = "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
; zone promote
If PassionMintPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_passion_mint.xml"
If MomCocoaPro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_mom_cocoa_ignore.xml"
Else
If 7UpLuckyDrawX2Pro = 1 Then
Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_7up_lucky_draw_x2.xml"

View file

@ -116,9 +116,15 @@ Var FromCocoa77Pro = 0
Var PassionMintPro = 0
Var FromPassionMintPro = 0
; Enable 7UpLuckyDrawX2 promotion, 22 Jul - 9 Aus
; Enable 7UpLuckyDrawX2 promotion, 22 Jul - 9 Aug
Var 7UpLuckyDrawX2Pro = 0
; Enable Mom Cocoa promotion, 10 Aug - 16 Aug
Var MomCocoaPro = 0
Var MomCocoaProDiscountEnable = 0
Var FromMomCocoaPro = 0
Var Seeker.BuyMomCocoaProFlag = 0
Var NewCollectPoint = 1
Var ShouldCollectPromotionPoint = 0
@ -231,6 +237,18 @@ If SystemDateMonthInt = 8 Then
If SystemDateDayInt <= 9 Then
Var 7UpLuckyDrawX2Pro = 1
EndIf
If SystemDateDayInt >= 10 Then
If SystemDateDayInt <= 16 Then
Var MomCocoaPro = 1
If SystemDateDayInt >= 12 Then
Var MomCocoaProDiscountEnable = 1
EndIf
EndIf
EndIf
EndIf
@ -254,8 +272,10 @@ If BoxID = 105005 Then
Var New_Payment = 1
Var NamHomCoconutPro = 0
Var Cocoa77Pro = 0
Var 7UpLuckyDrawX2Pro = 1
Var 7UpLuckyDrawX2Pro = 0
Var PassionMintPro = 0
Var MomCocoaPro = 1
Var MomCocoaProDiscountEnable = 1
EndIf
@ -388,6 +408,7 @@ If CocoaPowderEnable = "true" Then
Else
Var Cocoa77Pro = 0
Var MomCocoaPro = 0
EndIf
If 7UpSyrupEnable = "true" Then

File diff suppressed because it is too large Load diff

View file

@ -1115,14 +1115,14 @@
Machine OrderCheck
DEBUGVAR CLOSE_ORDER_NOW
SAVELOG "EVENTOPEN ON page_board.xml"
; move to TRY actoin.
; Move to end of EventOpen for override war
Var RoadShow = "false"
TRY "ROOT/taobin_project/xml/sometime/RoadShow.ev"
;XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
;XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
XMLSaveFileNameForResume 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
XMLSaveFileNameForResume 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
</EventOpen>
@ -1190,8 +1190,7 @@
</EventActionError>
<EventUnitTest1>
Var XMLProfile = "AllPriceUp05"
Open CurrentXMLFileName0
ReloadAll
</EventUnitTest1>
<EventUnitTest2>
@ -1303,7 +1302,7 @@
</EventUnitTest6>
<EventUnitTest7>
Var XMLProfile = "$Tier1"
Var XMLProfile = "Tier1"
PRICE "Reset" "-"
PRICE "Load" "-"
PRICE "CheckAndApply" XMLProfile

View file

@ -0,0 +1,48 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,48 @@
<?hurr
#include=menu_head.py
?>
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Timeout = 0
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<?hurr
#include=menu_new_layout_gen_v2.py
?>
<?hurr
#include=menu_new_layout_gen.py
?>
;BigLogoLayout
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
</Popup>

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

260
xml/page_checkin_result.xml Normal file
View file

@ -0,0 +1,260 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Volume> SoundVolume </Volume>
<Background> "0x2c2928" </Background>
<EventOpen>
Var KornCamDisplayX = 285
Var KornCamDisplayY = 250
Var KornCamDisplayW = 500
Var KornCamDisplayH = 680
Var KornCamYHidden = 208
Var KornCameraXOffsetX = 150
Var TimerbacktoHome = 60
Var KornCameraXX = KornCamDisplayX - KornCameraXOffsetX
Var KornCameraXY = KornCamDisplayY
Var KornCameraXW = 800
Var KornCameraXH = 800
Var timerCoundown = 3
Var showSendandRetryState = "true"
Var countdownToSend = "false"
Var countdownToHome = "false"
Var showSendandRetry = "Invisible"
DEBUGVAR tmpPassPhrase
Var strOnpageLogtext = tmpPassPhrase + " on page checkin result"
Var strOnsendLogtext = tmpPassPhrase + " send capture checkin"
Var strOnretryLogtext = tmpPassPhrase + " retry capture checkin"
Var statesendButton = "Invisible"
Var stateprocessButton = "Invisible"
Var statesendsuccessButton = "Invisible"
Var statesendHomeButton = "Invisible"
DEBUGVAR strOnpageLogtext
DEBUGVAR strOnsendLogtext
DEBUGVAR strOnretryLogtext
DEBUGVAR filepushname
SAVELOG strOnpageLogtext
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
If showSendandRetryState = "true" Then
Var timerCoundown = timerCoundown - 1
If timerCoundown = 0 Then
Var showSendandRetry = "Enable"
Var statesendButton = "Enable"
Var showSendandRetryState = "false"
Var timerCoundown = 3
EndIf
EndIf
If countdownToSend = "true" Then
Var timerCoundown = timerCoundown - 1
If timerCoundown = 0 Then
Var stateprocessButton = "Invisible"
Var statesendsuccessButton = "Enable"
Var countdownToSend = "false"
Var countdownToHome = "true"
Var timerCoundown = 3
EndIf
EndIf
If countdownToHome = "true" Then
Var timerCoundown = timerCoundown - 1
If timerCoundown = 0 Then
Var statesendsuccessButton = "Invisible"
Var countdownToHome = "false"
Var statesendHomeButton = "false"
Var timerCoundown = 3
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
EndIf
EndIf
Var TimerbacktoHome = TimerbacktoHome - 1
If TimerbacktoHome = 0 Then
SAVELOG "timeout"
SAVELOG "back_to_page_board"
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
Refresh
TimerReset
</EventTimeout>
; header
<Image>
<X> 0 </X>
<Y> 0 </Y>
<Height> 80 </Height>
<Width> 1080 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
</Image>
;back
<Button>
<X> 40 </X>
<Y> 20 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
</EventClick>
</Button>
<Text>
<X> 800 </X>
<Y> 20 </Y>
<Size> 19 </Size>
<Font> fontType1 </Font>
<Color> 0xe2e2e2 </Color>
<Value> Text1_9 </Value>
</Text>
;task
<Image>
<X> 250 </X>
<Y> 150 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/checkinheader.png" </Filename>
</Image>
<Image>
<X> KornCameraXX </X>
<Y> KornCameraXY </Y>
<Height> 800 </Height>
<Width> 800 </Width>
<State> "Enable" </State>
<Filename> filesavepath </Filename>
</Image>
<Button>
<X> 200 </X>
<Y> 1110 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/sendcheckin.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/sendcheckin.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> statesendButton </State>
<EventClick>
PushFile "/sdcard/" "RootManPicture" filepushname
SAVELOG strOnsendLogtext
StatusLog "send capture checkin"
Var statesendButton = "Invisible"
Var stateprocessButton = "Enable"
Var countdownToSend = "true"
Var TimerbacktoHome = 60
</EventClick>
</Button>
<Button>
<X> 200 </X>
<Y> 1110 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinprocess.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinprocess.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> stateprocessButton </State>
<EventClick>
</EventClick>
</Button>
<Button>
<X> 200 </X>
<Y> 1110 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinsuccess.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinsuccess.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> statesendsuccessButton </State>
<EventClick>
</EventClick>
</Button>
<Button>
<X> 200 </X>
<Y> 1110 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinbackhome.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/sendpicturecheckinbackhome.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> statesendHomeButton </State>
<EventClick>
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
</EventClick>
</Button>
<Button>
<X> 600 </X>
<Y> 1110 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/retrycheckin.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/retrycheckin.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> showSendandRetry </State>
<EventClick>
SAVELOG strOnretryLogtext
StatusLog "retry capture checkin"
Open "ROOT/taobin_project/xml/checkin.xml"
</EventClick>
</Button>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>
</Page>

View file

@ -717,32 +717,32 @@
DEBUGVAR targetDate
DEBUGVAR dayDiff
If dayDiff <= 5 Then
If dayDiff >= 26 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_1-5_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf
If dayDiff <= 10 Then
If dayDiff < 26 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_6-10_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf
If dayDiff <= 15 Then
If dayDiff < 21 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_11-15_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf
If dayDiff <= 20 Then
If dayDiff < 16 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_16-20_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf
If dayDiff <= 25 Then
If dayDiff < 11 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_21-25_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf
If dayDiff >= 26 Then
If dayDiff < 6 Then
Var LuckyDrawProgressBarImg = "/lucky_draw_progress_bar_day_26-30_level" + TaobinLevel
Var LuckyDrawProgressBarImg = LuckyDrawProgressBarImg + ".png"
EndIf

View file

@ -30,19 +30,19 @@
Var Timeout = Timeout + 1
If FromCheckMemberPoint = 1 Then
If Timeout > 10 Then
If Timeout > 10 Then
If FromCheckMemberPoint = 1 Then
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
Else
If Seeker.IsLineMember = 0 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
If Seeker.IsLineMember = 0 Then
If LuckyDrawCampaign = 1 Then
Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf

View file

@ -198,6 +198,16 @@
Var TimeDelayDefault = 1200
DEBUGVAR Seeker
DEBUGVAR Seeker.BuyMomCocoaProFlag
If Seeker.BuyMomCocoaProFlag = 1 Then
Var dummyPhone = "0899999999"
Var param1 = "1"
Var param2 = ""
Var param3 = ""
AddData 50 dummyPhone param1 param2 param3
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>

View file

@ -145,6 +145,8 @@
Var Seeker.CreditCard = 0
Var Seeker.CreditCardRef = ""
Var Seeker.UseCreditPayFullDrinkPrice = 0
Var Seeker.IntVendingCredit = 0
Var Seeker.StoreCreditFlag = 0
@ -299,6 +301,13 @@
DEBUGVAR OriginalPrice
DEBUGVAR TOPPING_PRICE
If FromMomCocoaPro = 1 Then
If DiscountMomCocoaPro > 0 Then
Var DiscountDrink = DiscountMomCocoaPro
Var Seeker.CampaignPPrice = PromotionPriceDrink
EndIf
EndIf
If FromCocoa77Pro = 1 Then
Var OriginalPriceWithTopping = OriginalPrice + TOPPING_PRICE
Var PriceDiff = OriginalPriceWithTopping - PromotionPriceDrink

View file

@ -1915,7 +1915,6 @@
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf
@ -1994,7 +1993,6 @@
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
EndIf
EndIf

View file

@ -90,6 +90,8 @@
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
Var Seeker.CreditEnoughRefID = PointCrm
CoinVending OFF
Var Seeker.TNumberTaobinCredit = TelephoneNumber
@ -98,6 +100,7 @@
Var Seeker.StoreCreditFlag = 1
Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount
Var VendingCreditRemain = "" + SumCreditAmount
Var Seeker.UseCreditPayFullDrinkPrice = 1
If CART_COUNT >= 1 Then

View file

@ -78,8 +78,6 @@
Var ChangeTimeout = 0
Var CancelCounter = 0
CoinVending XBILL
Var ServiceAmount2 = CreditAmount
Var ServiceCharge = 0
@ -95,6 +93,24 @@
Var warning_price_state = "Enable"
If CoinAmount > 0 Then
Var SumAmount = CreditAmount + CoinAmount
If SumAmount >= PayAmountSubDiscount Then
Var confirmButtonState = "Enable"
Var alphaState2 = "Invisible"
Var warning_price_state = "Invisible"
Else
Var warning_price_state = "Enable"
EndIf
Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
Var showRemaining = charOfBaht + RemainAmountStr
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
@ -112,7 +128,6 @@
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
CoinVending OFF
Var CancelFlag = 1
Var CancelCounter = 0
If CoinAmount = 0 Then
@ -154,6 +169,7 @@
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Var Seeker.CoffeePinNumber
Var ServiceAmount2 = CoinAmount
Var VendingDiscount = 0
Var VendingCampaign = 0
@ -163,6 +179,8 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1
CoinVending OFF
If Seeker = "curr" Then
Open "ROOT/taobin_project/xml/page_catalog.xml"
@ -212,14 +230,6 @@
EndIf
TimerReset
Refresh
</EventTimeout>
@ -381,7 +391,6 @@
AddData 24 TelephoneNumber BmiYear PointCrm GetScore
EndIf
CoinVending OFF
Var CancelCounter = 0
Var CancelFlag = 1
If CoinAmount = 0 Then

View file

@ -0,0 +1,147 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Volume> SoundVolume </Volume>
<Background> "0x2c2928" </Background>
<EventOpen>
Coin ON
; Var TestCoinLine1 = "กรุณาใส่เงิน . . ."
Var TestCoinLine1 = "insert money . . ."
; Var TestCoinLine2 = "จำนวนเงินทั้งหมด 0 บาท"
Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
Var TestCoinLine2 = "total amount "
Var TestCoinLine2 = TestCoinLine2 + RemainAmountStr
Var RemainAmountStr1 = 0
Var LastCoin = 0
Var openTextTest20bath = "Enable"
Var currentStage = "test20bath"
DEBUGVAR currentStage
DEBUGVAR LastCoin
</EventOpen>
<EventCoin>
Var LastCoin = CoinAmount - LastCoin
Var RemainAmountStr1 !assigned StringFmt( LastCoin, DisplayFormat, PreScaleConvertShow )
Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
DEBUGVAR currentStage
DEBUGVAR LastCoin
If currentStage = "test20bath" Then
If LastCoin = 20 Then
Open "ROOT/taobin_project/xml/page_test_money_change.xml"
EndIf
EndIf
; Var TestCoinLine1 = "ท่านได้ใส่เงินจำนวน "
Var TestCoinLine1 = "insert money "
Var TestCoinLine1 = TestCoinLine1 + RemainAmountStr1
; Var TestCoinLine1 = TestCoinLine1 + " บาท"
; Var TestCoinLine2 = "จำนวนเงินทั้งหมด "
Var TestCoinLine2 = "total amount "
Var TestCoinLine2 = TestCoinLine2 + RemainAmountStr
; Var TestCoinLine2 = TestCoinLine2 + " บาท"
Var LastCoin = CoinAmount
; Var RemainAmountStr = RemainAmountStr + "###size=90"
Refresh
</EventCoin>
<Timeout> 1000 </Timeout>
<EventTimeout>
Refresh
TimerReset
</EventTimeout>
; header
<Image>
<X> 0 </X>
<Y> 0 </Y>
<Height> 80 </Height>
<Width> 1080 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
</Image>
;back
<Button>
<X> 40 </X>
<Y> 20 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
</EventClick>
</Button>
<Text>
<X> 800 </X>
<Y> 20 </Y>
<Size> 19 </Size>
<Font> fontType1 </Font>
<Color> 0xe2e2e2 </Color>
<Value> Text1_9 </Value>
</Text>
;task
<Image>
<X> 280 </X>
<Y> 150 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_bank_header_page.png" </Filename>
</Image>
<Image>
<X> 280 </X>
<Y> 220 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_bank_20.png" </Filename>
<State> openTextTest20bath </State>
</Image>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>
</Page>

View file

@ -0,0 +1,141 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Volume> SoundVolume </Volume>
<Background> "0x2c2928" </Background>
<EventOpen>
Coin ON
; Var TestCoinLine1 = "กรุณาใส่เงิน . . ."
Var TestCoinLine1 = "insert money . . ."
; Var TestCoinLine2 = "จำนวนเงินทั้งหมด 0 บาท"
Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
Var TestCoinLine2 = "total amount "
Var TestCoinLine2 = TestCoinLine2 + RemainAmountStr
Var RemainAmountStr1 = 0
Var LastCoin = 0
Var openTextTest20bath = "Enable"
Var currentStage = "test20bath"
</EventOpen>
<EventCoin>
Var LastCoin = CoinAmount - LastCoin
Var RemainAmountStr1 !assigned StringFmt( LastCoin, DisplayFormat, PreScaleConvertShow )
Var RemainAmountStr !assigned StringFmt( CoinAmount, DisplayFormat, PreScaleConvertShow )
If currentStage = "test20bath" Then
If LastCoin = 20 Then
Open "ROOT/taobin_project/xml/page_test_money_change.xml"
EndIf
EndIf
; Var TestCoinLine1 = "ท่านได้ใส่เงินจำนวน "
Var TestCoinLine1 = "insert money "
Var TestCoinLine1 = TestCoinLine1 + RemainAmountStr1
; Var TestCoinLine1 = TestCoinLine1 + " บาท"
; Var TestCoinLine2 = "จำนวนเงินทั้งหมด "
Var TestCoinLine2 = "total amount "
Var TestCoinLine2 = TestCoinLine2 + RemainAmountStr
; Var TestCoinLine2 = TestCoinLine2 + " บาท"
Var LastCoin = CoinAmount
; Var RemainAmountStr = RemainAmountStr + "###size=90"
Refresh
</EventCoin>
<Timeout> 1000 </Timeout>
<EventTimeout>
Refresh
TimerReset
</EventTimeout>
; header
<Image>
<X> 0 </X>
<Y> 0 </Y>
<Height> 80 </Height>
<Width> 1080 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/nav-bar-mid.png" </Filename>
</Image>
;back
<Button>
<X> 40 </X>
<Y> 20 </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/arrow_back.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/vending_tasks_pre_main.xml"
</EventClick>
</Button>
<Text>
<X> 800 </X>
<Y> 20 </Y>
<Size> 19 </Size>
<Font> fontType1 </Font>
<Color> 0xe2e2e2 </Color>
<Value> Text1_9 </Value>
</Text>
;task
<Image>
<X> 280 </X>
<Y> 150 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_change_header_page.png" </Filename>
</Image>
<Image>
<X> 280 </X>
<Y> 220 </Y>
<Height> 40 </Height>
<Width> 560 </Width>
<Volume> SoundVolume </Volume>
<Filename> "ROOT/taobin_project/image/new_vending_info/test_change_10.png" </Filename>
<State> openTextTest20bath </State>
</Image>
<Button>
<X> 50 </X>
<Y> info_cancel_y </Y>
<Filename> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/new_vending_info/exit_button.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_board.xml"
</EventClick>
</Button>
</Page>

1041
xml/page_test_money_coin.xml Normal file

File diff suppressed because it is too large Load diff

View file

@ -22,6 +22,8 @@
Var GotoStoreCredit0 = 0
Var StoreCreditAmount = 0
Var DetectCoinAmount = 0
Var buttonRemoveCup = "Invisible"
Var MachineState_Result = 0
@ -35,6 +37,12 @@
DEBUGVAR Seeker
If FromMomCocoaPro = 1 Then
If DiscountMomCocoaPro > 0 Then
Var Seeker.BuyMomCocoaProFlag = 1
EndIf
EndIf
If Seeker = "curr" Then
Var LastMakeDrinkResult = "-"
EndIf
@ -215,24 +223,33 @@
EndIf
Else
DEBUGVAR Seeker.UseCreditPayFullDrinkPrice
If Seeker.IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
If Seeker.UseCreditPayFullDrinkPrice = 1 Then
If CoinAmount > 0 Then
Var StoreCreditAmount = CoinAmount
Var DetectCoinAmount = 1
EndIf
Else
If Seeker.IntVendingCampaign < PayAmount Then
Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then
;Change Canout
;Var ChangeFlag2 = 1
Var GotoStoreCredit0 = 1
Var StoreCreditAmount = Canout
If SumCoinAmount >= PayAmount Then
Var Canout = SumCoinAmount - PayAmount
If Canout > 0 Then
;Change Canout
;Var ChangeFlag2 = 1
Var GotoStoreCredit0 = 1
Var StoreCreditAmount = Canout
EndIf
EndIf
EndIf
EndIf
EndIf
@ -409,16 +426,32 @@
DEBUGVAR Seeker.CurrCreditAmount
DEBUGVAR Seeker.CreditNotEnoughRefID
DEBUGVAR Seeker.CreditEnoughRefID
If Seeker.CreditNotEnoughRefID = "" Then
Var CurrAmount = Seeker.CurrCreditAmount
If CoinAmount > 0 Then
Var CurrAmount = CurrAmount + CoinAmount
EndIf
Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
Var CurrPinNum = Seeker.CurrCreditPinNum
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
If DetectCoinAmount = 1 Then
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
If CurrAmount >= ServiceAmountSupCampain Then
Var creditToTopup = CurrAmount - ServiceAmountSupCampain
Var RefID = "0/" + Seeker.CreditEnoughRefID
Var Seeker.CreditReferenceTmp = RefID
AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID
Else
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
EndIf
Else
Var RefID = ""
AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
EndIf
Else
Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign

View file

@ -155,7 +155,7 @@
Var CountDownReset = 0
Var strTouchScreen = " Reset Touch : disable."
SAVELOG " EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen EventOpen "
Var MainMenuBlockCount = 2
</EventOpen>
<Timeout> 1000 </Timeout>

View file

@ -166,6 +166,7 @@
Var ClickOn = ""
Var PermissionLevel = ""
Var tmpPassPhrase = ""
</EventOpen>
@ -871,6 +872,8 @@
; CallCMDFromXML
__CMD "check-password" PassPhrase "-" "-"
Var tmpPassPhrase = PassPhrase
Var PassPhrase = ""
</EventClick>

View file

@ -97,7 +97,7 @@
<FrameScroll>
<Max> 4 </Max>
<Max> 6 </Max>
<X> 280 </X>
<Y> 200 </Y>
<Width> 600 </Width>
@ -165,8 +165,36 @@
</EventOnClick>
</Button>
</Block>
<Block>
<MarginLeft> 0 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 80 </Height>
<State> EnableTestSystem </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/checkin.png" </Filename>
<EventOnClick>
Open "ROOT/taobin_project/xml/checkin.xml"
</EventOnClick>
</Button>
</Block>
<Block>
<MarginLeft> 0 </MarginLeft>
<MarginTop> 22 </MarginTop>
<Width> 560 </Width>
<Height> 80 </Height>
<State> EnableTestSystem </State>
<Button>
<Filename> "ROOT/taobin_project/image/new_vending_info/testmoney.png" </Filename>
<EventOnClick>
Open "ROOT/taobin_project/xml/page_test_money_coin.xml"
</EventOnClick>
</Button>
</Block>
</FrameScroll>

View file

@ -10,7 +10,7 @@
<EventOpen>
;DEBUGVAR HeadVideoFilename
Var ClickCountMainTe = 0
Open "ROOT/taobin_project/xml/sold_cup_count.xml"
;Open "ROOT/taobin_project/xml/sold_cup_count.xml"
</EventOpen>
<Timeout> 33000 </Timeout>