diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index ec19c44..5c344de 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -27,14 +27,14 @@ Sub Class_Globals
Public principal As C_Principal 'Antes seleccion
Public clientes As C_Clientes 'Antes Colonia
Public cliente As C_Cliente 'Antes fila
-' Public productos As C_Productos 'Antes colonia2
+ Public productos As C_Productos 'Antes colonia2
' Public updateAvailable As C_updateAvailable
'' Public mapas As C_Mapas
'' Public nuevoCliente As C_NuevoCliente
' Public ticketsDia As C_TicketsDia 'Antes buscar
Public noVenta As C_NoVenta 'Antes nopago
Public nota As C_Nota 'Antes tarjeta
-' Public promos As C_Promos
+ Public promos As C_Promos
Public historico As C_Historico 'Antes historico
Dim reqManager As DBRequestManager
@@ -114,8 +114,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
B4XPages.AddPage("Clientes", clientes)
cliente.Initialize
B4XPages.AddPageAndCreate("Cliente", cliente)
-' productos.Initialize
-' B4XPages.AddPage("Productos", productos)
+ productos.Initialize
+ B4XPages.AddPage("Productos", productos)
' updateAvailable.Initialize
' B4XPages.AddPage("updateAvailable", updateAvailable)
' mapas.Initialize
@@ -130,8 +130,8 @@ Private Sub B4XPage_Created (Root1 As B4XView)
B4XPages.AddPage("Nota", nota)
' pedidos.Initialize
' B4XPages.AddPage("Pedidos", pedidos)
-' promos.Initialize
-' B4XPages.AddPage("Promos", promos)
+ promos.Initialize
+ B4XPages.AddPage("Promos", promos)
historico.Initialize
B4XPages.AddPage("Historico", historico)
' checklist.Initialize
@@ -161,17 +161,15 @@ Private Sub B4XPage_Created (Root1 As B4XView)
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_EXHIBIDORES (CAT_EX_ID TEXT, CAT_EX_TIPO TEXT, CAT_EX_VALOR TEXT)")
Starter.skmt.ExecNonQuery("CREATE TABLE PEDIDO3 (PE_PRECIO2 TEXT,PE_TIPO TEXT,PE_FOLIO NUMERIC,PE_DESC NUMERIC,PE_COSTO_SIN TEXT,PE_RUTA TEXT,PE_CEDIS TEXT,PE_COSTO_TOT NUMERIC,PE_COSTOU NUMERIC,PE_CANT NUMERIC,PE_PRONOMBRE TEXT,PE_PROID TEXT,PE_CLIENTE TEXT,PE_FECHA TEXT,PE_USUARIO TEXT)")
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_GPS(FECHA INTEGER, LAT TEXT, LON TEXT)")
+ Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CLIENTE_IMPRESO (CI_CUENTA TEXT)")
+ kh.agregaColumna(Starter.skmt, "kmt_info", "impresion", "TEXT")
If sDate = "20190523" Then
Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("SERVER"))
-
Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER",Starter.skmt))
End If
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT)")
-
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS HIST_ENCUESTA2 (HE_CLIE TEXT, HE_RES TEXT, HE_FECHA TEXT, HE_TIPO TEXT, HE_PRECIO TEXT)")
-
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)")
-
Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_ENCUESTA_PREGUNTA5P (CAT_EP_ID TEXT,CAT_EP_IDTIPOPREGUNTA TEXT,CAT_CE_DESCRIPCION TEXT,CAT_EP_PREGUNTA TEXT,CAT_EP_RES1_PRED TEXT,CAT_EP_RES2_PRED TEXT,CAT_EP_RES3_PRED TEXT,CAT_EP_ORDEN_PREGUNTA TEXT)")
c=Starter.skmt.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index f1f93f2..6f5c193 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -288,6 +288,7 @@ Sub B4XPage_Appear
B_VENTA.Visible = True
gest.Visible = True
End If
+ Log(">>>>>>>>>>>> "&Starter.tipov)
End Sub
Sub GPS_LocationChanged (Location1 As Location)
@@ -308,6 +309,7 @@ End Sub
Sub gest_Click
Starter.tipov = "PREVENTA"
+ B4XPages.ShowPage("Productos")
' StartActivity(colonia2)
cuestionario
End Sub
@@ -919,6 +921,7 @@ End Sub
Sub B_VENTA_Click
Starter.tipov = "VENTA"
'StartActivity(colonia2)
+ B4XPages.ShowPage("Productos")
cuestionario
End Sub
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index fecd550..c32c51a 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -200,13 +200,14 @@ Private Sub B4XPage_Created (Root1 As B4XView)
l_ruta.Text = f.GetString("CAT_CL_RUTA")
f.Close
If l_ruta.Text = 0 Then
- l_ruta.Text =0
+ l_ruta.Text = 0
Else
f=skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
f.Position=0
l_ruta.Text = f.GetString("CAT_CL_RUTA")
f.Close
End If
+ Starter.rutav = l_ruta.Text
If Cuantos = 0 Then
L_MONTOD.Text =0
l_cuantosc.Text = 0
diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas
index 54b66b1..ffe5142 100644
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -7,6 +7,7 @@ Version=11.5
Sub Class_Globals
Private Root As B4XView 'ignore
Private xui As XUI 'ignore
+ dim kh as kms_helperSubs
Dim ruta As String
Dim q_buscar As String
Dim forzarBusqueda As Boolean = False
@@ -108,6 +109,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
' Activity.RemoveAllViews
Root.LoadLayout("productos")
ruta = File.DirInternal
+ kh.Initialize(Me, "kh")
If File.Exists(ruta, "kmt.db") = False Then
File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db")
End If
@@ -147,8 +149,8 @@ Sub B4XPage_Appear
' clv_prods_ll.Initialize(Me, "clv_prods_ll")
' list_prodsPedido.Initialize
' Log("list_prodsPedido.Initialize")
- clienteId = Subs.traeCliente
- rutaUsuario = Subs.traeRuta
+ clienteId = kh.traeCliente(Starter.skmt)
+ rutaUsuario = kh.traeRuta(Starter.skmt)
If p_rmi.Visible Then p_rmi.Visible = False
' l_mDisponible.Visible = False
' Starter.skmt.ExecNonQuery2("UPDATE CAT_GUNAPROD SET CAT_GP_TIPOPROD = (?) WHERE CAT_GP_TIPOPROD = (?) ",Array As Object("PRIORITARIO","1"))
@@ -203,7 +205,7 @@ Sub B4XPage_Appear
c = Starter.skmt.ExecQuery("select count(*) as hayPromos from promos_comp")
c.Position = 0
' Log(Subs.revisaImpresa)
- If c.GetInt("hayPromos") > 0 And Subs.traeCliente <> 0 And Subs.revisaImpresa = False Then
+ If c.GetInt("hayPromos") > 0 And clienteId <> 0 And kh.revisaImpresa(Starter.skmt) = False Then
lv_catalogos.AddSingleLine("PROMOS")
End If
Sleep(100)
@@ -213,12 +215,12 @@ Sub B4XPage_Appear
' l_totProds.Width = Root.Width * 0.19
' l_total.Left = l_totProds.Width + 20
' l_total.Width = Root.Width * 0.25
-
+
' Log(Subs.traeTotalesClienteActual)
- Dim m As Map = Subs.traeTotalesClienteActual
+ Dim m As Map = subs.traeTotalesClienteActual
prodsPedidoActual = m.Get("productos")
montoPedidoActual = m.Get("monto")
- hayPedido = Subs.hayPedido
+ hayPedido = kh.hayPedido(Starter.skmt)
' LogColor("Pedido ant? - "&hayPedido, Colors.Magenta)
If reiniciarlistaProds Then
' Log("Llamamos LlenaProdsLL")
@@ -228,6 +230,7 @@ Sub B4XPage_Appear
' Log("Llamamos LlenaProdsLL")
LlenaProdsLL(Null, Null)
End If
+
If clv_prods_ll.Size > 0 Then
clv_prods_ll.JumpToItem(0) 'Vamos al primer artículo de la lista.
PCLV.lblHint.SetTextSizeAnimated(0,13)
diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a
index ca96b0e..5c035af 100644
--- a/B4A/Durakelo.b4a
+++ b/B4A/Durakelo.b4a
@@ -1,100 +1,772 @@
Build1=Default,durakelo.keymon.com.mx,HU2_PUBLIC
File1=alcancia.png
-File10=fondo_kmt.jpg
-File11=historico.bal
-File12=itembuttonblue.png
-File13=k.png
-File14=K-b27c0809.png
-File15=kelloggs.png
-File16=login.bal
-File17=MainPage.bal
-File18=Malo.jpg
-File19=NoVenta.bal
-File2=alerta_amarilla.png
-File20=nuevocliente.bal
-File21=palomita_verde.png
-File22=planfia_logo.png
-File23=principal.bal
-File24=productos.bal
-File25=rechazo.jpg
-File26=salma.jpg
-File27=senial.jpg
-File28=sync.png
-File29=Tiendita.jpg
-File3=carrito.png
-File30=unilever.jpg
-File4=Cliente.bal
-File5=Clientes.bal
-File6=durakelo.png
-File7=durakelo1.png
-File8=engrane.jpg
-File9=espera.gif
+File10=Cliente.bal
+File100=marker-azul-65.png
+File101=marker-azul-66.png
+File102=marker-azul-67.png
+File103=marker-azul-68.png
+File104=marker-azul-69.png
+File105=marker-azul-7.png
+File106=marker-azul-70.png
+File107=marker-azul-71.png
+File108=marker-azul-72.png
+File109=marker-azul-73.png
+File11=Clientes.bal
+File110=marker-azul-74.png
+File111=marker-azul-75.png
+File112=marker-azul-76.png
+File113=marker-azul-77.png
+File114=marker-azul-78.png
+File115=marker-azul-79.png
+File116=marker-azul-8.png
+File117=marker-azul-80.png
+File118=marker-azul-81.png
+File119=marker-azul-82.png
+File12=detalle_promo.bal
+File120=marker-azul-83.png
+File121=marker-azul-84.png
+File122=marker-azul-85.png
+File123=marker-azul-86.png
+File124=marker-azul-87.png
+File125=marker-azul-88.png
+File126=marker-azul-89.png
+File127=marker-azul-9.png
+File128=marker-azul-90.png
+File129=marker-azul-91.png
+File13=durakelo.png
+File130=marker-azul-92.png
+File131=marker-azul-93.png
+File132=marker-azul-94.png
+File133=marker-azul-95.png
+File134=marker-azul-96.png
+File135=marker-azul-97.png
+File136=marker-azul-98.png
+File137=marker-azul-99.png
+File138=marker-rojo-0.png
+File139=marker-rojo-1.png
+File14=durakelo_192x192.png
+File140=marker-rojo-10.png
+File141=marker-rojo-100.png
+File142=marker-rojo-11.png
+File143=marker-rojo-12.png
+File144=marker-rojo-13.png
+File145=marker-rojo-14.png
+File146=marker-rojo-15.png
+File147=marker-rojo-16.png
+File148=marker-rojo-17.png
+File149=marker-rojo-18.png
+File15=durakelo1.png
+File150=marker-rojo-19.png
+File151=marker-rojo-2.png
+File152=marker-rojo-20.png
+File153=marker-rojo-21.png
+File154=marker-rojo-22.png
+File155=marker-rojo-23.png
+File156=marker-rojo-24.png
+File157=marker-rojo-25.png
+File158=marker-rojo-26.png
+File159=marker-rojo-27.png
+File16=engrane.jpg
+File160=marker-rojo-28.png
+File161=marker-rojo-29.png
+File162=marker-rojo-3.png
+File163=marker-rojo-30.png
+File164=marker-rojo-31.png
+File165=marker-rojo-32.png
+File166=marker-rojo-33.png
+File167=marker-rojo-34.png
+File168=marker-rojo-35.png
+File169=marker-rojo-36.png
+File17=engrane3.png
+File170=marker-rojo-37.png
+File171=marker-rojo-38.png
+File172=marker-rojo-39.png
+File173=marker-rojo-4.png
+File174=marker-rojo-40.png
+File175=marker-rojo-41.png
+File176=marker-rojo-42.png
+File177=marker-rojo-43.png
+File178=marker-rojo-44.png
+File179=marker-rojo-45.png
+File18=espera.gif
+File180=marker-rojo-46.png
+File181=marker-rojo-47.png
+File182=marker-rojo-48.png
+File183=marker-rojo-49.png
+File184=marker-rojo-5.png
+File185=marker-rojo-50.png
+File186=marker-rojo-51.png
+File187=marker-rojo-52.png
+File188=marker-rojo-53.png
+File189=marker-rojo-54.png
+File19=fondo_kmt.jpg
+File190=marker-rojo-55.png
+File191=marker-rojo-56.png
+File192=marker-rojo-57.png
+File193=marker-rojo-58.png
+File194=marker-rojo-59.png
+File195=marker-rojo-6.png
+File196=marker-rojo-60.png
+File197=marker-rojo-61.png
+File198=marker-rojo-62.png
+File199=marker-rojo-63.png
+File2=alert2.png
+File20=foto.bal
+File200=marker-rojo-64.png
+File201=marker-rojo-65.png
+File202=marker-rojo-66.png
+File203=marker-rojo-67.png
+File204=marker-rojo-68.png
+File205=marker-rojo-69.png
+File206=marker-rojo-7.png
+File207=marker-rojo-70.png
+File208=marker-rojo-71.png
+File209=marker-rojo-72.png
+File21=guardagestion.bal
+File210=marker-rojo-73.png
+File211=marker-rojo-74.png
+File212=marker-rojo-75.png
+File213=marker-rojo-76.png
+File214=marker-rojo-77.png
+File215=marker-rojo-78.png
+File216=marker-rojo-79.png
+File217=marker-rojo-8.png
+File218=marker-rojo-80.png
+File219=marker-rojo-81.png
+File22=guna_viejo.png
+File220=marker-rojo-82.png
+File221=marker-rojo-83.png
+File222=marker-rojo-84.png
+File223=marker-rojo-85.png
+File224=marker-rojo-86.png
+File225=marker-rojo-87.png
+File226=marker-rojo-88.png
+File227=marker-rojo-89.png
+File228=marker-rojo-9.png
+File229=marker-rojo-90.png
+File23=historico.bal
+File230=marker-rojo-91.png
+File231=marker-rojo-92.png
+File232=marker-rojo-93.png
+File233=marker-rojo-94.png
+File234=marker-rojo-95.png
+File235=marker-rojo-96.png
+File236=marker-rojo-97.png
+File237=marker-rojo-98.png
+File238=marker-rojo-99.png
+File239=marker-verde-0.png
+File24=infonavit1.jpg
+File240=marker-verde-1.png
+File241=marker-verde-10.png
+File242=marker-verde-100.png
+File243=marker-verde-11.png
+File244=marker-verde-12.png
+File245=marker-verde-13.png
+File246=marker-verde-14.png
+File247=marker-verde-15.png
+File248=marker-verde-16.png
+File249=marker-verde-17.png
+File25=itembuttonblue.png
+File250=marker-verde-18.png
+File251=marker-verde-19.png
+File252=marker-verde-2.png
+File253=marker-verde-20.png
+File254=marker-verde-21.png
+File255=marker-verde-22.png
+File256=marker-verde-23.png
+File257=marker-verde-24.png
+File258=marker-verde-25.png
+File259=marker-verde-26.png
+File26=k.png
+File260=marker-verde-27.png
+File261=marker-verde-28.png
+File262=marker-verde-29.png
+File263=marker-verde-3.png
+File264=marker-verde-30.png
+File265=marker-verde-31.png
+File266=marker-verde-32.png
+File267=marker-verde-33.png
+File268=marker-verde-34.png
+File269=marker-verde-35.png
+File27=kelloggs.png
+File270=marker-verde-36.png
+File271=marker-verde-37.png
+File272=marker-verde-38.png
+File273=marker-verde-39.png
+File274=marker-verde-4.png
+File275=marker-verde-40.png
+File276=marker-verde-41.png
+File277=marker-verde-42.png
+File278=marker-verde-43.png
+File279=marker-verde-44.png
+File28=keymon_logo.png
+File280=marker-verde-45.png
+File281=marker-verde-46.png
+File282=marker-verde-47.png
+File283=marker-verde-48.png
+File284=marker-verde-49.png
+File285=marker-verde-5.png
+File286=marker-verde-50.png
+File287=marker-verde-51.png
+File288=marker-verde-52.png
+File289=marker-verde-53.png
+File29=kmt.db
+File290=marker-verde-54.png
+File291=marker-verde-55.png
+File292=marker-verde-56.png
+File293=marker-verde-57.png
+File294=marker-verde-58.png
+File295=marker-verde-59.png
+File296=marker-verde-6.png
+File297=marker-verde-60.png
+File298=marker-verde-61.png
+File299=marker-verde-62.png
+File3=alerta.jpg
+File30=login.bal
+File300=marker-verde-63.png
+File301=marker-verde-64.png
+File302=marker-verde-65.png
+File303=marker-verde-66.png
+File304=marker-verde-67.png
+File305=marker-verde-68.png
+File306=marker-verde-69.png
+File307=marker-verde-7.png
+File308=marker-verde-70.png
+File309=marker-verde-71.png
+File31=logo sanfer.jpg
+File310=marker-verde-72.png
+File311=marker-verde-73.png
+File312=marker-verde-74.png
+File313=marker-verde-75.png
+File314=marker-verde-76.png
+File315=marker-verde-77.png
+File316=marker-verde-78.png
+File317=marker-verde-79.png
+File318=marker-verde-8.png
+File319=marker-verde-80.png
+File32=logo_exitus1.jpg
+File320=marker-verde-81.png
+File321=marker-verde-82.png
+File322=marker-verde-83.png
+File323=marker-verde-84.png
+File324=marker-verde-85.png
+File325=marker-verde-86.png
+File326=marker-verde-87.png
+File327=marker-verde-88.png
+File328=marker-verde-89.png
+File329=marker-verde-9.png
+File33=MainPage.bal
+File330=marker-verde-90.png
+File331=marker-verde-91.png
+File332=marker-verde-92.png
+File333=marker-verde-93.png
+File334=marker-verde-94.png
+File335=marker-verde-95.png
+File336=marker-verde-96.png
+File337=marker-verde-97.png
+File338=marker-verde-98.png
+File339=marker-verde-99.png
+File34=Malo.jpg
+File340=NoVenta.bal
+File341=nuevocliente.bal
+File342=palomita_verde.png
+File343=pedido.bal
+File344=pedidoitem.bal
+File345=planfia_logo.png
+File346=planfia_logo_old.png
+File347=planfia_logo_old2.png
+File348=principal.bal
+File349=proditem.bal
+File35=mapa.bal
+File350=productos.bal
+File351=productos.bal.old
+File352=promociones.bal
+File353=qr.bal
+File354=rechazo.jpg
+File355=rojo.png
+File356=salma.jpg
+File357=salma.png
+File358=senial.jpg
+File359=sync.png
+File36=mapa_rutas.bal
+File360=tache_rojo.png
+File361=telefonos.bal
+File362=Tiendita.jpg
+File363=unilever.jpg
+File364=verde.png
+File37=marker-azul-0.png
+File38=marker-azul-1.png
+File39=marker-azul-10.png
+File4=alerta_amarilla.png
+File40=marker-azul-100.png
+File41=marker-azul-11.png
+File42=marker-azul-12.png
+File43=marker-azul-13.png
+File44=marker-azul-14.png
+File45=marker-azul-15.png
+File46=marker-azul-16.png
+File47=marker-azul-17.png
+File48=marker-azul-18.png
+File49=marker-azul-19.png
+File5=amarillo.png
+File50=marker-azul-2.png
+File51=marker-azul-20.png
+File52=marker-azul-21.png
+File53=marker-azul-22.png
+File54=marker-azul-23.png
+File55=marker-azul-24.png
+File56=marker-azul-25.png
+File57=marker-azul-26.png
+File58=marker-azul-27.png
+File59=marker-azul-28.png
+File6=anterior.jpg
+File60=marker-azul-29.png
+File61=marker-azul-3.png
+File62=marker-azul-30.png
+File63=marker-azul-31.png
+File64=marker-azul-32.png
+File65=marker-azul-33.png
+File66=marker-azul-34.png
+File67=marker-azul-35.png
+File68=marker-azul-36.png
+File69=marker-azul-37.png
+File7=buscar.bal
+File70=marker-azul-38.png
+File71=marker-azul-39.png
+File72=marker-azul-4.png
+File73=marker-azul-40.png
+File74=marker-azul-41.png
+File75=marker-azul-42.png
+File76=marker-azul-43.png
+File77=marker-azul-44.png
+File78=marker-azul-45.png
+File79=marker-azul-46.png
+File8=carrito.png
+File80=marker-azul-47.png
+File81=marker-azul-48.png
+File82=marker-azul-49.png
+File83=marker-azul-5.png
+File84=marker-azul-50.png
+File85=marker-azul-51.png
+File86=marker-azul-52.png
+File87=marker-azul-53.png
+File88=marker-azul-54.png
+File89=marker-azul-55.png
+File9=celltitle.bal
+File90=marker-azul-56.png
+File91=marker-azul-57.png
+File92=marker-azul-58.png
+File93=marker-azul-59.png
+File94=marker-azul-6.png
+File95=marker-azul-60.png
+File96=marker-azul-61.png
+File97=marker-azul-62.png
+File98=marker-azul-63.png
+File99=marker-azul-64.png
FileGroup1=Default Group
FileGroup10=Default Group
+FileGroup100=Default Group
+FileGroup101=Default Group
+FileGroup102=Default Group
+FileGroup103=Default Group
+FileGroup104=Default Group
+FileGroup105=Default Group
+FileGroup106=Default Group
+FileGroup107=Default Group
+FileGroup108=Default Group
+FileGroup109=Default Group
FileGroup11=Default Group
+FileGroup110=Default Group
+FileGroup111=Default Group
+FileGroup112=Default Group
+FileGroup113=Default Group
+FileGroup114=Default Group
+FileGroup115=Default Group
+FileGroup116=Default Group
+FileGroup117=Default Group
+FileGroup118=Default Group
+FileGroup119=Default Group
FileGroup12=Default Group
+FileGroup120=Default Group
+FileGroup121=Default Group
+FileGroup122=Default Group
+FileGroup123=Default Group
+FileGroup124=Default Group
+FileGroup125=Default Group
+FileGroup126=Default Group
+FileGroup127=Default Group
+FileGroup128=Default Group
+FileGroup129=Default Group
FileGroup13=Default Group
+FileGroup130=Default Group
+FileGroup131=Default Group
+FileGroup132=Default Group
+FileGroup133=Default Group
+FileGroup134=Default Group
+FileGroup135=Default Group
+FileGroup136=Default Group
+FileGroup137=Default Group
+FileGroup138=Default Group
+FileGroup139=Default Group
FileGroup14=Default Group
+FileGroup140=Default Group
+FileGroup141=Default Group
+FileGroup142=Default Group
+FileGroup143=Default Group
+FileGroup144=Default Group
+FileGroup145=Default Group
+FileGroup146=Default Group
+FileGroup147=Default Group
+FileGroup148=Default Group
+FileGroup149=Default Group
FileGroup15=Default Group
+FileGroup150=Default Group
+FileGroup151=Default Group
+FileGroup152=Default Group
+FileGroup153=Default Group
+FileGroup154=Default Group
+FileGroup155=Default Group
+FileGroup156=Default Group
+FileGroup157=Default Group
+FileGroup158=Default Group
+FileGroup159=Default Group
FileGroup16=Default Group
+FileGroup160=Default Group
+FileGroup161=Default Group
+FileGroup162=Default Group
+FileGroup163=Default Group
+FileGroup164=Default Group
+FileGroup165=Default Group
+FileGroup166=Default Group
+FileGroup167=Default Group
+FileGroup168=Default Group
+FileGroup169=Default Group
FileGroup17=Default Group
+FileGroup170=Default Group
+FileGroup171=Default Group
+FileGroup172=Default Group
+FileGroup173=Default Group
+FileGroup174=Default Group
+FileGroup175=Default Group
+FileGroup176=Default Group
+FileGroup177=Default Group
+FileGroup178=Default Group
+FileGroup179=Default Group
FileGroup18=Default Group
+FileGroup180=Default Group
+FileGroup181=Default Group
+FileGroup182=Default Group
+FileGroup183=Default Group
+FileGroup184=Default Group
+FileGroup185=Default Group
+FileGroup186=Default Group
+FileGroup187=Default Group
+FileGroup188=Default Group
+FileGroup189=Default Group
FileGroup19=Default Group
+FileGroup190=Default Group
+FileGroup191=Default Group
+FileGroup192=Default Group
+FileGroup193=Default Group
+FileGroup194=Default Group
+FileGroup195=Default Group
+FileGroup196=Default Group
+FileGroup197=Default Group
+FileGroup198=Default Group
+FileGroup199=Default Group
FileGroup2=Default Group
FileGroup20=Default Group
+FileGroup200=Default Group
+FileGroup201=Default Group
+FileGroup202=Default Group
+FileGroup203=Default Group
+FileGroup204=Default Group
+FileGroup205=Default Group
+FileGroup206=Default Group
+FileGroup207=Default Group
+FileGroup208=Default Group
+FileGroup209=Default Group
FileGroup21=Default Group
+FileGroup210=Default Group
+FileGroup211=Default Group
+FileGroup212=Default Group
+FileGroup213=Default Group
+FileGroup214=Default Group
+FileGroup215=Default Group
+FileGroup216=Default Group
+FileGroup217=Default Group
+FileGroup218=Default Group
+FileGroup219=Default Group
FileGroup22=Default Group
+FileGroup220=Default Group
+FileGroup221=Default Group
+FileGroup222=Default Group
+FileGroup223=Default Group
+FileGroup224=Default Group
+FileGroup225=Default Group
+FileGroup226=Default Group
+FileGroup227=Default Group
+FileGroup228=Default Group
+FileGroup229=Default Group
FileGroup23=Default Group
+FileGroup230=Default Group
+FileGroup231=Default Group
+FileGroup232=Default Group
+FileGroup233=Default Group
+FileGroup234=Default Group
+FileGroup235=Default Group
+FileGroup236=Default Group
+FileGroup237=Default Group
+FileGroup238=Default Group
+FileGroup239=Default Group
FileGroup24=Default Group
+FileGroup240=Default Group
+FileGroup241=Default Group
+FileGroup242=Default Group
+FileGroup243=Default Group
+FileGroup244=Default Group
+FileGroup245=Default Group
+FileGroup246=Default Group
+FileGroup247=Default Group
+FileGroup248=Default Group
+FileGroup249=Default Group
FileGroup25=Default Group
+FileGroup250=Default Group
+FileGroup251=Default Group
+FileGroup252=Default Group
+FileGroup253=Default Group
+FileGroup254=Default Group
+FileGroup255=Default Group
+FileGroup256=Default Group
+FileGroup257=Default Group
+FileGroup258=Default Group
+FileGroup259=Default Group
FileGroup26=Default Group
+FileGroup260=Default Group
+FileGroup261=Default Group
+FileGroup262=Default Group
+FileGroup263=Default Group
+FileGroup264=Default Group
+FileGroup265=Default Group
+FileGroup266=Default Group
+FileGroup267=Default Group
+FileGroup268=Default Group
+FileGroup269=Default Group
FileGroup27=Default Group
+FileGroup270=Default Group
+FileGroup271=Default Group
+FileGroup272=Default Group
+FileGroup273=Default Group
+FileGroup274=Default Group
+FileGroup275=Default Group
+FileGroup276=Default Group
+FileGroup277=Default Group
+FileGroup278=Default Group
+FileGroup279=Default Group
FileGroup28=Default Group
+FileGroup280=Default Group
+FileGroup281=Default Group
+FileGroup282=Default Group
+FileGroup283=Default Group
+FileGroup284=Default Group
+FileGroup285=Default Group
+FileGroup286=Default Group
+FileGroup287=Default Group
+FileGroup288=Default Group
+FileGroup289=Default Group
FileGroup29=Default Group
+FileGroup290=Default Group
+FileGroup291=Default Group
+FileGroup292=Default Group
+FileGroup293=Default Group
+FileGroup294=Default Group
+FileGroup295=Default Group
+FileGroup296=Default Group
+FileGroup297=Default Group
+FileGroup298=Default Group
+FileGroup299=Default Group
FileGroup3=Default Group
FileGroup30=Default Group
+FileGroup300=Default Group
+FileGroup301=Default Group
+FileGroup302=Default Group
+FileGroup303=Default Group
+FileGroup304=Default Group
+FileGroup305=Default Group
+FileGroup306=Default Group
+FileGroup307=Default Group
+FileGroup308=Default Group
+FileGroup309=Default Group
+FileGroup31=Default Group
+FileGroup310=Default Group
+FileGroup311=Default Group
+FileGroup312=Default Group
+FileGroup313=Default Group
+FileGroup314=Default Group
+FileGroup315=Default Group
+FileGroup316=Default Group
+FileGroup317=Default Group
+FileGroup318=Default Group
+FileGroup319=Default Group
+FileGroup32=Default Group
+FileGroup320=Default Group
+FileGroup321=Default Group
+FileGroup322=Default Group
+FileGroup323=Default Group
+FileGroup324=Default Group
+FileGroup325=Default Group
+FileGroup326=Default Group
+FileGroup327=Default Group
+FileGroup328=Default Group
+FileGroup329=Default Group
+FileGroup33=Default Group
+FileGroup330=Default Group
+FileGroup331=Default Group
+FileGroup332=Default Group
+FileGroup333=Default Group
+FileGroup334=Default Group
+FileGroup335=Default Group
+FileGroup336=Default Group
+FileGroup337=Default Group
+FileGroup338=Default Group
+FileGroup339=Default Group
+FileGroup34=Default Group
+FileGroup340=Default Group
+FileGroup341=Default Group
+FileGroup342=Default Group
+FileGroup343=Default Group
+FileGroup344=Default Group
+FileGroup345=Default Group
+FileGroup346=Default Group
+FileGroup347=Default Group
+FileGroup348=Default Group
+FileGroup349=Default Group
+FileGroup35=Default Group
+FileGroup350=Default Group
+FileGroup351=Default Group
+FileGroup352=Default Group
+FileGroup353=Default Group
+FileGroup354=Default Group
+FileGroup355=Default Group
+FileGroup356=Default Group
+FileGroup357=Default Group
+FileGroup358=Default Group
+FileGroup359=Default Group
+FileGroup36=Default Group
+FileGroup360=Default Group
+FileGroup361=Default Group
+FileGroup362=Default Group
+FileGroup363=Default Group
+FileGroup364=Default Group
+FileGroup37=Default Group
+FileGroup38=Default Group
+FileGroup39=Default Group
FileGroup4=Default Group
+FileGroup40=Default Group
+FileGroup41=Default Group
+FileGroup42=Default Group
+FileGroup43=Default Group
+FileGroup44=Default Group
+FileGroup45=Default Group
+FileGroup46=Default Group
+FileGroup47=Default Group
+FileGroup48=Default Group
+FileGroup49=Default Group
FileGroup5=Default Group
+FileGroup50=Default Group
+FileGroup51=Default Group
+FileGroup52=Default Group
+FileGroup53=Default Group
+FileGroup54=Default Group
+FileGroup55=Default Group
+FileGroup56=Default Group
+FileGroup57=Default Group
+FileGroup58=Default Group
+FileGroup59=Default Group
FileGroup6=Default Group
+FileGroup60=Default Group
+FileGroup61=Default Group
+FileGroup62=Default Group
+FileGroup63=Default Group
+FileGroup64=Default Group
+FileGroup65=Default Group
+FileGroup66=Default Group
+FileGroup67=Default Group
+FileGroup68=Default Group
+FileGroup69=Default Group
FileGroup7=Default Group
+FileGroup70=Default Group
+FileGroup71=Default Group
+FileGroup72=Default Group
+FileGroup73=Default Group
+FileGroup74=Default Group
+FileGroup75=Default Group
+FileGroup76=Default Group
+FileGroup77=Default Group
+FileGroup78=Default Group
+FileGroup79=Default Group
FileGroup8=Default Group
+FileGroup80=Default Group
+FileGroup81=Default Group
+FileGroup82=Default Group
+FileGroup83=Default Group
+FileGroup84=Default Group
+FileGroup85=Default Group
+FileGroup86=Default Group
+FileGroup87=Default Group
+FileGroup88=Default Group
+FileGroup89=Default Group
FileGroup9=Default Group
+FileGroup90=Default Group
+FileGroup91=Default Group
+FileGroup92=Default Group
+FileGroup93=Default Group
+FileGroup94=Default Group
+FileGroup95=Default Group
+FileGroup96=Default Group
+FileGroup97=Default Group
+FileGroup98=Default Group
+FileGroup99=Default Group
Group=Default Group
Library1=b4xpages
-Library10=firebasenotifications
-Library11=fusedlocationprovider
-Library12=gifdecoder
-Library13=googlemaps
-Library14=gps
-Library15=ime
-Library16=javaobject
-Library17=json
-Library18=okhttputils2
-Library19=phone
+Library10=firebaseanalytics
+Library11=firebasenotifications
+Library12=fusedlocationprovider
+Library13=gifdecoder
+Library14=googlemaps
+Library15=gps
+Library16=ime
+Library17=javaobject
+Library18=json
+Library19=okhttputils2
Library2=baqrcode
-Library20=randomaccessfile
-Library21=reflection
-Library22=runtimepermissions
-Library23=serial
-Library24=sql
-Library25=xcustomlistview
-Library26=zxing_scanner
-Library27=bitmapcreator
+Library20=phone
+Library21=randomaccessfile
+Library22=reflection
+Library23=runtimepermissions
+Library24=serial
+Library25=sql
+Library26=xcustomlistview
+Library27=zxing_scanner
+Library28=preoptimizedclv
Library3=batteryprogressview
-Library4=byteconverter
-Library5=camera
-Library6=compressstrings
-Library7=core
-Library8=fileprovider
-Library9=firebaseanalytics
+Library4=bitmapcreator
+Library5=byteconverter
+Library6=camera
+Library7=compressstrings
+Library8=core
+Library9=fileprovider
ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~~\n~AddApplicationText(~\n~~\n~~\n~)~\n~AddManifestText()~\n~AddManifestText()~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.Crashlytics)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'Si al cargar un mapa de google manda este error "java.lang.NoClassDefFoundError: Failed resolution of: Lorg/apache/http/ProtocolVersion". agregar la siguiente linea:~\n~AddApplicationText()~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~AddManifestText()
Module1=B4XMainPage
-Module10=EscPosPrinter
-Module11=FirebaseMessaging
-Module12=kms_helperSubs
-Module13=ManageExternalStorage
-Module14=Starter
-Module15=Tracker
+Module10=C_Promos
+Module11=DBRequestManager
+Module12=EscPosPrinter
+Module13=FirebaseMessaging
+Module14=kms_helperSubs
+Module15=ManageExternalStorage
+Module16=Starter
+Module17=Subs
+Module18=Tracker
Module2=BatteryUtilities
Module3=C_Cliente
Module4=C_Clientes
@@ -102,10 +774,10 @@ Module5=C_Historico
Module6=C_Nota
Module7=C_NoVenta
Module8=C_Principal
-Module9=DBRequestManager
-NumberOfFiles=30
-NumberOfLibraries=27
-NumberOfModules=15
+Module9=C_Productos
+NumberOfFiles=364
+NumberOfLibraries=28
+NumberOfModules=18
Version=12.5
@EndOfDesignText@
#Region Project Attributes
diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta
index 0144016..4cab4f8 100644
--- a/B4A/Durakelo.b4a.meta
+++ b/B4A/Durakelo.b4a.meta
@@ -6,6 +6,9 @@ ModuleBookmarks12=
ModuleBookmarks13=
ModuleBookmarks14=
ModuleBookmarks15=
+ModuleBookmarks16=
+ModuleBookmarks17=
+ModuleBookmarks18=
ModuleBookmarks2=
ModuleBookmarks3=
ModuleBookmarks4=
@@ -22,6 +25,9 @@ ModuleBreakpoints12=
ModuleBreakpoints13=
ModuleBreakpoints14=
ModuleBreakpoints15=
+ModuleBreakpoints16=
+ModuleBreakpoints17=
+ModuleBreakpoints18=
ModuleBreakpoints2=
ModuleBreakpoints3=
ModuleBreakpoints4=
@@ -36,8 +42,11 @@ ModuleClosedNodes10=
ModuleClosedNodes11=
ModuleClosedNodes12=
ModuleClosedNodes13=
-ModuleClosedNodes14=1
+ModuleClosedNodes14=
ModuleClosedNodes15=
+ModuleClosedNodes16=1
+ModuleClosedNodes17=10,12,14
+ModuleClosedNodes18=
ModuleClosedNodes2=
ModuleClosedNodes3=
ModuleClosedNodes4=
@@ -46,6 +55,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
-NavigationStack=C_Cliente,B_INV_Click,875,0,C_Cliente,B_IMP_Click,447,0,C_Cliente,B_IMP2_Click,670,0,C_Cliente,Guardar_Click,353,5,C_NoVenta,CANCELA_Click,52,1,C_NoVenta,GUARDA_Click,62,6,C_Cliente,initialize,131,0,Visual Designer,Cliente.bal,-100,6,C_Cliente,B4XPage_Created,162,6,B4XMainPage,Class_Globals,17,0,Visual Designer,productos.bal,-100,1
+NavigationStack=C_Promos,B4XPage_Appear,72,6,Subs,alcanzanLosVariablesParaPromo,934,6,Subs,procesaPromocion,1014,0,Subs,revisaMaxPromosProdsFijosPorInventario,1089,0,C_Productos,B4XPage_Appear,153,3,Subs,traeTablaProds,1350,0,Subs,traeProdNombre,635,6,Subs,traePromo,858,6,Subs,traemosInventarioDisponibleParaPromo,880,6,Subs,traeProdIdDeBD,1200,2,C_Productos,b_rmi_Click,1234,0
SelectedBuild=0
-VisibleModules=14,1,8,12,6,3,7
+VisibleModules=16,1,8,14,6,3,7,9,17,10
diff --git a/B4A/Starter.bas b/B4A/Starter.bas
index abc79cc..be0d2f7 100644
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -29,6 +29,7 @@ Sub Process_Globals
Dim DBReqServer As String = "http://keymon.lat:1782"
Dim FECHA_HOY As String
Dim tipov As String = ""
+ Dim rutav As String = "0"
End Sub
Sub Service_Create
diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas
index 8d16374..dbe4a43 100644
--- a/B4A/kms_helperSubs.bas
+++ b/B4A/kms_helperSubs.bas
@@ -394,6 +394,15 @@ Sub hayPedido(db As SQL) As Boolean 'ignore
Return hay
End Sub
+'Regresa verdadero si el usuario actual ya imprimio su venta
+Sub revisaImpresa (db As SQL) As Boolean
+ Dim imp As Boolean = False
+ Dim i As Cursor = db.ExecQuery("select count(*) as CUANTOS from kmt_info where (impresion = 1 or cat_cl_codigo in (select ci_cuenta from cliente_impreso)) and CAT_CL_CODIGO in (Select CUENTA from cuentaa)")
+ i.Position = 0
+ If i.GetString("CUANTOS") > 0 Then imp = True Else imp = False
+ Return imp
+End Sub
+
'Guarda el nombre y version de la app en CAT_VARIABLES.
Sub guardaAppInfo(db As SQL) 'ignore
db.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'EMPRESA' or CAT_VA_DESCRIPCION = 'APP_NAME' or CAT_VA_DESCRIPCION = 'APP_VERSION'")