diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml
index f9fa7088..beadcb0d 100644
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@@ -81,6 +81,10 @@
Var SpiralModeFrozenFruit = 1
Var ButtonFrozenSmoothie = "Enable"
EndIf
+ If MAT_ID_2301 = "Disable" Then
+ Var SpiralModeFrozenFruit = 1
+ Var ButtonFrozenSmoothie = "Enable"
+ EndIf
If BoxID = 123456 Then
diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml
index 3dbb8089..7fe2efe7 100644
--- a/inter/tha/xml/page_topping_frozen_fruit_select.lxml
+++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml
@@ -318,6 +318,8 @@
DEBUGVAR LinkProductCodeAnotherMachine[1]
DEBUGVAR LinkProductCodeAnotherMachine[2]
+ Var Seeker.sprial_frozen_fruit_select_product_code = LinkProductCodeAnotherMachine[0]
+
Function 2
EndIf
diff --git a/xml/page_spiral_sell.xml b/xml/page_spiral_sell.xml
index 3be1aad1..6c2c99c5 100644
--- a/xml/page_spiral_sell.xml
+++ b/xml/page_spiral_sell.xml
@@ -6,12 +6,12 @@
; "ROOT/taobin_project/sounds/chaching.mp3"
SoundVolume
-
+
Var Timeout = 0
Var LastMakeSpiralResult = 0
- Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4"
+ Var ShowSwapVDO = "ROOT/taobin_project/spiral/video/sp01.mp4"
GenHashWithTimeStamp SpiralRef
- Var ServiceCredit = "03-02-00-6001"
+ Var ServiceCredit = Seeker.sprial_frozen_fruit_select_product_code
SPIRAL_SELL ServiceCredit SpiralRef
Var TimeOutSmoothiesProcess = 120
@@ -19,10 +19,15 @@
1000
-
-
+
+
Var Timeout = Timeout + 1
+ ; test
+ ;If Timeout > 10 Then
+ ; Var LastMakeSpiralResult = 2
+ ;EndIf
+
If LastMakeSpiralResult = 1 Then
Var SessionID4 = MachineSpiralID
@@ -31,88 +36,38 @@
Var SessionID4 = SessionID4 + ":"
Var SessionID4 = SessionID4 + MachineSpiralSlotID
Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + ServiceCredit
+ Var SessionID4 = SessionID4 + Seeker.sprial_frozen_fruit_select_product_code
Var SessionID4 = SessionID4 + ":"
Var SessionID4 = SessionID4 + 1
Var SessionID4 = SessionID4 + ":"
Var SessionID4 = SessionID4 + MachineSpiralRemaining
Var PayDetail="S:0:"
- Var PayDetail = PayDetail + SessionID4
+ Var PayDetail = PayDetail + SessionID4
- Var Cid = 27
- Var PointCrm = CounterOrderId
- If FromCounterMulti = 1 Then
- Var PointCrm = PayReference
- EndIf
- Var GetScore = Seeker.VendingTSID
- Var param1 = PayDetail
- Var ACC = "0899999999"
-
- AddData Cid ACC param1 PointCrm GetScore
- ;Open "ROOT/taobin_project/xml/page_spiral_success.xml"
- OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+ __CMD "SprialPayDetail" PayDetail "-" "-"
+ OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
EndIf
If LastMakeSpiralResult = 2 Then
- Var SessionID4 = MachineSpiralID
- Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + MachineSpiralVMName
- Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + MachineSpiralSlotID
- Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + ServiceCredit
- Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + 1
- Var SessionID4 = SessionID4 + ":"
- Var SessionID4 = SessionID4 + MachineSpiralRemaining
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/spiral_pay_fail.ev"
- Var PayDetail="F:"
- Var PayDetail = PayDetail + MachineSpiralErrorCode
- Var PayDetail = PayDetail + ":"
- Var PayDetail = PayDetail + SessionID4
+ Open "ROOT/taobin_project/xml/page_spiral_failed.xml"
- Var Cid = 27
- Var PointCrm = CounterOrderId
- If FromCounterMulti = 1 Then
- Var PointCrm = PayReference
- EndIf
- Var GetScore = Seeker.VendingTSID
- Var param1 = PayDetail
- Var ACC = "0899999999"
-
- AddData Cid ACC param1 PointCrm GetScore
- Open "ROOT/taobin_project/xml/page_spiral_failed.xml"
-
- EndIf
-
- If BoxID = 210699 Then
- ;If Timeout > 10 Then
- ;Open "ROOT/taobin_project/xml/page_spiral_failed.xml"
- ;EndIf
- If Timeout > 10 Then
- OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
- Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
- EndIf
- EndIf
-
- If BoxID = 105005 Then
- If Timeout > 10 Then
- OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
- Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
- ;Open "ROOT/taobin_project/xml/page_spiral_failed.xml"
- EndIf
EndIf
If Timeout > 120 Then
- Open "ROOT/taobin_project/xml/page_back_to_failed.xml"
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/spiral_pay_fail.ev"
+
+ Open "ROOT/taobin_project/xml/page_back_to_failed.xml"
EndIf
TimerReset
Refresh
-
+
diff --git a/xml/process/spiral_pay_fail.ev b/xml/process/spiral_pay_fail.ev
new file mode 100644
index 00000000..ea3623b1
--- /dev/null
+++ b/xml/process/spiral_pay_fail.ev
@@ -0,0 +1,66 @@
+TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
+
+Var SelectDrink = Seeker.selected_a_drink
+Var ExtendData = Seeker.ExtendData
+Var ServiceAmount2 = Seeker.ServiceAmount2
+Var SessionID2 = SelectSlot + ":"
+Var SessionID2 = SessionID2 + ExtendData
+
+Var CreditReference = Seeker.CreditReferenceTmp
+Var VendingDiscount = Seeker.VendingDiscount
+Var VendingCampaign = Seeker.VendingCampaign
+Var TxReference = Seeker.TxRef1
+Var VendingOrderID = Seeker.ORDER_ID
+Var PayType = "newpay"
+
+Var ServiceType = "coffee-payment"
+Var ServiceCredit = SelectDrink
+Var SuggestID = ""
+
+Var PayDetail = "2/S:0/0/"
+
+Var SessionID4 = MachineSpiralID
+Var SessionID4 = SessionID4 + ":"
+Var SessionID4 = SessionID4 + MachineSpiralVMName
+Var SessionID4 = SessionID4 + ":"
+Var SessionID4 = SessionID4 + MachineSpiralSlotID
+Var SessionID4 = SessionID4 + ":"
+Var SessionID4 = SessionID4 + Seeker.sprial_frozen_fruit_select_product_code
+Var SessionID4 = SessionID4 + ":"
+Var SessionID4 = SessionID4 + 1
+Var SessionID4 = SessionID4 + ":"
+Var SessionID4 = SessionID4 + MachineSpiralRemaining
+
+Var PayDetail = PayDetail + "|locker:F:"
+Var PayDetail = PayDetail + MachineSpiralErrorCode
+Var PayDetail = PayDetail + ":"
+Var PayDetail = PayDetail + SessionID4
+
+Var PayDetail = PayDetail + "/XML|"
+Var PayDetail = PayDetail + Seeker.OrderChanel
+
+If Seeker.CodeChannel = 1 Then
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + ""
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + Seeker.VendingCode
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + SelectDrink
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + BoxID
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + "S"
+ Var SessionID2 = SessionID2 + "/"
+ Var SessionID2 = SessionID2 + Seeker.CodeNumber
+ Var SessionID2 = SessionID2 + "/"
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+Else
+
+
+ Var PayDetail2 = Seeker.PayDetail2
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+
+EndIf
\ No newline at end of file