From 25eb489d91a537c9c5cac85052e00ea04a2f95e0 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Mon, 20 Nov 2023 22:56:22 -0600
Subject: [PATCH] 20/11/23 - Cambios en defailt para clientes nuevos y algunos
 estilos

---
 B4A/B4XMainPage.bas     |   7 +++++--
 B4A/C_NuevoCliente.bas  |  27 ++++++++++++++++++++++++++-
 B4A/C_Principal.bas     |   7 ++++---
 B4A/Files/checks.bal    | Bin 33830 -> 33821 bytes
 B4A/Files/login.bal     | Bin 21617 -> 21632 bytes
 B4A/Files/principal.bal | Bin 69110 -> 69110 bytes
 B4A/KelloggsV4.b4a      |   2 +-
 B4A/KelloggsV4.b4a.meta |   6 +++---
 B4A/kms_helperSubs.bas  |   5 +++--
 9 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas
index 9c4cb72..537126e 100644
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -544,7 +544,10 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 	' BACK key pressed
 	'Return True to close, False to cancel
 	Log("BACK")
-	If Panel1.Visible Then
+	If p_extras.Visible Then
+		p_extras.Visible = False
+		Return False
+	else If Panel1.Visible Then
 		Panel1.Visible = False
 		Entrar.Visible = True
 		p_extras.Visible = False
@@ -816,7 +819,7 @@ Private Sub et_geocerca_TextChanged (Old As String, New As String)
 End Sub
 
 Private Sub b_extras_Click
-	p_extras.Top = p_botones.Top
+	p_extras.Top = E_SERVER.Top
 	kh.centraPanel(p_extras, Root.Width)
 	p_extras.Elevation = 100dip
 	p_extras.BringToFront
diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas
index f101e0e..d45f0bf 100644
--- a/B4A/C_NuevoCliente.bas
+++ b/B4A/C_NuevoCliente.bas
@@ -27,6 +27,8 @@ Sub Class_Globals
 	Private b_cancelar As Button
 	Private Panel1 As Panel
 	Private p_botones As Panel
+	Private maxClientesNuevos As Int = 0
+	Private permitirCtesNuevos As Boolean
 End Sub
 
 'You can add more parameters here.
@@ -48,15 +50,38 @@ End Sub
 
 Sub B4XPage_Appear
 	b_guardar.Enabled = False
+	permitirCtesNuevos = True
 	b_guardar.Text = "Sin Ubicación ..."
 	E_NOMBRE.Text =  ""
 	CallSubDelayed(Tracker, "StartFLPSmall")
+	Private c As Cursor = Starter.skmt.ExecQuery($"select CAT_VA_VALOR from cat_variables where CAT_VA_DESCRIPCION = 'MAXCTESNUEVOS'"$)
+	If c.RowCount > 0 Then
+		c.Position = 0
+		maxClientesNuevos = c.GetString("CAT_VA_VALOR")
+	End If
+'	Log("MaxClientesNuevos: " & maxClientesNuevos)
+	If maxClientesNuevos <> 0 Then
+		Private d As Cursor = Starter.skmt.ExecQuery($"select count(CAT_CL_CODIGO) as ctesNuevos from kmt_info where CAT_CL_CODIGO like 'N%'"$)
+		If d.RowCount > 0 Then
+			d.Position = 0
+'			Log($"Clientes nuevos actuales: ${d.GetString("ctesNuevos")}"$)
+			If d.GetString("ctesNuevos") >= maxClientesNuevos Then
+				b_guardar.Enabled = False
+				permitirCtesNuevos = False
+				ToastMessageShow("¡Ha alcanzado el LIMITE de usuarios nuevos por día!", True)
+			End If
+		End If
+	End If
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
 '	lat_gps=Location1.ConvertToSeconds(Location1.Latitude)
 '	lon_gps=Location1.ConvertToSeconds(Location1.Longitude)
