diff --git a/.vs/compabetov2.csproj.dtbcache.json b/.vs/compabetov2.csproj.dtbcache.json
index 0e4378e..7f621c8 100644
--- a/.vs/compabetov2.csproj.dtbcache.json
+++ b/.vs/compabetov2.csproj.dtbcache.json
@@ -1 +1 @@
-{"RootPath":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"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":"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\\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:\\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
+{"RootPath":"C:\\Users\\carsu\\Source\\Repos\\compabetoOG","ProjectFileName":"compabetov2.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"database\\modelos\\DetalleEnvioModel.cs"},{"SourceFile":"database\\modelos\\Envio.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\\datosEnvio.cs"},{"SourceFile":"Ventas\\datosEnvio.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:\\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/Ventas/datosCuenta.Designer.cs b/Ventas/datosCuenta.Designer.cs
new file mode 100644
index 0000000..a456cb4
--- /dev/null
+++ b/Ventas/datosCuenta.Designer.cs
@@ -0,0 +1,101 @@
+namespace compabetov2.Ventas
+{
+ partial class datosCuenta
+ {
+ ///
+ /// 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.label1 = new System.Windows.Forms.Label();
+ this.btnCliente = new System.Windows.Forms.TextBox();
+ this.btnAceptar = new System.Windows.Forms.Button();
+ this.btnCancelar = new System.Windows.Forms.Button();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Location = new System.Drawing.Point(12, 20);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(58, 20);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "Cliente";
+ //
+ // btnCliente
+ //
+ this.btnCliente.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btnCliente.Location = new System.Drawing.Point(16, 52);
+ this.btnCliente.Name = "btnCliente";
+ this.btnCliente.Size = new System.Drawing.Size(283, 26);
+ this.btnCliente.TabIndex = 1;
+ //
+ // btnAceptar
+ //
+ this.btnAceptar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btnAceptar.Location = new System.Drawing.Point(66, 109);
+ this.btnAceptar.Name = "btnAceptar";
+ this.btnAceptar.Size = new System.Drawing.Size(79, 31);
+ this.btnAceptar.TabIndex = 2;
+ this.btnAceptar.Text = "Aceptar";
+ this.btnAceptar.UseVisualStyleBackColor = true;
+ this.btnAceptar.Click += new System.EventHandler(this.btnAceptar_Click);
+ //
+ // btnCancelar
+ //
+ this.btnCancelar.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btnCancelar.Location = new System.Drawing.Point(167, 109);
+ this.btnCancelar.Name = "btnCancelar";
+ this.btnCancelar.Size = new System.Drawing.Size(83, 31);
+ this.btnCancelar.TabIndex = 3;
+ this.btnCancelar.Text = "Cancelar";
+ this.btnCancelar.UseVisualStyleBackColor = true;
+ this.btnCancelar.Click += new System.EventHandler(this.btnCancelar_Click);
+ //
+ // datosCuenta
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(320, 160);
+ this.Controls.Add(this.btnCancelar);
+ this.Controls.Add(this.btnAceptar);
+ this.Controls.Add(this.btnCliente);
+ this.Controls.Add(this.label1);
+ this.Name = "datosCuenta";
+ this.Text = "Datos de cuenta";
+ this.Load += new System.EventHandler(this.datosCuenta_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.TextBox btnCliente;
+ private System.Windows.Forms.Button btnAceptar;
+ private System.Windows.Forms.Button btnCancelar;
+ }
+}
\ No newline at end of file
diff --git a/Ventas/datosCuenta.cs b/Ventas/datosCuenta.cs
new file mode 100644
index 0000000..7f40f5f
--- /dev/null
+++ b/Ventas/datosCuenta.cs
@@ -0,0 +1,50 @@
+using compabetov2.database;
+using compabetov2.database.modelos;
+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.Ventas
+{
+ public partial class datosCuenta : Form
+ {
+ private Cuenta ventaModel;
+ private List detalles;
+ private vender ventanaPadre;
+ public datosCuenta(Cuenta ventaModel, List detalles, vender ventanaPadre)
+ {
+ InitializeComponent();
+ this.ventaModel = ventaModel;
+ this.detalles = detalles;
+ this.ventanaPadre = ventanaPadre;
+ }
+
+ private void datosCuenta_Load(object sender, EventArgs e)
+ {
+
+ }
+
+ private void btnAceptar_Click(object sender, EventArgs e)
+ {
+ if (service.crearCuenta(ventaModel, detalles))
+ {
+ MessageBox.Show("Fiado");
+ ventanaPadre.eliminarProductosTocket();
+ ventanaPadre.llenarLayout();
+ ventanaPadre.total = 0;
+ Close();
+ }
+ }
+
+ private void btnCancelar_Click(object sender, EventArgs e)
+ {
+ Close();
+ }
+ }
+}
diff --git a/Ventas/datosCuenta.resx b/Ventas/datosCuenta.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Ventas/datosCuenta.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/Ventas/vender.cs b/Ventas/vender.cs
index a614ca4..10b13d6 100644
--- a/Ventas/vender.cs
+++ b/Ventas/vender.cs
@@ -719,12 +719,9 @@ namespace compabetov2
{
Cuenta ventaModel = new Cuenta(total);
- if (service.crearCuenta(ventaModel, detallesCuenta))
- {
- MessageBox.Show("Fiado");
- eliminarProductosTocket();
- llenarLayout();
- }
+ datosCuenta datoCuenta = new datosCuenta(ventaModel, detallesCuenta,this);
+ datoCuenta.Show();
+
}
else
{
diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe
index 9f1c089..85303a9 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 2adce21..688f7d3 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 baa4a51..7c25ca0 100644
Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ
diff --git a/compabetov2.csproj b/compabetov2.csproj
index 2d9535e..eedd05d 100644
--- a/compabetov2.csproj
+++ b/compabetov2.csproj
@@ -233,6 +233,12 @@
+
+ Form
+
+
+ datosCuenta.cs
+
Form
@@ -318,6 +324,9 @@
Resources.resx
True
+
+ datosCuenta.cs
+
datosEnvio.cs
diff --git a/database/DAO.cs b/database/DAO.cs
index 9ba8f4f..abbf362 100644
--- a/database/DAO.cs
+++ b/database/DAO.cs
@@ -1110,7 +1110,6 @@ namespace compabetov2.database
}
foreach (DetalleCuentaModel detalleCuenta in detallesCuentas)
{
- MessageBox.Show(detalleCuenta.producto.idProducto.ToString());
SQLiteCommand commandEmpleado = new SQLiteCommand(sqlDetalle, conexion);
commandEmpleado.Parameters.AddWithValue("@idVenta", idVenta);
commandEmpleado.Parameters.AddWithValue("@idProducto", detalleCuenta.producto.idProducto);
diff --git a/database/service.cs b/database/service.cs
index 9c772e3..40a17f8 100644
--- a/database/service.cs
+++ b/database/service.cs
@@ -456,17 +456,36 @@ namespace compabetov2.database
int.Parse(reader["stock"].ToString())
);
+
productos.Add(producto);
}
return productos;
}
- public static List conseguirEnvioMes(DateTime fecha)
+ public static Dictionary conseguirEnvioMes(DateTime fecha)
{
- List envios = new List();
+ Dictionary dic = new Dictionary();
+ string formato = "dd/MM/yyyy";
+ List enviosDia = new List();
+ List enviosMes = new List();
- return envios;
+ SQLiteDataReader reader = DAO.conseguirEnvioMesDAO(fecha);
+
+ while (reader.Read()) {
+ Envio envio = new Envio((int)reader.GetInt64(0),"","","", "","","",0);
+
+ string[] fecha_hora = envio.fecha.Split(' ');
+ string fechaVentaStr = fecha_hora[0];
+ DateTime.TryParseExact(fechaVentaStr, formato, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime fechaVenta);
+ if (fecha.Day == fechaVenta.Day)
+ {
+ enviosDia.Add(envio);
+ }
+ enviosDia.Add(envio);
+ }
+
+ return dic;
}
}
}
diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
index 8b5645f..f3a1c49 100644
--- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-139b4fcf6da88d898310192ac1940949355dbb22e52e62b98f67cedee395686d
+3f62af869539c2801b7da3577ef2feb00e7c32f1cefc777b57202fa5ad70cc96
diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt
index d7959f2..c4acda8 100644
--- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt
+++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt
@@ -97,3 +97,4 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb
>>>>>>> c401f0a5d425880eadaf1bd65205d8559b5d39bc
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
+C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache
index cdcb24c..c44ce35 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 9f1c089..85303a9 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 2adce21..688f7d3 100644
Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