diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index d61afe0..dae9232 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -236,7 +236,6 @@ Sub B4XPage_Appear 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,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_BFACTURA,CAT_CL_BCREDITO from kmt_info where CAT_CL_CODIGO In (Select cuenta from cuentaa)") s=Starter.skmt.ExecQuery("select sum(pe_costo_tot) as TOTAL_CLIE, SUM(PE_CANT) AS CANT_CLIE FROM PEDIDO WHERE PE_CLIENTE IN (Select CUENTA from cuentaa)") s.Position=0 - c.Position=0 la_cuenta.Text = c.GetString("CAT_CL_CODIGO") La_nombre.Text = c.GetString("CAT_CL_NOMBRE") @@ -603,7 +602,7 @@ Sub B_IMP_Click c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") c.Position=0 usuario = c.GetString("USUARIO") - DateTime.DateFormat = "MM/dd/yyyy" + DateTime.DateFormat = "MM/dd/yyyy HH:mm:ss" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) c.Close @@ -648,23 +647,25 @@ Sub B_IMP_Click Dim bmp As Bitmap bmp.InitializeResize(File.DirAssets, "durakelo1.png", 376, 129, True) 'ignore 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) - + Private x As ResultSet = Starter.skmt.ExecQuery($"SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION ='DOMICILIO'"$) + Private domicilioF As String = "" + Do While x.NextRow + domicilioF = x.GetString("CAT_VA_VALOR") + Loop 'Printer1.Justify = 1 'printer.Initialize(cmp20.OutputStream) Printer1.WriteString("DURAKELO S.A. de C.V." & CRLF) Printer1.WriteString("RFC: DUR-011025-T12" & CRLF) + Printer1.WriteString("REGIMEN GENERAL DE LEY DE PERSONAS MORALES" & CRLF) + Printer1.WriteString("DOM: " & domicilioF & CRLF) Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) + Printer1.WriteString(Subs.fechanormal(DateTime.Now) & CRLF) Printer1.WriteString("Vendedor:" & usuario & CRLF) Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) @@ -819,6 +820,13 @@ 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 + If bc.GetString("CAT_CL_BCREDITO") = 1 Then formaPago = "Por definir" + Loop + Printer1.WriteString("Forma de pago: " & formaPago & CRLF) c.Close End If @@ -859,7 +867,7 @@ Sub B_IMP2_Click c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") c.Position=0 usuario = c.GetString("USUARIO") - DateTime.DateFormat = "MM/dd/yyyy" + DateTime.DateFormat = "MM/dd/yyyy HH:mm:ss" sDate=DateTime.Date(DateTime.Now) sTime=DateTime.Time(DateTime.Now) c.Close @@ -903,23 +911,25 @@ Sub B_IMP2_Click Dim bmp As Bitmap bmp.InitializeResize(File.DirAssets, "durakelo1.png", 376, 129, True) 'ignore Dim myimage As AnImage = Printer1.ImageToBWIMage(bmp) - myimage = Printer1.DitherImage2D(myimage, 128) - myimage= Printer1.PackImage(myimage) Log("Iniciamos 2 ...") Printer1.WriteString(CRLF) ' nudge the printer to show the user something is happening Printer1.WriteString(Printer1.REVERSE) - Printer1.PrintImage(myimage) Printer1.WriteString(Printer1.UNREVERSE) - + Private x As ResultSet = Starter.skmt.ExecQuery($"SELECT CAT_VA_VALOR FROM CAT_VARIABLES WHERE CAT_VA_DESCRIPCION ='DOMICILIO'"$) + Private domicilioF As String = "" + Do While x.NextRow + domicilioF = x.GetString("CAT_VA_VALOR") + Loop ' printer.Initialize(cmp20.OutputStream) Printer1.WriteString("DURAKELO S.A. de C.V." & CRLF) Printer1.WriteString("RFC: DUR-011025-T12" & CRLF) + Printer1.WriteString("REGIMEN GENERAL DE LEY DE PERSONAS MORALES" & CRLF) + Printer1.WriteString("DOM: " & domicilioF & CRLF) Printer1.WriteString(sucursal & CRLF) - Printer1.WriteString(sDate & CRLF) - Printer1.WriteString(sTime & CRLF) + Printer1.WriteString(Subs.fechanormal(DateTime.Now) & CRLF) Printer1.WriteString("Vendedor:" & usuario & CRLF) Printer1.WriteString("Tienda: " & La_nombre.Text & CRLF) Printer1.WriteString("ID.Cliente: " & la_cuenta.Text & CRLF) @@ -1039,6 +1049,12 @@ Sub B_IMP2_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 + If bc.GetString("CAT_CL_BCREDITO") = 1 Then formaPago = "Por definir" + Loop + Printer1.WriteString("Forma de pago: " & formaPago & CRLF) c.Close ' Printer1.WriteString("------------VENTA-------------") ' Printer1.WriteString("TOTAL COMPRA: $:" & total_cliente) diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 2625f9a..e4fc8fa 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -159,6 +159,7 @@ Sub Class_Globals Dim ime As IME Private l_monto_kc As Label Private l_version As Label + Private l_montoColgateResumen As Label End Sub Sub initialize @@ -224,7 +225,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) l_ctast.Text = d.GetString("TOTAL_VISITAR") l_porvisitar.Text = e.GetString("POR_VISITAR") Else - c=skmt.ExecQuery("select sum(pc_monto) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente ") + c=skmt.ExecQuery("select ifnull(sum(pc_monto), 0) as MONTO_DIA, count(pc_cliente) AS CLIENTES_DIA from pedido_cliente ") b=skmt.ExecQuery("select count(*) as CUANTOS from noventa") 'where pc_fecha = ?", Array As String(fecha) C.Position=0 @@ -1076,7 +1077,9 @@ Sub JobDone(Job As HttpJob) LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue) End If If Job.Success = False Then - LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) + LogColor("############################################", Colors.red) + LogColor("#### Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) + LogColor("############################################", Colors.red) If Job.ErrorMessage = "STREAM" Then If CARGA = "SUBIR" Then PB2.Progress = PB2.Progress + PORCENTAJE @@ -1872,8 +1875,11 @@ Sub JobDone(Job As HttpJob) If RESULT.Tag = "sucursal" Then 'query tag For Each records() As Object In RESULT.Rows Dim SUCURSAL As String = records(RESULT.Columns.Get("SUCURSAL")) + Dim domicilio As String = records(RESULT.Columns.Get("CAT_AG_CALLE")) & " " & records(RESULT.Columns.Get("CAT_AG_NUMERO")) & ", " & records(RESULT.Columns.Get("CAT_AG_COLONIA")) & ", " & records(RESULT.Columns.Get("CAT_AG_CIUDAD")) skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("SUCURSAL")) skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SUCURSAL",SUCURSAL)) + skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("DOMICILIO")) + skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("DOMICILIO", domicilio)) Next End If End If @@ -1976,12 +1982,16 @@ End Sub Sub BUSCA_Click c=skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("MARCAS")) - c.Position =0 - MARCASQ = c.GetString("CAT_VA_VALOR") - c.Close - skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &")" ) -' StartActivity(BUSCAR) - B4XPages.ShowPage("TicketsDia") + If c.RowCount > 0 Then + c.Position = 0 + MARCASQ = c.GetString("CAT_VA_VALOR") + c.Close + skmt.ExecNonQuery("delete from CAT_GUNAPROD WHERE CAT_GP_CLASIF NOT IN (" & MARCASQ &")" ) +' StartActivity(BUSCAR) + B4XPages.ShowPage("TicketsDia") + Else + ToastMessageShow("No hay tickets guardados!", True) + End If End Sub Sub b_mapa_Click @@ -2316,6 +2326,13 @@ Sub Resumen_Click cargar.Visible=False Resumen.Visible= False + Private r As ResultSet = Starter.skmt.ExecQuery($"Select CAT_GP_CLASIF, PEDIDO.* from pedido join cat_gunaprod on PE_PROID = CAT_GP_ID where CAT_GP_CLASIF = 'COLGATE'"$) + Private cRes As String = 0 + Do While r.NextRow + cRes = cRes + r.GetString("PE_COSTO_TOT") + Loop + l_montoColgateResumen.Text = numberformat2(cRes, 1, 2, 2, True) + b=skmt.ExecQuery("Select count(*) as CUANTOS from pedido_cliente where pc_cliente <> 0") b.Position=0 Cuantos = b.GetString("CUANTOS") @@ -2357,11 +2374,11 @@ Sub Resumen_Click If c.GetString("CUANTOS") > 0 Then Log("Entramos") ImageView12.Bitmap = LoadBitmap(File.DirAssets, "k.png") - c=skmt.ExecQuery2("select sum(pe_cant) as CAMBIOS from pedido where substr(pe_pronombre,1,6) = ?", Array As String("CAMBIO")) + c=skmt.ExecQuery2("select ifnull(sum(pe_cant), 0) as CAMBIOS from pedido where substr(pe_pronombre,1,6) = ?", Array As String("CAMBIO")) c.Position = 0 - l_cambios.Text = c.GetString("CAMBIOS") + l_cambios.Text = numberformat2(c.GetString("CAMBIOS"), 1, 2, 2, True) c.Close - c=skmt.ExecQuery("Select sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2' union Select CAT_GP_ID from cat_gunaprod2 where CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2')") + c=skmt.ExecQuery("Select ifnull(sum(PE_COSTO_TOT), 0) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2' union Select CAT_GP_ID from cat_gunaprod2 where CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2')") c.Position = 0 l_monto_k.Text = c.GetString("MONTO_DIA") c.Close @@ -2373,12 +2390,12 @@ Sub Resumen_Click l_monto_kp.Text = "0" End If c.Close - c=skmt.ExecQuery("Select sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'SNACK' union Select CAT_GP_ID from cat_gunaprod2 where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'SNACK')") + c=skmt.ExecQuery("Select ifnull(sum(PE_COSTO_TOT), 0) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'SNACK' union Select CAT_GP_ID from cat_gunaprod2 where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'SNACK')") c.Position = 0 l_monto_ks.Text = c.GetString("MONTO_DIA") c.Close Log("Snacks=" & l_monto_ks.text) - c=skmt.ExecQuery("Select sum(PE_COSTO_TOT) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'CEREAL' union Select CAT_GP_ID from cat_gunaprod2 where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'CEREAL')") + c=skmt.ExecQuery("Select ifnull(sum(PE_COSTO_TOT), 0) As MONTO_DIA from pedido where PE_CLIENTE <> 0 and pe_proid in (Select CAT_GP_ID from cat_gunaprod where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'CEREAL' union Select CAT_GP_ID from cat_gunaprod2 where (CAT_GP_CLASIF = 'KELLOGGS' Or CAT_GP_CLASIF = 'KELLOGGS 2') And CAT_GP_TIPO = 'CEREAL')") c.Position = 0 l_monto_kc.Text = c.GetString("MONTO_DIA") c.Close @@ -2415,14 +2432,13 @@ Sub Resumen_Click End If E1.Close - E1=skmt.ExecQuery2("Select count(*) As CUANTOS from pedido where PE_TIPO = ?", Array As String("PREVENTA")) E1.Position = 0 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("PREVENTA")) + c=skmt.ExecQuery2("Select ifnull(sum(PE_COSTO_TOT), 0) As MONTO_DIA from pedido where PE_TIPO = ?", Array As String("PREVENTA")) c.Position = 0 - L_PREVENTA.Text = c.GetString("MONTO_DIA") + L_PREVENTA.Text = NumberFormat2(c.GetString("MONTO_DIA"), 1, 2, 2, True) c.Close Else L_PREVENTA.Text = 0 @@ -2552,7 +2568,7 @@ End Sub Sub B_MARCAS_Click Panel5.Visible = True - + Panel5.BringToFront pnlTitle.Visible = False pnlTitle.SetLayoutAnimated(0, 0, 0, CLV1.AsView.Width, TitleHeight + DividerHeight) pnlTitle.LoadLayout("CellTitle") diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 2729e58..830789d 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -571,23 +571,23 @@ File610=carrito.png File611=celltitle.bal File612=Cliente.bal File613=Clientes.bal -File614=detalle_promo.bal -File615=durakelo.png -File616=durakelo_192x192.png -File617=durakelo1.png -File618=encuesta.bal -File619=engrane.jpg +File614=colgate.png +File615=detalle_promo.bal +File616=durakelo.png +File617=durakelo_192x192.png +File618=durakelo1.png +File619=encuesta.bal File62=117marker-verde.png -File620=engrane3.png -File621=espera.gif -File622=fondo_kmt.jpg -File623=foto.bal -File624=guardagestion.bal -File625=guna_viejo.png -File626=infonavit1.jpg -File627=itembuttonblue.png -File628=k.png -File629=K-b27c0809.png +File620=engrane.jpg +File621=engrane3.png +File622=espera.gif +File623=fondo_kmt.jpg +File624=foto.bal +File625=guardagestion.bal +File626=guna_viejo.png +File627=infonavit1.jpg +File628=itembuttonblue.png +File629=k.png File63=118.png File630=kelloggs.png File631=keymon_logo.png @@ -1393,12 +1393,12 @@ Module9=C_NoVenta NumberOfFiles=667 NumberOfLibraries=31 NumberOfModules=24 -Version=12.5 +Version=12.8 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.04.02ENCU + #VersionName: 4.04.03ENCU 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -1426,8 +1426,6 @@ Sub Activity_Create(FirstTime As Boolean) pm.Initialize(Activity) End Sub - - 'Template version: B4A-1.01 #Region Delegates diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 3338b4d..63b0eb6 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -73,6 +73,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_Cliente,B_IMP_Click,675,0,C_Cliente,Class_Globals,132,0,C_Principal,Class_Globals,0,0,C_Principal,trabajar_Click,436,0,C_Principal,connecta_Click,1958,0,C_Principal,BUSCA_Click,1973,0,Diseñador Visual,principal.bal,-100,6,C_Cliente,B4XPage_Appear,213,2,C_Cliente,B_VENTA_Click,1194,0,C_Cliente,gest_Click,387,0 +NavigationStack=C_Principal,connecta_Click,1970,0,C_Cliente,B_INV_Click,1097,0,Main,Globals,25,0,C_Cliente,B4XPage_Appear,224,0,B4XMainPage,B4XPage_Appear,212,0,Subs,fechanormal,1396,0,C_Principal,cargar_Click,940,6,C_Principal,JobDone,1127,6,C_Cliente,B_IMP_Click,659,6,C_Cliente,B_IMP2_Click,923,6 SelectedBuild=0 -VisibleModules=1,2,10,4,5,6,8,9,11,24 +VisibleModules=1,2,10,4,5,6,8,9,11,24,23 diff --git a/B4A/Files/colgate.png b/B4A/Files/colgate.png new file mode 100644 index 0000000..b8d446b Binary files /dev/null and b/B4A/Files/colgate.png differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 2449dcc..b5a91dd 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