...

2026-04-17 21:06:32 +00:00 · 2024-02-26 10:59:00 -06:00
parent a32149d755
commit e67a1f20c4
12 changed files with 1657 additions and 156 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -94,6 +94,7 @@ Sub Class_Globals
 	Private b_envioBD As Button
 	Public Provider As FileProvider
 	Public rutaBDBackup = ""
+	Private B4XSwitch1 As B4XSwitch
 End Sub

 Public Sub Initialize
@@ -147,6 +148,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db")
 	End If
 	skmt.Initialize(ruta,"kmt.db", True)
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS IMPRESORA (HABILITADA)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_GPS (HGDATE TEXT, HGLAT TEXT, HGLON TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_STORE (HSS_CODIGO TEXT, HSS_IN TEXT, HSS_OUT TEXT, HSS_TOT TEXT)")
@@ -241,8 +243,8 @@ Sub B4XPage_Appear
 	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_PHONE_STATE)
 	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
 	If Result Then
-		IMEN.Text = Phn.GetDeviceId
-		IMEI = Phn.GetDeviceId
+		IMEN.Text =""
+		IMEI = ""
 		LogColor($"//////////////////  IMEI: ${IMEI} ////////////////// "$, Colors.Blue)
 		IMEI=""  'Pruebas
 	End If
@@ -291,6 +293,19 @@ Sub B4XPage_Appear
 	'Obtenemos el usuario registrado
 	CallSubDelayed(FirebaseMessaging, "SubscribeToTopics")
 	dameUsuario
+	
+	c = skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA")
+	If c.RowCount >  0 Then
+		c.Position = 0
+		If c.GetString("HABILITADA") = 1 Then
+			B4XSwitch1.Value = True
+		Else If c.GetString("HABILITADA") = 0 Then
+			B4XSwitch1.Value = False
+		End If
+	Else
+		B4XSwitch1.Value = False
+	End If
+
 End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

@@ -640,6 +655,13 @@ Sub i_engrane_Click
 	l_server.Text = Starter.server
 	Subs.panelVisible(p_appUpdate,0,0)
 	p_appUpdate.Height = Root.Height
+	
+	c = skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA")
+	If c.RowCount = 0 Then
+		skmt.ExecNonQuery2("INSERT INTO IMPRESORA VALUES (?)", Array As Object(0))
+	Else
+		
+	End If
 End Sub

 Sub b_regesar_Click
@@ -679,3 +701,13 @@ Private Sub b_envioBD_Click
 	in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION
 	StartActivity(in)
 End Sub
+
+
+Private Sub B4XSwitch1_ValueChanged (Value As Boolean)
+	If Value Then
+		skmt.ExecNonQuery2("UPDATE IMPRESORA SET HABILITADA = (?)",Array As Object(1))
+	Else
+		Log("desactivado")
+		skmt.ExecNonQuery2("UPDATE IMPRESORA SET HABILITADA = (?)",Array As Object(0))
+	End If
+End Sub
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -28,7 +28,8 @@ Sub Class_Globals
 	Dim cuenta As String
 	Dim tipo_venta As String = "PREVENTA"
 	Dim MAC_IMPRESORA As String
-	
+	Dim btAdmin As BluetoothAdmin
+	Dim Printer1 As EscPosPrinter
 	
 	Dim c As Cursor
 	Dim s As Cursor
@@ -371,6 +372,8 @@ Sub Class_Globals
 	Private p_m2 As Panel
 	Private p_m3 As Panel
 	Private p_m4 As Panel
+	Dim impresoraConectada As Boolean = False
+	Dim errorImpresora As Int = 0
 End Sub

 'You can add more parameters here.
@@ -573,6 +576,35 @@ Sub B4XPage_Appear
 	Else
 		b_like.Visible = False
 	End If
+	c = skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
+	If c.RowCount > 0 Then
+		c.Position = 0
+		Starter.MAC_IMPRESORA = c.GetString("CAT_VA_VALOR")
+	End If
+	If Starter.MAC_IMPRESORA = "" Then Starter.MAC_IMPRESORA = "0"
+	Log("|" & Starter.MAC_IMPRESORA & "|")
+	Printer1.Initialize(Me, "Printer1")
+	
+	If Printer1.IsConnected = False Then
+'		Printer1.Connect
+		Log("1")
+	Else
+		Printer1.DisConnect
+		Printer1.Connect
+		Log("2")
+	End If
+	
+	c = skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA")
+	If c.RowCount >  0 Then
+		c.Position = 0
+		If c.GetString("HABILITADA") = 1 Then
+			B_IMP.Visible = True
+		Else If c.GetString("HABILITADA") = 0 Then
+			B_IMP.Visible = False
+		End If
+	Else If c.RowCount =  0 Then
+		B_IMP.Visible = False
+	End If
 End Sub

 Sub GPS_LocationChanged (Location1 As Location)
@@ -791,7 +823,6 @@ Private Sub b_preguntag_Click
 				Select Case result
 					Case DialogResponse.POSITIVE
 						
-						
 					
 						
 					
@@ -817,6 +848,7 @@ Private Sub b_preguntag_Click
 '	
 '
 '			Else
+Log(que_modulo)
 				If que_modulo = Null Or que_modulo = " " Then que_modulo = "1"
 				'	Msgbox(que_modulo,"ALO")
 				If que_modulo < =  ENCUESTA	Then
@@ -1480,50 +1512,286 @@ Sub b_mapa_Click
 	B4XPages.ShowPage("mapas")
 End Sub

+Sub Printer1_Connected (Success As Boolean)
+'	If Logger Then Log("Printer1_Connected")
+	If Success Then
+		ToastMessageShow("Impresora conectada", False)
+		skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MACIMP"))
+		skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MACIMP",Starter.mac_impresora))
+		LogColor("Impresora conectada", Colors.Green)
+'		B_IMP2.Enabled = True
+		impresoraConectada = True
+	Else
+'		Msgbox(Printer1.ConnectedErrorMsg, "Error connecting.") 'ignore
+'		ToastMessageShow("Error conectando la impresora", False)
+		LogColor("Error conectando la impresora", Colors.Red)
+		errorImpresora = errorImpresora + 1
+		If errorImpresora > 1 Then
+			Starter.MAC_IMPRESORA = "0"
+			errorImpresora = 0
+		End If
+	End If
+End Sub
+
 Sub B_IMP_Click
