Merge branch 'pos_aot' into masterpiece

xml/event/tricker.ev

@@ -423,6 +423,11 @@ DEBUGVAR JemilaRewardOutOfStock
 Var New_Payment = 0
 Var NewFlowPaymentCode = 0
 
+If BoxID = 105005 Then
+    Var New_Payment = 1
+	Var NewFlowPaymentCode = 1
+EndIf
+
 If BoxID = 173149 Then
 	Var New_Payment = 1
 	Var NewFlowPaymentCode = 1
@@ -469,3 +474,10 @@ If BoxID = 176757 Then
 	Var SaveOrderNameAndPictureEnable = 1
 EndIf
 
+; Check POS machine flag
+Var ConnectWithPOSMachine = 0
+
+READ_FILE "/mnt/sdcard/coffeevending/POS_MACHINE" POSMachineFlag
+If POSMachineFlag = 1 Then
+    Var ConnectWithPOSMachine = 1
+EndIf

xml/page_payment.xml

@@ -313,11 +313,33 @@
 
 	__CMD "CLEAR_TIME_BLINK_DISPLAY" 0 "-" "-"
 
+	Var WaitPOSStatus = 0
+
 	;new payment coffee-payment
 	If New_Payment = 1 Then
 		SAVELOG "NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT NEW-PAYMENT "
 		Var Seeker.ORDER_ID = ""
 		GenHashWithTimeStamp Seeker.ORDER_ID
+
+		DEBUGVAR Seeker.NameDrinkTH
+		DEBUGVAR Seeker.NameDrinkEN
+
+		Var param1 = Seeker.ORDER_ID
+		Var param2 = Seeker.NameDrinkEN
+
+		STRCONTAIN "size" Seeker.NameDrinkEN SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.NameDrinkEN "###" 1 PureName
+			Var param2 = PureName
+		EndIf
+
+		If ConnectWithPOSMachine = 1 Then
+    		Var WaitPOSStatus = 1
+    		Var TimeWaitPOSStatus = 0
+    		Var POS_SELL_STATUS = "-"
+    		GetPOSStatus param1 param2
+		EndIf
+
 	EndIf
 
 </EventOpen>
@@ -397,6 +419,24 @@
 	DEBUGVAR ToppingDetailNext
 
 
+	If WaitPOSStatus = 1 Then
+
+        If TimeWaitPOSStatus < 10 Then
+            Var TimeWaitPOSStatus = TimeWaitPOSStatus + 1
+
+            If POS_SELL_STATUS = "READY" Then
+                Var WaitPOSStatus = 0
+            EndIf
+
+        Else
+            If POS_SELL_STATUS = "READY" Then
+                Var WaitPOSStatus = 0
+            Else
+                Open "ROOT/taobin_project/xml/pos_fail.xml"
+            EndIf
+        EndIf
+
+	Else
     	If CountStepPackPayment = CountStepForCupFlagDelay Then
     		If Seeker = "curr" Then
     			Var Seeker.ExtendData = ExtendDataCurr
@@ -479,6 +519,10 @@
     			Open "ROOT/taobin_project/xml/page_payment_cash.xml"
     		EndIf
     	EndIf
+	EndIf
+
+
+
 
 
 

xml/page_topping_select7.xml

@@ -159,6 +159,9 @@
 
 	Var BugFlag = 0
 
+	Var Seeker.NameDrinkEN = NameDrink
+	Var Seeker.NameDrinkTH = NameDrinkTH
+
 	If show_eng = "true" Then
 
 		Var DirImage = "ROOT/taobin_project/image/topping2_en"
@@ -167,6 +170,7 @@
 		Var showname = NameDrink
 		Var showdesc = DrinkDescription
 
+
 		Var text_show_thai = "Invisible"
 		Var text_show_eng = "Enable"
 
@@ -205,6 +209,7 @@
 		Var showname = NameDrinkTH
 		Var showdesc = DrinkDescriptionTH
 
+
 		Var text_show_thai = "Enable"
 		Var text_show_eng = "Invisible"
 

xml/pos_fail.xml

@@ -0,0 +1,68 @@
+<Popup>
+<X> 0 </X>
+<Y> 0 </Y>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	Var Timeout = 0
+
+	Var DirImage = "ROOT/taobin_project/image/pos/"
+	If show_eng = "true" Then
+        Var PosFailImg = DirImage + "pos_fail_en.png"
+        Var CloseBtnImg = DirImage + "bn_close_en.png"
+        Var ClosePressedImg = DirImage + "bp_close_en.png"
+	Else
+        Var PosFailImg = DirImage + "pos_fail_th.png"
+        Var CloseBtnImg = DirImage + "bn_close_th.png"
+        Var ClosePressedImg = DirImage + "bp_close_th.png"
+	EndIf
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+	If Timeout > 30 Then
+	   Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	EndIf
+
+	Var Timeout = Timeout + 1
+
+	Refresh
+	TimerReset
+
+</EventTimeout>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+<Image>
+<X> 0 </X>
+<Y> 480 </Y>
+<Filename> PosFailImg </Filename>
+</Image>
+
+<Button>
+<X> 398 </X>
+<Y> 1753 </Y>
+<Filename> CloseBtnImg </Filename>
+<FilenamePress> ClosePressedImg </FilenamePress>
+<EventClick>
+    Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+</EventClick>
+</Button>
+
+<EventUnitTest1>
+    Open "ROOT/taobin_project/xml/pos_fail.xml"
+</EventUnitTest1>
+
+<EventUnitTest2>
+    If show_eng = "true" Then
+        Var show_eng = "false"
+    Else
+        Var show_eng = "true"
+    EndIf
+    Open "ROOT/taobin_project/xml/pos_fail.xml"
+</EventUnitTest2>
+
+</Popup>

xml/process/payment.ev

@@ -1,7 +1,6 @@
 DEBUGVAR "MIGGAZE0"
 If Seeker.PayWithQR = 1 Then
 
-
 		Var ServiceAmount2 = Seeker.ServiceAmount2
 		Var CreditReference = ""
 		Var TxReference = ""
@@ -37,6 +36,38 @@ If Seeker.PayWithQR = 1 Then
 
 		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"
 
+		If ConnectWithPOSMachine = 1 Then
+    		Var SelectDrink = Seeker.selected_a_drink
+    		Var ExtendData = Seeker.ExtendData
+    		Var ServiceAmount2 = Seeker.ServiceAmount2
+    		Var SessionID2 = SelectSlot + ":"
+    		Var SessionID2 = SessionID2 + ExtendData
+
+    		Var CreditReference = Seeker.CreditReferenceTmp
+    		Var VendingDiscount = Seeker.VendingDiscount
+    		Var VendingCampaign = Seeker.VendingCampaign
+    		Var TxReference = Seeker.TxRef1
+    		Var VendingOrderID = Seeker.ORDER_ID
+    		Var PayType = "newpay"
+
+    		Var ServiceType = "coffee-payment"
+    		Var ServiceCredit = SelectDrink
+    		Var SuggestID  = ""
+
+    		Var PayDetail = "2/S:0/0//XML|" +  Seeker.OrderChanel
+
+    		If GetFreeFromError = 1 Then
+    			Var Seeker.CodeChannel = 1
+    			Var Seeker.VendingCode = "FAU"
+    			Var Seeker.CodeNumber = "0000000000"
+    			Var VendingCampaign = ServiceAmount2
+    		EndIf
+
+    		Var PayDetail2 = Seeker.PayDetail2
+    		POSPay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+		EndIf
+
+
 	Else
 
 		TRY "/mnt/sdcard/coffeevending/taobin_project/xml/process/addpoint.ev"