diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 7e69c64..212f8c8 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -561,8 +561,8 @@ Sub Guardar_Click Subs.actualizaTET(la_cuenta.text) DateTime.TimeFormat = "HH:mm:ss" -' mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! -' mandapiezas + mandaPendientes 'LO COMENTAMOS PARA PRUEBAS, ACTIVAR AL FINAL!!! + mandapiezas B4XPages.MainPage.productos.reiniciarlistaProds = True B4XPages.MainPage.productos.prodsMap.Initialize B4XPages.MainPage.promos.promosMap.Initialize diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index 788acb7..f5a548c 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -126,7 +126,7 @@ Sub GUARDA_Click B4XPages.MainPage.skmt.ExecNonQuery2("update PEDIDO_INICIO_FINAL set PIF_HORA_FINAL = ? where PIF_CLIENTE = ? and PIF_HORA_FINAL = 0", Array As Object (DateTime.Now, cuenta)) LogColor($"actualizamos "${cuenta}, hora_final=${DateTime.now}"$,Colors.Red) -' mandaPendientesnoventa + mandaPendientesnoventa B4XPages.ShowPage("Principal") End Sub diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 90f2750..1b5998f 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -179,22 +179,26 @@ Sub B4XPage_Appear c.Position = 0 - c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String("PROMOS", "PROMOS")) + c = B4XPages.MainPage.skmt.ExecQuery($"SELECT CUENTA FROM CUENTAA"$) + c.Position = 0 + If c.GetString("CUENTA") <> "0" Then + c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String("PROMOS", "PROMOS")) ' Log($"res:${c2.RowCount}, ${Value}, ${marca}, ${tipo}"$) - Private hayPromos As Boolean = False - If c2.RowCount > 0 Then - For i=0 To c2.RowCount -1 - c2.Position=i - Private tm As Map = Subs.procesaPromocion(c2.GetString("CAT_GP_ID"), clienteId) - If tm.Get("status") = "ok" Then 'Solo muestrala si hay producto. - hayPromos = True - End If - Next - If hayPromos Then lv_catalogos.AddSingleLine("PROMOS") - Else - Log("NO HAY PROMOS") + Private hayPromos As Boolean = False + If c2.RowCount > 0 Then + For i=0 To c2.RowCount -1 + c2.Position=i + Private tm As Map = Subs.procesaPromocion(c2.GetString("CAT_GP_ID"), clienteId) + If tm.Get("status") = "ok" Then 'Solo muestrala si hay producto. + hayPromos = True + End If + Next + If hayPromos Then lv_catalogos.AddSingleLine("PROMOS") + Else + Log("NO HAY PROMOS") + End If + c2.Close End If - c2.Close Sleep(100) l_total.Visible = False @@ -641,9 +645,9 @@ Sub b_terminar1_Click textColor = Colors.RGB(166,0,0) End If If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "VENTA" Then - textColor = Colors.RGB(110,74,228) 'Si es promo, cambiamos el color del texto. + textColor = Colors.RGB(154,131,231) 'Si es promo, cambiamos el color del texto. Else If Not(IsNumber(c_prods.GetString("PE_CEDIS"))) And c_prods.GetString("PE_FOLIO") = "PREVENTA" Then - textColor = Colors.RGB(231,6,6) 'Si es promo, cambiamos el color del texto. + textColor = Colors.RGB(255,111,111) 'Si es promo, cambiamos el color del texto. End If Dim label2 As Label label2 = lv_prodsPedido.TwoLinesLayout.SecondLabel diff --git a/B4A/INTMEX.b4a b/B4A/INTMEX.b4a index 47be3c7..c121d2f 100644 --- a/B4A/INTMEX.b4a +++ b/B4A/INTMEX.b4a @@ -157,7 +157,7 @@ Module9=C_Nota NumberOfFiles=46 NumberOfLibraries=33 NumberOfModules=28 -Version=12.8 +Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex diff --git a/B4A/INTMEX.b4a.meta b/B4A/INTMEX.b4a.meta index 17114c8..f51040e 100644 --- a/B4A/INTMEX.b4a.meta +++ b/B4A/INTMEX.b4a.meta @@ -85,6 +85,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,procesaPromocion,1029,0,C_RespaldoDiario,respaldaPedido,83,0,Subs,restaFijosPromo,932,3,Subs,alcanzanLosVariablesParaPromo,934,6,C_Productos,Class_Globals,0,0,C_Productos,lv_catalogos_ItemClick,254,6,C_Productos,B4XPage_Created,127,0,C_Productos,B4XPage_Appear,168,6,Visual Designer,cliente.bal,-100,5,B4XMainPage,Class_Globals,20,0 +NavigationStack=Subs,restaFijosPromo,932,3,Subs,alcanzanLosVariablesParaPromo,934,6,C_Productos,lv_catalogos_ItemClick,254,6,C_Productos,B4XPage_Created,127,0,C_Cliente,Guardar_Click,557,0,C_NoVenta,GUARDA_Click,122,0,C_Productos,Class_Globals,0,0,C_Productos,b_terminar1_Click,628,0,C_Productos,B4XPage_Appear,189,6,B4XMainPage,Class_Globals,24,0 SelectedBuild=0 -VisibleModules=2,26,13,16,14,4,27,15,9,6 +VisibleModules=2,26,13,16,14,4,27,15,9,6,10