+'	Printer1.Connect2
+'	c=Starter.skmt.ExecQuery2("select count(*) AS CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("PERFIL"))
+'	c.Position =0
+'	perfil = c.GetString("CUANTOS")
+'	c.Close
+	
+'	If perfil > 0 Then
+'	c=Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("PERFIL"))
+'	If c.RowCount > 0 Then
+'		c.Position =0
+'		perfil = c.GetString("CAT_VA_VALOR")
+'		c.Close
+'	End If
+'	LogColor(perfil,Colors.Magenta)
+'	End If
+	
+	
+	
+	c=skmt.ExecQuery("select USUARIO from usuarioa")
+	c.Position=0
+	usuario = c.GetString("USUARIO")
+	DateTime.DateFormat = "MM/dd/yyyy"
+	sDate=DateTime.Date(DateTime.Now)
+	sTime=DateTime.Time(DateTime.Now)
+	c.Close
+'	c=Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION =?", Array As String ("SUCURSAL"))
+'	c.Position = 0
+'	sucursal = c.GetString("CAT_VA_VALOR")
+'	c.Close
+	
+	ProgressDialogShow("Imprimiendo, un momento ...")
+	Printer1.DisConnect
+	If Not(Printer1.IsConnected) Then
+		Log("Conectando a impresora ...")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada)
+			Sleep(1000)
+			Log("++++++  " & cont)
+			cont = cont + 1
+			If cont = 2 Then Printer1.Connect 'Tratamos de reconectar
+			If cont > 3 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	Else
+		Log("conectando 2")
+		Printer1.Connect
+		Private cont As Int = 0
+		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
+			Sleep(1000)
+			Log("******  " & cont)
+			cont = cont + 1
+			If cont = 2 Then Printer1.Connect
+			If cont > 3 Then impresoraConectada = True
+		Loop
+		Sleep(500)
+		impresoraConectada = False
+	End If
+	
 	TAMANO = 0
 	ESPACIO = 21
 	BLANCO = " "
-	printer.Initialize(cmp20.OutputStream)
-	printer.WriteLine("DURAKELO S.A. de C.V.")
-	printer.WriteLine("RFC: DUR-011025-T12")
-	printer.WriteLine("Tel.: 618-826-0104")
-	printer.WriteLine("Vendedor: KMTS ")
-	printer.WriteLine("Tienda: " & La_nombre.Text)
-	printer.WriteLine("-----------PREVENTA-----------")
-	s=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+	Dim bmp As Bitmap
+	bmp.InitializeResize(File.DirAssets, "guna.png", 192, 192, True) 'ignore
+	Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp)
+	
+	myimage = Printer1.DitherImage2D(myimage, 128)
+	
+	myimage= Printer1.PackImage(myimage)
+	Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening
+	Printer1.WriteString(Printer1.REVERSE)
+	
+	Printer1.PrintImage(myimage)
+	Printer1.WriteString(Printer1.UNREVERSE)
+
+	'Printer1.Justify = 1
+	'printer.Initialize(cmp20.OutputStream)
+'	Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" &  CRLF)
+	Printer1.WriteString("RFC: DRT-110316-9J1" &  CRLF)
+'	Printer1.WriteString(sucursal &  CRLF)
+	Printer1.WriteString(sDate &  CRLF)
+	Printer1.WriteString(sTime &  CRLF)
+	Printer1.WriteString("Vendedor:" & usuario &  CRLF)
+	Printer1.WriteString("Tienda: " & La_nombre.Text &  CRLF)
+	Printer1.WriteString("ID.Cliente: " &  la_cuenta.Text &  CRLF)
+	Printer1.WriteString("Calle: " & la_Calle.Text &  CRLF)
+	Printer1.WriteString("Colonia: " & la_col.Text &  CRLF)
+'	Printer1.WriteString("C.P.: " & la_cp.Text &  CRLF)
+	Printer1.WriteString("Entre calle1: " & l_entre1.Text &  CRLF)
+	Printer1.WriteString("Entre Calle2: " & l_entre2.Text &  CRLF)
+	
+	
+	Printer1.WriteString("-----------PREVENTA-----------" &  CRLF)
+	' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show.
+	s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS  PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS  FROM PEDIDO WHERE PE_CEDIS <> ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa)  order by  PE_PROID", Array As String("DUR"))
 	If S.RowCount>0 Then
 		For i=0 To S.RowCount -1
 			S.Position=i
-			printer.WriteLine(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE"))
-			TAMANO = s.GetLong("L_CANT") + TAMANO
-			TAMANO = s.GetLong("L_COSTOU") + TAMANO
-			TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO
-			ESPACIO = ESPACIO - TAMANO
-			For E=0 To ESPACIO -1
-				BLANCO = " " & BLANCO
-			Next
-			printer.WriteLine(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & "   $" & s.GETSTRING("PE_COSTO_TOT") )
-			TAMANO = 0
-			ESPACIO = 21
-			BLANCO = " "
+			If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then
+				Printer1.WriteString(s.GetString("PE_PRONOMBRE") &  CRLF)
+				
+			Else
+				
+				Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") &  CRLF)
+				TAMANO = s.GetLong("L_CANT") + TAMANO
+				TAMANO = s.GetLong("L_COSTOU") + TAMANO
+				TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO
+	
+				ESPACIO = ESPACIO - TAMANO
+	
+				For E=0 To ESPACIO -1
+					BLANCO = " " & BLANCO
+				Next
+				Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & "   $" & s.GETSTRING("PE_COSTO_TOT") &  CRLF )
+				TAMANO = 0
+				ESPACIO = 21
+				BLANCO = " "
+			End If
 		Next
 	End If
 	s.Close
