From 1911003145cf72830d5e20f6dbac4fe302f2030e Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 8 Dec 2023 11:09:06 -0600 Subject: [PATCH] 8/12/23 - Cambios a poductos para que solo paarezca el mensaje del limite abordo cuando el cliete sea CERO --- B4A/C_Cliente.bas | 30 +++++++++++++++++++++++------- B4A/C_Clientes.bas | 1 + B4A/C_Productos.bas | 4 ++-- B4A/Files/cliente.bal | Bin 103996 -> 104329 bytes B4A/Files/principal.bal | Bin 69453 -> 69453 bytes B4A/KelloggsV4.b4a | 2 +- B4A/KelloggsV4.b4a.meta | 6 +++--- B4A/kms_helperSubs.bas | 6 +++--- 8 files changed, 33 insertions(+), 16 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index b5a2486..c1abc6f 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -293,6 +293,7 @@ Sub Class_Globals Private r_4 As RadioButton Private R_5 As RadioButton Private e_comm As EditText + Private p_infoGral2 As Panel End Sub 'You can add more parameters here. @@ -310,11 +311,10 @@ Private Sub B4XPage_Created (Root1 As B4XView) 'load the layout to Root Root.LoadLayout("cliente") ruta = File.DirInternal -' Subs.panelAnchoAlto(P_INF_GENERAL, Root.Width, Root.Height) -' Subs.centraPanel(P_INF_GENERAL, Root.Width) Panel6.Width = Root.Width p_promowhats.Width = Root.Width p_promowhats.visible = False + kh.centraPanel(p_infoGral2, Root.Width) If Starter.boleta = 0 Then c=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_RUTA, CAT_CL_NOMBRE, CAT_CL_ATIENDE1, CAT_CL_ATIENTE2,"& _ "CAT_CL_TELEFONO, CAT_CL_EMAIL, CAT_CL_CALLE, CAT_CL_NOEXT, CAT_CL_NOINT, CAT_CL_CALLE1, CAT_CL_CALLE2, "& _ @@ -398,7 +398,7 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear - clienteId = kh.traeCliente(Starter.skmt) + clienteId = kh.traeCliente P_DOE.Visible = False If clienteId.StartsWith("N") Then b_noVenta.Visible = False ' Log($"TOTAL VENTA: ${kh.traeTotalCliente}"$) @@ -417,8 +417,6 @@ Sub B4XPage_Appear reqManager.Initialize(Me, Starter.DBReqServer) usarGeocerca = kh.traeUsarGeocerca ' Log(Subs.traeUltimaActividadBD) -' P_INF_GENERAL.Height = Root.Height -' P_INF_GENERAL.Width = Root.Width c = Starter.skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP")) c.Position = 0 If c.RowCount > 0 Then @@ -772,14 +770,31 @@ Sub GPS_LocationChanged (Location1 As Location) Starter.lat_gps = "19.432568527069805" Starter.lon_gps = "-99.13335030112772" End If + + 'Revisamos si el cliente es candidato a la promo DOE + c=Starter.skmt.ExecQuery("select CAT_CL_EMAIL from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") + c.Position = 0 + If c.RowCount > 0 Then + gps_boton_doe = c.GetString("CAT_CL_EMAIL") + End If + ' gest.Visible = True ' gps_boton_doe ="1" ' LogColor($"Distancia actual: ${distance}"$, Colors.Blue) 'Si no estamos usando la geocerca o ya estanos dentro de la geocerca o el usuario es KMTS1 o es abordo ... If Not(usarGeocerca) Or dentroDeGeocerca Or usuario = "KMTSKLL1" Or la_cuenta.Text = "0" Then + Private x As Cursor = Starter.skmt.ExecQuery("select count(HIST_CLIENTE) as clienteConPromo from HIST_PROMO_WHATS where HIST_CLIENTE in (Select CUENTA from cuentaa)") + If x.RowCount > 0 Then + x.Position = 0 + clienteConPromo = x.GetString("clienteConPromo") +' Log($"${x.GetString("clienteConPromo")}"$) + End If ' If pgs_boton_noventa = "1" Then b_noVenta.Visible = True ' If gps_boton_doe ="1" Then b_whats.Visible = True + +' Log($"${gps_boton_doe}|${clienteConPromo}"$) + If gps_boton_doe = "1" And clienteConPromo = "0" Then b_whats.Visible = True If Not(clienteDeudor) Then B_VENTA.Visible = True 'Si el cliente no tiene adeudo, habilitamos el boton de venta pedido_doe_muestra @@ -1104,7 +1119,7 @@ Sub B_IMP2_Click 'printer.Initialize(cmp20.OutputStream) Printer1.Reset Dim bmp As Bitmap - bmp.InitializeResize(File.DirAssets, "kelloggs.png", 376, 129, True) 'ignore + bmp.InitializeResize(File.DirAssets, "kellanova_borde.png", 376, 129, True) 'ignore Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) myimage = Printer1.DitherImage2D(myimage, 128) myimage= Printer1.PackImage(myimage) @@ -1311,9 +1326,10 @@ Sub B_IMP2_Click s.Position = 0 Private sTotal2 As Double Log(sTotal2) + LogColor(s.GetString("TOTAL"),Colors.Magenta) If s.GetString("TOTAL") <> Null And IsNumber(s.GETSTRING("TOTAL")) Then sTotal2 = s.GetString("TOTAL") - sTotal2 = Subs.sumaPedido(Subs.traeCliente) +' sTotal2 = Subs.sumaPedido(Subs.traeCliente) Printer1.WriteString( $"Sub Total : $${NumberFormat2(sTotal2, 1, 2, 2, False)}"$ & CRLF) Else sTotal2 = 0 diff --git a/B4A/C_Clientes.bas b/B4A/C_Clientes.bas index 34a850a..2a940e6 100644 --- a/B4A/C_Clientes.bas +++ b/B4A/C_Clientes.bas @@ -147,6 +147,7 @@ Sub Activity_KeyPress (key As Int) As Boolean 'ignore End Sub Sub BUSCA_TextChanged (Old As String, New As String) + Log($"${Old}|${New}"$) q_buscar = "%" & busca.Text & "%" c2 = Starter.skmt.ExecQuery2("select CAT_CL_NOMBRE, CAT_CL_CALLE, CAT_CL_CODIGO from kmt_info where (CAT_CL_NOMBRE like ? OR CAT_CL_CODIGO LIKE ?) and CAT_CL_DIAS_VISITA = (SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?) and gestion = 0 order by CAT_CL_NOMBRE ", Array As String(q_buscar,q_buscar,"DIA_VISITA")) ListView1.Clear diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index 8cf1770..24139f2 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -748,7 +748,7 @@ Sub cuentaProds ' Log($"LIMITE ABORDO DISPONIBLE: ${NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False)}"$) dispAbordo = NumberFormat2((kh.traeLimiteAbordoWeb - (kh.traeLimiteAbordoXInventario - kh.traeVenta) - kh.traeVentaAbordo), 0, 2, 2, False) l_limiteAbordoDisp.Text = $"Disp Abordo: $${dispAbordo}"$ - If dispAbordo < 1 Then + If dispAbordo < 1 and kh.traeCliente = 0 Then b_continuar.Visible = False b_terminar1.Visible = False l_avisoAbordo.BringToFront @@ -1124,7 +1124,7 @@ Sub Busca_TextChanged (Old As String, New As String) forzarBusqueda = False If lfila.text = "PROMOCIONES" Then If Not(lv_promos.Visible) Then lv_promos.Visible = True - Private cPromo As Cursor=Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${query} where CAT_GP_NOMBRE like '%${New}%' and CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS' AND CAT_GP_TIPOPROD <> 1 and (length(CAT_GP_CODPROMO) = 1 OR CAT_GP_CODPROMO = CAT_GP_ID)"$) + Private cPromo As Cursor=Starter.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${query} where CAT_GP_NOMBRE like '%${New}%' and CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = 'PROMOS' AND CAT_GP_SUBTIPO = 'PROMOS' AND CAT_GP_TIPOPROD <> 1 and (length(CAT_GP_CODPROMO) = 1 OR CAT_GP_CODPROMO = CAT_GP_ID)"$) Log($"res:${cPromo.RowCount}"$) If cPromo.RowCount > 0 Then lv_promos.Clear diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 638ddbd3ddffdce20a8733f664fd23310dcd9b7f..72914a5c86e90cd02a11556eb5a65599d939ad5a 100644 GIT binary patch delta 3575 zcmZuz3s98T72dO<$o?X~t}6moC5VsU!m=o!C{N`j0apZ!qAUvv^8S%167Ug?22l~c z#$y_ZB#ki-6T+Y_O{@ux_-HI(I@1}gCU!E@iD`NCF`a2`$DaHD>J?Bf1|762K4LncfS9 z%mG>(q~}L^p3w6XJ%4c;|J7+cpOkMb2Rdx=kK;zdjF&Qk#C3^ zzU}t%U!r9Xg=wsI@lN(2?8V8>x(@2|)ia9BRTjy@Nk*F6J?WL3l)j3s)a#8ruq1PO zrb%9GIm^Q;GVd%ZE4CDu)l~D@;ltgN=(RpQD=^ixo~>9s-@tz-ne&pfauPX#Jn*JL z{dUXCbrwkqld4NOrpPSMFhRexyTIW6)I;@5rDEYJ^YCN{99Lgav#yp!?5iUotgXxo zO--OhNeddh7z#Sr%0ct+`%s!Vqo<{+9pJ;V^0X}BwhqI>U<+)++SxFji7yw3+d!o< zl1uLy^iQ)DJDMS!jY@h}nCHm`&+4oP43Gp+qF9Ws_Q%hrfR>$?wD@Bv_`p`yJFH`- zWG$3ph7m^aMmU5r(}rMiyDRgVA_&AaMiB5u1RTN#bu`)(3K1yjNaN!`(6G1^9h58T zzw-nQjW_RrL8!p}^C%!w9caV~7t(SJ41{PrUk5!W_vD2o@{HA&nXcR969e zdN2*2-w8d~zYKJY!{awVFwR|0!IUFMv4le5j6Zl`#V+_7YMi{+jN>Hl3HVVxti-2j zW8tvCBn_xAT!8r?IaMNeg`*OFXxa!q`1W$p=wc}CbLoK{#2v^7MYifjU_de$pjKh2 zN~Z8@T?9yYC>f$z=3OoJC&T+_j0GKbWWyvpkpfX7XLOXdmI@Go&1n#V;i+&FOXCTA zEFEI8C!RvDl|#p&c#0#Y8q)Dj8gycNB5k5yRY4jKCxRD0yu?X=@@7#?V3!rv0R7eD z$y_jr^{!rJTG(wpn87g(3Z}sgM*Rw4MR~lJg+CmW%=S<8u5qx*L0*@87<~thEyAuyiAt3+u+r^Vd1dNmvNqP&4t#Cg_9~2T{v7 zBH0^7C&PX4zcp0cip|7(ESm!OV*%-Xl>g8hc-^Tr$#5UJ;WmlcV6FIa~ ztGCfC5eu)&53958f( z?W-VIhlTWazC_3DtgAFDNucLezZ^>N?Q)(bqe9IN+a$eM4C2 z>&7y*06xOIdPrxpztv3NOD^P=T||RG(hoOS*Y96IaW#ity~Tz}CjE7*i=QO{rG+geb~6rk*_? z6OC;iFzwV&{`hP+rNj1p#<)g0RG&_8reopN!HA8pOgLq8^)B9TBv)VkLBOU2xZotd z(=MKJJWK4HK(_!7HPA6IECPe@HyfWK9otURZv0}^3YHM#hm|X#54v3Gx?Jh-WGqMy zmR==pZF(cteEQl~RD z+H2cAF8PXY{7g;X!p9mO#s>nSctBlSPU>u3(;{g&aEqpDW3X z*&Hi=J`N=JwJ&i0L4sXVV56%iv2&SP`CfL-9sJig`WnHn%XbYw-m&F_d3_vq)?s*r zbDQOzW@FT1^y{?QzI1_Jr|uO(_ed{nd7XM}-x2V|$Y$7#zAcpY>sGpE&IjmK)Q#QQ zD3dKj)ay#5^vmC1N(;13{+ia*w9zy-fYnBAhd!AA^N+$JHBA}%{KYm-`LHAykPoRR6K-l+>zY1mbB659gi~l1hl_O z-RU9YskHBjY#crX?a(i?QYQ#PDS|pqzZ)|30I)wbq~XYObnAY+TZ5&iVabH#4%+qE TlRM~!4DRvdX5*jVfV}?$Hm140 delta 3575 zcmZ`+dr*|u73a69$bJf+tQbWqu8KqfS$P^>B0j*CK!Fe)BM(u;2O?M~z6GaI(JDf2 z^ki&JP-AN11Cxziqhiu(5@WF7AN?caIHT=!rZ%yzZD%@3J5A5MyURY<{&By(-*?aX z-E)5ToO{k5=ncMpJ~(tlP*Bhh6M}*?{{6=Xp#z#&8Xs=^k5&!*(N;0~1+DEbyz-dG zUwOFa-+0Zx^_oBNn*WXGn|L(xc*^5B9zWvY@R~p4xm)J%Uf)A`E-k9rxW*PXKEi-| zwrPo-lJ{Z0g3jYB78OhX*q*O4V=r%e!DkLS^)bqJyRo3IMC zV)NCpqQM#|E^RZ>&PJH@S_B0p@m8b9@x!>9^1=~|HFT>H*0IvbXdXDnLX+jBip))z zAxcs;s!u|)c-m?b4+o6&NjxG@N8yt(O_T0M@G#a95^xG@)utIORr*?=z3K!WL{MQl zeoO-$2oZygG4}RZr~sAC#w@llMqlTvAdQQl5(`X*^$-_d$`oBo!|1#P?_z`8gdB;8 zq%rGZ6y}vt^j#9d*r>c^Fo)JNQaT$I`~yEkQtM37voeD812EF`BxKXMJ?N#bZMY9b z!6b5Q<|T79mQd~-7_~Tqi-Ahf*f2xrdo*!r`5CD(n(l5ym9~*LNRVDPPk zsTk*kizRa;OjI(1F^kv2qR9|Z%zjIc>hVw>(L^#&$12*Ah6pjQd#V_m7e%+z*aI(v z&`7geVO1vKJYCv~B=KohuSXqC%tIRM8b#=CBSmk8QE&1g(RIR`6_6&wU)kXVBg-UA z5nZ`4GIl6@3qGTi%prTcFn<~VlPb1ii3jl;r+H)6Y2ww?GaeJ^a+U{?{`CU$5}fUJ zGZrmg9y%dtcZ>6EtP&(e`ic_N%?VD7;lkS6a5(PmW(G+NdYvv(aLFJUbsP? zqm{PTG5S_F`ZluHp+J}Ke!$KU#P&ewa}>G=&rhW=4r==PMOd&yB?cvA@bN!CA7K=h zz+S(Sfmm%Q#pcl73|z!c701>27)iyMNY{7zY`=p_S97Spb=XM3Sxid70?voR9OTfO z3z)(kG$j{i`eFg27i7ahUoLd5k8g9~jN&BbGY<+<>F!dnE@Fk|Wqfb!%Efpx&1LAq zd{nyuzsl$Jmvb5LZh_}((PIAESdKWAg>Bi=xjfeVi50oDPukF9^%yl^+Tr!-eAa>-m< z&Gg2VpchBg_Kju8(U1D>OiG10c2Ip4qa80}wChzKv?pb7fc(s-Kp=dq4ti3}oNyGz zka-y+&0VRG_&QCdXRq*jV+}`_J5*glpVmkrI}1$(j=Q(Y(U1G>B2O5cph!DY%RKP|WA4xCn!GF|o4enJZR9lN7O2G|)TH)1u* zo$-~kbNX{^#Wyfl`)hgqUEg(;|M)fivlg8~yRV7<@@#o&hKQ~8vnAwV0ZlJrzdQ!3n(#pjwiPK1j}5NS0QP^Zo|!vRptTHX(__tTc6@tB;DJ?bBew z2V`u<2AaQ1uJ?|=`7<2tK^7_-?#qgwEymd+xo)V@PSEl854Q_U{a!=|c( z=*c%4Y!E&5(PRmMNetGRap!+E58xrjzX`(J%WL zU~{%{zfrZ+-n0jGfL#jCRRveK2a>+xth_93q~4$71U{y`nS5mKeoFt?PfG>uRl55c zp5mH{*}=UWlh*=>8LmTguW{bxs_8nik2mOZ*2R+j9BzGnTI=@X0dBZaDW-I1MwY{{UY+ea=MrEs0;C zQ~MpGa(fqKyh+cFVm)q2zb8`fAxyzdx_1Z@^;>=$E7w1xN5@b`4Tq6E4CC|R7@r5i z_<~M%1~B3FaP`}P)W4+ot^n$HhSZ}*Vyx3O<;R^sAYa*S-JH_s_ll5yKSA}kz&k>+ z-eA^O31=2~nr{8BpQ5@Aey>iS2FG!CF?lb?*GEUW)$-?kV94qr-UkApVNmjZ_J79% BpuzwE diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index db533e6e28547c7da8faf795f696a251cc299380..349b85ea312da71f3ed8ab9e7459b5aaee1a93ad 100644 GIT binary patch delta 314 zcmX>*kLBz`yAz* ze0}E9X^m!=?EcC+l1>m>fGFA+NmvNnQsce}4f&e(l0aE)GT%;}aJlr1ck9 za>J#e#y?(+kl(ljNgiVS=G3L`jEp^#A0E?~{Glv+vcvK_P+md>I7B9ISOFE;ymjS_ FQ~>T+cpCr! delta 267 zcmX>*kLBzQK6Jy!tnC?bKAa$?j1J~rcJ)D!T zPv0?Fe!AJ@qcbWQn>O3eG++X8H!q#-!#G)?-)yq_+{)?i_!v1EKTN(m$#C-Rxii4R zE9XIknfMqd-8*CZRa&7CscraIeEhhFn{ybl`~QS D4>4}0 diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index b1d9e46..2756fbf 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.12.05 PRUEBA V4 + #VersionName: 3.12.08 P-V4 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index ca81f34..4e9a1f4 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -83,7 +83,7 @@ ModuleClosedNodes26=2 ModuleClosedNodes27= ModuleClosedNodes28=9,10,11 ModuleClosedNodes29= -ModuleClosedNodes3=24,86,100 +ModuleClosedNodes3=86 ModuleClosedNodes30= ModuleClosedNodes4= ModuleClosedNodes5= @@ -91,6 +91,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=3,11,12,14 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,b_prodMas_Click,611,0,C_Productos,cuentaProds,754,0,C_Cliente,B4XPage_Appear,591,0,C_Nota,B4XPage_Created,89,0,C_Nota,B4XPage_Appear,146,0,Subs,borraPedidoClienteActual,1406,6,Visual Designer,cliente.bal,-100,4,C_Cliente,JobDone,3895,0,C_Cliente,b_geopass_Click,3853,2,C_Cliente,b_rechazapromo_Click,3849,0,C_Cliente,b_aceptarrpomo_Click,3842,0 +NavigationStack=Visual Designer,principal.bal,-100,6,C_Cliente,B4XPage_Created,304,4,C_Cliente,Initialize,298,0,Visual Designer,cliente.bal,-100,6,Visual Designer,productos.bal,-100,1,C_Principal,e_ruta_EnterPressed,2045,0,kms_helperSubs,traeCliente,615,0,kms_helperSubs,hayPedido,696,0,C_Cliente,B4XPage_Appear,394,0,C_Productos,cuentaProds,744,5 SelectedBuild=0 -VisibleModules=1,28,11,24,3,12,7,29 +VisibleModules=1,28,11,24,3,12,7,4,29 diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas index f872a83..7b43283 100644 --- a/B4A/kms_helperSubs.bas +++ b/B4A/kms_helperSubs.bas @@ -616,10 +616,10 @@ Sub traeRuta(db As SQL) As String 'ignore End Sub 'Regresa el cliente actual de la base de dtos (CUENTAA). -Sub traeCliente(db As SQL) As String 'ignore +Sub traeCliente As String 'ignore Private c As Cursor Private cl As String - c = db.ExecQuery("Select CUENTA from cuentaa") + c = khdb.ExecQuery("Select CUENTA from cuentaa") c.Position=0 cl = c.GetString("CUENTA") c.Close @@ -700,7 +700,7 @@ End Sub 'Regresa verdadero si hay pedido en la tabla "PEDIDO" del cliente actual. Sub hayPedido(db As SQL) As Boolean 'ignore - Private thisC As Cursor = skmt.ExecQuery($"select count(PE_CLIENTE) as hayPedido from PEDIDO where PE_CLIENTE = '${traeCliente(db)}'"$) + Private thisC As Cursor = skmt.ExecQuery($"select count(PE_CLIENTE) as hayPedido from PEDIDO where PE_CLIENTE = '${traeCliente}'"$) thisC.Position = 0 Private hay As Boolean = False If thisC.GetInt("hayPedido") > 0 Then hay = True