VERSION 6.02.20 GPS

- Se modifico el script para generar automaticamente los tags.

B4A/B4XMainPage.bas

@@ -12,12 +12,18 @@ Version=9.85
 	'######################           PULL         #############################################################
 	'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=git&Args=pull
 	'###########################################################################################################
+	'######################        PULL FORZADO    #############################################################
+	'Ctrl + click Respaldar y Pull: ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=start&Args=powershell.exe&Args=-ExecutionPolicy&Args=Bypass&Args=-File&Args=..\..\_sync_project.ps1
+	'###########################################################################################################
 	'######################           PUSH         #############################################################
 	'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=github&Args=..\..\
 	'###########################################################################################################
 	'######################      PUSH TORTOISE GIT     #########################################################
 	'Ctrl + click ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=TortoiseGitProc&Args=/command:commit&Args=/path:"./../../"&Args=/closeonend:2
 	'###########################################################################################################
+	'######################      PUSH TORTOISE GIT CON TAG    ##################################################
+	'Ctrl + clic para Git: ide://run?file=%WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe&Args=-ExecutionPolicy&Args=Bypass&Args=-File&Args=..\_git_tag.ps1&Args=%22%PROJECT%%22&Args=%22%PROJECT_NAME%%22
+	'###########################################################################################################
 #End Region
  
 'Ctrl + click ide://run?file=%WINDIR%\System32\cmd.exe&Args=/c&Args=github&Args=..\..\
@@ -156,11 +162,17 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	Log(ruta)
 	skmt.Initialize(ruta,"kmt.db", True)
 	Subs.guardaAppInfo(skmt)
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GIRO(GIRO TEXT)")
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CN(ACTIVO TEXT)")
+	
+	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTES_NUEVOS(CN_ID TEXT, CN_FECHA TEXT, CN_USER TEXT, CN_LAT TEXT, CN_LON TEXT, CN_NOMBRE TEXT, CN_DIRECCION TEXT, CN_FOTO TEXT, CN_ALMACEN TEXT, CN_RUTA TEXT,CN_GIRO TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_CUOTAS (HC_META6 TEXT, HC_META5 TEXT, HC_META4 TEXT, HC_META3 TEXT, HC_META2 TEXT, HC_META1 TEXT, HC_RUTA TEXT, HC_CUOTA1 TEXT, HC_CUOTA2 TEXT, HC_CUOTA3 TEXT, HC_CUOTA4 TEXT, HC_CUOTA5 TEXT, HC_CUOTA6 TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_GPS (HGDATE TEXT, HGLAT TEXT, HGLON TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_GUNAPROD2 (CAT_GP_INICIATIVA TEXT, CAT_GP_TIPOPROD TEXT, CAT_GP_DEV TEXT, CAT_GP_ALMACEN NUMERIC, CAT_GP_ID TEXT, CAT_GP_NOMBRE TEXT, CAT_GP_IMP1 TEXT, CAT_GP_IMP2 TEXT, CAT_GP_PRECIO TEXT, CAT_GP_CLASIF TEXT, CAT_GP_STS TEXT, CAT_GP_TIPO TEXT, CAT_GP_SUBTIPO TEXT, CAT_GP_IMG BLOB)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_STORE (HSS_CODIGO TEXT, HSS_IN TEXT, HSS_OUT TEXT, HSS_TOT TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_STAY_OUT (HSO_INI TEXT, HSO_FIN TEXT)")
+	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS TELEFONO(TEL TEXT, CLIENTE TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS INVENT_X_ENVIAR (ALMACEN TEXT, PROID TEXT, CANTIDAD TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_RESUM_APK (HIST_RA_OBJMES TEXT, HIST_RA_VENTA TEXT, HIST_RA_TENDENCIA TEXT, HIST_RA_ALCANCE TEXT, HISR_RA_DRAOBJ TEXT, HIST_RA_DRAVTA TEXT, HIST_RA_DSOBJ TEXT, HIST_RA_DSVTA TEXT, HIST_RA_VPOOBJ TEXT, HIST_RA_VPOVTA TEXT, HIST_RA_COBCCC TEXT, HIST_RA_CTES TEXT, HIST_RA_ECO TEXT, HIST_RA_VISITPLAN TEXT, HIST_RA_VISIREAL TEXT, HIST_RA_COBVISIT TEXT, HIST_RA_FRECCOMPOBJ TEXT, HIST_RA_FRECCOMREAL TEXT, HIST_RA_VENTAMES1 TEXT, HIST_RA_VENTAMES2 TEXT, HIST_RA_VENTAMES3 TEXT, HIST_RA_VENTAMES4 TEXT, HIST_RA_RECHAZO TEXT, HIST_RA_RECHAZOPORCEN TEXT, HIST_RA_SEMANA1 TEXT, HIST_RA_SEMANA1_DIAS TEXT, HIST_RA_SEMANA1_DRA TEXT, HIST_RA_SEMANA2 TEXT, HIST_RA_SEMANA2_DIAS TEXT, HIST_RA_SEMANA2_DRA TEXT, HIST_RA_SEMANA3 TEXT, HIST_RA_SEMANA3_DIAS TEXT, HIST_RA_SEMANA4 TEXT, HIST_RA_SEMANA3_DRA TEXT, HIST_RA_SEMANA4_DIAS TEXT, HIST_RA_SEMANA4_DRA TEXT, HIST_RA_SEMANA5 TEXT, HIST_RA_SEMANA5_DIAS TEXT, HIST_RA_SEMANA5_DRA TEXT, HIST_RA_SEMANA1_LPT TEXT, HIST_RA_SEMANA2_LPT TEXT, HIST_RA_SEMANA3_LPT TEXT, HIST_RA_SEMANA4_LPT TEXT, HIST_RA_SEMANA5_LPT TEXT, HIST_RA_RUTA TEXT, HIST_RA_IDALMACEN TEXT)")
 	skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_COMISIONES_MOVIL (HCM_IDALMACEN TEXT, HCM_RUTA TEXT, HCM_TOTAL_V TEXT, HCM_TOTAL_VIVE TEXT, HCM_TOTAL_GUNA TEXT,	HCM_TOTAL_BEB TEXT)")
@@ -178,7 +190,11 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "INT")
 	Subs.agregaColumna("NOVENTA", "NV_ENVIO_OK", "INT")
 	Subs.agregaColumna("PEDIDO", "PE_TICKET", "INT")
-
+	Subs.agregaColumna("CLIENTES_NUEVOS", "CN_COLONIA", "TEXT")
+	Subs.agregaColumna("CLIENTES_NUEVOS", "CN_TELEFONO", "TEXT")
+	Subs.agregaColumna("CLIENTES_NUEVOS", "CN_CP", "TEXT")
+	Subs.agregaColumna("CLIENTES_NUEVOS", "CN_SOLICITA", "TEXT")
+	Subs.agregaColumna("CLIENTES_NUEVOS", "CN_ENVIO", "TEXT")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_PRECIO8", "TEXT DEFAULT '0'")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_PRECIO9", "TEXT DEFAULT '0'")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_PRECIO10", "TEXT DEFAULT '0'")
@@ -188,6 +204,9 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Subs.agregaColumna("PEDIDO_CLIENTE", "PC_GUARDADO", "TEXT DEFAULT '0'")
 	Subs.agregaColumna("CAT_GUNAPROD2", "CAT_GP_VARREQ3", "TEXT DEFAULT '0'")
 	
+	Subs.agregaColumna("CAT_GUNAPROD2", "MARCA", "TEXT")
+	Subs.agregaColumna("CAT_GUNAPROD", "MARCA", "TEXT")
+
 	c=skmt.ExecQuery("select  COUNT(*) AS CUANTOS from HIST_STAY_OUT ")
 	C.Position = 0
 	If c.GetString("CUANTOS")  = 0 Then

B4A/C_Cliente.bas

@@ -15,7 +15,6 @@ Sub Class_Globals
 	Dim reqManager As DBRequestManager
 	Dim cmd As DBCommand
 	Dim ime As IME
-
 	Dim g As GPS
 	Dim ruta As String
 	Dim skmt As SQL
@@ -34,8 +33,6 @@ Sub Class_Globals
 	Dim BLANCO As String
 	Dim cuenta As String
 	Dim tipo_venta As String = "PREVENTA"
-	
-	
 	Dim c As Cursor
 	Dim s As Cursor
 	Dim DD As Cursor
@@ -54,13 +51,10 @@ Sub Class_Globals
 	Dim gest As Button
 	Dim la_saldotot As Label
 	Dim la_saldooper As Label
-	
 	Dim Tels As Button
 	Dim Label10 As Label
 	Dim Label11 As Label
-	
 	Dim Tar As Button
-	
 	Dim la_comm As Label
 	Dim la_actdte As Label
 	Dim la_usuario As Label
@@ -72,8 +66,7 @@ Sub Class_Globals
 	Dim DATOS As Button
 	Dim Guardar As Button
 	Dim NUEVO As Button
-	'    Dim lat_gps, lon_gps As String
+'	Dim lat_gps, lon_gps As String
-
 	Dim l_total As Label
 	Dim c2 As Cursor
 	Dim S2 As Cursor
@@ -88,7 +81,6 @@ Sub Class_Globals
 	Private BT_QR As Button
 	'Private qr As QRCode
 	Dim CODIGO As String
-
 	Private b_mapa As Button
 	Dim CUANTOS As String
 	Private B_IMP As Button
@@ -110,22 +102,18 @@ Sub Class_Globals
 	Private HR_RES3 As String
 	Private EXISTE As String
 	Private TELEFONO As String
-	
 	Private RB1 As RadioButton
 	Private RB2 As RadioButton
 	Private RB3 As RadioButton
 	Private RB4 As RadioButton
 	Private RB5 As RadioButton
-	
 	Private stay_hh As String
 	Private stay_mi As String
 	Private stay_ss As String
-	
 	Private LA_GEO As Label
 	Dim result As Int
 	Private cercavalor As String
 	Private LA_RUTA As String
-	
 	Private b_like As Button
 	Private B_GPS As Button
 '	Dim sc As JhsIceZxing1
@@ -152,7 +140,6 @@ Sub Class_Globals
 	Dim cuest As C_Cuestionario
 	Private b_ventaabordo As Button
 	Private l_factura As Label
-	
 	Dim Printer1 As EscPosPrinter
 	Dim impresoraConectada As Boolean = False
 	Dim MAC_IMPRESORA As String
@@ -163,6 +150,12 @@ Sub Class_Globals
 	Private lv_pedidoExistente As ListView
 	Private b_cerrar As Button
 	Private l_pedidoExistente As Label
+	Private l_telefono As Label
+	Private p_telefono As Panel
+	Private et_telefono As EditText
+	Private b_canceltelefono As Button
+	Private b_aceptelefono As Button
+	Private l_version As Label
 End Sub
 
 'You can add more parameters here.
@@ -192,7 +185,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Else 
 		b_cxc.Visible = True
 	End If
-	
+	p_telefono.Top = 0 : p_telefono.Left = 0
 	s.Position=0
 	If c.RowCount>0 Then
 		c.Position=0
@@ -242,11 +235,14 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	b_cerrar.Left = (p_pedidoExistente.Width / 2) - (b_cerrar.Width / 2)
 	Subs.centraPanel(p_pedidoExistente, Root.Width)
 	Subs.centraEtiqueta(l_pedidoExistente, Root.Width)
+	l_version.Text = Application.VersionName
+	l_version.Left = Root.Width - l_version.Width - 5dip
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	CallSubDelayed(Tracker, "StartFLPSmall")
 	p_pedidoExistente.Visible = False
 	reqManager.Initialize(Me, Starter.DBReqServer)
 	b_pedidoExistente.Visible = False
@@ -262,7 +258,7 @@ Sub B4XPage_Appear
 	p_abono.Visible = False
 	Subs.centraPanel(p_abono, Root.Width)
 	skmt.Initialize(ruta,"kmt.db", True)
-	c=B4XPages.MainPage.skmt.ExecQuery("select 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  from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa) UNION ALL select 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  from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
+	c=B4XPages.MainPage.skmt.ExecQuery("select 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 from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa) UNION ALL select 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  from kmt_info2 where CAT_CL_CODIGO In (Select cuenta from cuentaa)")
 	s=B4XPages.MainPage.skmt.ExecQuery("Select ifnull(SUM(PE_COSTO_TOT), 0)  As TOTAL_CLIE, SUM(PE_CANT)  As CANT_CLIE, PC_FACTURA FROM PEDIDO_CLIENTE INNER JOIN PEDIDO ON PEDIDO_CLIENTE.PC_CLIENTE = PEDIDO.PE_CLIENTE WHERE (PE_CLIENTE IN (Select cuenta from cuentaa))")
 	b = B4XPages.MainPage.skmt.ExecQuery("select COUNT(*) AS CLIENTE FROM ABONOSP WHERE CLIENTE IN (Select CUENTA from cuentaa)")
 	b.Position = 0
@@ -285,6 +281,7 @@ Sub B4XPage_Appear
 		l_atiende.Text = c.GetString("CAT_CL_ATIENDE1")
 		l_atiende2.Text = c.GetString("CAT_CL_ATIENTE2")
 		TELEFONO  = c.GetString("CAT_CL_TELEFONO")
+		l_telefono.Text  = c.GetString("CAT_CL_TELEFONO")
 		l_total.Text = "$" & NumberFormat2(s.GetString("TOTAL_CLIE"), 1, 2, 2, True)
 		total_cliente = s.GetString("TOTAL_CLIE")
 		Private factura As String = 0
@@ -298,16 +295,16 @@ Sub B4XPage_Appear
 		If m_lon.Length < 5 Then m_lon = "0"
 		LA_RUTA = c.GetString("CAT_CL_RUTA")
 		' ESTO ES PARA FORZAR A PEDIR LA FOTO Y EL GPS
-		If c.GetString("CAT_CL_NUM_SERIEFISICO") = "0"  Then
+'		If c.GetString("CAT_CL_NUM_SERIEFISICO") = "0"  Then
-			L_QR.TEXT = "SIN CODIGO"
+'			L_QR.TEXT = "SIN CODIGO"
-			L_QR.TextColor = Colors.Red
+'			L_QR.TextColor = Colors.Red
-			gest.VISIBLE = False
+'			gest.VISIBLE = False
-			BT_QR.Visible = True
+'			BT_QR.Visible = True
-		Else
+'		Else
-			L_QR.TEXT = c.GetString("CAT_CL_NUM_SERIEFISICO")
+'			L_QR.TEXT = c.GetString("CAT_CL_NUM_SERIEFISICO")
-			L_QR.TextColor = Colors.Blue
+'			L_QR.TextColor = Colors.Blue
-			BT_QR.Visible = False
+'			BT_QR.Visible = False
-		End If
+'		End If
 	End If
 	c.Close
 	s.Close
@@ -368,14 +365,6 @@ Sub B4XPage_Appear
 		Tels.Visible = True
 		gest.Visible = True
 	End If
-	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
 	Tels.Visible = True
 	gest.Visible = True
 
@@ -393,33 +382,20 @@ Sub B4XPage_Appear
 '	h.Close
 '	j.Close
 
-	If la_cuenta.Text = "0" Then
-		p_cbFactura.Visible = False
-		l_factura.Visible = False
-		b_ventaabordo.Visible = False
-	Else
-		p_cbFactura.Visible = True
-		l_factura.Visible = True
-		b_ventaabordo.Visible = True
-	End If
 	c = skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP"))
 	If c.RowCount > 0 Then
 		c.Position = 0
 		Starter.MAC_IMPRESORA = c.GetString("CAT_VA_VALOR")
 	End If
 	If Starter.MAC_IMPRESORA = "" Then Starter.MAC_IMPRESORA = "0"
-'	Log("|" & Starter.MAC_IMPRESORA & "|")
 	Printer1.Initialize(Me, "Printer1")
 	If Printer1.IsConnected = False Then
 '		Printer1.Connect
-'		Log("1")
 	Else
 		Printer1.DisConnect
 		Printer1.Connect
-		Log("2")
 	End If
 	If Subs.hayPedido And Starter.utimaPagina <> "Productos" And Starter.utimaPagina <> "Cliente" Then
-'		Log()
 		Private p As ResultSet = Starter.skmt.ExecQuery($"select * from pedido where pe_cliente = '${Subs.traeCliente}'"$)
 		lv_pedidoExistente.Clear
 		Private label1 As Label = lv_pedidoExistente.TwoLinesLayout.Label
@@ -442,6 +418,26 @@ Sub B4XPage_Appear
 		p_pedidoExistente.BringToFront
 		b_pedidoExistente.Visible = True
 	End If
+
+	If la_cuenta.Text = "0" Then
+		p_cbFactura.Visible = False
+		l_factura.Visible = False
+		b_ventaabordo.Visible = False
+	Else
+		p_cbFactura.Visible = True
+		l_factura.Visible = True
+		b_ventaabordo.Visible = True
+	End If
+
+	'Revisamos si la geocerca debe de activarse y de ser necesario, ocultamos los botones de venta y no venta.
+	If Subs.traeGeocerca Then ocultamosBotonesPorGeocerca
+
+	If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos.
+		Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$)
+		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+		GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation)
+	End If
 End Sub
 
 Sub B4XPage_disappear
@@ -451,35 +447,41 @@ End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
 '	LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red)
-	If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then
+'	If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then
-		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
+'		B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude
-		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
+'		B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude
-'		Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps)
+''		Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps)
-	End If
+'	End If
+	B4XPages.MainPage.lat_gps = Location1.Latitude
+	B4XPages.MainPage.lon_gps = Location1.Longitude
 
-	Dim l1, l2 As Location
+	Dim locTienda As Location
-	l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
+	locTienda.Initialize2(m_lat, m_lon)
 '	Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$)
-	l2.Initialize2(m_lat, m_lon)
 
 	BT_QR.Enabled = True
 	LA_GPS.TextColor = Colors.Blue
 	LA_GPS.Text = "CON UBICACION GPS"
-'	B_GPS.Enabled = True
+	distance = Location1.DistanceTo(locTienda)  'Distancia de la ubicacion actual a coords de la tienda.
-	'now we need the distance between our location and the target location
+	Log("Distancia a tienda: " & distance)
-	distance =    l1.DistanceTo(l2)  'the result is in meter
+	If distance < 50 Then
-	gest.Visible = True
-'	If distance < 100 Then
-		LA_GEO.TextColor = Colors.Blue
-		Tels.Visible = True
 		gest.Visible = True
-'	Else
+		Tels.Visible = True
-'		LA_GEO.TextColor = Colors.Red
+		If la_cuenta.Text = "0" Then
-	'	End If
+			b_ventaabordo.Visible = False
+		Else
+			b_ventaabordo.Visible = True
+		End If
+	Else
+		LA_GEO.TextColor = Colors.Red
+		If Subs.traeGeocerca Then
+			ocultamosBotonesPorGeocerca
+		End If
+	End If
 	LA_GEO.Text= $"$1.2{distance/1000} kms"$
 	B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM HIST_GPS")
 	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))