-	printer.WriteLine("Total Preventa:   $" & total_cliente)
-	printer.WriteLine("------------VENTA-------------")
-	printer.WriteLine(" ")
-	printer.WriteLine("TOTAL:   $" & total_cliente)
-	printer.WriteLine(" ")
-	printer.WriteLine("----ESTE TICKET NO ES UN -----")
-	printer.WriteLine("--COMPROBANTE FISCAL, SOLO ES-")
-	printer.WriteLine("--------INFORMATIVO-----------")
-	printer.WriteLine("------------------------------")
-	printer.WriteLine(" ")
-	printer.Flush
-'	printer.Close
+	Printer1.WriteString(" " &  CRLF)
+	s=skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS  PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS  FROM PEDIDO WHERE LENGTH(PE_CEDIS) > 3 AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) AND PE_CLIENTE IN (Select CUENTA from cuentaa)  order by  PE_CEDIS, PE_COSTOU")
+	If S.RowCount>0 Then
+		Printer1.WriteString("------------PROMOS------------" &  CRLF)
+		For i=0 To S.RowCount -1
+			S.Position=i
+			If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then
+				Printer1.WriteString(s.GetString("PE_PRONOMBRE") &  CRLF)
+				
+			Else
+				
+				Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") &  CRLF)
+				TAMANO = s.GetLong("L_CANT") + TAMANO
+				TAMANO = s.GetLong("L_COSTOU") + TAMANO
+				TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO
+	
+				ESPACIO = ESPACIO - TAMANO
+	
+				For E=0 To ESPACIO -1
+					BLANCO = " " & BLANCO
+				Next
+				Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & "   $" & s.GETSTRING("PE_COSTO_TOT") &  CRLF )
+				TAMANO = 0
+				ESPACIO = 21
+				BLANCO = " "
+			End If
+		Next
+		Printer1.WriteString(" " &  CRLF)
+	End If
+	s.Close
+		
+'		Printer1.WriteString("-------------RMI..-----------" &  CRLF)
+'		' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show.
+'		s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS  PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS  FROM PEDIDO WHERE PE_TIPO = ? AND PE_CEDIS = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa)  order by  PE_PROID", Array As String("PREVENTA","DUR"))
+'		If S.RowCount>0 Then
+'			For i=0 To S.RowCount -1
+'				S.Position=i
+'				If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then
+'					Printer1.WriteString(s.GetString("PE_PRONOMBRE") &  CRLF)
+'				
+'				Else
+'				
+'					Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") &  CRLF)
+'					TAMANO = s.GetLong("L_CANT") + TAMANO
+'					TAMANO = s.GetLong("L_COSTOU") + TAMANO
+'					TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO
+'	
+'					ESPACIO = ESPACIO - TAMANO
+'	
+'					For E=0 To ESPACIO -1
+'						BLANCO = " " & BLANCO
+'					Next
+'					Printer1.WriteString(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & "   $" & s.GETSTRING("PE_COSTO_TOT") &  CRLF )
+'					TAMANO = 0
+'					ESPACIO = 21
+'					BLANCO = " "
+'				End If
+'			Next
+'		End If
+'		s.Close
+		
+	s=skmt.ExecQuery("select SUM(PE_COSTO_TOT) AS TOTAL FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+	s.Position =0
+	'	If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then
+	'		Printer1.WriteString("Descuento:     $" & 	 (s.GetString("TOTAL2") -  s.GetString("TOTAL")))
+	'	End If
+	Printer1.WriteString("Total Preventa:   $" & s.GetString("TOTAL") &  CRLF)
+	s.Close
+	c= skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP )")
+	C.Position=0
+	Printer1.WriteString("Total Articulos:   " & c.GetString("PC_NOART") &  CRLF)
+	c.Close
+	
+	Printer1.WriteString(" " &  CRLF)
+	Printer1.WriteString("------------------------------" &  CRLF)
+	Printer1.WriteString("ENTREGA EN :" &  CRLF)
+	Printer1.WriteString(la_Calle.Text &  CRLF)
+	Printer1.WriteString("----ESTE TICKET NO ES UN -----" &  CRLF)
+	Printer1.WriteString("--COMPROBANTE FISCAL, SOLO ES-" &  CRLF)
+	Printer1.WriteString("--------INFORMATIVO-----------" &  CRLF)
+	Printer1.WriteString("------------------------------" &  CRLF)
+	Printer1.WriteString(" " &  CRLF)
+	
+	Sleep(1000)
+	Printer1.DisConnect
+	
+	ProgressDialogHide
+'	printer.Flush
+	'	printer.Close
+	
 End Sub

+'Sub B_IMP_Click
+'	TAMANO = 0
+'	ESPACIO = 21
+'	BLANCO = " "
+'	printer.Initialize(cmp20.OutputStream)
+'	printer.WriteLine("DURAKELO S.A. de C.V.")
+'	printer.WriteLine("RFC: DUR-011025-T12")
+'	printer.WriteLine("Tel.: 618-826-0104")
+'	printer.WriteLine("Vendedor: KMTS ")
+'	printer.WriteLine("Tienda: " & La_nombre.Text)
+'	printer.WriteLine("-----------PREVENTA-----------")
+'	s=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
+'	If S.RowCount>0 Then
+'		For i=0 To S.RowCount -1
+'			S.Position=i
+'			printer.WriteLine(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE"))
+'			TAMANO = s.GetLong("L_CANT") + TAMANO
+'			TAMANO = s.GetLong("L_COSTOU") + TAMANO
+'			TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO
+'			ESPACIO = ESPACIO - TAMANO
+'			For E=0 To ESPACIO -1
+'				BLANCO = " " & BLANCO
+'			Next
+'			printer.WriteLine(BLANCO & s.GETSTRING("PE_CANT") & " X $" & s.GETSTRING("PE_COSTOU") & "   $" & s.GETSTRING("PE_COSTO_TOT") )
+'			TAMANO = 0
+'			ESPACIO = 21
+'			BLANCO = " "
+'		Next
+'	End If
+'	s.Close
+'	printer.WriteLine("Total Preventa:   $" & total_cliente)
+'	printer.WriteLine("------------VENTA-------------")
+'	printer.WriteLine(" ")
+'	printer.WriteLine("TOTAL:   $" & total_cliente)
+'	printer.WriteLine(" ")
+'	printer.WriteLine("----ESTE TICKET NO ES UN -----")
+'	printer.WriteLine("--COMPROBANTE FISCAL, SOLO ES-")
+'	printer.WriteLine("--------INFORMATIVO-----------")
+'	printer.WriteLine("------------------------------")
+'	printer.WriteLine(" ")
+'	printer.Flush
+''	printer.Close
+'End Sub
+
 Sub Printer_Connected (Success As Boolean)
 	If Success Then
 		B_IMP.Enabled = True
@@ -2177,19 +2445,27 @@ Private Sub B_guardaencuesta_m3_Click
 	If P9_M3 = "" Then PASA = "0"
 	If P5_M3 = "" Then PASA = "0"
 	
-	P3_M3 = CB1_P3_M3.Checked & "," & CB2_P3_M3.Checked & "," & CB3_P3_M3.Checked & "," & CB4_P3_M3.Checked & "," & CB5_P3_M3.Checked
+'	P3_M3 = CB1_P3_M3.Checked & "," & CB2_P3_M3.Checked & "," & CB3_P3_M3.Checked & "," & CB4_P3_M3.Checked & "," & CB5_P3_M3.Checked
 	If CB1_P3_M3.Checked = False And  CB2_P3_M3.Checked = False And CB3_P3_M3.Checked = False And CB4_P3_M3.Checked = False And CB5_P3_M3.Checked = False Then PASA = "0"
