From fee8a83516ddb884f991ce2ace32a60c474967d4 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Sat, 5 Jul 2025 18:49:31 -0600 Subject: [PATCH] - VERSION 5.07.05 - Se copiaron y adaptaron queries de Guna. - Se agregaron tablas y columnas faltantes. - Se puso logo de Salma. - PARECE QUE YA ESTA FUNCIONANDO (DEDOS CRUZADOS)!! --- B4A/C_Cliente.bas | 32 ++++++++++++++++++++------------ B4A/C_Principal.bas | 2 +- B4A/C_Productos.bas | 5 +---- B4A/Files/cliente.bal | Bin 63537 -> 63537 bytes B4A/Salma_Venta.b4a.meta | 4 ++-- B4A/Subs.bas | 5 ++++- 6 files changed, 28 insertions(+), 20 deletions(-) diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 7dceaa2..58d16ce 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -528,6 +528,18 @@ Private Sub B4XPage_Created (Root1 As B4XView) cuest.Initialize(Me, "cuest", Root, B4XPages.MainPage.skmt) bitacora.Initialize("bitacora", "bitacora", Root, B4XPages.MainPage.skmt, reqManager) l_version.Left = Root.Width - l_version.Width + p_encuesta.Top = 0 : p_encuesta.Left = 0 + Panel10.Top = 0 : Panel10.Left = 0 + p_transparentePDF.Top = 0 : p_transparentePDF.Left = 0 + pnlPlanLealtad.Top = 0 : pnlPlanLealtad.Left = 0 + p_transparenteTicketImpreso.Top = 0 : p_transparenteTicketImpreso.Left = 0 + p_comentario.Top = 0 : p_comentario.Left = 0 + p_camara.Top = 0 : p_camara.Left = 0 + Panel2.Top = 0 : Panel2.Left = 0 + p_pregunta1.Top = 0 : p_pregunta1.Left = 0 + P_gallina.Top = 0 : P_gallina.Left = 0 + SV_ENCUESTA.Top = 0 : SV_ENCUESTA.Left = 0 + ' bitacora.cargamosPanel End Sub @@ -555,7 +567,7 @@ Sub B4XPage_Appear ' Log(Subs.traeCliente) If Subs.traeCliente = "0" Then tipo_venta = "ABORDO" - Log(1) +' Log(1) Log("ABORDO") Else tipo_venta = Subs.traeTipoVentaDeBD @@ -1566,7 +1578,6 @@ Sub ListView1_ItemLongClick (Position As Int, Value As Object) End Sub Sub gest_Click - Dim pagarepen As Cursor = B4XPages.MainPage.skmt.ExecQuery("select FECHA, SALDO_PENDIENTE FROM ABONOSP WHERE CLIENTE IN (SELECT CUENTA FROM CUENTAA)") If pagarepen.RowCount > 0 Then pagarepen.Position = 0 @@ -1596,11 +1607,8 @@ Sub gest_Click Else If DiferenciaDias > 7 Then MsgboxAsync($"No se puede realizar venta por que presenta ${(DiferenciaDias-7)} días de atraso en el credito, por un monto de $${pagarepen.GetString("SALDO_PENDIENTE")}"$, "Atención") End If - Else - gestionar - End If End Sub @@ -1613,12 +1621,12 @@ Sub gestionar Dim Intent1 As Intent Dim enviorutas As String = "" 'guna://tienda360/config?clienteId="&la_cuenta.Text&"&almacen="&ALMACEN&"&ruta="&Subs.traeRuta Log(enviorutas) - Intent1.Initialize(Intent1.ACTION_VIEW, enviorutas) +' Intent1.Initialize(Intent1.ACTION_VIEW, enviorutas) Try Starter.encuesta = 1 Dim cmd As DBCommand skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) - StartActivity(Intent1) +' StartActivity(Intent1) compra Catch Starter.encuesta = 0 @@ -1641,15 +1649,15 @@ Sub gestionar c=B4XPages.MainPage.skmt.ExecQuery("select IFNULL(encuesta,0) AS encuesta from kmt_info3 where CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)") c.Position = 0 If c.GetString("encuesta") = "0" Then - Dim Intent1 As Intent - Dim enviorutas As String = "" 'guna://tienda360/config?clienteId="&la_cuenta.Text&"&almacen="&ALMACEN&"&ruta="&Subs.traeRuta - Log(enviorutas) - Intent1.Initialize(Intent1.ACTION_VIEW, enviorutas) +' Dim Intent1 As Intent +' Dim enviorutas As String = "" 'guna://tienda360/config?clienteId="&la_cuenta.Text&"&almacen="&ALMACEN&"&ruta="&Subs.traeRuta +' Log(enviorutas) +' Intent1.Initialize(Intent1.ACTION_VIEW, enviorutas) Try Starter.encuesta = 1 Dim cmd As DBCommand skmt.ExecNonQuery2("UPDATE kmt_info3 SET encuesta = (?) WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA)",Array As Object(1)) - StartActivity(Intent1) +' StartActivity(Intent1) compra Catch Starter.encuesta = 0 diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index bf5a65a..f80134f 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -1107,7 +1107,7 @@ Sub cargar_Click B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "promoesp") End If - + cmd.Initialize cmd.Name = "select_cat_paquetess_SALMA2" cmd.Parameters = Array As Object(ALMACEN) diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index ddb9153..c590d43 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -949,7 +949,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) lv_tipo.Clear For i=0 To c.RowCount-1 c.Position=i - Log("ENTRE AQUI EN PROMOS create") +' Log("ENTRE AQUI EN PROMOS create") lv_tipo.AddSingleLine(c.GetString("CAT_GP_TIPO")) Next End If @@ -1080,9 +1080,6 @@ Sub B4XPage_Appear PCLV.B4XSeekBar1.mBase.Height=clv_prods_ll.AsView.Height PCLV.pnlOverlay.Height = clv_prods_ll.AsView.Height PCLV.B4XSeekBar1.Update - - - End Sub Sub PCLV_AddProds diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index 44587ee37c7ad1286fd3ac04f972c2c3faa2e29f..2c278e469420b5cea64fddbb5fa9b3e3efa321a1 100644 GIT binary patch delta 645 zcmZ9JPiPZS5XSetY?@>@nuvjFH4p_cO)S|qCB_t5X%TOsH$}14MiR(HC8ZU#&|bW0 zBp+BPSPh|;Uh3Ate+SVPJQ%2Wv4Yef>cK+|(NnfX>u$1%;OWhqZ{GaAnYUE2ELAM( zeZSPJZEx=r1cCXXbabNhR>J2~8Jun}%C^mhB;a9C!OIU4Hd7gV3>0}mqX)rB#*-TP zJGwdlrO{BRn@ist?RKKG(1yuSD=Nbh(hFr|l`yJZ@AxZ?is2yl#BG95Bd;+**l$=! zYUqm|CMB}PJly`jI$Nc_=s~`FvBgyE+p^z^*&+5fgNhO^13c5ZjayCs(*Q_v~( zO{Vp)^BT-W26lWeW_w(SO|)ae2c7b_hNBU#6JxZ#{6?1hMU(i4 zk-B=$#)lZW-p}pe{UWlt0jw`ypfg{q4sY{y(}DB1=^)Nc2jSd`4{E^y<%)-@KaNR% E0T++a#sB~S delta 617 zcmdn^fqCNx<_!xpxa5BS|1ZtJz`&?6*+AED^1X9hlOKc^Pma($#r+&E#V~ojw!!56 z*SRMDN-v&#OY0O<^Y6{ev>Om_*L8KxH_Xp!z<5^-cbe&NX?~Hu24St>!B*_D*gr)0mvFl52B+^gVVU zH(wvoyzImJ4ud&$_Gy@(t_ck7lZq?{4RqJhzvNlOb*r zRCJ+%;%33VWai0x&T~#)zn63J_OmLJHw5ql-EK5_!yEm{Qj?02j$W1P(BAUS!SHUDI*TFuFC+GIDsTk6LTQ@Gi0t0xbP z1GLz9^PPhyxnTmEx1S9|*d%{-Dlbe1q;&F~gNd7?9{=Ek337k<|NlSORzD`Ft;UlM TDNNq5m~*m0p~&VRZ!Nh1=;!ip diff --git a/B4A/Salma_Venta.b4a.meta b/B4A/Salma_Venta.b4a.meta index ea40b85..4558a07 100644 --- a/B4A/Salma_Venta.b4a.meta +++ b/B4A/Salma_Venta.b4a.meta @@ -79,6 +79,6 @@ ModuleClosedNodes6= ModuleClosedNodes7=6,8,9,10,11 ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Principal,inv_Click,2462,0,Starter,JobDone,145,0,Starter,ENVIA_ULTIMA_GPS,109,0,Starter,logcat_LogCatData,127,0,C_Principal,JobDone,1892,4,Diseñador Visual,login.bal,-100,6,Diseñador Visual,nuevocliente.bal,-100,6,Diseñador Visual,principal.bal,-100,6,Diseñador Visual,clientes.bal,-100,6,C_Principal,Subir_Click,677,0 +NavigationStack=C_Principal,cargar_Click,1033,0,C_Cliente,B4XPage_Appear,551,0,C_Cliente,Initialize,465,0,C_Cliente,B4XPage_Created,528,2,C_Cliente,JobDone,1470,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,b_geopass_Click,1435,0,C_Cliente,gest_Click,1604,0,C_Cliente,EnviarPDFWhatsAppNumero2,5820,0,C_Cliente,gestionar,1648,0 SelectedBuild=0 -VisibleModules=24,2,14,25,5,10,11,20,19,16 +VisibleModules=24,2,14,25,5,10,11,20,15 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 82cdf03..7c26fce 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1816,7 +1816,10 @@ End Sub Sub traeTablaProds(tipoventa As String) As String Log(tipoventa) Private tablaProds As String = "cat_gunaprod2" - If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then tablaProds = "cat_gunaprod" +' If tipoventa = "ABORDO" Or tipoventa = "PREVENTA" Then tablaProds = "cat_gunaprod" + + tablaProds = "cat_gunaprod" 'Salma solo maneja Preventa. + ' LogColor($"Tipo= ${tipoventa}, tabla=${tablaProds}"$, Colors.RGB(200,136,0)) Return tablaProds End Sub