bajar cambios

Ventas/datosCuenta.Designer.cs

@@ -0,0 +1,101 @@
+namespace compabetov2.Ventas
+{
+    partial class datosCuenta
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        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;
+    }
+}

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<DetalleCuentaModel> detalles;
+        private vender ventanaPadre;
+        public datosCuenta(Cuenta ventaModel, List<DetalleCuentaModel> 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();
+        }
+    }
+}

Ventas/datosCuenta.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Ventas/vender.cs

@@ -719,12 +719,9 @@ namespace compabetov2
             {
                 Cuenta ventaModel = new Cuenta(total);
 
-                if (service.crearCuenta(ventaModel, detallesCuenta))
+                datosCuenta datoCuenta = new datosCuenta(ventaModel, detallesCuenta,this);
-                {
+                datoCuenta.Show();
-                    MessageBox.Show("Fiado");
+                
-                    eliminarProductosTocket();
-                    llenarLayout();
-                }
             }
             else
             {

compabetov2.csproj

@@ -233,6 +233,12 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqlServerTypes\Loader.cs" />
+    <Compile Include="Ventas\datosCuenta.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Ventas\datosCuenta.Designer.cs">
+      <DependentUpon>datosCuenta.cs</DependentUpon>
+    </Compile>
     <Compile Include="Ventas\datosEnvio.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -318,6 +324,9 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <EmbeddedResource Include="Ventas\datosCuenta.resx">
+      <DependentUpon>datosCuenta.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Ventas\datosEnvio.resx">
       <DependentUpon>datosEnvio.cs</DependentUpon>
     </EmbeddedResource>

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);

database/service.cs

@@ -456,17 +456,36 @@ namespace compabetov2.database
                     int.Parse(reader["stock"].ToString())
                     );
 
+                
                 productos.Add(producto);
             }
 
             return productos;
         }
 
-        public static List<Envio> conseguirEnvioMes(DateTime fecha)
+        public static Dictionary<string, dynamic> conseguirEnvioMes(DateTime fecha)
         {
-            List<Envio> envios = new List<Envio>();
+            Dictionary<string,dynamic> dic = new Dictionary<String,dynamic>();
+            string formato = "dd/MM/yyyy";
+            List<Envio> enviosDia = new List<Envio>();
+            List<Envio> enviosMes = new List<Envio>();
 
-            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;
         }
     }
 }

obj/Debug/compabetov2.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-139b4fcf6da88d898310192ac1940949355dbb22e52e62b98f67cedee395686d
+3f62af869539c2801b7da3577ef2feb00e7c32f1cefc777b57202fa5ad70cc96

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