-	P4_M3 = CB1_P4_M3.Checked & "," & CB2_P4_M3.Checked & "," & CB3_P4_M3.Checked & "," & CB4_P4_M3.Checked & "," & CB5_P4_M3.Checked
+'	P4_M3 = CB1_P4_M3.Checked & "," & CB2_P4_M3.Checked & "," & CB3_P4_M3.Checked & "," & CB4_P4_M3.Checked & "," & CB5_P4_M3.Checked
 	If  CB1_P4_M3.Checked  = False And  CB2_P4_M3.Checked  = False And  CB3_P4_M3.Checked  = False And  CB4_P4_M3.Checked  = False And  CB5_P4_M3.Checked = False Then PASA = "0"
 	
-	P6_M3 = CB1_P6_M3.Checked & "," & CB2_P6_M3.Checked & "," & CB3_P6_M3.Checked & "," & CB4_P6_M3.Checked & "," & CB5_P6_M3.Checked & "," & CB6_P6_M3.Checked  & "," & ET_P6_M3.TEXT
+'	P6_M3 = CB1_P6_M3.Checked & "," & CB2_P6_M3.Checked & "," & CB3_P6_M3.Checked & "," & CB4_P6_M3.Checked & "," & CB5_P6_M3.Checked & "," & CB6_P6_M3.Checked  & "," & ET_P6_M3.TEXT
 	
-	P7_M3 = CB1_P7_M3.Checked & "," & CB2_P7_M3.Checked & "," & CB3_P7_M3.Checked & "," & CB4_P7_M3.Checked
+'	P7_M3 = CB1_P7_M3.Checked & "," & CB2_P7_M3.Checked & "," & CB3_P7_M3.Checked & "," & CB4_P7_M3.Checked
 	If CB1_P7_M3.Checked  = False And  CB2_P7_M3.Checked  = False And  CB3_P7_M3.Checked  = False And  CB4_P7_M3.Checked = False Then PASA = "0"
 	
-	P8_M3 = CB1_P8_M3.Checked & "," & CB2_P8_M3.Checked & "," & CB3_P8_M3.Checked & "," & CB4_P8_M3.Checked
+'	P8_M3 = CB1_P8_M3.Checked & "," & CB2_P8_M3.Checked & "," & CB3_P8_M3.Checked & "," & CB4_P8_M3.Checked
 	If CB1_P8_M3.Checked = False And  CB2_P8_M3.Checked = False And  CB3_P8_M3.Checked = False And  CB4_P8_M3.Checked = False Then PASA = "0"
+	If rb1_m3_p1.Checked Then P3_M3 = "7 A 9"
+	If RB2_M3_P1.Checked Then P3_M3 = "9 A 11"
+	If RB3_M3_P1.Checked Then P3_M3 = "11 A 13"
+	If RB4_M3_P1.Checked Then P3_M3 = "13 +"
 	
+	If RB1_M3_P2.Checked Then P4_M3 = "2 A 4"
+	If RB2_M3_P2.Checked Then P4_M3 = "4 A 6"
+	If RB3_M3_P2.Checked Then P4_M3 = "6 A 8"
+	If RB4_M3_P2.Checked Then P4_M3 = "8 +"
 	
 	If CB5_P4_M3.Checked  = True And ( CB2_P4_M3.Checked = True Or  CB3_P4_M3.Checked = True Or  CB4_P4_M3.Checked = True Or CB1_P4_M3.Checked = True ) Then
 		PASA = "0"
@@ -3174,5 +3450,3 @@ Private Sub CB4_P8_M3_CheckedChange(Checked As Boolean)
 End Sub


-
-
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -456,7 +456,7 @@ Sub B4XPage_Appear
 	'///////
 	CallSub(Starter, "ENVIA_ULTIMA_GPS")
 '	panel_5.Visible = False
-'	Log("panel5 visible FALSE")
+'	'Log("panel5 visible FALSE")
 End Sub

 Sub Subir_Click
@@ -699,7 +699,7 @@ Sub Subir_Click
 	If x2.RowCount>0 Then
 		For i=0 To x2.RowCount -1
 			x2.Position=i
-			LogColor(x2.GetString("CLIENTE"),Colors.Red)
+			'Logcolor(x2.GetString("CLIENTE"),Colors.Red)
 			Dim cmd As DBCommand
 			cmd.Initialize
 			cmd.Name = "insert_ENCUESTA_MODULO3"
@@ -807,7 +807,7 @@ Sub cargar_Click
 	sTime=DateTime.Time(DateTime.Now)
 	
 	Dim P As PhoneId
-	imei = P.GetDeviceId
+	imei = ""
 	cmd.Initialize
 	cmd.Name ="insert_drop_GV2_2"
 	cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN)
@@ -845,7 +845,7 @@ Sub cargar_Click
 	
 	cmd.Initialize
 	cmd.Name = "select_hist_datos_GV2_2"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 	
 	cmd.Initialize
@@ -870,8 +870,8 @@ Sub cargar_Click
 		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos2")
 	
 		cmd.Initialize
-		cmd.Name = "select_hist_datos_GV2"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+		cmd.Name = "select_hist_datos_GV2_2"
+		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN,E_RUTA2.text, ALMACEN,E_RUTA2.text, ALMACEN)
 		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 	
 		cmd.Initialize
@@ -940,9 +940,9 @@ End Sub
 Sub JobDone(Job As HttpJob)
 '	If Job.JobName = "DBRequest" Then
 '		Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
-'		Log($"Tag: ${RESULT.tag}, success=${Job.Success}"$)
+'		'Log($"Tag: ${RESULT.tag}, success=${Job.Success}"$)
 '	End If
-	
+	'Log(Job.Tag)
 	If Job.Success = False Then
 		'ToastMessageShow("Error: " & Job.ErrorMessage, True)
 		If Job.ErrorMessage = "STREAM" Then
@@ -955,7 +955,7 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 	Else 'If Job Success then ...
-		LogColor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
+		'Logcolor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
 		'Verificamos que el usuario guardado en BD sea VALIDO.
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
@@ -964,20 +964,20 @@ Sub JobDone(Job As HttpJob)
 				For Each records() As Object In RESULT.Rows
 					n = records(RESULT.Columns.Get("USUARIO"))
 				Next
