diff --git a/image/collectiing/bd_pay_with_cashAli.png b/image/collectiing/bd_pay_with_cashAli.png
new file mode 100644
index 00000000..c15cd3e3
Binary files /dev/null and b/image/collectiing/bd_pay_with_cashAli.png differ
diff --git a/image/collectiing/bd_pay_with_cashUnion.png b/image/collectiing/bd_pay_with_cashUnion.png
new file mode 100644
index 00000000..ef366e2f
Binary files /dev/null and b/image/collectiing/bd_pay_with_cashUnion.png differ
diff --git a/image/collectiing/bn_pay_with_cashAli.png b/image/collectiing/bn_pay_with_cashAli.png
new file mode 100644
index 00000000..ec2d740e
Binary files /dev/null and b/image/collectiing/bn_pay_with_cashAli.png differ
diff --git a/image/collectiing/bn_pay_with_cashUnion.png b/image/collectiing/bn_pay_with_cashUnion.png
new file mode 100644
index 00000000..462d87e0
Binary files /dev/null and b/image/collectiing/bn_pay_with_cashUnion.png differ
diff --git a/image/collectiing/bp_pay_with_cashAli.png b/image/collectiing/bp_pay_with_cashAli.png
new file mode 100644
index 00000000..79ebf7f9
Binary files /dev/null and b/image/collectiing/bp_pay_with_cashAli.png differ
diff --git a/image/collectiing/bp_pay_with_cashUnion.png b/image/collectiing/bp_pay_with_cashUnion.png
new file mode 100644
index 00000000..c4e51261
Binary files /dev/null and b/image/collectiing/bp_pay_with_cashUnion.png differ
diff --git a/image/drink_option_aus/blend.png b/image/drink_option_aus/blend.png
new file mode 100644
index 00000000..46f014dc
Binary files /dev/null and b/image/drink_option_aus/blend.png differ
diff --git a/image/drink_option_aus/blend_db.png b/image/drink_option_aus/blend_db.png
new file mode 100644
index 00000000..2df87af3
Binary files /dev/null and b/image/drink_option_aus/blend_db.png differ
diff --git a/image/drink_option_aus/cold.png b/image/drink_option_aus/cold.png
new file mode 100644
index 00000000..4076f2ae
Binary files /dev/null and b/image/drink_option_aus/cold.png differ
diff --git a/image/drink_option_aus/cold_db.png b/image/drink_option_aus/cold_db.png
new file mode 100644
index 00000000..df8ff639
Binary files /dev/null and b/image/drink_option_aus/cold_db.png differ
diff --git a/image/drink_option_aus/hot.png b/image/drink_option_aus/hot.png
new file mode 100644
index 00000000..8ea602b0
Binary files /dev/null and b/image/drink_option_aus/hot.png differ
diff --git a/image/drink_option_aus/hot_db.png b/image/drink_option_aus/hot_db.png
new file mode 100644
index 00000000..c27311a8
Binary files /dev/null and b/image/drink_option_aus/hot_db.png differ
diff --git a/image/drink_option_aus/normal.png b/image/drink_option_aus/normal.png
new file mode 100644
index 00000000..82a1b3be
Binary files /dev/null and b/image/drink_option_aus/normal.png differ
diff --git a/image/drink_option_aus/option_deactive.png b/image/drink_option_aus/option_deactive.png
new file mode 100644
index 00000000..f141d74c
Binary files /dev/null and b/image/drink_option_aus/option_deactive.png differ
diff --git a/image/page_payment/img_popup20.png b/image/page_payment/img_popup20.png
new file mode 100644
index 00000000..4a8483b6
Binary files /dev/null and b/image/page_payment/img_popup20.png differ
diff --git a/image/page_payment/img_popup21.png b/image/page_payment/img_popup21.png
new file mode 100644
index 00000000..8ed2dc99
Binary files /dev/null and b/image/page_payment/img_popup21.png differ
diff --git a/image/page_payment_en/page_payment/img_popup20.png b/image/page_payment_en/page_payment/img_popup20.png
new file mode 100644
index 00000000..c57994d0
Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup20.png differ
diff --git a/image/page_payment_en/page_payment/img_popup21.png b/image/page_payment_en/page_payment/img_popup21.png
new file mode 100644
index 00000000..fcd2bad5
Binary files /dev/null and b/image/page_payment_en/page_payment/img_popup21.png differ
diff --git a/inter/aus/xml/menu_catalog_default_init.lxml b/inter/aus/xml/menu_catalog_default_init.lxml
index 7a298408..279a53f0 100644
--- a/inter/aus/xml/menu_catalog_default_init.lxml
+++ b/inter/aus/xml/menu_catalog_default_init.lxml
@@ -32,7 +32,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
diff --git a/inter/aus/xml/menu_catalog_new.lxml b/inter/aus/xml/menu_catalog_new.lxml
index bd632202..70469eea 100644
--- a/inter/aus/xml/menu_catalog_new.lxml
+++ b/inter/aus/xml/menu_catalog_new.lxml
@@ -101,6 +101,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_appfast.lxml b/inter/aus/xml/page_catalog_group_appfast.lxml
index e9a49c1f..e0694b75 100644
--- a/inter/aus/xml/page_catalog_group_appfast.lxml
+++ b/inter/aus/xml/page_catalog_group_appfast.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -260,6 +260,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_coffee.lxml b/inter/aus/xml/page_catalog_group_coffee.lxml
index c4c64531..b45c5f6c 100644
--- a/inter/aus/xml/page_catalog_group_coffee.lxml
+++ b/inter/aus/xml/page_catalog_group_coffee.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -252,6 +252,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_forkid.lxml b/inter/aus/xml/page_catalog_group_forkid.lxml
index ab482f8d..cdefe583 100644
--- a/inter/aus/xml/page_catalog_group_forkid.lxml
+++ b/inter/aus/xml/page_catalog_group_forkid.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -261,6 +261,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_health.lxml b/inter/aus/xml/page_catalog_group_health.lxml
index 6eac51b1..7a04d30d 100644
--- a/inter/aus/xml/page_catalog_group_health.lxml
+++ b/inter/aus/xml/page_catalog_group_health.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -252,6 +252,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml
index e5d9561f..791a711b 100644
--- a/inter/aus/xml/page_catalog_group_milk.lxml
+++ b/inter/aus/xml/page_catalog_group_milk.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -250,6 +250,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_other.lxml b/inter/aus/xml/page_catalog_group_other.lxml
index 2791b2be..97e409c7 100644
--- a/inter/aus/xml/page_catalog_group_other.lxml
+++ b/inter/aus/xml/page_catalog_group_other.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -251,6 +251,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_recommend.lxml b/inter/aus/xml/page_catalog_group_recommend.lxml
index ea644c35..73108fc1 100644
--- a/inter/aus/xml/page_catalog_group_recommend.lxml
+++ b/inter/aus/xml/page_catalog_group_recommend.lxml
@@ -258,6 +258,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_tea.lxml b/inter/aus/xml/page_catalog_group_tea.lxml
index 05e63ceb..a46a0bbc 100644
--- a/inter/aus/xml/page_catalog_group_tea.lxml
+++ b/inter/aus/xml/page_catalog_group_tea.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -252,6 +252,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/inter/aus/xml/page_catalog_group_whey.lxml b/inter/aus/xml/page_catalog_group_whey.lxml
index 1fe34f24..1cf53c10 100644
--- a/inter/aus/xml/page_catalog_group_whey.lxml
+++ b/inter/aus/xml/page_catalog_group_whey.lxml
@@ -42,7 +42,7 @@
If CountryName = "Australia" Then
- Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
@@ -257,6 +257,13 @@
Var ice_tab_text = "Ice will be ready at "
EndIf
+ If CountryName = "Australia" Then
+ Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var ice_tab_text = "Ice will be ready at "
+ EndIf
+
SAVELOG "EventLanguageOnChange menu -list"
Refresh
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 797168f8..d7516c89 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -924,6 +924,92 @@
Var ReqPayInfoFlag = 8
EndIf
+ If web_payment = "ALIPAY" Then
+
+ Var QR_POPUP = "/img_popup20.png"
+ Var LOADING_STATE = "Enable"
+
+ Var FlagQROpened = 1
+ Var alphaState = "Enable"
+ ;CoinVending OFF
+ VendingQR ON
+
+
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + Seeker.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 + "ALP:2/"
+
+
+ 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 = 9
+ EndIf
+
+ If web_payment = "UNIONPAY" Then
+
+ Var QR_POPUP = "/img_popup21.png"
+ Var LOADING_STATE = "Enable"
+
+ Var FlagQROpened = 1
+ Var alphaState = "Enable"
+ ;CoinVending OFF
+ VendingQR ON
+
+
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + Seeker.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 + "UNP:2/"
+
+
+ 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 = 10
+ EndIf
+
@@ -1014,6 +1100,12 @@
If ReqPayInfoFlag2 = 8 Then
Var Seeker.CampaignPayChanel = "wechat"
EndIf
+ If ReqPayInfoFlag2 = 9 Then
+ Var Seeker.CampaignPayChanel = "alipay"
+ EndIf
+ If ReqPayInfoFlag2 = 10 Then
+ Var Seeker.CampaignPayChanel = "unionpay"
+ EndIf
@@ -1410,6 +1502,93 @@
EndIf
EndIf
+
+ If ReqPayInfoFlag = 9 Then
+ If VendingQRTypeResult = "ALP:2" Then
+ Var CashTextWarning = ""
+ Var QRErrorState = "Invisible"
+ Var QRCODE99Shoppy = ""
+ Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
+ Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
+ SAVELOG Ext1a
+ SAVELOG QRCODE99Shoppy
+ Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
+ Var ReqPayInfoFlag = 0
+ Var ReqPayInfoFlag2 = 9
+ SAVELOG QRCODE99Shoppy
+ SAVELOG Ext21
+
+ DEBUGVAR QRCODE99Shoppy
+
+ Var QRCODE99 = QRCODE99Shoppy
+ Var LOADING_STATE = "Invisible"
+
+ If show_eng = "true" Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
+ Else
+ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+
+ ; Play Sound #zone
+ If SoundBackToSchoolEnable = 1 Then
+
+ If SoundBackToSchoolType = 1 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
+ EndIf
+ If SoundBackToSchoolType = 2 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
+ EndIf
+ Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav"
+ EndIf
+
+ Play PlaySoundLag
+ EndIf
+
+ EndIf
+ EndIf
+
+ If ReqPayInfoFlag = 10 Then
+ If VendingQRTypeResult = "UNP:2" Then
+ Var CashTextWarning = ""
+ Var QRErrorState = "Invisible"
+ Var QRCODE99Shoppy = ""
+ Var QRCODE99Shoppy = QRCODE99Shoppy + SessionID
+ Var QRCODE99Shoppy = QRCODE99Shoppy + Ext1a
+ SAVELOG Ext1a
+ SAVELOG QRCODE99Shoppy
+ Var QRCODE99Shoppy = QRCODE99Shoppy + Ext21
+ Var ReqPayInfoFlag = 0
+ Var ReqPayInfoFlag2 = 10
+ SAVELOG QRCODE99Shoppy
+ SAVELOG Ext21
+
+ DEBUGVAR QRCODE99Shoppy
+
+ Var QRCODE99 = QRCODE99Shoppy
+ Var LOADING_STATE = "Invisible"
+
+ If show_eng = "true" Then
+ PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
+ Else
+ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+
+ ; Play Sound #zone
+ If SoundBackToSchoolEnable = 1 Then
+
+ If SoundBackToSchoolType = 1 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/boy/"
+ EndIf
+ If SoundBackToSchoolType = 2 Then
+ Var RootPathSoundBackToSchool = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/girl/"
+ EndIf
+ Var PlaySoundLag = RootPathSoundBackToSchool + "Please_scan_to_pay_via_e-wallet.wav"
+ EndIf
+
+ Play PlaySoundLag
+ EndIf
+
+ EndIf
+ EndIf
+
Else
Var PayInfoCFlag = 1
EndIf
diff --git a/xml/page_payment_cashOther.xml b/xml/page_payment_cashOther.xml
index 78dec4a7..6d71dc91 100644
--- a/xml/page_payment_cashOther.xml
+++ b/xml/page_payment_cashOther.xml
@@ -161,7 +161,7 @@
158
567
- Var( DirImage + "/img_popup17.png")
+ Var( DirImage + "/img_popup16.png")
@@ -732,14 +732,63 @@
675
1189
"Enable"
- "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png"
- "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png"
- "ROOT/taobin_project/image/collectiing/bn_pay_with_codeXXX.png"
+ "ROOT/taobin_project/image/collectiing/bn_pay_with_cashAli.png"
+ "ROOT/taobin_project/image/collectiing/bp_pay_with_cashAli.png"
+ "ROOT/taobin_project/image/collectiing/bd_pay_with_cashAli.png"
"ROOT/sounds/codebuttom.wav"
SoundVolume
+ Var QR_POPUP = "/img_popup20.png"
+ Var LOADING_STATE = "Enable"
+ Var QRCODE99 = ""
+
+ Var FlagQROpened = 1
+ Var alphaState = "Enable"
+ ;CoinVending OFF
+ VendingQR ON
+
+
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + Seeker.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 + "ALP:2/"
+
+ ;If IntVendingCampaign > 0 Then
+ ; Var ECommerceQR = ECommerceQR + Seeker.VendingCode
+ ; Var ECommerceQR = ECommerceQR + ":"
+ ; Var ECommerceQR = ECommerceQR + Seeker.CodeNumber
+ ; Var ECommerceQR = ECommerceQR + ":"
+ ; Var ECommerceQR = ECommerceQR + Seeker.VendingCampaignRI3
+ ;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 = 9
+ Var ReqPayInfoFromCashOther = 1
+ Open "ROOT/taobin_project/xml/page_payment_cash.xml"
@@ -767,9 +816,91 @@
+
+
+
+