diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index 411d80f..280ce57 100644 --- a/B4A/C_NuevoCliente.bas +++ b/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") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 3a7ede6..116aebe 100644 --- a/B4A/C_Principal.bas +++ b/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 @@ -1070,11 +1071,11 @@ Sub cargar_Click cmd.Name = "select_promo_comp_INTMEX" cmd.Parameters = Array As Object(ALMACEN) reqManager.ExecuteQuery(cmd , 0, "hist_comp_promos") - -' cmd.Initialize -' cmd.Name = "select_verificacion_INTMEX" -' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) -' reqManager.ExecuteQuery(cmd , 0, "cat_verificacion") + +' cmd.Initialize +' cmd.Name = "select_verificacion_INTMEX" +' cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) +' 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) @@ -1511,16 +1517,25 @@ Sub JobDone(Job As HttpJob) Next End If End If - + If Job.JobName = "DBRequest" Then - Dim RESULT As DBResult = reqManager.HandleJob(Job) - If RESULT.Tag = "marcas_rutas" Then 'query tag - For Each records() As Object In RESULT.Rows - Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA")) - 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)) - Next - End If + Dim RESULT As DBResult = reqManager.HandleJob(Job) + If RESULT.Tag = "marcas_rutas" Then 'query tag + For Each records() As Object In RESULT.Rows + Dim HVD_MARCA As String = records(RESULT.Columns.Get("HVD_MARCA")) + 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)) + Next + 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 @@ -2573,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 diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 19f9bca..e279856 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index 7b7d8bb..abf8b91 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -164,7 +164,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Intmex #VersionCode: 1 - #VersionName: 5.11.26 + #VersionName: 5.12.3 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 9589331..628a257 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=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,C_NuevoCliente,B4XPage_Created,168,0,C_NuevoCliente,Initialize,166,0,C_NuevoCliente,Class_Globals,115,4,C_NuevoCliente,B4XPage_Appear,234,6,Main,Process_Globals,18,0,Diseñador Visual,nuevocliente.bal,-100,6,C_Principal,JobDone,1502,1 +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 diff --git a/INTMEX_LL.lnk b/INTMEX_LL.lnk deleted file mode 100644 index ce1f4f2..0000000 Binary files a/INTMEX_LL.lnk and /dev/null differ