diff --git a/image/collectiing/Businessman_sorry.png b/image/collectiing/Businessman_sorry.png
new file mode 100644
index 00000000..92218611
Binary files /dev/null and b/image/collectiing/Businessman_sorry.png differ
diff --git a/image/collectiing/bn_back2.png b/image/collectiing/bn_back2.png
new file mode 100644
index 00000000..e0f74345
Binary files /dev/null and b/image/collectiing/bn_back2.png differ
diff --git a/image/collectiing/bn_confirm2.png b/image/collectiing/bn_confirm2.png
new file mode 100644
index 00000000..0528b222
Binary files /dev/null and b/image/collectiing/bn_confirm2.png differ
diff --git a/image/collectiing/bn_door_open.png b/image/collectiing/bn_door_open.png
new file mode 100644
index 00000000..b2d59f40
Binary files /dev/null and b/image/collectiing/bn_door_open.png differ
diff --git a/image/collectiing/bns_0.png b/image/collectiing/bns_0.png
new file mode 100644
index 00000000..8af37386
Binary files /dev/null and b/image/collectiing/bns_0.png differ
diff --git a/image/collectiing/bns_1.png b/image/collectiing/bns_1.png
new file mode 100644
index 00000000..59ece25a
Binary files /dev/null and b/image/collectiing/bns_1.png differ
diff --git a/image/collectiing/bns_2.png b/image/collectiing/bns_2.png
new file mode 100644
index 00000000..50277f88
Binary files /dev/null and b/image/collectiing/bns_2.png differ
diff --git a/image/collectiing/bns_3.png b/image/collectiing/bns_3.png
new file mode 100644
index 00000000..3e9a333e
Binary files /dev/null and b/image/collectiing/bns_3.png differ
diff --git a/image/collectiing/bns_4.png b/image/collectiing/bns_4.png
new file mode 100644
index 00000000..d2e8e5eb
Binary files /dev/null and b/image/collectiing/bns_4.png differ
diff --git a/image/collectiing/bns_5.png b/image/collectiing/bns_5.png
new file mode 100644
index 00000000..838c13ae
Binary files /dev/null and b/image/collectiing/bns_5.png differ
diff --git a/image/collectiing/bns_6.png b/image/collectiing/bns_6.png
new file mode 100644
index 00000000..b6347019
Binary files /dev/null and b/image/collectiing/bns_6.png differ
diff --git a/image/collectiing/bns_7.png b/image/collectiing/bns_7.png
new file mode 100644
index 00000000..d451525e
Binary files /dev/null and b/image/collectiing/bns_7.png differ
diff --git a/image/collectiing/bns_8.png b/image/collectiing/bns_8.png
new file mode 100644
index 00000000..29e585e0
Binary files /dev/null and b/image/collectiing/bns_8.png differ
diff --git a/image/collectiing/bns_9.png b/image/collectiing/bns_9.png
new file mode 100644
index 00000000..e9eedf3a
Binary files /dev/null and b/image/collectiing/bns_9.png differ
diff --git a/image/collectiing/bns_back-1.png b/image/collectiing/bns_back-1.png
new file mode 100644
index 00000000..364ad356
Binary files /dev/null and b/image/collectiing/bns_back-1.png differ
diff --git a/image/collectiing/bp_back2.png b/image/collectiing/bp_back2.png
new file mode 100644
index 00000000..2c5476ad
Binary files /dev/null and b/image/collectiing/bp_back2.png differ
diff --git a/image/collectiing/bp_confirm2.png b/image/collectiing/bp_confirm2.png
new file mode 100644
index 00000000..946fa4d3
Binary files /dev/null and b/image/collectiing/bp_confirm2.png differ
diff --git a/image/collectiing/bp_door_open.png b/image/collectiing/bp_door_open.png
new file mode 100644
index 00000000..2b9eb387
Binary files /dev/null and b/image/collectiing/bp_door_open.png differ
diff --git a/image/collectiing/bps_0.png b/image/collectiing/bps_0.png
new file mode 100644
index 00000000..1ac3ea5f
Binary files /dev/null and b/image/collectiing/bps_0.png differ
diff --git a/image/collectiing/bps_1.png b/image/collectiing/bps_1.png
new file mode 100644
index 00000000..821cebd0
Binary files /dev/null and b/image/collectiing/bps_1.png differ
diff --git a/image/collectiing/bps_2.png b/image/collectiing/bps_2.png
new file mode 100644
index 00000000..feb4bad4
Binary files /dev/null and b/image/collectiing/bps_2.png differ
diff --git a/image/collectiing/bps_3.png b/image/collectiing/bps_3.png
new file mode 100644
index 00000000..e83ff732
Binary files /dev/null and b/image/collectiing/bps_3.png differ
diff --git a/image/collectiing/bps_4.png b/image/collectiing/bps_4.png
new file mode 100644
index 00000000..244d4143
Binary files /dev/null and b/image/collectiing/bps_4.png differ
diff --git a/image/collectiing/bps_5.png b/image/collectiing/bps_5.png
new file mode 100644
index 00000000..722bcfcd
Binary files /dev/null and b/image/collectiing/bps_5.png differ
diff --git a/image/collectiing/bps_6.png b/image/collectiing/bps_6.png
new file mode 100644
index 00000000..ab6e2fe7
Binary files /dev/null and b/image/collectiing/bps_6.png differ
diff --git a/image/collectiing/bps_7.png b/image/collectiing/bps_7.png
new file mode 100644
index 00000000..64c2806f
Binary files /dev/null and b/image/collectiing/bps_7.png differ
diff --git a/image/collectiing/bps_8.png b/image/collectiing/bps_8.png
new file mode 100644
index 00000000..ff57475d
Binary files /dev/null and b/image/collectiing/bps_8.png differ
diff --git a/image/collectiing/bps_9.png b/image/collectiing/bps_9.png
new file mode 100644
index 00000000..41e3c648
Binary files /dev/null and b/image/collectiing/bps_9.png differ
diff --git a/image/collectiing/bps_back-1.png b/image/collectiing/bps_back-1.png
new file mode 100644
index 00000000..063d63d0
Binary files /dev/null and b/image/collectiing/bps_back-1.png differ
diff --git a/image/collectiing/img5.png b/image/collectiing/img5.png
new file mode 100644
index 00000000..53560d9d
Binary files /dev/null and b/image/collectiing/img5.png differ
diff --git a/image/collectiing/img_popup12.png b/image/collectiing/img_popup12.png
new file mode 100644
index 00000000..f1382367
Binary files /dev/null and b/image/collectiing/img_popup12.png differ
diff --git a/image/collectiing/text22.png b/image/collectiing/text22.png
new file mode 100644
index 00000000..d4c3c5ad
Binary files /dev/null and b/image/collectiing/text22.png differ
diff --git a/image/collectiing/textRefundChannel1.png b/image/collectiing/textRefundChannel1.png
new file mode 100644
index 00000000..f2986342
Binary files /dev/null and b/image/collectiing/textRefundChannel1.png differ
diff --git a/image/collectiing/textRefundChannel2.png b/image/collectiing/textRefundChannel2.png
new file mode 100644
index 00000000..0a84f96d
Binary files /dev/null and b/image/collectiing/textRefundChannel2.png differ
diff --git a/image/collectiing/textRefundChannel3.png b/image/collectiing/textRefundChannel3.png
new file mode 100644
index 00000000..e140e879
Binary files /dev/null and b/image/collectiing/textRefundChannel3.png differ
diff --git a/image/collectiing_en/Businessman_sorry.png b/image/collectiing_en/Businessman_sorry.png
new file mode 100644
index 00000000..92218611
Binary files /dev/null and b/image/collectiing_en/Businessman_sorry.png differ
diff --git a/image/collectiing_en/bn_back2.png b/image/collectiing_en/bn_back2.png
new file mode 100644
index 00000000..652fb6c8
Binary files /dev/null and b/image/collectiing_en/bn_back2.png differ
diff --git a/image/collectiing_en/bn_confirm2.png b/image/collectiing_en/bn_confirm2.png
new file mode 100644
index 00000000..9fd6c97b
Binary files /dev/null and b/image/collectiing_en/bn_confirm2.png differ
diff --git a/image/collectiing_en/bn_door_open.png b/image/collectiing_en/bn_door_open.png
new file mode 100644
index 00000000..d187683d
Binary files /dev/null and b/image/collectiing_en/bn_door_open.png differ
diff --git a/image/collectiing_en/bp_back2.png b/image/collectiing_en/bp_back2.png
new file mode 100644
index 00000000..8f3b69ca
Binary files /dev/null and b/image/collectiing_en/bp_back2.png differ
diff --git a/image/collectiing_en/bp_confirm2.png b/image/collectiing_en/bp_confirm2.png
new file mode 100644
index 00000000..280a0d2c
Binary files /dev/null and b/image/collectiing_en/bp_confirm2.png differ
diff --git a/image/collectiing_en/bp_door_open.png b/image/collectiing_en/bp_door_open.png
new file mode 100644
index 00000000..51188674
Binary files /dev/null and b/image/collectiing_en/bp_door_open.png differ
diff --git a/image/collectiing_en/img5.png b/image/collectiing_en/img5.png
new file mode 100644
index 00000000..53560d9d
Binary files /dev/null and b/image/collectiing_en/img5.png differ
diff --git a/image/collectiing_en/img_popup12.png b/image/collectiing_en/img_popup12.png
new file mode 100644
index 00000000..f1382367
Binary files /dev/null and b/image/collectiing_en/img_popup12.png differ
diff --git a/image/collectiing_en/text22.png b/image/collectiing_en/text22.png
new file mode 100644
index 00000000..9a8994a9
Binary files /dev/null and b/image/collectiing_en/text22.png differ
diff --git a/image/collectiing_en/textRefundChannel1.png b/image/collectiing_en/textRefundChannel1.png
new file mode 100644
index 00000000..f90616d8
Binary files /dev/null and b/image/collectiing_en/textRefundChannel1.png differ
diff --git a/image/collectiing_en/textRefundChannel2.png b/image/collectiing_en/textRefundChannel2.png
new file mode 100644
index 00000000..4820a825
Binary files /dev/null and b/image/collectiing_en/textRefundChannel2.png differ
diff --git a/image/collectiing_en/textRefundChannel3.png b/image/collectiing_en/textRefundChannel3.png
new file mode 100644
index 00000000..431819b4
Binary files /dev/null and b/image/collectiing_en/textRefundChannel3.png differ
diff --git a/image/page_payment/QRError.png b/image/page_payment/QRError.png
new file mode 100644
index 00000000..ca9f7a51
Binary files /dev/null and b/image/page_payment/QRError.png differ
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index d9d2a10b..75ca6230 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -114,20 +114,21 @@
Else
SAVELOG "back_to_main from line > 116."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
Else
If ActionOKCase = 2 Then
SAVELOG "back_to_main from line > 123."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
EndIf
If waitAckPay = 1 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
+
EndIf
@@ -171,14 +172,14 @@
Else
SAVELOG "back_to_main from line > 173."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
Else
If ActionOKCase = 2 Then
SAVELOG "back_to_main from line > 180."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
EndIf
@@ -217,7 +218,7 @@
If Timeout > 540 Then
SAVELOG "back_to_main from line > 217."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
@@ -241,7 +242,7 @@
If Timeout > 60 Then
SAVELOG "back_to_main from line > 241."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
EndIf
@@ -314,7 +315,7 @@
If ActionOKCase = 0 Then
Var SVT = "coffee"
- Var ACC = "089999999"
+ Var ACC = "0899999999"
Var PayDetail = "1/" + HURR_FOREVER
Var PayDetail = PayDetail + "/"
@@ -331,7 +332,7 @@
Var ActionOKCase = 1
If CodeChannel = 0 Then
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
Var waitAckPay = 2
@@ -506,7 +507,7 @@
If MachineStage = "close-maintenance" Then
SAVELOG "back_to_main from line > 488."
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
EndIf
If MachineStage = "drink-success" Then
diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml
index 2a476fcd..397d2822 100644
--- a/xml/page_check_member.xml
+++ b/xml/page_check_member.xml
@@ -6,7 +6,7 @@
"0xEFEDEA"
SoundVolume
"Partial"
-
+2
; On open
Var Timeout = 0
diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
new file mode 100644
index 00000000..c641a6db
--- /dev/null
+++ b/xml/page_drinkfail2.xml
@@ -0,0 +1,542 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xEFEDEA"
+ SoundVolume
+ "Partial"
+
+ ; On open
+
+
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/collectiing/"
+ EndIf
+
+
+ Var Timeout = 0
+
+ If TNumberTaobinMember = "" Then
+
+ Else
+ If PayWithQR = 1 Then
+ Var VendingTSID = VendingTSIDTmp
+ EndIf
+
+
+ Var BmiYear = PointTaobinStr
+ Var PointCrm = ""
+ If FromConsent = 1 Then
+ Var PointCrm = "pdpa1"
+ EndIf
+ Var GetScore = VendingTSID
+ If TaobinErrorNetwork = 0 Then
+ AddData 11 TNumberTaobinMember BmiYear PointCrm GetScore
+ Else
+ Var PointCrm = ""
+ AddData 14 TNumberTaobinMember BmiYear PointCrm GetScore
+ EndIf
+ Var TNumberTaobinMember = ""
+ Var VendingTSID = ""
+ EndIf
+
+ StopLongPlay
+
+ Var TelephoneNumberProblem = ""
+ Var ShowTextNumber = "Enable"
+ Var Tel_Confirm_State = "Disable"
+
+ Var MachineErrorDetailAll = MachineErrorDetail + " / "
+ Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+
+
+
+ If show_eng = "true" Then
+ Var textRefundChannelX = "textRefundChannel1.png"
+ Var xRefundChannelX = 249
+
+ If PayWithQR = 0 Then
+
+ If StoreCreditFlag = 1 Then
+ Var textRefundChannelX = "textRefundChannel2.png"
+ Var xRefundChannelX = 249
+ EndIf
+
+ If CodeChannel = 1 Then
+ Var textRefundChannelX = "textRefundChannel3.png"
+ Var xRefundChannelX = 60
+ EndIf
+
+ Else
+ Var textRefundChannelX = "textRefundChannel3.png"
+ Var xRefundChannelX = 60
+ EndIf
+
+ Else
+ Var textRefundChannelX = "textRefundChannel1.png"
+ Var xRefundChannelX = 204
+
+ If PayWithQR = 0 Then
+
+ If StoreCreditFlag = 1 Then
+ Var textRefundChannelX = "textRefundChannel2.png"
+ Var xRefundChannelX = 256
+ EndIf
+
+ If CodeChannel = 1 Then
+ Var textRefundChannelX = "textRefundChannel3.png"
+ Var xRefundChannelX = 162
+ EndIf
+
+ Else
+ Var textRefundChannelX = "textRefundChannel3.png"
+ Var xRefundChannelX = 162
+ EndIf
+ EndIf
+
+
+
+ 1000
+
+
+
+
+ Var Timeout = Timeout + 1
+
+ If Timeout > 120 Then
+ If MachineStage = "remove-cup" Then
+ Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+ EndIf
+
+
+
+ TimerReset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xRefundChannelX
+ 960
+ Var( DirImage + textRefundChannelX )
+
+
+
+ 47
+ 428
+ Var( DirImage + "/text22.png" )
+
+
+
+ 341
+ 524
+ Var( DirImage + "/Businessman_sorry.png" )
+
+
+
+
+
+ 262
+ 1119
+ Var( DirImage + "/img5.png" )
+
+
+
+ 400
+ 1160
+ ShowTextNumber
+ "Enable"
+ Var( DirImage + "/text15.png" )
+
+
+
+ 293
+ 1140
+ ShowTextNumber
+ "Enable"
+ Var( DirImage + "/Group.png" )
+
+
+
+ 0
+ 1140
+ 1080
+ Center
+ 62
+ RobotoBlack
+ 0x513C2F
+ "Enable"
+ TelephoneNumberProblem
+ Telnum
+
+
+
+
+
+
+ 5
+ 1868
+ 24
+ Center
+ 1080
+ RobotoRegular
+ 0xDE794E
+ MachineErrorDetailAll
+
+
+
+
+
+
diff --git a/xml/page_drinkfail3.xml b/xml/page_drinkfail3.xml
new file mode 100644
index 00000000..de99d2ca
--- /dev/null
+++ b/xml/page_drinkfail3.xml
@@ -0,0 +1,117 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xEFEDEA"
+ SoundVolume
+
+
+ ; On open
+
+
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/collectiing/"
+ EndIf
+
+
+ Var Timeout = 0
+
+ Var Door_Open_State="Invisible"
+ Var Door_Open_flagBlink = 0
+
+
+
+
+
+ 1000
+
+
+
+
+ Var Timeout = Timeout + 1
+
+ ;If Timeout > 240 Then
+ If Timeout > 10 Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+
+ If Door_Open_flagBlink = 0 Then
+ Var Door_Open_flagBlink = 1
+ Var Door_Open_State="Enable"
+ Else
+ Var Door_Open_flagBlink = 0
+ Var Door_Open_State="Invisible"
+ EndIf
+
+
+ If MachineStage = "remove-cup" Then
+
+ Else
+ ;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
+
+
+ Refresh
+ TimerReset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 53
+ 473
+ Var( DirImage + "/img_popup12.png" )
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 993a7276..7fbe877f 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -273,6 +273,8 @@
EndIf
If ReqPayInfoFlag = 1 Then
+ Var CashTextWarning = ""
+ Var QRErrorState = "Invisible"
Var QRCODE99 = SessionID
Var QRCODE99 = QRCODE99 + Ext1a
SAVELOG Ext1a
@@ -303,6 +305,7 @@
If Timeout >= 120 Then
Var alphaState = "Invisible"
+ Var PayState3 = "Disable"
EndIf
@@ -750,20 +753,28 @@
If CoinInFlag = 0 Then
If CancelFlag = 0 Then
- Var FlagQROpened = 1
- Var alphaState = "Enable"
- ;CoinVending OFF
- VendingQR ON
- Refresh
- If CoinAmount > 0 Then
- Change CoinAmount
- Var ChangeOK = 0
- Var CancelFlag = 1
- Var CancelCounter = 0
- Var NoGotoMenupage = "true"
-
- EndIf
+ Var FlagQROpened = 1
+ Var alphaState = "Enable"
+ ;CoinVending OFF
+ VendingQR ON
+ If QRCODE99 = "" Then
+ Var CashTextWarning = "ระบบ Promtpay ไม่สามารถใช้งานได้ในขณะนี้"
+ Var QRErrorState = "Enable"
+ Else
+ Var CashTextWarning = ""
+ Var QRErrorState = "Invisible"
+ EndIf
+ Refresh
+
+ If CoinAmount > 0 Then
+ Change CoinAmount
+ Var ChangeOK = 0
+ Var CancelFlag = 1
+ Var CancelCounter = 0
+ Var NoGotoMenupage = "true"
+
+ EndIf
EndIf
EndIf
EndIf
@@ -820,6 +831,7 @@
;VendingQR OFF
+
If CoinInOK = 0 Then
If CancelFlag = 0 Then
@@ -912,6 +924,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
;CoinVending ON
;VendingQR OFF
@@ -1040,7 +1053,17 @@
;
-
+
+ 270
+ 1000
+550
+ Center
+ 30
+ KanitRegularTTF
+ alphaState
+ 0xFF0000
+ CashTextWarning
+
@@ -1052,6 +1075,18 @@
testservice
+
+
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 13047f3b..99ac8776 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -9,6 +9,7 @@
"Partial"
; On open
+ Var FreeVendingCampaign = 0
Var Timeout = 0
diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml
index 5e0cf697..0b52a430 100644
--- a/xml/page_payment_storeCredit.xml
+++ b/xml/page_payment_storeCredit.xml
@@ -43,7 +43,11 @@
If pageStoreCredit0 = 1 Then
Change StoreCreditAmount
Var ChangeFlag2 = 1
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
Else
CoinVending BILLREJECT
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@@ -572,7 +576,11 @@
Change StoreCreditAmount
Var ChangeFlag2 = 1
Var TNumberTaobinCredit = ""
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
Else
CoinVending BILLREJECT
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml
index 84bf2002..06e3e4ba 100644
--- a/xml/page_payment_storeCredit0.xml
+++ b/xml/page_payment_storeCredit0.xml
@@ -43,7 +43,11 @@
Change StoreCreditAmount
Var ChangeFlag2 = 1
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
EndIf
@@ -116,7 +120,11 @@
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
EndIf
diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml
index ed74ffec..6af1523c 100644
--- a/xml/page_payment_storeCredit3.xml
+++ b/xml/page_payment_storeCredit3.xml
@@ -41,7 +41,12 @@
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
+
Else
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 826c053a..c6240cd0 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -116,12 +116,20 @@
Else
If StoreCreditFlag = 1 Then
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
Else
If GotoStoreCredit0 = 1 Then
Open "ROOT/taobin_project/xml/page_payment_storeCredit0.xml"
Else
- Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ If FreeVendingCampaign = 1 Then
+ Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+ Else
+ Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+ EndIf
EndIf
EndIf