....

B4A/C_Cliente.bas

@@ -1086,11 +1086,11 @@ Sub gest_Click
 '	If ALMACEN = "4" Or ALMACEN = "36" Then
 '	Log(Subs.traeAlmacen)
 
-	Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
+'	Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
-	If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
+'	If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
-		cuest.agregaPreguntaCheckbox("1", "¿Qué productos de Kileo Perro encuentras en esta tienda?", Array As String("Pedigree Adulto", "Pedigree Cachorro", "Pedigree Razas Pequeñas", "Champ", "PAL","DOG CHOW ADULTO","DOG CHOW CACHORRO","DOG CHOW RAZAS PEQUEÑAS","Campeon","Ganador","Poder canino","Perron","Silverkan","Woow","Chapetes","Dyno","Beriscan","Nogacan","Nutrescan","Fidus","Amigo Gourmet","Otros","Ninguno de los anteriores"))
+'		cuest.agregaPreguntaCheckbox("1", "¿Qué productos de Kileo Perro encuentras en esta tienda?", Array As String("Pedigree Adulto", "Pedigree Cachorro", "Pedigree Razas Pequeñas", "Champ", "PAL","DOG CHOW ADULTO","DOG CHOW CACHORRO","DOG CHOW RAZAS PEQUEÑAS","Campeon","Ganador","Poder canino","Perron","Silverkan","Woow","Chapetes","Dyno","Beriscan","Nogacan","Nutrescan","Fidus","Amigo Gourmet","Otros","Ninguno de los anteriores"))
-		Return False
+'		Return False
-	End If
+'	End If
 
 	If TOMAR_FOTO = 0 Then
 		Cuestionario
@@ -2014,8 +2014,225 @@ Sub B_IMP_Click
 '	LogColor(perfil,Colors.Magenta)
 '	End If
 	
+	If ALMACEN = 87 Or ALMACEN = 6 Then
+		If Subs.traemontoprod Then
+			Impresion2
+		Else
+			Impresion
+		End If
+	Else
+		Impresion
+	End If
 	
 	
+	
+	
+End Sub
+
+Sub Impresion2
+	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 = " "
+	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
+			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
+	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("Subtotal 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
+	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("Descuento:   $" & 150 &  CRLF)
+	Printer1.WriteString("Total Preventa:   $" & (s.GetString("TOTAL") -150 )&  CRLF)
+	
+	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 Impresion
 	c=skmt.ExecQuery("select USUARIO from usuarioa")
 	c.Position=0
 	usuario = c.GetString("USUARIO")
@@ -2209,7 +2426,6 @@ Sub B_IMP_Click
 	ProgressDialogHide
 '	printer.Flush
 	'	printer.Close
-	
 End Sub
 
 'Sub B_IMP_Click

B4A/C_Principal.bas

@@ -571,7 +571,7 @@ Sub Subir_Click
 			Next
 		End If
 		c.Close
-		c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE PE_RECALCULO = ? AND PE_RECALCULO = ? AND PE_RECALCULO = ?",Array As String("","null",Null))
+		c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
 		d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1
@@ -588,7 +588,7 @@ Sub Subir_Click
 		cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
 		d.Close
 		
-		c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE PE_RECALCULO <> ? AND PE_RECALCULO <> ? AND PE_RECALCULO <> ?",Array As String("","null",Null))
+		c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null"))
 		d=B4XPages.MainPage.skmt.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDO FROM PEDIDO")
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1

B4A/Guna Vistas V3.1.b4a

@@ -190,7 +190,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Guna V3.1
 	#VersionCode: 1
-	#VersionName: 4.07.24.EP
+	#VersionName: 4.07.27.EP
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Guna Vistas V3.1.b4a.meta

@@ -73,6 +73,6 @@ ModuleClosedNodes6=8,9,10
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,B4XPage_Created,450,0,C_Cuestionario,Class_Globals,5,0,C_Cuestionario,Initialize,18,0,C_Cuestionario,B4XPage_Created,31,0,C_Cliente,GPS_LocationChanged,842,0,C_Cliente,gest_Click,1082,0,C_Cliente,cuest_preguntaContestada,4240,0,C_Cliente,Cuestionario,3977,0,C_Cuestionario,agregaPreguntaCheckbox,72,0,C_Cuestionario,agregaPreguntaRadio,120,0,Visual Designer,cliente.bal,-100,1,C_Cuestionario,agregaPreguntaAbierta,186,6,Main,Process_Globals,21,0
+NavigationStack=C_Cliente,Impresion,2023,0,C_Cliente,B_IMP_Click,2014,6,C_Principal,Subir_Click,584,6,C_Cliente,Impresion2,2189,2,Diseñador Visual,cliente.bal,-100,3,C_Cliente,CB4_P8_M3_CheckedChange,4118,0,C_Cuestionario,Class_Globals,0,0,C_Principal,Class_Globals,0,0,C_Cliente,Cuestionario,4193,0,C_Cliente,gest_Click,1082,0
 SelectedBuild=0
-VisibleModules=22,2,23,13,14,4,6,9,12,5,24
+VisibleModules=22,2,23,13,14,4,6,9,12,5