diff --git a/image/collectiing_en/img_popup11-SGP.png b/image/collectiing_en/img_popup11-SGP.png
new file mode 100644
index 00000000..4c0e72af
Binary files /dev/null and b/image/collectiing_en/img_popup11-SGP.png differ
diff --git a/image/collectiing_en/img_popup15-SGP.png b/image/collectiing_en/img_popup15-SGP.png
new file mode 100644
index 00000000..0c96c641
Binary files /dev/null and b/image/collectiing_en/img_popup15-SGP.png differ
diff --git a/image/collectiing_en/text_show_amountInvalid-SGP.png b/image/collectiing_en/text_show_amountInvalid-SGP.png
new file mode 100644
index 00000000..a4cd74df
Binary files /dev/null and b/image/collectiing_en/text_show_amountInvalid-SGP.png differ
diff --git a/image/collectiing_en/text_show_amountInvalid2-SGP.png b/image/collectiing_en/text_show_amountInvalid2-SGP.png
new file mode 100644
index 00000000..ac59d855
Binary files /dev/null and b/image/collectiing_en/text_show_amountInvalid2-SGP.png differ
diff --git a/image/display_point_en/text5-SGD.png b/image/display_point_en/text5-SGD.png
new file mode 100644
index 00000000..f27e9b14
Binary files /dev/null and b/image/display_point_en/text5-SGD.png differ
diff --git a/image/page_payment_cash_extend_en/img_popup11-SGP.png b/image/page_payment_cash_extend_en/img_popup11-SGP.png
new file mode 100644
index 00000000..4c0e72af
Binary files /dev/null and b/image/page_payment_cash_extend_en/img_popup11-SGP.png differ
diff --git a/image/page_payment_cash_extend_en/img_popup15-SGP.png b/image/page_payment_cash_extend_en/img_popup15-SGP.png
new file mode 100644
index 00000000..61aaef46
Binary files /dev/null and b/image/page_payment_cash_extend_en/img_popup15-SGP.png differ
diff --git a/image/page_thankyou_en/imgGetChange-SGP.png b/image/page_thankyou_en/imgGetChange-SGP.png
new file mode 100644
index 00000000..8969cd56
Binary files /dev/null and b/image/page_thankyou_en/imgGetChange-SGP.png differ
diff --git a/image/page_thankyou_en/remainCredit-SGP.png b/image/page_thankyou_en/remainCredit-SGP.png
new file mode 100644
index 00000000..5f98fa33
Binary files /dev/null and b/image/page_thankyou_en/remainCredit-SGP.png differ
diff --git a/inter/sgp/xml/page_catalog_group_other.lxml b/inter/sgp/xml/page_catalog_group_other.lxml
index 289c9a8e..8c0714f8 100644
--- a/inter/sgp/xml/page_catalog_group_other.lxml
+++ b/inter/sgp/xml/page_catalog_group_other.lxml
@@ -13224,6 +13224,268 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 52-05-02-0016 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 52-05-02-0016.Button,$Sum5205020016) </State> 
+	<Button>
+	<State> $Sum5205020016 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_water_roomtemp.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_water_roomtemp.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_water_roomtemp.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $52-05-02-0016.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "52-05-02-0016"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "Water"
+		Var aliasDesc[0] = "Water"
+		Var aliasName[1] = "น้ำแข็ง"
+		Var aliasDesc[1] = "น้ำแข็ง"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = ""
+		Var aliasDesc[4] = ""
+		Var NameLang[0][0] = ""
+		Var NameLang[0][1] = ""
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = ""
+		Var DescLang[0][0] = ""
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var NameLang[1][0] = "DRINKING WATER"
+		Var NameLang[1][1] = "น้ำดื่ม"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = "AIR MINUMAN"
+		Var DescLang[1][0] = "Water"
+		Var DescLang[1][1] = "น้ำ"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = "Air"
+		Var NameLang[2][0] = ""
+		Var NameLang[2][1] = ""
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = ""
+		Var DescLang[2][0] = ""
+		Var DescLang[2][1] = ""
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = ""
+		; end lang 
+		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_2 = $52-05-02-0016.Button
+		Var PD_STAGE_3 = "Disable2"
+		Var SelectCountDrinkType = 0
+		Var DefaultDrinkType = 0
+		If PD_STAGE_1 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 1
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 2
+		EndIf
+		If PD_STAGE_3 = "Enable" Then
+			Var SelectCountDrinkType = SelectCountDrinkType + 1
+			Var DefaultDrinkType = 3
+		EndIf
+		If PD_STAGE_2 = "Enable" Then
+			Topping "Load" "52-05-02-0016"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Water</LanguageSlot1>
+		<LanguageSlot2>น้ำแข็ง</LanguageSlot2>
+		<LanguageSlot3>Water</LanguageSlot3>
+		<LanguageSlot4>น้ำแข็ง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>น้ำแข็ง</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Water</LanguageSlot1>
+		<LanguageSlot2>น้ำแข็ง</LanguageSlot2>
+		<LanguageSlot3>Water</LanguageSlot3>
+		<LanguageSlot4>น้ำแข็ง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>น้ำแข็ง</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $52-05-02-0016.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $52-05-02-0016.Button </State>
+	<Value> StringFmt( $52-05-02-0016.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5205020016 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $52-05-02-0016.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5205020016 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 </FrameScroll>
 ; Cart
diff --git a/xml/page_check_member2.xml b/xml/page_check_member2.xml
index 7616668f..31a9945b 100644
--- a/xml/page_check_member2.xml
+++ b/xml/page_check_member2.xml
@@ -910,9 +910,13 @@
 		Var text5Img = "/text5-MYR.png"
 	EndIf
 
-	If CountryName = "Indonesia" Then
-		Var text5Img = "/text5-IDR.png"
-	EndIf 
+    If CountryName = "Indonesia" Then
+        Var text5Img = "/text5-IDR.png"
+    EndIf 
+
+    If CountryName = "Singapore" Then
+        Var text5Img = "/text5-SGD.png"
+    EndIf 
 
     
     INT TaobinCredit
diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml
index 6d867391..2ab6b0c8 100644
--- a/xml/page_collect_point_1-3.xml
+++ b/xml/page_collect_point_1-3.xml
@@ -134,6 +134,7 @@
 
 	Var MaxNumber = 10
 
+	;inter-max-number
 	If CountryName = "Malaysia" Then
 		Var MaxNumber = 11
 	EndIf
@@ -142,6 +143,10 @@
 		Var MaxNumber = 12
 	EndIf 
 
+	If CountryName = "Singapore" Then
+		Var MaxNumber = 10
+	EndIf 
+
 
 	If PromotionIDCurrentOrder = 2 Then
 		Var text_x = "/text_4.png"
diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml
index 99120bd2..f77d2ee6 100644
--- a/xml/page_collect_point_3.xml
+++ b/xml/page_collect_point_3.xml
@@ -660,6 +660,10 @@
 		Var Seeker.FromConsent = 0
 	EndIf 
 
+	If CountryName = "Singapore" Then
+		Var Seeker.FromConsent = 0
+	EndIf 
+
 
  
 </EventOpen>
diff --git a/xml/page_get_yourchange.xml b/xml/page_get_yourchange.xml
index d7e05015..77e849c4 100644
--- a/xml/page_get_yourchange.xml
+++ b/xml/page_get_yourchange.xml
@@ -35,7 +35,8 @@
 	EndIf
 
 	Var imgGetChange = "/imgGetChange.png"
-
+	
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var imgGetChange = "/imgGetChange-MYR.png"
 	EndIf
@@ -44,6 +45,11 @@
 		Var imgGetChange = "/imgGetChange-IDR.png"
 	EndIf 
 
+	If CountryName = "Singapore" Then
+		Var imgGetChange = "/imgGetChange-SGP.png"
+	EndIf
+
+
 	;INT StoreCreditAmount
 	Var StoreCreditAmountStr !assigned StringFmt( StoreCreditAmount, DisplayFormat, PreScaleConvertShow )
 
diff --git a/xml/page_payment_credit3-Topup.xml b/xml/page_payment_credit3-Topup.xml
index 3cb39f2b..15985a2f 100644
--- a/xml/page_payment_credit3-Topup.xml
+++ b/xml/page_payment_credit3-Topup.xml
@@ -61,6 +61,7 @@
 	Var Min = PayAmountSubDiscount 
 	Var Max = 5000
 
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var text_44 = "/text_44-MYR.png"
 		Var text_show_amountInvalid = "/text_show_amountInvalid-MYR.png"
@@ -71,6 +72,16 @@
 
 	EndIf
 
+  	If CountryName = "Singapore" Then
+		Var text_44 = "/text_44-SGP.png"
+		Var text_show_amountInvalid = "/text_show_amountInvalid-SGP.png"
+		Var text_show_amountInvalid2 = "/text_show_amountInvalid2-SGP.png"
+
+		;Var Min = 2
+		Var Max = 500
+
+	EndIf
+
 	If CountryName = "Indonesia" Then
 		Var text_44 = "/text_44-IDR.png"
 		Var text_show_amountInvalid = "/text_show_amountInvalid-IDR.png"
diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml
index 4e5a6f63..ac47e9ec 100644
--- a/xml/page_payment_credit3-TopupCash.xml
+++ b/xml/page_payment_credit3-TopupCash.xml
@@ -45,6 +45,7 @@
 	Var img_popup11 = "/img_popup11.png"
 	Var img_popup15 = "/img_popup15.png"
 
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var img_popup11 = "/img_popup11-MYR.png"
 		Var img_popup15 = "/img_popup15-MYR.png"
@@ -56,6 +57,11 @@
 		Var img_popup15 = "/img_popup15-IDR.png"
 	EndIf 
 
+    If CountryName = "Singapore" Then
+		Var img_popup11 = "/img_popup11-SGP.png"
+		Var img_popup15 = "/img_popup15-SGP.png"
+		Var AmountNumber = AmountNumber * 100
+	EndIf
 
     
     
diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml
index 72ee6064..6fbbf494 100644
--- a/xml/page_payment_credit3.xml
+++ b/xml/page_payment_credit3.xml
@@ -93,6 +93,10 @@
 		Var img_popup11 = "/img_popup11-IDR.png"
 	EndIf 
 
+	If CountryName = "Singapore" Then
+		Var img_popup11 = "/img_popup11-SGP.png"
+	EndIf 
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml
index 9fc72712..ef3e4e34 100644
--- a/xml/page_payment_storeCredit3.xml
+++ b/xml/page_payment_storeCredit3.xml
@@ -33,6 +33,7 @@
 
 	Var img_popup15 = "/img_popup15.png"
 
+	;inter-image
     If CountryName = "Malaysia" Then
 		Var img_popup15 = "/img_popup15-MYR.png"
 	EndIf
@@ -41,6 +42,10 @@
 		Var img_popup15 = "/img_popup15-IDR.png"
 	EndIf 
 
+	If CountryName = "Singapore" Then
+		Var img_popup15 = "/img_popup15-SGP.png"
+	EndIf
+
 	DEBUGVAR Seeker.TNumberTaobinCredit
 
 </EventOpen>
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index a5506013..1a86c8ba 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -179,6 +179,10 @@
 		Var remainCredit = "/remainCredit-AUD.png"
 	EndIf
 
+	If CountryName = "Singapore" Then
+		Var remainCredit = "/remainCredit-SGP.png"
+	EndIf
+
 
 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/script_thankyou.ev"