diff --git a/image/bn_back_to_school.png b/image/bn_back_to_school.png
new file mode 100644
index 00000000..738cf83c
Binary files /dev/null and b/image/bn_back_to_school.png differ
diff --git a/image/bn_back_to_school_en.png b/image/bn_back_to_school_en.png
new file mode 100644
index 00000000..29072d50
Binary files /dev/null and b/image/bn_back_to_school_en.png differ
diff --git a/image/bn_oreo_buy2_save_move.png b/image/bn_oreo_buy2_save_move.png
new file mode 100644
index 00000000..8625b7c7
Binary files /dev/null and b/image/bn_oreo_buy2_save_move.png differ
diff --git a/image/bn_oreo_buy2_save_move_en.png b/image/bn_oreo_buy2_save_move_en.png
new file mode 100644
index 00000000..72e6ae74
Binary files /dev/null and b/image/bn_oreo_buy2_save_move_en.png differ
diff --git a/image/event/bn_back_to_school.png b/image/event/bn_back_to_school.png
new file mode 100644
index 00000000..49ae9cf6
Binary files /dev/null and b/image/event/bn_back_to_school.png differ
diff --git a/image/event/bn_back_to_school_en.png b/image/event/bn_back_to_school_en.png
new file mode 100644
index 00000000..774c0052
Binary files /dev/null and b/image/event/bn_back_to_school_en.png differ
diff --git a/image/event/bn_oreo_buy2_save_move.png b/image/event/bn_oreo_buy2_save_move.png
new file mode 100644
index 00000000..eb5bd249
Binary files /dev/null and b/image/event/bn_oreo_buy2_save_move.png differ
diff --git a/image/event/bn_oreo_buy2_save_move_en.png b/image/event/bn_oreo_buy2_save_move_en.png
new file mode 100644
index 00000000..471d1fd5
Binary files /dev/null and b/image/event/bn_oreo_buy2_save_move_en.png differ
diff --git a/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png b/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png
new file mode 100644
index 00000000..dc56dc08
Binary files /dev/null and b/image/page_drink_picture2_n/bn_oreo_vo_weekend_special.png differ
diff --git a/image/page_drink_picture2_n/bn_save_buy2_oreo_volcano.png b/image/page_drink_picture2_n/bn_save_buy2_oreo_volcano.png
new file mode 100644
index 00000000..cd38672f
Binary files /dev/null and b/image/page_drink_picture2_n/bn_save_buy2_oreo_volcano.png differ
diff --git a/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav b/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav
new file mode 100644
index 00000000..fda9876c
Binary files /dev/null and b/sound_thai/boy/Please_scan_to_pay_via_e-wallet.wav differ
diff --git a/sound_thai/boy/Please_scan_to_pay_via_mobile.wav b/sound_thai/boy/Please_scan_to_pay_via_mobile.wav
new file mode 100644
index 00000000..961c3df0
Binary files /dev/null and b/sound_thai/boy/Please_scan_to_pay_via_mobile.wav differ
diff --git a/sound_thai/boy/drinkfinish.wav b/sound_thai/boy/drinkfinish.wav
new file mode 100644
index 00000000..08ba8238
Binary files /dev/null and b/sound_thai/boy/drinkfinish.wav differ
diff --git a/sound_thai/boy/drinkfinish_no_straw.wav b/sound_thai/boy/drinkfinish_no_straw.wav
new file mode 100644
index 00000000..4bc861bd
Binary files /dev/null and b/sound_thai/boy/drinkfinish_no_straw.wav differ
diff --git a/sound_thai/boy/next_drink.wav b/sound_thai/boy/next_drink.wav
new file mode 100644
index 00000000..a8358cb9
Binary files /dev/null and b/sound_thai/boy/next_drink.wav differ
diff --git a/sound_thai/boy/payment.wav b/sound_thai/boy/payment.wav
new file mode 100644
index 00000000..2d20f781
Binary files /dev/null and b/sound_thai/boy/payment.wav differ
diff --git a/sound_thai/boy/select_level.wav b/sound_thai/boy/select_level.wav
new file mode 100644
index 00000000..b5e4f5a0
Binary files /dev/null and b/sound_thai/boy/select_level.wav differ
diff --git a/sound_thai/boy/taobin_sawade.wav b/sound_thai/boy/taobin_sawade.wav
new file mode 100644
index 00000000..99330e78
Binary files /dev/null and b/sound_thai/boy/taobin_sawade.wav differ
diff --git a/sound_thai/boy/thankyou.wav b/sound_thai/boy/thankyou.wav
new file mode 100644
index 00000000..697542dd
Binary files /dev/null and b/sound_thai/boy/thankyou.wav differ
diff --git a/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav b/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav
new file mode 100644
index 00000000..32edbf2c
Binary files /dev/null and b/sound_thai/girl/Please_scan_to_pay_via_e-wallet.wav differ
diff --git a/sound_thai/girl/Please_scan_to_pay_via_mobile.wav b/sound_thai/girl/Please_scan_to_pay_via_mobile.wav
new file mode 100644
index 00000000..5b624050
Binary files /dev/null and b/sound_thai/girl/Please_scan_to_pay_via_mobile.wav differ
diff --git a/sound_thai/girl/drinkfinish.wav b/sound_thai/girl/drinkfinish.wav
new file mode 100644
index 00000000..6c78ee3a
Binary files /dev/null and b/sound_thai/girl/drinkfinish.wav differ
diff --git a/sound_thai/girl/drinkfinish_no_straw.wav b/sound_thai/girl/drinkfinish_no_straw.wav
new file mode 100644
index 00000000..91fff02a
Binary files /dev/null and b/sound_thai/girl/drinkfinish_no_straw.wav differ
diff --git a/sound_thai/girl/next_drink.wav b/sound_thai/girl/next_drink.wav
new file mode 100644
index 00000000..cf2da760
Binary files /dev/null and b/sound_thai/girl/next_drink.wav differ
diff --git a/sound_thai/girl/payment.wav b/sound_thai/girl/payment.wav
new file mode 100644
index 00000000..0df3c80c
Binary files /dev/null and b/sound_thai/girl/payment.wav differ
diff --git a/sound_thai/girl/select_level.wav b/sound_thai/girl/select_level.wav
new file mode 100644
index 00000000..9f0dc3f8
Binary files /dev/null and b/sound_thai/girl/select_level.wav differ
diff --git a/sound_thai/girl/taobin_sawade.wav b/sound_thai/girl/taobin_sawade.wav
new file mode 100644
index 00000000..28772611
Binary files /dev/null and b/sound_thai/girl/taobin_sawade.wav differ
diff --git a/sound_thai/girl/thankyou.wav b/sound_thai/girl/thankyou.wav
new file mode 100644
index 00000000..6f28342b
Binary files /dev/null and b/sound_thai/girl/thankyou.wav differ
diff --git a/sound_thai/sublang/north/drinkfinish.wav b/sound_thai/sublang/north/drinkfinish.wav
deleted file mode 100644
index 48e90e72..00000000
Binary files a/sound_thai/sublang/north/drinkfinish.wav and /dev/null differ
diff --git a/sound_thai/sublang/north/next_drink.wav b/sound_thai/sublang/north/next_drink.wav
deleted file mode 100644
index 94ce680b..00000000
Binary files a/sound_thai/sublang/north/next_drink.wav and /dev/null differ
diff --git a/sound_thai/sublang/north/payment.wav b/sound_thai/sublang/north/payment.wav
deleted file mode 100644
index b8b2b62a..00000000
Binary files a/sound_thai/sublang/north/payment.wav and /dev/null differ
diff --git a/sound_thai/sublang/north/select_level.wav b/sound_thai/sublang/north/select_level.wav
deleted file mode 100644
index 9ecf7911..00000000
Binary files a/sound_thai/sublang/north/select_level.wav and /dev/null differ
diff --git a/sound_thai/sublang/north/taobin_sawade.wav b/sound_thai/sublang/north/taobin_sawade.wav
deleted file mode 100644
index c7bad4c5..00000000
Binary files a/sound_thai/sublang/north/taobin_sawade.wav and /dev/null differ
diff --git a/sound_thai/sublang/north/thankyou.wav b/sound_thai/sublang/north/thankyou.wav
deleted file mode 100644
index 74bc3746..00000000
Binary files a/sound_thai/sublang/north/thankyou.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/drinkfinish.wav b/sound_thai/sublang/northeast/drinkfinish.wav
deleted file mode 100644
index 70a5144b..00000000
Binary files a/sound_thai/sublang/northeast/drinkfinish.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/next_drink.wav b/sound_thai/sublang/northeast/next_drink.wav
deleted file mode 100644
index 9ae6ba2b..00000000
Binary files a/sound_thai/sublang/northeast/next_drink.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/payment.wav b/sound_thai/sublang/northeast/payment.wav
deleted file mode 100644
index 52e09de0..00000000
Binary files a/sound_thai/sublang/northeast/payment.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/select_level.wav b/sound_thai/sublang/northeast/select_level.wav
deleted file mode 100644
index edc9239c..00000000
Binary files a/sound_thai/sublang/northeast/select_level.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/taobin_sawade.wav b/sound_thai/sublang/northeast/taobin_sawade.wav
deleted file mode 100644
index 642a65e8..00000000
Binary files a/sound_thai/sublang/northeast/taobin_sawade.wav and /dev/null differ
diff --git a/sound_thai/sublang/northeast/thankyou.wav b/sound_thai/sublang/northeast/thankyou.wav
deleted file mode 100644
index e4d7b56f..00000000
Binary files a/sound_thai/sublang/northeast/thankyou.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/drinkfinish.wav b/sound_thai/sublang/south/drinkfinish.wav
deleted file mode 100644
index 3987c2ab..00000000
Binary files a/sound_thai/sublang/south/drinkfinish.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/next_drink.wav b/sound_thai/sublang/south/next_drink.wav
deleted file mode 100644
index f28bbc5e..00000000
Binary files a/sound_thai/sublang/south/next_drink.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/payment.wav b/sound_thai/sublang/south/payment.wav
deleted file mode 100644
index 8b6579b0..00000000
Binary files a/sound_thai/sublang/south/payment.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/select_level.wav b/sound_thai/sublang/south/select_level.wav
deleted file mode 100644
index fc102cdb..00000000
Binary files a/sound_thai/sublang/south/select_level.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/taobin_sawade.wav b/sound_thai/sublang/south/taobin_sawade.wav
deleted file mode 100644
index b2477760..00000000
Binary files a/sound_thai/sublang/south/taobin_sawade.wav and /dev/null differ
diff --git a/sound_thai/sublang/south/thankyou.wav b/sound_thai/sublang/south/thankyou.wav
deleted file mode 100644
index 06e1eefb..00000000
Binary files a/sound_thai/sublang/south/thankyou.wav and /dev/null differ
diff --git a/xml/dummy_layout.inc b/xml/dummy_layout.inc
index e351b0d5..7c052ef4 100644
--- a/xml/dummy_layout.inc
+++ b/xml/dummy_layout.inc
@@ -493,7 +493,7 @@
22
225
296
- Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032)
+ Flag( 12-03-03-0032.Button, ,$Sum1203030032)
diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py
index cafc3647..f75e7170 100644
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@@ -211,14 +211,14 @@
out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
#out_xml( '\t\t\tVar PD_STAGE_2 = "Enable"\r\n')
- out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n')
+ out_xml( '\t\t\tTopping "Load" "'+ spl[5].replace("-alter", "") +'"\r\n')
out_xml( '\t\tElse\r\n')
out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
#out_xml( '\t\t\t\tVar PD_STAGE_1 = "Enable"\r\n')
- out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n')
+ out_xml( '\t\t\tTopping "Load" "'+ spl[4].replace("-alter", "") +'"\r\n')
out_xml( '\t\t\tElse\r\n')
#out_xml( '\t\t\t\tVar PD_STAGE_3 = "Enable"\r\n')
- out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n')
+ out_xml( '\t\t\tTopping "Load" "'+ spl[6].replace("-alter", "") +'"\r\n')
out_xml( '\t\t\tEndIf\r\n')
out_xml( '\t\tEndIf\r\n')
@@ -251,10 +251,7 @@
out_xml( '\t\t\r\n')
out_xml( '\t\t\r\n')
- if "inter" in param:
- out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
- else:
- out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select4.xml"\r\n')
+ out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
out_xml( '\t\t\r\n')
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 02ef2214..3b57ff6b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -679,6 +679,15 @@
Var SongkranEnable = 1
EndIf
EndIf
+
+ If SystemDateMonthInt = 5 Then
+ If SystemDateDayInt = 1 Then
+ Var SongkranEnable = 1
+ EndIf
+ If SystemDateDayInt = 2 Then
+ Var SongkranEnable = 1
+ EndIf
+ EndIf
If SongkranEnable = 1 Then
@@ -700,10 +709,18 @@
If BoxID = 200434 Then
Var SongkranEnable = 0
EndIf
+ If BoxID = 172644 Then
+ Var SongkranEnable = 0
+ EndIf
If BoxID = 172102 Then
Var SongkranEnable = 0
EndIf
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+
+ If BoxID = 200001 Then
+ Var OreoDueEnable = 0
+ EndIf
DEBUGVAR SoundThaiIndex
@@ -727,6 +744,19 @@
DEBUGVAR Not#CameraSettingStatus
RootLayoutVisible 3 "hide"
+
+ ; Init default
+ If SoundBackToSchoolType = "" Then
+ Var SoundBackToSchoolType = 1
+ EndIf
+ If SoundBackToSchoolType = 1 Then
+ Var SoundBackToSchoolType = 2
+ Else
+ Var SoundBackToSchoolType = 1
+ EndIf
+
+
+
@@ -844,12 +874,10 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-
- If SongkranEnable = 1 Then
- OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ Var OpenFromPageBoard = 1
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+
Machine DoorClose
@@ -884,9 +912,18 @@
;Var CupOnArm = "true"
If CupOnArm = "true" Then
- Var buttonRemoveCup = "Enable"
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
Else
- Var buttonRemoveCup = "Invisible"
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
EndIf
@@ -924,6 +961,7 @@
EndIf
+
Refresh
TimerReset
@@ -1136,6 +1174,9 @@
Machine RemoveCup
Machine DoorLidOpen
+
+ Var CheckCupStateDoorCupClose = "reset"
+ Var buttonRemoveCup = "Invisible"
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 3b12aa80..fe0056e6 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -69,14 +69,16 @@
Else
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/thankyou.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/thankyou.wav"
- EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/thankyou.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/thankyou.wav"
+ ; 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 + "thankyou.wav"
EndIf
Play PlaySoundLag
@@ -562,14 +564,17 @@
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/next_drink.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/next_drink.wav"
- EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/next_drink.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/next_drink.wav"
+
+ ; 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 + "next_drink.wav"
EndIf
PlayLong PlaySoundLag
diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml
index 7fcd181c..e1eb02ba 100644
--- a/xml/page_catalog2.xml
+++ b/xml/page_catalog2.xml
@@ -44,7 +44,8 @@
Var text_price_6 = ""
-
+
+ ; zone sound
; Clear value
Topping "clear" "-"
@@ -67,14 +68,16 @@
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/taobin_sawade.wav"
- EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/taobin_sawade.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/taobin_sawade.wav"
+ ; 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 + "taobin_sawade.wav"
EndIf
Play PlaySoundLag
@@ -204,6 +207,8 @@
EndIf
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
+
Var Price5Active = 0
@@ -237,7 +242,21 @@
EndIf
EndIf
-
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
Refresh
TimerReset
@@ -349,12 +368,8 @@
; zone promote
-
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+
@@ -581,7 +596,11 @@
"ROOT/taobin_project/image/main_page/bp_remove_cup.png"
Machine RemoveCup
- Machine DoorLidOpen
+ Machine DoorLidOpen
+
+ Var CheckCupStateDoorCupClose = "reset"
+ Var buttonRemoveCup = "Invisible"
+
@@ -633,5 +652,12 @@
Var SongkranEnable = 1
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_backToSchool.xml"
+
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/event/page_recommend_oreo_buy2_save_more.xml"
+
+
diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml
index 87249ffd..19b3fbe9 100644
--- a/xml/page_catalog_group_appfast.xml
+++ b/xml/page_catalog_group_appfast.xml
@@ -227,26 +227,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -328,12 +330,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml
index 371f1c3c..d4e8d641 100644
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@@ -219,26 +219,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -320,12 +322,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index cf45777c..07c256ca 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -219,26 +219,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -320,12 +322,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml
index e34f169e..0c7001d5 100644
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@@ -228,26 +228,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -329,12 +331,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml
index e6eff2b2..21cef35a 100644
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@@ -219,26 +219,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -320,12 +322,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_milk.skt b/xml/page_catalog_group_milk.skt
index 956e94f0..f0a9ce20 100644
--- a/xml/page_catalog_group_milk.skt
+++ b/xml/page_catalog_group_milk.skt
@@ -43,5 +43,7 @@
?>
-
+
diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml
index 2925894f..f3ed8dba 100644
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@@ -217,26 +217,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -318,12 +320,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
@@ -3287,15 +3285,15 @@ VOLCANO"
; - - -
; ==================> Len = 16
- ; - - 12-03-03-0009
+ ; - - 12-03-03-0032
33
22
225
296
- Flag( 12-03-03-0009.Button,$Sum1203030009)
+ Flag( 12-03-03-0032.Button,$Sum1203030032)
- $Sum1203030009
+ $Sum1203030032
"ROOT/taobin_project/image/page_drink_n//bn_super_oreo_volcano.png"
"ROOT/taobin_project/image/page_drink_press_n//bn_super_oreo_volcano.png"
"ROOT/taobin_project/image/page_drink_disable_n2//bn_super_oreo_volcano.png"
@@ -3310,13 +3308,13 @@ VOLCANO"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
- Var PriceD3 = $12-03-03-0009.Price
+ Var PriceD3 = $12-03-03-0032.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
- Var PD_CODE3 = "12-03-03-0009"
+ Var PD_CODE3 = "12-03-03-0032"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
- Var PD_STAGE_3 = $12-03-03-0009.Button
+ Var PD_STAGE_3 = $12-03-03-0032.Button
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
@@ -3337,7 +3335,7 @@ VOLCANO"
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
- Topping "Load" "12-03-03-0009"
+ Topping "Load" "12-03-03-0032"
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -3350,10 +3348,10 @@ VOLCANO"
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
- Var menu_name_eng_blender = $12-03-03-0009.NameE
- Var menu_desc_eng_blender = $12-03-03-0009.descriptionE
- Var menu_name_thai_blender = $12-03-03-0009.Name
- Var menu_desc_thai_blender = $12-03-03-0009.description
+ Var menu_name_eng_blender = $12-03-03-0032.NameE
+ Var menu_desc_eng_blender = $12-03-03-0032.descriptionE
+ Var menu_name_thai_blender = $12-03-03-0032.Name
+ Var menu_desc_thai_blender = $12-03-03-0032.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
@@ -3455,7 +3453,7 @@ VOLCANO"
264
Var( DirImage2 + "blend.png" )
Var( DirImage2 + "blend_db.png" )
- $12-03-03-0009.Button
+ $12-03-03-0032.Button
180
@@ -3465,8 +3463,8 @@ VOLCANO"
KanitRegularTTF
0x6F5F51
0xEAE6E1
- $12-03-03-0009.Button
- StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test
+ $12-03-03-0032.Button
+ StringFmt( $12-03-03-0032.Price , DisplayFormat, PreScaleConvertShow) ; test
81
@@ -3491,10 +3489,10 @@ VOLCANO"
117
eval(
- If $Sum1203030009 = "Disable" Then
+ If $Sum1203030032 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
- STRCONTAIN "ERR" $12-03-03-0009.TAG tag3_is_disable
+ STRCONTAIN "ERR" $12-03-03-0032.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
@@ -3530,7 +3528,7 @@ VOLCANO"
MITRegularTTF
0x5A5A5A
"disable-show"
- $Sum1203030009
+ $Sum1203030032
text_unavailable
center-vertical-horizontal
diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml
index a745108b..35051e89 100644
--- a/xml/page_catalog_group_oreo.xml
+++ b/xml/page_catalog_group_oreo.xml
@@ -215,26 +215,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -316,12 +318,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml
index 67213c45..ea7fd324 100644
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@@ -218,26 +218,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -319,12 +321,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt
index 681ce228..d4de5d16 100644
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@@ -70,6 +70,7 @@
Machine RemoveCup
Machine DoorLidOpen
+ Var buttonRemoveCup = "Invisible"
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 1c412bb5..058e3ec8 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -236,26 +236,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -337,12 +339,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
@@ -579,15 +577,15 @@
; menu_new_list 30
;TAGESP
; ==================> Len = 16
- ; - - 12-03-03-0009
+ ; - - 12-03-03-0032
33
22
225
296
- Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009)
+ Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032)
- $Sum1203030009
+ $Sum1203030032
"ROOT/taobin_project/image/page_drink_n//bn_super_oreo_volcano.png"
"ROOT/taobin_project/image/page_drink_press_n//bn_super_oreo_volcano.png"
"ROOT/taobin_project/image/page_drink_disable_n2//bn_super_oreo_volcano.png"
@@ -602,13 +600,13 @@
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $-.Price
Var PriceD2 = $-.Price
- Var PriceD3 = $12-03-03-0009.Price
+ Var PriceD3 = $12-03-03-0032.Price
Var PD_CODE1 = "##-##-##-####"
Var PD_CODE2 = "##-##-##-####"
- Var PD_CODE3 = "12-03-03-0009"
+ Var PD_CODE3 = "12-03-03-0032"
Var PD_STAGE_1 = "Disable2"
Var PD_STAGE_2 = "Disable2"
- Var PD_STAGE_3 = $12-03-03-0009.Button
+ Var PD_STAGE_3 = $12-03-03-0032.Button
Var SelectCountDrinkType = 0
Var DefaultDrinkType = 0
If PD_STAGE_1 = "Enable" Then
@@ -629,7 +627,7 @@
If PD_STAGE_1 = "Enable" Then
Topping "Load" "-"
Else
- Topping "Load" "12-03-03-0009"
+ Topping "Load" "12-03-03-0032"
EndIf
EndIf
Var menu_name_eng_hot = $##-##-##-####.NameE
@@ -642,10 +640,10 @@
Var menu_name_thai_cold = $##-##-##-####.Name
Var menu_desc_thai_cold = $##-##-##-####.description
- Var menu_name_eng_blender = $12-03-03-0009.NameE
- Var menu_desc_eng_blender = $12-03-03-0009.descriptionE
- Var menu_name_thai_blender = $12-03-03-0009.Name
- Var menu_desc_thai_blender = $12-03-03-0009.description
+ Var menu_name_eng_blender = $12-03-03-0032.NameE
+ Var menu_desc_eng_blender = $12-03-03-0032.descriptionE
+ Var menu_name_thai_blender = $12-03-03-0032.Name
+ Var menu_desc_thai_blender = $12-03-03-0032.description
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
@@ -747,7 +745,7 @@ VOLCANO"
264
Var( DirImage2 + "blend.png" )
Var( DirImage2 + "blend_db.png" )
- $12-03-03-0009.Button
+ $12-03-03-0032.Button
180
@@ -757,8 +755,8 @@ VOLCANO"
KanitRegularTTF
0x6F5F51
0xEAE6E1
- $12-03-03-0009.Button
- StringFmt( $12-03-03-0009.Price , DisplayFormat, PreScaleConvertShow) ; test
+ $12-03-03-0032.Button
+ StringFmt( $12-03-03-0032.Price , DisplayFormat, PreScaleConvertShow) ; test
81
@@ -783,10 +781,10 @@ VOLCANO"
117
eval(
- If $Sum1203030009 = "Disable" Then
+ If $Sum1203030032 = "Disable" Then
STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
- STRCONTAIN "ERR" $12-03-03-0009.TAG tag3_is_disable
+ STRCONTAIN "ERR" $12-03-03-0032.TAG tag3_is_disable
Var return = "Invisible"
If tag1_is_disable = "true" Then
Var return = "Enable"
@@ -822,7 +820,7 @@ VOLCANO"
MITRegularTTF
0x5A5A5A
"disable-show"
- $Sum1203030009
+ $Sum1203030032
text_unavailable
center-vertical-horizontal
@@ -7928,6 +7926,7 @@ LIMENADE SODA"
Machine RemoveCup
Machine DoorLidOpen
+ Var buttonRemoveCup = "Invisible"
diff --git a/xml/page_catalog_group_recommend3.xml b/xml/page_catalog_group_recommend3.xml
index d81a282d..7c52a1ee 100644
--- a/xml/page_catalog_group_recommend3.xml
+++ b/xml/page_catalog_group_recommend3.xml
@@ -236,26 +236,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -337,12 +339,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
@@ -1070,7 +1068,7 @@
22
225
296
- Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032)
+ Flag( 12-03-03-0032.Button, ,$Sum1203030032)
$Sum1203030032
"ROOT/taobin_project/image/page_drink_n//bn_super_oreo_volcano.png"
@@ -8908,6 +8906,7 @@ LIMENADE SODA"
Machine RemoveCup
Machine DoorLidOpen
+ Var buttonRemoveCup = "Invisible"
diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml
index de6e72ef..331a8768 100644
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@@ -215,26 +215,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -316,12 +318,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml
index 8efecba9..48b9e0c0 100644
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@@ -219,26 +219,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -320,12 +322,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml
index e69d7411..762bc94f 100644
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@@ -224,26 +224,28 @@
EndIf
EndIf
+
+ If CupOnArm = "true" Then
+
+ If CheckCupStateDoorCupClose = "" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+
+ If CheckCupStateDoorCupClose = "done" Then
+ Var buttonRemoveCup = "Enable"
+ EndIf
+ Else
+ If buttonRemoveCup = "Enable" Then
+ Var buttonRemoveCup = "Invisible"
+ EndIf
+ EndIf
+
+
Var Timeout = Timeout + 1
TimerReset
-;
-; 0
-; 0
-; "ROOT/taobin_project/image/ad_medium_2.png"
-;
-
-;
-
; under line
0
@@ -325,12 +327,8 @@
SAVELOG "Click rec"
Var NextPage = "-"
- ; zone promote
- If SongkranEnable = 1 Then
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
- Else
- Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml"
- EndIf
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index c46734db..d83c3e02 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -476,15 +476,19 @@
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/drinkfinish.wav"
- EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/drinkfinish.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/drinkfinish.wav"
+
+ ; 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 + "drinkfinish.wav"
EndIf
+
Play PlaySoundLag
EndIf
EndIf
diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml
index 80454153..32760057 100644
--- a/xml/page_face_compare.xml
+++ b/xml/page_face_compare.xml
@@ -16,7 +16,7 @@
- SAVELOG "EventActionOk"
+ SAVELOG "EventActionOk-facecompare"
Var FaceCompareStatus = "OK"
Var AdultFlag = 0
@@ -50,7 +50,7 @@
Var Price5Active = 0
Var FaceCompareStatus = "Fail"
- SAVELOG "EventActionError"
+ SAVELOG "EventActionError-facecompare"
Var load_gif_stage = "Invisible"
Var Timeout = 10
Var IDcardTextState = "Enable"
diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml
index 903ae49b..5e9f3e79 100644
--- a/xml/page_identity_verification.xml
+++ b/xml/page_identity_verification.xml
@@ -98,9 +98,6 @@
EndIf
EndIf
-
-
-
If IDCardStatus = "OK" Then
If IDCardReady = "OK" Then
If IDCardData = "ERROR" Then
@@ -242,7 +239,7 @@
EndIf
EndIf
-
+
If IDCardState = "PRESENT" Then
If IDCardStatus = "ERROR" Then
Var load_gif_stage = "Invisible"
@@ -308,6 +305,7 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ SAVELOG "Liveness Result - Cancel"
Open "ROOT/taobin_project/xml/page_catalog2.xml"
@@ -404,7 +402,10 @@
DEBUGVAR LivenessResult
If LivenessResult = "pass" Then
- SAVELOG "Liveness Result - pass"
+
+ Var strlog_liveness = "Liveness Result - pass " + FailTrickCount
+
+ SAVELOG strlog_liveness
Else
Var FailTrickCount = FailTrickCount + 1
Var strlog_liveness = "Liveness Result - fail " + FailTrickCount
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 237bf70d..d158742e 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -12,6 +12,8 @@
Var IndoQR = 0
+
+
Var GetPayInfoFlag = 0
Var SessionID2 = ""
Var testservice = "kbank"
@@ -133,27 +135,24 @@
Else
Var DirImage = "ROOT/taobin_project/image/page_payment"
Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/north/payment.wav"
- EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/northeast/payment.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/sublang/south/payment.wav"
+
+ ; 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 + "payment.wav"
EndIf
+
Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
EndIf
- Var PromotionIDCurrentOrder = 0
- If PromotionOreoVolcanoEnable = 1 Then
- If PD_CODE3 = "12-03-03-0009" Then
- Var PromotionIDCurrentOrder = 2
- EndIf
- EndIf
- DEBUGVAR PromotionIDCurrentOrder
SAVELOG MachineStage
@@ -250,9 +249,13 @@
If UserSelectProductCode = "12-05-02-0056" Then
Var PromotionIDCurrentOrder = 3
EndIf
+
+ If SystemDateMonthInt = 5 Then
+ Var PromotionIDCurrentOrder = 0
+ EndIf
EndIf
- DEBUGVAR PromotionIDCurrentOrder
+
Var RemainAmountStr = ""
@@ -292,9 +295,18 @@
EndIf
-
-
+
+
+ ; Oreo free
+ If PromotionIDOreoBuyTwoSaveMore = 1 Then
+ Var PromotionIDOreoBuyTwoSaveMore = 0
+ Var PromotionIDCurrentOrder = 2
+ EndIf
+ If PromotionIDCurrentOrder = 2 Then
+ SAVELOG "Promotion: Oreo Get 1 Free 1"
+ EndIf
+ DEBUGVAR PromotionIDCurrentOrder
900
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 42a7111d..d163ded3 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -1004,7 +1004,23 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
+
+ Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.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_mobile.wav"
+ EndIf
+
+ Play PlaySoundLag
+
EndIf
EndIf
@@ -1029,7 +1045,22 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1057,7 +1088,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1083,7 +1128,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1109,7 +1168,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1135,7 +1208,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1166,7 +1253,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1195,7 +1296,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
@@ -1224,7 +1339,21 @@
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
- PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
+ 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
diff --git a/xml/page_topping_select6.xml b/xml/page_topping_select6.xml
index 2708ec94..b01e861b 100644
--- a/xml/page_topping_select6.xml
+++ b/xml/page_topping_select6.xml
@@ -303,41 +303,24 @@
Var PromotionIDCurrentOrder = 0
- If PromotionOreoVolcanoEnable = 1 Then
- If PD_CODE3 = "12-03-03-0009" Then
- Var PromotionIDCurrentOrder = 2
- EndIf
- EndIf
-
-
- If PromotionOreoToppingFreeEnable = 1 Then
-
-
- Var oreo_topping_wed_free = "Enable"
- Var oreo_topping_wed_topping = "Invisible"
- Else
-
- Var oreo_topping_wed_free = "Invisible"
- Var oreo_topping_wed_topping = "Enable"
-
- EndIf
-
- If ShowPromoitonOreo = 1 Then
-
- Else
- Var oreo_topping_wed_free = "Invisible"
- Var oreo_topping_wed_topping = "Invisible"
- EndIf
-
DEBUGVAR PromotionIDCurrentOrder
+
Var DiscountWithIdentifyState = "Enable"
+
+ ;Var DiscountWithIdentifyState = "Invisible"
+
+
DEBUGVAR Price5Active
DEBUGVAR EnableLiveness
DEBUGVAR DiscountWithIdentifyState
Var ChildrenFree = 0
+ If BackToSchoolForFreeEnable = 1 Then
+
+ EndIf
+
If EnableLiveness = "true" Then
If CameraCount = 1 Then
; echo -n true > /mnt/sdcard/enable_discount_price5
@@ -350,10 +333,6 @@
EndIf
EndIf
- If Price5Active = 1 Then
-
- EndIf
-
1000
@@ -492,16 +471,18 @@
Else
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
- If SoundThaiIndex = 1 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/north/select_level.wav"
+ ; 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 + "select_level.wav"
EndIf
- If SoundThaiIndex = 2 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/northeast/select_level.wav"
- EndIf
- If SoundThaiIndex = 3 Then
- Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/south/select_level.wav"
- EndIf
-
+
Play PlaySoundLag
EndIf
EndIf
@@ -3253,6 +3234,8 @@
;
+
+
Var SelectDrink = UserSelectProductCode
; Set drink
Topping "Select" UserSelectProductCode
@@ -3431,6 +3414,8 @@
EndIf
;
+ Var PromotionIDCurrentOrder = 0
+
Var SelectDrink = UserSelectProductCode
@@ -3665,6 +3650,9 @@
;
+ DEBUGVAR PromotionIDCurrentOrder
+
+
Var SelectDrink = UserSelectProductCode
Var Seeker.selected_a_drink = UserSelectProductCode
@@ -3996,7 +3984,7 @@
EndIf
-
+
DEBUGVAR showOreoAddEnable
DEBUGVAR TOPPING_PRICE
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index e374c512..b2c1dd3d 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.15"
- Var XMLPageVersionInt = 715
+ Var XMLPageVersion = "7.17"
+ Var XMLPageVersionInt = 717