From 54bdaabc36e27da2d4a5014b57b5aaefec978bac Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Mon, 16 Aug 2021 19:50:14 +0700
Subject: [PATCH] fix bug credit+cash case failed

---
 xml/page_payment_credit.xml      | 31 ++++++++++++++++++++++++++++++-
 xml/page_payment_credit3.xml     |  2 +-
 xml/page_payment_storeCredit.xml |  3 ++-
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml
index c2c5deae..55288c8b 100644
--- a/xml/page_payment_credit.xml
+++ b/xml/page_payment_credit.xml
@@ -111,6 +111,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
@@ -137,7 +139,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "1"
 	EndIf
-
+	EndIf
 </EventClick>
 </Button>
 
@@ -150,6 +152,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
@@ -176,6 +180,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "2"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -188,6 +193,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
@@ -214,6 +221,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "3"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -226,6 +234,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
@@ -252,6 +262,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "4"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -264,6 +275,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
@@ -290,6 +303,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "5"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -302,6 +316,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
@@ -328,6 +344,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "6"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -340,6 +357,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
@@ -366,6 +385,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "7"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -378,6 +398,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
@@ -404,6 +426,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "8"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -416,6 +439,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
@@ -442,6 +467,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "9"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
@@ -454,6 +480,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
@@ -481,6 +509,7 @@
 	If TelNumLen = 10 Then
 		Var number10 = "0"
 	EndIf
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml
index 5a9f1c00..d0ef470d 100644
--- a/xml/page_payment_credit3.xml
+++ b/xml/page_payment_credit3.xml
@@ -197,7 +197,7 @@
 
 
 
-
+		Var StoreCreditFlag = 1
 
 		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 
diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml
index 5c502fc1..65d45b1c 100644
--- a/xml/page_payment_storeCredit.xml
+++ b/xml/page_payment_storeCredit.xml
@@ -125,7 +125,7 @@
 			If Ext1a = "invalid password" Then
 				Var ShowErrorText = "Enable"
 			EndIf
-			
+
 		EndIf
 	 	
 	EndIf
@@ -611,6 +611,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
+	Var GetAccFlag = 1
 	GETACCEXT TelephoneNumber 13
 
 </EventClick>