diff --git a/B4A/ADM.b4a b/B4A/ADM.b4a index ebce653..6826955 100644 --- a/B4A/ADM.b4a +++ b/B4A/ADM.b4a @@ -1121,7 +1121,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: ADM #VersionCode: 1 - #VersionName: 6.01.05 + #VersionName: 6.01.10 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/ADM.b4a.meta b/B4A/ADM.b4a.meta index b9abaea..5972032 100644 --- a/B4A/ADM.b4a.meta +++ b/B4A/ADM.b4a.meta @@ -68,9 +68,9 @@ ModuleClosedNodes0= ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= -ModuleClosedNodes12= +ModuleClosedNodes12=3 ModuleClosedNodes13= -ModuleClosedNodes14=16 +ModuleClosedNodes14=4,5,16 ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= @@ -88,15 +88,15 @@ ModuleClosedNodes27= ModuleClosedNodes28= ModuleClosedNodes29= ModuleClosedNodes3= -ModuleClosedNodes30=2,3,4,5,6,7,8,9,10,11,12,14 +ModuleClosedNodes30=2,3,4,5,6,7,8,9,11,12,14 ModuleClosedNodes31= -ModuleClosedNodes32=15,16,17,18,19 +ModuleClosedNodes32=16,17,18,19 ModuleClosedNodes4= ModuleClosedNodes5=2 ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Diseñador Visual,login.bal,-100,1,C_NuevoCliente,Class_Globals,41,0,C_NuevoCliente,Initialize,46,0,C_NuevoCliente,B4XPage_Created,77,0,C_NuevoCliente,p_nuevoCliente_Click,248,0,C_NuevoCliente,GUARDA_Click,218,0,Starter,mandaForma,195,0,C_Cliente,MODS,0,0,C_Cliente,Initialize,181,0,C_Cliente,Class_Globals,178,0,C_Cliente,Camera1_PictureTaken,2928,6 +NavigationStack=C_Cliente,B4XPage_Created,186,0,C_Cliente,B4XPage_Appear,434,0,C_Cliente,imprime_venta,1794,0,C_Cliente,savePDF,1756,0,C_Cliente,openPDF,1777,0,C_TicketsDia,B4XPage_Appear,59,6,Diseñador Visual,resdia.bal,-100,2,Diseñador Visual,principal.bal,-100,3,C_Principal,B_MARCAS_Click,2692,6,C_Principal,B_OK_COMISS_Click,2688,0,C_Cliente,imprime_preventa,1255,1 SelectedBuild=0 -VisibleModules=2,14,30,12,11,5,6,32,31,18 +VisibleModules=2,14,30,12,5,6,32,31,19,15 diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index 66572f4..407f7df 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -228,6 +228,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) Subs.agregaColumna("CAT_GUNAPROD2", "CAT_DP_PRECIO4", "TEXT") Subs.agregaColumna("CAT_GUNAPROD", "CAT_DP_PRECIO4", "TEXT") Subs.agregaColumna("CLIENTES_NUEVOS", "CN_SOLICITA", "TEXT") + Subs.agregaColumna("CLIENTES_NUEVOS", "CN_COMENTARIO", "TEXT") c=skmt.ExecQuery("select COUNT(*) AS CUANTOS from HIST_STAY_OUT ") C.Position = 0 If c.GetString("CUANTOS") = 0 Then diff --git a/B4A/C_BItacora.bas b/B4A/C_BItacora.bas index d740dc6..061d2b9 100644 --- a/B4A/C_BItacora.bas +++ b/B4A/C_BItacora.bas @@ -65,7 +65,7 @@ Sub mandaBitacora(fechab As String, usuariob As String, almacenb As String, ruta e.Position = 0 Log("ACTUALIZA BITACORA") If eventob = "Termina Venta" Then - db.ExecNonQuery($"update BITACORAGPS set finb = '${finb}' where rutab = '${rutab}' and almacenb = '${almacenb}' and usuariob = '${usuariob}' and clienteb = '${clienteb}' and fechab = '${e.GetString("fechab")}' "$) + db.ExecNonQuery($"update BITACORAGPS set finb = '${finb}', latitudb = '${latitudb}', longitudb = '${longitudb}' where rutab = '${rutab}' and almacenb = '${almacenb}' and usuariob = '${usuariob}' and clienteb = '${clienteb}' and fechab = '${e.GetString("fechab")}' "$) cmd.Parameters = Array As Object(finb, rutab, almacenb, usuariob, clienteb, "Inicia Venta", e.GetString("fechab")) else if eventob = "No Venta" Then Log("-- NV") @@ -130,6 +130,8 @@ Sub inicioFin End Sub Private Sub b_Inicio_Fin_venta2_Click + Log("INICIO/FIN CLICKED") + Log(B4XPages.MainPage.lat_gps & "," & B4XPages.MainPage.lon_gps) ' b_Inicio_Fin_venta.Visible = False ' Subs.bitacora(Subs.fechanormal(DateTime.Now), usuario, Subs.traeAlmacen, Subs.traeRuta, "Pre-venta", "0", Subs.fechanormal(DateTime.Now), Subs.fechanormal(DateTime.Now), B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps, precision, "", "") contadorIniciarVenta = 0 diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index a5c53ea..cb2a2c5 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -299,7 +299,6 @@ Sub B4XPage_Appear Else b_cxc.Visible = True End If - If la_cuenta.Text = "0" Or la_cuenta.Text = "1" Then p_cbFactura.Visible = False l_factura.Visible = False @@ -410,8 +409,8 @@ Sub B4XPage_Appear CallSubDelayed(Tracker, "Track") CallSubDelayed(Tracker, "StartFLPSmall") If Tracker.FLP.IsInitialized And Tracker.FLP.GetLastKnownLocation.IsInitialized Then 'Si tenemos "UltimaUbicaccionConocida" la usamos. - B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude - B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude +' B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude +' B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude ' Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$) GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation) End If @@ -437,9 +436,6 @@ Sub B4XPage_Appear ' gest.Visible = False ' b_ventaabordo.Visible = False - - - c = skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MACIMP")) If c.RowCount > 0 Then c.Position = 0 @@ -455,11 +451,8 @@ Sub B4XPage_Appear Else Printer1.DisConnect Printer1.Connect - Log("2") End If - - pre_act = Subs.traeTotalClientepreventaparacredito 'SELECT CAT_CL_BCREDITO, CAT_CL_CODIGO, Ifnull(SALDO_PENDIENTE,0) FROM KMT_INFO INNER JOIN ABONOSP ON CAT_CL_CODIGO = CLIENTE WHERE CAT_CL_CODIGO IN (SELECT CUENTA FROM CUENTAA) @@ -516,11 +509,14 @@ End Sub Sub GPS_LocationChanged (Location1 As Location) ' LogColor($"Entrando a Cliente.GPS_LocationChanged"$, Colors.red) - If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then - B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude - B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude -' Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps) - End If +' If Tracker.FLP.GetLastKnownLocation.IsInitialized And Tracker.FLP.GetLastKnownLocation.Latitude <> 0 Then +' B4XPages.MainPage.lat_gps = Tracker.FLP.GetLastKnownLocation.Latitude +' B4XPages.MainPage.lon_gps = Tracker.FLP.GetLastKnownLocation.Longitude +'' Log("Coords set to: " & B4XPages.MainPage.lat_gps & " and " & B4XPages.MainPage.lon_gps) +' End If + + B4XPages.MainPage.lat_gps = Location1.Latitude + B4XPages.MainPage.lon_gps = Location1.Longitude ' ToastMessageShow(B4XPages.MainPage.lat_gps,False) @@ -531,6 +527,7 @@ Sub GPS_LocationChanged (Location1 As Location) If BT_QR.IsInitialized Then BT_QR.Enabled = True If LA_GPS.IsInitialized Then LA_GPS.TextColor = Colors.Blue + Log("CON UBICACION: " & Location1.Latitude & "," & Location1.Longitude) If LA_GPS.IsInitialized Then LA_GPS.Text = "CON UBICACION GPS" ' B_GPS.Enabled = True 'now we need the distance between our location and the target location @@ -540,7 +537,7 @@ Sub GPS_LocationChanged (Location1 As Location) If LA_GEO.IsInitialized Then LA_GEO.TextColor = Colors.Blue Tels.Visible = True gest.Visible = True - b_ventaabordo.Visible = True +' b_ventaabordo.Visible = True bitacora.banderaGeoCerca = "1" Else Tels.Visible = False @@ -898,7 +895,7 @@ Sub GUADAVENTA2 b_cxc.Enabled = True Tar.Enabled = True Tels.Enabled = True - b_ventaabordo.Enabled = True +' b_ventaabordo.Enabled = True HIST.Enabled = True banderaimp = 0 ' B4XPages.ShowPage("Principal") @@ -1104,7 +1101,7 @@ Sub imprime_preventa Sleep(500) impresoraConectada = False End If - + TAMANO = 0 ESPACIO = 22 BLANCO = " " @@ -1113,18 +1110,16 @@ Sub imprime_preventa ' Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) ' myimage = Printer1.DitherImage2D(myimage, 128) -' + ' myimage= Printer1.PackImage(myimage) ' Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening ' Printer1.WriteString(Printer1.REVERSE) -' ' Printer1.PrintImage(myimage) ' Printer1.WriteString(Printer1.UNREVERSE) - ' Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) ' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("ADM Distribuciones" & CRLF) + Printer1.WriteString("ADM" & CRLF) ' Printer1.WriteString(sucursal & CRLF) Printer1.WriteString(sDate & CRLF) Printer1.WriteString(sTime & CRLF) @@ -1140,10 +1135,10 @@ Sub imprime_preventa c = skmt.ExecQuery2("SELECT * FROM PEDIDO WHERE PE_FOLIO = ?",Array As String("PREVENTA")) If c.RowCount > 0 Then Printer1.WriteString("-----------PREVENTA-----------" & CRLF) - + ' Printer1.WriteString("--------------------------------" & CRLF) Printer1.WriteString("Cant. Precio Importe" & CRLF) - + Printer1.WriteString("------------------------------" & CRLF) ' aqui es donde esta el pedo de julieta de los descuentos quitar el precio2 pero meter un if para saber si es ruta especial o es normal o que show. s=skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU,PE_CANT * PE_COSTOU AS PE_COSTO_TOT, length(PE_CANT * PE_COSTOU) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_FOLIO = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA")) @@ -1152,15 +1147,13 @@ Sub imprime_preventa S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - Else - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) LogColor(s.GetLong("L_CANT"),Colors.Magenta) LogColor(s.GetLong("L_COSTOU"),Colors.Magenta) LogColor(s.GetLong("L_COSTO_TOT"),Colors.Magenta) TAMANO = s.GetLong("L_CANT") + TAMANO - + If s.GetLong("L_COSTOU") = 1 Then TAMANO = s.GetLong("L_COSTOU") + TAMANO + 4 Else If s.GetLong("L_COSTOU") = 2 Then @@ -1172,7 +1165,7 @@ Sub imprime_preventa Else TAMANO = s.GetLong("L_COSTOU") + TAMANO End If - + ' If s.GetLong("L_COSTOU") = 1 Then ' TAMANO = s.GetLong("L_COSTOU") + TAMANO + 3 ' Else If s.GetLong("L_COSTOU") = 2 Then @@ -1182,7 +1175,7 @@ Sub imprime_preventa ' Else ' TAMANO = s.GetLong("L_COSTOU") + TAMANO ' End If -' + ' If s.GetLong("L_COSTO_TOT") = 1 Then ' TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO + 5 ' Else If s.GetLong("L_COSTO_TOT") = 2 Then @@ -1208,18 +1201,18 @@ Sub imprime_preventa Else TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO End If - + ESPACIO = ESPACIO - TAMANO - + For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next Printer1.Justify = 0 - Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) + Printer1.WriteString(s.GETSTRING("PE_CANT")& BLANCO) Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) + Printer1.WriteString(NumberFormat2(s.GETSTRING("PE_COSTOU"),1,2,2,True) & BLANCO) Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(NumberFormat2(s.GETSTRING("PE_COSTO_TOT"),1,2,2,True) & CRLF ) TAMANO = 0 ESPACIO = 22 BLANCO = " " @@ -1239,7 +1232,6 @@ Sub imprime_preventa S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - Else TAMANO = 0 Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) @@ -1267,9 +1259,9 @@ Sub imprime_preventa Else TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO End If - + ESPACIO = ESPACIO - TAMANO - + For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next @@ -1277,9 +1269,9 @@ Sub imprime_preventa Printer1.Justify = 0 Printer1.WriteString( s.GETSTRING("PE_CANT")& BLANCO) Printer1.Justify = 1 - Printer1.WriteString(s.GETSTRING("PE_COSTOU")& BLANCO) + Printer1.WriteString(NumberFormat2(s.GETSTRING("PE_COSTOU"),1,2,2,True) & BLANCO) Printer1.Justify = 2 - Printer1.WriteString(s.GETSTRING("PE_COSTO_TOT") & CRLF ) + Printer1.WriteString(NumberFormat2(s.GETSTRING("PE_COSTO_TOT"),1,2,2,True) & CRLF ) TAMANO = 0 ESPACIO = 22 BLANCO = " " @@ -1382,7 +1374,7 @@ Private Sub Label20_LongClick PDF.outImage(xui.DefaultFolder,"mariana1.jpg",1,pagina-55,70,0) multiplicador = multiplicador +1 - PDF.outtext(1,pagina-multiplicador*6,"ADM Distribuciones") + PDF.outtext(1,pagina-multiplicador*6,"ADM") multiplicador = multiplicador +1 PDF.outtext(1,pagina-multiplicador*6,sDate& " " & sTime) @@ -1566,7 +1558,7 @@ Private Sub PDFGENERAR PDF.outImage(xui.DefaultFolder,"mariana1.jpg",1,pagina-55,70,0) multiplicador = multiplicador +1 - PDF.outtext(1,pagina-multiplicador*6,"ADM Distribuciones") + PDF.outtext(1,pagina-multiplicador*6,"ADM") multiplicador = multiplicador +1 PDF.outtext(1,pagina-multiplicador*6,sDate& " " & sTime) @@ -1789,7 +1781,6 @@ private Sub openPDF(afile As String) #End If End Sub - Sub imprime_venta c=skmt.ExecQuery("select USUARIO from usuarioa") c.Position=0 @@ -1852,7 +1843,7 @@ Sub imprime_venta ' Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) ' Printer1.WriteString("DISTRIBUIDORA ROCHA TULA PACHUCA" & CRLF) - Printer1.WriteString("ADM Distribuciones" & CRLF) + Printer1.WriteString("ADM" & CRLF) ' Printer1.WriteString(sucursal & CRLF) Printer1.WriteString(sDate & CRLF) Printer1.WriteString(sTime & CRLF) @@ -3168,7 +3159,7 @@ Private Sub b_acept_tp_Click b_cxc.Enabled = True Tar.Enabled = True Tels.Enabled = True - b_ventaabordo.Enabled = True +' b_ventaabordo.Enabled = True HIST.Enabled = True banderaimp = 1 diff --git a/B4A/C_NoVenta.bas b/B4A/C_NoVenta.bas index ea34c59..1e1a4fa 100644 --- a/B4A/C_NoVenta.bas +++ b/B4A/C_NoVenta.bas @@ -31,6 +31,9 @@ Sub Class_Globals Private stay_mi As String Private stay_ss As String Dim bitacora As C_BItacora + Private r_5 As RadioButton + Private r_6 As RadioButton + Private r_7 As RadioButton End Sub 'You can add more parameters here. @@ -66,6 +69,9 @@ Sub B4XPage_Appear r_2.Checked = False r_3.Checked = False r_4.Checked = False + r_5.Checked = False + r_6.Checked = False + r_7.Checked = False e_comm.Text = "" End Sub @@ -79,13 +85,19 @@ Sub CANCELA_Click End Sub Sub GUARDA_Click If r_1.Checked Then - motivo = "CERRADO" + motivo = r_1.Text.ToUpperCase Else If r_2.Checked Then - motivo = "NO COMPRA" + motivo = r_2.Text.ToUpperCase Else If r_3.Checked Then - motivo = "CON PRODUCTO" - Else - motivo = "NO ESTA EL ENCARGADO" + motivo = r_3.Text.ToUpperCase + Else If r_4.Checked Then + motivo = r_4.Text.ToUpperCase + Else If r_5.Checked Then + motivo = r_5.Text.ToUpperCase + Else If r_6.Checked Then + motivo = r_6.Text.ToUpperCase + Else If r_7.Checked Then + motivo = r_7.Text.ToUpperCase End If DateTime.DateFormat = "MM/dd/yyyy" sDate=DateTime.Date(DateTime.Now) diff --git a/B4A/C_Nota.bas b/B4A/C_Nota.bas index 05be972..9f9110b 100644 --- a/B4A/C_Nota.bas +++ b/B4A/C_Nota.bas @@ -77,6 +77,7 @@ Sub B4XPage_Appear Existe = C.GetString("EXISTE") C.Close c=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_PRONOMBRE") +' ListView1. ListView1.Clear vamoaver.Initialize Private cs As CSBuilder @@ -104,7 +105,7 @@ Sub B4XPage_Appear label2 = ListView1.TwoLinesLayout.SecondLabel label2.TextSize = 10 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(cs.Color(textColor).append(c.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c.GetString("PE_CANT")& " SubTotal $"& c.GetString("PE_COSTO_TOT")& " Folio "& c.GetString("PE_FOLIO")) + ListView1.AddTwoLines(cs.Color(textColor).append(c.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c.GetString("PE_CANT")& " Monto preventa $"& c.GetString("PE_COSTO_TOT")) folio = c.GetString("PE_FOLIO") vamoaver.Add(c.GetString("PE_FOLIO")) Next diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas index d0be6f4..695e7c9 100644 --- a/B4A/C_NuevoCliente.bas +++ b/B4A/C_NuevoCliente.bas @@ -44,6 +44,7 @@ Sub Class_Globals Private ET_Atiende As EditText Dim bitacora As C_BItacora Dim reqManager As DBRequestManager + Private et_comentarios As EditText End Sub 'You can add more parameters here. @@ -98,6 +99,7 @@ Sub B4XPage_Appear et_direccion.Text = "" E_NOMBRE.Text = "" ET_Atiende.Text = "" + et_comentarios.Text = "" If Not(Starter.gps.GPSEnabled) Then ToastMessageShow("Es necesario tener el GPS encendido", True) StartActivity(Starter.gps.LocationSettingsIntent) @@ -114,6 +116,7 @@ Sub B4XPage_Appear Subs.centraPanel(p_botones, Root.Width) E_NOMBRE.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2) et_direccion.Left = Round(Root.Width/2)-(E_NOMBRE.Width/2) + et_comentarios.Left = Round(Root.Width/2)-(et_comentarios.Width/2) If B4XPages.MainPage.lat_gps <> "0.0" Then GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar. l_sinUbicacion.Visible = True @@ -153,14 +156,13 @@ End Sub Sub GPS_LocationChanged (Location1 As Location) If B4XPages.MainPage.lat_gps <> "0.0" Then - Log("-- LOC CHANGED") +' Log("-- LOC CHANGED") GUARDA.Visible = True 'Si hay ubicaccion, mostramos el boton de guardar. l_sinUbicacion.Visible = True lat = Location1.Latitude lon = Location1.Longitude l_sinUbicacion.Text = ("Latitud: " & lat & ", Longitud: "& lon) End If - b_ubicacion.TextSize = 13 b_ubicacion.Text = $"Precisión GPS $1.0{Location1.Accuracy} m"$ If Location1.Accuracy > 200 Then @@ -168,7 +170,7 @@ Sub GPS_LocationChanged (Location1 As Location) b_ubicacion.TextSize = 16 b_ubicacion.Text = $"Mala señal $1.0{Location1.Accuracy} m"$ End If - Log("Latitud: " & lat & " - " & "Longuitud: " & lon) +' Log("Latitud: " & lat & " - " & "Longuitud: " & lon) End Sub Sub CANCELA_Click @@ -228,7 +230,7 @@ Sub GUARDA_Click sDate2 = DateTime.Date(DateTime.Now) sTime2 = DateTime.Time(DateTime.Now) - Starter.skmt.ExecNonQuery2("INSERT INTO CLIENTES_NUEVOS(CN_ID, CN_FECHA, CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_RUTA, CN_GIRO, CN_SOLICITA) VALUES (?,?,?,?,?,?,?,?,?,?,?)", Array As String(no_cliente, sDate2 &" "&sTime2, usuario, lat, lon, E_NOMBRE.Text, et_direccion.Text, ALMACEN, no_ruta, cb_giro.SelectedItem, ET_Atiende.Text)) + Starter.skmt.ExecNonQuery2("INSERT INTO CLIENTES_NUEVOS(CN_ID, CN_FECHA, CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_RUTA, CN_GIRO, CN_SOLICITA, CN_COMENTARIO) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)", Array As String(no_cliente, sDate2 &" "&sTime2, usuario, lat, lon, E_NOMBRE.Text, et_direccion.Text, ALMACEN, no_ruta, cb_giro.SelectedItem, ET_Atiende.Text, et_comentarios.text)) ' fototomada = "0" B4XPages.ShowPage("Cliente") Log("-- XX") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index e4c6c65..0fd93cb 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -199,7 +199,7 @@ Sub Class_Globals Private xui As XUI Type TitleData (Title As String) Private B_MARCAS As Button - Private Panel5 As Panel + Private p_marcas As Panel Private lblTitle As Label Private B_OK_PANEL5 As Button Private p_principal As Panel @@ -223,6 +223,7 @@ Sub Class_Globals Dim q_buscar As String Private et_buspc As EditText Dim bitacora As C_BItacora + Private l_Version As Label End Sub 'You can add more parameters here. @@ -245,6 +246,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If + SCROLL_RESDIA.Height = Root.Height - 10dip DateTime.DateFormat = "MM/dd/yyyy" fecha=DateTime.Date(DateTime.Now) B4XPages.MainPage.skmt.Initialize(ruta,"kmt.db", True) @@ -255,6 +257,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) d=B4XPages.MainPage.skmt.ExecQuery("select count(*) as TOTAL_VISITAR from kmt_info where gestion = 0") d.Position=0 e=B4XPages.MainPage.skmt.ExecQuery("select count(*) as POR_VISITAR from kmt_info") + l_Version.Left = Root.Width - l_Version.Width - 5dip + l_Version.text = Application.VersionName e.Position=0 ' f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info") ' f.Position=0 @@ -670,7 +674,7 @@ Sub Subir_Click Dim Dir2 As String Dir = "/promotoriakmts" - c=Starter.skmt.ExecQuery("SELECT CN_ID, CN_FECHA , CN_USER, CN_LAT, CN_LON, CN_NOMBRE, CN_DIRECCION, CN_FOTO, CN_ALMACEN, CN_RUTA, CN_GIRO, CN_SOLICITA FROM CLIENTES_NUEVOS") + c=Starter.skmt.ExecQuery("SELECT * FROM CLIENTES_NUEVOS") If c.RowCount>0 Then For i = 0 To c.RowCount - 1 c.Position = i @@ -691,7 +695,7 @@ Sub Subir_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "insert_clientesnuevos_ADM3" - cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), "En espera",c.GetString("CN_GIRO"),dialetra, c.GetString("CN_SOLICITA")) + cmd.Parameters = Array As Object(c.GetString("CN_ID"), c.GetString("CN_FECHA"), c.GetString("CN_USER"), c.GetString("CN_LAT"), c.GetString("CN_LON"), c.GetString("CN_NOMBRE"), c.GetString("CN_DIRECCION"),ALMACEN, c.GetString("CN_RUTA"), "En espera",c.GetString("CN_GIRO"),dialetra, c.GetString("CN_SOLICITA"), c.GetString("CN_COMENTARIO")) reqManager.ExecuteCommand(cmd , "inst_clientesn") Next End If @@ -955,7 +959,6 @@ Sub cargar_Click If E_RUTA2.Text <> "" Then B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO RUTA_SUPLENCIA(RS_RUTA) VALUES(?)",Array As String(E_RUTA2.Text)) - E_RUTA2.Text = "" End If c = B4XPages.MainPage.skmt.ExecQuery2("select count(CAT_VA_DESCRIPCION) as HoraIngreso from cat_variables where CAT_VA_DESCRIPCION = ? ", Array As String("HoraIngreso")) @@ -1023,7 +1026,7 @@ Sub cargar_Click reqManager.ExecuteQuery(cmd , 0, "detallepaq") cmd.Initialize - cmd.Name = "select_cat_clientes_ADM3" + cmd.Name = "select_cat_clientes2_ADM3" cmd.Parameters = Array As Object(e_ruta.text, ALMACEN) reqManager.ExecuteQuery(cmd , 0, "kmt_datos") @@ -1068,8 +1071,11 @@ Sub cargar_Click cmd.Initialize cmd.Name = "select_cat_clientes_ADM3" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) - reqManager.ExecuteQuery(cmd , 0, "kmt_datos") - + reqManager.ExecuteQuery(cmd , 0, "kmt_datos_sup") + Log("====== PEDIMOS RUTA SUPLENCIA - " & E_RUTA2.text & "|" & ALMACEN) + + E_RUTA2.Text = "" + cmd.Initialize cmd.Name = "select_cat_clientes_todos_ADM3" cmd.Parameters = Array As Object(E_RUTA2.text, ALMACEN) @@ -1247,6 +1253,52 @@ Sub JobDone(Job As HttpJob) For Each records() As Object In RESULT.Rows Dim CAT_CL_CODIGO As String = records(RESULT.Columns.Get("CAT_CL_CODIGO")) Dim CAT_CL_RUTA As String = records(RESULT.Columns.Get("CAT_CL_RUTA")) + Log("-" &CAT_CL_RUTA) + Dim CAT_CL_NOMBRE As String = records(RESULT.Columns.Get("CAT_CL_NOMBRE")) + Dim CAT_CL_ATIENDE1 As String = records(RESULT.Columns.Get("CAT_CL_ATIENDE1")) + Dim CAT_CL_ATIENTE2 As String = records(RESULT.Columns.Get("CAT_CL_ATIENTE2")) + Dim CAT_CL_TELEFONO As String = records(RESULT.Columns.Get("CAT_CL_TELEFONO")) + Dim CAT_CL_EMAIL As String = records(RESULT.Columns.Get("CAT_CL_EMAIL")) + Dim CAT_CL_CALLE As String = records(RESULT.Columns.Get("CAT_CL_CALLE")) + Dim CAT_CL_NOEXT As String = records(RESULT.Columns.Get("CAT_CL_NOEXT")) + Dim CAT_CL_NOINT As String = records(RESULT.Columns.Get("CAT_CL_NOINT")) + Dim CAT_CL_CALLE1 As String = records(RESULT.Columns.Get("CAT_CL_CALLE1")) + Dim CAT_CL_CALLE2 As String = records(RESULT.Columns.Get("CAT_CL_CALLE2")) + Dim CAT_CL_COLONIA As String = records(RESULT.Columns.Get("CAT_CL_COLONIA")) + Dim CAT_CL_DIAS_VISITA As String = records(RESULT.Columns.Get("CAT_CL_DIAS_VISITA")) + Dim CAT_CL_MUNI As String = records(RESULT.Columns.Get("CAT_CL_MUNI")) + Dim CAT_CL_EDO As String = records(RESULT.Columns.Get("CAT_CL_EDO")) + Dim CAT_CL_CP As String = records(RESULT.Columns.Get("CAT_CL_CP")) + Dim CAT_CL_LONG As String = records(RESULT.Columns.Get("CAT_CL_LONG")) + Dim CAT_CL_LAT As String = records(RESULT.Columns.Get("CAT_CL_LAT")) + Dim CAT_CL_MTOCOMPRA As String = records(RESULT.Columns.Get("CAT_CL_MTOCOMPRA")) + Dim CAT_CL_NUM_SERIEFISICO As String = records(RESULT.Columns.Get("CAT_CL_NUM_SERIEFISICO")) + Dim CAT_CL_BCREDITO As String = records(RESULT.Columns.Get("CAT_CL_BCREDITO")) + Dim CAT_CL_LIMITECREDITO As String = records(RESULT.Columns.Get("CAT_CL_LIMITECREDITO")) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO kmt_info(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,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, CAT_CL_BCREDITO, CAT_CL_LIMITECREDITO, gestion,CAT_CL_DIAS_VISITA) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ,?,0,?)", Array As Object (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,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, CAT_CL_BCREDITO, CAT_CL_LIMITECREDITO, CAT_CL_DIAS_VISITA)) + B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO HIST_STAY_STORE(HSS_CODIGO, HSS_IN , HSS_OUT , HSS_TOT) VALUES (?,0,0,0)", Array As Object (CAT_CL_CODIGO)) + Next + Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object ("0",e_ruta.TEXT, "VENTA ABORDO","null","null","null","null","null","null","null","null","null","null","null","null","NULL","null","NULL")) + Starter.skmt.ExecNonQuery2("INSERT INTO kmt_info(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,CAT_CL_COLONIA,CAT_CL_MUNI,CAT_CL_EDO,CAT_CL_CP,CAT_CL_LONG,CAT_CL_LAT,CAT_CL_MTOCOMPRA,CAT_CL_NUM_SERIEFISICO, gestion) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0,0) ",Array As Object ("1",e_ruta.TEXT, "VENTA RECARGA","null","null","null","null","null","null","null","null","null","null","null","null","NULL","null","NULL")) + Listo1 = 1 + S_CC.Text = "LISTO" + If Starter.marcaCel <> "Sony" Then ToastMessageShow("Catalogo Clientes Actualizados." , True) + If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then + B4XPage_Appear + img2.Visible=False + EJECUTANDO=0 + End If + End If + End If + + If Job.JobName = "DBRequest" Then + Dim RESULT As DBResult = reqManager.HandleJob(Job) + If RESULT.Tag = "kmt_datos_sup" Then 'query tag + S_CC.TEXT = "CARGANDO" + For Each records() As Object In RESULT.Rows + Dim CAT_CL_CODIGO As String = records(RESULT.Columns.Get("CAT_CL_CODIGO")) + Dim CAT_CL_RUTA As String = records(RESULT.Columns.Get("CAT_CL_RUTA")) + Log("-" &CAT_CL_RUTA) Dim CAT_CL_NOMBRE As String = records(RESULT.Columns.Get("CAT_CL_NOMBRE")) Dim CAT_CL_ATIENDE1 As String = records(RESULT.Columns.Get("CAT_CL_ATIENDE1")) Dim CAT_CL_ATIENTE2 As String = records(RESULT.Columns.Get("CAT_CL_ATIENTE2")) @@ -1840,7 +1892,7 @@ Sub JobDone(Job As HttpJob) datos_iguales = "ok" S_CP.Text = "INFO OK" Else - If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info P. Sync Nuevamente" & CUANTOSP & " " & cuantos_pedido, True) +' If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info P. Sync Nuevamente" & CUANTOSP & " " & cuantos_pedido, True) S_CP.Text = "ENVIAR DATOS (K-2)" End If Next @@ -1856,7 +1908,7 @@ Sub JobDone(Job As HttpJob) ' ToastMessageShow("rojo val ok 1 cuantosp." , True) datos_iguales = "ok" Else - If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info C. Sync Nuevamente" & CUANTOSC & " " & cuantos_pedidosc, True) +' If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info C. Sync Nuevamente" & CUANTOSC & " " & cuantos_pedidosc, True) End If Next End If @@ -1871,7 +1923,7 @@ Sub JobDone(Job As HttpJob) ' ToastMessageShow("rojo val ok 1 cuantosp." , True) datos_iguales = "ok" Else - If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info N. Sync Nuevamente" & CUANTOSN & " " & cuantos_noventa, True) +' If Starter.marcaCel <> "Sony" Then ToastMessageShow("No se cargo bien la info N. Sync Nuevamente" & CUANTOSN & " " & cuantos_noventa, True) End If Next End If @@ -2041,13 +2093,11 @@ End Sub Private Sub B4XPage_CloseRequest As ResumableSub 'Return True to close, False to cancel - - If SCROLL_RESDIA.Visible Then SCROLL_RESDIA.Visible = False B_OK_RES_Click Return False - Else if Panel5.Visible Then + Else if p_marcas.Visible Then B_OK_PANEL5_Click Return False Else @@ -2643,103 +2693,49 @@ Sub B_OK_COMISS_Click Btn_Ubicar.Visible=True End Sub - Sub B_MARCAS_Click -' SCROLL_RESDIA.Visible = False -' Panel5.Visible = True -' pnlTitle.Visible = False -' pnlTitle.SetLayoutAnimated(0, 0, 0, CLV1.AsView.Width, TitleHeight + DividerHeight) -' pnlTitle.LoadLayout("CellTitle") -' c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_GP_CLASIF, sum(pe_costo_tot) As total from CATALOGO, pedido where pe_proid = cat_gp_id And pe_cliente <> 0 group by cat_gp_clasif") -' -' CLV1.Clear -' If c.RowCount>0 Then -' For i=0 To c.RowCount -1 -' c.Position=i -' AddTitle(c.GetString("CAT_GP_CLASIF")) -' f=B4XPages.MainPage.skmt.ExecQuery2("select * from HIST_AVANCE where HA_MARCA = ?", Array As String(c.GetString("CAT_GP_CLASIF"))) -' f.Position=0 -' If f.RowCount > 0 Then -' CLV1.AddTextItem("VENTA = $" & f.GetString("HA_AVANCE"),"1") -' CLV1.AddTextItem("META = $" & f.GetString("HA_OBJETIVO"),"1") -' CLV1.AddTextItem("PORCENTAJE = %" & (f.GetString("HA_PORCENTAJE")) ,"1") -' End If -' f.Close -' Next -' End If -' c.Close - + Log("MARCAS") SCROLL_RESDIA.Visible = False - Panel5.Visible = True + p_marcas.Visible = True + p_marcas.BringToFront + p_marcas.Top = 0 : p_marcas.left = 0 + p_marcas.Width = Root.Width : p_marcas.height = Root.height + p_marcas.Visible = True + Log("Panel 5 visible") pnlTitle.Visible = False pnlTitle.SetLayoutAnimated(0, 0, 0, CLV1.AsView.Width, TitleHeight + DividerHeight) pnlTitle.LoadLayout("CellTitle") - c=B4XPages.MainPage.skmt.ExecQuery("Select CAT_GP_CLASIF, SUM(TOTAL) AS TOTAL FROM TOTAL_MARCAS GROUP BY CAT_GP_CLASIF") + c = B4XPages.MainPage.skmt.ExecQuery("Select sum(pe_costo_tot) as TOTAL, CAT_GP_TIPO, CAT_GP_SUBTIPO from pedido join cat_gunaprod on cat_gp_id = Pe_proid where cat_gp_tipo like '%GANADOR%' or cat_gp_tipo like '%MININO%' or cat_gp_tipo like '%Top CHOICE%' or cat_gp_tipo like '%FULLLIFE%' group by CAT_GP_SUBTIPO") CLV1.Clear - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - AddTitle(c.GetString("CAT_GP_CLASIF")) - If c.GetString("CAT_GP_CLASIF") = "PROMOS" Then - d=B4XPages.MainPage.skmt.ExecQuery("SELECT SUM(PE_CANT) AS CUANTOS FROM PEDIDO WHERE PE_CEDIS = PE_PROID") - d.Position=0 - CLV1.AddTextItem("CANTIDAD DE PROMOS = " & d.GetString("CUANTOS"),"1") - d.Close - Else - f=B4XPages.MainPage.skmt.ExecQuery2("select COUNT(*) AS CUANTOS from HIST_MARCAS_CUOTAS where HMC_MARCA = ?", Array As String(c.GetString("CAT_GP_CLASIF"))) - f.Position=0 - If f.GetString("CUANTOS") > 0 Then - e=B4XPages.MainPage.skmt.ExecQuery2("select HMC_MARCA, HMC_TOTAL from HIST_MARCAS_CUOTAS where HMC_MARCA = ?", Array As String(c.GetString("CAT_GP_CLASIF"))) - e.Position=0 - d=B4XPages.MainPage.skmt.ExecQuery2("SELECT count(distinct(PE_CLIENTE)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from cat_gunaprod WHERE CAT_GP_CLASIF =?)", Array As String (c.GetString("CAT_GP_CLASIF"))) - d.Position=0 - CLV1.AddTextItem("TOTAL PREVENTA = $" & c.GetString("TOTAL"),"1") - CLV1.AddTextItem("M E T A = $" & e.GetString("HMC_TOTAL"),"1") - CLV1.AddTextItem("FALTA = $" & (e.GetString("HMC_TOTAL") - c.GetString("TOTAL")) ,"1") - CLV1.AddTextItem("CLIENTES = " & d.GetString("CUANTOS"),"1") - d.Close - e.Close - Else - d=B4XPages.MainPage.skmt.ExecQuery2("SELECT count(distinct(pe_cliente)) AS CUANTOS FROM PEDIDO WHERE PE_PROID in (select CAT_GP_ID from cat_gunaprod WHERE CAT_GP_CLASIF =?)", Array As String (c.GetString("CAT_GP_CLASIF"))) - d.Position=0 - CLV1.AddTextItem("TOTAL PREVENTA = $" & c.GetString("TOTAL"),"1") - CLV1.AddTextItem("M E T A = $" & "1000","1") - CLV1.AddTextItem("FALTA = $" & (1000 - c.GetString("TOTAL")) ,"1") - CLV1.AddTextItem("CLIENTES = " & d.GetString("CUANTOS"),"1") - d.Close - End If - f.Close + If c.RowCount > 0 Then + For i = 0 To c.RowCount - 1 + c.Position = i + AddTitle("TIPOS") + f = B4XPages.MainPage.skmt.ExecQuery("Select sum(pe_costo_tot) as TOTAL, CAT_GP_TIPO, CAT_GP_SUBTIPO from pedido join cat_gunaprod on cat_gp_id = Pe_proid where cat_gp_tipo like '%GANADOR%' or cat_gp_tipo like '%MININO%' or cat_gp_tipo like '%Top CHOICE%' or cat_gp_tipo like '%FULLLIFE%' group by CAT_GP_SUBTIPO") + If f.RowCount > 0 Then + For i = 0 To f.RowCount - 1 + f.Position = i + CLV1.AddTextItem($"${f.GetString("CAT_GP_TIPO")} = $${NumberFormat2(f.GetString("TOTAL"),1,2,2,True)}"$,"1") + Next End If + f.Close Next End If c.Close - c=B4XPages.MainPage.skmt.ExecQuery("Select HMC_MARCA, HMC_TOTAL from HIST_MARCAS_CUOTAS where HMC_MARCA not in (SELECT CAT_GP_CLASIF FROM TOTAL_MARCAS )") - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - AddTitle(c.GetString("HMC_MARCA")) - CLV1.AddTextItem("TOTAL PREVENTA = $ 0.00","1") - CLV1.AddTextItem("M E T A = $" & C.GetString("HMC_TOTAL"),"1") - CLV1.AddTextItem("CLIENTES = 0","1") - Next - End If - c.Close - - End Sub Sub AddTitle (Title As String) - Dim p_MARCAS As B4XView = xui.CreatePanel("") - p_MARCAS.SetLayoutAnimated(0, 0, 0, CLV1.AsView.Width, TitleHeight) - p_MARCAS.LoadLayout("CellTitle") + Dim p_marcas2 As B4XView = xui.CreatePanel("") + p_marcas2.SetLayoutAnimated(0, 0, 0, CLV1.AsView.Width, TitleHeight) + p_marcas2.LoadLayout("CellTitle") lblTitle.Text = Title Dim td As TitleData td.Title = Title - CLV1.Add(p_MARCAS, td) + CLV1.Add(p_marcas2, td) End Sub Sub B_OK_PANEL5_Click - Panel5.Visible = False + p_marcas.Visible = False NUEVO.Visible =True BUSCA.Visible=True connecta.Visible=True @@ -2780,4 +2776,4 @@ End Sub Private Sub img2_Click img2.Visible = False -End Sub \ No newline at end of file +End Sub diff --git a/B4A/C_Productos.bas b/B4A/C_Productos.bas index aba4e85..70c3668 100644 --- a/B4A/C_Productos.bas +++ b/B4A/C_Productos.bas @@ -257,12 +257,14 @@ Sub PCLV_AddProds End Sub Sub lv_catalogos_ItemClick (Position As Int, Value As Object) + Log("Clic lv_catalogos") If Value = "CATALOGO" Then ' lfila.text = "TIPO" lfila.text = "PRODUCTOS" lv_catalogos.Visible = False ' lv_tipo.Visible = True - If clv_prods_ll.Size = 0 Then LlenaProdsLL(Null) +' If clv_prods_ll.Size = 0 Then LlenaProdsLL(Null) + LlenaProdsLL(Null) clv_prods_ll.AsView.Visible = True If hayPedido Then p_botonesVenta.Visible = True 'Si ya hay pedido, entonces mostramos los botones. Else @@ -288,9 +290,7 @@ Sub lv_catalogos_ItemClick (Position As Int, Value As Object) label14.TextSize = 12 label14.TextColor = Colors.Black lfila.text = "PROMOS" - - - + ' c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 and CAT_GP_TIPOPROD = ? AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String(Value, Value, Value)) c2=B4XPages.MainPage.skmt.ExecQuery2($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_PRECIO, CAT_GP_ALMACEN, CAT_GP_IMG from ${Starter.tabla} where CAT_GP_PRECIO > 0 AND CAT_GP_ALMACEN > 0 AND CAT_GP_TIPO = ? AND CAT_GP_SUBTIPO = ? AND CAT_GP_ID NOT IN (SELECT PE_PROID FROM PEDIDO WHERE PE_CLIENTE IN (Select cuenta from cuentaa) )"$, Array As String(Value, Value)) ' Log($"res:${c2.RowCount}, ${Value}, ${marca}, ${tipo}"$) @@ -393,7 +393,6 @@ Sub lv_promos_ItemClick (Position As Int, Value As Object) B4XPages.ShowPage("Cliente") End If If entro = "3" Then - 'xxxxxxxxxxxxxxxxxxxxx Else If entro = "4" Then ' Log("Entro = 4") B4XPages.MainPage.skmt.ExecNonQuery("delete from PROID") @@ -479,8 +478,6 @@ Private Sub B4XPage_CloseRequest As ResumableSub End If End Sub - - Sub b_QR_Click If ciclo = 1 Then ciclo = 2 @@ -603,10 +600,8 @@ Sub b_prodMenos_Click If clv_prods_ll.GetValue(index).As(Map).Get("cant").As(Int) = 0 Then Log("Aqui debemos ponerlo invisible") panelcajas.Visible = False - Else - End If -' p_botMasMenc.Visible = False +' p_botMasMenc.Visible = False End If 'fin aparecer parte de cajas ' LogColor("InvTotal PRODMAS: " & invTotal, Colors.Red) @@ -720,7 +715,6 @@ Private Sub et_pCant_FocusChanged (HasFocus As Boolean) End If invTotal = totalcajasmaspiezas + Subs.traeinventario(id) ' LogColor("InvTotal PRODMAS: " & invTotal, Colors.Red) - cuentaProds End Sub @@ -742,25 +736,20 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) Private nombreX As String = Subs.traeProdNombre(id) Dim panelcajas As B4XView = pnl.GetView(3) Dim panelpiezas As B4XView = pnl.GetView(2) - - If(New = "" Or New = Null Or New = "-") Then New = 0 ' If New < 0 Then New = 0 If(New > invTotal) Then Sender.As(EditText).text = invTotal End If ' Log($"inventario=${inv}"$) - If New = "" Then New = 0 If laCant.Text = "" Then laCant.Text = 0 LogColor(laCant.Text,Colors.Red) - If New > 0 Then panelcajas.Visible = False Else If New = 0 Then panelcajas.Visible = True End If - ' If laCant2.IsInitialized Then ' totalcajasmaspiezas = laCant.Text + laCant2.Text ' Else @@ -771,7 +760,6 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) Subs.actualizaProducto(Subs.traeAlmacen, precio, laCant.Text, Subs.traeProdNombre(id), id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, B4XPages.MainPage.tipo_venta,0,0) cuentaProds End If - ' If New <> "" And New.SubString2(0,0) = "0" Then ' New.SubString(1) ' End If @@ -781,7 +769,6 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) ' laCant.Text = New.SubString(1) ' Log(laCant.Text) ' End If - If 1 = 1 Then Private cs As CSBuilder cs.Initialize @@ -792,7 +779,6 @@ Private Sub et_pCant_TextChanged (Old As String, New As String) invActualizado = Subs.traeinventario(id) Log(Subs.traeinventario(id)) ' End If - If New = "" Then New = 0 If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then Private maxcajas As Int = 0 @@ -824,7 +810,6 @@ Sub b_terminar1_Click ' Log("b_terminar1_Click") ' ya_entro = "0" : Log("ya_entro=1") B4XPages.MainPage.skmt.ExecNonQuery2("delete from PEDIDO WHERE PE_PRONOMBRE = ? ", Array As Object("N/A") ) - lv_promos.Visible = False clv_prods_ll.AsView.Visible = False lv_catalogos.Visible = True @@ -834,7 +819,6 @@ Sub b_terminar1_Click Private c_prods As Cursor=B4XPages.MainPage.skmt.ExecQuery("select PE_PRONOMBRE,PE_COSTO_TOT, PE_CANT, PE_FOLIO, PE_CEDIS FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_PRONOMBRE") If c_prods.RowCount > 0 Then Private cs As CSBuilder - vamoaver.Initialize For i=0 To c_prods.RowCount -1 cs.Initialize @@ -845,7 +829,6 @@ Sub b_terminar1_Click label1.TextColor = Colors.Black label1.color = Colors.White Private textColor As Int = Colors.black - If c_prods.GetString("PE_FOLIO") = "VENTA" Then textColor = Colors.RGB(48,3,195) Else If c_prods.GetString("PE_FOLIO") = "PREVENTA" Or c_prods.GetString("PE_FOLIO") = "ABORDO" Or c_prods.GetString("PE_FOLIO") = "RECARGA" Then @@ -860,7 +843,6 @@ Sub b_terminar1_Click label2 = lv_prodsPedido.TwoLinesLayout.SecondLabel label2.TextSize = 10 label2.TextColor = Colors.Blue - lv_prodsPedido.AddTwoLines(cs.Color(textColor).append(c_prods.GetString("PE_PRONOMBRE")).pop,"Cantidad #"& c_prods.GetString("PE_CANT")& " SubTotal $"& c_prods.GetString("PE_COSTO_TOT")& " Folio "& c_prods.GetString("PE_FOLIO")) vamoaver.Add(c_prods.GetString("PE_FOLIO")) folio = c_prods.GetString("PE_FOLIO") @@ -1135,12 +1117,9 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In ' b_prodMas.Enabled = False b_prodMenos.Enabled = False End If - End If - Private precio As String=NumberFormat2(clv_prods_ll.GetValue(i).As(Map).Get("precio").As(Double),1,2,2,False) ' Log(clv_prods_ll.GetValue(i).As(Map)) - c = Starter.skmt.ExecQuery2("SELECT PE_BCAJAS FROM PEDIDO WHERE PE_PROID = ? AND PE_CLIENTE IN (SELECT CUENTA FROM CUENTAA)",Array As String(clv_prods_ll.GetValue(i).As(Map).Get("id"))) ' Log(clv_prods_ll.GetValue(i).As(Map).Get("id")) If c.RowCount = 0 Then @@ -1158,7 +1137,6 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In p_botMasMenc.Visible = True End If End If - ' If clv_prods_ll.GetValue(i).As(Map).Get("b_caja").As(String) = "0" Then ' If clv_prods_ll.GetValue(i).As(Map).Get("cant") <> Null Then et_pCant.Text = clv_prods_ll.GetValue(i).As(Map).Get("cant") ' p_botMasMen.Visible = True @@ -1193,8 +1171,6 @@ Private Sub clv_prods_ll_VisibleRangeChanged (FirstIndex As Int, LastIndex As In If clv_prods_ll.GetValue(i).As(Map).Get("cant").As(Int) = 0 Then Log("Aqui debemos ponerlo invisible") p_botMasMenc.Visible = False - Else - End If ' p_botMasMenc.Visible = False End If @@ -1247,11 +1223,12 @@ End Sub Sub LlenaProdsLL(p As ResultSet) Log("Iniciamos LlenaProdsLL") listaProds.Initialize - If hayPedido Then 'Si hay pedido obtenemos las cantidades de los productos para agregarlos al CLV. + If Subs.hayPedido Then 'Si hay pedido obtenemos las cantidades de los productos para agregarlos al CLV. + Log("Hay pedido") Dim cantsMap As Map cantsMap.Initialize Dim pe As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select PE_PROID, PE_CANT, PE_CANTC, PE_BCAJAS from PEDIDO where PE_CLIENTE = '${clienteId}' and PE_CEDIS = '${Subs.traeAlmacen}' and PE_FOLIO = '${B4XPages.MainPage.tipo_venta}'"$) -' LogColor("Ponemos productos de pedido anterior: "&pe.RowCount, Colors.red) + LogColor("Ponemos productos de pedido anterior: "&pe.RowCount, Colors.red) Do While pe.NextRow Private cant As Int = 0 If pe.GetString("PE_BCAJAS") = 0 Then @@ -1265,19 +1242,17 @@ Sub LlenaProdsLL(p As ResultSet) End If ' Log(p.IsInitialized) If p.IsInitialized Then -' Log("YA HAY RESULSET") + Log("YA HAY RESULSET") Else -' Log("NO HAY RESULSET") -LogColor(Starter.tabla,Colors.blue) + Log("NO HAY RESULSET") + LogColor(Starter.tabla,Colors.blue) ' Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD from ${Starter.tabla} where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' order by CAT_GP_NOMBRE"$) - Dim p As ResultSet = B4XPages.MainPage.skmt.ExecQuery($"select distinct CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4, PE_BCAJAS from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN > 0 And CAT_GP_CLASIF <> 'PROMOS' union all select CAT_GP_ID, CAT_GP_NOMBRE, CAT_GP_ALMACEN, CAT_GP_PRECIO, CAT_GP_TIPOPROD, CAT_DP_CONVERSION1, CAT_DP_PRECIO4 , PE_BCAJAS from ${Starter.tabla} LEFT JOIN PEDIDO ON CAT_GP_ID = PE_PROID where CAT_GP_PRECIO > 0 And CAT_GP_ALMACEN = 0 And CAT_GP_CLASIF <> 'PROMOS' and cat_gp_id in (select pe_proid from pedido where pe_cliente in (select cuenta from cuentaa)) order by 2"$) - End If - Do While p.NextRow Private cant As Int = 0 - If hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then + If Subs.hayPedido And cantsMap.ContainsKey(p.GetString("CAT_GP_ID")) Then + clv_prods_ll.Clear Log(p.GetString("CAT_GP_ID")) cant = cantsMap.Get(p.GetString("CAT_GP_ID")) End If @@ -1340,9 +1315,6 @@ Sub PCLV_HintRequested(Index As Int) As Object Return word End Sub - - - Sub b_prodMenosc_Click totalcajasmaspiezas = 0 etCantHasFocus = False @@ -1368,7 +1340,6 @@ Sub b_prodMenosc_Click Private nombreX As String = Subs.traeProdNombre(id) Private conversion As String = clv_prods_ll.GetValue(index).As(Map).Get("conversion") Private preciocaja As String = clv_prods_ll.GetValue(index).As(Map).Get("precio_caja") - Log(tmpMap) ' prodsMap.Put(id, tmpMap) If laCant2.Text = 0 Then prodsMap.Remove(id) @@ -1412,14 +1383,12 @@ Sub b_prodMenosc_Click If Subs.totalPedido < 1 Then laCant2.Text = "0" invTotal = totalcajasmaspiezas + Subs.traeinventario(id) ' LogColor("InvTotal PRODMAS: " & invTotal, Colors.Red) - End Sub Sub b_prodMasc_Click etCantHasFocus = False Root.RequestFocus ' LogColor("b_prodMas_Click", Colors.Magenta) - Dim index As Int = clv_prods_ll.GetItemFromView(Sender) Dim pnl0 As B4XView = clv_prods_ll.GetPanel(index) Dim pnl As B4XView = pnl0.GetView(0) @@ -1474,14 +1443,12 @@ Sub b_prodMasc_Click Else If laCant2.Text = 0 Then panelpiezas.Visible = True End If - ' LogColor(laCant.Text,Colors.Red) ' If laCant.IsInitialized Then ' totalcajasmaspiezas = laCant.Text + laCant2.Text ' Else ' totalcajasmaspiezas = laCant2.Text ' End If - ' Subs.actualizaProducto(Subs.traeAlmacen,preciocaja,(laCant2.Text * conversion), Subs.traeProdNombre(id), id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, B4XPages.MainPage.tipo_venta,laCant2.Text,1) Subs.actualizaProducto2(Subs.traeAlmacen,preciocaja,(laCant2.Text * conversion), Subs.traeProdNombre(id), id, clienteId, Subs.traeFecha, Subs.traeUsuarioDeBD, rutaUsuario, 0, B4XPages.MainPage.tipo_venta,laCant2.Text,1) cuentaProds @@ -1529,7 +1496,6 @@ Private Sub et_pCantc_FocusChanged (HasFocus As Boolean) ' End If invTotal = totalcajasmaspiezas + Subs.traeinventario(id) ' LogColor("InvTotal PRODMAS: " & invTotal, Colors.Red) - cuentaProds End Sub @@ -1554,7 +1520,6 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String) Dim panelpiezas As B4XView = pnl.GetView(2) Private conversion As String = clv_prods_ll.GetValue(index).As(Map).Get("conversion") Private preciocaja As String = clv_prods_ll.GetValue(index).As(Map).Get("precio_caja") - invTotal = Subs.traeinventario(id) Log("inventario total "& invTotal) If(New = "" Or New = Null Or New = "-") Then New = 0 @@ -1568,28 +1533,23 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String) pnl.GetView(2).Visible = True Log("ponemos en 0") End If - ' Log($"inventario=${inv}"$) Log("inventario total despues de max "& invTotal) - If New = "" Then New = 0 If laCant2.Text = "" Then laCant2.Text = 0 ' LogColor("la cant2 " &laCant2.Text,Colors.Red) - If New > 0 Then Log("lo ocultamos") panelpiezas.Visible = False Else If New = 0 Then panelpiezas.Visible = True End If - ' If laCant.IsInitialized Then ' totalcajasmaspiezas = laCant.Text + laCant2.Text ' Else ' totalcajasmaspiezas = laCant2.Text ' End If Log("InvTotal: " & invTotal) - If Not(Old = "0" And New = "") And laCant2.Text <> Null And laCant2.Text <> "" And etCantHasFocus Then If invTotal - (laCant2.Text * conversion) >= 0 Then LogColor("validacion inventariio " & (invTotal - (laCant2.Text * conversion)), Colors.Blue) @@ -1603,8 +1563,6 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String) End If End If LogColor("la cant2 " & laCant2.Text,Colors.Green) - - ' If New <> "" And New.SubString2(0,0) = "0" Then ' New.SubString(1) ' End If @@ -1614,7 +1572,6 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String) ' laCant.Text = New.SubString(1) ' Log(laCant.Text) ' End If - If 1 = 1 Then Private cs As CSBuilder cs.Initialize @@ -1625,7 +1582,6 @@ Private Sub et_pCantc_TextChanged (Old As String, New As String) invActualizado = Subs.traeinventario(id) Log(Subs.traeinventario(id)) ' End If - If New = "" Then New = 0 If clv_prods_ll.GetValue(index).As(Map).Get("precio_caja").As(Float) = 0 Or clv_prods_ll.GetValue(index).As(Map).Get("conversion").As(Int) = 1 Then Private maxcajas2 As Int = 0 diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas index de27694..3bfdc00 100644 --- a/B4A/C_TicketsDia.bas +++ b/B4A/C_TicketsDia.bas @@ -32,33 +32,35 @@ Private Sub B4XPage_Created (Root1 As B4XView) If File.Exists(ruta, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", ruta, "kmt.db") End If - c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") - - +' c = B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") + ListView1.TwoLinesLayout.ItemHeight = 50dip ListView1.Clear - If c.RowCount>0 Then - For i=0 To c.RowCount -1 - c.Position=i - Dim label1 As Label - label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 10 - label1.TextColor = Colors.Black - Dim label2 As Label - label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 13 - label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) - Next - End If +' If c.RowCount>0 Then +' For i=0 To c.RowCount -1 +' c.Position=i +' Dim label1 As Label +' label1 = ListView1.TwoLinesLayout.Label +' label1.TextSize = 10 +' label1.TextColor = Colors.Black +' Dim label2 As Label +' label2 = ListView1.TwoLinesLayout.SecondLabel +' label2.TextSize = 12 +' label2.TextColor = Colors.Blue +' ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),"Cantidad #"& c.GetString("PC_NOART")& " Monto de venta $"& c.GetString("PC_MONTO")) +' Next +' End If + p_ticketsdia.Height = Root.Height + ListView1.Height = p_ticketsdia.Height * 0.8 + ListView1.Width = Root.Width * 0.9 + b_noventa.Top = Root.Height - b_noventa.Height - 20dip End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear nombre_boton = "NOVENTA" - c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE,PC_MONTO,PC_NOART,(select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") + c=B4XPages.MainPage.skmt.ExecQuery("select PC_CLIENTE, PC_MONTO, PC_NOART, (select CAT_CL_NOMBRE from kmt_info where cat_cl_codigo = pc_cliente UNION select CAT_CL_NOMBRE from kmt_info2 where cat_cl_codigo = pc_cliente ) as NOMBRE FROM PEDIDO_CLIENTE ORDER BY PC_FECHA asc") Dim noArticulos As Int = 0 - ListView1.Clear If c.RowCount>0 Then For i=0 To c.RowCount -1 @@ -69,15 +71,18 @@ Sub B4XPage_Appear ' Log(x.GetString("PC_NOART")) noArticulos = x.GetString("PC_NOART") End If - Dim label1 As Label + Dim label1 As B4XView label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 10 - label1.TextColor = Colors.Black - Dim label2 As Label + label1.Height = 1dip + label1.TextSize = 1 + label1.TextColor = Colors.White + Dim label2 As B4XView label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 13 + ListView1.TwoLinesLayout.SecondLabel.SetLayout(0,0,ListView1.Width,50dip) + label2.TextSize = 12 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " SubTotal $"& c.GetString("PC_MONTO")) +' ListView1.AddSingleLine(c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " Monto de venta $"& c.GetString("PC_MONTO")) + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& noArticulos & " Monto preventa $"& c.GetString("PC_MONTO")) Next End If c.Close @@ -86,6 +91,7 @@ End Sub Sub Regresar_Click B4XPages.ShowPage("cliente") End Sub + Sub Activity_KeyPress (key As Int) As Boolean ' BACK key pressed If key=KeyCodes.KEYCODE_BACK Then @@ -96,7 +102,9 @@ Sub Activity_KeyPress (key As Int) As Boolean ' Returning False signals the system to handle the key Return False End Sub + Sub ListView1_ItemLongClick (Position As Int, Value As Object) + Log(Value) B4XPages.MainPage.skmt.ExecNonQuery("delete from CUENTAA") B4XPages.MainPage.skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?)", Array As Object(Value)) DateTime.TimeFormat = "HHmmss" @@ -127,13 +135,15 @@ Sub b_noventa_Click c.Position=i Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 15 + label1.TextSize = 10 + label1.Height = 0 label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 10 + label2.TextSize = 12 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("NV_CLIENTE"),c.GetString("NOMBRE") &" Motivo #"& c.GetString("NV_MOTIVO")& " Comentario $"& c.GetString("NV_COMM")) + ListView1.AddTwoLines("",c.GetString("NOMBRE") &" Causa #"& c.GetString("NV_MOTIVO")& " Comentario: " & c.GetString("NV_COMM")) +' ListView1.AddSingleLine(c.GetString("NOMBRE") &" Causa #"& c.GetString("NV_MOTIVO")& " Comentario: " & c.GetString("NV_COMM")) Next End If Else @@ -147,13 +157,15 @@ Sub b_noventa_Click c.Position=i Dim label1 As Label label1 = ListView1.TwoLinesLayout.Label - label1.TextSize = 15 + label1.TextSize = 10 + label1.Height = 0 label1.TextColor = Colors.Black Dim label2 As Label label2 = ListView1.TwoLinesLayout.SecondLabel - label2.TextSize = 10 + label2.TextSize = 12 label2.TextColor = Colors.Blue - ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " SubTotal $"& c.GetString("PC_MONTO")) +' ListView1.AddSingleLine(c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " Monto de venta $"& c.GetString("PC_MONTO")) + ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &" Cantidad #"& c.GetString("PC_NOART")& " Monto preventa $"& c.GetString("PC_MONTO")) Next End If c.Close diff --git a/B4A/Files/celltitle.bal b/B4A/Files/celltitle.bal index 17a1327..52238cc 100644 Binary files a/B4A/Files/celltitle.bal and b/B4A/Files/celltitle.bal differ diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index f33de5e..52a1ace 100644 Binary files a/B4A/Files/cliente.bal and b/B4A/Files/cliente.bal differ diff --git a/B4A/Files/clientes.bal b/B4A/Files/clientes.bal index 08bea6c..7543023 100644 Binary files a/B4A/Files/clientes.bal and b/B4A/Files/clientes.bal differ diff --git a/B4A/Files/datoscliente.bal b/B4A/Files/datoscliente.bal index 81e7a6e..854aa24 100644 Binary files a/B4A/Files/datoscliente.bal and b/B4A/Files/datoscliente.bal differ diff --git a/B4A/Files/noventa.bal b/B4A/Files/noventa.bal index 9d54fcb..f98c731 100644 Binary files a/B4A/Files/noventa.bal and b/B4A/Files/noventa.bal differ diff --git a/B4A/Files/nuevocliente.bal b/B4A/Files/nuevocliente.bal index f6742e4..e6f0879 100644 Binary files a/B4A/Files/nuevocliente.bal and b/B4A/Files/nuevocliente.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 0805bd7..24b43e7 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Files/resdia.bal b/B4A/Files/resdia.bal index ba3124c..37732b5 100644 Binary files a/B4A/Files/resdia.bal and b/B4A/Files/resdia.bal differ diff --git a/B4A/Files/ticketsdia.bal b/B4A/Files/ticketsdia.bal index 0362e18..daf55be 100644 Binary files a/B4A/Files/ticketsdia.bal and b/B4A/Files/ticketsdia.bal differ