Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/page_topping_select7.xml

@@ -1145,6 +1145,29 @@
 
 		DEBUGVAR SubMenuGroupIDSlot6_1
 
+		DEBUGVAR TOPPING3
+        If TOPPING3 = "Collagen(mix)" Then
+            Var CollagenState = "Enable"
+            Var ExtraTopping = "Enable"
+        Else
+            Var CollagenState = "Invisible"
+            Var ShowCollagenOnly = "Invisible"
+        EndIf
+
+        If JemilaToppingFlag = 1 Then
+ 			If CollagenState = "Enable" Then
+ 			    If JemilaToppingFreeFlag = 1 Then
+   					Var CollagenToppingBg = "/bg_top_jemila_free.png"
+   					Var CollagenToppingPrice = 0
+    				Else
+    				    Var CollagenToppingBg = "/bg_top_jemila.png"
+   					Var CollagenToppingPrice = 5
+    				EndIf
+ 			EndIf
+        Else
+            Var CollagenState = "Invisible"
+        EndIf
+
 
 		Var PriceCustomCoffeeFormat = "%.0f฿"
 
@@ -2093,6 +2116,8 @@
 		EndIf
 		; End of UserSeletedSugar = 0
 
+
+
 		Refresh
 
 		Var collagenShow = "true"
@@ -2364,28 +2389,6 @@
 			EndIf
 
 		;-END
-		    DEBUGVAR TOPPING3
-			If TOPPING3 = "Collagen(mix)" Then
-				Var CollagenState = "Enable"
-				Var ExtraTopping = "Enable"
-			Else
-				Var CollagenState = "Invisible"
-				Var ShowCollagenOnly = "Invisible"
-			EndIf
-
-			If JemilaToppingFlag = 1 Then
-    			If CollagenState = "Enable" Then
-    			    If JemilaToppingFreeFlag = 1 Then
-    					Var CollagenToppingBg = "/bg_top_jemila_free.png"
-    					Var CollagenToppingPrice = 0
-    				Else
-    				    Var CollagenToppingBg = "/bg_top_jemila.png"
-    					Var CollagenToppingPrice = 5
-    				EndIf
-    			EndIf
-			Else
-			    Var CollagenState = "Invisible"
-			EndIf
 
 
 		EndIf