-				LogColor("**************************"&n, Colors.Green)
+				'Logcolor("**************************"&n, Colors.Green)
 				If n = "OKActivo"  Then
-					Log("Usuario guardado en BD es 'Valido'")
-				Else If n  = "OKExpirado" Then
-					Msgbox("Usuario Expirado llamar al administrador","") 'ignore
-					B4XPages.ShowPage("B4XMainPage")
-				Else If n = "OKCancelado" Then
-					Msgbox("Usuario Cancelado llamar al administrador","") 'ignore
-					B4XPages.ShowPage("B4XMainPage")
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "select_ruta_GV2_70_2"
+					cmd.Parameters = Array As Object(ALMACEN,e_ruta.text)
+					B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
+					'Log("Usuario guardado en BD es 'Valido'")
 				Else
 					Msgbox("Usuario o password No validos","") 'ignore
-					B4XPages.ShowPage("B4XMainPage")
+					B4XPages.MainPage.skmt.ExecNonQuery("delete from usuarioa")
+					ExitApplication
 				End If
-				Log("*****************  "&n)
+				'Log("*****************  "&n)
 			End If
 		End If

@@ -1011,7 +1011,7 @@ Sub JobDone(Job As HttpJob)
 				Next
 				Listo1 = 1
 				S_CC.Text = "LISTO"
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
@@ -1108,7 +1108,7 @@ Sub JobDone(Job As HttpJob)
 				Next
 				Listo1 = 1
 				S_CC.Text = "LISTO"
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Resumen Actualizado." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Resumen Actualizado." , True)
 			End If
 		End If

@@ -1120,7 +1120,7 @@ Sub JobDone(Job As HttpJob)
 					Dim HP_CODIGO_PROMOCION As String = records(RESULT.Columns.Get("HP_CODIGO_PROMOCION"))
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_PROMOS(HP_CLIENTE, HP_CODIGO_PROMOCION) VALUES (?,?)", Array As Object (HP_CLIENTE, HP_CODIGO_PROMOCION))
 				Next
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Historico Promociones Actualizado." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Historico Promociones Actualizado." , True)
 				If PB1.Progress = 0 Then
 					PB1.Progress = 30
 					S_CH.Text = "CARGANDO"
@@ -1142,7 +1142,7 @@ Sub JobDone(Job As HttpJob)
 					Dim HCCP_CANT As String = records(RESULT.Columns.Get("HCCP_CANT"))
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_CLIENTE_CANT_PROMOS(HCCP_CLIENTE, HCCP_PROMO, HCCP_CANT) VALUES (?,?,?)", Array As Object (HCCP_CLIENTE, HCCP_PROMO,HCCP_CANT))
 				Next
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Clientes Promociones Actualizado." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Clientes Promociones Actualizado." , True)
 			End If
 		End If

@@ -1154,7 +1154,7 @@ Sub JobDone(Job As HttpJob)
 					Dim HMC_TOTAL As String = records(RESULT.Columns.Get("HMC_TOTAL"))
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_MARCAS_CUOTAS(HMC_MARCA, HMC_TOTAL) VALUES (?,?)", Array As Object (HMC_MARCA, HMC_TOTAL))
 				Next
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Marcas" , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Marcas" , True)
 			End If
 		End If

@@ -1287,7 +1287,7 @@ Sub JobDone(Job As HttpJob)
 					PB2.Progress = 100
 					S_CP.Text = "LISTO"
 				End If
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Productos Actualizados." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Productos Actualizados." , True)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
@@ -1327,7 +1327,7 @@ Sub JobDone(Job As HttpJob)
 					PB2.Progress = 100
 					S_CP.Text = "LISTO"
 				End If
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Promociones  Actualizados." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Promociones  Actualizados." , True)
 				Listo4=1
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
@@ -1364,15 +1364,15 @@ Sub JobDone(Job As HttpJob)
 				If PB2.Progress = 0 Then
 					PB2.Progress = 30
 					S_CP.Text = "CARGANDO"
-					Log("C4")
+					'Log("C4")
 				ELSE If PB2.Progress = 30 Then
 					PB2.Progress = 60
 				ELSE IF PB2.Progress = 60 Then
 					PB2.Progress = 100
 					S_CP.Text = "LISTO"
-					Log("3")
+					'Log("3")
 				End If
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Promociones especiales  Actualizados." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Promociones especiales  Actualizados." , True)

 				Listo4=1
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
@@ -1430,12 +1430,17 @@ Sub JobDone(Job As HttpJob)
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			If RESULT.Tag = "hist_datos" Then 'query tag
+					Dim cont As Int = 0
 				For Each records() As Object In RESULT.Rows
+					cont = cont +1
+					
 					Dim HVD_CLIENTE As String = records(RESULT.Columns.Get("HVD_CLIENTE"))
 					Dim HVD_PRONOMBRE As String = records(RESULT.Columns.Get("HVD_PRONOMBRE"))
 					Dim HVD_CANT As String = records(RESULT.Columns.Get("HVD_CANT"))
 					Dim HVD_COSTO_TOT As String = records(RESULT.Columns.Get("HVD_COSTO_TOT"))
+					Log(cont &" " &HVD_CLIENTE&"--"&HVD_PRONOMBRE&"--"&HVD_CANT&"--"&HVD_COSTO_TOT)
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT) VALUES (?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT))
+				
 				Next
 				Listo3 =1
 				If PB1.Progress = 0 Then
@@ -1447,7 +1452,7 @@ Sub JobDone(Job As HttpJob)
 					PB1.Progress = 100
 					S_CH.Text = "LISTO"
 				End If
-				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Venta historico Actualizado." , True)
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow("Venta historico Actualizado." , True)
 				If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
 					B4XPage_Appear
 					img2.Visible=False
@@ -1540,7 +1545,7 @@ Sub JobDone(Job As HttpJob)
 				Next
 				PB2.Progress = 100
 				S_CP.Text = "LISTO"
-				Log("5")
+				'Log("5")
 			End If
 		End If
 	 
@@ -1655,24 +1660,24 @@ Sub connecta_Click
 		Private usrT As String = c.GetString("USUARIO")
 		Private passT As String = c.GetString("PASS")
 		cmd.Initialize
-		cmd.Name = "select_usuario_guna_GV2_1"
+		cmd.Name = "select_usuario_guna_GV2_10"
 		cmd.Parameters = Array As Object(usrT, passT)
 		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA")
 	End If
 	c.Close

