diff --git a/image/collectiing/bn_sh.png b/image/collectiing/bn_sh.png
new file mode 100644
index 00000000..d5fe2e1a
Binary files /dev/null and b/image/collectiing/bn_sh.png differ
diff --git a/image/collectiing/bp_sh.png b/image/collectiing/bp_sh.png
new file mode 100644
index 00000000..6e95bea2
Binary files /dev/null and b/image/collectiing/bp_sh.png differ
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index dc3a6258..f023fd76 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -227,7 +227,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -288,7 +288,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -406,7 +406,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml
index 98cdff2b..9c2fbff6 100644
--- a/xml/page_brewing3Conti.xml
+++ b/xml/page_brewing3Conti.xml
@@ -130,7 +130,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -191,7 +191,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -309,7 +309,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
diff --git a/xml/page_brewing3Multi.xml b/xml/page_brewing3Multi.xml
index d9b5fefa..17f0e1ca 100644
--- a/xml/page_brewing3Multi.xml
+++ b/xml/page_brewing3Multi.xml
@@ -226,7 +226,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -285,7 +285,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
@@ -396,7 +396,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 1aae7daf..413d2ad4 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -627,7 +627,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml
index 6ff81431..afa9d21b 100644
--- a/xml/page_payment_cashMore.xml
+++ b/xml/page_payment_cashMore.xml
@@ -543,7 +543,7 @@
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + SelectDrink
Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + Seeker.VendingCode
Var ECommerce = ECommerce + "/"
Var ECommerce = ECommerce + Seeker.CodeNumber
Var ECommerce = ECommerce + "/"
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index f5208d61..cc2106cc 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -91,11 +91,17 @@
EndIf
+ Var Mode# = 0
+ Var Str# = ""
+ Var TelephoneNumber# = ""
+
1000
;Open "ROOT/xml/page_board.xml"
+
+
Var Timeout = Timeout + 1
If Timeout > 30 Then
;VendingQR OFF
@@ -166,7 +172,11 @@
Var Seeker.VendingCode = "C00"
EndIf
- If Seeker.VendingCode = "AIR" Then
+ If Seeker.VendingCode = "AIR:2" Then
+ Var Seeker.VendingCode = "C00"
+ EndIf
+
+ If Seeker.VendingCode = "TWN:2" Then
Var Seeker.VendingCode = "C00"
EndIf
@@ -366,6 +376,9 @@
Var TelephoneNumber = TelephoneNumber + "1"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -388,6 +401,9 @@
Var TelephoneNumber = TelephoneNumber + "2"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -410,6 +426,9 @@
Var TelephoneNumber = TelephoneNumber + "3"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -432,6 +451,9 @@
Var TelephoneNumber = TelephoneNumber + "4"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -454,6 +476,9 @@
Var TelephoneNumber = TelephoneNumber + "5"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -476,6 +501,9 @@
Var TelephoneNumber = TelephoneNumber + "6"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -498,6 +526,9 @@
Var TelephoneNumber = TelephoneNumber + "7"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -520,6 +551,9 @@
Var TelephoneNumber = TelephoneNumber + "8"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -542,6 +576,9 @@
Var TelephoneNumber = TelephoneNumber + "9"
Var ShowTextNumber = "Invisible"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
TimerReset
Refresh
StrLen TelephoneNumber TelNumLen
@@ -563,6 +600,9 @@
Var Timeout = 0
Var TelephoneNumber = TelephoneNumber + "0"
Trim TelephoneNumber 8
+
+ Var TelephoneNumber# = Str# + TelephoneNumber
+
StrLen TelephoneNumber TelNumLen
If TelNumLen >= 8 Then
Var Tel_Confirm_State = "Enable"
@@ -575,6 +615,32 @@
+
+