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

Add PayDetail2 from seeker before call action Pay/PAYEXT

Browse source
This commit is contained in:
wanlop run 2024-04-11 17:25:04 +07:00
parent 6b535fc770
commit cec8e4e427
14 changed files with 356 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xml/page_brewing3.xml
View file

@ -1032,7 +1032,7 @@
Var SuggestID = ""
Var SessionID2 = ""
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
@ -1148,7 +1148,7 @@
Var DEE = PayDetail
Var PayDetail2 = Seeker.PayDetail2
PAYEXT SVT ACC VendingTSIDTmp DEE
Var ActionOKCase = 1
@ -1258,7 +1258,7 @@
;CashlessReq FAIL
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
@ -1268,7 +1268,7 @@
;CashlessReq FAIL
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
@ -1289,6 +1289,7 @@
Var ACC = Seeker.TNumberTaobinMember
EndIf
Var PayDetail2 = Seeker.PayDetail2
PAYEXT SVT ACC VendingTSIDTmp DEE
EndIf
@ -1392,22 +1393,7 @@
Var ChangeOK = 3
EndIf
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
EndIf
EndIf

8
xml/page_brewing3Conti.xml
View file

@ -458,7 +458,7 @@
Var SessionID2 = ""
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
@ -513,7 +513,7 @@
Var SessionID2 = ""
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
;If Seeker.CodeChannel = 0 Then
@ -670,7 +670,7 @@
;CashlessReq FAIL
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
@ -682,7 +682,7 @@
;CashlessReq FAIL
EndIf
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate

16
xml/page_catalog_group_pro_tea_time.xml
View file