-	b_guardar.Enabled = True
+	If Not(permitirCtesNuevos) Then
+		b_guardar.Enabled = False
+	Else
+		b_guardar.Enabled = True
+	End If
 	b_guardar.Text = "Guardar"
 End Sub
 
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index 31409b2..3648d07 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -2356,7 +2356,7 @@ Sub Resumen_Click
 		c = Starter.skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente where pc_cliente <> 0")
 		b = Starter.skmt.ExecQuery("select count(*) as CUANTOS from noventa")
 		'where pc_fecha = ?", Array As String(fecha)
-		C.Position = 0
+		c.Position = 0
 		b.Position = 0
 		L_MONTOD.Text = c.GetString("MONTO_DIA")
 		L_MONTOD.Text = Subs.sumaPedido(Subs.traeCliente) 'Trae el monto sin el redondeo que a veces hace el SUM().
@@ -2364,11 +2364,12 @@ Sub Resumen_Click
 		Subs.sumaPedido(Subs.traeCliente)
 		l_cuantosc.Text = c.GetString("CLIENTES_DIA")
 		l_cuantosn.Text = b.GetString("CUANTOS")
-		efectiva = c.GetString("CLIENTES_DIA") / e.GetString("POR_VISITAR")
+		L_CUANTOST.Text = NumberFormat2((l_cuantosc.Text + l_cuantosn.Text), 1, 0, 0, False)
+		efectiva = L_CUANTOST.Text / e.GetString("POR_VISITAR")
+		LogColor($"${L_CUANTOST.Text} / ${e.GetString("POR_VISITAR")} = ${(L_CUANTOST.Text / e.GetString("POR_VISITAR") * 100)}"$, Colors.BLUE)
 		l_efectiva.text = Round2(efectiva*100,2)
 		l_ctast.Text = d.GetString("TOTAL_VISITAR")
 		'l_porvisitar.Text = e.GetString("POR_VISITAR")
-		L_CUANTOST.Text = l_cuantosc.Text + l_cuantosn.Text
 		drop = (c.GetString("CLIENTES_DIA") + b.GetString("CUANTOS"))/ d.GetString("TOTAL_VISITAR")
 		l_drop.Text = Round(drop * 100)
 		If l_drop.Text + l_efectiva.Text < 100 Then
diff --git a/B4A/Files/checks.bal b/B4A/Files/checks.bal
index f8d6b22d41597ed5834bb845b6d936ecf7f34f33..9d6f2966affb52dc42ad9f5e1d913ee23f52ee4a 100644
GIT binary patch
delta 251
zcmZ41!8EsnX@f{I<AKS7sfLpmC~$2KNIt;Gcwn<&YCa=l&gRCnU`EE=$@vO~lk3z<
zCRb%#W(sDUtYB&|xju6pBkN@Sa{0*y1xAzWvpz8`W}LjI(O`0cCfDS(*-KC)B`5F6
zxjFf$y3pkJg$k38=b~zroctgUA^SQXU6!TrCZpQqdxiIr%;Ycr1Qs)#9Hq~-*|y{(
u=j3e-LX#cp#3xVilwg)g?U}r>L2L2_9k$J@>vl3iB`rV_n>RL;G6Mj;Cu11^

