diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 0005e6b..d148df7 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,10 +1,16 @@ { "ExpandedNodes": [ +<<<<<<< HEAD "", "\\admin", "\\Empleados", "\\Ventas" ], "SelectedNode": "\\admin\\editar.cs", +======= + "" + ], + "SelectedNode": "\\Solution.sln", +>>>>>>> 68bcb453d1be6aa4af940b43aa4a1848e71b2c46 "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/compabetov2.csproj.dtbcache.json b/.vs/compabetov2.csproj.dtbcache.json index 8d8fe80..9617e83 100644 --- a/.vs/compabetov2.csproj.dtbcache.json +++ b/.vs/compabetov2.csproj.dtbcache.json @@ -1 +1 @@ -{"RootPath":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"admin\\crud.cs"},{"SourceFile":"admin\\crud.Designer.cs"},{"SourceFile":"admin\\editar.cs"},{"SourceFile":"admin\\editar.Designer.cs"},{"SourceFile":"database\\modelos\\DetalleEnvioModel.cs"},{"SourceFile":"database\\modelos\\DetalleImporte.cs"},{"SourceFile":"database\\modelos\\DetalleImporteCuenta.cs"},{"SourceFile":"database\\modelos\\DetalleImporteEnvio.cs"},{"SourceFile":"database\\modelos\\Envio.cs"},{"SourceFile":"database\\modelos\\ImporteModel.cs"},{"SourceFile":"database\\modelos\\Variante.cs"},{"SourceFile":"Empleados\\AgregarEmpleado1.cs"},{"SourceFile":"Empleados\\AgregarEmpleado1.Designer.cs"},{"SourceFile":"Empleados\\AgregarLogin1.cs"},{"SourceFile":"Empleados\\AgregarLogin1.Designer.cs"},{"SourceFile":"Empleados\\EditarEmpleado1.cs"},{"SourceFile":"Empleados\\EditarEmpleado1.Designer.cs"},{"SourceFile":"Estadiscticas.cs"},{"SourceFile":"Estadiscticas.Designer.cs"},{"SourceFile":"Merma\\ActualizarMerma.cs"},{"SourceFile":"Merma\\ActualizarMerma.Designer.cs"},{"SourceFile":"Empleados\\AgregarEmpleado.cs"},{"SourceFile":"Empleados\\AgregarEmpleado.Designer.cs"},{"SourceFile":"Empleados\\AgregarLogin.cs"},{"SourceFile":"Empleados\\AgregarLogin.Designer.cs"},{"SourceFile":"Merma\\agregarmermas.cs"},{"SourceFile":"Merma\\agregarmermas.Designer.cs"},{"SourceFile":"Cuentas\\cuentas.cs"},{"SourceFile":"Cuentas\\cuentas.Designer.cs"},{"SourceFile":"database\\conexion.cs"},{"SourceFile":"database\\DAO.cs"},{"SourceFile":"database\\modelos\\Categoria.cs"},{"SourceFile":"database\\modelos\\Cliente.cs"},{"SourceFile":"database\\modelos\\Cuenta.cs"},{"SourceFile":"database\\modelos\\DetalleCuentaModel.cs"},{"SourceFile":"database\\modelos\\DetalleVentaModel.cs"},{"SourceFile":"database\\modelos\\Empleado.cs"},{"SourceFile":"database\\modelos\\LoginModel.cs"},{"SourceFile":"database\\modelos\\Merma.cs"},{"SourceFile":"database\\modelos\\Producto.cs"},{"SourceFile":"database\\modelos\\usuario.cs"},{"SourceFile":"database\\modelos\\VentaModel.cs"},{"SourceFile":"database\\service.cs"},{"SourceFile":"Empleados\\EditarEmpleado.cs"},{"SourceFile":"Empleados\\EditarEmpleado.Designer.cs"},{"SourceFile":"Envios\\envios.cs"},{"SourceFile":"Envios\\envios.Designer.cs"},{"SourceFile":"Inventario\\inventario.cs"},{"SourceFile":"Inventario\\inventario.Designer.cs"},{"SourceFile":"Principal\\login.cs"},{"SourceFile":"Principal\\login.Designer.cs"},{"SourceFile":"Principal\\MenuPrincipal.cs"},{"SourceFile":"Principal\\MenuPrincipal.Designer.cs"},{"SourceFile":"Merma\\mermas.cs"},{"SourceFile":"Merma\\mermas.Designer.cs"},{"SourceFile":"Empleados\\ModificarContra.cs"},{"SourceFile":"Empleados\\ModificarContra.Designer.cs"},{"SourceFile":"Empleados\\personal.cs"},{"SourceFile":"Empleados\\personal.Designer.cs"},{"SourceFile":"Empleados\\preguntaLogin.cs"},{"SourceFile":"Empleados\\preguntaLogin.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SqlServerTypes\\Loader.cs"},{"SourceFile":"Ventas\\datosCuenta.cs"},{"SourceFile":"Ventas\\datosCuenta.Designer.cs"},{"SourceFile":"Ventas\\datosEnvio.cs"},{"SourceFile":"Ventas\\datosEnvio.Designer.cs"},{"SourceFile":"Ventas\\Importe.cs"},{"SourceFile":"Ventas\\Importe.Designer.cs"},{"SourceFile":"Ventas\\Importe1.cs"},{"SourceFile":"Ventas\\Importe1.Designer.cs"},{"SourceFile":"Ventas\\vender.cs"},{"SourceFile":"Ventas\\vender.Designer.cs"},{"SourceFile":"Merma\\verMerma.cs"},{"SourceFile":"Merma\\verMerma.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\bin\\Debug\\compabetov2.exe","OutputItemRelativePath":"compabetov2.exe"},{"OutputItemFullPath":"C:\\Users\\Googl\\Source\\Repos\\aspermaster23yeh\\compabetoOG\\bin\\Debug\\compabetov2.pdb","OutputItemRelativePath":"compabetov2.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file +{"RootPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"admin\\crud.cs"},{"SourceFile":"admin\\crud.Designer.cs"},{"SourceFile":"admin\\editar.cs"},{"SourceFile":"admin\\editar.Designer.cs"},{"SourceFile":"database\\modelos\\DetalleEnvioModel.cs"},{"SourceFile":"database\\modelos\\DetalleImporte.cs"},{"SourceFile":"database\\modelos\\DetalleImporteCuenta.cs"},{"SourceFile":"database\\modelos\\DetalleImporteEnvio.cs"},{"SourceFile":"database\\modelos\\Envio.cs"},{"SourceFile":"database\\modelos\\ImporteModel.cs"},{"SourceFile":"database\\modelos\\Variante.cs"},{"SourceFile":"Empleados\\AgregarEmpleado1.cs"},{"SourceFile":"Empleados\\AgregarEmpleado1.Designer.cs"},{"SourceFile":"Empleados\\AgregarLogin1.cs"},{"SourceFile":"Empleados\\AgregarLogin1.Designer.cs"},{"SourceFile":"Empleados\\EditarEmpleado1.cs"},{"SourceFile":"Empleados\\EditarEmpleado1.Designer.cs"},{"SourceFile":"Estadiscticas.cs"},{"SourceFile":"Estadiscticas.Designer.cs"},{"SourceFile":"Merma\\ActualizarMerma.cs"},{"SourceFile":"Merma\\ActualizarMerma.Designer.cs"},{"SourceFile":"Empleados\\AgregarEmpleado.cs"},{"SourceFile":"Empleados\\AgregarEmpleado.Designer.cs"},{"SourceFile":"Empleados\\AgregarLogin.cs"},{"SourceFile":"Empleados\\AgregarLogin.Designer.cs"},{"SourceFile":"Merma\\agregarmermas.cs"},{"SourceFile":"Merma\\agregarmermas.Designer.cs"},{"SourceFile":"Cuentas\\cuentas.cs"},{"SourceFile":"Cuentas\\cuentas.Designer.cs"},{"SourceFile":"database\\conexion.cs"},{"SourceFile":"database\\DAO.cs"},{"SourceFile":"database\\modelos\\Categoria.cs"},{"SourceFile":"database\\modelos\\Cliente.cs"},{"SourceFile":"database\\modelos\\Cuenta.cs"},{"SourceFile":"database\\modelos\\DetalleCuentaModel.cs"},{"SourceFile":"database\\modelos\\DetalleVentaModel.cs"},{"SourceFile":"database\\modelos\\Empleado.cs"},{"SourceFile":"database\\modelos\\LoginModel.cs"},{"SourceFile":"database\\modelos\\Merma.cs"},{"SourceFile":"database\\modelos\\Producto.cs"},{"SourceFile":"database\\modelos\\usuario.cs"},{"SourceFile":"database\\modelos\\VentaModel.cs"},{"SourceFile":"database\\service.cs"},{"SourceFile":"Empleados\\EditarEmpleado.cs"},{"SourceFile":"Empleados\\EditarEmpleado.Designer.cs"},{"SourceFile":"Envios\\envios.cs"},{"SourceFile":"Envios\\envios.Designer.cs"},{"SourceFile":"Inventario\\inventario.cs"},{"SourceFile":"Inventario\\inventario.Designer.cs"},{"SourceFile":"Principal\\login.cs"},{"SourceFile":"Principal\\login.Designer.cs"},{"SourceFile":"Principal\\MenuPrincipal.cs"},{"SourceFile":"Principal\\MenuPrincipal.Designer.cs"},{"SourceFile":"Merma\\mermas.cs"},{"SourceFile":"Merma\\mermas.Designer.cs"},{"SourceFile":"Empleados\\ModificarContra.cs"},{"SourceFile":"Empleados\\ModificarContra.Designer.cs"},{"SourceFile":"Empleados\\personal.cs"},{"SourceFile":"Empleados\\personal.Designer.cs"},{"SourceFile":"Empleados\\preguntaLogin.cs"},{"SourceFile":"Empleados\\preguntaLogin.Designer.cs"},{"SourceFile":"Program.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"SqlServerTypes\\Loader.cs"},{"SourceFile":"Ventas\\datosCuenta.cs"},{"SourceFile":"Ventas\\datosCuenta.Designer.cs"},{"SourceFile":"Ventas\\datosEnvio.cs"},{"SourceFile":"Ventas\\datosEnvio.Designer.cs"},{"SourceFile":"Ventas\\Importe.cs"},{"SourceFile":"Ventas\\Importe.Designer.cs"},{"SourceFile":"Ventas\\Importe1.cs"},{"SourceFile":"Ventas\\Importe1.Designer.cs"},{"SourceFile":"Ventas\\vender.cs"},{"SourceFile":"Ventas\\vender.Designer.cs"},{"SourceFile":"Merma\\verMerma.cs"},{"SourceFile":"Merma\\verMerma.Designer.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\EntityFramework.6.4.4\\lib\\net45\\EntityFramework.SqlServer.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\Microsoft.SqlServer.Types.14.0.314.76\\lib\\net40\\Microsoft.SqlServer.Types.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\\lib\\net46\\System.Data.SQLite.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\System.Data.SQLite.EF6.1.0.118.0\\lib\\net46\\System.Data.SQLite.EF6.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\packages\\System.Data.SQLite.Linq.1.0.118.0\\lib\\net46\\System.Data.SQLite.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\bin\\Debug\\compabetov2.exe","OutputItemRelativePath":"compabetov2.exe"},{"OutputItemFullPath":"C:\\Users\\carsu\\source\\repos\\compabetoOG\\bin\\Debug\\compabetov2.pdb","OutputItemRelativePath":"compabetov2.pdb"}],"CopyToOutputEntries":[]} \ No newline at end of file diff --git a/admin/Variantes.Designer.cs b/admin/Variantes.Designer.cs new file mode 100644 index 0000000..3905724 --- /dev/null +++ b/admin/Variantes.Designer.cs @@ -0,0 +1,76 @@ +namespace compabetov2.admin +{ + partial class Variantes + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.VariantePanel = new System.Windows.Forms.FlowLayoutPanel(); + this.btnAgregar = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // VariantePanel + // + this.VariantePanel.AutoScroll = true; + this.VariantePanel.BackColor = System.Drawing.SystemColors.Control; + this.VariantePanel.Location = new System.Drawing.Point(13, 59); + this.VariantePanel.Name = "VariantePanel"; + this.VariantePanel.Size = new System.Drawing.Size(1146, 516); + this.VariantePanel.TabIndex = 16; + this.VariantePanel.Paint += new System.Windows.Forms.PaintEventHandler(this.VariantePanel_Paint); + // + // btnAgregar + // + this.btnAgregar.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnAgregar.Location = new System.Drawing.Point(543, 12); + this.btnAgregar.Name = "btnAgregar"; + this.btnAgregar.Size = new System.Drawing.Size(94, 40); + this.btnAgregar.TabIndex = 17; + this.btnAgregar.Text = "Agregar"; + this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); + // + // Variantes + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1171, 587); + this.Controls.Add(this.btnAgregar); + this.Controls.Add(this.VariantePanel); + this.Margin = new System.Windows.Forms.Padding(2); + this.Name = "Variantes"; + this.Text = "Variantes"; + this.Load += new System.EventHandler(this.Variantes_Load); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.FlowLayoutPanel VariantePanel; + private System.Windows.Forms.Button btnAgregar; + } +} \ No newline at end of file diff --git a/admin/Variantes.cs b/admin/Variantes.cs new file mode 100644 index 0000000..596b08c --- /dev/null +++ b/admin/Variantes.cs @@ -0,0 +1,154 @@ +using compabetov2.database; +using compabetov2.database.modelos; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace compabetov2.admin +{ + public partial class Variantes : Form + { + private crud ventanaPadre; + private Producto producto; + private List variantes = new List(); + public Variantes(crud ventanaPadre, Producto producto) + { + this.ventanaPadre = ventanaPadre; + this.producto = producto; + InitializeComponent(); + llenarLayout(); + } + + public void llenarLayout() + { + VariantePanel.Controls.Clear(); + variantes.Clear(); + variantes = service.conseguirVariante(producto.idProducto); + + + foreach (Variante variante in variantes) + { + TableLayoutPanel filaLayout = new TableLayoutPanel(); + filaLayout.RowCount = 1; + filaLayout.ColumnCount = 2; + filaLayout.Height = 100; + filaLayout.Width = 1115; + filaLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); + filaLayout.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F)); + filaLayout.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + + + TableLayoutPanel informacionProducto = new TableLayoutPanel(); + informacionProducto.RowCount = 1; + informacionProducto.ColumnCount = 2; + informacionProducto.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 20F)); + informacionProducto.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 80F)); + informacionProducto.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + informacionProducto.Dock = DockStyle.Fill; + + Label idProducto = new Label(); + idProducto.Text = variante.idVariante.ToString(); + idProducto.BackColor = Color.FromArgb(82, 82, 82); + idProducto.ForeColor = Color.White; + idProducto.AutoSize = true; + idProducto.Dock = DockStyle.Left; + + PictureBox imagen = new PictureBox(); + string rutaImg = Path.Combine(Application.StartupPath, "Resources", variante.img); + imagen.Image = Image.FromFile(rutaImg); + imagen.Dock = DockStyle.Fill; + imagen.BackgroundImageLayout = ImageLayout.Stretch; + imagen.SizeMode = PictureBoxSizeMode.Zoom; + imagen.Controls.Add(idProducto); + + + Label nombreStock = new Label(); + nombreStock.Text = variante.nombre + " - $" + variante.precio; + nombreStock.Font = new Font(nombreStock.Font.FontFamily, 14); + nombreStock.Dock = DockStyle.Fill; + nombreStock.TextAlign = ContentAlignment.MiddleCenter; + + //panel de agregar stock + TableLayoutPanel agregarPanel = new TableLayoutPanel(); + agregarPanel.Dock = DockStyle.Fill; + agregarPanel.RowCount = 1; + agregarPanel.ColumnCount = 2; + agregarPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); + agregarPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); + agregarPanel.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33F)); + agregarPanel.RowStyles.Add(new RowStyle(SizeType.Percent, 100F)); + + Button btnEditar = new Button(); + btnEditar.Text = "Editar"; + btnEditar.Font = new Font(btnEditar.Font.FontFamily, 20); + btnEditar.ForeColor = Color.White; + btnEditar.FlatStyle = FlatStyle.Flat; + btnEditar.FlatAppearance.BorderSize = 0; + btnEditar.BackColor = Color.FromArgb(33, 90, 255); + btnEditar.Dock = DockStyle.Fill; + btnEditar.Click += new EventHandler(delegate (object sender, EventArgs e) + { + + }); + + + Button btnEliminar = new Button(); + btnEliminar.Text = "Eliminar"; + btnEliminar.Font = new Font(btnEliminar.Font.FontFamily, 20); + btnEliminar.ForeColor = Color.White; + btnEliminar.FlatStyle = FlatStyle.Flat; + btnEliminar.FlatAppearance.BorderSize = 0; + btnEliminar.BackColor = Color.Red; + btnEliminar.Dock = DockStyle.Fill; + btnEliminar.Click += new EventHandler(delegate (object sender, EventArgs e) + { + DialogResult result = MessageBox.Show($"¿Está seguro de que desea eliminar el producto {producto.nombre}?", + "Confirmación", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (result == DialogResult.Yes) + { + if (service.eliminarVariante(variante.idVariante)) + { + llenarLayout(); + } + } + }); + + + + informacionProducto.Controls.Add(imagen, 0, 0); + informacionProducto.Controls.Add(nombreStock, 1, 0); + + agregarPanel.Controls.Add(btnEditar, 0, 0); + agregarPanel.Controls.Add(btnEliminar, 1, 0); + + filaLayout.Controls.Add(informacionProducto, 0, 0); + filaLayout.Controls.Add(agregarPanel, 1, 0); + VariantePanel.Controls.Add(filaLayout); + } + } + + private void Variantes_Load(object sender, EventArgs e) + { + + } + + private void btnAgregar_Click(object sender, EventArgs e) + { + addvariante ventana = new addvariante(producto,this); + ventana.Owner = this; + ventana.Show(); + } + + private void VariantePanel_Paint(object sender, PaintEventArgs e) + { + + } + } +} diff --git a/admin/Variantes.resx b/admin/Variantes.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/admin/Variantes.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/admin/addvariante.Designer.cs b/admin/addvariante.Designer.cs index 7e813f5..84a7222 100644 --- a/admin/addvariante.Designer.cs +++ b/admin/addvariante.Designer.cs @@ -32,11 +32,11 @@ this.label2 = new System.Windows.Forms.Label(); this.txtNombre = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.textBox1 = new System.Windows.Forms.TextBox(); + this.txtCantidad = new System.Windows.Forms.TextBox(); this.label3 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.lbImg = new System.Windows.Forms.Label(); - this.textBox2 = new System.Windows.Forms.TextBox(); + this.txtPrecioCompra = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); @@ -47,10 +47,9 @@ // txtPrecio // this.txtPrecio.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtPrecio.Location = new System.Drawing.Point(250, 252); - this.txtPrecio.Margin = new System.Windows.Forms.Padding(4); + this.txtPrecio.Location = new System.Drawing.Point(188, 205); this.txtPrecio.Name = "txtPrecio"; - this.txtPrecio.Size = new System.Drawing.Size(399, 30); + this.txtPrecio.Size = new System.Drawing.Size(300, 26); this.txtPrecio.TabIndex = 37; // // label2 @@ -59,20 +58,18 @@ this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.Transparent; - this.label2.Location = new System.Drawing.Point(245, 209); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(184, 170); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(89, 29); + this.label2.Size = new System.Drawing.Size(69, 24); this.label2.TabIndex = 38; this.label2.Text = "Precio:"; // // txtNombre // this.txtNombre.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtNombre.Location = new System.Drawing.Point(250, 163); - this.txtNombre.Margin = new System.Windows.Forms.Padding(4); + this.txtNombre.Location = new System.Drawing.Point(188, 132); this.txtNombre.Name = "txtNombre"; - this.txtNombre.Size = new System.Drawing.Size(399, 30); + this.txtNombre.Size = new System.Drawing.Size(300, 26); this.txtNombre.TabIndex = 35; // // label1 @@ -81,21 +78,19 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Transparent; - this.label1.Location = new System.Drawing.Point(245, 121); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(184, 98); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(107, 29); + this.label1.Size = new System.Drawing.Size(84, 24); this.label1.TabIndex = 36; this.label1.Text = "Nombre:"; // - // textBox1 + // txtCantidad // - this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox1.Location = new System.Drawing.Point(250, 337); - this.textBox1.Margin = new System.Windows.Forms.Padding(4); - this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(399, 30); - this.textBox1.TabIndex = 39; + this.txtCantidad.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtCantidad.Location = new System.Drawing.Point(188, 274); + this.txtCantidad.Name = "txtCantidad"; + this.txtCantidad.Size = new System.Drawing.Size(300, 26); + this.txtCantidad.TabIndex = 39; // // label3 // @@ -103,10 +98,9 @@ this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.Transparent; - this.label3.Location = new System.Drawing.Point(245, 294); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label3.Location = new System.Drawing.Point(184, 239); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(115, 29); + this.label3.Size = new System.Drawing.Size(89, 24); this.label3.TabIndex = 40; this.label3.Text = "Cantidad:"; // @@ -114,12 +108,14 @@ // this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.button1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.button1.Location = new System.Drawing.Point(250, 393); + this.button1.Location = new System.Drawing.Point(188, 319); + this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(103, 46); + this.button1.Size = new System.Drawing.Size(77, 37); this.button1.TabIndex = 42; this.button1.Text = "Subir"; this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); // // lbImg // @@ -127,21 +123,19 @@ this.lbImg.BackColor = System.Drawing.Color.Transparent; this.lbImg.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbImg.ForeColor = System.Drawing.Color.Transparent; - this.lbImg.Location = new System.Drawing.Point(360, 399); - this.lbImg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbImg.Location = new System.Drawing.Point(270, 324); this.lbImg.Name = "lbImg"; - this.lbImg.Size = new System.Drawing.Size(99, 29); + this.lbImg.Size = new System.Drawing.Size(78, 24); this.lbImg.TabIndex = 41; this.lbImg.Text = "Imagen:"; // - // textBox2 + // txtPrecioCompra // - this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.textBox2.Location = new System.Drawing.Point(250, 488); - this.textBox2.Margin = new System.Windows.Forms.Padding(4); - this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(399, 30); - this.textBox2.TabIndex = 43; + this.txtPrecioCompra.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txtPrecioCompra.Location = new System.Drawing.Point(188, 396); + this.txtPrecioCompra.Name = "txtPrecioCompra"; + this.txtPrecioCompra.Size = new System.Drawing.Size(300, 26); + this.txtPrecioCompra.TabIndex = 43; // // label4 // @@ -149,10 +143,9 @@ this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label4.ForeColor = System.Drawing.Color.Transparent; - this.label4.Location = new System.Drawing.Point(245, 455); - this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label4.Location = new System.Drawing.Point(184, 370); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(181, 29); + this.label4.Size = new System.Drawing.Size(141, 24); this.label4.TabIndex = 44; this.label4.Text = "Precio Compra:"; // @@ -161,39 +154,43 @@ this.pictureBox2.BackColor = System.Drawing.Color.Transparent; this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.pictureBox2.Image = global::compabetov2.Properties.Resources.check1; - this.pictureBox2.Location = new System.Drawing.Point(353, 540); + this.pictureBox2.Location = new System.Drawing.Point(265, 439); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(100, 69); + this.pictureBox2.Size = new System.Drawing.Size(75, 56); this.pictureBox2.TabIndex = 46; this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); // // pictureBox1 // this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.pictureBox1.Image = global::compabetov2.Properties.Resources.cancel1; - this.pictureBox1.Location = new System.Drawing.Point(459, 540); + this.pictureBox1.Location = new System.Drawing.Point(344, 439); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(100, 69); + this.pictureBox1.Size = new System.Drawing.Size(75, 56); this.pictureBox1.TabIndex = 45; this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // // addvariante // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); this.BackgroundImage = global::compabetov2.Properties.Resources.Form; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(897, 621); + this.ClientSize = new System.Drawing.Size(673, 505); this.ControlBox = false; this.Controls.Add(this.pictureBox2); this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.textBox2); + this.Controls.Add(this.txtPrecioCompra); this.Controls.Add(this.label4); this.Controls.Add(this.button1); this.Controls.Add(this.lbImg); - this.Controls.Add(this.textBox1); + this.Controls.Add(this.txtCantidad); this.Controls.Add(this.label3); this.Controls.Add(this.txtPrecio); this.Controls.Add(this.label2); @@ -201,6 +198,7 @@ this.Controls.Add(this.label1); this.DoubleBuffered = true; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "addvariante"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); @@ -216,11 +214,11 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtNombre; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.TextBox txtCantidad; private System.Windows.Forms.Label label3; private System.Windows.Forms.Button button1; private System.Windows.Forms.Label lbImg; - private System.Windows.Forms.TextBox textBox2; + private System.Windows.Forms.TextBox txtPrecioCompra; private System.Windows.Forms.Label label4; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox1; diff --git a/admin/addvariante.cs b/admin/addvariante.cs index eb402ba..f6e1154 100644 --- a/admin/addvariante.cs +++ b/admin/addvariante.cs @@ -1,8 +1,11 @@ -using System; +using compabetov2.database; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -12,9 +15,83 @@ namespace compabetov2.admin { public partial class addvariante : Form { - public addvariante() + private string imagePath = ""; + private Producto producto; + Variantes ventanaPadre; + public addvariante(Producto producto, Variantes ventanaPadre) { InitializeComponent(); + this.ventanaPadre = ventanaPadre; + this.producto = producto; + } + + private void pictureBox1_Click(object sender, EventArgs e) + { + Close(); + } + + private void pictureBox2_Click(object sender, EventArgs e) + { + if (isInt(txtCantidad.Text) && isDecimal(txtPrecio.Text) && isDecimal(txtPrecioCompra.Text)) { + Variante NuevaVariante = new Variante( + -1, + txtNombre.Text, + Decimal.Parse(txtPrecio.Text), + int.Parse(txtCantidad.Text), + imagePath, + producto.idProducto, + Decimal.Parse(txtPrecioCompra.Text) + ); + + if (service.insertarVariante(NuevaVariante)) + { + Close(); + ventanaPadre.llenarLayout(); + } + } + } + + private static bool isInt(string cadena) + { + try + { + int.Parse(cadena); + return true; + } + catch + { + MessageBox.Show("Por favor introduzca un precio valido", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + return false; + } + } + + private static bool isDecimal(string cadena) + { + try + { + Decimal.Parse(cadena); + return true; + } + catch + { + MessageBox.Show("Por favor introduzca un precio valido", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + + return false; + } + } + + private void button1_Click(object sender, EventArgs e) + { + OpenFileDialog openFileDialog1 = new OpenFileDialog(); + + openFileDialog1.Filter = "Archivos de imagen (*.jpg, *.jpeg, *.png, *.bmp)|*.jpg;*.jpeg;*.png;*.bmp"; + openFileDialog1.Title = "Seleccionar imagen"; + + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + imagePath = openFileDialog1.FileName; + lbImg.Text = $"Imagen: {Path.GetFileName(imagePath)}"; + } } } } diff --git a/admin/agregarproducto.Designer.cs b/admin/agregarproducto.Designer.cs index ceee01a..b591a51 100644 --- a/admin/agregarproducto.Designer.cs +++ b/admin/agregarproducto.Designer.cs @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - this.button1 = new System.Windows.Forms.Button(); + this.btnSubir = new System.Windows.Forms.Button(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.lbImg = new System.Windows.Forms.Label(); @@ -40,16 +40,17 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // - // button1 + // btnSubir // - this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.button1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.button1.Location = new System.Drawing.Point(243, 312); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(103, 46); - this.button1.TabIndex = 38; - this.button1.Text = "Subir"; - this.button1.UseVisualStyleBackColor = true; + this.btnSubir.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnSubir.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.btnSubir.Location = new System.Drawing.Point(243, 312); + this.btnSubir.Name = "btnSubir"; + this.btnSubir.Size = new System.Drawing.Size(103, 46); + this.btnSubir.TabIndex = 38; + this.btnSubir.Text = "Subir"; + this.btnSubir.UseVisualStyleBackColor = true; + this.btnSubir.Click += new System.EventHandler(this.button1_Click); // // pictureBox2 // @@ -61,6 +62,7 @@ this.pictureBox2.Size = new System.Drawing.Size(100, 69); this.pictureBox2.TabIndex = 37; this.pictureBox2.TabStop = false; + this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); // // pictureBox1 // @@ -72,6 +74,7 @@ this.pictureBox1.Size = new System.Drawing.Size(100, 69); this.pictureBox1.TabIndex = 36; this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // // lbImg // @@ -139,7 +142,7 @@ this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(897, 575); this.ControlBox = false; - this.Controls.Add(this.button1); + this.Controls.Add(this.btnSubir); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.lbImg); @@ -161,7 +164,7 @@ #endregion - private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button btnSubir; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label lbImg; diff --git a/admin/agregarproducto.cs b/admin/agregarproducto.cs index 8f66428..1e32297 100644 --- a/admin/agregarproducto.cs +++ b/admin/agregarproducto.cs @@ -1,8 +1,11 @@ -using System; +using compabetov2.database; +using compabetov2.database.modelos; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -12,9 +15,61 @@ namespace compabetov2.admin { public partial class agregarproducto : Form { - public agregarproducto() + private crud ventanaPadre; + private string imagePath = ""; + public agregarproducto(crud ventanaPadre) { + this.ventanaPadre = ventanaPadre; InitializeComponent(); } + + private void pictureBox2_Click(object sender, EventArgs e) + { + try + { + string nombre = txtNombre.Text; + decimal precio = decimal.Parse(txtPrecio.Text); + //valida que se haya colocado alguna imagen + if (!imagePath.Equals("")) { + Producto producto = new Producto(-1, nombre, "", precio, imagePath, 0); + if (service.insertarProducto(producto)) + { + string destinationFolder = Path.Combine(Application.StartupPath, "Resources"); + string destinationFile = Path.Combine(destinationFolder, Path.GetFileName(imagePath)); + File.Copy(imagePath, destinationFile, true); + + Close(); + ventanaPadre.llenarLayout(); + } + } + else + { + MessageBox.Show("Por favor seleccione alguna imagen", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + + } + catch { + MessageBox.Show("Por favor introduzca un precio valido", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void button1_Click(object sender, EventArgs e) + { + OpenFileDialog openFileDialog1 = new OpenFileDialog(); + + openFileDialog1.Filter = "Archivos de imagen (*.jpg, *.jpeg, *.png, *.bmp)|*.jpg;*.jpeg;*.png;*.bmp"; + openFileDialog1.Title = "Seleccionar imagen"; + + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + imagePath = openFileDialog1.FileName; + lbImg.Text = $"Imagen: {Path.GetFileName(imagePath)}"; + } + } + + private void pictureBox1_Click(object sender, EventArgs e) + { + Close(); + } } } diff --git a/admin/crud.Designer.cs b/admin/crud.Designer.cs index 8836728..24bcf0d 100644 --- a/admin/crud.Designer.cs +++ b/admin/crud.Designer.cs @@ -169,6 +169,7 @@ this.btnAgregar.TabIndex = 15; this.btnAgregar.Text = "Agregar"; this.btnAgregar.UseVisualStyleBackColor = true; + this.btnAgregar.Click += new System.EventHandler(this.btnAgregar_Click); // // crud // diff --git a/admin/crud.cs b/admin/crud.cs index d46de24..bef003a 100644 --- a/admin/crud.cs +++ b/admin/crud.cs @@ -24,9 +24,12 @@ namespace compabetov2.admin llenarLayout(); } - private void llenarLayout() + public void llenarLayout() { + AdminPanel.Controls.Clear(); + productos.Clear(); productos = service.conseguirProductos(); + foreach (Producto producto in productos) { @@ -107,6 +110,9 @@ namespace compabetov2.admin btnVariante.Dock = DockStyle.Fill; btnVariante.Click += new EventHandler(delegate (object sender, EventArgs e) { + Variantes variantes = new Variantes(this, producto); + variantes.Owner = this; + variantes.Show(); }); Button btnEliminar = new Button(); @@ -119,7 +125,37 @@ namespace compabetov2.admin btnEliminar.Dock = DockStyle.Fill; btnEliminar.Click += new EventHandler(delegate (object sender, EventArgs e) { - + DialogResult result = MessageBox.Show($"¿Está seguro de que desea eliminar el producto {producto.nombre}?", + "Confirmación", MessageBoxButtons.YesNo, MessageBoxIcon.Question); + if (result == DialogResult.Yes) + { + if (service.eliminarProducto(producto)) + { + //eliminar imagen antigua + string destinationFolder = Path.Combine(Application.StartupPath, "Resources"); + string imagenEliminada = Path.Combine(destinationFolder, producto.img); + llenarLayout(); + //se pone a esperar 1 segundo antes de eliminar la imagen + //esto para que al programa le de tiempo de dejar de utilizar la imagen y no lance una excepcion + Timer timer = new Timer(); + timer.Interval = 1000; // 1 segundos + timer.Tick += delegate (object sender2, EventArgs e2) + { + try + { + File.Delete(imagenEliminada); + timer.Stop(); + } + catch (Exception ex) + { + // Manejar la excepción de eliminación de archivo temporal + Console.WriteLine("Error al eliminar archivo temporal: " + ex.Message); + } + }; + timer.Start(); + + } + } }); @@ -131,13 +167,12 @@ namespace compabetov2.admin agregarPanel.Controls.Add(btnVariante, 1, 0); agregarPanel.Controls.Add(btnEliminar, 2, 0); - filaLayout.Controls.Add(informacionProducto, 0, 0); filaLayout.Controls.Add(agregarPanel, 1, 0); AdminPanel.Controls.Add(filaLayout); } } - + private void crud_Load(object sender, EventArgs e) { @@ -169,5 +204,12 @@ namespace compabetov2.admin menuprincipalForm.BringToFront(); } } + + private void btnAgregar_Click(object sender, EventArgs e) + { + agregarproducto agregarproducto = new agregarproducto(this); + agregarproducto.Owner = this; + agregarproducto.Show(); + } } } diff --git a/admin/editar.cs b/admin/editar.cs index ae44b73..77728b6 100644 --- a/admin/editar.cs +++ b/admin/editar.cs @@ -1,4 +1,5 @@ -using compabetov2.database.modelos; +using compabetov2.database; +using compabetov2.database.modelos; using System; using System.Collections.Generic; using System.ComponentModel; @@ -59,7 +60,57 @@ namespace compabetov2.admin { try { decimal precio = decimal.Parse(txtPrecio.Text); - }catch(Exception ex) + string nombre = txtNombre.Text; + //en caso de que descida cambiar la imagen + if (!imagePath.Equals("")) + { + Producto productoNuevo = new Producto(producto.idProducto, nombre, "", precio, imagePath, 0); + if (service.editarProducto(productoNuevo)) + { + //guardar imagen nueva + string destinationFolder = Path.Combine(Application.StartupPath, "Resources"); + string destinationFile = Path.Combine(destinationFolder, Path.GetFileName(imagePath)); + File.Copy(imagePath, destinationFile, true); + + ventanaPadre.llenarLayout(); + + + //eliminar imagen antigua + string imagenEliminada = Path.Combine(destinationFolder, producto.img); + //se pone a esperar 1 segundo antes de eliminar la imagen + //esto para que al programa le de tiempo de dejar de utilizar la imagen y no lance una excepcion + Timer timer = new Timer(); + timer.Interval = 1000; // 1 segundos + timer.Tick += delegate (object sender2, EventArgs e2) + { + try + { + File.Delete(imagenEliminada); + timer.Stop(); + } + catch (Exception ex) + { + // Manejar la excepción de eliminación de archivo temporal + Console.WriteLine("Error al eliminar archivo temporal: " + ex.Message); + } + }; + + Close(); + + } + } + else + { + // si la imagen no es modificada + Producto productoNuevo = new Producto(producto.idProducto, nombre, "", precio, producto.img, 0); + if (service.editarProducto(productoNuevo)) + { + ventanaPadre.llenarLayout(); + Close(); + } + } + } + catch(Exception ex) { MessageBox.Show("Por favor introduzca un precio valido", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } diff --git a/admin/editarvariante.Designer.cs b/admin/editarvariante.Designer.cs new file mode 100644 index 0000000..1717f62 --- /dev/null +++ b/admin/editarvariante.Designer.cs @@ -0,0 +1,39 @@ +namespace compabetov2.admin +{ + partial class editarvariante + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "editarvariante"; + } + + #endregion + } +} \ No newline at end of file diff --git a/admin/editarvariante.cs b/admin/editarvariante.cs new file mode 100644 index 0000000..f110364 --- /dev/null +++ b/admin/editarvariante.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace compabetov2.admin +{ + public partial class editarvariante : Form + { + public editarvariante() + { + InitializeComponent(); + } + } +} diff --git a/admin/editarvariante.resx b/admin/editarvariante.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/admin/editarvariante.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/bin/Debug/Resources/logo.png b/bin/Debug/Resources/logo.png new file mode 100644 index 0000000..6a81398 Binary files /dev/null and b/bin/Debug/Resources/logo.png differ diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 1fa84fd..109e723 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 1f3173a..71391ce 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/bin/Debug/data.db b/bin/Debug/data.db index 9e77377..13f9ed8 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/bin/Debug/produtos_img/fondo.jpg b/bin/Debug/produtos_img/fondo.jpg new file mode 100644 index 0000000..95eb267 Binary files /dev/null and b/bin/Debug/produtos_img/fondo.jpg differ diff --git a/bin/Debug/produtos_img/logo.png b/bin/Debug/produtos_img/logo.png new file mode 100644 index 0000000..6a81398 Binary files /dev/null and b/bin/Debug/produtos_img/logo.png differ diff --git a/bin/Debug/produtos_img/the-legend-of-zelda-twi-56b48843ad5b6.jpg b/bin/Debug/produtos_img/the-legend-of-zelda-twi-56b48843ad5b6.jpg new file mode 100644 index 0000000..01080ed Binary files /dev/null and b/bin/Debug/produtos_img/the-legend-of-zelda-twi-56b48843ad5b6.jpg differ diff --git a/compabetov2.csproj b/compabetov2.csproj index 30033ca..d745e7e 100644 --- a/compabetov2.csproj +++ b/compabetov2.csproj @@ -130,6 +130,12 @@ editar.cs + + Form + + + Variantes.cs + @@ -310,6 +316,9 @@ editar.cs + + Variantes.cs + AgregarEmpleado1.cs diff --git a/database/DAO.cs b/database/DAO.cs index 8eacccd..09ce953 100644 --- a/database/DAO.cs +++ b/database/DAO.cs @@ -10,6 +10,7 @@ using System.Security.Policy; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using compabetov2.admin; using compabetov2.database; using compabetov2.database.modelos; @@ -478,7 +479,39 @@ namespace compabetov2.database command.Parameters.AddWithValue("@precio", producto.precion); command.Parameters.AddWithValue("@img", producto.img); command.Parameters.AddWithValue("@stock", producto.stock); - command.Parameters.AddWithValue("@idcategoria", producto.categoria.idCategoria); + command.Parameters.AddWithValue("@idcategoria", 1); + int filasAfectadas = command.ExecuteNonQuery(); + + if (filasAfectadas > 0) { return true; } + else { return false; } + } + } + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + + public static bool editarProductoDAO(Producto producto) + { + var db_conexion = new Conexion(); + try + { + using (SQLiteConnection conexion = db_conexion.get_connection()) + { + conexion.Open(); + + string sql = "UPDATE Producto SET nombre = @nombre, precio = @precio, img = @img WHERE idproducto = @idproducto;"; + + + using (SQLiteCommand command = new SQLiteCommand(sql, conexion)) + { + command.Parameters.AddWithValue("@nombre", producto.nombre); + command.Parameters.AddWithValue("@precio", producto.precion); + command.Parameters.AddWithValue("@img", producto.img); + command.Parameters.AddWithValue("@idproducto", producto.idProducto); int filasAfectadas = command.ExecuteNonQuery(); if (filasAfectadas > 0) { return true; } @@ -1750,6 +1783,85 @@ namespace compabetov2.database } } + public static SQLiteDataReader conseguirVarianteDAO(int idProducto) + { + SQLiteDataReader reader = null; + var db_conexion = new Conexion(); + try + { + SQLiteConnection conexion = db_conexion.get_connection(); + + conexion.Open(); + + string sql = "SELECT * FROM variantes WHERE fk_producto = @fk_producto"; + SQLiteCommand command = new SQLiteCommand(sql, conexion); + command.Parameters.AddWithValue("@fk_producto", idProducto); + reader = command.ExecuteReader(); + + return reader; + + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return reader; + } + } + + public static bool insertarVarianteDAO(Variante variante) + { + var db_conexion = new Conexion(); + try + { + SQLiteConnection conexion = db_conexion.get_connection(); + conexion.Open(); + + string sql = "INSERT INTO variantes (nombre, precio, cantidad, img, fk_producto, precioCompra) " + + "VALUES(@nombre, @precio, @cantidad, @img, @fk_producto, @precioCompra);"; + + + SQLiteCommand command = new SQLiteCommand(sql, conexion); + command.Parameters.AddWithValue("@nombre", variante.nombre); + command.Parameters.AddWithValue("@precio", variante.precio); + command.Parameters.AddWithValue("@cantidad", variante.cantidad); + command.Parameters.AddWithValue("@img", variante.img); + command.Parameters.AddWithValue("@fk_producto", variante.fkProducto); + command.Parameters.AddWithValue("@precioCompra", variante.precioCompra); + command.ExecuteNonQuery(); + + return true; + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + + public static bool eliminarVarianteDAO(int idVariante) + { + var db_conexion = new Conexion(); + try + { + SQLiteConnection conexion = db_conexion.get_connection(); + conexion.Open(); + + string sql = "DELETE FROM variantes WHERE idVariante = @idVariante;"; + + + SQLiteCommand command = new SQLiteCommand(sql, conexion); + command.Parameters.AddWithValue("@idVariante", idVariante); + command.ExecuteNonQuery(); + + return true; + } + catch (SQLiteException ex) + { + MessageBox.Show(ex.Message); + return false; + } + } + public static SQLiteDataReader conseguirImportesDAO() { SQLiteDataReader reader = null; diff --git a/database/service.cs b/database/service.cs index cbd03b2..2b38dd0 100644 --- a/database/service.cs +++ b/database/service.cs @@ -66,7 +66,17 @@ namespace compabetov2.database { return DAO.insertarProductoDAO(producto); } - + + public static bool editarProducto(Producto producto) + { + return DAO.editarProductoDAO(producto); + } + + public static bool eliminarProducto(Producto producto) + { + return DAO.eliminarProductoDAO(producto); + } + public static bool insertarCliente(Cliente cliente) { return DAO.insertarClienteDAO(cliente); @@ -564,6 +574,45 @@ namespace compabetov2.database return variantes; } + public static List conseguirVariante(int idProducto) + { + List variantes = new List(); + SQLiteDataReader reader = DAO.conseguirVarianteDAO(idProducto); + + while (reader.Read()) + { + int idVariante = (int)reader.GetInt64(0); + string nombre = reader.GetString(1); + decimal precio = reader.GetDecimal(2); + int cantidad = (int)reader.GetInt64(3); + string img = reader.GetString(4); + int fkProducto = (int)reader.GetInt64(5); + decimal precioCompra = reader.GetDecimal(6); + + variantes.Add(new Variante( + idVariante, + nombre, + precio, + cantidad, + img, + fkProducto, + precioCompra + )); + } + + return variantes; + } + + public static bool insertarVariante(Variante variante) + { + return DAO.insertarVarianteDAO(variante); + } + + public static bool eliminarVariante(int idVariante) + { + return DAO.eliminarVarianteDAO(idVariante); + } + public static List conseguirImportes() { List importes = new List(); diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 13498bc..ea2f144 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 6621135..fe7ee61 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -30eeea1d3a18c3af78d41c1a75498495f055cb0c8c73112988833c654a1eeba7 +e213d9beb5da3320ef36bb44a93fdae1bbcb3db7d3ede06b34b1df208bbd692a diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index e633da0..5f2f5ba 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -156,3 +156,7 @@ C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.editar.resou ======= C:\Users\Googl\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.admin.editar.resources >>>>>>> ae6945f7e474edb1bde1c277c092d25b221e151b +C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.addvariante.resources +C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.agregarproducto.resources +C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.admin.Variantes.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabet.5C4A9C0C.Up2Date diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 9c5cbda..9037b20 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 1fa84fd..109e723 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 1f3173a..71391ce 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