@ -3604,9 +3604,9 @@ Sugar, Oreo" </Value>
<State> Flag( 12-02-01-1026.Button,12-02-02-1026.Button,$Sum12020110261202021026) </State>
<Button>
<State> $Sum12020110261202021026 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Matcha_latte_tea_time.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Matcha_latte_tea_time.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Matcha_latte_tea_time.png" </FilenameDisable>
<OverlayImage> xmlpro( 12-02-01-1026, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -3615,7 +3615,7 @@ Sugar, Oreo" </Value>
Var NameDrinkTH = "ชาละทะเว็วฟ์"
Var DrinkDescriptionTH = "ชาเชียว นม "
Var DrinkDescription = "Matcha and Warm milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Matcha_latte_tea_time.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-02-01-1026.Price
Var PriceD2 = $12-02-02-1026.Price
@ -4883,9 +4883,9 @@ Sugar, Oreo" </Value>
<State> Flag( 12-21-01-0031.Button,12-21-02-0031.Button,12-21-03-0031.Button,$Sum122101003112210200311221030031) </State>
<Button>
<State> $Sum122101003112210200311221030031 </State>
<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_Matcha_latte_tea_time.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_Matcha_latte_tea_time.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_Matcha_latte_tea_time.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/image/page_drink_n//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<OverlayImage> xmlpro( 12-21-01-0031, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
@ -4894,7 +4894,7 @@ Sugar, Oreo" </Value>
Var NameDrinkTH = "ชาละซิกส์ทีน"
Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ และ นม"
Var DrinkDescription = "Espresso, Matcha, Milk"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Matcha_latte_tea_time.png"
Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "BN_ICED_MATCHA_CAFE_LATTE_tea_time_health.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $12-21-01-0031.Price
Var PriceD2 = $12-21-02-0031.Price

43
xml/page_drinkok.xml
View file

@ -277,50 +277,7 @@
If MultiGo = 1 Then
If CART_INDEX = CART_COUNT Then
;Pay Multi
If sendPayMultiFlag = 0 Then
If Seeker.PayWithQR = 0 Then
Var ServiceType = "coffee-multi"
Else
Var ServiceType = "coffee-multiQR"
EndIf
If Seeker.TNumberTaobinCredit = "" Then
Var TelephoneNumber = "0899999999"
Var PayO2 = ""
If Seeker.TNumberTaobinMember = "" Then
Else
Var TelephoneNumber = Seeker.TNumberTaobinMember
EndIf
Else
Var TelephoneNumber = Seeker.TNumberTaobinCredit
Var PayO2 = Seeker.CoffeePinNumber
EndIf
Var ServiceCredit = "00-00-00-0000"
Var SuggestID = ""
Var PayDetail="1/S:0/0/"
Var SessionID3 = "" + CART_COUNT
Var SessionID3 = SessionID3 + ":00000"
SAVELOG PayO2
Var VendingCampaign = IntVendingCampaign
Var CreditReference = Seeker.CreditReferenceTmp
Var PayType = ""
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID3 ServiceAmountSum ServiceCharge Donate
Var sendPayMultiFlag = 1
EndIf
EndIf
EndIf
; Do not change
;
If MachineStage = "show-menu" Then

2
xml/page_payment.xml
View file

@ -500,8 +500,10 @@
If CountStepPackPayment = CountStepForCupFlagDelay Then
If Seeker = "curr" Then
Var Seeker.ExtendData = ExtendDataCurr
Var Seeker.PayDetail2 = ToppingDetailCurr;
Else
Var Seeker.ExtendData = ExtendDataNext
Var Seeker.PayDetail2 = ToppingDetailNext
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData

5
xml/page_payment_cash.xml
View file

@ -1970,6 +1970,8 @@
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Var PayDetail2 = Seeker.PayDetail2
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Var PayCredit = 1
@ -2563,7 +2565,8 @@
Var GetScore = ""
Var OperatorName = ""
Var SessionID = ""
Var PayDetail2 = Seeker.PayDetail2
GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
Var ReqPayInfoFlag = 1
Refresh

2
xml/page_payment_qr.xml
View file

@ -198,6 +198,8 @@
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf

17
xml/page_thankyouConti.xml
View file

@ -95,22 +95,7 @@
Var bg_lidProblem_ST = "Enable"
EndIf
Topping "Select" Seeker.selected_a_drink
; Set option toppinng and pack
Topping "Select1-ID" Seeker.topping1
Topping "Select2-ID" Seeker.topping2
Topping "Select3-ID" Seeker.topping3
Topping "Select6-ID" Seeker.topping6
Topping "Select7-ID" Seeker.topping7
Topping "Select8-ID" Seeker.topping8
Topping "Select9-ID" Seeker.topping9
Topping "Select10-ID" Seeker.topping10
; Pack
Topping "Pack" ExtendDataCurr
;include="ROOT/taobin_project/inc/select_drink_current.inc"
Topping "ClearNextOrder" "-"

33
xml/page_topping_select7.xml
View file

@ -6716,6 +6716,18 @@
EndIf
; Post Topping
If SugarZeroCalEnable = "true" Then
Var sugarToppingID = 1000
If SugarZeroCalCheck = "PressForever" Then
Var sugarToppingID = 1001
Else
Var sugarToppingID = 1000
EndIf
EndIf
Var Seeker.topping1 = topping1
Var Seeker.topping2 = topping2
Var Seeker.topping3 = topping3
@ -6725,6 +6737,8 @@
Var Seeker.topping9 = topping9
Var Seeker.topping10 = topping10
Var Seeker.PostTopping1 = sugarToppingID
Var Seeker.get_a_straw = StrawState
Var Seeker.get_a_lid = LidState
@ -6737,6 +6751,7 @@
DEBUGVAR Seeker.topping8
DEBUGVAR Seeker.topping9
DEBUGVAR Seeker.topping10
DEBUGVAR Seeker.PostTopping1
DEBUGVAR Seeker.get_a_straw
DEBUGVAR Seeker.get_a_lid
@ -6782,25 +6797,11 @@
; Set drink
; Post Topping
If SugarZeroCalEnable = "true" Then
Var sugarToppingID = 1000
If SugarZeroCalCheck = "PressForever" Then
Var sugarToppingID = 1001
Else
Var sugarToppingID = 1000
EndIf
Topping "PostTopping1-ID" sugarToppingID
EndIf
If Seeker = "curr" Then
;include="ROOT/taobin_project/inc/select_drink_current.inc"
Else
Topping "SetNextOrder" UserSelectProductCode
@ -6815,6 +6816,8 @@
Topping "__select8-id" topping8
Topping "__select9-id" topping9
Topping "__select10-id" topping10
Topping "__posttopping1-ID" sugarToppingID
; Pack
Topping "__pack" ExtendDataNext