- VERSION 5.12.3

-Se agregaron las marcas por usuario.

B4A/C_NuevoCliente.bas

@@ -162,6 +162,7 @@ Sub Class_Globals
 	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.
@@ -260,14 +261,16 @@ Sub B4XPage_Appear
 	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.
+'	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
+'	End If
 
 	CallSubDelayed(Tracker, "Track")
 	CallSubDelayed(Tracker, "StartFLPSmall")

B4A/C_Principal.bas

@@ -977,6 +977,7 @@ Sub cargar_Click
 		cmd.Initialize
 		cmd.Name = "select_cat_clientes2_INTMEX"
 		cmd.Parameters = Array As Object(e_ruta.text, ALMACEN)
+		Log("select_cat_clientes2_INTMEX: " & e_ruta.text & "|" & ALMACEN)
 		reqManager.ExecuteQuery(cmd , 0, "kmt_datos")
 
 		cmd.Initialize
@@ -1071,10 +1072,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"
@@ -1096,6 +1097,11 @@ Sub cargar_Click
 		cmd.Parameters = Array As Object( ALMACEN, e_ruta.text)
 		reqManager.ExecuteQuery(cmd , 0, "marcas_rutas")
 	
+		cmd.Initialize
+		cmd.Name = "select_marcas_Intmex"
+		cmd.Parameters = Array As Object(usuario)
+		reqManager.ExecuteQuery(cmd , 0, "marcas")
+	
 '	cmd.Initialize
 '	cmd.Name = "select_CUEST_INTMEX"
 '	cmd.Parameters = Array As Object(ALMACEN)
@@ -1506,20 +1512,30 @@ Sub JobDone(Job As HttpJob)
 				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
 
 		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
@@ -2572,7 +2588,17 @@ 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 &")" )
+		Starter.skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_ID 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

B4A/INTMEX.b4a

@@ -164,7 +164,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Intmex
 	#VersionCode: 1
-	#VersionName: 5.11.25
+	#VersionName: 5.12.3
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/INTMEX.b4a.meta

@@ -91,6 +91,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,JobDone,1499,0,C_Principal,cargar_Click,967,0,C_NuevoCliente,p_transparenteCN_Click,588,0,C_NuevoCliente,et_cp_TextChanged,569,0,C_NuevoCliente,b_clienteNuevo_Click,582,6,Diseñador Visual,nuevocliente.bal,-100,6,C_NuevoCliente,B4XPage_Created,168,0,C_NuevoCliente,Initialize,166,0,C_NuevoCliente,Class_Globals,115,4,C_NuevoCliente,B4XPage_Appear,234,6
+NavigationStack=Main,Activity_Create,28,0,DBRequestManager,HandleJob,193,0,DBRequestManager,ReadByte,183,0,Diseñador Visual,nuevocliente.bal,-100,6,C_NuevoCliente,B4XPage_Appear,266,6,C_Principal,Class_Globals,0,0,C_Principal,cargar_Click,1067,6,C_Principal,hacer_ped_Click,2591,2,Diseñador Visual,principal.bal,-100,3,C_Principal,resdia_Click,2582,0
 SelectedBuild=0
-VisibleModules=28,2,13,20,14,29,15,9,4,11
+VisibleModules=28,2,13,20,14,29,15,4,11,21