-	If imei = "" Then
-		cmd.Initialize
-		cmd.Name = "select_ruta_GV2_70"
-		cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei)
-		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
-	Else
-		Dim cmd As DBCommand
-		cmd.Initialize
-		cmd.Name = "select_ruta_GV2_70"
-		cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei)
-		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
-	End If
+'	If imei = "" Then
+'		cmd.Initialize
+'		cmd.Name = "select_ruta_GV2_70_2"
+'		cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei)
+'		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
+'	Else
+'		Dim cmd As DBCommand
+'		cmd.Initialize
+'		cmd.Name = "select_ruta_GV2_70_2"
+'		cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei)
+'		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
+'	End If

 	If e_ruta.Text = "KMTS1" Then
 		cargar.Visible = True
@@ -1710,7 +1715,7 @@ Sub BUSCA_Click
 End Sub

 Sub b_mapa_Click
-	Log("mapClic")
+	'Log("mapClic")
 	B4XPages.GetPage("Mapas")
 End Sub

@@ -2032,7 +2037,7 @@ Sub resdia_Click
 		'
 		'///  Al parecer d.GetString("MONTO_DIA") regresa null y la funcion numberFormat truena
 		'/////////////////////////////////////////////////////////////////////////////////
-		Log("|"&d.GetString("MONTO_DIA")&"|")
+		'Log("|"&d.GetString("MONTO_DIA")&"|")
 		'L_PRIO.Text = NumberFormat(d.GetString("MONTO_DIA"),0,2)
 		L_PRIO.Text = d.GetString("MONTO_DIA")
 		d.Close
@@ -2110,16 +2115,16 @@ End Sub
 '''''''''''''''''''''''''''''''''''' VALIDAR CARACTERES
 Sub e_ruta_TextChanged (Old As String, New As String)
 	Dim validChars As String ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 "
-'	Log("Antes: " & Old & " | " & New)
+'	'Log("Antes: " & Old & " | " & New)
 	If Old <> "KMTS1" Then
-'		Log("Desp: " & Old & " | " & New)
+'		'Log("Desp: " & Old & " | " & New)
 		Try
 			If validChars.Contains(New.SubString(New.Length-1)) = False Then
 				e_ruta.Text = New.SubString2(0, New.Length-1)
 				e_ruta.SelectionStart = e_ruta.Text.Length
 			End If
 		Catch
-			Log(LastException)
+			'Log(LastException)
 		End Try
 	End If
 End Sub
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -338,7 +338,10 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 '	Return True To close, False To cancel
 '	ya_entro ="0" : Log("ya_entro=0")
-	If l_info.Visible Then
+	If lv_catalogos.visible = True Then
+		B4XPages.ShowPage("Cliente")
+	Return False
+	ELSE If l_info.Visible Then
 		l_info.Visible = False
 		Return False
 	else if lv_promos.visible Then
@@ -521,6 +524,8 @@ Sub cuentaProds
 			Private m As Map
 			m=CreateMap("cant":cant1.Text, "precio":esteTag.get(0))
 			prodsMap.Put(esteTag.Get(2), m)
+		Else
+			prodsMap.Remove(esteTag.Get(2))
 		End If
 		l_total.Visible = True
 		l_totProds.Visible = True
@@ -528,7 +533,7 @@ Sub cuentaProds
 		l_totProds.text = $"Prods: ${totalProds}"$
 	Next
 '	LogColor("TIEMPO cuentaProds -=" & ((DateTime.Now-inicioContador)/1000), Colors.Red)
-'	LogColor(prodsMap, Colors.blue)
+	LogColor(prodsMap, Colors.blue)
 	p_botonesVenta.Visible = True
 	Log($"Total Prods: ${totalProds}, Total Compra: $$1.2{totalCompra}"$)
 End Sub
@@ -601,7 +606,9 @@ Private Sub b_continuar_Click
 		p1 = prodsMap.Get(p)
 		Log(p & "|" & p1)
 		Private pn As String = Subs.traeProdNombre(p)
