From 40e2e0be0b057d973845e3416d5bc9a268711dd6 Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Tue, 17 Aug 2021 15:21:10 +0700
Subject: [PATCH] fix bug storecredit for credit+cash

---
 xml/page_brewing3.xml            |  1 -
 xml/page_payment_storeCredit.xml | 33 +++++++++++++++++++++++++++++---
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 55802e96..99a3759b 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -468,7 +468,6 @@
 		EndIf
 	EndIf
 
-	
 	If MachineState_Result = 1 Then
 		If  waitAckPay = 0 Then 
 
diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml
index 65d45b1c..9ed7cf62 100644
--- a/xml/page_payment_storeCredit.xml
+++ b/xml/page_payment_storeCredit.xml
@@ -168,6 +168,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "1"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -194,7 +196,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "1"
 	EndIf
-
+	EndIf
 </EventClick>
 </Button>
 
@@ -207,6 +209,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "2"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -233,6 +237,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "2"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -245,6 +250,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "3"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -271,6 +278,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "3"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -283,6 +291,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "4"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -309,6 +319,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "4"
 	EndIf
+	EndIf
 
 </EventClick>
 </Button>
@@ -322,6 +333,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "5"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -348,6 +361,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "5"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -360,6 +374,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "6"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -386,6 +402,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "6"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -398,6 +415,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "7"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -424,7 +443,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "7"
 	EndIf
-
+	EndIf
 </EventClick>
 </Button>
 
@@ -437,6 +456,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "8"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -463,7 +484,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "8"
 	EndIf
-
+	EndIf
 </EventClick>
 </Button>
 
@@ -476,6 +497,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "9"
 	Var ShowTextNumber = "Invisible"
 	Trim TelephoneNumber 10
@@ -502,6 +525,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "9"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -514,6 +538,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var Timeout = 0
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen < 10 Then 
 	Var TelephoneNumber = TelephoneNumber + "0"
 	Trim TelephoneNumber 10
 	StrLen TelephoneNumber TelNumLen
@@ -541,6 +567,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "0"
 	EndIf
+	EndIf
 </EventClick>
 </Button>