From a3c014e8ec673b6adadf7dbd0ab44f3f80c49feb Mon Sep 17 00:00:00 2001
From: cvaldes1201 <cj.valdes@keymonsoft.com>
Date: Fri, 25 Oct 2024 10:28:05 -0600
Subject: [PATCH] ...

---
 B4A/C_Cliente.bas       |  10 ++--
 B4A/C_Principal.bas     |  11 ++++
 B4A/C_Productos.bas     |   2 +-
 B4A/Durakelo.b4a        | 116 ++++++++++++++++++++--------------------
 B4A/Durakelo.b4a.meta   |   2 +-
 B4A/Files/principal.bal | Bin 54141 -> 55616 bytes
 6 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index 9d8dc15..b6c5aad 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -413,11 +413,11 @@ End Sub
 
 Sub gest_Click
 	Log("GEST CLIC")
-	Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
-	If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
-		cuest.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
-		Return False
-	End If
+'	Log($"${cuest.encuestaIniciada} - ${cuest.clienteConCuestionario(Subs.traeCliente)}"$)
+'	If Not(cuest.encuestaIniciada) And Not(cuest.clienteConCuestionario(Subs.traeCliente)) Then
+'		cuest.agregaPregunta("1", "¿Se puede acceder al negocio o está enrejado?", Array As String("No, está enrejado o no se tiene acceso", "Si se pude acceder"))
+'		Return False
+'	End If
 '	If la_cuenta.Text <> "0" Then
 '		Dim queenc As String
 '		'		1=1 ----> si no esta en el historico que se descargue del web ver si esta contestada de manera local
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index e29f8c7..cd6a0e5 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -162,6 +162,7 @@ Sub Class_Globals
 	Private l_montoColgateResumen As Label
 	Private l_nes_humedos As Label
 	Private l_nes_secos As Label
+	Private l_conagra As Label
 End Sub
 
 Sub initialize
@@ -2386,6 +2387,16 @@ Sub Resumen_Click
 	Loop
 	l_nes_secos.Text = NumberFormat2(cRes3, 1, 2, 2, True)
 	
+	
+	Private r9 As ResultSet = Starter.skmt.ExecQuery($"SELECT CAT_GP_CLASIF, PEDIDO.* FROM PEDIDO JOIN CAT_GUNAPROD WHERE CAT_GP_CLASIF LIKE '%CONAGRA%' AND PE_PROID = CAT_GP_ID"$)
+	Private cRes4 As String = 0
+	Do While r9.NextRow
+		cRes4 = cRes4 + r9.GetString("PE_COSTO_TOT")
+	Loop
+	l_conagra.Text = NumberFormat2(cRes4, 1, 2, 2, True)
+	
+	
+	
 	b=skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0")
 	b.Position=0
 	Cuantos = b.GetString("CUANTOS")
diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas
index f45a250..58b000c 100644
--- a/B4A/C_Productos.bas
+++ b/B4A/C_Productos.bas
@@ -1342,7 +1342,7 @@ Sub LlenaProdsLL(p As ResultSet, extra As String)
 	Else
 		Log("NO HAY RESULTSET")
 '		Dim p As ResultSet = Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Subs.traeTablaProds(Starter.tipov)} where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