-	CallSubDelayed(Tracker, "CreateLocationRequest")
+'	CallSubDelayed(Tracker, "CreateLocationRequest")
 End Sub
 
 Sub ListView1_ItemLongClick (Position As Int, Value As Object)
@@ -504,7 +506,6 @@ Sub gest_Click
 '		Return False
 '	End If
 	Private x As Cursor = B4XPages.MainPage.skmt.ExecQuery($"select tienda_id from COORDENADAS_GPS where tienda_id = '${la_cuenta.text}'"$)
-'	Log("+++++++++++++  " & x.RowCount)
 	If la_cuenta.Text<> "0" And distance > 50 And x.RowCount = 0 Then
 		Private res As String = Msgbox2("¿Estas en la tienda, para guardar la nueva ubicación?", "AVISO", "Si","" ,"No", Null) 'ignore
 		If res = DialogResponse.POSITIVE Then
@@ -521,8 +522,6 @@ Sub gest_Click
 			reqManager.ExecuteCommand(cmd , "ins_coords_nuevas")
 		End If
 	End If
-	'Si hay mapa de productos es que hay venta en proceso, entonces borramos la actual para meter la nueva.
-'	If B4XPages.MainPage.productos.prodsMap.IsInitialized And B4XPages.MainPage.productos.prodsMap.Size > 0 Then Subs.borraPedidoClienteActual
 	B4XPages.ShowPage("productos")
 End Sub
 
@@ -533,7 +532,6 @@ End Sub
 Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 '	Return True To close, False To cancel
-'	Log($"venimosDeTicketsDia=${venimosDeTicketsDia}"$)
 	If la_cuenta.Text <> "0" Then
 	cuest.encuestaIniciada = False
 	cuest.ocultPanelPregunta
@@ -564,10 +562,6 @@ Sub Tar_Click
 	B4XPages.ShowPage("Nota")
 End Sub
 
-'Sub Tar_LongClick
-'	p_abono.Visible = True
-'End Sub
-
 Sub DATOS_Click
 	B4XPages.ShowPage("telefonos")
 End Sub
@@ -586,7 +580,6 @@ Sub Guardar_Click
 	c.Close
 	c=B4XPages.MainPage.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE, COUNT(*) AS CUANTOS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)")
 	c.Position=0
-'	Log("xxxxxxxxxxxxxxx   " & c.GetString("CUANTOS"))
 	If c.GetString("CUANTOS") > 0 Then ' Si hay pedido, entonces ...
 		Log("HAY PEDIDO")
 		Private cbFactura As Int = 0
@@ -626,7 +619,7 @@ Sub Guardar_Click
 '	LogColor($"actualizamos "${la_cuenta.text},  hora_final=${DateTime.now}"$,Colors.Red)
 	Subs.actualizaTET(la_cuenta.text)
 	DateTime.TimeFormat = "HH:mm:ss"
-	mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!!   solo envia clientes nuenos, no comentar lo que yo descomente --- javier (por que Guerra lo comento)
+	mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! - Solo envia clientes nuevos, no comentar lo que yo descomente --- javier (por que Guerra lo comento) ... ¿Que descomentaste?? --- Guerra
 	mandapiezas
 	B4XPages.MainPage.productos.reiniciarlistaProds = True
 	B4XPages.MainPage.productos.prodsMap.Initialize
@@ -1211,23 +1204,66 @@ Sub mandaPendientes
 '		ab.Close
 	
 	'CLIENTES NUEVOS
-	Dim bb As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from CLIENTE_NUEVO where CN_enviado is null"$)
+'	Dim bb As Cursor = B4XPages.MainPage.skmt.ExecQuery($"SELECT * from CLIENTE_NUEVO where CN_enviado is null"$)
-	Dim cb As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ID_ALMACEN from CAT_ALMACEN")
+'	Dim cb As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT ID_ALMACEN from CAT_ALMACEN")
-	cb.Position = 0
+'	cb.Position = 0
-	If bb.RowCount > 0 Then
+'	If bb.RowCount > 0 Then
-		For i=0 To bb.RowCount -1
+'		For i=0 To bb.RowCount -1
-			bb.Position = i
+'			bb.Position = i
+'			Dim cmd As DBCommand
+'			cmd.Initialize
+'			cmd.Name = "insert_cliente_INTMEX"
+'			cmd.Parameters = Array As Object( bb.GetString("CN_ID_CLIENTE"), bb.GetString("CN_NOMBRE"),B4XPages.MainPage.principal.l_ruta.Text,cb.GetString("ID_ALMACEN"))
+'			reqManager.ExecuteCommand(cmd , $"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$)
+'			Log($"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$)
+'		Next
+'		Log("si lo hice")
+'	End If
+'	bb.Close
+'	cb.Close
+
+
+	c=Starter.skmt.ExecQuery("SELECT CN_ID, CN_FECHA , CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_ALMACEN, CN_RUTA, CN_GIRO, CN_SOLICITA, CN_COLONIA, CN_TELEFONO, CN_CP FROM CLIENTES_NUEVOS")
+	If c.RowCount>0 Then
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			Dim dia As Int = DateTime.GetDayOfWeek(DateTime.Now)
+			If dia = 2  Then
+				Dim dialetra As String = "LUNES"
+			Else If dia = 3  Then
+				Dim dialetra As String = "MARTES"
+			Else If dia = 4  Then
+				Dim dialetra As String = "MIERCOLES"
+			Else If dia = 5  Then
+				Dim dialetra As String = "JUEVES"
+			Else If dia = 6  Then
+				Dim dialetra As String = "VIERNES"
+			Else If dia = 7  Then
+				Dim dialetra As String = "SABADO"
+			End If
 			Dim cmd As DBCommand
 			cmd.Initialize
