From c746c740f89fb7c3a4bc9d9656e5be43e7125e25 Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Mon, 13 May 2024 11:16:45 +0700
Subject: [PATCH] SGP & MYS: (drink fail) change tel num setting to read from
 file.

---
 inter/mys/max_tel_num           |  1 +
 inter/mys/xml/tel_num_script.ev |  9 ---------
 inter/sgp/max_tel_num           |  1 +
 inter/sgp/xml/tel_num_script.ev |  9 ---------
 xml/page_board.xml              |  9 ++++++++-
 xml/page_drinkfail2.xml         | 21 ++++++++++++++++++---
 6 files changed, 28 insertions(+), 22 deletions(-)
 create mode 100644 inter/mys/max_tel_num
 delete mode 100644 inter/mys/xml/tel_num_script.ev
 create mode 100644 inter/sgp/max_tel_num
 delete mode 100644 inter/sgp/xml/tel_num_script.ev

diff --git a/inter/mys/max_tel_num b/inter/mys/max_tel_num
new file mode 100644
index 00000000..9d607966
--- /dev/null
+++ b/inter/mys/max_tel_num
@@ -0,0 +1 @@
+11
\ No newline at end of file
diff --git a/inter/mys/xml/tel_num_script.ev b/inter/mys/xml/tel_num_script.ev
deleted file mode 100644
index c38d265e..00000000
--- a/inter/mys/xml/tel_num_script.ev
+++ /dev/null
@@ -1,9 +0,0 @@
-;inter-max-number
-If CountryName = "Malaysia" Then
-    Var MaxNumber = 11
-Else
-    Var MaxNumber = 10
-EndIf
-
-DEBUGVAR CountryName
-DEBUGVAR MaxNumber
\ No newline at end of file
diff --git a/inter/sgp/max_tel_num b/inter/sgp/max_tel_num
new file mode 100644
index 00000000..301160a9
--- /dev/null
+++ b/inter/sgp/max_tel_num
@@ -0,0 +1 @@
+8
\ No newline at end of file
diff --git a/inter/sgp/xml/tel_num_script.ev b/inter/sgp/xml/tel_num_script.ev
deleted file mode 100644
index 247c0e13..00000000
--- a/inter/sgp/xml/tel_num_script.ev
+++ /dev/null
@@ -1,9 +0,0 @@
-;inter-max-number
-If CountryName = "Singapore" Then
-    Var MaxNumber = 8
-Else
-    Var MaxNumber = 10
-EndIf
-
-DEBUGVAR CountryName
-DEBUGVAR MaxNumber
\ No newline at end of file
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 19718b2f..da3145bd 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -633,7 +633,8 @@
 
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
 
-		Var CountryRootPath = "ROOT/taobin_project/inter/mys/"	
+		Var CountryRootPath = "ROOT/taobin_project/inter/mys/"
+		Var CountryShortName = "mys"
 
 		Var PriceUnitText = "Prices in MYR"
 
@@ -680,6 +681,8 @@
 		Var CountryRootPath = "ROOT/taobin_project/inter/ids/"
 		Var CountDownShowButton = 35
 
+		Var CountryShortName = "ids"
+
 		If Not#LanguageLoaded = "" Then
 			LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/ids/menu/lang.tsv"
 		EndIf
@@ -710,6 +713,7 @@
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
 
 		Var CountryRootPath = "ROOT/taobin_project/inter/aus/"
+		Var CountryShortName = "aus"
 
 		ar TextPriceMenuSize = 12
 		Var TextPriceMenuY = 264
@@ -756,6 +760,7 @@
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
 
 		Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/"
+		Var CountryShortName = "usaNY"
 
 		ar TextPriceMenuSize = 12
 		Var TextPriceMenuY = 264
@@ -799,6 +804,7 @@
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
 
 		Var CountryRootPath = "ROOT/taobin_project/inter/sgp/"
+		Var CountryShortName = "sgp"
 
 		ar TextPriceMenuSize = 12
 		Var TextPriceMenuY = 264
@@ -852,6 +858,7 @@
 		Var ShowNetworkProblemText = "Network error. Payment Cash only."
 
 		Var CountryRootPath = "ROOT/taobin_project/inter/uae_dubai/"
+		Var CountryShortName = "uae_dubai"
 		
 		Var TextPriceMenuSize = 12
 		Var TextPriceMenuY = 264
diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
index a11128b3..cc8b7db3 100644
--- a/xml/page_drinkfail2.xml
+++ b/xml/page_drinkfail2.xml
@@ -166,9 +166,24 @@
 
 	;inter-from-consent
 	If InternationalEnable = 1 Then
-		Var tel_setting = CountryRootPath + "xml/tel_num_script.ev"
-		DEBUGVAR tel_setting
-		TRY tel_setting
+		;Var tel_setting = CountryRootPath + "xml/tel_num_script.ev"
+		;DEBUGVAR tel_setting
+		;TRY tel_setting
+
+		Var InterNumSetting = "/mnt/sdcard/coffeevending/taobin_project/inter/" + CountryShortName
+		Var InterNumSetting = InterNumSetting + "/max_tel_num"
+
+		DEBUGVAR CountryShortName
+
+		READ_FILE InterNumSetting MaxNumber2
+		DEBUGVAR MaxNumber2
+
+		If MaxNumber2 = "" Then
+
+		Else
+			Var MaxNumber = MaxNumber2
+		EndIf
+
 	EndIf
 
 	;inter-from-consent