AUS: Hide some payment

inter/aus/menu/lang.tsv

@@ -174,7 +174,7 @@ TextID	Note	English	Thai
 		Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center	Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
 000408		Next customer can order while waiting	ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย
 		Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90	Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
-000409		The Previous Drink\nHas Not Been Collected	มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม
+000409		The Previous Drink\nHas Not Been Grabbed	มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม
 		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
 000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
 		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50

inter/aus/xml/menu_catalog_new.lxml

@@ -26,17 +26,17 @@
     If NextPage = "-" Then
 
     Else
-            If CupOnArm = "true" Then
+        If CupOnArm = "true" Then
-                If Timeout > 9 Then
+            If Timeout > 9 Then
-                    SAVELOG "COA9"
+                SAVELOG "COA9"
-                    Open NextPage
+                Open NextPage
-                EndIf
-            Else
-                If Timeout > 30 Then
-                    SAVELOG "COA30"
-                    Open NextPage
-                EndIf
             EndIf
+        Else
+            If Timeout > 30 Then
+                SAVELOG "COA30"
+                Open NextPage
+            EndIf
+        EndIf
     EndIf
 
     If Timeout > 60 Then
@@ -81,39 +81,19 @@
 
     ; zone cup on arm
     If Seeker = "curr" Then
-		If CupOnArm = "true" Then
+        If CupOnArm = "true" Then
-
+            Var buttonRemoveCup = "Enable"
-			If CheckCupStateDoorCupClose = "" Then
+            Refresh
-				If buttonRemoveCup =  "Enable" Then
+        Else
-
+            If buttonRemoveCup = "Enable" Then
-				Else
+                Var buttonRemoveCup = "Invisible"
-					Refresh
+                Refresh
-				EndIf
+            EndIf
-
+        EndIf
-				Var buttonRemoveCup = "Enable"
+    Else
-
+        Var buttonRemoveCup = "Invisible"
-			EndIf
+        Refresh
-
+    EndIf
-			If CheckCupStateDoorCupClose = "done" Then
-				If buttonRemoveCup =  "Enable" Then
-
-				Else
-					Refresh
-				EndIf
-
-				Var buttonRemoveCup = "Enable"
-
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-				Refresh
-			EndIf
-		EndIf
-	Else
-		Var buttonRemoveCup = "Invisible"
-		Refresh
-	EndIf
 
     Var Timeout = Timeout + 1
     TimerReset

inter/aus/xml/page_member_topup.lxml

@@ -261,7 +261,7 @@
 <Button>
 <X> 287 </X>
 <Y> 778 </Y>
-<State> "Disable" </State>
+<State> "Invisible" </State>
 <Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename>
 <FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress>
 <FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable>

xml/page_payment_cash-AUS.xml

@@ -1451,6 +1451,7 @@
 
         				Var LOADING_STATE = "Enable"
                         Var EMAEnterNumberButtonState = "Disable"
+                        Var PopupCancelButtonState = "Disable"
 
         				VendingQR ON
 
@@ -1607,7 +1608,8 @@
 
 <Button>
 <X> 216 </X>
-<Y> 1176 </Y>
+;<Y> 1176 </Y>
+<Y> 1250 </Y>
 <State> PayWithCreditCardState </State>
 <Filename> Var( DirImage + "/bn_pay_with_ccard_AUS.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_ccard_AUS.png") </FilenamePress>
@@ -1635,7 +1637,8 @@ EndIf
 
 <Button>
 <X> 439 </X>
-<Y> 1176 </Y>
+;<Y> 1176 </Y>
+<Y> 1250 </Y>
 <State> PayWithTaoCreditState </State>
 <Filename> Var( DirImage + "/bn_pay_with_credit_AUS.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_credit_AUS.png") </FilenamePress>
@@ -1666,7 +1669,8 @@ EndIf
 
 <Button>
 <X> 664 </X>
-<Y> 1176 </Y>
+;<Y> 1176 </Y>
+<Y> 1250 </Y>
 <State> PayWithCouponState </State>
 <Filename> Var( DirImage + "/bn_pay_with_code.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_pay_with_code.png") </FilenamePress>
@@ -1785,7 +1789,7 @@ EndIf
 <Button>
 <X> 552 </X>
 <Y> 1399 </Y>
-<State> "Enable" </State>
+<State> "Invisible" </State>
 <Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
 <FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
 <FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
@@ -1799,7 +1803,8 @@ EndIf
 <Button>
 <X> 328 </X>
 <Y> 1399 </Y>
-<State> PayWithAUBState </State>
+;<State> PayWithAUBState </State>
+<State> "Invisible" </State>
 <Filename> "ROOT/taobin_project/inter/aus/image/payment_cash/bn_pay_with_ema.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/inter/aus/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
 <FilenameDisable> "ROOT/taobin_project/inter/aus/image/payment_cash/bd_pay_with_ema.png" </FilenameDisable>