-			cmd.Name = "insert_cliente_INTMEX"
+			cmd.Name = "insert_cliente_INTMEX2"
-			cmd.Parameters = Array As Object( bb.GetString("CN_ID_CLIENTE"), bb.GetString("CN_NOMBRE"),B4XPages.MainPage.principal.l_ruta.Text,cb.GetString("ID_ALMACEN"))
+			Log(c.GetString("CN_ID")&"    ,"& c.GetString("CN_FECHA")&"    ,"& c.GetString("CN_USER")&"    ,"& c.GetString("CN_LAT")&"    ,"& c.GetString("CN_LON")&"    ,"& c.GetString("CN_NOMBRE")&"    ,"& c.GetString("CN_DIRECCION")&"    ,"&ALMACEN& c.GetString("CN_RUTA")&"    ,"& "En espera"&c.GetString("CN_GIRO")&"    ,"&dialetra& c.GetString("CN_SOLICITA")&"    ,"& c.GetString("CN_COLONIA")&"    ,"& c.GetString("CN_TELEFONO"))
-			reqManager.ExecuteCommand(cmd , $"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$)
+			cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_NOMBRE"), c.GetString("CN_RUTA"),ALMACEN, c.GetString("CN_LAT"), c.GetString("CN_LON"), "En espera", c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_DIRECCION"), c.GetString("CN_GIRO"),dialetra, c.GetString("CN_TELEFONO"), c.GetString("CN_SOLICITA"), c.GetString("CN_COLONIA"), c.GetString("CN_CP"))
-			Log($"insert_cliente_${bb.GetString("CN_ID_CLIENTE")}"$)
+			reqManager.ExecuteCommand(cmd , $"insert_cliente_${C.GetString("CN_ID")}"$)
 		Next
-		Log("si lo hice")
 	End If
-	bb.Close
+	c.Close
-	cb.Close
+	
+	' Cambio atiende
+	c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_CL_TELEFONO, CAT_CL_CODIGO from kmt_info where CAT_CL_CODIGO IN (SELECT CLIENTE FROM TELEFONO)")
+	If c.RowCount>0 Then
+		For i=0 To c.RowCount -1
+			c.Position=i
+			Dim cmd As DBCommand
+			cmd.Initialize
+			cmd.Name = "update_atiende_INTMEX"
+			cmd.Parameters = Array As Object(C.GetString("CAT_CL_TELEFONO"),C.GetString("CAT_CL_CODIGO"),ALMACEN,Subs.traeRuta2(C.GetString("CAT_CL_CODIGO")))
+			reqManager.ExecuteCommand(cmd , "up_coordenadas")
+		Next
+	End If
+	c.Close
 
 ''		BANDERA FACTURA (Pendientes)
 ''		c=B4XPages.MainPage.skmt.ExecQuery("SELECT PC_FACTURA, PC_CLIENTE FROM pedido_cliente where PC_CLIENTE IN (Select CUENTA from cuentaa)")
@@ -1405,7 +1441,7 @@ Sub JobDone(Job As HttpJob)
 						Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k)))
 					Next
 				Next
-				B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE CLIENTE_NUEVO set CN_enviado = 1  where CN_ID_CLIENTE = '${cliente}'"$)
+				B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE CLIENTES_NUEVOS set CN_ENVIO = 1  where CN_ID = '${cliente}'"$)
 			End If
 		End If
 		
@@ -1644,3 +1680,61 @@ End Sub
 Private Sub b_pedidoExistente_Click
 	p_pedidoExistente.Visible = True
 End Sub
+
+Private Sub l_telefono_LongClick
+	p_telefono.Height = Root.Height
+	p_telefono.Width = Root.Width
+	p_telefono.Visible = True
+End Sub
+
+Private Sub b_aceptelefono_Click
+	If et_telefono.Text <> "" Then
+		
+		Private coord As Cursor = B4XPages.MainPage.skmt.ExecQuery("SELECT * from TELEFONO where CLIENTE IN (SELECT CUENTA FROM CUENTAA)")
+		
+		If coord.RowCount = 0 Then
+			skmt.ExecNonQuery2("INSERT INTO TELEFONO(TEL,CLIENTE) VALUES (?,?)", Array As String (et_telefono.Text,Subs.traeCliente))
+			B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE kmt_info set CAT_CL_TELEFONO = '${et_telefono.Text}'  where CAT_CL_CODIGO In (select cuenta from cuentaa)"$)
+			MsgboxAsync("Datos actualizados.","Atención")
+			l_telefono.Text = et_telefono.Text
+			ime.HideKeyboard
+			p_telefono.Visible = False
+			et_telefono.Text = ""
+		Else
+			skmt.ExecNonQuery2("UPDATE TELEFONO SET TEL = ? where CLIENTE IN (SELECT CUENTA FROM CUENTAA)", Array As String (et_telefono.Text))
+			B4XPages.MainPage.skmt.ExecNonQuery($"UPDATE kmt_info set CAT_CL_TELEFONO = '${et_telefono.Text}'  where CAT_CL_CODIGO In (select cuenta from cuentaa)"$)
+			MsgboxAsync("Datos actualizados.","Atención")
+			l_telefono.Text = et_telefono.Text
+			ime.HideKeyboard
+			p_telefono.Visible = False
+			et_telefono.Text = ""
+		End If
+		
+		
+	Else
+		MsgboxAsync("Por favor captura un telefono valido.","Atención")
+	End If
+End Sub
+
+Private Sub b_canceltelefono_Click
+	p_telefono.Visible = False
+	et_telefono.Text = ""
+	ime.HideKeyboard
+End Sub
+
+Private Sub p_telefono_Click
+	
+End Sub
+
+Private Sub Label16_LongClick
+	p_telefono.Height = Root.Height
+	p_telefono.Width = Root.Width
+	p_telefono.Visible = True
+End Sub
+
+' Ocultamos por geocerca (Venta, Preventa y No venta) 
+Sub ocultamosBotonesPorGeocerca
+	gest.Visible = False
+	b_ventaabordo.Visible = False
+	Tels.Visible = False
+End Sub

B4A/C_NuevoCliente.bas

@@ -4,22 +4,131 @@ 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 ruta As String
+'	Dim c As Cursor
+'	
+'	Dim CANCELA As Button
+'	Dim GUARDA As Button
+'	Dim cuenta As String
+'	Dim usuario As String
+'	Dim sDate,sTime As String
+'	Dim no_cliente As String
+'	Dim no_ruta As String
+'	
+'	Dim r_4 As RadioButton
+'	Dim E_NOMBRE As EditText
+'	Dim tgl As Toggle
+'	Private l_sinUbicacion As Label
+'	Private p_nuevoCliente As Panel
+'	Private Label1 As Label
+'	Private p_botones As Panel
+'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("nuevocliente")
+'	ruta = File.DirInternal
+'	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
+'	E_NOMBRE.Text =  ""
+'	If Not(Starter.gps.GPSEnabled) Then
+'		ToastMessageShow("Es necesario tener el GPS encendido", True)
+'		StartActivity(Starter.gps.LocationSettingsIntent)
+'	End If
+'	GUARDA.Visible = False
+'	Subs.panelVisible(p_nuevoCliente, 0, 0)
+'	p_nuevoCliente.Height = Root.Height
+'	p_nuevoCliente.Width = Root.Width
+'	Subs.centraEtiqueta(Label1, Root.Width)
+'	Subs.centraEtiqueta(l_sinUbicacion, Root.Width)
+'	Subs.centraPanel(p_botones, Root.Width)
+'	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
+'	End If
+'End Sub
+'
+'Sub GPS_LocationChanged (Location1 As Location)
+'	If B4XPages.MainPage.lat_gps <> "0.0" Then
+'		GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar.
+'		l_sinUbicacion.Visible = False
+'	End If
+'End Sub
+'
+'Sub CANCELA_Click
+'	B4XPages.ShowPage("Principal")
+'End Sub
+'
+'Sub GUARDA_Click
+'	If E_NOMBRE.Text =  "" Then
+'		ToastMessageShow("Se tiene que nombrar la tienda para continuar" , True)
+'	Else
+'		DateTime.DateFormat = "MM/dd/yyyy"
+'		DateTime.Timeformat = "HHmmss"
+'		sDate=DateTime.Date(DateTime.Now)
+'		sTime=DateTime.Time(DateTime.Now)
+'		Log($" ////////////   Date: ${sDate} - Time: ${sTime} ////////////////"$)
+'		'Aqui creamos manualmete la hora con el separador de los 2 puntos porque en algunas versiones de android no respeta el formato "Timeformat = 'HH:mm:ss'"
+'		Private hora As String = sTime.SubString2(0,2)
+'		Private mins As String = sTime.SubString2(2,4)
+'		Private segs As String = sTime.SubString(4)
+'		sTime = hora&":"&mins&":"&segs
+'		Log("////////////// sTime: "&sTime&" ////////////////")
+'		c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info")
+'		c.Position=0
+'		no_ruta= c.GetString("CAT_CL_RUTA")
+'		no_cliente= "N" & sTime & no_ruta
+'		Log("++ ++ no_cliente = "&no_cliente)
+'		c.Close
+'		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(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 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))
+'		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CLIENTE_NUEVO(CN_ID_CLIENTE, CN_NOMBRE) VALUES (?,?)", Array As Object(no_cliente, E_NOMBRE.Text))
+'		B4XPages.ShowPage("Cliente")
+'	End If
+'End Sub
+'
+'
+'Private Sub p_nuevoCliente_Click
+'	
+'End Sub
+
 Sub Class_Globals
 	Private Root As B4XView 'ignore
 	Private xui As XUI 'ignore
-	
 	Dim g As GPS
 	Dim ruta As String
 	Dim c As Cursor
-	
 	Dim CANCELA As Button
 	Dim GUARDA As Button
 	Dim cuenta As String
 	Dim usuario As String
 	Dim sDate,sTime As String
+	Dim sDate2,sTime2 As String
 	Dim no_cliente As String
 	Dim no_ruta As String
-	
+	Dim lista_punta As List
 	Dim r_4 As RadioButton
 	Dim E_NOMBRE As EditText
 	Dim tgl As Toggle
@@ -27,6 +136,33 @@ Sub Class_Globals
 	Private p_nuevoCliente As Panel
 	Private Label1 As Label
 	Private p_botones As Panel
+	Private p_cam As Panel
+	Private p_camara As Panel
+	Private b_foto_inci As Button
+'	Private camEx2 As CameraExClass2
+	Dim frontCamera As Boolean = False
+	Dim fototomada As String = "0"
+	Dim ALMACEN As String
+	Private et_direccion As EditText
+	Private Label2 As Label
+	Dim lat As Double = 0
+	Dim lon As Double = 0
+	Private b_ubicacion As Label
+	Private Label3 As Label
+	Private cb_giro As B4XComboBox
+	Dim giros As String
+	Private L_Atiende As Label
+	Private ET_Atiende As EditText
+	Private Label5 As Label
+	Private et_colonia As EditText
+	Private et_telefono As EditText
+	Private et_cp As EditText
+	Private Label6 As Label
+	Dim cuantosNuevos As Int
+	Private p_transparenteCN As Panel
+	Private p_clientesNuevos As Panel
+	Private b_clienteNuevo As Button
+	Private l_textoCN As Label
 End Sub
 
 'You can add more parameters here.