delta 253
zcmbQ+!L+P{X@f{I<G#s)sfLpmC~$2KNIt;GxNoyyYCa=l^5(|0U`EE2$@vO~lk3z<
zCRb%#X7Xp8tYB&|xju6pBg16<a{0*y1xAzWvpzA+Vw_xCZ!oz)lWX$Y>?J6Yl9Tu3
z++>=@F!_F=!Q|t)s5&JlKgfeizRpLNWGTGKs5JRr;e8|%`HMe+#SAA$>2qziE&0d^
llC0AJx<zyHoid@x4dud<FX*ssUR1Y}5kpFH^Nj{qW&mb9VGjTR

diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal
index de024ccdd209bcabb3d1dc1f1b5e2e02686eaa81..b119ab238a74edf25c9e1ac04c78601a84a6fab2 100644
GIT binary patch
delta 2061
zcmb7FOHi9t6wVQ${1Hg`6CeZ%!L%6K1PDb+%j*yCAOeDp3(8Pz(Msh_1zH$V+ESF!
zq4RB8X=_oWw7mUoSI#(0H_A*$SDn$Z+Aefq9S0Wb%E$SCNJt`%<Ko=8_uPBFdmi7p
zcYTK3H)-kX5V|9O6EYYa^^``VDQa))>1yh3zPsE+ygaZA<JuVXgv|-TysUMVmA@#P
z!w&|9h4Qkjx&3H!*U=`d3r2ZlXMHFxOCrXjp2Y7)UC`?4DpsTzm}8$sxHBH+%24#j
z*3d0T(N@e?Wx|{rDyN!y$zvwwGpKNk2Z<%*uPp=-zr|TlZxE5_)T&5%@ta85&3rb9
zMI*e*!xPHnH69dyH`K>H>eqSF!XljD;SKx}Z=_Z%#+dZVc_WJwvPQ=uv?6oY2(@9M
z%8rM7OQ{``4ij}?D9VD?1d-S7gjDLpVuDNG#s;x0RLu4!WpW3pl9jr=*4?=HoQ)GB
zs<z##ZI5D$I7y%fIBj-hpJc=T8OEDzvJplvzAyF(LrI|;MlU)`9ayu6pd&8=?MXR?
zKJPXCJX5oE3M*9^SWAkGI?bvbEE<6&n6%1l0BIJJ{uEEu40)jk7`g<bPnT!|fCP&d
zNRoVj1{I(rFOUMR`Z&lF8%x+u9{9R@b_?FIbmBmAG~ShxX$UJ^`-dqaMw26G5YAWw
z^XV1&*WHB#m$i{qkwwY)(pn+!c&3nOm`i2DTJdh(uphE|jLzaK>k^&AnUqf5IlujZ
zO=N|sk@zAZ3H43`9@_-C_fFG!wunORz8u~804sNenMN4Z#5QSI+gGB!z$etqj-tS}
zUwDg`Z?gpBQL&LmF>g;KCCn7HD35Ic8Fb);UEH=5WB-!DF@KNbd-kh@>yAbm<IEV~
z&JvNFQ70FrHxTac_f;RxtdsjQSRIzNrEZoNGg(!by`>WId3K%rLl&$14*9D8Je0Lb
zuNXP*Aa5_^`fg|DW#J{g0Ua5F{6bCx(IqZUjqZ}4!(K1xGS<^-aUrkN@E)Jo=msBl
zJ<2Qc<i+gtVb+8{MZL_LV2UQ<JG;nyGGI1;8huhU+-WgtD~=b4_(_VO2`m?w=_<_5
z9JL^EQUhIMH=~$+hjrKdT%AxjB8NMt2zQGc*;HYktE56cQ^d@h^fGTUz>1I22h0(*
z;c=xT*YM$g1nAd;Q~m*ZdvJ;aJVM_ha*qkmi#n|3H{oo#Ux>Po{9KuWLf2_LD0Arz
zyraHb%3H3!Ti5YNg%#<0v^XLe>4rB6Hv%v=S}-0zmSreSqPKXE;yp;i$_t3u3@tu$
zHPH+sd0tOWyKW``Pbt7nOjguVIexBo;L{?l_7<N}n`jn}nwM#gpV0KMc~%B%B6t*L
z;kKG|bN@uz{32XbEVoo<6D@eFvJh}ssmh{K6>To>sHs@MK-Cpm3h;L+z)<mbS@rig
z`<oN!>&M&rit5@3no`K-_3#*4Djn3!|3nMP0e8yV-1!OLsZvNg%DZaGPAVnikLrD6
l91`n7=r+S_F!y!<fHO87_v@;)LmtxvT+GW2;T8XTe*^KO<w*bl

delta 1872
zcmb7FTTEMZ81FZ1rAKJ#g<H9dOM~T7pdGMIK+3J9Y{5d8xI`3|RHtKVtD75_2@z$$
z9+>$hDid^o;uu3<XTB^8L47h=l=!AuVtDXP7fhTF8iU_CrG<9k!H4gk|M~8}@BGep
zh8F0L>$LKdioOzmR$Wx8NTE<1&cYQT6~hTPMMvV1IJJ^>9UgbfaWR-Q7>~aU8F(UH
zi1YjX*l?zzEWHxn`7$w-egfCB3URls0^QztvDS2+Wan?4W_Hp;nVG-i7>{F_Udh?v
z=iG5D3iXS89FQ(A@gbEAsZWK~FZ1OU7WHX9dhl;%8l3@Em<*DC8jIArLd&8)gT|~8
zdKKihB5=?}ui<2!33ra_@oBOi1KE1kOk|hR>sZV72<se@&O$bf=h!F^2@5_F7L>!@
zkisyOqo#XOgyT&P{+}4ma!3fnIXr0EgF%{yjNu%HTs8zURS4vIjBiCsoadW7rVH3;
zvtv6~N4?PH8K@64R+HfZo8@6d67_MSW_*~}EX0JS<?E7r+5K^a!s%4=MM(mm>V7Fv
zZX}VUlRN6?O9@LtlH}Eg`__C+<p*hi$CQj|X8~PA&{wG)i1O=)H@#e3GmjDy%_*2D
zOT~7R8G~jG^+VTIK!f<j;t^AxY#_J_x<X3aD`<tK@Dxs1jF>BY0Sgul1N5dFWdb>i
z9?~#ZHNaC`s~e80*QZcmvn-q5<+LVj6rUB|W4k=D5ww*YQeWc7Q5Ge(n$mJd_$JRQ
z0#mX_!z{#5mIi;9#7xkJKC6Cb_+$IbY%DsNc;7lrG|sJ;;D=PRc09^FhE+!aUA|Sm
zOz17^BKaBHWj=A#{ybsX7FJc-ed1aLtA0HcR`pc)#6PQ8l~EN|%~bisq9d$ocZ5`(
z@EeR6w5!GLYF1x*D(sn9T_rP3g2`rlQ0p>&#I1!$y@xhiwT)rQ<kat>%w#n8BD0)i
z?j6MMRy`BNh&xZu(^baq)n1LlJ&E<Y9QqiWb@S-1OJOQ?YNuj6m_%4JyTrHa8;GXy
zb%R$s9pfUA=@XeuR~ng2>kVBrDKQML##ZTT#bR@fab_P_JMVEe8c5_Lnq?r}^dmN1
z<1{Bjn2V}DD?|7Uzqvhze74B@M8y{q3%!GcqZR~O^3da!;o+`ZL$lJCfroB8w#>%e
zD8p{l`}KBw?>R~HT+u{dpuM<KH_zr>dd}{!{W?}!JE#u-JY&OFg&-`jm(2MaaC)Dm
zMJWL<z?6iWY)~pRe5!9?!eY`cM(2}optN3qvq%T$F$Yy6*lxp8nt<}d)ktdkhL+^%
zFU7=3)BjSMzEHy!8UN?F+%`qadzxR44%%scMQ*-}o3D;-e0BfESEF-1()e>y<K*XU
zewuFW_J9XoO<Z_vB3BM=@<D8N*!Y(bY{@{WPer#mLRxB_+S@U8LQAMekXEw%cC&G<
Mwg!RYj~yVze-b&t;Q#;t

diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index aaad8a1732259fb29bb1facc83341cbf79dc5b2c..48b83eff6e9e65b78c1886894118ca34b3879329 100644
GIT binary patch
delta 203
zcmex1o8{YVmJOTNPIgZ>+x&8^6(g7txgN?mxdF<s+yrH;+ze$%ZuMcDeEqV@=FV+#
zV8-MH?}aAI?&zLu`BrnXemvLY1oPs_emkYXih6g3f)tr;me}pX$Y?kD<3!WRv-VU9
z=Q1!bNCGjV8<3C!F{CFS^wyZ{w|53eAIQwjGW%XKGIma$^D%dG@qrjdMu*7{x7$qS
VIn*?nKZSGhiXEDp4;(V{1^@u`RyF_t

delta 209
zcmex1o8{YVmJOTNPIkC&w)y2+D@HIQay^uBas!lMxe3Zxxf#lk-0A~TEHv3cPiS-J
zwm3Lv@`Cq5lVx{wPqzJ_IaxoRYjT2l@npZ9(s0GSJ43;WCt0X$me>t31<0N}YfmL(
z>Et;dttR{JodHt~GHtWWzL$)Q-9V|_&BX^|7$-m2&W<cUndeXwqsZp|L+RcCbGTfV

diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a
index 890f9d7..ac56223 100644
--- a/B4A/KelloggsV4.b4a
+++ b/B4A/KelloggsV4.b4a
@@ -870,7 +870,7 @@ Version=12.5
 #Region  Project Attributes	
 	#ApplicationLabel: Kelloggs Venta
 	#VersionCode: 3000
-	#VersionName: 3.11.11 PRUEBA V4
+	#VersionName: 3.11.19 PRUEBA V4
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False
 	#BridgeLogger:true
diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta
index 3a24c54..ab5ef6a 100644
--- a/B4A/KelloggsV4.b4a.meta
+++ b/B4A/KelloggsV4.b4a.meta
@@ -63,7 +63,7 @@ ModuleBreakpoints9=
 ModuleClosedNodes0=
 ModuleClosedNodes1=
 ModuleClosedNodes10=
-ModuleClosedNodes11=1,3,50,51,52
+ModuleClosedNodes11=1,50,51,52
 ModuleClosedNodes12=1,15,16
 ModuleClosedNodes13=
 ModuleClosedNodes14=39,40,41,42,43,44
@@ -91,6 +91,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Principal,B4XPage_Created,236,0,C_Nota,Class_Globals,21,0,C_Nota,borra_Click,202,0,Subs,borraPedidoClienteActual,1405,0,C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Appear,288,0,C_Cliente,B4XPage_Created,297,0,C_Cliente,Initialize,287,0,C_Cliente,LBL_REGRESA_Click,2703,0,Subs,procesaPromocion,1175,0
+NavigationStack=C_NuevoCliente,GPS_LocationChanged,75,4,C_NuevoCliente,Class_Globals,24,6,C_NuevoCliente,B4XPage_Created,41,0,C_NuevoCliente,B4XPage_Appear,50,6,kms_helperSubs,traeUsarCartaPorte,655,0,Visual Designer,nuevocliente.bal,-100,2,kms_helperSubs,traeMaxClientesNuevos,659,0,B4XMainPage,Class_Globals,23,0,Visual Designer,login.bal,-100,6,B4XMainPage,B4XPage_CloseRequest,541,6,B4XMainPage,b_extras_Click,815,1
 SelectedBuild=0
-VisibleModules=1,28,11,24,3,29,14,12,7,13
+VisibleModules=1,28,11,24,3,29,14,12,9
diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas
index fc0fde1..2424d7e 100644
--- a/B4A/kms_helperSubs.bas
+++ b/B4A/kms_helperSubs.bas
@@ -658,9 +658,10 @@ Sub traeUsarCartaPorte As Boolean 'ignore
 	Return CP
 End Sub
 
-'Regresa los clientes nuevos maximos. 
+'Regresa los clientes nuevos maximos.
+'Si no está especificado, el default es 2.
 Sub traeMaxClientesNuevos As Int 'ignore
-	Private CN As Int = 0
+	Private CN As Int = 2
 	Private x As Cursor = Starter.skmt.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'MAXCTESNUEVOS'"$)
 	If x.RowCount > 0 Then
 		x.Position = 0