diff --git a/image/liveness/bg3.png b/image/liveness/bg3.png
index f4a5052b..d65b7455 100644
Binary files a/image/liveness/bg3.png and b/image/liveness/bg3.png differ
diff --git a/inter/aus/video/video_main.mp4 b/inter/aus/video/video_main.mp4
index 40223f9c..ff0a543d 100644
Binary files a/inter/aus/video/video_main.mp4 and b/inter/aus/video/video_main.mp4 differ
diff --git a/inter/mys/image/LOGO_DuitNow.png b/inter/mys/image/LOGO_DuitNow.png
new file mode 100644
index 00000000..53fcad2b
Binary files /dev/null and b/inter/mys/image/LOGO_DuitNow.png differ
diff --git a/inter/mys/image/payment/LOGO_DuitNow.png b/inter/mys/image/payment/LOGO_DuitNow.png
new file mode 100644
index 00000000..0c390071
Binary files /dev/null and b/inter/mys/image/payment/LOGO_DuitNow.png differ
diff --git a/inter/mys/image/payment/img_popup1.png b/inter/mys/image/payment/img_popup1.png
new file mode 100644
index 00000000..370e467a
Binary files /dev/null and b/inter/mys/image/payment/img_popup1.png differ
diff --git a/video/script1.ev b/video/script1.ev
index 1cbf62e4..417e9689 100644
--- a/video/script1.ev
+++ b/video/script1.ev
@@ -19,13 +19,6 @@ Else
EndIf
EndIf
- If BoxID = 173149 Then
- Var EventTurnOn = 1
- EndIf
-
- If BoxID = 172644 Then
- Var EventTurnOn = 1
- EndIf
If EventTurnOn = 1 Then
Var CountDownShowButton = 0
diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml
index c1169608..7ea6a348 100644
--- a/xml/page_identity_verification.xml
+++ b/xml/page_identity_verification.xml
@@ -435,7 +435,7 @@
- 423
+ 370
FrameOfFaceYPosition
CameraStage
"ROOT/taobin_project/image/liveness/bg3.png"
diff --git a/xml/page_payment_cash-MYR.xml b/xml/page_payment_cash-MYR.xml
index 6abd20f1..ba1846ff 100644
--- a/xml/page_payment_cash-MYR.xml
+++ b/xml/page_payment_cash-MYR.xml
@@ -6,6 +6,7 @@
SoundVolume
PlaySoundLag
+
Var cash_disable = "0"
READ_FILE "/mnt/sdcard/coffeevending/cash_disable" cash_disable
@@ -1756,7 +1757,7 @@ EndIf
249
748
alphaState
- Var( DirImage + QR_POPUP )
+ "ROOT/taobin_project/inter/mys/image/payment/img_popup1.png"
@@ -1843,7 +1844,7 @@ EndIf
Var return = "Enable"
EndIf
EndIf
- DEBUGVAR return
+
)
@@ -2061,11 +2062,20 @@ EndIf
+
+ 483
+ 791
+ alphaState
+ "ROOT/taobin_project/inter/mys/image/LOGO_DuitNow.png"
+
+
+
445
958
200
200
+ "0xFFFFFF"
"0xE61A5F"
alphaState
testservice
@@ -2165,8 +2175,27 @@ EndIf
+; Test QR
+
+ Var QR_POPUP = "/img_popup12.png"
+
+ Var QRCODE99 = ""
+ Var LOADING_STATE = "Invisible"
+ Var FlagQROpened = 1
+ Var PayInfoCFlag = 0
+
+ Var testservice = "Herr"
+ Var alphaState = "Enable"
+ Refresh
+
+
+
+
+ Var testservice = "Herr"
+ Open CurrentXMLFileName2
+
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index d821ec45..c65d1f82 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -14,6 +14,9 @@
DEBUGVAR MachineStage
DEBUGVAR stop_now
+
+ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
Var show_error_normal = "Invisible"
Var show_error_sp1 = "Enable"
diff --git a/xml/page_topping_select5.xml b/xml/page_topping_select5.xml
index 276127f4..77e076a4 100644
--- a/xml/page_topping_select5.xml
+++ b/xml/page_topping_select5.xml
@@ -43,7 +43,7 @@
Var showText7 = "Invisible"
DEBUGVAR UserSelectProductCode
-
+ DEBUGVAR JXMLVersionInt
Var CHECK_EventOpen_Double = 0
If JXMLVersionInt > 448 Then
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 3f22c47f..6e331b86 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -9,7 +9,7 @@
Var UserSeletedSugar = 0
- SAVELOG "Event Open Select 6"
+ SAVELOG "Event Open Select 7"
If NoWaitMachineEnable = 1 Then
Var ConfirmDrinkButtonState = "Enable"
@@ -360,7 +360,25 @@
DEBUGVar MenuReady
If SelectDrinkType = 1 Then
+
If MenuReady = "YES" Then
+
+
+ ; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
+
+ READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
+ DEBUGVAR menu_blend_free
+ DEBUGVAR blend_button_state
+
+ If menu_blend_free = "true" Then
+ If blend_button_state = "PressForever" Then
+ Var PriceDrinkNoTop = 0
+ Var PriceDrink = 0
+ Var PriceDrinkTmpShow = "Free"
+ EndIf
+ EndIf
+
+
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
@@ -3866,9 +3884,10 @@
If UserSelectProductCode = "-" Then
Else
+
If SelectDrinkType = 1 Then
- ; MenuReady
+ ; Move to MenuReady
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_payment.xml"
EndIf
@@ -4203,8 +4222,6 @@
Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
-
-
If SelectDrinkType = 0 Then
Var PriceDrinkTmpShow = "---"
Else
@@ -4220,6 +4237,21 @@
DEBUGVAR PriceDrinkTmpShow
EndIf
+
+ ; echo -n true > /mnt/sdcard/coffeevending/menu_blend_free
+
+ READ_FILE "/mnt/sdcard/coffeevending/menu_blend_free" menu_blend_free
+ DEBUGVAR menu_blend_free
+ DEBUGVAR blend_button_state
+
+ If menu_blend_free = "true" Then
+ If blend_button_state = "PressForever" Then
+ Var PriceDrinkNoTop = 0
+ Var PriceDrinkTmpShow = "Free"
+ EndIf
+ EndIf
+
+
CRLFToSpace showname
CRLFToSpace showdesc
DEBUGVAR showname
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index b5cd1323..7ae2f121 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -108,8 +108,8 @@
Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0
- Var XMLPageVersion = "7.40"
- Var XMLPageVersionInt = 740
+ Var XMLPageVersion = "7.44"
+ Var XMLPageVersionInt = 744
;Oreo
Var OreoGuarantee = 0