@@ -36,6 +172,7 @@ End Sub
 
 'This event will be called once, before the page becomes visible.
 Private Sub B4XPage_Created (Root1 As B4XView)
+'	B4XPages.SetTitle(Me, $"${Subs.capitalizar(B4XPages.GetPageId(Me))} - ${Application.VersionName}"$)
 	Root = Root1
 	'load the layout to Root
 	Root.LoadLayout("nuevocliente")
@@ -44,12 +181,45 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db")
 	End If
 '	skmt.Initialize(ruta,"kmt.db", True)
+'	p_camara.Height = Root.Height
+'	p_camara.Width = Root.Width
+'	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_CAMERA)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	If Result Then
+	''		camEx2.Initialize(p_cam, frontCamera, Me, "Camera1")
+	''		frontCamera = camEx2.Front
+'		Log("inicializamos Camara")
+'	Else
+'		ToastMessageShow("Sin permisos de camara!!!", True)
+'	End If
+	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE)
+	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+	If Result Then
+		Log("Con permisos para escritura")
+	Else
+		ToastMessageShow("Sin permisos de escritura!!!", True)
+	End If
+	
+	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_EXTERNAL_STORAGE)
+	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+	If Result Then
+		Log("Con permisos para escritura")
+	Else
+		ToastMessageShow("Sin permisos de lectura!!!", True)
+	End If
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	p_transparenteCN.Top = 0 : p_transparenteCN.Left = 0
+	p_transparenteCN.Width = Root.Width : p_transparenteCN.Height = Root.Height
+	et_direccion.Text = ""
 	E_NOMBRE.Text =  ""
+	ET_Atiende.Text = ""
+	et_colonia.Text = ""
+	et_telefono.Text = ""
+	et_cp.Text = ""
 	If Not(Starter.gps.GPSEnabled) Then
 		ToastMessageShow("Es necesario tener el GPS encendido", True)
 		StartActivity(Starter.gps.LocationSettingsIntent)
@@ -59,57 +229,390 @@ Sub B4XPage_Appear
 	p_nuevoCliente.Height = Root.Height
 	p_nuevoCliente.Width = Root.Width
 	Subs.centraEtiqueta(Label1, Root.Width)
+	Subs.centraEtiqueta(Label5, Root.Width)
+	Subs.centraEtiqueta(Label6, Root.Width)
+	Subs.centraEtiqueta(Label2, Root.Width)
+	Subs.centraEtiqueta(Label3, Root.Width)
 	Subs.centraEtiqueta(l_sinUbicacion, Root.Width)
+	Subs.centraEtiqueta(b_ubicacion, Root.Width)
 	Subs.centraPanel(p_botones, Root.Width)
 	E_NOMBRE.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2)
+	et_cp.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2)
+	et_colonia.Left = Round(Root.Width/2)-(et_colonia.Width/2)
+	et_direccion.Left = Round(Root.Width/2)-(et_direccion.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
+	cuantosNuevos = 0
+	Subs.centraPanel(p_clientesNuevos, Root.Width)
+	c = Starter.skmt.ExecQuery("select count(cat_cl_codigo) as cuantos from kmt_info where cat_cl_codigo like 'N%'")
+	If c.RowCount > 0 Then
+		c.Position = 0
+		cuantosNuevos = c.GetInt("cuantos")
+	End If
+	c.Close
+	Dim permitidos As Int = 0
+	c = Starter.skmt.ExecQuery("select ACTIVO from cn")
+	If c.RowCount > 0 Then
+		c.Position = 0
+		permitidos = c.GetInt("ACTIVO")
+	End If
+	c.Close
+	Log($"Permitidos: ${permitidos}, Actuales: ${cuantosNuevos}"$)
+	Log((permitidos > 0) & "|" & (permitidos > cuantosNuevos))
+'	If permitidos <> 0 Then ' Si permitidos es CERO entonces SIN LIMITE de clientes nuevos.
+	l_textoCN.Text = "Llegó al límite de clientes nuevos, ya no es posible agregar mas clientes."
+	If permitidos = 0 Then l_textoCN.Text = "No tienes permitido dar de alta clientes nuevos."
+		If permitidos > cuantosNuevos Then
+			p_transparenteCN.Visible = False
+		Else
+			p_transparenteCN.BringToFront
+			p_transparenteCN.Visible = True
+		End If
+'	End If
+
+	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
+	
+'	lista_punta.Initialize
+'	Dim pol As Cursor = Starter.skmt.ExecQuery("SELECT LAT, LONG FROM POLIGONO")
+'	If pol.RowCount > 0 Then
+'		
+'		For poli = 0 To pol.RowCount -1
+'			pol.Position = poli
+'			Dim coords As LatLng
+'			coords.Initialize(pol.GetString("LAT"), pol.GetString("LONG"))
+'			lista_punta.Add(coords)
+'		Next
+'	End If
+	
+	If Not(Starter.GPS.GPSEnabled) Then
+		ToastMessageShow("Debe Activar el GPS del Equipo.", True)
+		StartActivity(Starter.GPS.LocationSettingsIntent)
+	Else
+		Starter.GPS.Start(0, 0)
+'		If Starter.ubicacionActual.Latitude <> 0 Then GPS_LocationChanged(Starter.ubicacionActual)
+	End If
+	CallSubDelayed(Tracker, "StartFLPSmall")
+	
+	c = Starter.skmt.ExecQuery("SELECT GIRO FROM CAT_GIRO order by 1")
+	Dim Items As List
+	Items.Initialize
+	Items.Add("SELECCIONA UNA OPCIÓN")
+	If c.RowCount > 0 Then
+		For i = 0 To c.RowCount-1
+			c.Position = i
+			Items.Add(c.GetString("GIRO"))
+		Next
+		cb_giro.SetItems(Items)
+	End If
+	giros = "SELECCIONA UNA OPCIÓN"
+	c.Close
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
 	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
+		lat = Location1.Latitude
+		lon = Location1.Longitude
+		l_sinUbicacion.Text = ("Latitud: " & lat & ", Longotud: "& lon)
+	End If
+	
+	b_ubicacion.TextSize = 13
+	b_ubicacion.Text = $"Precisión GPS $1.0{Location1.Accuracy} m"$
+	If Location1.Accuracy > 200 Then
+		b_ubicacion.TextColor = Colors.Red
+		b_ubicacion.TextSize = 16
+		b_ubicacion.Text = $"Mala señal $1.0{Location1.Accuracy} m"$
 	End If
 End Sub
 
+'Sub InicializarGPSPreciso
+'	Dim gps1 As GPS
+'	gps1.Initialize("GPS")
+'    
+'	' Usar Criteria para alta precisión
+'	Dim cr As Criteria
+'	cr.Accuracy = cr.ACCURACY_FINE
+'	cr.PowerRequirement = cr.POWER_HIGH
+'    
+'	gps1.Start(0, 0) ' Máxima frecuencia de actualización
+'End Sub
+
 Sub CANCELA_Click
 	B4XPages.ShowPage("Principal")
+	CallSubDelayed(Tracker, "StartFLP")
+End Sub
+
+Sub PointInPolygon(point As LatLng, polygon As List) As Boolean
+	Dim x As Double = point.Longitude
+	Dim y As Double = point.Latitude
+    
+	Dim inside As Boolean = False
+	For i = 0 To polygon.Size - 1
+		Dim j As Int = (i + 1) Mod polygon.Size
+		Dim p1_1 As LatLng = polygon.Get(i)
+		Dim p2_1 As LatLng = polygon.Get(j)
+        
+		Dim xi As Double = p1_1.Longitude
+		Dim yi As Double = p1_1.Latitude
+		Dim xj As Double = p2_1.Longitude
+		Dim yj As Double = p2_1.Latitude
+        
+		Dim intersect As Boolean = ((yi > y) <> (yj > y)) And (x < (xj - xi) * (y - yi) / (yj - yi) + xi)
+		If intersect Then
+			inside = Not(inside)
+		End If
+	Next
+    
+	Return inside
+	
+	
 End Sub
 
 Sub GUARDA_Click
-	If E_NOMBRE.Text =  "" Then
+	
-		ToastMessageShow("Se tiene que nombrar la tienda para continuar" , True)
+'	Dim mPoint As LatLng
+'	mPoint.Initialize(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
+'	
+	''	If lista_punta.Size > 0 Then
+	''		Dim dentro As Boolean = PointInPolygon(mPoint, lista_punta)
+	''
+	''		If dentro Then
+'	ToastMessageShow("El punto está DENTRO del polígono", True)
+	B4XPages.ShowPage("NuevoCliente")
+		
+	
+	' Verifica si el nombre de la tienda está vacío
+	If E_NOMBRE.Text = "" Then
+		MsgboxAsync("Por favor captura el nombre de la Tienda","Atención")
+		' Verifica si la dirección tiene más de 3 caracteres
+	Else If et_direccion.Text.Length > 3 Then
+		' Verifica si la latitud es diferente de 0
+		If lat <> 0 Then
+			' Verifica si el giro del cliente está seleccionado
+			If giros <> "SELECCIONA UNA OPCIÓN" Or cb_giro.SelectedItem <> "SELECCIONA UNA OPCIÓN" Then
+				' Verifica si el encargado que atiende el negocio está capturado
+				If ET_Atiende.Text <> "" Then
+					If et_telefono.Text <> "" Then
+						If et_colonia.Text <> "" Then
+							If et_cp.Text <> "" Then
+					
+								DateTime.DateFormat = "MM/dd/yyyy"
+								DateTime.Timeformat = "HHmmss"
+								sDate = DateTime.Date(DateTime.Now)
+								sTime = DateTime.Time(DateTime.Now)
+								Log($" ////////////   Date: ${sDate} - Time: ${sTime} ////////////////"$)
+								' Aquí creamos manualmente la hora con el separador de los 2 puntos porque en algunas versiones de Android no respeta el formato "Timeformat = 'HH:mm:ss'"
+								Private hora As String = sTime.SubString2(0,2)
+								Private mins As String = sTime.SubString2(2,4)
+								Private segs As String = sTime.SubString(4)
+								sTime = hora & ":" & mins & ":" & segs
+								Dim Fechacliente() As String = Regex.Split("/",sDate)
+								Log("////////////// sTime: "&sTime&" ////////////////")
+								c = Starter.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info")
+								c.Position = 0
+								no_ruta = c.GetString("CAT_CL_RUTA")
+ 								no_cliente = "N" & sTime & no_ruta
+								Log("++ ++ no_cliente = "&no_cliente)
+								c.Close
+							
+								Starter.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO,  HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (no_cliente))
+								Starter.skmt.ExecNonQuery("delete from CUENTAA")
+								Starter.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(no_cliente))
+								c = Starter.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN")
+								If c.RowCount > 0 Then
+									c.Position = 0
+									ALMACEN = c.GetString("ID_ALMACEN")
+								End If
+								c.Close
+								c = Starter.skmt.ExecQuery("select usuario from usuarioa")
+								c.Position = 0
+								usuario = c.GetString("USUARIO")
+								c.Close
+								' Starter.skmt.ExecNonQuery2("INSERT INTO HIST_FOTO_CLIENTE(CODIGO, ALMACEN, RUTA) VALUES(?,?,?)", Array As Object(no_cliente, ALMACEN, no_ruta))
+								' Starter.skmt.ExecNonQuery2("INSERT INTO  NOVENTA (NV_CLIENTE,NV_FECHA,NV_USER,NV_MOTIVO,NV_LAT,NV_LON,NV_NOMBRE,NV_DIRECCION) VALUES(?,?,?,?,?,?,?,?) ", Array As Object (no_cliente,sDate & sTime, usuario, "NUEVO CLIENTE", lat, lon, E_NOMBRE.Text,et_direccion.Text))
+                    
+								DateTime.DateFormat = "dd/MM/yyyy"
+								DateTime.Timeformat = "HH:mm:ss"
+								sDate2 = DateTime.Date(DateTime.Now)
+								sTime2 = DateTime.Time(DateTime.Now)
+								Log("AQUI")
+								Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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_GIRO,CAT_CL_CP) 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, cb_giro.SelectedItem,et_cp.Text))
+								Starter.skmt.ExecNonQuery2("INSERT INTO CLIENTES_NUEVOS(CN_ID, CN_FECHA, CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_ALMACEN, CN_RUTA, CN_GIRO, CN_SOLICITA,CN_COLONIA, CN_TELEFONO,CN_CP) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As String(no_cliente, sDate2 &" "&sTime2, usuario, lat, lon, E_NOMBRE.Text, et_direccion.Text, ALMACEN, no_ruta, cb_giro.SelectedItem, ET_Atiende.Text,et_colonia.Text,et_telefono.Text,et_cp.Text))
+								' fototomada = "0"
+								B4XPages.ShowPage("Cliente")
+								CallSubDelayed(Tracker, "StartFLP")
+							Else
+								MsgboxAsync("Por favor, debe capturar el C.P. el negocio.","Atención")
+							End If
+						Else
+							MsgboxAsync("Por favor, debe capturar la colonia el negocio.","Atención")
+						End If
+					Else
+						MsgboxAsync("Por favor, debe capturar el telefono.","Atención")
+					End If
+				Else
+					' Mensaje de advertencia si ET_Atiende.Text está vacío
+					MsgboxAsync("Por favor, debe capturar al encargado que atiende el negocio.","Atención")
+				End If
+			Else
+				MsgboxAsync("Por favor captura el giro del cliente","Atención")
+			End If
+		Else
+			MsgboxAsync("Por favor revisa que tengas señal GPS","Atención")
+		End If
 	Else
-		DateTime.DateFormat = "MM/dd/yyyy"
+		MsgboxAsync("Por favor captura la dirección del cliente","Atención")
-		DateTime.Timeformat = "HHmmss"
-		sDate=DateTime.Date(DateTime.Now)
-		sTime=DateTime.Time(DateTime.Now)
-		Log($" ////////////   Date: ${sDate} - Time: ${sTime} ////////////////"$)
-		'Aqui creamos manualmete la hora con el separador de los 2 puntos porque en algunas versiones de android no respeta el formato "Timeformat = 'HH:mm:ss'"
-		Private hora As String = sTime.SubString2(0,2)
-		Private mins As String = sTime.SubString2(2,4)
-		Private segs As String = sTime.SubString(4)
-		sTime = hora&":"&mins&":"&segs
-		Log("////////////// sTime: "&sTime&" ////////////////")
-		c=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA FROM kmt_info")
-		c.Position=0
-		no_ruta= c.GetString("CAT_CL_RUTA")
-		no_cliente= "N" & sTime & no_ruta
-		Log("++ ++ no_cliente = "&no_cliente)
-		c.Close
-		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(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 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))
-		B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CLIENTE_NUEVO(CN_ID_CLIENTE, CN_NOMBRE) VALUES (?,?)", Array As Object(no_cliente, E_NOMBRE.Text))
-		B4XPages.ShowPage("Cliente")
 	End If
