diff --git a/Empleados/personal.Designer.cs b/Empleados/personal.Designer.cs index 69ba86a..31d1bb1 100644 --- a/Empleados/personal.Designer.cs +++ b/Empleados/personal.Designer.cs @@ -51,8 +51,8 @@ // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(64, 34); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBox7.Location = new System.Drawing.Point(48, 28); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -63,10 +63,10 @@ // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(3, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel2.Location = new System.Drawing.Point(2, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(312, 263); + this.panel2.Size = new System.Drawing.Size(234, 214); this.panel2.TabIndex = 8; // // button1 @@ -78,11 +78,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(3, 269); - this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button1.Location = new System.Drawing.Point(2, 220); + this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(312, 114); + this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(234, 93); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -97,11 +97,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(3, 387); - this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button2.Location = new System.Drawing.Point(2, 317); + this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(312, 114); + this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(234, 93); this.button2.TabIndex = 9; this.button2.Text = "Reportes"; this.button2.UseVisualStyleBackColor = false; @@ -116,11 +116,11 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(3, 505); - this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button3.Location = new System.Drawing.Point(2, 414); + this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(312, 114); + this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(234, 93); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -134,11 +134,11 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(3, 623); - this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button5.Location = new System.Drawing.Point(2, 511); + this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(312, 114); + this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(234, 93); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; @@ -152,17 +152,17 @@ this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); + this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); this.flowLayoutPanel1.TabIndex = 8; // // personalPanel // - this.personalPanel.Location = new System.Drawing.Point(460, 308); - this.personalPanel.Margin = new System.Windows.Forms.Padding(4); + this.personalPanel.AutoScroll = true; + this.personalPanel.Location = new System.Drawing.Point(345, 250); this.personalPanel.Name = "personalPanel"; - this.personalPanel.Size = new System.Drawing.Size(1212, 553); + this.personalPanel.Size = new System.Drawing.Size(909, 449); this.personalPanel.TabIndex = 9; this.personalPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.flowLayoutPanel3_Paint); // @@ -171,19 +171,19 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.MediumBlue; - this.lblhora.Location = new System.Drawing.Point(868, 80); + this.lblhora.Location = new System.Drawing.Point(651, 65); + this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(445, 113); + this.lblhora.Size = new System.Drawing.Size(352, 91); this.lblhora.TabIndex = 11; this.lblhora.Text = "Personal"; this.lblhora.Click += new System.EventHandler(this.lblhora_Click); // // btnAgregar // - this.btnAgregar.Location = new System.Drawing.Point(984, 220); - this.btnAgregar.Margin = new System.Windows.Forms.Padding(4); + this.btnAgregar.Location = new System.Drawing.Point(738, 179); this.btnAgregar.Name = "btnAgregar"; - this.btnAgregar.Size = new System.Drawing.Size(167, 43); + this.btnAgregar.Size = new System.Drawing.Size(125, 35); this.btnAgregar.TabIndex = 12; this.btnAgregar.Text = "Agregar"; this.btnAgregar.UseVisualStyleBackColor = true; @@ -199,15 +199,15 @@ // // personal // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1827, 922); + this.ClientSize = new System.Drawing.Size(1028, 627); this.ControlBox = false; this.Controls.Add(this.btnAgregar); this.Controls.Add(this.lblhora); this.Controls.Add(this.personalPanel); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "personal"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.personal_Load); diff --git a/Estadiscticas.Designer.cs b/Estadiscticas.Designer.cs index 824184d..c190fae 100644 --- a/Estadiscticas.Designer.cs +++ b/Estadiscticas.Designer.cs @@ -49,6 +49,8 @@ this.lbVendedorMes = new System.Windows.Forms.Label(); this.lbProductoMes = new System.Windows.Forms.Label(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.lbDiaSEnvio = new System.Windows.Forms.Label(); + this.lbMesSEnvio = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dgvDia)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvMes)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); @@ -57,10 +59,9 @@ // dtpBuscar // this.dtpBuscar.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dtpBuscar.Location = new System.Drawing.Point(36, 191); - this.dtpBuscar.Margin = new System.Windows.Forms.Padding(4); + this.dtpBuscar.Location = new System.Drawing.Point(27, 155); this.dtpBuscar.Name = "dtpBuscar"; - this.dtpBuscar.Size = new System.Drawing.Size(341, 26); + this.dtpBuscar.Size = new System.Drawing.Size(257, 22); this.dtpBuscar.TabIndex = 0; // // dgvDia @@ -71,11 +72,10 @@ this.Precio, this.Cantidad, this.Total}); - this.dgvDia.Location = new System.Drawing.Point(32, 245); - this.dgvDia.Margin = new System.Windows.Forms.Padding(4); + this.dgvDia.Location = new System.Drawing.Point(24, 199); this.dgvDia.Name = "dgvDia"; this.dgvDia.RowHeadersWidth = 51; - this.dgvDia.Size = new System.Drawing.Size(591, 185); + this.dgvDia.Size = new System.Drawing.Size(443, 150); this.dgvDia.TabIndex = 1; // // Producto @@ -111,11 +111,10 @@ // // btnBuscar // - this.btnBuscar.Font = new System.Drawing.Font("Poppins", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnBuscar.Location = new System.Drawing.Point(384, 190); - this.btnBuscar.Margin = new System.Windows.Forms.Padding(4); + this.btnBuscar.Font = new System.Drawing.Font("Microsoft Sans Serif", 7.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnBuscar.Location = new System.Drawing.Point(288, 154); this.btnBuscar.Name = "btnBuscar"; - this.btnBuscar.Size = new System.Drawing.Size(92, 27); + this.btnBuscar.Size = new System.Drawing.Size(69, 22); this.btnBuscar.TabIndex = 2; this.btnBuscar.Text = "Buscar"; this.btnBuscar.UseVisualStyleBackColor = true; @@ -125,12 +124,11 @@ // this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Transparent; - this.label1.Location = new System.Drawing.Point(36, 222); - this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Location = new System.Drawing.Point(27, 180); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(156, 30); + this.label1.Size = new System.Drawing.Size(114, 17); this.label1.TabIndex = 3; this.label1.Text = "Resumen del dia"; // @@ -138,12 +136,11 @@ // this.label2.AutoSize = true; this.label2.BackColor = System.Drawing.Color.Transparent; - this.label2.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label2.ForeColor = System.Drawing.Color.Transparent; - this.label2.Location = new System.Drawing.Point(36, 476); - this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Location = new System.Drawing.Point(27, 387); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(168, 30); + this.label2.Size = new System.Drawing.Size(121, 17); this.label2.TabIndex = 4; this.label2.Text = "Resumen del mes"; // @@ -155,11 +152,10 @@ this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4}); - this.dgvMes.Location = new System.Drawing.Point(32, 500); - this.dgvMes.Margin = new System.Windows.Forms.Padding(4); + this.dgvMes.Location = new System.Drawing.Point(24, 406); this.dgvMes.Name = "dgvMes"; this.dgvMes.RowHeadersWidth = 51; - this.dgvMes.Size = new System.Drawing.Size(591, 185); + this.dgvMes.Size = new System.Drawing.Size(443, 150); this.dgvMes.TabIndex = 5; // // dataGridViewTextBoxColumn1 @@ -197,12 +193,11 @@ // this.lbProductDia.AutoSize = true; this.lbProductDia.BackColor = System.Drawing.Color.Transparent; - this.lbProductDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbProductDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbProductDia.ForeColor = System.Drawing.Color.Transparent; - this.lbProductDia.Location = new System.Drawing.Point(781, 243); - this.lbProductDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbProductDia.Location = new System.Drawing.Point(586, 197); this.lbProductDia.Name = "lbProductDia"; - this.lbProductDia.Size = new System.Drawing.Size(210, 30); + this.lbProductDia.Size = new System.Drawing.Size(153, 17); this.lbProductDia.TabIndex = 6; this.lbProductDia.Text = "Producto mas vendido:"; this.lbProductDia.Click += new System.EventHandler(this.lbProductDia_Click); @@ -211,12 +206,11 @@ // this.lbVendedorDia.AutoSize = true; this.lbVendedorDia.BackColor = System.Drawing.Color.Transparent; - this.lbVendedorDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbVendedorDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbVendedorDia.ForeColor = System.Drawing.Color.Transparent; - this.lbVendedorDia.Location = new System.Drawing.Point(781, 316); - this.lbVendedorDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbVendedorDia.Location = new System.Drawing.Point(586, 257); this.lbVendedorDia.Name = "lbVendedorDia"; - this.lbVendedorDia.Size = new System.Drawing.Size(154, 30); + this.lbVendedorDia.Size = new System.Drawing.Size(113, 17); this.lbVendedorDia.TabIndex = 7; this.lbVendedorDia.Text = "Mejor vendedos:"; this.lbVendedorDia.Click += new System.EventHandler(this.lbVendedorDia_Click); @@ -225,12 +219,11 @@ // this.lbTotalDia.AutoSize = true; this.lbTotalDia.BackColor = System.Drawing.Color.Transparent; - this.lbTotalDia.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbTotalDia.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbTotalDia.ForeColor = System.Drawing.Color.Transparent; - this.lbTotalDia.Location = new System.Drawing.Point(444, 438); - this.lbTotalDia.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbTotalDia.Location = new System.Drawing.Point(333, 356); this.lbTotalDia.Name = "lbTotalDia"; - this.lbTotalDia.Size = new System.Drawing.Size(120, 30); + this.lbTotalDia.Size = new System.Drawing.Size(90, 17); this.lbTotalDia.TabIndex = 8; this.lbTotalDia.Text = "Total del dia:"; // @@ -238,12 +231,11 @@ // this.lbTotalMes.AutoSize = true; this.lbTotalMes.BackColor = System.Drawing.Color.Transparent; - this.lbTotalMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbTotalMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbTotalMes.ForeColor = System.Drawing.Color.Transparent; - this.lbTotalMes.Location = new System.Drawing.Point(440, 689); - this.lbTotalMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbTotalMes.Location = new System.Drawing.Point(330, 560); this.lbTotalMes.Name = "lbTotalMes"; - this.lbTotalMes.Size = new System.Drawing.Size(129, 30); + this.lbTotalMes.Size = new System.Drawing.Size(97, 17); this.lbTotalMes.TabIndex = 9; this.lbTotalMes.Text = "Total del Mes:"; // @@ -251,12 +243,11 @@ // this.lbVendedorMes.AutoSize = true; this.lbVendedorMes.BackColor = System.Drawing.Color.Transparent; - this.lbVendedorMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbVendedorMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbVendedorMes.ForeColor = System.Drawing.Color.Transparent; - this.lbVendedorMes.Location = new System.Drawing.Point(784, 559); - this.lbVendedorMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbVendedorMes.Location = new System.Drawing.Point(588, 454); this.lbVendedorMes.Name = "lbVendedorMes"; - this.lbVendedorMes.Size = new System.Drawing.Size(151, 30); + this.lbVendedorMes.Size = new System.Drawing.Size(111, 17); this.lbVendedorMes.TabIndex = 11; this.lbVendedorMes.Text = "Mejor vendedor:"; this.lbVendedorMes.Click += new System.EventHandler(this.lbVendedorMes_Click); @@ -265,12 +256,11 @@ // this.lbProductoMes.AutoSize = true; this.lbProductoMes.BackColor = System.Drawing.Color.Transparent; - this.lbProductoMes.Font = new System.Drawing.Font("Poppins", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbProductoMes.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbProductoMes.ForeColor = System.Drawing.Color.Transparent; - this.lbProductoMes.Location = new System.Drawing.Point(784, 487); - this.lbProductoMes.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbProductoMes.Location = new System.Drawing.Point(588, 396); this.lbProductoMes.Name = "lbProductoMes"; - this.lbProductoMes.Size = new System.Drawing.Size(210, 30); + this.lbProductoMes.Size = new System.Drawing.Size(153, 17); this.lbProductoMes.TabIndex = 10; this.lbProductoMes.Text = "Producto mas vendido:"; this.lbProductoMes.Click += new System.EventHandler(this.lbProductoMes_Click); @@ -280,22 +270,49 @@ 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(1047, 689); + this.pictureBox2.Location = new System.Drawing.Point(785, 560); + 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 = 28; this.pictureBox2.TabStop = false; this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click); // + // lbDiaSEnvio + // + this.lbDiaSEnvio.AutoSize = true; + this.lbDiaSEnvio.BackColor = System.Drawing.Color.Transparent; + this.lbDiaSEnvio.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbDiaSEnvio.ForeColor = System.Drawing.Color.Transparent; + this.lbDiaSEnvio.Location = new System.Drawing.Point(266, 373); + this.lbDiaSEnvio.Name = "lbDiaSEnvio"; + this.lbDiaSEnvio.Size = new System.Drawing.Size(157, 17); + this.lbDiaSEnvio.TabIndex = 29; + this.lbDiaSEnvio.Text = "Total del dia sin envios:"; + // + // lbMesSEnvio + // + this.lbMesSEnvio.AutoSize = true; + this.lbMesSEnvio.BackColor = System.Drawing.Color.Transparent; + this.lbMesSEnvio.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbMesSEnvio.ForeColor = System.Drawing.Color.Transparent; + this.lbMesSEnvio.Location = new System.Drawing.Point(270, 577); + this.lbMesSEnvio.Name = "lbMesSEnvio"; + this.lbMesSEnvio.Size = new System.Drawing.Size(164, 17); + this.lbMesSEnvio.TabIndex = 30; + this.lbMesSEnvio.Text = "Total del mes sin envios:"; + // // Estadiscticas // - 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(1273, 867); + this.ClientSize = new System.Drawing.Size(955, 627); this.ControlBox = false; + this.Controls.Add(this.lbMesSEnvio); + this.Controls.Add(this.lbDiaSEnvio); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.lbVendedorMes); this.Controls.Add(this.lbProductoMes); @@ -310,7 +327,6 @@ this.Controls.Add(this.label1); this.Controls.Add(this.label2); this.DoubleBuffered = true; - this.Margin = new System.Windows.Forms.Padding(4); this.Name = "Estadiscticas"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Load += new System.EventHandler(this.Estadiscticas_Load); @@ -345,5 +361,7 @@ private System.Windows.Forms.Label lbVendedorMes; private System.Windows.Forms.Label lbProductoMes; private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Label lbDiaSEnvio; + private System.Windows.Forms.Label lbMesSEnvio; } } \ No newline at end of file diff --git a/Estadiscticas.cs b/Estadiscticas.cs index 6fbd8bd..df3b99b 100644 --- a/Estadiscticas.cs +++ b/Estadiscticas.cs @@ -38,6 +38,7 @@ namespace compabetov2 List productosDia = estadisticasDia(); decimal totalmes = totalMes(); decimal totaldia = totalDia(); + Dictionary> envios = service.conseguirEnvioMes(fechaBuscar); Dictionary estadisticas = new Dictionary { @@ -46,23 +47,30 @@ namespace compabetov2 { "productoMasVendido", prodctoMasVendido(productosMes) }, { "mejorVendedor", mejorVenderdorMes() }, { "totalMes", totalmes }, - { "totalMesSinEnvio", totalMesSinEnvio(totalmes) }, + { "EnvioCantidad", totalMesSinEnvio(envios) }, } }, { "dia", new Dictionary{ { "productos", productosDia }, { "productoMasVendido", prodctoMasVendido(productosDia) }, { "mejorVendedor", mejorVenderdorDia() }, - { "totalDia", totalDia()} + { "totalDia", totalDia()}, + { "EnvioCantidad", totalDiaSinEnvio(envios) }, } } }; mostrarDatos(estadisticas); } - private dynamic totalMesSinEnvio(decimal total) + private int totalMesSinEnvio(Dictionary> envios) { - return 0; + + return envios["mes"].Count; + } + + private int totalDiaSinEnvio(Dictionary> envios) + { + return envios["dia"].Count; } private decimal totalMes() @@ -169,10 +177,11 @@ namespace compabetov2 // Agregar la nueva fila al DataGridView dgvMes.Rows.Add(nuevaFila); } - + decimal totalSinEnvioMes = estadisticas["mes"]["totalMes"] - (estadisticas["mes"]["EnvioCantidad"] *10); lbTotalMes.Text = $"Total de mes: ${estadisticas["mes"]["totalMes"]}"; lbProductoMes.Text = $"Producto mas vendido: {estadisticas["mes"]["productoMasVendido"]}"; lbVendedorMes.Text = $"Mejor vendedor: {estadisticas["mes"]["mejorVendedor"]}"; + lbMesSEnvio.Text = $"Total del mes sin envios: ${totalSinEnvioMes}"; //dia List detallesDia = estadisticas["dia"]["productos"]; @@ -205,9 +214,11 @@ namespace compabetov2 dgvDia.Rows.Add(nuevaFila); } + decimal totalSinEnvioDia = estadisticas["dia"]["totalDia"] - (estadisticas["dia"]["EnvioCantidad"] * 10); lbTotalDia.Text = $"Total de dia: ${estadisticas["dia"]["totalDia"]}"; lbProductDia.Text = $"Producto mas vendido: {estadisticas["dia"]["productoMasVendido"]}"; lbVendedorDia.Text = $"Mejor vendedor: {estadisticas["dia"]["mejorVendedor"]}"; + lbDiaSEnvio.Text = $"Total del dia sin envios: ${totalSinEnvioDia}"; } private List estadisticasMes() diff --git a/Estadiscticas.resx b/Estadiscticas.resx index 61e5f8b..3d753bc 100644 --- a/Estadiscticas.resx +++ b/Estadiscticas.resx @@ -129,30 +129,6 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - True diff --git a/Inventario/inventario.Designer.cs b/Inventario/inventario.Designer.cs index 92b3642..70dccec 100644 --- a/Inventario/inventario.Designer.cs +++ b/Inventario/inventario.Designer.cs @@ -48,9 +48,10 @@ this.lblhora.AutoSize = true; this.lblhora.Font = new System.Drawing.Font("Microsoft Sans Serif", 60F); this.lblhora.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(104)))), ((int)(((byte)(255))))); - this.lblhora.Location = new System.Drawing.Point(933, 9); + this.lblhora.Location = new System.Drawing.Point(700, 7); + this.lblhora.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.lblhora.Name = "lblhora"; - this.lblhora.Size = new System.Drawing.Size(299, 113); + this.lblhora.Size = new System.Drawing.Size(238, 91); this.lblhora.TabIndex = 10; this.lblhora.Text = "Stock"; // @@ -63,26 +64,26 @@ this.flowLayoutPanel1.Controls.Add(this.button3); this.flowLayoutPanel1.Controls.Add(this.button5); this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, 2); - this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(324, 1061); + this.flowLayoutPanel1.Size = new System.Drawing.Size(243, 862); this.flowLayoutPanel1.TabIndex = 8; // // panel2 // this.panel2.BackColor = System.Drawing.Color.Transparent; this.panel2.Controls.Add(this.pictureBox7); - this.panel2.Location = new System.Drawing.Point(3, 2); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel2.Location = new System.Drawing.Point(2, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(312, 263); + this.panel2.Size = new System.Drawing.Size(234, 214); this.panel2.TabIndex = 8; // // pictureBox7 // this.pictureBox7.Image = global::compabetov2.Properties.Resources.HomeroMenu; - this.pictureBox7.Location = new System.Drawing.Point(64, 34); - this.pictureBox7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.pictureBox7.Location = new System.Drawing.Point(48, 28); + this.pictureBox7.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(190, 197); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -98,11 +99,11 @@ this.button1.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button1.Image = global::compabetov2.Properties.Resources.Menui1; this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(3, 269); - this.button1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button1.Location = new System.Drawing.Point(2, 220); + this.button1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button1.Name = "button1"; - this.button1.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button1.Size = new System.Drawing.Size(312, 114); + this.button1.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button1.Size = new System.Drawing.Size(234, 93); this.button1.TabIndex = 8; this.button1.Text = "Menú"; this.button1.UseVisualStyleBackColor = false; @@ -117,11 +118,11 @@ this.button2.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button2.Image = global::compabetov2.Properties.Resources.estadisticasi; this.button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.Location = new System.Drawing.Point(3, 387); - this.button2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button2.Location = new System.Drawing.Point(2, 317); + this.button2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button2.Name = "button2"; - this.button2.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button2.Size = new System.Drawing.Size(312, 114); + this.button2.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button2.Size = new System.Drawing.Size(234, 93); this.button2.TabIndex = 9; this.button2.Text = "Reportes"; this.button2.UseVisualStyleBackColor = false; @@ -136,11 +137,11 @@ this.button3.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button3.Image = global::compabetov2.Properties.Resources.productoi; this.button3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.Location = new System.Drawing.Point(3, 505); - this.button3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button3.Location = new System.Drawing.Point(2, 414); + this.button3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button3.Name = "button3"; - this.button3.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button3.Size = new System.Drawing.Size(312, 114); + this.button3.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button3.Size = new System.Drawing.Size(234, 93); this.button3.TabIndex = 10; this.button3.Text = "Productos"; this.button3.UseVisualStyleBackColor = false; @@ -154,21 +155,20 @@ this.button5.ForeColor = System.Drawing.SystemColors.ButtonHighlight; this.button5.Image = global::compabetov2.Properties.Resources.sesionc; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.Location = new System.Drawing.Point(3, 623); - this.button5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.button5.Location = new System.Drawing.Point(2, 511); + this.button5.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.button5.Name = "button5"; - this.button5.Padding = new System.Windows.Forms.Padding(51, 0, 0, 0); - this.button5.Size = new System.Drawing.Size(312, 114); + this.button5.Padding = new System.Windows.Forms.Padding(38, 0, 0, 0); + this.button5.Size = new System.Drawing.Size(234, 93); this.button5.TabIndex = 12; this.button5.Text = "Salir"; this.button5.UseVisualStyleBackColor = false; // // btnAgregarStock // - this.btnAgregarStock.Location = new System.Drawing.Point(992, 181); - this.btnAgregarStock.Margin = new System.Windows.Forms.Padding(4); + this.btnAgregarStock.Location = new System.Drawing.Point(744, 147); this.btnAgregarStock.Name = "btnAgregarStock"; - this.btnAgregarStock.Size = new System.Drawing.Size(133, 28); + this.btnAgregarStock.Size = new System.Drawing.Size(100, 23); this.btnAgregarStock.TabIndex = 12; this.btnAgregarStock.Text = "Agregar stock"; this.btnAgregarStock.UseVisualStyleBackColor = true; @@ -176,24 +176,24 @@ // // stockPanel // - this.stockPanel.Location = new System.Drawing.Point(525, 245); - this.stockPanel.Margin = new System.Windows.Forms.Padding(4); + this.stockPanel.AutoScroll = true; + this.stockPanel.Location = new System.Drawing.Point(394, 199); this.stockPanel.Name = "stockPanel"; - this.stockPanel.Size = new System.Drawing.Size(1112, 638); + this.stockPanel.Size = new System.Drawing.Size(834, 518); this.stockPanel.TabIndex = 13; this.stockPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.stockPanel_Paint); // // inventario // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1827, 922); + this.ClientSize = new System.Drawing.Size(1028, 627); this.ControlBox = false; this.Controls.Add(this.stockPanel); this.Controls.Add(this.btnAgregarStock); this.Controls.Add(this.lblhora); this.Controls.Add(this.flowLayoutPanel1); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.Name = "inventario"; this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.Load += new System.EventHandler(this.inventario_Load); diff --git a/Inventario/inventario.cs b/Inventario/inventario.cs index 7ee020d..7e2a64e 100644 --- a/Inventario/inventario.cs +++ b/Inventario/inventario.cs @@ -217,7 +217,7 @@ namespace compabetov2 for (int i = 0; i < stockNuevo.Count; i++) { - mensajeConfirmacion += productos[i].nombre + ": " + stockNuevo[i].stock + "\n"; + mensajeConfirmacion += productos[stockNuevo[i].idProducto - 1].nombre + ": " + stockNuevo[i].stock + "\n"; } diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 114f5eb..4350f05 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 8f85e25..d3b3e02 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 9a8dabc..00b1911 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/database/DAO.cs b/database/DAO.cs index a3cfe02..3c6c32c 100644 --- a/database/DAO.cs +++ b/database/DAO.cs @@ -1173,7 +1173,7 @@ namespace compabetov2.database conexion.Open(); - string sql = "SELECT * FROM envio WHERE fecha LIKE @fecha"; + string sql = "SELECT * FROM envios WHERE fecha LIKE @fecha and estado = 'CONCLUIDO'"; SQLiteCommand command = new SQLiteCommand(sql, conexion); command.Parameters.AddWithValue("@fecha", $"%{fecha.Month}/{fecha.Year}%"); reader = command.ExecuteReader(); diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 10a1a65..1930dfe 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 5f3125c..0000000 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll deleted file mode 100644 index 39bc854..0000000 Binary files a/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and /dev/null differ diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache index 9e7d08c..e1562b1 100644 Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index 654a195..f3a1c49 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0aeb254002a0ce305fc1196d5eb6afeb21b30aa751f3290ac831261142a98d95 +3f62af869539c2801b7da3577ef2feb00e7c32f1cefc777b57202fa5ad70cc96 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index a688061..165ead4 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -1,4 +1,3 @@ -<<<<<<< HEAD C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll C:\Users\carsu\Source\Repos\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll @@ -37,6 +36,8 @@ C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.re C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.personal.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources +C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.vender.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache @@ -46,56 +47,3 @@ 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\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\msvcr120.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x64\SqlServerSpatial140.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\msvcr120.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\SqlServerTypes\x86\SqlServerSpatial140.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.config -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe.manifest -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.application -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.exe -C:\Users\Googl\Documents\compabetoOG\bin\Debug\compabetov2.pdb -C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\Microsoft.SqlServer.Types.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.EF6.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.Linq.dll -C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.xml -C:\Users\Googl\Documents\compabetoOG\bin\Debug\EntityFramework.SqlServer.xml -C:\Users\Googl\Documents\compabetoOG\bin\Debug\System.Data.SQLite.xml -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.AssemblyReference.cache -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.AgregarEmpleado1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Empleados.EditarEmpleado1.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Estadiscticas.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.cuentas.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.envios.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.inventario.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.login.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.MenuPrincipal.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.mermas.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.personal.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Properties.Resources.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.vender.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.GenerateResource.cache -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CoreCompileInputs.cache -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe.manifest -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.application -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.csproj.CopyComplete -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.exe -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 -C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index 96ec853..19307b3 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 114f5eb..4350f05 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 8f85e25..d3b3e02 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