version 1.2

.vs/VSWorkspaceState.json

@@ -1,11 +1,8 @@
 {
   "ExpandedNodes": [
     "",
-    "\\Cuentas",
-    "\\database",
-    "\\Principal",
     "\\Ventas"
   ],
-  "SelectedNode": "\\database\\service.cs",
+  "SelectedNode": "\\Ventas\\vender.cs",
   "PreviewInSolutionExplorer": false
 }

Inventario/inventario.cs

@@ -191,6 +191,7 @@ namespace compabetov2
         private void button6_Click_1(object sender, EventArgs e)
         {
             List<Producto> stockNuevo = new List<Producto>();
+            string mensajeConfirmacion = "Se aumentara el stock a los\nsiguientes productos\n";
             try {
                 foreach (Control control in stockPanel.Controls)
                 {
@@ -201,27 +202,24 @@ namespace compabetov2
                     Label lbIdProducto = informacionProducto.Controls[0].Controls[0] as Label;
                     int idProducto = int.Parse(lbIdProducto.Text);
 
+                    //nombre
+                    Label lbNombre = informacionProducto.Controls[1] as Label;
+                    string[] strInfo = lbNombre.Text.Split('-');
+                    string nombreProducto = strInfo[0];
+
                     //stock a agregar
                     TextBox txtStock = agregarPanel.Controls[0] as TextBox;
                     int stock = int.Parse(txtStock.Text);
 
                     if (stock != 0)
                     {
-                        Producto productoStockNuuevo = new Producto(idProducto, "", "", 0, "", stock, null);
+                        Producto productoStockNuuevo = new Producto(idProducto, nombreProducto, "", 0, "", stock, null);
                         stockNuevo.Add(productoStockNuuevo);
+                        mensajeConfirmacion += nombreProducto + ": " + stock + "\n";
                     }
 
                 }
 
-                string mensajeConfirmacion = "Se aumentara el stock a los\nsiguientes productos\n";
-                for (int i = 0; i < stockNuevo.Count; i++)
-                {
-
-                    mensajeConfirmacion += productos[stockNuevo[i].idProducto - 1].nombre + ": " + stockNuevo[i].stock + "\n";
-
-                }
-
-
                 if (stockNuevo.Count > 0)
                 {
                     DialogResult result = MessageBox.Show(mensajeConfirmacion, "Confirmación", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
@@ -232,7 +230,8 @@ namespace compabetov2
                     }
                 }
             }
-            catch(Exception ex) {
+            catch (Exception)
+            {
                 MessageBox.Show("Solo debe introducir numeros","Error", MessageBoxButtons.OK,MessageBoxIcon.Error);
             }
             

Ventas/vender.cs

@@ -532,10 +532,11 @@ namespace compabetov2
                     if (service.crearVentaDAO(ventaModel, carrito))
                     {
                         MessageBox.Show("Venta hecha");
+                        ImprimirTicket();
                         eliminarProductosTocket();
                         llenarLayout();
                         total = 0;
-                        ImprimirTicket();
+                        
                     }
                 }
                 else

obj/Debug/compabetov2.csproj.FileListAbsolute.txt

@@ -47,3 +47,52 @@ C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.application
 C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
 C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.exe
 C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.pdb
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe.config
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe.manifest
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.application
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.exe
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\compabetov2.pdb
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.xml
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\bin\Debug\System.Data.SQLite.xml
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.cuentas.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.envios.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.inventario.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.login.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.mermas.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.personal.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.vender.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.verMerma.resources
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.exe.manifest
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.application
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.exe
+C:\Users\compa\Source\Repos\aspermaster23yeh\compabetoOG\obj\Debug\compabetov2.pdb