+	
+'		Else
+'			ToastMessageShow("El punto está FUERA del polígono", True)
+'		End If
+'	End If
 End Sub
 
 
+
+
 Private Sub p_nuevoCliente_Click
 	
 End Sub
+
+'Private Sub b_foto_inci_Click
+'	camEx2.TakePicture
+'	p_camara.Visible = False
+''	StopCamera2
+'End Sub
+'
+'Private Sub InitializeCamera2
+'	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_CAMERA)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	If Result Then
+'		camEx2.Initialize(p_cam, frontCamera, Me, "Camera1")
+'		frontCamera = camEx2.Front
+'		Log("inicializamos Camara")
+'	Else
+'		ToastMessageShow("Sin permisos de camara!!!", True)
+'	End If
+'	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	If Result Then
+'		Log("con permisos para escritura")
+'	Else
+'		ToastMessageShow("Sin permisos de escritura!!!", True)
+'	End If
+'	
+'	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_EXTERNAL_STORAGE)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	If Result Then
+'		Log("con permisos para escritura")
+'	Else
+'		ToastMessageShow("Sin permisos de lectura!!!", True)
+'	End If
+'End Sub
+'
+'Sub Camera1_Ready (Success As Boolean)
+'	Log("Camara ready")
+'	If Success Then
+'		camEx2.SetJpegQuality(90)
+'		camEx2.SetContinuousAutoFocus
+'		camEx2.CommitParameters
+'		camEx2.StartPreview
+'		Log(camEx2.GetPreviewSize)
+'	Else
+'		ToastMessageShow("Cannot open camera.", True)
+'		Log("Cannot open camera")
+'	End If
+'End Sub
+'
+'Sub Camera1_PictureTaken (Data()As Byte)
+'	Log("tome foto")
+'	Dim filename As String = fototomada
+'	Dim Dirp As String = File.DirInternal
+'	Dim Dir As String
+'	Dim Dir2 As String
+'	Try
+'		File.MakeDir(Dirp,"/promotoriakmts")
+'		Dir = "/promotoriakmts"
+'		Log("creado en promotoria " & Dirp & Dir)
+'	Catch
+'		Dir = ""
+'		Log("creado en raiz")
+'	End Try
+'	
+'	Try
+'		File.MakeDir(Dirp & Dir,"/reduccion")
+'		Dir2 = "/reduccion"
+'		Log("creado en promotoria " & Dirp & Dir & Dir2)
+'	Catch
+'		Dir = ""
+'		Log("creado en raiz")
+'	End Try
+'	
+'	camEx2.SavePictureToFile(Data, Dirp&Dir, filename)
+'	camEx2.StartPreview 'restart preview
+'	ToastMessageShow("Picture saved." & CRLF  & "File size: " & File.Size(Dir, filename) & Dir &"," & filename, True)
+'	Log("Picture saved." & CRLF  & "File size: " & File.Size(Dir, filename) & Dir &"," & filename)
+'	p_camara.Visible = False
+'	StopCamera2
+'	
+'End Sub
+'
+'Private Sub StopCamera2
+''	Capturing = False
+'	If camEx2.IsInitialized Then
+'		camEx2.Release
+'	End If
+'End Sub
+'
+'
+'Private Sub B_FOTO_Click
+'	DateTime.DateFormat="ddMMyyyyHHmmss"
+'	InitializeCamera2
+'	Subs.panelVisible(p_camara, 0, 0)
+'	fototomada = DateTime.Now & "_cliente.jpg"
+'End Sub
+
+Private Sub cb_giro_SelectedIndexChanged (Index As Int)
+	giros = cb_giro.SelectedItem
+End Sub
+
+Private Sub et_cp_TextChanged (Old As String, New As String)
+	If New.Length > 5 Then
+		et_cp.Text = Old
+	Else If New.Length > 1 And New.Length <= 5 Then
+		If New.Contains(Chr(10)) Or New.Contains(Chr(13)) Or New.Contains(Chr(34)) Then
+			et_cp.Text = Old
+		End If
+	End If
+	
+End Sub
+
+Private Sub et_telefono_TextChanged (Old As String, New As String)
+	If New.Length > 10 Then
+		et_telefono.Text = Old
+	Else If New.Length > 1 And New.Length <= 10 Then
+		If New.Contains(Chr(10)) Or New.Contains(Chr(13)) Or New.Contains(Chr(34)) Then
+			et_telefono.Text = Old
+		End If
+	End If
+	
+End Sub
+
+Private Sub b_clienteNuevo_Click
+	B4XPages.ShowPage("Principal")
+	p_transparenteCN.Visible = False
+End Sub
+
+Private Sub p_transparenteCN_Click
+	
+End Sub

B4A/C_Principal.bas

@@ -222,6 +222,8 @@ Sub Class_Globals
 	Private p_prod As Panel
 	Private b_regreso As Button
 	Private b_productos As Button
+	Private B_PROM As Button
+	Private B_PROD As Button
 End Sub
 
 'You can add more parameters here.
@@ -747,6 +749,34 @@ Sub Subir_Click
 		End If
 		c.Close
 		
+		c=Starter.skmt.ExecQuery("SELECT CN_ID, CN_FECHA , CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_ALMACEN, CN_RUTA, CN_GIRO, CN_SOLICITA, CN_COLONIA, CN_TELEFONO, CN_CP FROM CLIENTES_NUEVOS")
+		If c.RowCount>0 Then
+			For i = 0 To c.RowCount - 1
+				c.Position = i
+				Dim dia As Int = DateTime.GetDayOfWeek(DateTime.Now)
+				If dia = 2  Then
+					Dim dialetra As String = "LUNES"
+				Else If dia = 3  Then
+					Dim dialetra As String = "MARTES"
+				Else If dia = 4  Then
+					Dim dialetra As String = "MIERCOLES"
+				Else If dia = 5  Then
+					Dim dialetra As String = "JUEVES"
+				Else If dia = 6  Then
+					Dim dialetra As String = "VIERNES"
+				Else If dia = 7  Then
+					Dim dialetra As String = "SABADO"
+				End If
+				Dim cmd As DBCommand
+				cmd.Initialize
+				cmd.Name = "insert_cliente_INTMEX2"
+				Log(c.GetString("CN_ID")&"    ,"& c.GetString("CN_FECHA")&"    ,"& c.GetString("CN_USER")&"    ,"& c.GetString("CN_LAT")&"    ,"& c.GetString("CN_LON")&"    ,"& c.GetString("CN_NOMBRE")&"    ,"& c.GetString("CN_DIRECCION")&"    ,"&ALMACEN& c.GetString("CN_RUTA")&"    ,"& "En espera"&c.GetString("CN_GIRO")&"    ,"&dialetra& c.GetString("CN_SOLICITA")&"    ,"& c.GetString("CN_COLONIA")&"    ,"& c.GetString("CN_TELEFONO"))
+				cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_NOMBRE"), c.GetString("CN_RUTA"),ALMACEN, c.GetString("CN_LAT"), c.GetString("CN_LON"), "En espera", c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_DIRECCION"), c.GetString("CN_GIRO"),dialetra, c.GetString("CN_TELEFONO"), c.GetString("CN_SOLICITA"), c.GetString("CN_COLONIA"), c.GetString("CN_CP"))
+				reqManager.ExecuteCommand(cmd , "inst_clientesn")
+			Next
+		End If
+		c.Close
+
 		' LO DEL LIKE
 		c=B4XPages.MainPage.skmt.ExecQuery("Select HFCLIENTE, HFALIAS,HFRUTA,HFALMACEN from HIST_FACE")
 		If c.RowCount>0 Then
@@ -841,7 +871,7 @@ Sub cargar_Click
 		Subs.panelVisible(P1, 0, 0)
 		Subs.centraPanel(P1, Root.Width)
 		Subs.centraPanelV(P1, Root.Height)
-'	trabajar.Visible = False
+'		trabajar.Visible = False
 		NUEVO.Visible =False
 		BUSCA.Visible=False
 		connecta.Visible=False
@@ -906,7 +936,7 @@ Sub cargar_Click
 		sTime=DateTime.Time(DateTime.Now)
 
 		Dim P As PhoneId
-'	imei = P.GetDeviceId
+'		imei = P.GetDeviceId
 		imei = "xxxx"
 		cmd.Initialize
 		cmd.Name ="insert_drop_INTMEX_3"
@@ -923,10 +953,10 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object(ALMACEN,e_ruta.Text)
 		reqManager.ExecuteQuery(cmd , 0, "gunaprod2")
 
-'	cmd.Initialize
+'		cmd.Initialize
-'	cmd.Name = "select_resum_apk_INTMEX"   ''' va el nombre de archivo de config
+'		cmd.Name = "select_resum_apk_INTMEX"   ''' va el nombre de archivo de config
-'	cmd.Parameters = Array As Object(ALMACEN)
+'		cmd.Parameters = Array As Object(ALMACEN)
-'	reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done
+'		reqManager.ExecuteQuery(cmd , 0, "resum_apk") ''' donde regresa la info ver job_done
 
 		cmd.Initialize
 		cmd.Name = "select_cat_paquetes_INTMEX4"