-		If pn <> "N/A" Then Subs.guardaProducto(Subs.traeAlmacen, p1.Get("precio"), p1.Get("cant"), pn, p, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		If pn <> "N/A" Then 
+			Subs.guardaProducto(Subs.traeAlmacen, p1.Get("precio"), p1.Get("cant"), pn, p, Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		End If
 	Next
 	Log("promos-inv, prods-inv, cat-vis")
 	lv_promos.Visible = False
--- a/B4A/C_Promos.bas
+++ b/B4A/C_Promos.bas
@@ -357,14 +357,21 @@ End Sub
 Private Sub b_continuar_Click
 	cuentaProds
 	Log("====================================================================")
-'	Log($"${prodsIds}${CRLF}${prodsCants}${CRLF}${prodsPrecios}"$)
+	Log($"${prodsIds}${CRLF}${prodsCants}${CRLF}${prodsPrecios}"$)
 	For t = 0 To prodsIds.Size - 1 'Guardamos los productos fijos de la promocion en pedido.
 		Private pn As String = Subs.traeProdNombre(prodsIds.Get(t))
-		Subs.guardaProducto(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		LogColor(pn,Colors.Red)
+		If pn <> "N/A" Then
+			Subs.guardaProducto(estaPromo, prodsPrecios.Get(t), prodsCants.Get(t), pn, prodsIds.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		End If
 	Next
+	Log(prodsIds2)
 	For t = 0 To prodsIds2.Size - 1 'Guardamos los productos variables de la promocion en pedido.
 		Private pn As String = Subs.traeProdNombre(prodsIds2.Get(t))
-		Subs.guardaProducto(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		LogColor(pn,Colors.Green)
+		If pn <> "N/A" Then
+			Subs.guardaProducto(estaPromo, prodsPrecios2.Get(t), prodsCants2.Get(t), pn, prodsIds2.Get(t), Subs.traeCliente, Subs.traeFecha, Subs.traeUsuarioDeBD, Subs.traeRuta, 0, B4XPages.MainPage.tipo_venta)
+		End If
 	Next
 	lv_prodsFijos.Clear
 '	Activity_KeyPress(KeyCodes.KEYCODE_BACK)
--- a/B4A/EscPosPrinter.bas
+++ b/B4A/EscPosPrinter.bas
--- a/B4A/Files/cliente.bal
+++ b/B4A/Files/cliente.bal
--- a/B4A/Files/guna.png
+++ b/B4A/Files/guna.png
--- a/B4A/Files/login.bal
+++ b/B4A/Files/login.bal
--- a/V3.1.b4a
+++ b/V3.1.b4a
@@ -8,52 +8,54 @@ File14=engrane18.png
 File15=ESNCUESTA_M2.bal
 File16=fondo_kmt.jpg
 File17=gps20.png
-File18=guna18.png
-File19=guna-fondo.png
+File18=guna.png
+File19=guna18.png
 File2=bus-ar.png
-File20=Hacer pedido.jpg
-File21=hacerpedido30.png
-File22=ic_cloud_download_white_24dp.png
-File23=itembuttonblue.png
-File24=login.bal
-File25=logo-guna-18.png
-File26=MainPage.bal
-File27=Malo.jpg
-File28=mapa_rutas.bal
-File29=mas-azul.png
+File20=guna-fondo.png
+File21=Hacer pedido.jpg
+File22=hacerpedido30.png
+File23=ic_cloud_download_white_24dp.png
+File24=itembuttonblue.png
+File25=login.bal
+File26=Logo Guna_192x192.png
+File27=logo-guna-18.png
+File28=MainPage.bal
+File29=Malo.jpg
 File3=carrito.png
-File30=mas-azul-red.png
-File31=mas-azul-red1.png
-File32=menos.png
-File33=menosred.png
-File34=menos-red.png
-File35=nota.bal
-File36=noventa.bal
-File37=nuevocliente.bal
-File38=nuevo-cliente20.png
-File39=Nvo Cliente.jpg
+File30=mapa_rutas.bal
+File31=mas-azul.png
+File32=mas-azul-red.png
+File33=mas-azul-red1.png
+File34=menos.png
+File35=menosred.png
+File36=menos-red.png
+File37=nota.bal
+File38=noventa.bal
+File39=nuevocliente.bal
 File4=celltitle.bal
-File40=palomita_verde.png
-File41=pedido.bal
-File42=planfia_logo.png
-File43=principal.bal
-File44=proditem.bal
-File45=productos.bal
-File46=promociones.bal
-File47=qr_gallina.jpg
-File48=resdia.bal
-File49=ResDia.jpg
+File40=nuevo-cliente20.png
+File41=Nvo Cliente.jpg
+File42=palomita_verde.png
+File43=pedido.bal
+File44=planfia_logo.png
+File45=principal.bal
+File46=proditem.bal
+File47=productos.bal
+File48=promociones.bal
+File49=qr_gallina.jpg
 File5=cliente.bal
-File50=resdia20.png
-File51=salma.jpg
-File52=salma.png
-File53=senial.jpg
-File54=sync.png
-File55=Ticket dia.jpg
-File56=ticketdia20.png
-File57=ticketsdia.bal
-File58=Tiendita.jpg
+File50=resdia.bal
+File51=ResDia.jpg
+File52=resdia20.png
+File53=salma.jpg
+File54=salma.png
+File55=senial.jpg
+File56=sync.png
+File57=Ticket dia.jpg
+File58=ticketdia20.png
+File59=ticketsdia.bal
 File6=clientes.bal
+File60=Tiendita.jpg
 File7=durakelo.png
 File8=ENCUESSTA_M3.bal
 File9=ENCUESTA.bal
@@ -111,7 +113,9 @@ FileGroup55=Default Group
 FileGroup56=Default Group
 FileGroup57=Default Group
 FileGroup58=Default Group
+FileGroup59=Default Group
 FileGroup6=Default Group
+FileGroup60=Default Group
 FileGroup7=Default Group
 FileGroup8=Default Group
 FileGroup9=Default Group
@@ -149,7 +153,7 @@ Library6=byteconverter
 Library7=camera
 Library8=compressstrings
 Library9=core
-ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="28"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true"~\n~    android:smallScreens="true"~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(<activity android:name="com.google.zxing.client.android.CaptureActivity"~\n~android:screenOrientation="landscape" ~\n~android:configChanges="orientation|keyboardHidden"~\n~android:theme="@android:style/Theme.NoTitleBar.Fullscreen"~\n~android:windowSoftInputMode="stateAlwaysHidden">~\n~</activity>)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~	  ''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~   android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~AddApplicationText(~\n~<uses-library~\n~      android:name="org.apache.http.legacy"~\n~      android:required="false" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~	AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.ACCESS_FINE_LOCATION"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'/////////////////////////   FLP Y PUSH /////////////~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~	CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~	SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'///////////////////////  App Updating ////////////////~\n~		AddManifestText(<uses-permission~\n~		   android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~		   android:maxSdkVersion="30" />~\n~		)~\n~		AddApplicationText(~\n~		  <provider~\n~		  android:name="android.support.v4.content.FileProvider"~\n~		  android:authorities="$PACKAGE$.provider"~\n~		  android:exported="false"~\n~		  android:grantUriPermissions="true">~\n~		  <meta-data~\n~		  android:name="android.support.FILE_PROVIDER_PATHS"~\n~		  android:resource="@xml/provider_paths"/>~\n~		  </provider>~\n~		)~\n~		CreateResource(xml, provider_paths,~\n~		<paths>~\n~		   <external-files-path name="name" path="" />~\n~		   <files-path name="name" path="" />~\n~		   <files-path name="name" path="shared" />~\n~		</paths>~\n~		)~\n~AddManifestText(<uses-feature android:name="android.hardware.telephony" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.flash" android:required="false" />)~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~		~\n~SetApplicationAttribute(android:largeHeap, "true")
+ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="5" android:targetSdkVersion="30"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true"~\n~    android:smallScreens="true"~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~AddApplicationText(<activity android:name="com.google.zxing.client.android.CaptureActivity"~\n~android:screenOrientation="landscape" ~\n~android:configChanges="orientation|keyboardHidden"~\n~android:theme="@android:style/Theme.NoTitleBar.Fullscreen"~\n~android:windowSoftInputMode="stateAlwaysHidden">~\n~</activity>)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~	  ''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~   android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~AddApplicationText(~\n~<uses-library~\n~      android:name="org.apache.http.legacy"~\n~      android:required="false" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	  'End of default text.~\n~	  ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~	AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.ACCESS_FINE_LOCATION"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"~\n~  android:maxSdkVersion="30" />~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'/////////////////////////   FLP Y PUSH /////////////~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~	CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~	CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~	SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'//////////////////////////////////////////////////////~\n~~\n~'///////////////////////  App Updating ////////////////~\n~		AddManifestText(<uses-permission~\n~		   android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~		   android:maxSdkVersion="30" />~\n~		)~\n~		AddApplicationText(~\n~		  <provider~\n~		  android:name="android.support.v4.content.FileProvider"~\n~		  android:authorities="$PACKAGE$.provider"~\n~		  android:exported="false"~\n~		  android:grantUriPermissions="true">~\n~		  <meta-data~\n~		  android:name="android.support.FILE_PROVIDER_PATHS"~\n~		  android:resource="@xml/provider_paths"/>~\n~		  </provider>~\n~		)~\n~		CreateResource(xml, provider_paths,~\n~		<paths>~\n~		   <external-files-path name="name" path="" />~\n~		   <files-path name="name" path="" />~\n~		   <files-path name="name" path="shared" />~\n~		</paths>~\n~		)~\n~AddManifestText(<uses-feature android:name="android.hardware.telephony" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />)~\n~AddManifestText(<uses-feature android:name="android.hardware.camera.flash" android:required="false" />)~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~		~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN)~\n~AddManifestText(<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />)
 Module1=appUpdater
 Module10=C_NuevoCliente
 Module11=C_Pedidos
@@ -159,12 +163,13 @@ Module14=C_Promos
 Module15=C_TicketsDia
 Module16=C_UpdateAvailable
 Module17=DBRequestManager
-Module18=FirebaseMessaging
-Module19=MAPA_RUTAS
+Module18=EscPosPrinter
+Module19=FirebaseMessaging
 Module2=B4XMainPage
-Module20=Starter
-Module21=Subs
-Module22=Tracker
+Module20=MAPA_RUTAS
+Module21=Starter
+Module22=Subs
+Module23=Tracker
 Module3=BatteryUtilities
 Module4=C_Cliente
 Module5=C_Clientes
@@ -172,15 +177,15 @@ Module6=C_Historico
 Module7=C_Mapas
 Module8=C_Nota
 Module9=C_NoVenta
-NumberOfFiles=58
+NumberOfFiles=60
 NumberOfLibraries=33
-NumberOfModules=22
+NumberOfModules=23
 Version=12.5
@EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Guna V3.1
 	#VersionCode: 1
-	#VersionName: 4.01.19_1ENC
+	#VersionName: 4.02.21ENC
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
--- a/V3.1.b4a.meta
+++ b/V3.1.b4a.meta
@@ -14,6 +14,7 @@ ModuleBookmarks2=
 ModuleBookmarks20=
 ModuleBookmarks21=
 ModuleBookmarks22=
+ModuleBookmarks23=
 ModuleBookmarks3=
 ModuleBookmarks4=
 ModuleBookmarks5=
@@ -37,6 +38,7 @@ ModuleBreakpoints2=
 ModuleBreakpoints20=
 ModuleBreakpoints21=
 ModuleBreakpoints22=
+ModuleBreakpoints23=
 ModuleBreakpoints3=
 ModuleBreakpoints4=
 ModuleBreakpoints5=
@@ -48,18 +50,19 @@ ModuleClosedNodes0=
 ModuleClosedNodes1=5,7,8,9,10,11,12,13,14
 ModuleClosedNodes10=
 ModuleClosedNodes11=6
-ModuleClosedNodes12=2,3,8,10,11,13,14,15
-ModuleClosedNodes13=6,8,10,11,12,13,14,15,16,17,18,19,20,21,22,23
+ModuleClosedNodes12=2,3,8,10,14,15
+ModuleClosedNodes13=6,10,11,13,14,16,17,20,21,22,23
 ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
 ModuleClosedNodes18=
-ModuleClosedNodes19=3,4
+ModuleClosedNodes19=
 ModuleClosedNodes2=
-ModuleClosedNodes20=1
-ModuleClosedNodes21=
+ModuleClosedNodes20=3,4
+ModuleClosedNodes21=1
 ModuleClosedNodes22=
+ModuleClosedNodes23=
 ModuleClosedNodes3=
 ModuleClosedNodes4=
 ModuleClosedNodes5=7
@@ -67,6 +70,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,Class_Globals,0,0,Diseñador Visual,ENCUESSTA_M3.bal,-100,3,C_Cliente,B_guardaencuesta_m3_Click,2159,6,C_Cliente,p6_TextChanged,2500,0,C_Principal,cargar_Click,907,0,C_Cliente,p8_TextChanged,2529,0,C_Cliente,b_preguntag_Click,794,1,Main,Globals,24,0,C_Principal,JobDone,1018,2,C_Cliente,B_guardaencuesta_m2_Click,2093,0
+NavigationStack=B4XMainPage,b_envioBD_Click,673,0,B4XMainPage,Class_Globals,91,0,B4XMainPage,B4XPage_Created,144,6,B4XMainPage,i_engrane_Click,642,2,Diseñador Visual,login.bal,-100,6,C_Cliente,B_IMP_Click,1596,6,B4XMainPage,B4XSwitch1_ValueChanged,706,6,C_Principal,Class_Globals,0,0,C_Cliente,B4XPage_Appear,599,4,B4XMainPage,B4XPage_Appear,299,6
 SelectedBuild=0
-VisibleModules=20,2,21,12,13,4,8,11,5,10
+VisibleModules=21,2,22,12,13,4,8,11,5,10
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -29,6 +29,9 @@ Sub Process_Globals
 	Dim logger As Boolean = False
 	Dim marcaCel As String = ph.manufacturer
 	Dim muestraProgreso = 0
+	Private BTAdmin As BluetoothAdmin
+	Dim MAC_IMPRESORA As String
+	Public BluetoothState As Boolean
 End Sub

 Sub Service_Create
@@ -36,7 +39,7 @@ Sub Service_Create
 	'This is a good place to load resources that are not specific to a single activity.
 	gps.Initialize("GPS")
 	CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") 'Para Push FirebaseMessaging
-	
+	BTAdmin.Initialize("admin")
 	Timer1.Initialize("Timer1", Interval * 1000)
 	Timer1.Enabled = True
 '	'Para los Logs
@@ -47,6 +50,13 @@ Sub Service_Create
 	CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") 'Para Push FirebaseMessaging
 End Sub

+Private Sub BTAdmin_StateChanged (NewState As Int, OldState As Int)
+	If logger Then Log("BT state changed: " & NewState)
+	BluetoothState = NewState = BTAdmin.STATE_ON
+'	StateChanged
+End Sub
+
+
 Sub Service_Start (StartingIntent As Intent)
 	Service.StopAutomaticForeground 'Starter service can start in the foreground state in some edge cases.
 	Subs.revisaBD