diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index 128734f..93e6a76 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -712,22 +712,18 @@ Sub B_IMP_Click If perfil = "V-ESPECIAL" Then 'Or perfil = "V-SUPER" Printer1.WriteString("-----------PREVENTA-----------" & 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=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_PRECIO2 as PE_COSTOU, length(PE_PRECIO2) as L_COSTOU,PE_CANT * PE_PRECIO2 AS PE_COSTO_TOT, length(PE_CANT * PE_PRECIO2) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID ", Array As String("PREVENTA")) + s = Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_PRECIO2 as PE_COSTOU, length(PE_PRECIO2) as L_COSTOU,PE_CANT * PE_PRECIO2 AS PE_COSTO_TOT, length(PE_CANT * PE_PRECIO2) as L_COSTO_TOT,PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA")) If S.RowCount>0 Then For i=0 To S.RowCount -1 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_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO - ESPACIO = ESPACIO - TAMANO - For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next @@ -735,7 +731,6 @@ Sub B_IMP_Click TAMANO = 0 ESPACIO = 21 BLANCO = " " - End If Next End If @@ -790,17 +785,13 @@ Sub B_IMP_Click For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - +' Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) ' Quitamos el nombre de la promo para que los tenderos no pidan la promo nuevamente. Else - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO - ESPACIO = ESPACIO - TAMANO - For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next @@ -813,7 +804,6 @@ Sub B_IMP_Click Printer1.WriteString(" " & CRLF) End If s.Close - Printer1.WriteString("-------------RMI..-----------" & 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=Starter.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_TIPO = ? AND PE_CEDIS = ? AND LENGTH(PE_CEDIS) < 4 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_PROID", Array As String("PREVENTA","DUR")) @@ -822,16 +812,12 @@ Sub B_IMP_Click 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_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO TAMANO = s.GetLong("L_COSTO_TOT") + TAMANO - ESPACIO = ESPACIO - TAMANO - For E=0 To ESPACIO -1 BLANCO = " " & BLANCO Next @@ -843,7 +829,6 @@ Sub B_IMP_Click Next End If s.Close - s=Starter.skmt.ExecQuery2("select SUM(PE_COSTO_TOT) AS TOTAL, SUM(PE_PRECIO2 * PE_CANT) AS TOTAL2 FROM PEDIDO WHERE PE_TIPO = ? AND PE_CLIENTE IN (Select CUENTA from cuentaa)", Array As String("PREVENTA")) s.Position =0 ' If s.GetString("TOTAL") - s.GetString("TOTAL2") <> 0 Then @@ -854,7 +839,6 @@ Sub B_IMP_Click c=Starter.skmt.ExecQuery("select sum(PE_CANT) as PC_NOART from PEDIDO where PE_CLIENTE in (Select CUENTA from cuentaa) AND PE_PROID NOT IN (SELECT CAT_PA_ID FROM PROMOS_COMP ) and PE_TIPO = 'PREVENTA'") C.Position=0 Printer1.WriteString("Total Articulos: " & c.GetString("PC_NOART") & CRLF) - Private bc As ResultSet = Starter.skmt.ExecQuery($"select CAT_CL_BCREDITO from kmt_info where CAT_CL_CODIGO = '${Subs.traeCliente}'"$) Private formaPago As String = "Efectivo" Do While bc.NextRow @@ -862,7 +846,6 @@ Sub B_IMP_Click Loop Printer1.WriteString("Forma de pago: " & formaPago & CRLF) c.Close - End If Printer1.WriteString(" " & CRLF) Printer1.WriteString("------------------------------" & CRLF) @@ -873,14 +856,11 @@ Sub B_IMP_Click Printer1.WriteString("--------INFORMATIVO-----------" & CRLF) Printer1.WriteString("------------------------------" & CRLF) Printer1.WriteString(" " & CRLF) - Sleep(1000) Printer1.DisConnect - ProgressDialogHide ' printer.Flush ' printer.Close - End Sub Sub B_IMP2_Click @@ -1006,14 +986,11 @@ Sub B_IMP2_Click s=Starter.skmt.ExecQuery2("select PE_PRONOMBRE, PE_CANT, length(pe_cant) as L_CANT, PE_COSTOU, length(PE_COSTOU) as L_COSTOU, PE_COSTO_TOT, length(PE_COSTO_TOT) as L_COSTO_TOT, PE_PROID, PE_CEDIS FROM PEDIDO WHERE PE_TIPO = ? AND LENGTH(PE_CEDIS) > 3 AND PE_CLIENTE IN (Select CUENTA from cuentaa) order by PE_CEDIS, PE_COSTOU", Array As String("VENTA")) If S.RowCount>0 Then Printer1.WriteString("-----------PROMOS-------------" & CRLF) - For i=0 To S.RowCount -1 S.Position=i If s.GetString("PE_CEDIS") = s.GetString("PE_PROID") Then - Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) - +' Printer1.WriteString(s.GetString("PE_PRONOMBRE") & CRLF) ' Quitamos el nombre de la promo para que los tenderos no pidan la promo nuevamente. Else - Printer1.WriteString(s.GetString("PE_CANT") & " " & s.GetString("PE_PRONOMBRE") & CRLF) TAMANO = s.GetLong("L_CANT") + TAMANO TAMANO = s.GetLong("L_COSTOU") + TAMANO diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 04e8391..aed4b86 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -163,6 +163,8 @@ Sub Class_Globals Private l_nes_humedos As Label Private l_nes_secos As Label Private l_conagra As Label + Private l_montoAbordo As Label + Private l_pzasAbordo As Label End Sub Sub initialize @@ -257,6 +259,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) P1.Top = 0 : P1.left = 0 P_RESUMEN.Top = 0 : P_RESUMEN.left = 0 P_RESUMEN.Width = Root.Width + P_RESUMEN.Left = 0 : P_RESUMEN.top = 0 + P_RESUMEN.Width = Root.Width : P_RESUMEN.Height = Root.Height + B_OK_RES.Left = Round(Root.Width/2)-(B_OK_RES.Width/2) End Sub Sub IsConnectedToInternet As Boolean @@ -430,9 +435,6 @@ Sub B4XPage_Appear B4XPage_Appear End If CallSub(Starter,"ENVIA_ULTIMA_GPS") - - - End Sub 'Sub Activity_Pause (UserClosed As Boolean) @@ -2485,7 +2487,7 @@ Sub Resumen_Click If E1.GetString("CUANTOS") > 0 Then c=skmt.ExecQuery2("Select sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_TIPO = ?", Array As String("VENTA")) c.Position = 0 - L_VENTA.Text = numberformat2(c.GetString("MONTO_DIA"), 1, 2, 2, true) + L_VENTA.Text = NumberFormat2(c.GetString("MONTO_DIA"), 1, 2, 2, True) c.Close Else L_VENTA.Text = 0 @@ -2551,6 +2553,18 @@ Sub Resumen_Click c.Close b.Close End If + Private pzasAbordo As String = 0 + Private montoAbordo As String = 0 + Private px As Cursor = Starter.skmt.ExecQuery("select cat_gp_almacen, cat_gp_precio from cat_gunaprod2 where cat_gp_tipo <> 'PROMOS'") + If px.RowCount > 0 Then + px.Position = 0 + pzasAbordo = pzasAbordo + px.GetString("CAT_GP_ALMACEN") + montoAbordo = montoAbordo + (px.GetString("CAT_GP_PRECIO") * px.GetInt("CAT_GP_ALMACEN")) + End If + Log(pzasAbordo) + Log(montoAbordo) + l_pzasAbordo.Text = pzasAbordo + l_montoAbordo.Text = NumberFormat2(montoAbordo, 1, 2, 2, True) End Sub Sub B_PROXIMA_Click diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index abb5bb8..56bc6b3 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -591,50 +591,51 @@ File629=infonavit1.jpg File63=118.png File630=itembuttonblue.png File631=k.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 +File632=K-b27c0809.png +File633=kelloggs.png +File634=keymon_logo.png +File635=kmt.db +File636=login.bal +File637=logo sanfer.jpg +File638=Logo_durakelo_192xx192.jpeg +File639=logo_exitus1.jpg File64=118marker-rojo.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 +File640=MainPage.bal +File641=Malo.jpg +File642=mapa.bal +File643=mapa_rutas.bal +File644=nestle.png +File645=nota.bal +File646=NoVenta.bal +File647=nuevocliente.bal +File648=palomita_verde.png +File649=pedido.bal File65=118marker-verde.png -File650=planfia_logo.png -File651=planfia_logo_old.png -File652=planfia_logo_old2.png -File653=principal.bal -File654=principal.bal.bak -File655=proditem.bal -File656=productos.bal -File657=productos.bal.old -File658=promociones.bal -File659=qr.bal +File650=pedidoitem.bal +File651=planfia_logo.png +File652=planfia_logo_old.png +File653=planfia_logo_old2.png +File654=principal.bal +File655=principal.bal.bak +File656=proditem.bal +File657=productos.bal +File658=productos.bal.old +File659=promociones.bal File66=119.png -File660=rechazo.jpg -File661=rojo.png -File662=salma.jpg -File663=salma.png -File664=senial.jpg -File665=sync.png -File666=tache_rojo.png -File667=telefonos.bal -File668=ticketsDia.bal -File669=Tiendita.jpg +File660=qr.bal +File661=rechazo.jpg +File662=rojo.png +File663=salma.jpg +File664=salma.png +File665=senial.jpg +File666=sync.png +File667=tache_rojo.png +File668=telefonos.bal +File669=ticketsDia.bal File67=119marker-rojo.png -File670=unilever.jpg -File671=verde.png +File670=Tiendita.jpg +File671=unilever.jpg +File672=verde.png File68=119marker-verde.png File69=11marker-rojo.png File7=100marker-rojo.png @@ -1306,6 +1307,7 @@ FileGroup669=Default Group FileGroup67=Default Group FileGroup670=Default Group FileGroup671=Default Group +FileGroup672=Default Group FileGroup68=Default Group FileGroup69=Default Group FileGroup7=Default Group @@ -1398,15 +1400,15 @@ Module6=C_Cuestionario Module7=C_Historico Module8=C_Nota Module9=C_NoVenta -NumberOfFiles=671 +NumberOfFiles=672 NumberOfLibraries=31 NumberOfModules=24 -Version=13.1 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 5.04.01 + #VersionName: 5.05.07 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index cced248..1236934 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -60,10 +60,10 @@ ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= ModuleClosedNodes19= -ModuleClosedNodes2= +ModuleClosedNodes2=2,5 ModuleClosedNodes20= ModuleClosedNodes21= -ModuleClosedNodes22=1 +ModuleClosedNodes22=1,4,5,6,7 ModuleClosedNodes23= ModuleClosedNodes24= ModuleClosedNodes3= @@ -73,6 +73,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Productos,b_prodMenos_Click,614,0,Starter,Process_Globals,22,0,C_Principal,Class_Globals,154,1,C_Principal,B4XPage_Appear,427,0,B4XMainPage,B4XPage_Appear,208,0,B4XMainPage,Class_Globals,89,0,C_Principal,SUBIR_P_Click,2708,3,C_Principal,cargar_Click,883,3,C_Principal,Subir_Click,569,2,C_Nota,B4XPage_Appear,107,0,B4XMainPage,B4XPage_Created,142,0 +NavigationStack=C_Principal,Resumen_Click,2543,6,C_Cliente,Class_Globals,22,0,Diseñador Visual,principal.bal,-100,1,Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B_IMP_Click,781,0,C_Cliente,B_IMP2_Click,981,6,C_Principal,Subir_Click,576,0,C_Principal,cargar_Click,883,0,C_Principal,SUBIR_P_Click,2721,0,Starter,ENVIA_ULTIMA_GPS,100,0,C_Principal,Class_Globals,9,0 SelectedBuild=0 -VisibleModules=2,10,4,19,9,11,23,12,8,22 +VisibleModules=22,2,10,4,19,9,11,23,12,8 diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 6c6a621..4273501 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