@@ -945,10 +975,21 @@ Sub cargar_Click
 		reqManager.ExecuteQuery(cmd , 0, "detallepaq")
 
 		cmd.Initialize
-		cmd.Name = "select_cat_clientes_INTMEX"
+		cmd.Name = "select_cat_clientes3_INTMEX"
-		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		cmd.Parameters = Array As Object(e_ruta.text,e_ruta.text, ALMACEN,e_ruta.text,e_ruta.text)
+		Log("select_cat_clientes3_INTMEX: " & e_ruta.text & "|" & ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 
+		cmd.Initialize
+		cmd.Name = "select_cn_INTMEX"
+		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		reqManager.ExecuteQuery(cmd , 0, "cn")
+
+		'' cambiar
+		cmd.Initialize
+		cmd.Name = "select_cat_GIRO_INTMEX"
+		reqManager.ExecuteQuery(cmd , 0, "giro")
+
 		cmd.Initialize
 		cmd.Name = "select_cat_clientes_todos_INTMEX"
 		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
@@ -986,23 +1027,25 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "tipoRuta")
 
+'		cmd.Initialize
+'		cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX"
+'		cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
+'		reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS")
 
-
+		cmd.Name = "select_geocerca_intmex"
-'	cmd.Initialize
+		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
-'	cmd.Name = "select_HIST_MARCAS_CUOTAS_INTMEX"
+		Log($"traeGeocerca: almacen: ${ALMACEN}, ruta: ${e_ruta.text}"$)
-'	cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
+		reqManager.ExecuteQuery(cmd , 0, "traeGeocerca")
-'	reqManager.ExecuteQuery(cmd , 0, "HIST_MARCAS_CUOTAS")
 	
 		If E_RUTA2.text <> "" Then
-			
 			B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text))
 
 			E_RUTA2.Visible = False
 			ImageView9.Visible = False
 
 			cmd.Initialize
-			cmd.Name = "select_cat_clientes_INTMEX"
+			cmd.Name = "select_cat_clientes3_INTMEX"
-			cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN)
+			cmd.Parameters = Array As Object(E_RUTA2.text,E_RUTA2.text, ALMACEN,E_RUTA2.text,E_RUTA2.text)
 			reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 
 			cmd.Initialize
@@ -1031,10 +1074,10 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object(ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos")
 
-'	cmd.Initialize
+'		cmd.Initialize
-'	cmd.Name = "select_verificacion_INTMEX"
+'		cmd.Name = "select_verificacion_INTMEX"
-'	cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+'		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
-'	reqManager.ExecuteQuery(cmd , 0, "cat_verificacion")
+'		reqManager.ExecuteQuery(cmd , 0, "cat_verificacion")
 
 		cmd.Initialize
 		cmd.Name = "select_fecha"
@@ -1056,19 +1099,24 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
 		reqManager.ExecuteQuery(cmd , 0, "marcas_rutas")
 	
-'	cmd.Initialize
+		cmd.Initialize
-'	cmd.Name = "select_CUEST_INTMEX"
+		cmd.Name = "select_marcas_Intmex"
-'	cmd.Parameters = Array As Object(ALMACEN)
+		cmd.Parameters = Array As Object(usuario)
-'	reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO")
+		reqManager.ExecuteQuery(cmd , 0, "marcas")
 	
-'	cmd.Initialize
+'		cmd.Initialize
-'	cmd.Name = "select_HIST_CUOTAS_INTMEX"
+'		cmd.Name = "select_CUEST_INTMEX"
-'	cmd.Parameters = Array As Object( ALMACEN,e_ruta.text )
+'		cmd.Parameters = Array As Object(ALMACEN)
-'	reqManager.ExecuteQuery(cmd , 0, "CUOTAS")
+'		reqManager.ExecuteQuery(cmd , 0, "CUESTIONARIO")
+'	
+'		cmd.Initialize
+'		cmd.Name = "select_HIST_CUOTAS_INTMEX"
+'		cmd.Parameters = Array As Object( ALMACEN,e_ruta.text )
+'		reqManager.ExecuteQuery(cmd , 0, "CUOTAS")
 
 		cmd.Initialize
 		cmd.Name = "select_comis_cedex_INTMEX"
-		cmd.Parameters = Array As Object( ALMACEN, e_ruta.text )
+		cmd.Parameters = Array As Object(ALMACEN, e_ruta.text)
 		reqManager.ExecuteQuery(cmd , 0, "COMISIONES")
 	
 		cmd.Initialize
@@ -1205,9 +1253,40 @@ Sub JobDone(Job As HttpJob)
 					B4XPage_Appear
 					img2.Visible=False
 					EJECUTANDO=0
+					End If
+				End If
+			End If
+		
+			If Job.JobName = "DBRequest" Then
+				Dim RESULT As DBResult = reqManager.HandleJob(Job)
+				If RESULT.Tag = "giro" Then 'query tag
+					For Each records() As Object In RESULT.Rows
+						Dim giro  As String = records(RESULT.Columns.Get("CAT_GR_DESC"))
+					
+						Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GIRO(GIRO) VALUES (?)", Array As Object (giro))
+					Next
+					If PB2.Progress = 0 Then
+						PB2.Progress = 30
+						S_CP.Text = "CARGANDO"
+					ELSE If PB2.Progress = 30 Then
+						PB2.Progress = 60
+					ELSE IF PB2.Progress = 60 Then
+						PB2.Progress = 100
+						S_CP.Text = "LISTO"
+					End If
+					Listo3 =1
+					If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then
+						B4XPage_Appear
+						img2.Visible=False
+						EJECUTANDO=0
+					Else If Listo4 = 1 And Listo3 = 1 And inve = 1 Then
+						B4XPage_Appear
+						img2.Visible=False
+						EJECUTANDO=0
+					End If
+	   
 				End If
 			End If
-		End If
 		
 		If Job.JobName = "DBRequest" Then
 			Dim resultado As DBResult = reqManager.HandleJob(Job)
@@ -1418,27 +1497,47 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If
 	
-		If Job.JobName = "DBRequest" Then
+			If Job.JobName = "DBRequest" Then
-			Dim RESULT As DBResult = reqManager.HandleJob(Job)
+				Dim RESULT As DBResult = reqManager.HandleJob(Job)
-			If RESULT.Tag = "cat_verificacion" Then 'query tag
+				If RESULT.Tag = "cat_verificacion" Then 'query tag
-				For Each records() As Object In RESULT.Rows
+					For Each records() As Object In RESULT.Rows
-					Dim CAT_VE_IDPROD As String = records(RESULT.Columns.Get("CAT_VE_IDPROD"))
+						Dim CAT_VE_IDPROD As String = records(RESULT.Columns.Get("CAT_VE_IDPROD"))
-					Dim CAT_VE_NOMBRE As String = records(RESULT.Columns.Get("CAT_VE_NOMBRE"))
+						Dim CAT_VE_NOMBRE As String = records(RESULT.Columns.Get("CAT_VE_NOMBRE"))
-					Dim CAT_VE_ORDEN As String = records(RESULT.Columns.Get("CAT_VE_ORDEN"))
+						Dim CAT_VE_ORDEN As String = records(RESULT.Columns.Get("CAT_VE_ORDEN"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VERIFICACION(CAT_VE_IDPROD, CAT_VE_NOMBRE,CAT_VE_ORDEN) VALUES (?,?,?)", Array As Object (CAT_VE_IDPROD, CAT_VE_NOMBRE,CAT_VE_ORDEN))
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VERIFICACION(CAT_VE_IDPROD, CAT_VE_NOMBRE,CAT_VE_ORDEN) VALUES (?,?,?)", Array As Object (CAT_VE_IDPROD, CAT_VE_NOMBRE,CAT_VE_ORDEN))
-				Next
+					Next
+				End If
+			End If
+		
+			If Job.JobName = "DBRequest" Then
+				Dim RESULT As DBResult = reqManager.HandleJob(Job)
+				If RESULT.Tag = "cn" Then 'query tag
+					For Each records() As Object In RESULT.Rows
+						Dim CAT_RU_CN As String = records(RESULT.Columns.Get("CAT_RU_CN"))
+						B4XPages.MainPage.skmt.ExecNonQuery("DELETE FROM CN")
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CN(ACTIVO) VALUES (?)", Array As Object (CAT_RU_CN))
+					Next
+				End If
 			End If
-		End If
 
 		If Job.JobName = "DBRequest" Then
-			Dim RESULT As DBResult = reqManager.HandleJob(Job)
+				Dim RESULT As DBResult = reqManager.HandleJob(Job)
-			If RESULT.Tag = "marcas_rutas" Then 'query tag
+				If RESULT.Tag = "marcas_rutas" Then 'query tag
-				For Each records() As Object In RESULT.Rows
+					For Each records() As Object In RESULT.Rows
-					Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA"))
+						Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA"))
-					Dim CLIENTES As String = records(RESULT.Columns.Get("CLIENTES"))
+						Dim CLIENTES As String = records(RESULT.Columns.Get("CLIENTES"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO MARCAS_RUTAS(HVD_MARCA, CLIENTES) VALUES (?,?)", Array As Object (HVD_MARCA, CLIENTES))
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO MARCAS_RUTAS(HVD_MARCA, CLIENTES) VALUES (?,?)", Array As Object (HVD_MARCA, CLIENTES))
-				Next
+					Next
-			End If
+				End If
+			
+'				Marcas
+				If RESULT.Tag = "marcas" Then 'query tag
+					For Each records() As Object In RESULT.Rows
+						Dim MARCAS As String = records(RESULT.Columns.Get("MARCAS"))
+						Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("MARCAS"))
+						Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("MARCAS",MARCAS))
+					Next
+				End If
 		End If
 
 		'CUOTAS
@@ -1588,13 +1687,14 @@ Sub JobDone(Job As HttpJob)
 						Dim CAT_GP_ALMACEN As Int = records(RESULT.Columns.Get("CAT_GP_ALMACEN"))
 						Dim CAT_GP_TIPOPROD As Int = records(RESULT.Columns.Get("CAT_GP_TIPOPROD"))
 						Dim CAT_GP_VARREQ3 As Int = records(RESULT.Columns.Get("CAT_GP_VARREQ3"))
+						Dim MARCA As String = records(RESULT.Columns.Get("MARCA"))
 						CAT_GP_TIPOPROD = "5"
 						If CAT_GP_ID = "PAQUNI003" Then
 							CAT_GP_ALMACEN = 60
 						End If
 '					Log("XXXXXXX gunaprodp XXXXXXXXX  " & CAT_GP_ID & "|" & CAT_GP_IMP1 & "|" & CAT_GP_IMP2)
-						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) 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))
+						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,MARCA) 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,MARCA))
-						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD2(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_VARREQ3) 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_VARREQ3))
+						B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD2(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_VARREQ3,MARCA) 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_VARREQ3,MARCA))
 					Next
 				If PB2.Progress = 0 Then
 					PB2.Progress = 30
@@ -1904,11 +2004,11 @@ Sub JobDone(Job As HttpJob)
 			Dim RESULT As DBResult = reqManager.HandleJob(Job)
 			If RESULT.Tag = "hist_avance" Then 'query tag
 				For Each records() As Object In RESULT.Rows
-					Dim marca As String = records(RESULT.Columns.Get("HIST_AM_MARCA"))
+					Dim marca2 As String = records(RESULT.Columns.Get("HIST_AM_MARCA"))
 					Dim avance As String = records(RESULT.Columns.Get("HIST_AM_AVANCE"))
 					Dim objetivo As String = records(RESULT.Columns.Get("HIST_AM_OBJETIVO"))
 					Dim porcentaje1 As String = records(RESULT.Columns.Get("HIST_AM_PORCENTAJE"))
