6.02.16

se agregan las encuestas de bat

B4A/B4XMainPage.bas

@@ -38,6 +38,9 @@ Sub Class_Globals
 	Public pedidos As C_Pedidos
 	Public promos As C_Promos
 	Public historico As C_Historico
+
+	Public historicobattodos As C_historicobatyodos
+	Public historicobat As C_historicobat
 	Dim reqManager As DBRequestManager
 	Dim v As String = Application.VersionName
 	Dim ruta As String
@@ -110,6 +113,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Root = Root1
 	Root.LoadLayout("login")
 '	B4XPages.SetTitle(Me, "Guna Preventa")
+
+	
 	login.Initialize
 	B4XPages.AddPage("Login", login)
 	principal.Initialize
@@ -138,6 +143,13 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	B4XPages.AddPage("Promos", promos)
 	historico.Initialize
 	B4XPages.AddPage("Historico", historico)
+	historicobat.Initialize
+	B4XPages.AddPage("historicobat", historicobat)
+	
+	historicobattodos.Initialize
+	B4XPages.AddPage("historicobattodos", historicobattodos)
+	
+	
 	p_Main.Height = Root.Height
 	p_Main.Width = Root.Width
 	ruta = Starter.ruta
@@ -192,6 +204,13 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_PRO3055(H_IDCLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_SUPLENCIA(RS_RUTA TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TICKET_IMPRESO (idCliente TEXT)")
+	
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA_BAT(CLIENTE)")
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS ENCUESTAS_BAT (CLIENTE TEXT,RUTA TEXT,ALMACEN TEXT,P1 TEXT,P2 TEXT,P3 TEXT,P4 TEXT,P5 TEXT,P6 TEXT,P7 TEXT,P8 TEXT,P9 TEXT,P10 TEXT, FECHA TEXT)")
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS hist_ventastodos (HVD_CLIENTE TEX, HVD_PRONOMBRE TEXT, HVD_CANT TEXT, HVD_COSTO_TOT TEXT, HVD_FECHA TEXT)")
+
 '	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_VARIABLES (CAT_VA_DESCRIPCION TEXT, CAT_VA_VALOR TEXT)")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_LAT", "TEXT")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_FOTO", "BLOB")
@@ -200,15 +219,26 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("PEDIDO", "PE_RECCEDIS", "TEXT")
 	Subs.agregaColumna("PEDIDO", "PE_RECALCULOTOT", "TEXT")
 	Subs.agregaColumna("HIST_ENCUESTA", "HE_LON", "TEXT")
+	Subs.agregaColumna("HIST_VENTAS", "HVD_FECHA", "TEXT")
 	Subs.agregaColumna("kmt_info3", "encuesta", "TEXT")
+	
+	Subs.agregaColumna("hist_ventastodos", "HVD_NUM_TICKET", "TEXT")
+	Subs.agregaColumna("hist_ventastodos", "HVD_CODPROMO", "TEXT")
+	
+	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR3", "TEXT")
+	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR2", "TEXT")
+	Subs.agregaColumna("kmt_info3", "CAT_CL_CLASIFICADOR5", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_TIPOCLIENTE", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_LIMITECREDITO", "TEXT")
+	Subs.agregaColumna("kmt_info3", "CAT_CL_DIASCREDITO", "TEXT")
 	Subs.agregaColumna("kmt_info3", "CAT_CL_BCREDITO", "TEXT") '##########################  CODIGO PARA CREDITOS ####################
+	Subs.agregaColumna("CAT_GUNAPROD", "CAT_GP_DEV", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD", "CAT_PA_BSEGMENTA", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD", "CAT_LISTAPRECIO", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD", "CAT_PA_SEGMENTAV", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_PA_BSEGMENTA", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_PA_SEGMENTAV", "TEXT")
+	Subs.agregaColumna("PEDIDO", "PE_RECCANT", "TEXT")
 	Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "P10" en la tabla
 		c=skmt.ExecQuery("SELECT COUNT(*) AS fCol FROM pragma_table_info('ENCUESTA_MODULO3') WHERE name='P10'")
 		c.Position = 0
@@ -366,7 +396,7 @@ Sub B4XPage_Appear
 			B4XSwitch2.Value = False
 		End If
 	Else
-		B4XSwitch1.Value = False
+		B4XSwitch2.Value = False
 	End If
 	Subs.guardaAppInfo
 	
@@ -992,7 +1022,7 @@ Sub revisaActualizacion 'Parte de la funcionalidad "appUpdater"
 	'##   Hay que actualizar la version en el archivo "gunaPreventa.ver"  ##
 	'################################################
 	LogColor("Buscarmos archivo Ver", Colors.red)
-	Private link As String = "https://keymon.lat/movil/guna/gunaPreventa.ver"
+	Private link As String = "https://keymon.net/movil/guna/gunaPreventa.ver"
 	Wait For (traeArchivoVer(Me, link)) JobDone (j As HttpJob)
 	If j.Success Then
 		LogColor("Archivo .VER encontrado.", Colors.red)
@@ -1027,7 +1057,7 @@ Sub revisaActualizacion 'Parte de la funcionalidad "appUpdater"
 			End If
 		End Try
 	Else
-		LogColor("appUpdater(), Job Failed " & link & CRLF & LastException.Message, Colors.Red)
+'		LogColor("appUpdater(), Job Failed " & link & CRLF & LastException.Message, Colors.Red)
 		If Msgbox2("Es necesaria una conexión a internet, por favor revise su conexión y vuelva a intentar", "ATENCIÓN", "OK", "", "", Null) = DialogResponse.POSITIVE Then 'Ignore
 			ExitApplication
 		End If
@@ -1079,13 +1109,13 @@ Private Sub cb_importarBDWA_CheckedChange(Checked As Boolean)
 End Sub
 
 
-Private Sub i_engrane_LongClick
+'Private Sub i_engrane_LongClick
-	Dim Intent1 As Intent
+''	Dim Intent1 As Intent
-	Intent1.Initialize(Intent1.ACTION_VIEW, "guna://tienda360/config?clienteId=12&almacen=45&ruta=143")
+''	Intent1.Initialize(Intent1.ACTION_VIEW, "guna://tienda360/config?clienteId=12&almacen=45&ruta=143")
-	Try
+''	Try
-		StartActivity(Intent1)
+''		StartActivity(Intent1)
-	Catch
+''	Catch
-'		Log(LastException)
+'''		Log(LastException)
-		ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
+''		ToastMessageShow("La aplicación Tienda 360 no está instalada o no puede manejar la URL.", True)
-	End Try
+''	End Try
-End Sub
+'End Sub

B4A/C_Historico.bas

@@ -70,7 +70,7 @@ Sub B4XPage_Appear
 	C.Position=0
 	Existe = C.GetString("EXISTE")
 	C.Close
-	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_PRONOMBRE asc")
+	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_FECHA asc")
 	ListView1.Clear
 	If c.RowCount>0 Then
 		For i=0 To c.RowCount -1
@@ -78,12 +78,12 @@ Sub B4XPage_Appear
 			Dim label1 As Label
 			label1 = ListView1.TwoLinesLayout.Label
 			label1.TextSize = 15
-			label1.TextColor = Colors.Black
+			label1.TextColor = Colors.White
 			Dim label2 As Label
 			label2 = ListView1.TwoLinesLayout.SecondLabel
-			label2.TextSize = 10
+			label2.TextSize = 15
-			label2.TextColor = Colors.Blue
+			label2.TextColor = Colors.White
-			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT"))
+			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT")&"      Fecha: "& c.GetString("HVD_FECHA"))
 		Next
 	End If
 	If Existe <> 0 Then
@@ -92,6 +92,10 @@ Sub B4XPage_Appear
 		L_CANT.Text = c.GetString("PC_NOART")
 		L_TOTAL.Text = c.GetString("PC_MONTO")
 	End If
+'	ListView1.Visible = False
+'	CustomListView1.AsView.Visible = True
+	
+	
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)

B4A/C_Historico2.bas

@@ -0,0 +1,167 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=11.5
+@EndOfDesignText@
+Sub Class_Globals
+	Private Root As B4XView 'ignore
+	Private xui As XUI 'ignore
+
+	Dim g As GPS
+	Dim clie_id As String
+	Dim sDate,sTime As String
+	Dim usuario As String
+	
+	Dim c As Cursor
+	Dim ruta As String
+	Dim Regresar As Button
+	
+
+	Dim ListView1 As ListView
+	Dim L_CANT As Label
+	Dim L_TOTAL As Label
+	Dim borra As Button
+	Dim Existe As String
+	Dim result As String
+	'    Dim lat_gps, lon_gps As String
+
+	Private Titulo As Label
+	Private b_desc As Button
+	Private ListView2 As ListView
+	Dim tgl As Toggle
+	Private p_nota As Panel
+	Private Panel1 As Panel
+	Private l_productohist As Label
+	Private l_s1 As Label
+	Private l_s2 As Label
+	Private l_s3 As Label
+	Private l_s4 As Label
+	Private CustomListView1 As CustomListView
+	
+End Sub
+
+'You can add more parameters here.
+'Public Sub Initialize As Object
+''	Return Me
+'End Sub
+
+'This event will be called once, before the page becomes visible.
+Private Sub B4XPage_Created (Root1 As B4XView)
+	Root = Root1
+	'load the layout to Root
+	ruta = File.DirInternal
+	Root.LoadLayout("nota2")
+	borra.Visible = False
+	Titulo.Text = "Acumulado"
+	b_desc.Visible = False
+	If File.Exists(ruta, "kmt.db") = False Then
+		File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db")
+	End If
+'	skmt.Initialize(ruta,"kmt.db", True)
+End Sub
+
+'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
+
+Sub B4XPage_Appear
+	p_nota.Height = Root.Height * 0.9
+	p_nota.Width = Root.Width * 0.9
+	Panel1.Visible = False
+	If Not(Starter.gps.GPSEnabled) Then
+		ToastMessageShow("Es necesario tener el GPS encendido", True)
+		StartActivity(Starter.gps.LocationSettingsIntent)
+	End If
+	L_CANT.Text =""
+	L_TOTAL.Text=""
+	c=B4XPages.MainPage.skmt.ExecQuery("select count(*) as EXISTE from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)")
+	C.Position=0
+	Existe = C.GetString("EXISTE")
+	C.Close
+	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_FECHA asc")
+	ListView1.Clear
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim label1 As Label
+			label1 = ListView1.TwoLinesLayout.Label
+			label1.TextSize = 15
+			label1.TextColor = Colors.White
+			Dim label2 As Label
+			label2 = ListView1.TwoLinesLayout.SecondLabel
+			label2.TextSize = 15
+			label2.TextColor = Colors.White
+			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT")&"      Fecha: "& c.GetString("HVD_FECHA"))
+		Next
+	End If
+	If Existe <> 0 Then
+		c=B4XPages.MainPage.skmt.ExecQuery("select SUM(HVD_CANT) AS PC_NOART, SUM(HVD_COSTO_TOT) AS PC_MONTO from HIST_VENTAS where HVD_CLIENTE in (Select CUENTA from cuentaa)")
+		C.Position=0
+		L_CANT.Text = c.GetString("PC_NOART")
+		L_TOTAL.Text = c.GetString("PC_MONTO")
+	End If
+'	ListView1.Visible = False
+'	CustomListView1.AsView.Visible = True
+'	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_FECHA asc")
+'	
+	For sfdf = 0 To  1
+		CustomListView1.Add(CreateListItem("ejemplo","1","2","3","4", 284, 144),sfdf)
+	
+	Next
+	
+	
+	
+End Sub
+
+
+Sub CreateListItem(prodhis As String, s1 As Int, s2 As Int, s3 As Int,s4 As Int, Width As Int, Height As Int) As Panel 'ignore
+	Dim p As B4XView = xui.CreatePanel("")
+	p.SetLayoutAnimated(0, 0, 0, Width, Height)
+	p.LoadLayout("historicobat")
+'	l_prodX.TextSize = 15
+'	l_prodX.Text = Text
+'	l_prodX.TextSize = 15
+	''	p_prods.Height = Height + 70
+	''	l_prodX.Height = Height
+'	p_prods.height = su.MeasureMultilineTextHeight(l_prodX, l_prodX.Text) + 20 'Calculamos la altura del panel de acuerdo al texto contenido.
+'	If p_prods.Height < Height Then p_prods.Height = Height
+'	l_prodX.Height = p_prods.Height
+'	l_pCant.Tag = precioU&"|"&inv&"|"&prodId
+'	et_pCant.Tag = precioU&"|"&inv&"|"&prodId
+'	et_pCant.BringToFront
+	''	i_prod.Bitmap = img
+'	p.Height = p_prods.Height
+	Return p
+End Sub
+
+Sub GPS_LocationChanged (Location1 As Location)
+	'lat_gps=Location1.ConvertToSeconds(Location1.Latitude)
+	'lon_gps=Location1.ConvertToSeconds(Location1.Longitude)
+End Sub
+
+Sub Regresar_Click
+	B4XPages.ShowPage("Cliente")
+End Sub
+
+Private Sub B4XPage_CloseRequest As ResumableSub
+'	BACK key pressed
+'	Return True To close, False To cancel
+	B4XPages.ShowPage("Cliente")
+	Return False
+End Sub
+
+Sub ListView2_ItemClick (Position As Int, Value As Object)
+	ListView2.Visible = False
+	ListView1.Visible = True
+End Sub
+
+Sub ListView1_ItemClick (Position As Int, Value As Object)
+	ListView2.Visible = True
+	ListView1.Visible = False
+	Dim label1 As Label
+	For i=0 To 20
+		label1 = ListView2.SingleLineLayout.Label
+		label1.TextSize = 15
+		label1.TextColor = Colors.Black
+		ListView2.AddSingleLine(i)
+	Next
+End Sub

B4A/C_NoVenta.bas

@@ -140,6 +140,95 @@ Sub GUARDA_Click
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_STORE set HSS_TOT = ?  where HSS_CODIGO In (select cuenta from cuentaa)", Array As Object(stay_hh + stay_mi + stay_ss))
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE HIST_STAY_OUT set HSO_FIN = ?  ", Array As Object(sTime))
 	DateTime.TimeFormat = "HH:mm:ss"
+	If Subs.traeAlmacen <> "43" Then
+		Mandapedido
+	End If
 	bitacora.mandaBitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRutaBitacora, "NO VENTA", Subs.traeCliente,Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, 2, motivo, r_1.Checked, B4XPages.MainPage.cliente.bitacora.banderaGeoCerca)
 	B4XPages.ShowPage("Principal")
 End Sub
+
+
+Sub Mandapedido
+	
+'		PEDIDO
+	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"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedido_GV2"
+			cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, C.GetString("PE_COSTO_TOT"), C.GetString("PE_COSTOU"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+		Next
+	End If
+	c.Close
+	
+	' NOVENTA
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_COMM,NV_LAT,NV_LON FROM NOVENTA")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_noventa_GV2"
+			cmd.Parameters = Array As Object(C.GetString("NV_CLIENTE"),C.GetString("NV_FECHA"),C.GetString("NV_USER"),C.GetString("NV_MOTIVO"),C.GetString("NV_COMM"),C.GetString("NV_LAT"),C.GetString("NV_LON"), Subs.traeAlmacen, Subs.traeRuta2(C.GetString("NV_CLIENTE")))
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_noventa")
+		Next
+	End If
+	c.Close
+	
+	
+	c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN, PC_FACTURA FROM PEDIDO_CLIENTE ")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "insert_pedidos_GV3"
+			cmd.Parameters = Array As Object(C.GetString("PC_CLIENTE"),C.GetString("PC_FECHA"),C.GetString("PC_USER"),C.GetString("PC_NOART"),C.GetString("PC_MONTO"),C.GetString("PC_LON"),C.GetString("PC_LAT"),Subs.traeAlmacen,Subs.traeRuta2(C.GetString("PC_CLIENTE")),C.GetString("PC_COSTO_SIN"),C.GetString("PC_FACTURA") )
+			B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedidos")
+		Next
+	End If
+	c.Close
+
+'		If Subs.traeAlmacen = "88" Or Subs.traeAlmacen = "6" Then
+	c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,ifnull(PE_CANT,0) as PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, IFNULL(PE_RECCANT,0) AS PE_RECCANT FROM PEDIDO WHERE PE_RECALCULO <> ? or PE_RECALCULO <> ? or PE_RECALCULO IS NOT NULL",Array As String("","null"))
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			If c.GetString("PE_RECCEDIS") = "" Then
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_pedido_GV2"
+				cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+			Else
+				If c.GetString("PE_RECCANT") = c.GetString("PE_CANT") Then
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				Else
+					'Con descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), Subs.traeAlmacen, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_RECCANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+					'Sin descuento
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_pedido_GV2"
+					cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), Subs.traeAlmacen, NumberFormat2((C.GetString("PE_CANT")-C.GetString("PE_RECCANT"))*C.GetString("PE_COSTOU"),1,2,2,False), C.GetString("PE_COSTOU"), (C.GetString("PE_CANT")-C.GetString("PE_RECCANT")), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				End If
+			End If
+		Next
+	End If
+	c.Close
+	
+
+
+End Sub

B4A/C_Nota.bas

@@ -129,28 +129,22 @@ Sub B4XPage_Appear
 		Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
 		LogColor(s3.RowCount,Colors.Yellow)
 		If s3.RowCount > 0 Then
-				
 			Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
 			s.Position=0
 			Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
 			s5.Position = 0
-			
-				
 			L_TOTAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,True)
-				
 			s.Close
-		
-		
 		Else If s3.RowCount = 0 Then
 			Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 			s.Position=0
-			
 			L_TOTAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,True)
-				
 			s.Close
 		End If
+		' *************************************************
+		L_TOTAL.text = Subs.calculaTotalConPromoXRango(Subs.traeCliente)
+		' *************************************************
 		'AQUI TERMINA
-		
 	End If
 End Sub
 
@@ -183,7 +177,7 @@ Sub borra_Click
 				If folio <> "" Then
 					result =  Msgbox2("Seguro que desa borrar el pedido?","Cancelar pedido", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
 					If result = DialogResponse.POSITIVE Then
-						c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+						c=B4XPages.MainPage.skmt.ExecQuery("select PE_PROID,PE_CANT FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS <> 'DUR'")
 						If c.RowCount>0 Then
 							For i=0 To c.RowCount -1
 								c.Position=i
@@ -309,8 +303,13 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 						'				For j = 0 To c.RowCount -1
 						'					Log("aqui tronare?")
 						''					c.Position = j
+						
+						If cedis <> "DUR" Then
 						B4XPages.MainPage.skmt.ExecNonQuery($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.GetString("PE_PROID")}'"$)
 						B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
+						Else
+						B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
+						End If
 						'				Next
 						'			End If
 						'			j3.Close
@@ -396,8 +395,13 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object)
 '						For j = 0 To c.RowCount -1
 '						Log("aqui tronare?")
 '						'					c.Position = j
+
+						If cedis <> "DUR" Then
 						B4XPages.MainPage.skmt.ExecNonQuery($"update ${Subs.traeTablaProds(tipo_venta)} set cat_gp_almacen = cat_gp_almacen + ${c.GetString("PE_CANT")} where cat_gp_id = '${c.GetString("PE_PROID")}'"$)
 						B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
+						Else
+						B4XPages.MainPage.skmt.ExecNonQuery2("delete from pedido where pe_cedis= ? and pe_cliente in (Select CUENTA from cuentaa) AND PE_FOLIO = ?", Array As Object(cedis, c.GetString("PE_FOLIO")))
+						End If
 						'				Next
 						'			End If
 						'			j3.Close

B4A/C_NuevoCliente.bas

@@ -20,6 +20,9 @@ Sub Class_Globals
 	Dim no_cliente As String
 	Dim no_ruta As String
 	
+	Dim lat As Double = 0
+	Dim lon As Double = 0
+	
 	Dim r_4 As RadioButton
 	Dim E_NOMBRE As EditText
 	Dim tgl As Toggle
@@ -55,6 +58,17 @@ Sub B4XPage_Appear
 		StartActivity(Starter.gps.LocationSettingsIntent)
 	End If
 	GUARDA.Visible = False
+	
+	CallSubDelayed(Tracker, "Track")
+	CallSubDelayed(Tracker, "StartFLPSmall")
+	If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos.
+		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+'		Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$)
+		GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation)
+	End If
+	
+	
 '	Subs.panelVisible(p_nuevoCliente,, 0)
 '	p_nuevoCliente.Height = Root.Height
 '	p_nuevoCliente.Width = Root.Width
@@ -65,15 +79,27 @@ Sub B4XPage_Appear
 '	E_NOMBRE.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2)
 	If B4XPages.MainPage.lat_gps <> "0.0" Then
 		GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar.
-		l_sinUbicacion.Visible = False
+		l_sinUbicacion.Visible = True
 	End If
 	Starter.skmt.ExecNonQuery("delete from cuentaa")
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
+	Log("NC GPS_LocationChanged")
 	If B4XPages.MainPage.lat_gps <> "0.0" Then
+		If GUARDA.IsInitialized Then
 		GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar.
-		l_sinUbicacion.Visible = False
+		l_sinUbicacion.Visible = True
+		End If
+	End If
+	If B4XPages.MainPage.lat_gps <> "0.0" Then
+		If GUARDA.IsInitialized Then
+			GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar.
+			l_sinUbicacion.Visible = True
+			lat = Location1.Latitude
+			lon = Location1.Longitude
+			l_sinUbicacion.Text = ("Latitud: " & lat & ", Longotud: "& lon)
+		End If
 	End If
 End Sub
 
@@ -102,7 +128,7 @@ Sub GUARDA_Click
 		no_cliente= "N" & sTime & no_ruta
 		Log("++ ++ no_cliente = "&no_cliente)
 '		c.Close
-		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object (no_cliente,no_ruta, E_NOMBRE.Text,"null","null","null","null","null","null","null","null","null","null","null","null","null",B4XPages.MainPage.lon_gps,B4XPages.MainPage.lat_gps))
+		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object (no_cliente,no_ruta, E_NOMBRE.Text,"null","null","null","null","null","null","null","null","null","null","null","null","null",lon,lat))
 		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (no_cliente))
 		B4XPages.MainPage.skmt.ExecNonQuery("delete from CUENTAA")
 		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(no_cliente))

B4A/C_Principal.bas

@@ -177,7 +177,7 @@ Sub Class_Globals
 	
 	Dim sDate,sTime As String
 	Dim HORAINGRESO As String
-	
+	Dim distancealm As Long
 	Private L_QUALA As Label
 	Private L_FERRERO As Label
 	Private L_SANMARCOS As Label
@@ -385,6 +385,14 @@ Sub B4XPage_Appear
 		If Starter.marcaCel <> "Sony" Then ToastMessageShow("Es necesario tener el GPS encendido", True)
 		StartActivity(Starter.gps.LocationSettingsIntent)
 	End If
+	
+	If Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos.
+		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+		Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$)
+		GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation)
+	End If
+	
 	c=B4XPages.MainPage.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("FECHA"))
 	c.Position = 0
 	If c.GetString("CUANTOS") = 0 Then
@@ -541,6 +549,23 @@ Sub B4XPage_Appear
 End Sub
 
 Sub Subir_Click
+	Dim envia As Boolean = False
+	Dim env As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'ENVIOALMACEN'")
+	If env.RowCount > 0 Then
+		env.Position = 0
+		If env.GetString("CAT_VA_VALOR") = 0 Then
+			envia = True
+		Else
+			If distancealm < 100 Then
+				envia = True
+			End If
+		End If
+	End If
+	
+	
+	If envia Then
+		
+	
 	checaPedido
 	CARGA = "SUBIR"
 	P1.Visible = True
@@ -630,6 +655,20 @@ Sub Subir_Click
 		End If
 			c.Close
 		
+			' ENCUESTAS BAT
+			c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM ENCUESTAS_BAT")
+			If c.RowCount>0 Then
+				For i=0 To c.RowCount -1
+					c.Position=i
+					Dim cmd As DBCommand
+					cmd.Initialize
+					cmd.Name = "insert_encuestas_bat_guna"
+					cmd.Parameters = Array As Object(c.GetString("CLIENTE"),c.GetString("RUTA"),c.GetString("ALMACEN"),c.GetString("FECHA"),c.GetString("P1"),c.GetString("P2"),c.GetString("P3"),c.GetString("P4"),c.GetString("P5"),c.GetString("P6"),c.GetString("P7"),c.GetString("P8"),c.GetString("P9"),c.GetString("P10"))
+					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INSENCUESTAS")
+				Next
+			End If
+			c.Close
+		
 		' Plan Lealtad
 		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM PLAN_LEALTAD WHERE DESCARGADO IS NULL")
 		If c.RowCount>0 Then
@@ -644,19 +683,19 @@ Sub Subir_Click
 		End If
 		c.Close
 		
-		' Plan Lealtad
+'		' Plan Lealtad
-		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM COMENTARIOS WHERE DESCARGADO IS NULL")
+'		c=B4XPages.MainPage.skmt.ExecQuery("SELECT * FROM COMENTARIOS WHERE DESCARGADO IS NULL")
-		If c.RowCount>0 Then
+'		If c.RowCount>0 Then
-			For i=0 To c.RowCount -1
+'			For i=0 To c.RowCount -1
-				c.Position=i
+'				c.Position=i
-				Dim cmd As DBCommand
+'				Dim cmd As DBCommand
-				cmd.Initialize
+'				cmd.Initialize
-				cmd.Name = "insert_coments_GUNA"
+'				cmd.Name = "insert_coments_GUNA"
-				cmd.Parameters = Array As Object(C.GetString("COMENTARTIO"),C.GetString("CLIENTE"),Subs.traeAlmacen,Subs.traeRuta)
+'				cmd.Parameters = Array As Object(C.GetString("COMENTARTIO"),C.GetString("CLIENTE"),Subs.traeAlmacen,Subs.traeRuta)
-				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INS_coment")
+'				B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "INS_coment")
-			Next
+'			Next
-		End If
+'		End If
-		c.Close
+'		c.Close
 		
 		
 		Dim fotomostrar1 As Cursor = Starter.skmt.ExecQuery("SELECT * FROM kmt_info3 where foto is not NULL")
@@ -732,6 +771,7 @@ Sub Subir_Click
 		End If
 		c.Close
 		
+'		PEDIDO
 		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
@@ -746,44 +786,68 @@ Sub Subir_Click
 		End If
 		c.Close
 		d.Position=0
+
 		cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
 		d.Close
 
-		If ALMACEN = "88" Or ALMACEN = "6" Then
+'		If ALMACEN = "88" Or ALMACEN = "6" Then
-			c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,PE_RECCEDIS,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"))
+		c=B4XPages.MainPage.skmt.ExecQuery2("SELECT PE_RECALCULO,PE_RECALCULOTOT,ifnull(PE_RECCEDIS,'') as PE_RECCEDIS,PE_CEDIS,PE_COSTO_TOT,PE_COSTOU,ifnull(PE_CANT,0) as PE_CANT,PE_PRONOMBRE,PE_PROID,PE_CLIENTE,PE_FECHA,PE_USUARIO, PE_COSTO_SIN, PE_RUTA, PE_DESC, PE_FOLIO, IFNULL(PE_RECCANT,0) AS PE_RECCANT 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 where PE_RUTA = '${Subs.traeRuta}'"$)
-			If c.RowCount>0 Then
-				For i=0 To c.RowCount -1
-					c.Position=i
-					Dim cmd As DBCommand
-					cmd.Initialize
-					cmd.Name = "insert_pedido_GV2"
-					cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
-					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
-				Next
-			End If
-			c.Close
-			d.Position=0
-			cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
-			d.Close
-		Else
-			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 where PE_RUTA = '${Subs.traeRuta}'"$)
 		If c.RowCount>0 Then
 			For i=0 To c.RowCount -1
 				c.Position=i
+				If c.GetString("PE_RECCEDIS") = "" Then
 					Dim cmd As DBCommand
 					cmd.Initialize
 					cmd.Name = "insert_pedido_GV2"
 					cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
 					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+				Else
+					If c.GetString("PE_RECCANT") = c.GetString("PE_CANT") Then
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_pedido_GV2"
+						cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+						B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+					Else
+						'Con descuento
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_pedido_GV2"
+						cmd.Parameters = Array As Object(C.GetString("PE_RECCEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_RECCANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+						B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+						'Sin descuento
+						Dim cmd As DBCommand
+						cmd.Initialize
+						cmd.Name = "insert_pedido_GV2"
+						cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), ALMACEN, NumberFormat2((C.GetString("PE_CANT")-C.GetString("PE_RECCANT"))*C.GetString("PE_COSTOU"),1,2,2,False), C.GetString("PE_COSTOU"), (C.GetString("PE_CANT")-C.GetString("PE_RECCANT")), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+						B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+					End If
+				End If
 			Next
 		End If
 			c.Close
 			d.Position=0
 			cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
 			d.Close
-		End If
+'		Else
+'			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 where PE_RUTA = '${Subs.traeRuta}'"$)
+'			If c.RowCount>0 Then
+'				For i=0 To c.RowCount -1
+'					c.Position=i
+'					Dim cmd As DBCommand
+'					cmd.Initialize
+'					cmd.Name = "insert_pedido_GV2"
+'					cmd.Parameters = Array As Object(C.GetString("PE_CEDIS"), ALMACEN, C.GetString("PE_RECALCULOTOT"), C.GetString("PE_RECALCULO"), C.GetString("PE_CANT"), C.GetString("PE_PRONOMBRE"), C.GetString("PE_PROID"), C.GetString("PE_CLIENTE"),C.GetString("PE_FECHA"),C.GetString("PE_USUARIO"),C.GetString("PE_RUTA"), C.GetString("PE_COSTO_SIN"),C.GetString("PE_DESC"),c.GetString("PE_FOLIO"))
+'					B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "ins_pedido")
+'				Next
+'			End If
+'			c.Close
+'			d.Position=0
+'			cuantos_pedido = D.GetString("CUANTOS_PEDIDO")
+'			d.Close
+'		End If
 		
 
 '		'CUESTIONARIO
@@ -941,6 +1005,9 @@ Sub Subir_Click
 		Next
 	End If
 	x.Close
+	Else
+		MsgboxAsync("Para poder enviar informacion debes de estar en el almacen.","Atención")
+	End If
 End Sub
 
 Sub cargar_Click
@@ -964,6 +1031,9 @@ Sub cargar_Click
 	Log(Rut_Rep)
 	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE GPS SET HABILITADO = (?)",Array As Object(0))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("CARGA_DIA"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("ENVIOALMACEN"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULAT"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULONG"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("pasword"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD"))
 	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("GEOCERCA"))
@@ -1063,6 +1133,11 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(usuario,e_ruta.text,sDate,imei,sTime,"","","","","CARGA",ALMACEN,Application.VersionName)
 	B4XPages.MainPage.reqManager.ExecuteCommand(cmd , "inst_drop")
 	
+	cmd.Initialize
+	cmd.Name = "select_envio_almacen"
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "envioalmacen")
+	
 	cmd.Initialize
 	cmd.Name = "select_TipoVenta"
 	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
@@ -1083,6 +1158,11 @@ Sub cargar_Click
 	cmd.Parameters = Array As Object(ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "promodesp")
 	
+ '	cmd.Initialize
+'	cmd.Name = "select_venta_tb_guna"
+'	cmd.Parameters = Array As Object( e_ruta.text,ALMACEN)
+'	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_ventastodos")
+	
 	cmd.Initialize
 	cmd.Name = "select_cat_gunaprod2_GV2"
 	cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
@@ -1152,8 +1232,8 @@ Sub cargar_Click
 	
 
 	cmd.Initialize
-	cmd.Name = "select_hist_datos_GV2_2"
+	cmd.Name = "select_hist_datos_GV2_3"
-	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
+	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN,e_ruta.text, ALMACEN)
 	B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 	
 	cmd.Initialize
@@ -1223,8 +1303,8 @@ Sub cargar_Click
 		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "kmt_datos2")
 
 		cmd.Initialize
-		cmd.Name = "select_hist_datos_GV2_2"
+		cmd.Name = "select_hist_datos_GV2_3"
-		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN,E_RUTA2.text, ALMACEN,E_RUTA2.text, ALMACEN)
+		cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN,E_RUTA2.text, ALMACEN)
 		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_datos")
 
 		cmd.Initialize
@@ -1342,8 +1422,8 @@ Sub JobDone(Job As HttpJob)
 				If n = "OKActivo"  Then
 					Dim cmd As DBCommand
 					cmd.Initialize
-					cmd.Name = "select_ruta_GV2_70_10"
+					cmd.Name = "select_ruta_GV2_70_19"
-					cmd.Parameters = Array As Object(ALMACEN,e_ruta.text)
+					cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,usuario)
 					B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta")
 					'Log("Usuario guardado en BD es 'Valido'")
 				Else
@@ -1370,6 +1450,21 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "envioalmacen" Then 'query tag
+				For Each records() As Object In RESULT.Rows
+					Dim CAT_RU_ENVIO_ALMACEN As String = records(RESULT.Columns.Get("CAT_RU_ENVIO_ALMACEN"))
+					Dim CAT_RU_LAT As String = records(RESULT.Columns.Get("CAT_RU_LAT"))
+					Dim CAT_RU_LONG As String = records(RESULT.Columns.Get("CAT_RU_LONG"))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("ENVIOALMACEN",CAT_RU_ENVIO_ALMACEN))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("RULAT",CAT_RU_LAT))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("RULONG",CAT_RU_LONG))
+				Next
+'				If Starter.marcaCel <> "Sony" Then ToastMessageShow(" Historico Marcas" , True)
+			End If
+		End If
+		
 		If Job.JobName = "DBRequest" Then
 			Dim result1 As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			If result1.Tag = "CHECAENCUESTA" Then 'query tag
@@ -1390,6 +1485,31 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "hist_ventastodos" Then 'query tag
+				
+				For Each records() As Object In RESULT.Rows
+'					Log ("NO HACE NADA")
+					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"))
+					Dim HVD_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
+					Dim HVD_NUM_TICKET As String = records(RESULT.Columns.Get("HVD_NUM_TICKET"))
+					Dim HVD_CODPROMO As String = records(RESULT.Columns.Get("HVD_CODPROMO"))
+'					Log(HVD_CLIENTE&"--"&HVD_PRONOMBRE&"--"&HVD_CANT&"--"&HVD_COSTO_TOT)
+
+					Private tc As Cursor = Starter.skmt.ExecQuery($"select * from hist_ventastodos where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PRONOMBRE = '${HVD_PRONOMBRE}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_COSTO_TOT = '${HVD_COSTO_TOT}' "$)
+					If tc.RowCount = 0 Then
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO hist_ventastodos(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO) VALUES (?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO))
+					End If
+					
+				Next
+				
+			End If
+		End If
+
 		If Job.JobName = "DBRequest" Then
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			If RESULT.Tag = "kmt_datos" Then 'query tag
@@ -1418,10 +1538,14 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO"))
 					Dim CAT_CL_TIPOCLIENTE As String = records(RESULT.Columns.Get("CAT_CL_TIPOCLIENTE"))
 					Dim CAT_CL_LIMITECREDITO As String = records(RESULT.Columns.Get("CAT_CL_LIMITECREDITO"))
+					Dim CAT_CL_DIASCREDITO As String = records(RESULT.Columns.Get("CAT_CL_DIASCREDITO"))
+					Dim CAT_CL_CLASIFICADOR3 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR3"))
+					Dim CAT_CL_CLASIFICADOR2 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR2"))
+					Dim CAT_CL_CLASIFICADOR5 As String = records(RESULT.Columns.Get("CAT_CL_CLASIFICADOR5"))
 					
 					'##########################  INICIA CODIGO PARA CREDITOS ####################
 					Dim CAT_CL_BCREDITO As String = records(RESULT.Columns.Get("CAT_CL_BCREDITO"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,FOTO,CAT_CL_LIMITECREDITO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,CAT_CL_FOTO,CAT_CL_LIMITECREDITO))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2,CAT_CL_CLASIFICADOR5) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?,?,?,?,?)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,CAT_CL_FOTO,CAT_CL_LIMITECREDITO,CAT_CL_DIASCREDITO,CAT_CL_CLASIFICADOR3,CAT_CL_CLASIFICADOR2,CAT_CL_CLASIFICADOR5))
 					'##########################  TERMINA CODIGO PARA CREDITOS ####################
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO))
 				Next
@@ -1464,6 +1588,7 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO"))
 					Dim CAT_CL_TIPOCLIENTE As String = records(RESULT.Columns.Get("CAT_CL_TIPOCLIENTE"))
 					Dim CAT_CL_FOTO() As Byte = records(RESULT.Columns.Get("CAT_CL_FOTO"))
+					
 					'##########################  INICIA CODIGO PARA CREDITOS ####################
 					Dim CAT_CL_BCREDITO As String = records(RESULT.Columns.Get("CAT_CL_BCREDITO"))
 					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info3(CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,FOTO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?)", Array As Object (CAT_CL_CODIGO,CAT_CL_RUTA,CAT_CL_NOMBRE,CAT_CL_ATIENDE1,CAT_CL_ATIENTE2,CAT_CL_TELEFONO,CAT_CL_EMAIL,CAT_CL_CALLE,CAT_CL_NOEXT,CAT_CL_NOINT,CAT_CL_CALLE1,CAT_CL_CALLE2,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO,CAT_CL_BCREDITO,CAT_CL_TIPOCLIENTE,CAT_CL_FOTO))
@@ -1800,14 +1925,14 @@ Sub JobDone(Job As HttpJob)
 					Dim CAT_GP_SUBTIPO As String = records(RESULT.Columns.Get("CAT_GP_SUBTIPO"))
 					Dim CAT_GP_IMG() As Byte = records(RESULT.Columns.Get("CAT_GP_IMG"))
 					Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_GP_ALMACEN"))
-					'	Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV"))
+					Dim CAT_GP_DEV As String = records(RESULT.Columns.Get("CAT_GP_DEV"))
 					Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD"))
 					Dim CAT_GP_INICIATIVA As Int = records(RESULT.Columns.Get("CAT_GP_INICIATIVA"))
 					Dim CAT_LISTAPRECIO As String = records(RESULT.Columns.Get("CAT_LISTAPRECIO"))
 '					Dim CAT_LISTAPRECIO As Int = 10
 '					CAT_GP_INICIATIVA = 5
 '					skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD,CAT_GP_INICIATIVA,CAT_LISTAPRECIO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA,CAT_LISTAPRECIO))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_TIPOPROD,CAT_GP_INICIATIVA,CAT_LISTAPRECIO, CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA,CAT_LISTAPRECIO,CAT_GP_DEV))
 				Next
 				Listo2=1
 				If PB2.Progress = 0 Then
@@ -2015,8 +2140,9 @@ Sub JobDone(Job As HttpJob)
 					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"))
+					Dim HVD_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
 '					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))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_VENTAS(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA) VALUES (?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA))
 				Next
 				Listo3 =1
 				If PB1.Progress = 0 Then
@@ -2325,7 +2451,7 @@ Sub connecta_Click
 				l_forzarActualizacion.Text = "Hay una nueva actualización para la aplicación, por favor revise que tenga DATOS y espere mientras se descarga."
 				p_transparenteActualizacion.Visible = True
 				p_transparenteActualizacion.BringToFront
-				Starter.nuevoLink = $"https://keymon.lat/movil/guna/GP_${revisaActualizacion.Get("nuevaVersion")}.apk"$
+				Starter.nuevoLink = $"https://keymon.net/movil/guna/GP_${revisaActualizacion.Get("nuevaVersion")}.apk"$
 				Log("Descargar: GP_" & Starter.newApp.appLink)
 				CallSubDelayed(appUpdater, "download_newApk")
 			else if revisaActualizacion.Get("forzar") = 2 Then ' No hay datos, regresamos al login y borramos usuario par que traiga los datos.
@@ -2434,6 +2560,10 @@ Log("-------->  BORRAMOS")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO3")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO4")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM ENCUESTA_MODULO5")
+	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM hist_ventastodos")	
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("ENVIOALMACEN"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULAT"))
+	B4XPages.MainPage.skmt.ExecNonQuery2("DELETE FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("RULONG"))
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM BITACORAGPS")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM RUTA_SUPLENCIA")
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM TICKET_IMPRESO")
@@ -2645,6 +2775,9 @@ Sub B_OK_PAS_Click
 			Next
 		End If
 		c13.Close
+		
+		
+		
 		checaPedido
 	Else if CARGA = "CARGAR" And (S_CP.Text <> "LISTO" Or S_CC.Text <> "LISTO" Or S_CH.Text <> "LISTO") Then
 		RES =  Msgbox2("Seguro que desa abortar el proceso","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png")) 'ignore
@@ -2792,43 +2925,72 @@ Sub resdia_Click
 	c.Close
 
 	'AQUI CAMBIAR
-	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
+'	Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String("","null"))
-	LogColor(s3.RowCount,Colors.Yellow)
+'	LogColor(s3.RowCount,Colors.Yellow)
+'	If s3.RowCount > 0 Then
+'		s3.Position = 0
+'		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+'		s.Position=0
+'		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
+'		s5.Position = 0
+''		l_ru_pri.Text = NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False)
+'		L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False)
+''		L_REAL.Text = Subs.calculaTotalConPromoXRango(s3.GetString("PE_CLIENTE"))
+'		s.Close
+'	Else If s3.RowCount = 0 Then
+'		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, pe_cliente FROM PEDIDO ")
+'		s.Position=0
+''		l_ru_pri.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False)
+'		L_REAL.Text = NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False)
+''		L_REAL.Text = Subs.calculaTotalConPromoXRango(s.GetString("PE_CLIENTE"))
+'		s.Close
+'	End If
+'	s3.Close
+
+	Private s3 As Cursor = B4XPages.MainPage.skmt.ExecQuery("select distinct(pe_cliente) FROM PEDIDO")
+	
 	If s3.RowCount > 0 Then
-				
+		Private total1 As String = 0
-		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL)",Array As String("","null"))
+		For i = 0 To s3.RowCount - 1
-		s.Position=0
+			s3.Position = i
-		Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE FROM PEDIDO WHERE (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL)",Array As String("","null"))
+'			LogColor($"Total antes ${total1}"$, Colors.blue)
-		s5.Position = 0
+			total1 = total1 + Subs.calculaTotalConPromoXRango(s3.GetString("PE_CLIENTE"))
-		
+'			LogColor(Subs.calculaTotalConPromoXRango(s3.GetString("PE_CLIENTE")), Colors.Magenta)
-'		l_ru_pri.Text = NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False)
+'			LogColor($"Total despues ${total1}"$, Colors.blue)
-		
+		Next
-		L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,False)
+		L_REAL.Text = total1
-		s.Close
+	Else
-		
+		L_REAL.Text = 0
-	Else If s3.RowCount = 0 Then
-		Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO ")
-		s.Position=0
-			
-'		l_ru_pri.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False)
-		
-		L_REAL.Text =NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,False)
-				
-		s.Close
 	End If
 
 	'Prueba0
-	Private ru_o As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT IFNULL(PE_RUTA, 0) AS PE_RUTA, IFNULL(SUM(PE_COSTO_TOT), 0) AS TOTAL_CLIE FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA IS NULL", Null)
+'	Private ru_o As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT IFNULL(PE_RUTA, 0) AS PE_RUTA, IFNULL(SUM(PE_COSTO_TOT), 0) AS TOTAL_CLIE, pe_cliente FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA IS NULL", Null)
-	ru_o.Position=0
+'	ru_o.Position=0
-	Log("------------->RutaOriginal "&ru_o)
+'	Log("------------->RutaOriginal "&ru_o)
-	If ru_o.GetString("PE_RUTA") = 0 Then
+'	If ru_o.GetString("PE_RUTA") = 0 Then
+'		Label2.Text = "N/A"
+'	Else if ru_o.RowCount >=1 Then 
+'		Private rutOr As String = ru_o.GetString("PE_RUTA")
+'		Label2.Text = "Ruta " & rutOr
+''		l_ru_pri.Text = NumberFormat2(ru_o.GetDouble("TOTAL_CLIE"), 0, 2, 2, False)
+'		l_ru_pri.Text = Subs.calculaTotalConPromoXRango(ru_o.GetString("PE_CLIENTE"))
+'	End If
+'	ru_o.Close
+
+	Private ru_o As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT distinct pe_cliente, pe_ruta FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA IS NULL", Null)
 	Label2.Text = "N/A"
-	Else if ru_o.RowCount >=1 Then 
+	Log("#####   " & ru_o.RowCount)
+	Private total2 As String = 0
+	If ru_o.RowCount > 0 Then
+		For i2 = 0 To ru_o.RowCount - 1
+			ru_o.Position = i2
+'			LogColor($"${ru_o.GetString("PE_RUTA")}|${ru_o.GetString("PE_CLIENTE")}"$, Colors.Red)
 			Private rutOr As String = ru_o.GetString("PE_RUTA")
 			Label2.Text = "Ruta " & rutOr
-		l_ru_pri.Text = NumberFormat2(ru_o.GetDouble("TOTAL_CLIE"), 0, 2, 2, False)
+			total2 = total2 + Subs.calculaTotalConPromoXRango(ru_o.GetString("PE_CLIENTE"))
+		Next
 	End If
-	ru_o.Close
+	l_ru_pri.Text = total2
 
 		'Prueba1
 	Private ru_s As Cursor = B4XPages.MainPage.skmt.ExecQuery2("SELECT IFNULL(PE_RUTA, 0) As PE_RUTA, IFNULL(SUM(PE_COSTO_TOT), 0) As TOTAL_CLIE FROM PEDIDO LEFT JOIN RUTA_SUPLENCIA ON PE_RUTA = RS_RUTA WHERE RS_RUTA Is Not Null", Null)
@@ -2860,6 +3022,8 @@ Sub resdia_Click
 		c.Close
 	End If
 '	L_REAL.Text = l_monto_ks.Text
+	Log(L_NES.Text)
+	Log(L_REAL.Text)
 	L_ALCANCE.Text = Round2((L_NES.Text / L_REAL.Text + 1),2)
 	L_VPLAN.Text = l_porvisitar.Text
 	L_VREAL.Text = L_CUANTOST.text
@@ -2949,7 +3113,26 @@ Sub tickets_dia_Click
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
-
+	Dim al_longitud As String = 0
+	Dim al_latitud As String = 0
+	Dim envlat As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'RULAT'")
+'	c = Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LATITUD"))
+	If envlat.RowCount > 0 Then
+		envlat.Position = 0
+		Dim al_latitud As String = envlat.GetString("CAT_VA_VALOR")
+	End If
+	envlat.Close
+	Dim envlat As Cursor = Starter.skmt.ExecQuery("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = 'RULONG'")
+'	envlat = Starter.skmt.ExecQuery2("SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?",Array As String("LONGITUD"))
+	If envlat.RowCount > 0 Then
+		envlat.Position = 0
+		Dim al_longitud As String = envlat.GetString("CAT_VA_VALOR")
+	End If
+	envlat.Close
+	Dim ubi1, ubi2 As Location
+	ubi1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
+	ubi2.Initialize2(al_latitud, al_longitud)
+	distancealm = ubi1.DistanceTo(ubi2)
 End Sub
 
 Sub Btn_Ubicar_Click
@@ -3192,4 +3375,7 @@ Sub checaPedido
 	If c.RowCount > 0 Then
 		Starter.skmt.ExecNonQuery("Update kmt_info3 set gestion = 3  WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)")
 	End If
+	
+	B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_ID IN (SELECT CAT_PD_PRODUCTO FROM CAT_PROMOS_DESCUENTOS) ",Array As Object("PRIORITARIO"))
+	
 End Sub

B4A/C_Promos.bas

@@ -596,6 +596,7 @@ Sub muestraPromo(promo As String, cliente As String)
 			Private thisProd As Map = prodsPromo.Get(p)
 			If thisLog Then Log(thisProd)
 			clv_prodsVariabes.Add(CreateListItem(Subs.traeProdNombre(p)&CRLF&"Hay " & invDispPromo.Get(p) & " $" & estePrecio, estePrecio, invDispPromo.Get(p), clv_prodsVariabes.AsView.Width, 50dip, Null, p), p)
+			
 		End If
 	Next
 	For Each p As String In pv2

B4A/C_TicketsDia.bas

@@ -54,7 +54,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 			ListView1.TwoLinesLayout.ItemHeight = 95dip
 			Label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 			label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
-			ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO"))
+			ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& Subs.calculaTotalConPromoXRango(c.GetString("PC_CLIENTE")))
 		Next
 	End If
 End Sub
@@ -104,13 +104,10 @@ Sub B4XPage_Appear
 				ListView1.TwoLinesLayout.ItemHeight = 95dip
 				label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 				label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
-				ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,True))
+				Log(1)
-				
+'				ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,True))
-			
+				ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& Subs.calculaTotalConPromoXRango(c.GetString("PC_CLIENTE")))
-			
 				s.Close
-		
-		
 			Else If s3.RowCount = 0 Then
 				Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE = ?", Array As String(C.GetString("PC_CLIENTE")))
 				s.Position=0
@@ -129,16 +126,10 @@ Sub B4XPage_Appear
 				ListView1.TwoLinesLayout.ItemHeight = 95dip
 				label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 				label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
-				ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& s.GetString("CANT_CLIE") & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,True))
+				Log(2)
-			
+				ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& s.GetString("CANT_CLIE") & " SubTotal $"& Subs.calculaTotalConPromoXRango(c.GetString("PC_CLIENTE")))
-				
-				
 				s.Close
 			End If
-			
-			
-			
-			
 		Next
 	End If
 	c.Close
@@ -210,15 +201,10 @@ Sub b_noventa_Click
 				Private s3 As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select * FROM PEDIDO WHERE PE_CLIENTE = ? and PE_RECALCULO <> ? OR PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL",Array As String(C.GetString("PC_CLIENTE"),"","null"))
 				LogColor(s3.RowCount,Colors.Yellow)
 				If s3.RowCount > 0 Then
-				
 					Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, IFNULL(SUM(PE_CANT),0) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE = ? and (PE_RECALCULO = ? or PE_RECALCULO = ? or PE_RECALCULO IS NULL ) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP)",Array As String(C.GetString("PC_CLIENTE"),"","null"))
 					s.Position=0
 					Private s5 As Cursor = B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(PE_RECALCULOTOT),0) as TOTAL_CLIE, IFNULL(SUM(PE_CANT),0) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE = ? and (PE_RECALCULO <> ? or PE_RECALCULO <> ? OR PE_RECALCULO IS NOT NULL) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP)",Array As String(C.GetString("PC_CLIENTE"),"","null"))
 					s5.Position = 0
-			
-				
-				
-				
 					Dim label1 As Label
 					label1 = ListView1.TwoLinesLayout.Label
 					label1.TextSize = 20
@@ -233,13 +219,9 @@ Sub b_noventa_Click
 					ListView1.TwoLinesLayout.ItemHeight = 95dip
 					label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 					label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
-					ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,True))
+'					ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE") + s5.GetString("TOTAL_CLIE"),0,2,2,True))
-				
+					ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& (s.GetString("CANT_CLIE") + s5.GetString("CANT_CLIE")) & " SubTotal $"& Subs.calculaTotalConPromoXRango(c.GetString("PC_CLIENTE")))
-			
-			
 					s.Close
-		
-		
 				Else If s3.RowCount = 0 Then
 					Private s As Cursor=B4XPages.MainPage.skmt.ExecQuery2("select iFNULL(sum(pe_costo_tot),0) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE = ?", Array As String(C.GetString("PC_CLIENTE")))
 					s.Position=0
@@ -258,10 +240,7 @@ Sub b_noventa_Click
 					ListView1.TwoLinesLayout.ItemHeight = 95dip
 					label1.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
 					label2.Typeface = Typeface.CreateNew(Typeface.DEFAULT_BOLD, Typeface.STYLE_BOLD)
-					ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& s.GetString("CANT_CLIE") & " SubTotal $"& NumberFormat2(s.GetString("TOTAL_CLIE"),0,2,2,True))
+					ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cantidad #"& s.GetString("CANT_CLIE") & " SubTotal $"& Subs.calculaTotalConPromoXRango(s3.GetString("PE_CLIENTE")))
-			
-				
-				
 					s.Close
 				End If
 			

B4A/C_historicobat.bas

@@ -0,0 +1,292 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=12.8
+@EndOfDesignText@
+Sub Class_Globals
+	Private Root As B4XView 'ignore
+	Private xui As XUI 'ignore
+
+	Dim g As GPS
+	Dim clie_id As String
+	Dim sDate,sTime As String
+	Dim usuario As String
+	
+	Dim c As Cursor
+	Dim ruta As String
+	Dim Regresar As Button
+	
+
+	Dim ListView1 As ListView
+	Dim L_CANT As Label
+	Dim L_TOTAL As Label
+	Dim borra As Button
+	Dim Existe As String
+	Dim result As String
+	'    Dim lat_gps, lon_gps As String
+
+	Private Titulo As Label
+	Private b_desc As Button
+	Private ListView2 As ListView
+	Dim tgl As Toggle
+	Private p_nota As Panel
+	Private Panel1 As Panel
+	Private l_productohist As Label
+	Private l_s1 As Label
+	Private l_s2 As Label
+	Private l_s3 As Label
+	Private l_s4 As Label
+	Private CustomListView1 As CustomListView
+	Private L_PROMEDIOHIST As Label
+End Sub
+
+'You can add more parameters here.
+Public Sub Initialize As Object
+	Return Me
+End Sub
+
+'This event will be called once, before the page becomes visible.
+Private Sub B4XPage_Created (Root1 As B4XView)
+	Root = Root1
+	'load the layout to Root
+	Root.LoadLayout("nota2")
+	borra.Visible = False
+	Titulo.Text = "Acumulado"
+	b_desc.Visible = False
+End Sub
+
+
+Sub B4XPage_Appear
+'	p_nota.Height = Root.Height
+'	p_nota.Width = Root.Width
+	Panel1.Visible = False
+	If Not(Starter.gps.GPSEnabled) Then
+		ToastMessageShow("Es necesario tener el GPS encendido", True)
+		StartActivity(Starter.gps.LocationSettingsIntent)
+	End If
+	L_CANT.Text =""
+	L_TOTAL.Text=""
+	c=B4XPages.MainPage.skmt.ExecQuery("select count(*) as EXISTE from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa)")
+	C.Position=0
+	Existe = C.GetString("EXISTE")
+	C.Close
+	c=B4XPages.MainPage.skmt.ExecQuery("select HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_FECHA asc")
+	ListView1.Clear
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim label1 As Label
+			label1 = ListView1.TwoLinesLayout.Label
+			label1.TextSize = 15
+			label1.TextColor = Colors.White
+			Dim label2 As Label
+			label2 = ListView1.TwoLinesLayout.SecondLabel
+			label2.TextSize = 15
+			label2.TextColor = Colors.White
+			ListView1.AddTwoLines(c.GetString("HVD_PRONOMBRE"),"Cantidad #"& c.GetString("HVD_CANT")& " SubTotal $"& c.GetString("HVD_COSTO_TOT")&"      Fecha: "& c.GetString("HVD_FECHA"))
+		Next
+	End If
+	If Existe <> 0 Then
+		c=B4XPages.MainPage.skmt.ExecQuery("select SUM(HVD_CANT) AS PC_NOART, SUM(HVD_COSTO_TOT) AS PC_MONTO from HIST_VENTAS where HVD_CLIENTE in (Select CUENTA from cuentaa)")
+		C.Position=0
+		L_CANT.Text = c.GetString("PC_NOART")
+		L_TOTAL.Text = c.GetString("PC_MONTO")
+	End If
+	ListView1.Visible = False
+'	CustomListView1.AsView.Visible = True
+	CustomListView1.AsView.Height = Root.Height * 0.45
+	CustomListView1.Clear
+	Dim prohit As Cursor = B4XPages.MainPage.skmt.ExecQuery("select distinct HVD_PRONOMBRE from HIST_VENTAS WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) order by HVD_PRONOMBRE asc")
+
+	If prohit.RowCount > 0 Then
+    
+		' --- Bucle 1: Recorrer cada producto ---
+		For sfdf = 0 To prohit.RowCount - 1
+			prohit.Position = sfdf
+			Dim nombreProducto As String = prohit.GetString("HVD_PRONOMBRE")
+        
+			' 1. Preparamos las variables para las 4 semanas
+			'    (Sem4 = hace 28 días, Sem1 = hace 7 días)
+			Dim cant_sem4 As String = "0"
+			Dim cant_sem3 As String = "0"
+			Dim cant_sem2 As String = "0"
+			Dim cant_sem1 As String = "0"
+        
+			' --- 2. Query 2: (MODIFICADO) ---
+			'    Este es el query de SQLite que hicimos, adaptado
+			'    para usar la variable 'nombreProducto'
+'			Dim sql As String = $"
+'				WITH FechasObjetivo (Fecha) AS (
+'   					SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-28 days'))
+'   					UNION ALL
+'   					SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-21 days'))
+'    				UNION ALL
+'  					SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-14 days'))
+'   					UNION ALL
+'   					SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-7 days'))
+'				)
+'				SELECT 
+'   					COALESCE(SUM(H.HVD_CANT), 0) AS HVD_CANT_TOTAL
+'				FROM 
+'   					FechasObjetivo AS F
+'				LEFT JOIN 
+'    				HIST_VENTAS AS H 
+'    				ON F.Fecha = H.HVD_FECHA
+'    				AND H.HVD_CLIENTE IN (SELECT CUENTA FROM cuentaa)
+'    				AND H.HVD_PRONOMBRE = '${nombreProducto}'
+'				GROUP BY
+'   					F.Fecha
+'				ORDER BY 
+'   					SUBSTR(F.Fecha, 7, 4),
+'    				SUBSTR(F.Fecha, 4, 2),
+			'    				SUBSTR(F.Fecha, 1, 2)
+'				"$
+
+
+			Dim sql As String = $"
+    WITH FechasObjetivo (Fecha) AS (
+        SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-28 days'))
+        UNION ALL
+        SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-21 days'))
+        UNION ALL
+        SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-14 days'))
+        UNION ALL
+        SELECT strftime('%d/%m/%Y', date('now', 'localtime', '-7 days'))
+    )
+    SELECT 
+        COALESCE(SUM(H.HVD_CANT), 0) AS HVD_CANT_TOTAL,
+        -- Si el mes de la fecha es igual al mes actual, devuelve 1, si no 0
+        CASE WHEN SUBSTR(F.Fecha, 4, 2) = strftime('%m', 'now', 'localtime') THEN 1 ELSE 0 END AS EsMesActual
+    FROM 
+        FechasObjetivo AS F
+    LEFT JOIN 
+        HIST_VENTAS AS H 
+        ON F.Fecha = H.HVD_FECHA
+        AND H.HVD_CLIENTE IN (SELECT CUENTA FROM cuentaa)
+        AND H.HVD_PRONOMBRE = '${nombreProducto}'
+    GROUP BY F.Fecha
+    ORDER BY SUBSTR(F.Fecha, 7, 4), SUBSTR(F.Fecha, 4, 2), SUBSTR(F.Fecha, 1, 2)
+"$
+        
+			' Log($"Ejecutando para: ${nombreProducto}")
+			' Log(sql) ' Descomenta esto si necesitas depurar el query
+        
+			Dim prohit2 As Cursor = B4XPages.MainPage.skmt.ExecQuery(sql)
+        
+			' --- 3. Leer los 4 resultados (YA NO NECESITAMOS BUCLE) ---
+			'    Sabemos que el query SIEMPRE devuelve 4 filas
+			'    en el orden correcto (hace 28, 21, 14, 7 días)
+'			Log(prohit2.RowCount)
+'			If prohit2.RowCount = 4 Then
+'				prohit2.Position = 0
+'				cant_sem4 = prohit2.GetString("HVD_CANT_TOTAL") ' Fila 1 (-28 días)
+'            
+'				prohit2.Position = 1
+'				cant_sem3 = prohit2.GetString("HVD_CANT_TOTAL") ' Fila 2 (-21 días)
+'            
+'				prohit2.Position = 2
+'				cant_sem2 = prohit2.GetString("HVD_CANT_TOTAL") ' Fila 3 (-14 días)
+'            
+'				prohit2.Position = 3
+'				cant_sem1 = prohit2.GetString("HVD_CANT_TOTAL") ' Fila 4 (-7 días)
+'			Else
+'				Log($"Error: El query no devolvió 4 filas para '${nombreProducto}'"$)
+'			End If
+'        
+'			prohit2.Close ' Cerramos el cursor interno
+'        	
+			Dim promx As Double = (cant_sem4 +  cant_sem3 + cant_sem2 + cant_sem1) / 4
+'			
+'			
+'			CustomListView1.Add(CreateListItem(nombreProducto, cant_sem4, cant_sem3, cant_sem2, cant_sem1, promx ), 1)
+
+
+			' Variables nuevas para el color (1 = Mes Actual, 0 = Otro)
+			Dim c1, c2, c3, c4 As Int
+
+			If prohit2.RowCount = 4 Then
+				prohit2.Position = 0
+				cant_sem4 = prohit2.GetString("HVD_CANT_TOTAL")
+				c1 = prohit2.GetInt("EsMesActual")
+    
+				prohit2.Position = 1
+				cant_sem3 = prohit2.GetString("HVD_CANT_TOTAL")
+				c2 = prohit2.GetInt("EsMesActual")
+    
+				prohit2.Position = 2
+				cant_sem2 = prohit2.GetString("HVD_CANT_TOTAL")
+				c3 = prohit2.GetInt("EsMesActual")
+    
+				prohit2.Position = 3
+				cant_sem1 = prohit2.GetString("HVD_CANT_TOTAL")
+				c4 = prohit2.GetInt("EsMesActual")
+			Else
+				Log("Error en filas")
+			End If
+			prohit2.Close
+
+			' Pasamos los indicadores de color al método (c1, c2, c3, c4)
+			CustomListView1.Add(CreateListItem(nombreProducto, cant_sem4, cant_sem3, cant_sem2, cant_sem1, promx, c1, c2, c3, c4), 1)
+'    
+		Next
+    
+		prohit.Close ' Cerramos el cursor externo
+    
+	End If
+	
+	
+	
+	
+End Sub
+
+
+'Sub CreateListItem(prodhis As String, s1 As Int, s2 As Int, s3 As Int,s4 As Int, prom As Double) As Panel 'ignore
+'	Dim p As B4XView = xui.CreatePanel("")
+'	p.SetLayoutAnimated(0, 0, 0, 288dip, 170dip)
+'	p.LoadLayout("historicobat")
+'	l_productohist.Text = prodhis
+'	l_s1.Text = s1
+'	l_s2.Text = s2
+'	l_s3.Text = s3
+'	l_s4.Text = s4
+'	L_PROMEDIOHIST.text = "Promedio " & prom
+'	
+'	Return p
+'End Sub
+
+
+Sub CreateListItem(prodhis As String, s1 As Int, s2 As Int, s3 As Int, s4 As Int, prom As Double, m1 As Int, m2 As Int, m3 As Int, m4 As Int) As Panel
+	Dim p As B4XView = xui.CreatePanel("")
+'	p.SetLayoutAnimated(0, 0, 0, 100%x, 170dip) ' En B4A es mejor usar %x para el ancho
+	p.SetLayoutAnimated(0, 0, 0, 288dip, 170dip)
+	p.LoadLayout("historicobat")
+    
+	l_productohist.Text = prodhis
+	l_s1.Text = s1
+	l_s2.Text = s2
+	l_s3.Text = s3
+	l_s4.Text = s4
+    
+	' Cambiar color de fondo de los labels según el mes
+	' Si mX es 1 (mes actual) -> Azul, si no -> Amarillo
+	l_s1.Color = IIf(m1 = 1, xui.Color_Blue, xui.Color_Yellow)
+	l_s2.Color = IIf(m2 = 1, xui.Color_Blue, xui.Color_Yellow)
+	l_s3.Color = IIf(m3 = 1, xui.Color_Blue, xui.Color_Yellow)
+	l_s4.Color = IIf(m4 = 1, xui.Color_Blue, xui.Color_Yellow)
+    
+	' Opcional: Cambiar el color del texto para que contraste
+	l_s1.TextColor = IIf(m1 = 1, xui.Color_White, xui.Color_Black)
+	l_s2.TextColor = IIf(m2 = 1, xui.Color_White, xui.Color_Black)
+	l_s3.TextColor = IIf(m3 = 1, xui.Color_White, xui.Color_Black)
+	l_s4.TextColor = IIf(m4 = 1, xui.Color_White, xui.Color_Black)
+
+	L_PROMEDIOHIST.Text = "Promedio " & NumberFormat(prom, 1, 2)
+    
+	Return p
+End Sub
+
+' Función auxiliar por si no tienes activado el IIf de B4A (disponible en versiones recientes)
+'Sub IIf(Condition As Boolean, TrueValue As Object, FalseValue As Object) As Object
+'    If Condition Then Return TrueValue Else Return FalseValue
+'End Sub

B4A/C_historicobatyodos.bas

@@ -0,0 +1,168 @@
+B4A=true
+Group=Default Group
+ModulesStructureVersion=1
+Type=Class
+Version=12.8
+@EndOfDesignText@
+Sub Class_Globals
+	Private Root As B4XView 'ignore
+	Private xui As XUI 'ignore
+
+	Dim g As GPS
+	Dim clie_id As String
+	Dim sDate,sTime As String
+	Dim usuario As String
+	
+	Dim c As Cursor
+	Dim ruta As String
+	Dim Regresar As Button
+	
+
+	Dim ListView1 As ListView
+	Dim L_CANT As Label
+	Dim L_TOTAL As Label
+	Dim borra As Button
+	Dim Existe As String
+	Dim result As String
+	'    Dim lat_gps, lon_gps As String
+
+	Private Titulo As Label
+	Private b_desc As Button
+	Private ListView2 As ListView
+	Dim tgl As Toggle
+	Private p_nota As Panel
+	Private Panel1 As Panel
+	Private l_productohist As Label
+	Private l_s1 As Label
+	Private l_s2 As Label
+	Private l_s3 As Label
+	Private l_s4 As Label
+	Private CustomListView1 As CustomListView
+	Private L_PROMEDIOHIST As Label
+End Sub
+
+'You can add more parameters here.
+Public Sub Initialize As Object
+	Return Me
+End Sub
+
+'This event will be called once, before the page becomes visible.
+Private Sub B4XPage_Created (Root1 As B4XView)
+	Root = Root1
+	'load the layout to Root
+	Root.LoadLayout("nota3")
+	borra.Visible = False
+	Titulo.Text = "Acumulado"
+	b_desc.Visible = False
+End Sub
+
+
+
+
+
+Sub B4XPage_Appear
+	Panel1.Visible = False
+	If Not(Starter.gps.GPSEnabled) Then
+		ToastMessageShow("Es necesario tener el GPS encendido", True)
+		StartActivity(Starter.gps.LocationSettingsIntent)
+	End If
+	
+	L_CANT.Text = ""
+	L_TOTAL.Text = ""
+	
+	c = B4XPages.MainPage.skmt.ExecQuery("select count(*) as EXISTE from hist_ventastodos  WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) ORDER BY HVD_CODPROMO, HVD_COSTO_TOT ASC")
+	c.Position = 0
+	Existe = c.GetString("EXISTE")
+	c.Close
+	
+	' =====================================================================
+	' NUEVA LÓGICA DE LISTVIEW1: DISEÑO "TICKET MODERNO"
+	' =====================================================================
+	ListView1.Clear
+	ListView1.Visible = True
+	
+	' 1. Fondo de la lista: Un gris muy claro/hueso para simular el papel
+	ListView1.Color = xui.Color_RGB(245, 245, 245)
+	
+	' 2. Diseño del Encabezado (El Ticket y la Fecha)
+	ListView1.SingleLineLayout.Label.TextSize = 16
+	' Azul oscuro elegante para separar visualmente los tickets
+	ListView1.SingleLineLayout.Label.TextColor = xui.Color_RGB(25, 118, 210)
+	ListView1.SingleLineLayout.Label.Typeface = Typeface.DEFAULT_BOLD
+	' Centrado en ambas direcciones para que parezca un divisor
+	ListView1.SingleLineLayout.Label.Gravity = Bit.Or(Gravity.CENTER_VERTICAL, Gravity.CENTER_HORIZONTAL)
+	ListView1.SingleLineLayout.ItemHeight = 50dip
+	
+	' 3. Diseño del Detalle (Los Productos)
+	ListView1.TwoLinesLayout.Label.TextSize = 16
+	ListView1.TwoLinesLayout.Label.TextColor = xui.Color_RGB(33, 33, 33) ' Gris casi negro (mejor lectura)
+	ListView1.TwoLinesLayout.Label.Typeface = Typeface.DEFAULT_BOLD
+	ListView1.TwoLinesLayout.Label.Gravity = Gravity.CENTER_VERTICAL
+	
+	ListView1.TwoLinesLayout.SecondLabel.TextSize = 15
+	' Verde oscuro para destacar el dinero y la cantidad
+	ListView1.TwoLinesLayout.SecondLabel.TextColor = xui.Color_RGB(56, 142, 60)
+	ListView1.TwoLinesLayout.SecondLabel.Typeface = Typeface.DEFAULT_BOLD
+	ListView1.TwoLinesLayout.ItemHeight = 70dip ' Espacio cómodo para que respire el texto
+
+	' Query: Ordena de más antiguo a más reciente
+	Dim queryVentas As String = $"
+		SELECT HVD_NUM_TICKET, HVD_PRONOMBRE, HVD_CANT, HVD_COSTO_TOT, HVD_FECHA 
+		FROM hist_ventastodos 
+		WHERE HVD_CLIENTE IN (Select CUENTA from cuentaa) 
+		ORDER BY 
+			SUBSTR(HVD_FECHA, 7, 4) ASC,
+			SUBSTR(HVD_FECHA, 4, 2) ASC,
+			SUBSTR(HVD_FECHA, 1, 2) ASC,
+			HVD_NUM_TICKET ASC,
+			HVD_CODPROMO,
+			HVD_COSTO_TOT ASC
+	"$
+	
+	c = B4XPages.MainPage.skmt.ExecQuery(queryVentas)
+	
+	If c.RowCount > 0 Then
+		Dim currentTicket As String = ""
+		
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			
+			Dim ticket As String = c.GetString("HVD_NUM_TICKET")
+			Dim fecha As String = c.GetString("HVD_FECHA")
+			Dim producto As String = c.GetString("HVD_PRONOMBRE")
+			Dim cant As String = c.GetString("HVD_CANT")
+			Dim costo As String = c.GetString("HVD_COSTO_TOT")
+'			Dim Costotodo As Double = 0
+			
+			' Agregamos el separador de Ticket
+			If ticket <> currentTicket Then
+'				Costotodo = Costotodo + costo
+'				ListView1.AddSingleLine($"🎫 TICKET: ${ticket} | 📅 ${fecha} ${CRLF} 💵 Total: $${NumberFormat2(Costotodo,0,2,2,False)}"$)
+				ListView1.AddSingleLine($"🎫 TICKET: ${ticket} | 📅 ${fecha}"$)
+				currentTicket = ticket
+			End If
+			
+			' Formateamos el texto del detalle usando Smart String Literal para que se vea más profesional
+			Dim detalle As String = $"📦 Cantidad: ${cant}   |   💵 Total: $${costo}"$
+			ListView1.AddTwoLines(producto, detalle)
+		Next
+	End If
+	c.Close
+	' =====================================================================
+
+	' Lógica para totales
+	If Existe <> "0" Then
+		c = B4XPages.MainPage.skmt.ExecQuery("select SUM(HVD_CANT) AS PC_NOART, SUM(HVD_COSTO_TOT) AS PC_MONTO from hist_ventastodos where HVD_CLIENTE in (Select CUENTA from cuentaa)")
+		c.Position = 0
+		L_CANT.Text = c.GetString("PC_NOART")
+		L_TOTAL.Text = c.GetString("PC_MONTO")
+		c.Close
+	End If
+
+	' ...
+	' (AQUÍ SIGUE TU CÓDIGO DEL CustomListView1 PARA EL PROMEDIO DE 4 SEMANAS)
+	' CustomListView1.AsView.Height = Root.Height * 0.45
+	' ...
+End Sub
+
+

B4A/Guna Vistas V3.1.b4a.meta

@@ -19,7 +19,10 @@ ModuleBookmarks24=
 ModuleBookmarks25=
 ModuleBookmarks26=
 ModuleBookmarks27=
+ModuleBookmarks28=
+ModuleBookmarks29=
 ModuleBookmarks3=
+ModuleBookmarks30=
 ModuleBookmarks4=
 ModuleBookmarks5=
 ModuleBookmarks6=
@@ -47,7 +50,10 @@ ModuleBreakpoints24=
 ModuleBreakpoints25=
 ModuleBreakpoints26=
 ModuleBreakpoints27=
+ModuleBreakpoints28=
+ModuleBreakpoints29=
 ModuleBreakpoints3=
+ModuleBreakpoints30=
 ModuleBreakpoints4=
 ModuleBreakpoints5=
 ModuleBreakpoints6=
@@ -64,24 +70,27 @@ ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
-ModuleClosedNodes18=4
+ModuleClosedNodes18=
 ModuleClosedNodes19=
 ModuleClosedNodes2=
 ModuleClosedNodes20=
-ModuleClosedNodes21=
+ModuleClosedNodes21=4
 ModuleClosedNodes22=
 ModuleClosedNodes23=
 ModuleClosedNodes24=
-ModuleClosedNodes25=4,6,7,8,9
+ModuleClosedNodes25=
 ModuleClosedNodes26=
 ModuleClosedNodes27=
+ModuleClosedNodes28=3,4,8,9
+ModuleClosedNodes29=
 ModuleClosedNodes3=
+ModuleClosedNodes30=20
 ModuleClosedNodes4=
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=6,8,9,10,11
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=Diseñador Visual,cliente.bal,-100,2,Main,Activity_Resume,46,0,Main,Globals,22,0,Main,Activity_Create,28,0,Main,Activity_ActionBarHomeClick,37,0,C_Cliente,Class_Globals,0,0,C_Cliente,Impresion3,2685,0,C_Cliente,B_IMP_Click,2674,2,C_Cliente,B4XPage_Appear,1145,3,C_Cliente,TraeCantProd,1222,6
+NavigationStack=C_Cliente,cb_p7_SelectedIndexChanged,7431,0,C_Cliente,cb_p9_SelectedIndexChanged,7449,0,C_Principal,Subir_Click,659,1,C_Cliente,b_guadarenc_Click,7454,6,C_Cliente,b_ventatb_Click,7411,0,C_Principal,Class_Globals,0,0,C_Principal,connecta_Click,2483,0,C_Principal,JobDone,1419,1,C_Cliente,gest_Click,1928,3,C_Cliente,B4XPage_CloseRequest,3164,0,C_Cliente,gestionar,2342,0
 SelectedBuild=0
-VisibleModules=25,2,14,26,5,10,11,20,19,16
+VisibleModules=28,2,17,29,5,14,18,30,20,4

B4A/Starter.bas

@@ -41,6 +41,7 @@ Sub Process_Globals
 	Dim encuesta As String = 0
 	Public fFileProvider As FileProvider
 	Dim tabla As String
+	Dim enCliente As Boolean = False
 End Sub
 
 Sub Service_Create
@@ -119,6 +120,15 @@ Sub ENVIA_ULTIMA_GPS
 	reqManager.ExecuteCommand(cmd, "actualizaUltimaGPS")
 	skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ?  WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
 	'Reiniciamos el timer para cuando llamamos el Sub desde "seleccion"
+	
+	If B4XPages.MainPage.rutapreventa <> 0 Then
+		cmd.Initialize
+		cmd.Name = "select_venta_tb_guna"
+		cmd.Parameters = Array As Object(B4XPages.MainPage.rutapreventa,B4XPages.MainPage.ALMACEN)
+		B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "hist_ventastodos")
+	End If
+	
+	
 	Timer1.Enabled = False
 	Timer1.Interval = Interval * 1000
 	Timer1.Enabled = True
@@ -155,6 +165,29 @@ Sub JobDone(Job As HttpJob)
 			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
 			Log($"Tag: ${RESULT.tag}, success=${Job.Success}"$)
 		End If
+		
+		If Job.JobName = "DBRequest" Then
+			Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job)
+			If RESULT.Tag = "hist_ventastodos" Then 'query tag
+				
+				For Each records() As Object In RESULT.Rows
+'					Log ("NO HACE NADA")
+					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"))
+					Dim HVD_FECHA As String = records(RESULT.Columns.Get("HVD_FECHA"))
+					Dim HVD_NUM_TICKET As String = records(RESULT.Columns.Get("HVD_NUM_TICKET"))
+					Dim HVD_CODPROMO As String = records(RESULT.Columns.Get("HVD_CODPROMO"))
+'					Log(HVD_CLIENTE&"--"&HVD_PRONOMBRE&"--"&HVD_CANT&"--"&HVD_COSTO_TOT)
+					Private tc As Cursor = skmt.ExecQuery($"select * from hist_ventastodos where HVD_CLIENTE = '${HVD_CLIENTE}' and HVD_PRONOMBRE = '${HVD_PRONOMBRE}' AND HVD_CANT = '${HVD_CANT}' AND HVD_CODPROMO = '${HVD_CODPROMO}' AND HVD_COSTO_TOT = '${HVD_COSTO_TOT}' "$)
+					If tc.RowCount = 0 Then
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO hist_ventastodos(HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT, HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO) VALUES (?,?,?,?,?,?,?)", Array As Object (HVD_CLIENTE,HVD_PRONOMBRE,HVD_CANT,HVD_COSTO_TOT,HVD_FECHA, HVD_NUM_TICKET,HVD_CODPROMO))
+					End If
+				Next
+				
+			End If
+		End If
 '		Log("JOBDONE SUCCESS")
 	End If
 End Sub

B4A/Subs.bas

@@ -741,7 +741,7 @@ Sub borraPedidoClienteActual As String
 '	Return 1
 	Private thisC As Cursor
 '	Private tablaProds As String = "cat_gunaprod2"
-	thisC=Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_FOLIO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) ")
+	thisC=Starter.skmt.ExecQuery("select PE_PROID, PE_CANT, PE_FOLIO FROM PEDIDO where pe_cliente in (Select CUENTA from cuentaa) AND PE_CEDIS <> 'DUR'")
 	If thisC.RowCount>0 Then
 		For i=0 To thisC.RowCount -1
 			thisC.Position = i
@@ -759,7 +759,7 @@ End Sub
 
 'Regresa el total del pedido en la tabla "PEDIDO" del cliente actual.
 Sub totalPedido As String
-	Private cT As Cursor = Starter.skmt.ExecQuery($"select sum(PE_COSTO_TOT) as total from PEDIDO where PE_CLIENTE = '${traeCliente}'"$)
+	Private cT As Cursor = Starter.skmt.ExecQuery($"select sum(PE_COSTO_TOT) as total from PEDIDO where PE_CLIENTE = '${traeCliente}' AND PE_CEDIS <> 'DUR'"$)
 	Private pTotal As String = "0"
 	If cT.RowCount > 0 Then
 		cT.Position = 0
@@ -779,7 +779,7 @@ End Sub
 Sub traeRuta2 (cliente As String) As String 'ignore
 	Private c As Cursor
 	Private r As String
-	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info where CAT_CL_CODIGO = '${cliente}' UNION ALL select CAT_CL_RUTA from kmt_info2 where CAT_CL_CODIGO = '${cliente}'"$)
+	c=B4XPages.MainPage.skmt.ExecQuery($"select CAT_CL_RUTA from kmt_info3 where CAT_CL_CODIGO = '${cliente}'"$)
 	r = "0"
 	If c.RowCount > 0 Then
 		c.Position=0
@@ -826,9 +826,12 @@ Sub traeCliente As String 'ignore
 	Private c As Cursor
 	Private cl As String
 	c=B4XPages.MainPage.skmt.ExecQuery("Select CUENTA from cuentaa")
+	If c.RowCount > 0 Then 
 		c.Position=0
 		cl = c.GetString("CUENTA")
+	End If
 	c.Close
+	Log($"Cliente=${cl}"$)
 	Return cl
 End Sub
 
@@ -1312,6 +1315,7 @@ Sub guardaAppInfo 'ignore
 	B4XPages.MainPage.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('APP_VERSION', '${Application.VersionName}')"$)
 End Sub
 
+' Promo $150
 Sub TraeMontoProd As Boolean
 	Private x As Boolean = False
 	Private c As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ifnull( SUM (PE_COSTO_TOT),0) As suma FROM PEDIDO JOIN CAT_PROMO_ESP ON CAT_PE_ID = PE_PROID WHERE PE_CLIENTE IN (Select CUENTA FROM CUENTAA)")
@@ -1320,7 +1324,6 @@ Sub TraeMontoProd As Boolean
 		Private c2 As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT DISTINCT CAT_PE_MONTO FROM CAT_PROMO_ESP")
 		If c2.RowCount > 0 Then
 			c2.Position = 0
-			
 				If c.GetString("suma") >= c2.GetString("CAT_PE_MONTO") Then
 					x = True
 '					Log("verdadero")
@@ -1328,7 +1331,6 @@ Sub TraeMontoProd As Boolean
 					x = False
 '					Log("Falso")
 				End If
-			
 		End If
 	End If
 	Return x
@@ -1755,14 +1757,15 @@ Sub traeUsarIntentBDWA As Boolean 'ignore
 	Return BDWA
 End Sub
 
-Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String)
+Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre As String, prodId As String, clienteId As String, fecha As String, usuario As String, rutaV As String, precioSin As String, tipoVenta As String,dev As String)
 	If nombre.Length < 6 Then ToastMessageShow("(actualizaProducto) El nombre del producto no es valido " & nombre, True)
 	precioSin = NumberFormat2(precioSin, 1, 2, 2, False)
 	costoU = NumberFormat2(costoU, 1, 2, 2, False)
 	LogColor($"actualizaProducto, c=${clienteId}, p=${prodId}, nombre=${nombre}, cant=${cant}, cedis=${cedis}, tipo=${tipoVenta}"$, Colors.Magenta)
 '	Private tablaProds As String = "cat_gunaprod2"
 '	If tipoVenta = "ABORDO" Then tablaProds = "cat_gunaprod"
-	Private c As Cursor=Starter.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}'"$)
+	If dev = 0 Then
+		Private c As Cursor=Starter.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' and PE_CEDIS <> 'DUR'"$)
 		If c.RowCount > 0 Then
 '		LogColor("ACTUALIZAMOS PROD - " & traeTablaProds(tipoVenta), Colors.Blue)
 			c.Position = 0
@@ -1789,6 +1792,36 @@ Sub actualizaProducto(cedis As String, costoU As String, cant As String, nombre
 			If cant > 0 Then guardaProductoSinGestion(cedis, costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)
 		End If
 		c.Close
+	Else If dev = 1 Then
+		Private c As Cursor=Starter.skmt.ExecQuery($"select * from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' and PE_CEDIS = 'DUR'"$)
+		If c.RowCount > 0 Then
+'		LogColor("ACTUALIZAMOS PROD - " & traeTablaProds(tipoVenta), Colors.Blue)
+			c.Position = 0
+			Private antCant As Int = 0
+			If IsNumber(c.GetInt("PE_CANT")) Then antCant=c.GetInt("PE_CANT")
+			Private difCant As Int = cant - antCant
+			Starter.skmt.ExecNonQuery($"update pedido set pe_cant = ${cant}, pe_costo_tot = ${NumberFormat2((cant*c.GetString("PE_COSTOU")), 1, 2, 2, False)}, pe_folio = '${tipoVenta}' where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
+			If cedis <> "DUR" Then Starter.skmt.ExecNonQuery($"update ${traeTablaProds(tipoVenta)} set cat_gp_almacen = cat_gp_almacen - (${difCant}) where cat_gp_id = '${prodId}' "$)
+			If cant = 0 Then
+				LogColor($"BORRAMOS PRODUCTO - ${prodId}"$, Colors.Red)
+				Starter.skmt.ExecNonQuery($"delete from pedido where pe_cedis = '${cedis}' and pe_proid = '${prodId}' and pe_cliente = '${clienteId}' "$)
+				Log($"Borramos pe_cedis='${cedis}' and pe_proid='${prodId}' and pe_cliente='${clienteId}'"$)
+				Private pe As Cursor = Starter.skmt.ExecQuery("select count(pe_cliente) as cuantosPedidos from pedido where pe_cliente In (select cuenta from cuentaa)")
+				pe.Position=0
+				If pe.GetString("cuantosPedidos") = 0 Then
+					Log("######    delete from pedido_cliente - " & traeCliente & "|" & clienteId)
+					Log($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$)
+					Starter.skmt.ExecNonQuery($"delete from pedido_cliente where PC_CLIENTE = '${traeCliente}'"$)
+				End If
+			End If
+		Else
+			'INSERTAMOS
+'		LogColor("INSERTAMOS PROD", Colors.red)
+			If cant > 0 Then guardaProductoSinGestion(cedis, costoU, cant, nombre, prodId, clienteId, fecha, usuario, rutaV, precioSin, tipoVenta)
+		End If
+		c.Close
+	End If
+	
 End Sub
 
 
@@ -2192,3 +2225,38 @@ Sub alcanzanLosVariablesParaPromo(promoMap As Map, inventarioSinFijos As Map) As
 '	Log(res)
 	Return res
 End Sub
+
+'Calcula el total de pedido tomando en cuenta si hay productos con promos por rango.
+Sub calculaTotalConPromoXRango(idCliente As String) As String
+'	caso 1 pe_recant = Null
+'	monto del pedido = pe_costo_tot
+'	caso 2 pe_recant = pe_cant (solo prods dentro de rango)
+'	monto del pedido = pe_recalculotot
+'	caso 3 pe_recant <> pe_cant (hay prod dentro de rango y producto extra
+'	monto del pedido = ((pe_cant - pe_reccant) * pe_costou) + pe_recalculotot
+'	Log("888888888888")
+	Private totalParcial As String = 0
+	Private total As String = 0
+	Private cx As Cursor = Starter.skmt.ExecQuery($"select *, ifnull(pe_reccant, 'N') as RECANT from pedido where pe_cliente = '${idCliente}'"$)
+	If cx.RowCount > 0 Then
+		For i = 0 To cx.RowCount - 1
+'			Log("999999999999999999999999999999999999")
+			cx.Position = i
+			Log("***************************************")
+			If cx.getstring("RECANT") = "N" Then ' Sin productos dentro de rango.
+				totalParcial = cx.getstring("PE_COSTO_TOT")
+			else if cx.getstring("RECANT") = cx.getstring("PE_CANT") Then ' Solo productos dentro de rango.
+				totalParcial = cx.getstring("PE_RECALCULOTOT")
+			Else ' hay productos dentro de rango y productos arriba del rango.
+				totalParcial = ((cx.getstring("PE_CANT") - cx.getstring("PE_RECCANT")) * cx.getstring("PE_COSTOU")) + (cx.getstring("PE_RECALCULO") * cx.getstring("PE_RECCANT"))
+				Log($"${((cx.getstring("PE_CANT") - cx.getstring("PE_RECCANT")) * cx.getstring("PE_COSTOU"))} + ${(cx.getstring("PE_RECALCULO") * cx.getstring("PE_RECCANT"))} "$)
+			End If
+			Log($"Total:${total} + Total Parcial: ${totalParcial}"$)
+			total = total + totalParcial
+		Next
+	End If
+	cx.Close
+	total = NumberFormat2(total, 1, 2, 2, False)
+	Log($"Total con promocXrango = ${total}"$)
+	Return total
+End Sub

B4A/Tracker.bas

@@ -4,6 +4,310 @@ ModulesStructureVersion=1
 Type=Service
 Version=10.2
 @EndOfDesignText@
+'#Region  Service Attributes 
+'	#StartAtBoot: True
+'#End Region
+''******************************************************************************
+''No olvidar agregar esta linea al editor de manifiesto:
+'' SetServiceAttribute(Tracker, android:foregroundServiceType, "location")
+''
+''En Starter agregar estas lineas en Process_Globals
+''	Public rp As RuntimePermissions
+''	Public FLP As FusedLocationProvider
+''	Private flpStarted As Boolean
+''
+''En Main agregar estas lineas a Activity_Resume
+''	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION)
+''	Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
+''	If Result Then
+''		StartService(Tracker)
+''		Log("Start Tracker")
+''	Else
+''		ToastMessageShow("No permission", True)
+''	End If
+''
+''Se necesitan las librerias FusedLocationProvider, GPS, Phone y RunTimePermissions
+''
+''Y en Main agregar estas dos lineas:
+''#AdditionalJar: com.android.support:support-v4
+''#AdditionalJar: com.google.android.gms:play-services-location
+'
+'Sub Process_Globals
+'	Private nid As Int = 51042
+'	Private Tracking As Boolean
+'	Private lock As PhoneWakeState
+'	'Para FusedLocationProvider (2 lineas)
+'	Public FLP As FusedLocationProvider
+'	Dim actualLR As LocationRequest
+'	Private flpStarted As Boolean
+''	Dim locRequest As String
+'	Dim UUGCoords As Location 'Ultima Ubicacion Guardada
+'End Sub
+'
+'Sub Service_Create
+'	Service.AutomaticForegroundMode = Service.AUTOMATIC_FOREGROUND_NEVER 'we are handling it ourselves
+'	'Para FusedLocationProvider (2 lineas)
+'	FLP.Initialize("flp")
+'	FLP.Connect
+'	lock.PartialLock
+'	StartFLP
+'End Sub
+'
+'Sub flp_ConnectionSuccess
+''	Log("Connected to location provider")
+'	'FLP.GetLastKnownLocation
+'End Sub
+'
+'Sub flp_ConnectionFailed(ConnectionResult1 As Int)
+'	Log("Failed to connect to location provider")
+'End Sub
+'
+'Sub Service_Start (StartingIntent As Intent)
+'	'Para FusedLocationProvider (1 linea)
+'	Service.StopAutomaticForeground
+'	Service.StartForeground(nid, CreateNotification("..."))
+'	Track
+'	StartServiceAt(Me, DateTime.Now + 5 * DateTime.TicksPerMinute, True)
+'	FLP.GetLastKnownLocation.Initialize
+'End Sub
+'
+'Public Sub Track
+''	Log("Inicia Track - Tracking : "&Tracking)
+'	If Not(FLP.IsInitialized) Then FLP.Initialize("flp")
+'	If Not(FLP.IsConnected) Then FLP.Connect
+'	If Tracking And actualLR.IsInitialized Then
+''		Log(actualLR.GetSmallestDisplacement)
+'		Return 'Si ya estamos "rastreando" no hacemos nada (return)
+'	End If
+'	If Starter.rp.Check(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION) = False Then
+'		Log("No permission")
+'		Return
+'	End If
+'	StartFLP 'Iniciamos FusedLocationProvider
+'	Tracking = True
+'End Sub
+'
+'Public Sub StartFLP
+'	Log("StartFLP - flpStarted="&flpStarted)
+'	Do While FLP.IsConnected = False
+'		Sleep(500)
+''		Log("sleeping")
+'	Loop
+''	If flpStarted = False Then
+''	Log("RequestLocationUpdates")
+'	FLP.RequestLocationUpdates(CreateLocationRequest) 'Buscamos ubicacion
+''	Log("Buscamos ubicacion")
+''	Log(actualLR.GetSmallestDisplacement)
+'	flpStarted = True
+''	End If
+'End Sub
+'
+'Public Sub StartFLPSmall
+''	Log("StartFLPSmall - flpStarted="&flpStarted)
+'	Do While FLP.IsConnected = False
+'		Sleep(500)
+'		Log("sleeping")
+'	Loop
+'	dameUltimaUbicacionConocida 'Regresamos ultima ubicacion conocida
+'	FLP.RequestLocationUpdates(CreateLocationRequestSmallD) 'Buscamos ubicacion 2 peticiones
+''	Log("Buscamos ubicacion Small displacement")
+''	Log("GPSSmallestDisplacement = " & actualLR.GetSmallestDisplacement)
+'End Sub
+'
+'Private Sub CreateLocationRequest As LocationRequest
+''	Log("CreateLocationRequest")
+'	Dim lr As LocationRequest
+'	lr.Initialize
+'	lr.SetInterval(10000) 'Intervalo deseado para actualizaciones de ubicacion
+'	lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion
+'	lr.SetSmallestDisplacement(40) 'Solo registra cambio de ubicacion si es mayor a XX mts
+'	lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY)
+'	actualLR=lr
+'	Return lr
+'End Sub
+'
+'Private Sub CreateLocationRequestSmallD As LocationRequest
+'	Log("Iniciamos CreateLocationRequestSmallD")
+'	Dim lr As LocationRequest
+'	lr.Initialize
+'	lr.SetInterval(2000) 'Intervalo deseado para actualizaciones de ubicacion
+'	lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion
+'	lr.setNumUpdates(2) 'Solicitamos solo 2 actualizaciones con estos parametros
+'	lr.SetSmallestDisplacement(0) 'Solo registra cambio de ubicacion si es mayor a XX mts
+'	lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY)
+'	actualLR=lr
+'	Return lr
+'End Sub
+'
+'Sub dameUltimaUbicacionConocida
+'	If FLP.GetLastKnownLocation.IsInitialized Then 'Mandamos ultima ubicacion guardada
+''		If Main.logger Then Log("Mandamos UUC : "&formatoFecha(FLP.GetLastKnownLocation.Time))
+'		If Starter.Logger Then LogColor($"Mandamos UUC "${Subs.fechaKMT(FLP.GetLastKnownLocation.Time)}|Acc:$0.2{FLP.GetLastKnownLocation.Accuracy}|$0.8{FLP.GetLastKnownLocation.Latitude}|$0.8{FLP.GetLastKnownLocation.Longitude}|Spd:$0.2{FLP.GetLastKnownLocation.Speed}|"$, Colors.RGB(255,112,35))
+'		Dim coords As String = FLP.GetLastKnownLocation.Latitude&","&FLP.GetLastKnownLocation.Longitude&","&formatoFecha(FLP.GetLastKnownLocation.Time)
+'		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
+''		Subs.mandamosLoc(coords)
+'	End If
+'End Sub
+'
+'Public Sub StopFLP
+'	'Log("StopFLP")
+'	If flpStarted Then
+'		FLP.RemoveLocationUpdates  'Eliminamos todas las solicitudes de ubicacion
+'		flpStarted = False
+'	End If
+'End Sub
+'
+'Sub flp_LocationChanged (Location1 As Location)
+''	ToastMessageShow("Loc changed", False)
+'	LogColor($"Loc changed:${Location1.Longitude},${Location1.Latitude}"$, Colors.Red)
+'	B4XPages.MainPage.lat_gps = Location1.Latitude
+'	B4XPages.MainPage.lon_gps = Location1.Longitude
+'	UUGCoords = Location1
+''	Starter.ubicacionActual = Location1
+''	Log("SmallestDisplacement="&actualLR.GetSmallestDisplacement)
+''	If DateTime.Now > LastUpdateTime + 10 * DateTime.TicksPerSecond Then
+''		Dim n As Notification = CreateNotification($"$2.5{Location1.Latitude} / $2.5{Location1.Longitude}"$)
+''		n.Notify(nid)
+''		LastUpdateTime = DateTime.Now
+''	End If
+'	If B4XPages.MainPage.lat_gps = 0 Or B4XPages.MainPage.lat_gps = Null And FLP.GetLastKnownLocation.IsInitialized Then
+'		B4XPages.MainPage.lat_gps = FLP.GetLastKnownLocation.Latitude
+'		B4XPages.MainPage.lon_gps = FLP.GetLastKnownLocation.Longitude
+'		Starter.ubicacionActual = FLP.GetLastKnownLocation
+'		LogColor("Coords en CERO - Guardamos ultima ubicacion conocida", Colors.red)
+'	End If
+'	'/////// para la ultima localización  FL
+'	Dim sDate,sTime As String
+'	DateTime.DateFormat = "MM/dd/yyyy"
+'	sDate=DateTime.Date(DateTime.Now)
+'	sTime=DateTime.Time(DateTime.Now)
+'	If Not(B4XPages.MainPage.skmt.IsInitialized) Then B4XPages.MainPage.skmt.Initialize(Starter.ruta,"kmt.db", True)
+'	Try
+'		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO  HIST_GPS (HGDATE, HGLAT, HGLON) VALUES(?,?,?) ", Array As Object (sDate & sTime, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps))
+'		B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
+'	Catch
+'		LogColor(LastException, Colors.Red)
+'	End Try
+'	'///////
+'	Dim coords As String = Location1.Latitude&","&Location1.Longitude&","&formatoFecha(Location1.Time)
+''	Log("Loc changed : "&Location1.Latitude&","&Location1.Longitude&"|"&B4XPages.MainPage.usuario&"|")
+''	Log("Mandamos Ubicacion")
+'	Log(FirebaseMessaging.locRequest)
+'	' Solo mandamos la ubicacion si la precision es menor a XX mts
+'	If Location1.Accuracy < 100 Then
+''		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
+'	End If
+'	If B4XPages.MainPage.cliente.LA_GPS.IsInitialized Then
+'		B4XPages.MainPage.cliente.LA_GPS.Text = "CON UBICACION GPS"
+'		B4XPages.MainPage.cliente.LA_GPS.TextColor = Colors.Black
+'	End If
+''	LogColor(Location1.Latitude, Colors.red)
+'	CallSub2(Starter, "GPS_LocationChanged", Location1)
+''	CallSub2(gestion, "GPS_LocationChanged", Location1)
+'	CallSub2(B4XPages.GetPage("Cliente"), "GPS_LocationChanged", Location1)
+''	CallSub2(nuevocliente, "GPS_LocationChanged", Location1)
+'End Sub
+'
+'Sub CreateNotification (Body As String) As Notification
+'	Dim notification As Notification
+'	notification.Initialize2(notification.IMPORTANCE_LOW)
+'	notification.Icon = "icon"
+'	notification.SetInfo("GUNA", Body, Main)
+'	Return notification
+'End Sub
+'
+'Sub Service_Destroy
+'	If Tracking Then
+'		StopFLP
+'	End If
+'	Tracking = False
+'	lock.ReleasePartialLock
+'End Sub
+'
+'Sub formatoFecha(fecha As String) As String 'Convierte una fecha al formato yyMMddHHmmss
+''	Log(fecha)
+'	Dim OrigFormat As String = DateTime.DateFormat  'save orig date format
+'	DateTime.DateFormat="yyMMddHHmmss"
+'	Dim lastUpdate As String=DateTime.Date(fecha)
+'	DateTime.DateFormat=OrigFormat  'return to orig date format
+''	Log(lastUpdate)
+'	Return lastUpdate
+'End Sub
+'
+''Revisamos que el FLP (FusedLocationProvider) este inicializado y activo
+'Sub revisaFLP 'ignore
+'	LogColor("**** **** Revisamos FLP **** ****", Colors.RGB(78,0,227))
+'	Private todoBienFLP As Boolean = True
+'	Try
+'		If Not(FLP.IsInitialized) Then
+'			Subs.log2DB("revisaFLP: No esta inicializado ... 'Reinicializando FLP'")
+'			FLP.Initialize("flp")
+'			todoBienFLP = False
+'		End If
+'	Catch
+'		LogColor("If Not(Tracker.FLP.IsInitialized) --> "&LastException, Colors.Red)
+'	End Try
+'	Try
+'		If FLP.IsInitialized Then
+'			Try
+'				If Not(FLP.IsConnected) Then
+'					Subs.log2DB("revisaFLP: No esta conectado ... 'Reconectando FLP'")
+'					'			Tracker.FLP.Connect
+'					StartFLP
+'					todoBienFLP = False
+'				End If
+'			Catch
+'				LogColor("If Not(Tracker.FLP.IsConnected) --> "&LastException, Colors.Red)
+'			End Try
+'			Try
+'				If FLP.IsConnected And _
+'					FLP.GetLastKnownLocation.IsInitialized And _
+'					FLP.GetLastKnownLocation.DistanceTo(UUGCoords) > 500 Then
+'					Subs.log2DB("revisaFLP: 'No se esta actualizando, lo reiniciamos ...'")
+'					StartService(Me)
+'					todoBienFLP = False
+'				End If
+'			Catch
+'				LogColor("If FLP.IsConnectctd and FLP.getLKL.IsInitialized --> "&LastException, Colors.Red)
+'			End Try
+'		End If
+'		If todoBienFLP Then LogColor(" +++ +++ Sin errores en FLP", Colors.Green)
+'	Catch
+'		LogColor("If Tracker.FLP.IsInitialized --> "&LastException, Colors.Red)
+'	End Try
+'	' revisar hora de lastKnownlocation y si es mayor de 10 minutos llamar StartFLP
+'End Sub
+'
+''Compara la UUG (Ultima Ubicacion Guardada) con FLP.LastKnowLocation y si
+''cumple con los requisitos de distancia y precision la guardamos en la BD.
+'Sub revisaUUG 'ignore
+'	Try
+''		revisaFLP
+'		If FLP.IsInitialized And FLP.IsConnected Then
+'			Try
+'				If FLP.GetLastKnownLocation.IsInitialized Then
+''					Dim x As Location = FLP.GetLastKnownLocation
+'					Dim daa As Int = UUGCoords.DistanceTo(FLP.GetLastKnownLocation) 'Distancia de la UUG a la actual de Tracker.FLP.GetLastKnownLocation
+'					If Starter.Logger Then LogColor($"**** UUC "${Subs.fechaKMT(FLP.GetLastKnownLocation.Time)}|$0.2{FLP.GetLastKnownLocation.Accuracy}|$0.8{FLP.GetLastKnownLocation.Latitude}|$0.8{FLP.GetLastKnownLocation.Longitude}|$0.2{FLP.GetLastKnownLocation.Speed}|"$, Colors.RGB(255,112,35))
+'					If daa > 40 And FLP.GetLastKnownLocation.Accuracy < 35 Then 'Si la distancia de la ubicacion anterior es mayor de XX y la precision es menor de XX, la guardamos ...
+'						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_GPS(fecha, lat, lon) VALUES (?,?,?)", Array As Object (Subs.fechaKMT(FLP.GetLastKnownLocation.Time),FLP.GetLastKnownLocation.Latitude,FLP.GetLastKnownLocation.Longitude))
+'						If Starter.Logger Then Log("++++ Distancia a anterior="&daa&"|"&"Precision="&FLP.GetLastKnownLocation.Accuracy)
+'					End If
+'					UUGCoords = FLP.GetLastKnownLocation
+'				End If
+'			Catch
+'				LogColor("FLP.GetLastKnownLocation.IsInitialized --> "&LastException, Colors.Red)
+'			End Try
+'		Else
+'			Log("StartFLP")
+'			StartFLP
+'		End If
+'	Catch
+'		LogColor("If FLP.IsInitialized --> "&LastException, Colors.Red)
+'	End Try
+'End Sub
+
+
 #Region  Service Attributes 
 	#StartAtBoot: True
 #End Region
@@ -18,7 +322,7 @@ Version=10.2
 '
 'En Main agregar estas lineas a Activity_Resume
 '	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION)
-'	Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
 '	If Result Then
 '		StartService(Tracker)
 '		Log("Start Tracker")
@@ -32,6 +336,7 @@ Version=10.2
 '#AdditionalJar: com.android.support:support-v4
 '#AdditionalJar: com.google.android.gms:play-services-location
 
+
 Sub Process_Globals
 	Private nid As Int = 51042
 	Private Tracking As Boolean
@@ -72,7 +377,7 @@ Sub Service_Start (StartingIntent As Intent)
 End Sub
 
 Public Sub Track
-'	Log("Inicia Track - Tracking : "&Tracking)
+	Log("Inicia Track - Tracking : "&Tracking)
 	If Not(FLP.IsInitialized) Then FLP.Initialize("flp")
 	If Not(FLP.IsConnected) Then FLP.Connect
 	If Tracking And actualLR.IsInitialized Then
@@ -102,8 +407,22 @@ Public Sub StartFLP
 '	End If
 End Sub
 
+Public Sub StartFLP2
+	Log("StartFLP2")
+	Private logger As Boolean = True
+	If logger Then Log("StartFLP2 - flpStarted="&flpStarted)
+	Do While FLP.IsConnected = False
+		Sleep(500)
+		If logger Then Log("kll - sleeping")
+	Loop
+	dameUltimaUbicacionConocida 'Regresamos ultima ubicacion conocida
+	FLP.RequestLocationUpdates(CreateLocationRequest2) 'Buscamos ubicacion 2 peticiones
+	If logger Then LogColor("Buscamos ubicacion (movimientoMinimo = "&actualLR.GetSmallestDisplacement&")", Colors.Magenta)
+'	If logger Then Log(actualLR.GetSmallestDisplacement)
+End Sub
+
 Public Sub StartFLPSmall
-'	Log("StartFLPSmall - flpStarted="&flpStarted)
+	Log("StartFLPSmall - flpStarted="&flpStarted)
 	Do While FLP.IsConnected = False
 		Sleep(500)
 		Log("sleeping")
@@ -115,12 +434,12 @@ Public Sub StartFLPSmall
 End Sub
 
 Private Sub CreateLocationRequest As LocationRequest
-'	Log("CreateLocationRequest")
+	Log("CreateLocationRequest")
 	Dim lr As LocationRequest
 	lr.Initialize
-	lr.SetInterval(10000) 'Intervalo deseado para actualizaciones de ubicacion
+	lr.SetInterval(2000) 'Intervalo deseado para actualizaciones de ubicacion
 	lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion
-	lr.SetSmallestDisplacement(40) 'Solo registra cambio de ubicacion si es mayor a XX mts
+	lr.SetSmallestDisplacement(15) 'Solo registra cambio de ubicacion si es mayor a XX mts
 	lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY)
 	actualLR=lr
 	Return lr
@@ -132,8 +451,22 @@ Private Sub CreateLocationRequestSmallD As LocationRequest
 	lr.Initialize
 	lr.SetInterval(2000) 'Intervalo deseado para actualizaciones de ubicacion
 	lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion
-	lr.setNumUpdates(2) 'Solicitamos solo 2 actualizaciones con estos parametros
+	lr.setNumUpdates(2) 'Solicitamos solo x actualizaciones con estos parametros
-	lr.SetSmallestDisplacement(0) 'Solo registra cambio de ubicacion si es mayor a XX mts
+	lr.SetSmallestDisplacement(3) 'Solo registra cambio de ubicacion si es mayor a XX mts
+	lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY)
+	actualLR=lr
+	Return lr
+End Sub
+
+Private Sub CreateLocationRequest2 As LocationRequest
+	Private logger As Boolean = True
+	If logger Then Log("Iniciamos CreateLocationRequest2")
+	Dim lr As LocationRequest
+	lr.Initialize
+	lr.SetInterval(1000) 'Intervalo deseado para actualizaciones de ubicacion
+	lr.SetFastestInterval(lr.GetInterval / 2) 'Intervalo minimo para actualizaciones de ubicacion
+	lr.setNumUpdates(2) 'Solicitamos solo x actualizaciones con estos parametros
+	lr.SetSmallestDisplacement(1) 'Solo registra cambio de ubicacion si es mayor a XX mts
 	lr.SetPriority(lr.Priority.PRIORITY_HIGH_ACCURACY)
 	actualLR=lr
 	Return lr
@@ -144,13 +477,13 @@ Sub dameUltimaUbicacionConocida
 '		If Main.logger Then Log("Mandamos UUC : "&formatoFecha(FLP.GetLastKnownLocation.Time))
 		If Starter.Logger Then LogColor($"Mandamos UUC "${Subs.fechaKMT(FLP.GetLastKnownLocation.Time)}|Acc:$0.2{FLP.GetLastKnownLocation.Accuracy}|$0.8{FLP.GetLastKnownLocation.Latitude}|$0.8{FLP.GetLastKnownLocation.Longitude}|Spd:$0.2{FLP.GetLastKnownLocation.Speed}|"$, Colors.RGB(255,112,35))
 		Dim coords As String = FLP.GetLastKnownLocation.Latitude&","&FLP.GetLastKnownLocation.Longitude&","&formatoFecha(FLP.GetLastKnownLocation.Time)
-		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
+'		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
 '		Subs.mandamosLoc(coords)
 	End If
 End Sub
 
 Public Sub StopFLP
-	'Log("StopFLP")
+	Log("StopFLP")
 	If flpStarted Then
 		FLP.RemoveLocationUpdates  'Eliminamos todas las solicitudes de ubicacion
 		flpStarted = False
@@ -158,24 +491,17 @@ Public Sub StopFLP
 End Sub
 
 Sub flp_LocationChanged (Location1 As Location)
+	Log($"Loc changed:${Location1.Longitude},${Location1.Latitude}"$)
 '	ToastMessageShow("Loc changed", False)
-	LogColor($"Loc changed:${Location1.Longitude},${Location1.Latitude}"$, Colors.Red)
 	B4XPages.MainPage.lat_gps = Location1.Latitude
 	B4XPages.MainPage.lon_gps = Location1.Longitude
 	UUGCoords = Location1
-'	Starter.ubicacionActual = Location1
 '	Log("SmallestDisplacement="&actualLR.GetSmallestDisplacement)
 '	If DateTime.Now > LastUpdateTime + 10 * DateTime.TicksPerSecond Then
 '		Dim n As Notification = CreateNotification($"$2.5{Location1.Latitude} / $2.5{Location1.Longitude}"$)
 '		n.Notify(nid)
 '		LastUpdateTime = DateTime.Now
 '	End If
-	If B4XPages.MainPage.lat_gps = 0 Or B4XPages.MainPage.lat_gps = Null And FLP.GetLastKnownLocation.IsInitialized Then
-		B4XPages.MainPage.lat_gps = FLP.GetLastKnownLocation.Latitude
-		B4XPages.MainPage.lon_gps = FLP.GetLastKnownLocation.Longitude
-		Starter.ubicacionActual = FLP.GetLastKnownLocation
-		LogColor("Coords en CERO - Guardamos ultima ubicacion conocida", Colors.red)
-	End If
 	'/////// para la ultima localización  FL
 	Dim sDate,sTime As String
 	DateTime.DateFormat = "MM/dd/yyyy"
@@ -192,19 +518,22 @@ Sub flp_LocationChanged (Location1 As Location)
 	Dim coords As String = Location1.Latitude&","&Location1.Longitude&","&formatoFecha(Location1.Time)
 '	Log("Loc changed : "&Location1.Latitude&","&Location1.Longitude&"|"&B4XPages.MainPage.usuario&"|")
 '	Log("Mandamos Ubicacion")
-	Log(FirebaseMessaging.locRequest)
+'	Log(FirebaseMessaging.locRequest)
 	' Solo mandamos la ubicacion si la precision es menor a XX mts
 	If Location1.Accuracy < 100 Then
 '		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
 	End If
-	If B4XPages.MainPage.cliente.LA_GPS.IsInitialized Then
+
-		B4XPages.MainPage.cliente.LA_GPS.Text = "CON UBICACION GPS"
-		B4XPages.MainPage.cliente.LA_GPS.TextColor = Colors.Black
-	End If
-'	LogColor(Location1.Latitude, Colors.red)
 	CallSub2(Starter, "GPS_LocationChanged", Location1)
+'	CallSub2(B4XPages.MainPage.cliente, "GPS_LocationChanged", Location1)
 '	CallSub2(gestion, "GPS_LocationChanged", Location1)
+
+	If B4XPages.MainPage.cliente.IsInitialized And Starter.enCliente Then
 		CallSub2(B4XPages.GetPage("Cliente"), "GPS_LocationChanged", Location1)
+	End If
+	If B4XPages.MainPage.nuevoCliente.IsInitialized Then
+		CallSub2(B4XPages.GetPage("nuevocliente"), "GPS_LocationChanged", Location1)
+	End If
 '	CallSub2(nuevocliente, "GPS_LocationChanged", Location1)
 End Sub
 
@@ -212,7 +541,7 @@ Sub CreateNotification (Body As String) As Notification
 	Dim notification As Notification
 	notification.Initialize2(notification.IMPORTANCE_LOW)
 	notification.Icon = "icon"
-	notification.SetInfo("GUNA", Body, Main)
+	notification.SetInfo("ADM", Body, Main)
 	Return notification
 End Sub
 

B4A/_juntaBas.ps1

@@ -0,0 +1,28 @@
+# SCRIPT: _juntaBas.ps1 - Versión Saneada y Optimizada para LLM
+$OutputFile="_CODIGO_COMPLETO_PARA_LLM.txt"
+
+# Eliminar el archivo anterior si existe (IMPORTANTE)
+Remove-Item -Path $OutputFile -ErrorAction SilentlyContinue
+
+Write-Host "Iniciando fusion para LLM..."
+
+# Itera sobre los archivos .bas, .b4a, .b4j
+Get-ChildItem -Path ".\*" -Include @("*.bas", "*.b4a", "*.b4j") | ForEach-Object {
+    $currentFile = $_.Name
+    Write-Host "Procesando: $currentFile"
+
+    # --- ENCABEZADO ESTRUCTURADO Y COMENTADO EN B4X (Agregado al archivo) ---
+    Add-Content -Path $OutputFile -Value "`n'======================================================================================"
+    Add-Content -Path $OutputFile -Value $"// ARCHIVO_INICIO: ${currentFile}"
+    Add-Content -Path $OutputFile -Value "'======================================================================================`n"
+    
+    # Vuelca el contenido del archivo
+    Get-Content -Encoding UTF8 -Path $_.FullName -Raw | Add-Content -Path $OutputFile
+    
+    # --- DELIMITADOR DE FIN DE ARCHIVO (Agregado al archivo) ---
+    Add-Content -Path $OutputFile -Value "`n'======================================================================================"
+    Add-Content -Path $OutputFile -Value $"// ARCHIVO_FIN: ${currentFile}"
+    Add-Content -Path $OutputFile -Value "'======================================================================================`n"
+}
+
+Write-Host "`nProceso terminado. Se ha creado el archivo: $OutputFile"

B4A/appUpdater.bas

@@ -78,7 +78,7 @@ Sub Process_Globals
 	'These variables can be accessed from all modules.
 
 	'Aqui va la liga al archivo .ver en el servidor que contiene la información de la aplicacion
-	Public lnk As String = "https://keymon.lat/movil/guna/gunaPreventa.ver"
+	Public lnk As String = "https://keymon.net/movil/guna/gunaPreventa.ver"
 '	Public lnk As String = "https://10.0.0.205/Movil/Guna/cedex.ver"
 	'##########################################
 	'##   La ruta en el servidor es:         ##