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-06-20 17:38:28 +07:00
commit 0aedea261f
59 changed files with 904 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

32
xml/page_brewing3.xml
View file

@ -55,8 +55,8 @@
Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3"
Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw_en.png"
Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw_en.png"
Var bnGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bn_get_more_straw.png"
Var bpGetMoreStrawFileName = "ROOT/taobin_project/image/page_doing/bp_get_more_straw.png"
Var bnStrawProblemReport = "ROOT/taobin_project/image/page_doing/bn_send_report_straw_en.png"
Var bpStrawProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_straw_en.png"
@ -65,13 +65,15 @@
Var bpLidProblemReport = "ROOT/taobin_project/image/page_doing/bp_send_report_lid_en.png"
Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png"
Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png"
;Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid_en.png"
;Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid_en.png"
Var bn_get_lid_image = "ROOT/taobin_project/image/page_doing/bn_get_lid.png"
Var bp_get_lid_image = "ROOT/taobin_project/image/page_doing/bp_get_lid.png"
Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3_en.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1_en.png"
Var XStraw = 274
Var XStraw = 142
Else
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
@ -108,7 +110,7 @@
Var brew_txt2 = "ROOT/taobin_project/video/brewing_txt_adv3.png"
Var brew_txt1 = "ROOT/taobin_project/video/brewing_txt_adv1.png"
Var XStraw = 274
Var XStraw = 142
EndIf
Var waitAckPay = 0
@ -364,15 +366,18 @@
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Else
Var SelectMenuBetweenBrewEnable1 = "Enable"
Var EnableTopupCreditBetweenBrew = "Enable"
EndIf
If GetFreeFromError = 1 Then
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If DisableFromPowerup = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If SelectMenuBetweenBrewEnable1 = "Enable" Then
@ -404,21 +409,25 @@
If Seeker.CreditCard = 1 Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If NeedUpgrade = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If NeedReboot = "true" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If SELLSTATUS = "DEACTIVE" Then
Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
DEBUGVAR NeedUpgrade
@ -1443,6 +1452,7 @@
If MachineState_Result > 0 Then
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
; Close next button.
@ -1450,12 +1460,14 @@
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var SelectMenuBetweenBrewEnable2 = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If DisableFromPowerup = "true" Then
Var SelectMenuBetweenBrewEnable1 = "Invisible"
Var SelectMenuBetweenBrewEnable1Text = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If SelectMenuBetweenBrewEnable1 = "Enable" Then
@ -1923,8 +1935,8 @@
</Button>
<Button>
<X> 792 </X>
<Y> 1687 </Y>
<X> 262 </X>
<Y> 1787 </Y>
<State>EnableTopupCreditBetweenBrew</State>
<Filename> topup_credit_bn </Filename>
<FilenamePress> topup_credit_bp </FilenamePress>
@ -2079,7 +2091,7 @@
; Lid button, Get one and report
;
<Button>
<X> 14 </X>
<X> 22 </X>
<Y> 1787 </Y>
<State>bg_lidProblem_ST</State>
<Filename> bnLidProblemReport </Filename>
@ -2097,7 +2109,7 @@
</Button>
<Button>
<X> 14 </X>
<X> 22 </X>
<Y> 1787 </Y>
<State>GetLidButtonState</State>
<Mode> "No" </Mode>

15
xml/page_brewing3Conti.xml
View file

@ -33,7 +33,7 @@
Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
Var EnableTopupCreditBetweenBrew = "Invisible"
Var EnableTopupCreditBetweenBrew = "Enable"
If NextOrder = "true" Then
Var EnableSelectMenuBetweenBrew = "Invisible"
@ -180,6 +180,11 @@
If Seeker.CreditCard = 1 Then
Var EnableSelectMenuBetweenBrew = "Invisible"
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
If MachineState_Result > 0 Then
Var EnableTopupCreditBetweenBrew = "Invisible"
EndIf
Var CreditCardVoid = 0
@ -1094,8 +1099,8 @@
</Button>
<Button>
<X> 792 </X>
<Y> 1687 </Y>
<X> 262 </X>
<Y> 1787 </Y>
<State>EnableTopupCreditBetweenBrew</State>
<Filename> topup_credit_bn </Filename>
<FilenamePress> topup_credit_bp </FilenamePress>
@ -1112,11 +1117,13 @@
Var SeekerTmp = "curr"
Var TelephoneNumber = SeekerTmp.TNumberTaobinCredit
CoinPause
EndIf
SAVELOG "User click topup-credit button"
Var Seeker = "topupCredit"
CoinPause
Var PayCredit = 0
If TelephoneNumber = "" Then