-					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_AVANCE(HA_MARCA, HA_AVANCE, HA_OBJETIVO, HA_PORCENTAJE) VALUES (?,?,?,?)", Array As Object (marca, avance, objetivo, porcentaje1))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_AVANCE(HA_MARCA, HA_AVANCE, HA_OBJETIVO, HA_PORCENTAJE) VALUES (?,?,?,?)", Array As Object (marca2, avance, objetivo, porcentaje1))
 				Next
 			End If
 		End If
@@ -1950,29 +2050,39 @@ Sub JobDone(Job As HttpJob)
 			End If
 		End If		
 	
-	If Job.JobName = "DBRequest" Then
+		If Job.JobName = "DBRequest" Then
-		Dim RESULT As DBResult = reqManager.HandleJob(Job)
+			Dim RESULT As DBResult = reqManager.HandleJob(Job)
-		If RESULT.Tag = "ins_cuestionario" Then 'query tag
+			If RESULT.Tag = "ins_cuestionario" Then 'query tag
-			Subs.logJobDoneResultados(RESULT)
+				Subs.logJobDoneResultados(RESULT)
-		End If
+			End If
 
-		Dim RESULT As DBResult = reqManager.HandleJob(Job)
+			Dim RESULT As DBResult = reqManager.HandleJob(Job)
-		If RESULT.Tag = "test" Then 'query tag
+			If RESULT.Tag = "test" Then 'query tag
-			Log(">>>>>>>>>>>>>  TEST")
+				Log(">>>>>>>>>>>>>  TEST")
-			Subs.logJobDoneResultados(RESULT)
+				Subs.logJobDoneResultados(RESULT)
-		End If
+			End If
+
+			Dim RESULT As DBResult = reqManager.HandleJob(Job)
+			If RESULT.Tag = "clientes_cuestionario" Then
+				Log("Entramos a clientes_cuestionario - Regs:" & RESULT.Rows.Size)
+				Starter.skmt.ExecNonQuery("delete from HIST_CUESTIONARIO")
+				For Each records() As Object In RESULT.Rows
+					Dim idCliente As String = records(RESULT.Columns.Get("HC_CLIENTE"))
+					Starter.skmt.ExecNonQuery2("INSERT INTO HIST_CUESTIONARIO(HC_CLIENTE) VALUES (?)", Array As Object (idCliente))
+				Next
+			End If
+
+			If RESULT.Tag = "traeGeocerca" Then
+				For Each records() As Object In RESULT.Rows
+					Dim geocerca As String = records(RESULT.Columns.Get("CAT_RU_GEOCERCA"))
+					Log("-- geo: " & geocerca)
+					B4XPages.MainPage.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("GEOCERCA"))
+					B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("GEOCERCA", geocerca))
+				Next
+			End If
 
-		Dim RESULT As DBResult = reqManager.HandleJob(Job)
-		If RESULT.Tag = "clientes_cuestionario" Then
-			Log("Entramos a clientes_cuestionario - Regs:" & RESULT.Rows.Size)
-			Starter.skmt.ExecNonQuery("delete from HIST_CUESTIONARIO")
-			For Each records() As Object In RESULT.Rows
-				Dim idCliente As String = records(RESULT.Columns.Get("HC_CLIENTE"))
-				Starter.skmt.ExecNonQuery2("INSERT INTO HIST_CUESTIONARIO(HC_CLIENTE) VALUES (?)", Array As Object (idCliente))
-			Next
 		End If
 	End If
-	End If
 	Job.Release
 End Sub
 
@@ -2087,6 +2197,7 @@ Sub e_ruta_EnterPressed
 		RES =  Msgbox2("Seguro que desea hacer el cierre todos los datos se borraran?","Cierre", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png"))  'ignore
 		If RES = DialogResponse.POSITIVE Then
 			e_ruta.Text = ""
+			Starter.skmt.ExecNonQuery("delete from CAT_GIRO")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from CLIENTE_NUEVO")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido_cliente")
 			B4XPages.MainPage.skmt.ExecNonQuery("delete from pedido")
@@ -2490,7 +2601,18 @@ Sub resdia_Click
 End Sub
 
 Sub hacer_ped_Click
-	B4XPages.ShowPage("Clientes")
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MARCAS"))
+	c.Position = 0
+	If c.RowCount > 0 Then
+		Private MARCASQ As String = c.GetString("CAT_VA_VALOR")
+		c.Close
+		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &", 'PROMOS')" )
+		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF IN ('PROMOS') AND MARCA NOT IN (" & MARCASQ &")" )
+'		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID NOT IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD))")
+		B4XPages.ShowPage("Clientes")
+	Else
+		If Starter.marcaCel <> "LGE" Then ToastMessageShow("No hay marcas en la base de datos ... ya se cargo ruta??", True)
+	End If
 End Sub
 
 Sub nvo_cliente_Click
@@ -2506,11 +2628,24 @@ Sub GPS_LocationChanged (Location1 As Location)
 End Sub
 
 Sub Btn_Ubicar_Click
-	rp.CheckAndRequest(rp.PERMISSION_ACCESS_FINE_LOCATION)
+	c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MARCAS"))
-	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+	c.Position = 0
-	If Result Then
+	If c.RowCount > 0 Then
-		StartActivity(MAPA_RUTAS)
+		Private MARCASQ As String = c.GetString("CAT_VA_VALOR")
+		c.Close
+		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &", 'PROMOS')" )
+		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF IN ('PROMOS') AND MARCA NOT IN (" & MARCASQ &")" )
+'		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID NOT IN (SELECT CAT_DP_ID FROM CAT_DETALLES_PAQ WHERE CAT_DP_IDPROD NOT IN (SELECT CAT_GP_ID FROM CAT_GUNAPROD))")
+		rp.CheckAndRequest(rp.PERMISSION_ACCESS_FINE_LOCATION)
+		Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+		If Result Then
+			StartActivity(MAPA_RUTAS)
+		End If
+	Else
+		If Starter.marcaCel <> "LGE" Then ToastMessageShow("No hay marcas en la base de datos ... ya se cargo ruta??", True)
 	End If
+	
+	
 End Sub
 
 '''''''''''''''''''''''''''''''''''' VALIDAR CARACTERES
@@ -2739,6 +2874,14 @@ Sub checaPedido
 	If c.RowCount > 0 Then
 		Starter.skmt.ExecNonQuery("Update kmt_info set gestion = 3  WHERE CAT_CL_CODIGO IN (SELECT NV_CLIENTE FROM NOVENTA)")
 	End If
+	
+	Private coord As Cursor = Starter.skmt.ExecQuery("SELECT * FROM TELEFONO")
+	If coord.RowCount > 0 Then
+		For cor = 0 To coord.RowCount -1
+			coord.Position = cor
+			B4XPages.MainPage.skmt.ExecNonQuery2("UPDATE kmt_info set  CAT_CL_TELEFONO = ? where CAT_CL_CODIGO = ?", Array As Object(coord.GetString("TEL"),coord.GetString("CLIENTE")))
+		Next
+	End If
 End Sub
 
 
@@ -2756,7 +2899,8 @@ Private Sub b_productos_Click
 	p_prod.BringToFront
 
 	
-	Private c As Cursor = Starter.skmt.ExecQuery("select CAT_GP_NOMBRE AS HVD_PRONOMBRE, IFNULL(CAT_GP_PRECIO, 0) AS HVD_RECHAZOCANT from CAT_GUNAPROD order by CAT_GP_NOMBRE asc")
+'	Private c As Cursor = Starter.skmt.ExecQuery("select CAT_GP_NOMBRE AS HVD_PRONOMBRE, IFNULL(CAT_GP_PRECIO, 0) AS HVD_RECHAZOCANT from CAT_GUNAPROD order by CAT_GP_NOMBRE asc")
+	Private c As Cursor = Starter.skmt.ExecQuery("select CAT_GP_NOMBRE AS HVD_PRONOMBRE, IFNULL(CAT_GP_PRECIO, 0) AS HVD_RECHAZOCANT from CAT_GUNAPROD WHERE CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE asc")
 	
 	lv_prod_Prin.SingleLineLayout.Label.TextColor = Colors.Black
 	lv_prod_Prin.Clear
@@ -2786,3 +2930,73 @@ End Sub
 Private Sub p_prod_Click
 	
 End Sub
+
+Private Sub B_PROD_Click
+	Dim label1 As Label
+	label1 = lv_prod_Prin.SingleLineLayout.Label
+	label1.TextSize = 14
+	p_prod.Width = Root.Width
+	p_prod.Height = Root.Height
+	b_regreso.Left = (p_prod.Width - b_regreso.Width) / 2
+	b_regreso.Top = p_prod.Height - b_regreso.Height
+	
+	p_prod.Visible = True
+	p_prod.BringToFront
+
+	
+	Private c As Cursor = Starter.skmt.ExecQuery("select CAT_GP_NOMBRE AS HVD_PRONOMBRE, IFNULL(CAT_GP_PRECIO, 0) AS HVD_RECHAZOCANT from CAT_GUNAPROD WHERE CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE asc")
+	
+	lv_prod_Prin.SingleLineLayout.Label.TextColor = Colors.Black
+	lv_prod_Prin.Clear
+	If c.RowCount > 0 Then
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			Dim itemText As String
+			
+			
+			
+			itemText = $"${c.GetString("HVD_PRONOMBRE")} ${CRLF}Precio: ${(c.GetDouble("HVD_RECHAZOCANT"))}"$
+			lv_prod_Prin.AddSingleLine(itemText)
+			
+			
+		Next
+	Else
+		lv_prod_Prin.AddSingleLine("No hay datos disponibles.")
+	End If
+	c.Close
+End Sub
+
+Private Sub B_PROM_Click
+	Dim label1 As Label
+	label1 = lv_prod_Prin.SingleLineLayout.Label
+	label1.TextSize = 14
+	p_prod.Width = Root.Width
+	p_prod.Height = Root.Height
+	b_regreso.Left = (p_prod.Width - b_regreso.Width) / 2
+	b_regreso.Top = p_prod.Height - b_regreso.Height
+	
+	p_prod.Visible = True
+	p_prod.BringToFront
+
+	
+	Private c As Cursor = Starter.skmt.ExecQuery("select CAT_GP_NOMBRE AS HVD_PRONOMBRE, IFNULL(CAT_GP_PRECIO, 0) AS HVD_RECHAZOCANT from CAT_GUNAPROD WHERE CAT_GP_CLASIF = 'PROMOS' order by CAT_GP_NOMBRE asc")
+	
+	lv_prod_Prin.SingleLineLayout.Label.TextColor = Colors.Black
+	lv_prod_Prin.Clear
+	If c.RowCount > 0 Then
+		For i = 0 To c.RowCount - 1
+			c.Position = i
+			Dim itemText As String
+			
+			
+			
+			itemText = $"${c.GetString("HVD_PRONOMBRE")} ${CRLF}Precio: ${(c.GetDouble("HVD_RECHAZOCANT"))}"$
+			lv_prod_Prin.AddSingleLine(itemText)
+			
+			
+		Next
+	Else
+		lv_prod_Prin.AddSingleLine("No hay datos disponibles.")
+	End If
+	c.Close
+End Sub

B4A/INTMEX.b4a

@@ -164,7 +164,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Intmex
 	#VersionCode: 1
-	#VersionName: 5.09.07 s/C
+	#VersionName: 6.02.20 GPS
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/INTMEX.b4a.meta

@@ -63,16 +63,16 @@ ModuleBreakpoints9=
 ModuleClosedNodes0=
 ModuleClosedNodes1=
 ModuleClosedNodes10=
-ModuleClosedNodes11=
+ModuleClosedNodes11=3
 ModuleClosedNodes12=
-ModuleClosedNodes13=4,5
+ModuleClosedNodes13=
-ModuleClosedNodes14=11
+ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=
 ModuleClosedNodes17=
 ModuleClosedNodes18=
 ModuleClosedNodes19=
-ModuleClosedNodes2=6
+ModuleClosedNodes2=
 ModuleClosedNodes20=
 ModuleClosedNodes21=
 ModuleClosedNodes22=
@@ -85,12 +85,12 @@ ModuleClosedNodes28=
 ModuleClosedNodes29=
 ModuleClosedNodes3=
 ModuleClosedNodes30=
