THAI: Fix weird case top-up with cash

xml/page_payment.xml

@@ -145,6 +145,8 @@
 	Var Seeker.CreditCard = 0
 	Var Seeker.CreditCardRef = ""
 
+	Var Seeker.UseCreditPayFullDrinkPrice = 0
+
 	Var Seeker.IntVendingCredit = 0
 	
 	Var Seeker.StoreCreditFlag = 0

xml/page_payment_credit3-0.xml

@@ -90,6 +90,8 @@
 		Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + "/"
 		Var Seeker.CreditReferenceTmp = Seeker.CreditReferenceTmp + PointCrm
 
+		Var Seeker.CreditEnoughRefID = PointCrm
+
 		CoinVending OFF
 
 		Var Seeker.TNumberTaobinCredit = TelephoneNumber
@@ -98,6 +100,7 @@
 		Var Seeker.StoreCreditFlag = 1
 		Var SumCreditAmount = SumCreditAmount - PayAmountSubDiscount
 		Var VendingCreditRemain = "" + SumCreditAmount
+		Var Seeker.UseCreditPayFullDrinkPrice = 1
 
 		If CART_COUNT >= 1 Then 
 

xml/page_payment_credit3-TopupCash.xml

@@ -169,6 +169,7 @@
 
                 Var TelephoneNumber = Seeker.TNumberTaobinCredit
                 Var PayO2 = Var Seeker.CoffeePinNumber
+				Var ServiceAmount2 = CoinAmount
                     
                 Var VendingDiscount = 0
                 Var VendingCampaign = 0

xml/page_thankyou.xml

@@ -22,6 +22,8 @@
 	Var GotoStoreCredit0 = 0
 	Var StoreCreditAmount = 0
 
+	Var DetectCoinAmount = 0
+
 	Var buttonRemoveCup = "Invisible"
 
 	Var MachineState_Result = 0
@@ -215,24 +217,33 @@
 						EndIf
 
 					Else
+						DEBUGVAR Seeker.UseCreditPayFullDrinkPrice
 
-						If Seeker.IntVendingCampaign < PayAmount Then 
+						If Seeker.UseCreditPayFullDrinkPrice = 1 Then
-							Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+							If CoinAmount > 0 Then
-							Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
+								Var StoreCreditAmount = CoinAmount
+								Var DetectCoinAmount = 1
+							EndIf
+						Else
+							If Seeker.IntVendingCampaign < PayAmount Then 
+								Var SumCoinAmount = CoinAmount + Seeker.IntVendingCampaign
+								Var SumCoinAmount = SumCoinAmount + Seeker.IntVendingCredit
 
-							If SumCoinAmount >= PayAmount Then 
+								If SumCoinAmount >= PayAmount Then 
-								Var Canout = SumCoinAmount - PayAmount
+									Var Canout = SumCoinAmount - PayAmount
-								If Canout > 0 Then
+									If Canout > 0 Then
-									
+										
-										;Change Canout	
+											;Change Canout	
-										;Var ChangeFlag2 = 1
+											;Var ChangeFlag2 = 1
-										Var GotoStoreCredit0 = 1
+											Var GotoStoreCredit0 = 1
-										Var StoreCreditAmount = Canout
+											Var StoreCreditAmount = Canout
-									
+										
+									EndIf
 								EndIf
 							EndIf
 						EndIf
 
+
 					EndIf
 
 
@@ -409,16 +420,32 @@
 
 					DEBUGVAR Seeker.CurrCreditAmount
 					DEBUGVAR Seeker.CreditNotEnoughRefID
+					DEBUGVAR Seeker.CreditEnoughRefID
 
 					If Seeker.CreditNotEnoughRefID = "" Then
 						Var CurrAmount = Seeker.CurrCreditAmount
-						If CoinAmount > 0 Then
-							Var CurrAmount = CurrAmount + CoinAmount
-						EndIf
 						Var CurrTelePhoneNum = Seeker.CurrCreditTelNum
 						Var CurrPinNum = Seeker.CurrCreditPinNum
-						Var RefID = ""
+
-						AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+						If DetectCoinAmount = 1 Then
+							Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign
+
+							If CurrAmount >= ServiceAmountSupCampain Then
+
+								Var creditToTopup = CurrAmount - ServiceAmountSupCampain
+								Var RefID = "0/" + Seeker.CreditEnoughRefID
+								Var Seeker.CreditReferenceTmp = RefID
+
+								AddData 41 CurrTelePhoneNum creditToTopup CurrPinNum RefID
+							Else
+								Var RefID = ""
+								AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+							EndIf
+						Else
+							Var RefID = ""
+							AddData 41 CurrTelePhoneNum CurrAmount CurrPinNum RefID
+						EndIf
+
 					Else
 
 						Var ServiceAmountSupCampain = Seeker.ServiceAmount2 - Seeker.IntVendingCampaign