5
xml/page_catalog.lxml
View file

@ -7,10 +7,7 @@
<EventOpen>
If CountryName = "Australia" Then
If WinterWarmersCatalogFlag = 1 Then
Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
Open catalogFile
EndIf
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
EndIf

7
xml/page_catalog_cocktail.xml
View file

@ -5,6 +5,13 @@
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
If CountryName = "Australia" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/open_page_catalog.ev"
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
TopView "show"

4
xml/page_topping_select7.xml
View file

@ -2353,6 +2353,10 @@
DEBUGVAR toppingID2price1
DEBUGVAR toppingID2price2
DEBUGVAR toppingID2price3
DEBUGVAR toppingID9price1
DEBUGVAR toppingID9price2
DEBUGVAR toppingID9price3
DEBUGVAR toppingID9price4
DEBUGVAR ShiftSugarStep

30
xml/page_topup_credit-ChooseNumber.xml
View file

@ -6,7 +6,6 @@
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
@ -20,6 +19,7 @@
Var ShowErrorText = "Invisible"
Var ShowErrorText2 = "Invisible"
Var Tel_Confirm_State = "Invisible"
Var LoadingState = "Invisible"
Var GetCreditFlag = 0
@ -47,6 +47,14 @@
<EventTimeout>
Var Timeout = Timeout + 1
If GetAccFlag = 1 Then
If Timeout > 20 Then
Var LoadingState = "Invisible"
Var ShowErrorText = "Enable"
EndIf
EndIf
If Timeout > 60 Then
;Open "ROOT/taobin_project/xml/page_catalog2.xml"
@ -189,6 +197,24 @@
</Text>
<GIF>
<X> 493 </X>
<Y> 1020 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> LoadingState </State>
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
</GIF>
<Image>
<X> 267 </X>
<Y> 1120 </Y>
<State> LoadingState </State>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc"
@ -214,6 +240,8 @@
Var GetAccFlag = 1
GETACCEXT TelephoneNumber 19
Var LoadingState = "Enable"
Refresh
Else
Var ShowErrorText2 = "Enable"

5
xml/page_topup_credit3-1.xml
View file

@ -38,6 +38,11 @@
Var timeout_Adddata22 = 0
GenHashWithTimeStamp PointCrm
If SELLSTATUS = "SELLNOCASH" Then
Var topupCreditWithCash = "Disable"
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>

23
xml/page_topup_credit3-Topup.xml
View file

@ -6,7 +6,6 @@
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
@ -19,6 +18,7 @@
Var ShowTextNumber = "Enable"
Var ShowErrorText = "Invisible"
Var Tel_Confirm_State = "Invisible"
Var loadingReqState = "Invisible"
Var GetCreditFlag = 0
@ -629,6 +629,8 @@ If ViewBill > 0 Then
Var TextWaiting = "กรุณารอซักครู่..."
EndIf
Var loadingReqState = "Enable"
Refresh
EndIf
@ -681,10 +683,21 @@ If ViewBill > 0 Then
<Filename> Var( DirImage + text_show_error ) </Filename>
</Image>
<Image>
<X> 158 </X>
<Y> 601 </Y>
<State> loadingReqState </State>
<Filename> "ROOT/taobin_project/image/collectiing/alpha_loading.png" </Filename>
</Image>
;include="ROOT/taobin_project/inc/video.inc"
<GIF>
<X> 494 </X>
<Y> 1078 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> loadingReqState </State>
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
</GIF>
<Text>
@ -700,7 +713,7 @@ If ViewBill > 0 Then
</Text>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>

2
xml/page_topup_credit3-TopupCash.xml
View file

@ -205,6 +205,7 @@
Var SessionID2 = "00-00-00-0000"
Var ServiceCredit = "coffee"
Var PayDetail = ""
Var CreditReference = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1
@ -233,6 +234,7 @@
Var SessionID2 = "00-00-00-0000"
Var ServiceCredit = "coffee"
Var PayDetail = ""
Var CreditReference = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1