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

inc/button_topping_select_confirm_order.inc

@@ -87,6 +87,32 @@ EndIf
     EndIf
 
 
+
+
+    If showShotNormalSoda = "Press" Then
+        Var topping13 = toppingID13index1
+    EndIf
+
+    If showShotEnableSoda = "Press" Then
+        Var topping13 = toppingID13index2
+        Var topping12 = toppingID12index1
+    Else 
+        Var topping13 = toppingID13index1
+        Var topping12 = toppingID12index1
+    EndIf
+
+
+    If CustomEnergyState[0] = "Press" Then
+        Var topping12 = toppingID12index2
+        
+    EndIf
+
+    If CustomEnergyState[1] = "Press" Then
+        Var topping12 = toppingID12index3
+
+    EndIf
+
+
     If CustomSweetState[3] = "PressForever" Then
         If ShiftSugarStep = 1 Then
             Var topping1 = toppingID1index4

xml/page_payment_cash.xml

@@ -1894,11 +1894,11 @@
 	DEBUGVAR VendingCashless
 	If VendingCashless = "OK" Then
 		DEBUGVAR CashlessCode
-		
+
 		If KBankCashlessMachine = 1 Then
-	
+
 			Var Seeker.CashlessVendingTrackNumber = VendingTrackNumber
-	
+
 			DEBUGVAR VendingTrackNumber
 			DEBUGVAR Var Seeker.CashlessVendingTrackNumber
 
@@ -3264,6 +3264,12 @@ eval(
     	Var CancelingPopupFlag = "Enable"
     	Var CancelingPopupCountDown = 0
 
+     	If KBankCashlessMachine = 1 Then
+      		If ServiceCharge > 0 Then
+      			Var ServiceCharge = 0
+        	EndIf
+      	EndIf
+
         Refresh
     EndIf
 </EventClick>