-ModuleClosedNodes4=4
+ModuleClosedNodes4=
 ModuleClosedNodes5=3
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Productos,Busca_TextChanged,1143,6,C_Principal,checaPedido,2723,0,C_Principal,Class_Globals,217,0,C_Principal,B4XPage_Appear,440,0,C_Principal,b_productos_Click,2774,0,Diseñador Visual,principal.bal,-100,6,C_Principal,b_regreso_Click,2777,0,C_Principal,p_prod_Click,2781,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1112,0,C_Principal,JobDone,1477,0,C_Principal,cargar_Click,910,0
+NavigationStack=C_Cliente,Guardar_Click,619,6,C_Cliente,mandaPendientes,1277,0,Diseñador Visual,cliente.bal,-100,3,C_Cliente,Class_Globals,137,0,C_Cliente,B4XPage_Appear,238,0,C_Cliente,B4XPage_Created,209,6,C_Principal,Class_Globals,0,0,B4XMainPage,b_guardar_Click,789,0,Main,Activity_Create,29,0,B4XMainPage,Class_Globals,24,0
 SelectedBuild=0
-VisibleModules=28,2,13,20,14,29,17,15,9,4
+VisibleModules=28,2,13,20,14,29,15,4,11,21

B4A/Subs.bas

@@ -65,6 +65,20 @@ Sub decompress(base64 As String) As String 'ignore
 	Return uncompressed
 End Sub
 
+'Regresa la ruta actual de la base de datos.
+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}'"$)
+	r = "0"
+	If c.RowCount > 0 Then
+		c.Position=0
+		r = c.GetString("CAT_CL_RUTA")
+	End If
+	c.Close
+	Return r
+End Sub
+
 'Convierte una fecha al formato yyMMddHHmmss
 Sub fechaKMT(fecha As String) As String 'ignore
 '	Log(fecha)
@@ -1532,3 +1546,14 @@ Sub traeTicketConsecutivo(idCliente As String) As Int
 	Loop
 	Return sigTicket + 1
 End Sub
+
+' Regresa la geocerca desde CAT_VARIABLES, default = TRUE
+Sub traeGeocerca As Boolean
+	Private usarGeo As Boolean = True
+	Private c As Cursor = Starter.skmt.ExecQuery("select * from cat_variables where cat_va_descripcion ='GEOCERCA'")
+	If c.RowCount> 0 Then
+		c.Position = 0
+		If c.GetInt("CAT_VA_VALOR") = 0 Then usarGeo = False
+	End If
+	Return usarGeo
+End Sub

B4A/Tracker.bas

@@ -109,7 +109,6 @@ Public Sub StartFLPSmall
 		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)
@@ -140,16 +139,6 @@ Private Sub CreateLocationRequestSmallD As LocationRequest
 	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
@@ -202,7 +191,7 @@ Sub CreateNotification (Body As String) As Notification
 	Dim notification As Notification
 	notification.Initialize2(notification.IMPORTANCE_LOW)
 	notification.Icon = "icon"
-	notification.SetInfo("INTMEX", Body, Main)
+	notification.SetInfo("IZCA", Body, Main)
 	Return notification
 End Sub
 

B4A/_git_tag.ps1

@@ -0,0 +1,127 @@
+# --- SCRIPT DE COMMIT Y TAG (MODO IDE B4A) ---
+
+# 0. CONFIGURACIÓN
+$HacerPush = $true # Cambia a $true para que suba los cambios a GitHub
+
+# Cargar librería visual para el MessageBox (por si se necesita en el Push)
+Add-Type -AssemblyName System.Windows.Forms
+
+# 1. AUTODESCUBRIMIENTO
+$projectPath = $PSScriptRoot
+Write-Host "Ruta del proyecto: $projectPath"
+
+$b4aFileItem = Get-ChildItem -Path $projectPath -Filter "*.b4a" | Select-Object -First 1
+
+if (-Not $b4aFileItem) {
+    Write-Host "ERROR: No hay archivo .b4a en esta carpeta."
+    return
+}
+
+$projectName = $b4aFileItem.BaseName
+Write-Host "Proyecto detectado: $projectName"
+
+# 2. LEER VERSIÓN
+$versionLine = Get-Content $b4aFileItem.FullName | Select-String "#VersionName:"
+if (-Not $versionLine) { 
+    Write-Host "ERROR: Falta #VersionName en el archivo .b4a"
+    return 
+}
+$version = ($versionLine -split ":")[1].Trim()
+# Reemplaza cualquier espacio en blanco por un guion bajo solo para el tag
+$tagName = "$version".Replace(" ", "_")
+
+Set-Location $projectPath
+
+# 3. COMMIT CON TORTOISEGIT
+$oldCommit = git rev-parse HEAD 2>$null
+
+Write-Host "----------------------------------------"
+Write-Host "Version a etiquetar: $version"
+Write-Host "Abriendo ventana de TortoiseGit..."
+
+$pathArg = '/path:"{0}"' -f $projectPath
+$msgArg = '/logmsg:"VERSION {0}"' -f $version
+$cmdArg = "/command:commit"
+
+Start-Process "TortoiseGitProc.exe" -ArgumentList $cmdArg, $pathArg, $msgArg
+
+Write-Host "Esperando a que termines el commit en TortoiseGit..."
+# El freno de mano: espera a que cierres la ventana
+while (Get-Process "TortoiseGitProc" -ErrorAction SilentlyContinue) {
+    Start-Sleep -Seconds 1
+}
+
+$newCommit = git rev-parse HEAD 2>$null
+
+# 4. VALIDACIÓN
+if ($oldCommit -eq $newCommit) {
+    Write-Host "WARNING: Commit cancelado o sin cambios detectados."
+    return
+}
+
+Write-Host "Commit registrado exitosamente: $newCommit"
+
+# 5. GESTIÓN DE TAGS
+$tagGenerado = $false
+
+# Revisamos si el tag ya existe localmente y lo borramos para recrearlo con el nuevo commit
+if (git tag -l $tagName) {
+    git tag -d $tagName 2>$null | Out-Null
+}
+
+# Creamos el tag nuevo apuntando al commit que acabamos de hacer
+git tag -a $tagName -m "Release version $version"
+if ($?) { $tagGenerado = $true }
+
+# 6. LÓGICA DE PUSH
+if ($HacerPush) {
+    Write-Host "Conectando con GitHub..."
+    $remoteTagInfo = git ls-remote --tags origin $tagName
+
+    if ($remoteTagInfo) {
+        # Conflicto: Ya existe en remoto
+        $topForm = New-Object System.Windows.Forms.Form
+        $topForm.TopMost = $true
+        $topForm.Opacity = 0
+        $topForm.ShowInTaskbar = $false
+        $topForm.StartPosition = "CenterScreen"
+        $topForm.Show()
+        $topForm.Activate()
+        
+        [System.Console]::Beep(1000, 200)
+        
+        $msgBody = "El tag '$tagName' YA EXISTE en GitHub.`n`nDeseas SOBRESCRIBIRLO?`n`nSi = Borrar anterior y actualizar (Force Push).`nNo = Subir solo codigo (mantener tag viejo)."
+        $msgTitle = "Conflicto de Versiones - $projectName"
+        
+        $respuesta = [System.Windows.Forms.MessageBox]::Show($topForm, $msgBody, $msgTitle, "YesNo", "Warning")
+        $topForm.Dispose()
+        
+        if ($respuesta -eq "Yes") {
+            Write-Host "Sobrescribiendo tag en GitHub (Force Push)..."
+            git push origin
+            git push origin $tagName --force
+        } else {
+            Write-Host "Conservando tag anterior en GitHub..."
+            git push origin
+        }
+    } else {
+        # Tag Nuevo
+        Write-Host "Subiendo codigo y tag nuevo a GitHub..."
+        git push origin --follow-tags
+    }
+} else {
+    Write-Host "Push OMITIDO (Switch de control apagado)."
+}
+
+# 7. REPORTE FINAL PARA EL IDE
+$EstadoPush = if($HacerPush) { "SI" } else { "NO (Modo de prueba local)" }
+$EstadoTag = if($tagGenerado) { "SI ($tagName)" } else { "NO (Error al generar)" }
+
+Write-Host ""
+Write-Host "========================================"
+Write-Host "           REPORTE DE VERSION           "
+Write-Host "========================================"
+Write-Host " PROYECTO   : $projectName"
+Write-Host " TAG CREADO : $EstadoTag"
+Write-Host " PUSH GITHUB: $EstadoPush"
+Write-Host "========================================"

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"

_sync_project.ps1

@@ -0,0 +1,61 @@
+# 1. Mensaje inicial y pausa
+Clear-Host
+Write-Host "Se va a hacer un respaldo del codigo actual en el directorio ""AutoBackups""" -ForegroundColor Yellow
+Write-Host "y al terminar, traemos desde GitHub la ultima version del codigo." -ForegroundColor Yellow
+Write-Host ""
+Write-Host "Presione cualquier tecla para continuar..." -ForegroundColor Yellow
+$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+
+# 2. Asegurar ubicación en la raíz
+Set-Location $PSScriptRoot
+Write-Host "`nScript ejecutado desde: $PWD" -ForegroundColor DarkGray
+
+# 3. Buscar el proyecto
+$B4AFile = Get-ChildItem -Path ".\B4A\*.b4a" | Select-Object -First 1
+if (!$B4AFile) { 
+    Write-Host "ERROR: No encontre el archivo .b4a" -ForegroundColor Red
+    Start-Sleep -Seconds 3
+    exit 
+}
+
+$ProjectName = $B4AFile.BaseName
+$BackupDir = ".\B4A\AutoBackups"
+if (!(Test-Path $BackupDir)) { New-Item -ItemType Directory -Path $BackupDir }
+
+Write-Host "Respaldando $ProjectName..." -ForegroundColor Cyan
+
+# 4. Preparar archivos limpios (Método Copiar y Podar)
+$tempFolder = Join-Path $env:TEMP "B4A_Stage_$ProjectName"
+if (Test-Path $tempFolder) { Remove-Item $tempFolder -Recurse -Force -ErrorAction SilentlyContinue }
+New-Item -ItemType Directory -Path $tempFolder | Out-Null
+
+Write-Host "Extrayendo archivos de codigo..." -ForegroundColor Gray
+foreach ($f in @("B4A", "Files")) {
+    if (Test-Path $f) {
+        $target = Join-Path $tempFolder $f
+        Copy-Item -Path $f -Destination $target -Recurse -Force -ErrorAction SilentlyContinue
+    }
+}
+
+Write-Host "Podando carpetas Objects y AutoBackups..." -ForegroundColor Gray
+Remove-Item -Path "$tempFolder\B4A\Objects" -Recurse -Force -ErrorAction SilentlyContinue
+Remove-Item -Path "$tempFolder\B4A\AutoBackups" -Recurse -Force -ErrorAction SilentlyContinue
+Remove-Item -Path "$tempFolder\B4A\*.zip" -Force -ErrorAction SilentlyContinue
+
+# 5. Zipear
+$Timestamp = Get-Date -Format "yyyyMMdd_HHmmss"
+Write-Host "Comprimiendo..." -ForegroundColor Gray
+Compress-Archive -Path "$tempFolder\*" -DestinationPath "$BackupDir\$ProjectName`_$Timestamp.zip" -Force
+Remove-Item $tempFolder -Recurse -Force -ErrorAction SilentlyContinue
+
+Write-Host "¡Respaldo limpio creado con exito en AutoBackups!`n" -ForegroundColor Green
+
+# 6. Sincronizar con GitHub (Pull forzado)
+Write-Host "--- Sincronizando con GitHub (Borrando cambios locales) ---" -ForegroundColor Cyan
+git fetch --all
+git reset --hard origin/main
+git pull
+
+Write-Host "`n¡PROCESO COMPLETADO!" -ForegroundColor Green
+# Pausa de 3 segundos para que veas el resultado antes de que se cierre sola
+Start-Sleep -Seconds 3