merge
This commit is contained in:
commit
b421173c0e
69 changed files with 5954 additions and 4966 deletions
|
|
@ -124,6 +124,10 @@
|
|||
|
||||
Var AddData = 0
|
||||
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
|
||||
|
||||
If Seeker.TNumberTaobinMember = "" Then
|
||||
|
||||
Else
|
||||
|
|
@ -401,7 +405,11 @@
|
|||
|
||||
If EnableSelectMenuBetweenBrew = "Enable" Then
|
||||
If Timeout = 5 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
|
||||
If show_eng = "true" Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3"
|
||||
Else
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
|
||||
EndIf
|
||||
EndIf
|
||||
If Timeout = 9 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
|
|
@ -706,7 +714,7 @@
|
|||
|
||||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
Var ServiceType = "coffee"
|
||||
|
|
@ -813,7 +821,7 @@
|
|||
|
||||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -88,6 +88,9 @@
|
|||
|
||||
Var AddData = 0
|
||||
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
|
||||
If Seeker.TNumberTaobinMember = "" Then
|
||||
|
||||
Else
|
||||
|
|
@ -563,7 +566,7 @@
|
|||
|
||||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
Var ServiceType = "coffee"
|
||||
|
|
@ -674,7 +677,7 @@
|
|||
|
||||
If AddData = 1 Then
|
||||
Var Cid = 26
|
||||
AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -60,7 +60,9 @@
|
|||
|
||||
Var MenuVSelected2 = "Invisible"
|
||||
If SpiralOnline = "true" Then
|
||||
Var MenuVSelected2 = "Enable"
|
||||
If Seeker = "curr" Then
|
||||
Var MenuVSelected2 = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; init default
|
||||
|
|
@ -255,7 +257,11 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
If SpiralOnline = "true" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml"
|
||||
If Seeker = "curr" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -8,6 +8,10 @@
|
|||
TopView "show"
|
||||
; On open
|
||||
|
||||
If Seeker = "next" Then
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
|
||||
Var NextPage = "-"
|
||||
|
||||
Var Seeker.thankLidFlag = 0
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
|
||||
Var GetCreditFlag = 0
|
||||
|
|
@ -186,13 +187,16 @@
|
|||
Var TelephoneNumber = TelephoneNumber + "1"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
Trim TelephoneNumber 10
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
StrLen TelephoneNumber TelNumLen
|
||||
If TelNumLen >= 10 Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "1"
|
||||
|
|
@ -232,6 +236,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "2"
|
||||
|
|
@ -271,6 +279,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "3"
|
||||
|
|
@ -310,6 +322,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "4"
|
||||
|
|
@ -349,6 +365,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "5"
|
||||
|
|
@ -388,6 +408,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "6"
|
||||
|
|
@ -427,6 +451,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "7"
|
||||
|
|
@ -466,6 +494,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "8"
|
||||
|
|
@ -504,6 +536,10 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "9"
|
||||
|
|
@ -544,6 +580,10 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "0"
|
||||
|
|
@ -583,6 +623,7 @@
|
|||
EndIf
|
||||
|
||||
;Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
|
@ -621,8 +662,37 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
;GETACCEXT TelephoneNumber 14
|
||||
GETACCEXT TelephoneNumber 19
|
||||
DEBUGVAR "PICHET"
|
||||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 2
|
||||
|
||||
If Tel2D = "06" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "07" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "08" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "09" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
GETACCEXT TelephoneNumber 19
|
||||
Else
|
||||
|
||||
Var ShowErrorText2 = "Enable"
|
||||
;Var TelephoneNumber = ""
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
Refresh
|
||||
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -677,7 +747,15 @@
|
|||
<Y> 942 </Y>
|
||||
<State> ShowErrorText </State>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> "ROOT/taobin_project/image/collectiing/text_show_notfound.png" </Filename>
|
||||
<Filename> Var( DirImage + "/text_show_notfound.png") </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 152 </X>
|
||||
<Y> 910 </Y>
|
||||
<State> ShowErrorText2 </State>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> Var( DirImage + "/text_show_error5.png") </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
<EventOpen>
|
||||
; On open
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var Timeout = 0
|
||||
|
|
@ -69,7 +71,7 @@
|
|||
If web_telnumOK = "" Then
|
||||
Else
|
||||
Var TelephoneNumber = web_telnumOK
|
||||
Var StepGetPoint = 0
|
||||
Var StepGetPoint = 1
|
||||
|
||||
Var PdpaAsk = 0
|
||||
|
||||
|
|
@ -82,7 +84,11 @@
|
|||
|
||||
|
||||
Var TelephoneNumberX = TelephoneNumber
|
||||
GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
|
||||
DEBUGVAR TelephoneNumber
|
||||
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
|
||||
Var Param1 = TelephoneNumber + "/"
|
||||
Var Param1 = Param1 + ParamCP
|
||||
GETACCEXT Param1 23
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
|
||||
|
||||
EndIf
|
||||
|
|
@ -101,6 +107,7 @@
|
|||
|
||||
SAVELOG "collect_point1-p71."
|
||||
Var TelephoneNumberX = TelephoneNumber
|
||||
DEBUGVAR TelephoneNumber
|
||||
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
|
||||
Var Param1 = TelephoneNumber + "/"
|
||||
Var Param1 = Param1 + ParamCP
|
||||
|
|
@ -146,6 +153,7 @@
|
|||
If Timeout > 30 Then
|
||||
|
||||
SAVELOG "collect_point1-p107."
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -204,6 +212,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "1"
|
||||
EndIf
|
||||
|
|
@ -245,6 +259,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "2"
|
||||
EndIf
|
||||
|
|
@ -284,6 +304,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "3"
|
||||
EndIf
|
||||
|
|
@ -323,6 +349,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "4"
|
||||
EndIf
|
||||
|
|
@ -362,6 +394,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "5"
|
||||
EndIf
|
||||
|
|
@ -401,6 +439,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "6"
|
||||
EndIf
|
||||
|
|
@ -440,6 +484,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "7"
|
||||
EndIf
|
||||
|
|
@ -479,6 +529,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "8"
|
||||
EndIf
|
||||
|
|
@ -518,6 +574,12 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "9"
|
||||
EndIf
|
||||
|
|
@ -557,6 +619,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowTextNumber = "Invisible"
|
||||
|
||||
TimerReset
|
||||
|
|
@ -627,6 +690,7 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
; goto lid straw
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
SAVELOG "collect_point1-p589."
|
||||
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
</EventClick>
|
||||
|
|
@ -644,26 +708,77 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
|
||||
|
||||
If Tel_Confirm_Flag = 1 Then
|
||||
Var StepGetPoint = 1
|
||||
|
||||
Var PdpaAsk = 0
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 2
|
||||
|
||||
If Tel2D = "06" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "07" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "08" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "09" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
|
||||
|
||||
Var OperatorTemp = ""
|
||||
Var CreditAmount = 0
|
||||
Var OperatorStatus = ""
|
||||
Var AccountType = ""
|
||||
|
||||
SAVELOG "collect_point1-p583."
|
||||
Var TelephoneNumberX = TelephoneNumber
|
||||
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
|
||||
|
||||
|
||||
Var Param1 = TelephoneNumber + "/"
|
||||
Var Param1 = Param1 + ParamCP
|
||||
GETACCEXT Param1 23
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
||||
Var StepGetPoint = 1
|
||||
|
||||
Var PdpaAsk = 0
|
||||
|
||||
Var OperatorTemp = ""
|
||||
Var CreditAmount = 0
|
||||
Var OperatorStatus = ""
|
||||
Var AccountType = ""
|
||||
|
||||
SAVELOG "collect_point1-p583."
|
||||
Var TelephoneNumberX = TelephoneNumber
|
||||
;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
|
||||
DEBUGVAR TelephoneNumber
|
||||
|
||||
|
||||
Var Param1 = TelephoneNumber + "/"
|
||||
Var Param1 = Param1 + ParamCP
|
||||
If Seeker = "next" Then
|
||||
Else
|
||||
GETACCEXT Param1 23
|
||||
EndIf
|
||||
;Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
|
||||
Else
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/collectiing_en"
|
||||
Else
|
||||
Var DirImage2 = "ROOT/taobin_project/image/collectiing"
|
||||
EndIf
|
||||
|
||||
Var text_show_error = DirImage2 + "/text_show_error5.png"
|
||||
|
||||
Var ShowErrorText = "Enable"
|
||||
;Var TelephoneNumber = ""
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
</EventClick>
|
||||
|
|
@ -723,6 +838,14 @@
|
|||
<Color> 0x513C2F </Color>
|
||||
<Value> ShowCountDownBrewing </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 152 </X>
|
||||
<Y> 955 </Y>
|
||||
<State> ShowErrorText </State>
|
||||
<Filename> text_show_error </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -35,8 +35,6 @@
|
|||
|
||||
If PayOfflineMode = 1 Then
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
;Var Seeker.PointTaobinStr = "" + PayAmount
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember= TelephoneNumber
|
||||
|
|
@ -55,22 +53,18 @@
|
|||
Var Timeout = Timeout + 1
|
||||
If Timeout > 30 Then
|
||||
|
||||
If StepGetPoint = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_show_consent.xml"
|
||||
Else
|
||||
|
||||
Var TaobinLevel = 0
|
||||
Var CoffeePoint = 1
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
;Var Seeker.PointTaobinStr = "" + PayAmount
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
|
||||
Var Seeker.TNumberTaobinMember= TelephoneNumber
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -108,8 +102,6 @@
|
|||
If Ext1a = "" Then
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
;Var Seeker.PointTaobinStr = "" + PayAmount
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumber
|
||||
|
|
@ -157,11 +149,9 @@
|
|||
EndIf
|
||||
|
||||
|
||||
;Var Seeker.PointTaobinStr = "" + PointTaobin
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/"
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + PointTaobin
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumberX
|
||||
|
||||
|
||||
Var CoffeePointRank = Ext1b
|
||||
|
|
@ -182,6 +172,8 @@
|
|||
Var CoffeePointRankTmp = CoffeePointRank
|
||||
|
||||
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
If TaobinPDPA = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_show_consent.xml"
|
||||
EndIf
|
||||
|
|
@ -191,8 +183,7 @@
|
|||
Else
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
;Var Seeker.PointTaobinStr = "" + PayAmount
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember = TelephoneNumber
|
||||
|
|
@ -210,18 +201,15 @@
|
|||
<EventActionError>
|
||||
|
||||
|
||||
If StepGetPoint = 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_show_consent.xml"
|
||||
Else
|
||||
;Var CoffeePoint = 1
|
||||
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 1
|
||||
;Var Seeker.PointTaobinStr = "" + PayAmount
|
||||
;Var Seeker.PointTaobinStr = Seeker.PointTaobinStr + "/1/0"
|
||||
|
||||
Var Seeker.PointTaobinStr = ParamCP
|
||||
Var TelephoneNumber = TelephoneNumberX
|
||||
Var Seeker.TNumberTaobinMember= TelephoneNumber
|
||||
Open "ROOT/taobin_project/xml/page_collect_point_error.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
</EventActionError>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@
|
|||
|
||||
Var CoffeePointStr = CoffeePoint
|
||||
|
||||
SAVELOG TelephoneNumber
|
||||
DEBUGVAR TelephoneNumber
|
||||
DEBUGVAR TelephoneNumberX
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/display_point_en"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@
|
|||
<Background> "0xeae6e1" </Background>
|
||||
<EventOpen>
|
||||
; On open
|
||||
|
||||
Var IndoQR = 0
|
||||
|
||||
Var GetPayInfoFlag = 0
|
||||
Var SessionID2 = ""
|
||||
Var testservice = "kbank"
|
||||
|
|
@ -117,7 +120,7 @@
|
|||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
|
||||
Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
|
||||
Var PlaySoundCodeLang = "ROOT/sounds_eng/Code8digit.m4a"
|
||||
Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3"
|
||||
|
||||
|
||||
Else
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
|
||||
<Button>
|
||||
<X> 784 </X>
|
||||
<Y> 1425 </Y>
|
||||
<Y> 1435 </Y>
|
||||
<State> "Enable" </State>
|
||||
<Filename> Var( DirImage + "/bn_shoot.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_shoot.png" )</FilenamePress>
|
||||
|
|
|
|||
|
|
@ -415,8 +415,13 @@
|
|||
EndIf
|
||||
|
||||
If web_payment = "QR" Then
|
||||
|
||||
If IndoQR = 1 Then
|
||||
Var QR_POPUP = "/img_popup7.png"
|
||||
Else
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
EndIf
|
||||
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
|
|
@ -441,7 +446,11 @@
|
|||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "KBA:2/"
|
||||
If IndoQR = 1 Then
|
||||
Var ECommerceQR = ECommerceQR + "IND:2/"
|
||||
Else
|
||||
Var ECommerceQR = ECommerceQR + "KBA:2/"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
|
@ -574,7 +583,11 @@
|
|||
If VendingBank = "kbank" Then
|
||||
Var Seeker.CampaignPayChanel = "kbank"
|
||||
Else
|
||||
Var Seeker.CampaignPayChanel = "cash"
|
||||
If IndoQR = 1 Then
|
||||
Var Seeker.CampaignPayChanel = "xendit"
|
||||
Else
|
||||
Var Seeker.CampaignPayChanel = "cash"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
If ReqPayInfoFlag2 = 2 Then
|
||||
|
|
@ -623,6 +636,24 @@
|
|||
Var QRCODE99 = QRCODE99KBANK
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
|
||||
If VendingQRTypeResult = "IND:2" Then
|
||||
Var CashTextWarning = ""
|
||||
Var QRErrorState = "Invisible"
|
||||
Var QRCODE99KBANK = SessionID
|
||||
Var QRCODE99KBANK = QRCODE99KBANK + Ext1a
|
||||
SAVELOG Ext1a
|
||||
SAVELOG QRCODE99KBANK
|
||||
Var QRCODE99KBANK = QRCODE99KBANK + Ext21
|
||||
Var QRCODETMP = QRCODE99KBANK
|
||||
Var ReqPayInfoFlag = 0
|
||||
Var ReqPayInfoFlag2 = 1
|
||||
SAVELOG QRCODE99KBANK
|
||||
SAVELOG Ext21
|
||||
|
||||
Var QRCODE99 = QRCODE99KBANK
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
|
@ -1437,7 +1468,12 @@
|
|||
If CancelFlag = 0 Then
|
||||
If alphaState = "Invisible" Then
|
||||
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
If IndoQR = 1 Then
|
||||
Var QR_POPUP = "/img_popup7.png"
|
||||
Else
|
||||
Var QR_POPUP = "/img_popup1.png"
|
||||
EndIf
|
||||
|
||||
Var LOADING_STATE = "Enable"
|
||||
|
||||
Var FlagQROpened = 1
|
||||
|
|
@ -1462,7 +1498,13 @@
|
|||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + SelectDrink
|
||||
Var ECommerceQR = ECommerceQR + "/"
|
||||
Var ECommerceQR = ECommerceQR + "KBA:2/"
|
||||
If IndoQR = 1 Then
|
||||
Var ECommerceQR = ECommerceQR + "IND:2/"
|
||||
Else
|
||||
Var ECommerceQR = ECommerceQR + "KBA:2/"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -1525,6 +1567,8 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 680 </X>
|
||||
<Y> 1255 </Y>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
|
||||
Var GetCreditFlag = 0
|
||||
|
|
@ -192,6 +193,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "1"
|
||||
|
|
@ -234,6 +236,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "2"
|
||||
|
|
@ -276,6 +279,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "3"
|
||||
|
|
@ -318,6 +322,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "4"
|
||||
|
|
@ -360,6 +365,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "5"
|
||||
|
|
@ -402,6 +408,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "6"
|
||||
|
|
@ -444,6 +451,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "7"
|
||||
|
|
@ -486,6 +494,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "8"
|
||||
|
|
@ -528,6 +537,7 @@
|
|||
Function 2
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "9"
|
||||
|
|
@ -571,6 +581,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "0"
|
||||
|
|
@ -611,6 +622,7 @@
|
|||
EndIf
|
||||
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
|
@ -713,6 +725,14 @@
|
|||
<Filename> Var( DirImage + "/text_show_notfound.png") </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 152 </X>
|
||||
<Y> 920 </Y>
|
||||
<State> ShowErrorText2 </State>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> Var( DirImage + "/text_show_error5.png") </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
;<Image>
|
||||
;<X> 0 </X>
|
||||
|
|
@ -736,8 +756,39 @@
|
|||
</EventSecurity>
|
||||
|
||||
<Function2>
|
||||
Var GetAccFlag = 1
|
||||
GETACCEXT TelephoneNumber 19
|
||||
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 2
|
||||
|
||||
If Tel2D = "06" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "07" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "08" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "09" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
||||
|
||||
Var GetAccFlag = 1
|
||||
GETACCEXT TelephoneNumber 19
|
||||
Else
|
||||
|
||||
Var ShowErrorText2 = "Enable"
|
||||
;Var TelephoneNumber = ""
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
Refresh
|
||||
|
||||
EndIf
|
||||
</Function2>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
Var ShowTextNumber = "Enable"
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
|
||||
Var GetCreditFlag = 0
|
||||
|
|
@ -218,6 +219,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "1"
|
||||
|
|
@ -259,6 +261,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "2"
|
||||
|
|
@ -300,6 +303,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "3"
|
||||
|
|
@ -341,6 +345,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "4"
|
||||
|
|
@ -383,6 +388,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "5"
|
||||
|
|
@ -424,6 +430,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "6"
|
||||
|
|
@ -465,6 +472,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "7"
|
||||
|
|
@ -506,6 +514,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "8"
|
||||
|
|
@ -547,6 +556,7 @@
|
|||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "9"
|
||||
|
|
@ -589,6 +599,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
|
||||
If TelNumLen = 7 Then
|
||||
Var number7 = "0"
|
||||
|
|
@ -629,6 +640,7 @@
|
|||
EndIf
|
||||
|
||||
;Var ShowErrorText = "Invisible"
|
||||
Var ShowErrorText2 = "Invisible"
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
|
@ -680,8 +692,38 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
Var GetAccFlag = 1
|
||||
GETACCEXT TelephoneNumber 13
|
||||
Var Tel2DFlag = 0
|
||||
|
||||
Var Tel2D = TelephoneNumber
|
||||
Trim Tel2D 2
|
||||
|
||||
If Tel2D = "06" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "07" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "08" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
If Tel2D = "09" Then
|
||||
Var Tel2DFlag = 1
|
||||
EndIf
|
||||
|
||||
|
||||
If Tel2DFlag = 1 Then
|
||||
|
||||
|
||||
Var GetAccFlag = 1
|
||||
GETACCEXT TelephoneNumber 13
|
||||
Else
|
||||
|
||||
Var ShowErrorText2 = "Enable"
|
||||
;Var TelephoneNumber = ""
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
Refresh
|
||||
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -736,7 +778,15 @@
|
|||
<Y> 942 </Y>
|
||||
<State> ShowErrorText </State>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> "ROOT/taobin_project/image/collectiing/text_show_notfound.png" </Filename>
|
||||
<Filename> Var( DirImage + "/text_show_notfound.png") </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 152 </X>
|
||||
<Y> 920 </Y>
|
||||
<State> ShowErrorText2 </State>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> Var( DirImage + "/text_show_error5.png") </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -803,6 +803,8 @@
|
|||
|
||||
DEBUGVAR CoffeeCredit
|
||||
DEBUGVAR Curr.CurrCreditAmount
|
||||
DEBUGVAR Curr.CurrCreditTelNum
|
||||
DEBUGVAR Seeker.TNumberTaobinCredit
|
||||
|
||||
If Seeker.TNumberTaobinCredit = Curr.CurrCreditTelNum Then
|
||||
Var CoffeeCredit = CoffeeCredit + Curr.CurrCreditAmount
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
If Timeout > 30 Then
|
||||
If Timeout > 5 Then
|
||||
; goto lid straw
|
||||
;SAVELOG "Timeout"
|
||||
;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue