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

fix for webApp

Browse source
This commit is contained in:
miggaze 2021-11-26 15:53:14 +07:00
parent 8f87f50e17
commit 11c8767cd0
9 changed files with 192 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_board.xml
View file

@ -21,6 +21,7 @@
DEBUGVAR web_pin DEBUGVAR web_pin
Var web_telnumOK = "" Var web_telnumOK = ""
Var web_readyOK = "false"
Var GetFreeFromError = 0 Var GetFreeFromError = 0
Var taobin_version = "1.53" Var taobin_version = "1.53"
@ -507,6 +508,7 @@
If web_ready = "true" Then If web_ready = "true" Then
If web_ref = QRCODE99 Then If web_ref = QRCODE99 Then
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum Var web_telnumOK = web_telnum

2
xml/page_catalog.xml
View file

@ -8,6 +8,7 @@
TopView "show" TopView "show"
; On open ; On open
Var web_readyOK = "false"
Var web_telnumOK = "" Var web_telnumOK = ""
@ -152,6 +153,7 @@
If web_ready = "true" Then If web_ready = "true" Then
If web_ref = QRCODE99 Then If web_ref = QRCODE99 Then
Cart "DeleteMenuID" "ALL" Cart "DeleteMenuID" "ALL"
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum Var web_telnumOK = web_telnum

12
xml/page_collect_point_2.xml
View file

@ -100,13 +100,13 @@
Var TNumberTaobinMemberXXX = TelephoneNumber Var TNumberTaobinMemberXXX = TelephoneNumber
Trim TNumberTaobinMemberXXX 3 ;Trim TNumberTaobinMemberXXX 3
;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-" ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + "-XXX-"
Var TNumberTaobinMemberXXX = "XXX-XXX-" ;Var TNumberTaobinMemberXXX = "XXX-XXX-"
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7 ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number7
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8 ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number8
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9 ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number9
Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10 ;Var TNumberTaobinMemberXXX = TNumberTaobinMemberXXX + number10
If TaobinLevel = 1 Then If TaobinLevel = 1 Then
Var PointTaobin = PayAmount / 20 Var PointTaobin = PayAmount / 20

1
xml/page_collect_point_3.xml
View file

@ -1074,6 +1074,7 @@
<Font> KanitRegularTTF </Font> <Font> KanitRegularTTF </Font>
<Color> 0x746253 </Color> <Color> 0x746253 </Color>
<Value> TNumberTaobinMemberXXX </Value> <Value> TNumberTaobinMemberXXX </Value>
<Format> Telnum-mask-1 </Format>
</Text> </Text>
<Text> <Text>

20
xml/page_drinkok.xml
View file

@ -344,16 +344,16 @@
<Text> ;<Text>
<X> 0 </X> ;<X> 0 </X>
<Y> 1886 </Y> ;<Y> 1886 </Y>
<Size> 20 </Size> ;<Size> 20 </Size>
<Width> 1080</Width> ;<Width> 1080</Width>
<Align> end </Align> ;<Align> end </Align>
<Font> RobotoBlack </Font> ;<Font> RobotoBlack </Font>
<Color> 0x513C2F </Color> ;<Color> 0x513C2F </Color>
<Value> countClick2 </Value> ;<Value> countClick2 </Value>
</Text> ;</Text>
<Image> <Image>

20
xml/page_payment.xml
View file

@ -121,8 +121,8 @@
;Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
;Var SessionID2 = SessionID2 + ExtendData Var SessionID2 = SessionID2 + ExtendData
;Var CreditAmount1 = "" ;Var CreditAmount1 = ""
;Var ServiceAmountFlow = "" ;Var ServiceAmountFlow = ""
@ -157,6 +157,22 @@
; Reset ; Reset
Var MachineState_Result = 0 Var MachineState_Result = 0
DEBUGVAR ExtendData
If web_readyOK = "true" Then
If web_payment = "CODE" Then
Open "ROOT/taobin_project/xml/page_payment_code.xml"
EndIf
If web_payment = "CREDIT" Then
Open "ROOT/taobin_project/xml/page_payment_credit2.xml"
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_payment_cash.xml" Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf EndIf

72
xml/page_payment_cash.xml
View file

@ -293,6 +293,78 @@
Var PayState5 = "Disable" Var PayState5 = "Disable"
EndIf EndIf
If web_readyOK = "true" Then
Var web_readyOK = "false"
If web_payment = "CASH" Then
Var alphaState2 = "Enable"
EndIf
If web_payment = "QR" Then
Var QR_POPUP = "/img_popup1.png"
Var LOADING_STATE = "Enable"
Var FlagQROpened = 1
Var alphaState = "Enable"
;CoinVending OFF
VendingQR ON
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumberQR = "0899999999"
Var ServiceType = "coffee"
Var ECommerceQR = ""
Var ECommerceQR = ECommerceQR + PriceDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + DiscountDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SessionID2
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + SelectDrink
Var ECommerceQR = ECommerceQR + "/"
Var ECommerceQR = ECommerceQR + "KBA:2/"
If IntVendingCampaign > 0 Then
Var ECommerceQR = ECommerceQR + VendingCode
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + CodeNumber
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + VendingCampaignRI3
EndIf
If IntVendingCredit > 0 Then
Var ECommerceQR = ECommerceQR + "CRD"
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + TNumberTaobinCredit
Var ECommerceQR = ECommerceQR + ":"
Var ECommerceQR = ECommerceQR + IntVendingCredit
EndIf
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 1
EndIf
EndIf
</EventOpen> </EventOpen>
<EventActionOk> <EventActionOk>

62
xml/page_payment_code.xml
View file

@ -34,6 +34,63 @@
Else Else
Var DirImage = "ROOT/taobin_project/image/collectiing" Var DirImage = "ROOT/taobin_project/image/collectiing"
EndIf EndIf
If web_readyOK = "true" Then
Var web_readyOK = "false"
If web_code = "" Then
Else
Var ShowTextNumber = "Invisible"
Var Tel_Confirm_State = "Enable"
Var GetPayInfoFlag = 1
VendingQR OFF
Var TelephoneNumber = web_code
Var CodeNumber = TelephoneNumber
Var RemainAmount = 0
;PrepareDrink SelectDrink SelectSugarID
Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + ExtendData
Var CreditAmount1 = ""
Var ServiceAmountFlow = ""
Var TelephoneNumber2 = "0899999999"
Var ServiceType = "coffee"
Var ECommerce = ""
Var ECommerce = ECommerce + PriceDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + DiscountDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SessionID2
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + "C00"
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + CodeNumber
Var ServiceParameter = "max"
Var ServiceCharge = 0
Var AccountType = "new"
Var testservice = "kbank"
Var tc = ""
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
GetPayInfo TelephoneNumber2 ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var Timeout = 0
Var TelephoneNumber = CodeNumber
Var CodeChannel = 1
EndIf
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -587,11 +644,10 @@
Var CodeNumber = TelephoneNumber Var CodeNumber = TelephoneNumber
Var RemainAmount = 0 Var RemainAmount = 0
PrepareDrink SelectDrink SelectSugarID ;PrepareDrink SelectDrink SelectSugarID
Var SessionID2 = SelectSlot + ":" Var SessionID2 = SelectSlot + ":"
Var SessionID2 = SessionID2 + sugarID Var SessionID2 = SessionID2 + ExtendData
Var SessionID2 = SessionID2 + "000"
Var CreditAmount1 = "" Var CreditAmount1 = ""
Var ServiceAmountFlow = "" Var ServiceAmountFlow = ""

22
xml/page_payment_credit2.xml
View file

@ -41,6 +41,28 @@
Var Ext1a = "" Var Ext1a = ""
If web_readyOK = "true" Then
Var web_readyOK = "false"
Var Tel_Confirm_State = "Enable"
Var ShowTextNumber1 = "Enable"
Var ShowTextNumber2= "Enable"
Var ShowTextNumber3= "Enable"
Var ShowTextNumber4= "Enable"
Var PinNumber = web_pin
Var TelephoneNumber = web_telnum
Var DataTmp = TelephoneNumber + "/"
Var DataTmp = DataTmp + PinNumber
GETACCEXT DataTmp 13
EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>