diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 45eb0b3..ae61e5e 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1217,7 +1217,7 @@ Sub JobDone(Job As HttpJob) Dim CAT_GP_CODPROMO As String = records(RESULT.Columns.Get("CAT_GP_CODPROMO")) 'CAT_GP_INICIATIVA = 5 ' skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD(CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG,CAT_GP_ALMACEN,CAT_GP_DEV) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_DEV)) - Starter.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_INICIATIVA,CAT_GP_DEV,CAT_GP_CODPROMO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA,CAT_GP_DEV,CAT_GP_CODPROMO)) + Starter.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_INICIATIVA,CAT_GP_DEV,CAT_GP_CODPROMO,CAT_GP_TIPOPROD2) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)", Array As Object (CAT_GP_ID,CAT_GP_NOMBRE,CAT_GP_IMP1,CAT_GP_IMP2,CAT_GP_PRECIO,CAT_GP_CLASIF,CAT_GP_STS,CAT_GP_TIPO,CAT_GP_SUBTIPO,CAT_GP_IMG, CAT_GP_ALMACEN,CAT_GP_TIPOPROD, CAT_GP_INICIATIVA,CAT_GP_DEV,CAT_GP_CODPROMO,CAT_GP_TIPOPROD)) Starter.skmt.ExecNonQuery2("INSERT INTO CAT_GUNAPROD5(CAT_GP_ID,CAT_GP_ALMACEN) VALUES (?,?)", Array As Object (CAT_GP_ID,CAT_GP_ALMACEN)) Next Starter.skmt.TransactionSuccessful @@ -2539,8 +2539,8 @@ End Sub Sub B_PROXIMA_Click b = Starter.skmt.ExecQuery("Select count(*) as CUANTOS from pedido where pe_cliente = 0 and pe_tipo = 'ABORDO' " ) b.Position = 0 - If horaentrada Then - Log(b.GetString("CUANTOS")) + If horaentrada Or 1 = 1 Then ' El 1 = 1 es para DESAHABILITAR la resticcion del horario para entrar al abordo del PEDIDO SUGERIDO. +' Log(b.GetString("CUANTOS")) If b.GetString("CUANTOS") > 0 Then ' If horaentrada Then Starter.skmt.ExecNonQuery("delete from CUENTAA") @@ -2549,10 +2549,10 @@ Sub B_PROXIMA_Click B4XPages.ShowPage("Productos") ' End If Else If b.GetString("CUANTOS") = 0 Then - Log(777) +' Log(777) e = Starter.skmt.ExecQuery("SELECT * FROM PEDIDO_SUGERIDO") - Log(e.RowCount) - If e.RowCount > 0 Then + Log("Registros en Pedido Sugerido: " & e.RowCount) + If 1 = 2 And e.RowCount > 0 Then ' El 1 = 2 es para DESACTIVAR el PEDIDO SUGERIDO. Msgbox2Async("Tienes un pedido sugerido, ¿Deseas aceptarlo?","Atención", "Si", "", "No",LoadBitmap(File.DirAssets,"alert2.png"),False) Wait For Msgbox_Result (result As Int) If result = DialogResponse.POSITIVE Then diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 8127409..72ef9d9 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -1193,18 +1193,17 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In cs.Initialize l_prodX.Width = p_prods.Width - p_botMasMen.Width l_prodX.SetTextSizeAnimated(0, 13) + Private p1 As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_TIPOPROD2 from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_ID = '${clv_prods_ll.GetValue(i).As(Map).Get("id")}'"$) + Private prioridad As Int = 0 + If p1.RowCount > 0 Then + p1.Position = 0 + prioridad = p1.GetInt("CAT_GP_TIPOPROD2") +' Log(prioridad) + End If If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null And clv_prods_ll.GetValue(i).As(Map).Get("cant") > 0 Then p_prods.Color=0xFFE2EEFF - Private p1 As Cursor = Starter.skmt.ExecQuery($"select CAT_GP_TIPOPROD2 from CAT_GUNAPROD where CAT_GP_ID = '${clv_prods_ll.GetValue(i).As(Map).Get("id")}'"$) - Private prioridad As Int = 0 ' Log($"select CAT_GP_TIPOPROD2 from CAT_GUNAPROD where CAT_GP_ID = '${clv_prods_ll.GetValue(i).As(Map).Get("id")}'"$) ' Log(p1.RowCount) - If p1.RowCount > 0 Then - p1.Position = 0 - prioridad = p1.GetInt("CAT_GP_TIPOPROD2") -' Log(prioridad) - End If - If prioridad = 3 Then p_prods.Color= Colors.RGB(239, 213, 213) et_pCant.TextColor=Colors.Red ' Log("VENDIDO ") b_prodMenos.Tag = "vendido" @@ -1216,6 +1215,7 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In b_prodMenos.Enabled = False End If End If + If prioridad = 3 Then p_prods.Color= Colors.RGB(239, 213, 213) Private precio As Double=clv_prods_ll.GetValue(i).As(Map).Get("precio").As(Double) If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null Then et_pCant.Text = clv_prods_ll.GetValue(i).As(Map).Get("cant") If Starter.tipov <> "ABORDO" Then @@ -1327,9 +1327,7 @@ Sub LlenaProdsLL(p As ResultSet, extra As String) ' Log(invAbordo) End If End If - Private precio As String = NumberFormat2(p.GetDouble("CAT_GP_PRECIO"),1,2,2,False) - 'Descuentos de condiciones comerciales por TIPO Private descXTipo As String = kh.traeDescXTipo(clienteId, p.GetString("CAT_GP_TIPO")) If Starter.Logger And descXTipo > 0 Then LogColor(">>> DESCXTIPO CC - " & descXTipo & " | " & p.GetString("CAT_GP_NOMBRE"), Colors.Blue) diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index 840afe9..8046ec2 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -838,10 +838,9 @@ Library22=serial Library23=sql Library24=stringutils Library25=togglelibrary -Library26=websocket -Library27=xcustomlistview -Library28=xui -Library29=zxing_scanner +Library26=xcustomlistview +Library27=xui +Library28=zxing_scanner Library3=baqrcode Library4=bitmapcreator Library5=byteconverter @@ -881,7 +880,7 @@ Module7=C_Nota Module8=C_NoVenta Module9=C_NuevoCliente NumberOfFiles=410 -NumberOfLibraries=29 +NumberOfLibraries=28 NumberOfModules=30 Version=12.8 @EndOfDesignText@ diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index eca2c7b..5d5ab6f 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,bitacora,1699,0,C_Cliente,Cuestionario,2165,0,C_Cliente,muestraBoton,2146,0,C_Principal,connecta_Click,2060,0,C_NoVenta,Class_Globals,0,0,C_NoVenta,GUARDA_Click,81,0,C_NuevoCliente,Class_Globals,0,0,C_NuevoCliente,b_cancelar_Click,91,0,C_NuevoCliente,b_guardar_Click,124,6,C_Cliente,B4XPage_Appear,454,0,B4XMainPage,Entrar_Click,444,6 +NavigationStack=B4XMainPage,Entrar_Click,444,6,C_Productos,Class_Globals,16,0,C_Principal,cargar_Click,679,0,C_Productos,Busca_TextChanged,1262,0,C_Productos,b_rmi_Click,1445,0,C_Principal,JobDone,1221,0,C_Productos,LlenaProdsLL,1322,0,C_Productos,clv_prods_ll_VisibleRangeChanged,1194,6,C_Principal,horaentrada,2620,0,C_Principal,B_PROXIMA_Click,2543,6 SelectedBuild=0 -VisibleModules=1,28,11,3,26,23,29,12,4,13,9 +VisibleModules=1,28,11,3,26,23,29,12,4,13