Merge branch 'masterpiece' into feat/sgp-new-payment

xml/page_payment.xml

@@ -8,10 +8,36 @@
 	;world-class
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
 
+	
+	If Seeker = "curr" Then
+		If MachineStage = "remove-cup" Then
+			SAVELOG "MachineStage = remove-cup"
+			If HaveCup = "true" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
 
-	;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml"
+		EndIf
 
+		If CupChecking = "true" Then
+			If HaveCup = "true" Then
+				SAVELOG "Have cup"
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+		EndIf
+
+		If DoorCupPosition = "bottom" Then
+
+		Else
+			SAVELOG "DoorCupPosition not bottom"
+			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+		EndIf
+	Else
+
+	EndIf
+
+	
 	Var IndoQR = 0
 
 	Var PaymentEnableAll = "true"
@@ -187,6 +213,7 @@
 	Else
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 		Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3"
+		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
 
 		If SongkranSoundCampaign = 1 Then
 			Var PlaySoundLag = SelectPayMethodSound[SoundCampaignIndex]
@@ -194,10 +221,8 @@
 
 		If CountryName = "HongKong" Then
 			Var PlaySoundLag = "ROOT/taobin_project/sound_eng/How_would_you_like_to_pay.mp3"
+			Var PlaySoundCodeLang = "ROOT/taobin_project/sound_eng/Code8digit.mp3"
 		EndIf
-
-
-		Var PlaySoundCodeLang = "ROOT/sounds/Code8digit.m4a"
 	EndIf
 
 
@@ -300,6 +325,32 @@
 		Var Seeker.CodeChannel = 1
 		Var Seeker.CodeNumber = IDNum
 
+		If New_Payment = 1 Then
+			Var Seeker.ORDER_ID = ""
+			GenHashWithTimeStamp Seeker.ORDER_ID
+			__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
+		EndIf
+
+		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
+
+
+
+	EndIf
+
+	If ModeFreeEnable = 2 Then
+
+		Var RemainAmountStr = "Free###size=150"
+
+		Var RoadShowMarketCode = ""
+		Var Seeker.VendingCode = RoadShowMarketCode
+		
+		DEBUGVAR PriceDrink
+
+		Var Seeker.IntVendingCampaign = PriceDrink
+		Var Seeker.FreeVendingCampaign = 1
+		Var Seeker.CodeChannel = 1
+		Var Seeker.CodeNumber = IDNum
+
 		SAVELOG "ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable ModeFreeEnable"
 		If New_Payment = 1 Then
 			Var Seeker.ORDER_ID = ""