-		Dim p As ResultSet = Starter.skmt.ExecQuery($"Select distinct ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, LISTA_PRECIOS.CAT_GP_ID as precioAlt from ${Subs.traeTablaProds(Starter.tipov)} left join LISTA_PRECIOS on LISTA_PRECIOS.CAT_GP_ID = ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
+		Dim p As ResultSet = Starter.skmt.ExecQuery($"Select distinct ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, LISTA_PRECIOS.CAT_GP_ID as precioAlt, CAT_GP_CLASIF from ${Subs.traeTablaProds(Starter.tipov)} left join LISTA_PRECIOS on LISTA_PRECIOS.CAT_GP_ID = ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_CLASIF, CAT_GP_NOMBRE"$)
 		Log("|" & Starter.tipov & "|")
 		Log($"Select distinct ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, LISTA_PRECIOS.CAT_GP_ID as precioAlt from ${Subs.traeTablaProds(Starter.tipov)} left join LISTA_PRECIOS on LISTA_PRECIOS.CAT_GP_ID = ${Subs.traeTablaProds(Starter.tipov)}.CAT_GP_ID where CAT_GP_PRECIO > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$)
 	End If
diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a
index 34177b0..1b07f0f 100644
--- a/B4A/Durakelo.b4a
+++ b/B4A/Durakelo.b4a
@@ -572,67 +572,68 @@ File611=celltitle.bal
 File612=Cliente.bal
 File613=Clientes.bal
 File614=colgate.png
-File615=detalle_promo.bal
-File616=durakelo.png
-File617=durakelo_192x192.png
-File618=durakelo1.png
-File619=encuesta.bal
+File615=conagra.jpg
+File616=detalle_promo.bal
+File617=durakelo.png
+File618=durakelo_192x192.png
+File619=durakelo1.png
 File62=117marker-verde.png
-File620=engrane.jpg
-File621=engrane3.png
-File622=espera.gif
-File623=fondo_kmt.jpg
-File624=foto.bal
-File625=guardagestion.bal
-File626=guna_viejo.png
-File627=infonavit1.jpg
-File628=itembuttonblue.png
-File629=k.png
+File620=encuesta.bal
+File621=engrane.jpg
+File622=engrane3.png
+File623=espera.gif
+File624=fondo_kmt.jpg
+File625=foto.bal
+File626=guardagestion.bal
+File627=guna_viejo.png
+File628=infonavit1.jpg
+File629=itembuttonblue.png
 File63=118.png
-File630=K-b27c0809.png
-File631=kelloggs.png
-File632=keymon_logo.png
-File633=kmt.db
-File634=login.bal
-File635=logo sanfer.jpg
-File636=Logo_durakelo_192xx192.jpeg
-File637=logo_exitus1.jpg
-File638=MainPage.bal
-File639=Malo.jpg
+File630=k.png
+File631=K-b27c0809.png
+File632=kelloggs.png
+File633=keymon_logo.png
+File634=kmt.db
+File635=login.bal
+File636=logo sanfer.jpg
+File637=Logo_durakelo_192xx192.jpeg
+File638=logo_exitus1.jpg
+File639=MainPage.bal
 File64=118marker-rojo.png
-File640=mapa.bal
-File641=mapa_rutas.bal
-File642=nestle.png
-File643=nota.bal
-File644=NoVenta.bal
-File645=nuevocliente.bal
-File646=palomita_verde.png
-File647=pedido.bal
-File648=pedidoitem.bal
-File649=planfia_logo.png
+File640=Malo.jpg
+File641=mapa.bal
+File642=mapa_rutas.bal
+File643=nestle.png
+File644=nota.bal
+File645=NoVenta.bal
+File646=nuevocliente.bal
+File647=palomita_verde.png
+File648=pedido.bal
+File649=pedidoitem.bal
 File65=118marker-verde.png
-File650=planfia_logo_old.png
-File651=planfia_logo_old2.png
-File652=principal.bal
-File653=proditem.bal
-File654=productos.bal
-File655=productos.bal.old
-File656=promociones.bal
-File657=qr.bal
-File658=rechazo.jpg
-File659=rojo.png
+File650=planfia_logo.png
+File651=planfia_logo_old.png
+File652=planfia_logo_old2.png
+File653=principal.bal
+File654=proditem.bal
+File655=productos.bal
+File656=productos.bal.old
+File657=promociones.bal
+File658=qr.bal
+File659=rechazo.jpg
 File66=119.png
-File660=salma.jpg
-File661=salma.png
-File662=senial.jpg
-File663=sync.png
-File664=tache_rojo.png
-File665=telefonos.bal
-File666=ticketsDia.bal
-File667=Tiendita.jpg
-File668=unilever.jpg
-File669=verde.png
+File660=rojo.png
+File661=salma.jpg
+File662=salma.png
+File663=senial.jpg
+File664=sync.png
+File665=tache_rojo.png
+File666=telefonos.bal
+File667=ticketsDia.bal
+File668=Tiendita.jpg
+File669=unilever.jpg
 File67=119marker-rojo.png
+File670=verde.png
 File68=119marker-verde.png
 File69=11marker-rojo.png
 File7=100marker-rojo.png
@@ -1302,6 +1303,7 @@ FileGroup667=Default Group
 FileGroup668=Default Group
 FileGroup669=Default Group
 FileGroup67=Default Group
+FileGroup670=Default Group
 FileGroup68=Default Group
 FileGroup69=Default Group
 FileGroup7=Default Group
@@ -1394,7 +1396,7 @@ Module6=C_Cuestionario
 Module7=C_Historico
 Module8=C_Nota
 Module9=C_NoVenta
-NumberOfFiles=669
+NumberOfFiles=670
 NumberOfLibraries=31
 NumberOfModules=24
 Version=12.8
@@ -1402,7 +1404,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Durakelo
 	#VersionCode: 1
-	#VersionName: 4.07.25
+	#VersionName: 4.09.06
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta
index be683fd..4c3f0d9 100644
--- a/B4A/Durakelo.b4a.meta
+++ b/B4A/Durakelo.b4a.meta
@@ -73,6 +73,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Productos,clv_prods_ll_ItemLongClick,1090,0,Diseñador Visual,productos.bal,-100,5,C_Principal,cargar_Click,814,0,B4XMainPage,Entrar_Click,303,0,C_Principal,connecta_Click,1993,6,C_Principal,JobDone,1195,6,C_Productos,l_prodX_Click,1136,0,C_Productos,l_prodX_LongClick,1145,6,B4XMainPage,B4XPage_Created,108,0,B4XMainPage,Class_Globals,94,0,B4XMainPage,Initialize,101,0
+NavigationStack=B4XMainPage,Class_Globals,94,0,C_Productos,Class_Globals,0,0,C_Productos,B4XPage_Appear,265,0,C_Productos,Busca_TextChanged,1299,0,C_Productos,LlenaProdsLL,1338,1,Diseñador Visual,principal.bal,-100,6,B4XMainPage,Initialize,101,0,C_Principal,Class_Globals,158,0,C_Principal,Resumen_Click,2384,2,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,407,0
 SelectedBuild=0
 VisibleModules=2,10,4,19,5,6,8,9,11,24
diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index cc3279be2875075803663b7a11bce5d38d8906d3..6c6a6215e781b623d1c47951d306130235ab0278 100644
GIT binary patch
delta 2264
zcmZwIZA?>F7y#gVE{bU_y@*7FZdtbwwX;$|%7=UkREnUKjj=BsR_xG<wYU$3sU7O3
zi9=`J7~LY<Ol;9?QRW4$jURw)4B{94<&q_C`{BQZZP{O8@44lcw+%nu+vnbM-uIky
zPwwgSK*Hd)grxa`ApEBn1TFra{xPYSNefXmyPd7Brk$>R*}2fqLP;8Y*4Esz$K!0>
z>y$m>zaq0j)BJndL~L+4J+8JwNKZV)4$GGlk1<~wK3$6ODn<gvJdBkXW{g!BS;Q9N
z)x_DvImBy-bBV39_6d2jH$pyf0dXPmTH+$&V&W3wQsOe=a>c&LD%X*Q3gSxQDq<V)
zdg5wgJ8=#12I5*AKl-Zch&K{%BCaQP5H}FNM*KQ)Bk>zE_VGP#A`Nd6zeW5u@jJxt
z5^pBnLi`?aGx1hI@I_beBn{h$TZp$4yNKT>ZYAD9ypz}+HNO8{(Hs15h<6ivi1!eC
ziQ9?y5`RGaA@N7teE<0te2k%fe*4h-F*-0hi9aDeKzxw+5HYW<*7=mUi@5MGxj907
z6#W^-=NQL`kE4~M;M6T{P)~^y_*C^5#NB9hStp545r2u6Fp@D+;f&6%=f~R20hZ<V
z%D?IQ7^{=J^`%mN;R0-{b8d6B<yvD-y4ajneoIb9dH6-`dhqyC79O9To;F}3`$h!I
zS1X{+m<FN7W%8!&cPm7J$x?5pj&;N7LvEOoGvQ#1hGoKobGF4(n3T>F&*LS7!w&jh
zfV2SvJRi%09RnTk*JTa-dgUrx28%8_@Ooi%KR&aub71u6h|3uabsE?T@cPYo?eW`Q
z7*UH}Q;YIrOqt&z_+!mW;FGoR^-V4G$WCzINP*;j1Dw5~hwr=AL1%vtoC&7F<ZuZ*
z3+kB(*d;goFrEVDunA5c(Spfu5?4k>HS<v=GZO@U66^TO)|jCEem*?C?h#i-I%V-r
zV86|4wcnp)7F<UL^ab-IOI)J&q8plT2B70kWc=|vk@1Zz8zv@d;87^Za-!Keb7VK%
z3c#+RRH#3Z4&Kd~aBE1dkgHU9dR+tKx3A)#mpTXQ991gs24Ks`Y?Uh`YL$GYiaZ!(
z1<?uxb5yVn2cUj5vWo9U)$FxOw*Oub{v1mM<AnvvTPT_%fB8=VRtyaj8DI?MNyTwJ
z*d-$?QEHw2Imk+*GbxSh$KPlAFMVPe19spQkQz0d-*#;T+gJ}P$NCPbJSL}XX16^v
zI}8I4i&$B7M=K&bTB&S%Wn3oT+bW!kL#m2v8GP^r&WA1VcZUI<h4onQpNEsITIpLI
v+gC1soXqee;8U~5HYrof2-k}>3|{tUiyI=7sfAG3EY>pky<`bYg?;}6&dadG

delta 1926
zcmZwHYfwyK7zgn4Zfb;fmBy`@&>*EG7F)Yf<j%U}mRoWyZMomAOXOBAk1xz<%wRRc
zs2sFqnpRnoOB#m8Fuodwj8Dc)c+NSy+dt#O^X~7R^MB8I&-=_C*KNNxhhLDtBuNE&
zN$SGCMHNBU1=Wjc`GoF=jtc#&Xj;H&v0r`{P$=wvoan?gj4PTehHE%D790m20geZc
z1Sfz;fk(I7E*aY=(ireq@HnsuoCr<=o52=vGI+ddyY|Kt;6e&G6+96<37iI=44wj>
z3Z4d@&d>K9`wZ|*@GS6buoXN9JQq9<JRh9yv0dr+0=Tdcya>D)yab#9UJ70YUJhOX
zUMWd--`i)xg;n4z@M`cH@LKRX@OtnDaJJ8U{yDyhBy9xef^FbDa6Whwcr$nl+xsuu
z%HGDcook0;rT@xgr!w()7kD>#4|p$lA9z1lxwrS82iOO>4sjg@+Y5N&4IN>7cY2iV
z{T>v8kAaUv{sj0W_!Qf~)t##cS2wQAjaiwttPPp5`8MhtWRzzHl?gFfZqr)~@}B-8
zt>3q{KY#jgP;g0o6<lP7DJap=#|uL#d_XVCP9H4)UR|3)18<#|=ahcxO63Rr)ml)M
zLs#!aQu&KO5lO98U#RA87~ObkB>lZzl=m`(THi*|$NLFlFa_6yiy;)@i0M9rpP_uF
zx+!}Nj1=_Xrjc@+ZDObzic&*S{|jBNanif$P_jNWQ}lg3l~m@?*H<Cb+Z{#4$8tn8
zoqcLm#>#N2Ee#Pd6#Q%|opU+Ga2n8P<?(FgP71Aah*)}XwFkM}W|lV{r>1k81F5LK
zj2ddS=k#%D&k1llM7(cRyl>S=b=CGqPO7fcR&=e`R{VVI5Tn!`@#xvnXf?h5iIZ-+
zwRD?XOMh;3h%suKM^AdJ9Q;fODrwN7tqofA{qu62Nl?Y!f$GVd_~d6%=cY>((HKe=
z*=$JcaCj!FD9z?>*gRcGQV%$(W2U_eX0;0zHDvi;h`S(?`6R4V^+GR96mczruDo)J
z@ybH_^)gY}oYK=Tubm=A2^vy5-bY<B=*@SL$}ilPTunwp>OTo(%OBp()=d=Dd@Y_b
YUdK^!OPDTA&>2fl`jD)rrj|{A0iwurr2qf`