diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 09e59cc5..6c99e847 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -1,8 +1,9 @@ { "ExpandedNodes": [ "", - "\\src" + "\\src", + "\\src\\Boleto.Net" ], - "SelectedNode": "\\src\\Boleto.Net.sln", + "SelectedNode": "\\src\\Boleto.Net", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index dab971ae..7e0427bf 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/src/.idea/.idea.Boleto.Net/.idea/.gitignore b/src/.idea/.idea.Boleto.Net/.idea/.gitignore new file mode 100644 index 00000000..212e9539 --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/.idea.Boleto.Net.iml +/contentModel.xml +/modules.xml +/projectSettingsUpdater.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/src/.idea/.idea.Boleto.Net/.idea/.name b/src/.idea/.idea.Boleto.Net/.idea/.name new file mode 100644 index 00000000..9634caac --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/.name @@ -0,0 +1 @@ +Boleto.Net \ No newline at end of file diff --git a/src/.idea/.idea.Boleto.Net/.idea/encodings.xml b/src/.idea/.idea.Boleto.Net/.idea/encodings.xml new file mode 100644 index 00000000..df87cf95 --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/.idea/.idea.Boleto.Net/.idea/indexLayout.xml b/src/.idea/.idea.Boleto.Net/.idea/indexLayout.xml new file mode 100644 index 00000000..8b32ee4a --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/indexLayout.xml @@ -0,0 +1,10 @@ + + + + + ../../boletonet + + + + + \ No newline at end of file diff --git a/src/.idea/.idea.Boleto.Net/.idea/projectSettingsUpdater.xml b/src/.idea/.idea.Boleto.Net/.idea/projectSettingsUpdater.xml new file mode 100644 index 00000000..4bb9f4d2 --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/.idea/.idea.Boleto.Net/.idea/vcs.xml b/src/.idea/.idea.Boleto.Net/.idea/vcs.xml new file mode 100644 index 00000000..6c0b8635 --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/.idea/.idea.Boleto.Net/.idea/workspace.xml b/src/.idea/.idea.Boleto.Net/.idea/workspace.xml new file mode 100644 index 00000000..c4e02337 --- /dev/null +++ b/src/.idea/.idea.Boleto.Net/.idea/workspace.xml @@ -0,0 +1,100 @@ + + + + Boleto.Net.Arquivo/Boleto.Net.Arquivo.csproj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Boleto.Net.Arquivo/Boleto.Net.Arquivo.csproj b/src/Boleto.Net.Arquivo/Boleto.Net.Arquivo.csproj index f204670a..970425da 100644 --- a/src/Boleto.Net.Arquivo/Boleto.Net.Arquivo.csproj +++ b/src/Boleto.Net.Arquivo/Boleto.Net.Arquivo.csproj @@ -19,7 +19,7 @@ 3.5 - v4.0 + v4.8 @@ -43,11 +43,26 @@ false + + ..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll + + + ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll + + + ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.WebRequest.dll + + + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll + @@ -124,6 +139,7 @@ True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/src/Boleto.Net.Arquivo/NBoleto.cs b/src/Boleto.Net.Arquivo/NBoleto.cs index c42167c0..92b29399 100644 --- a/src/Boleto.Net.Arquivo/NBoleto.cs +++ b/src/Boleto.Net.Arquivo/NBoleto.cs @@ -149,12 +149,17 @@ private void GeraBoletoSicredi(int qtde) c.ContaBancaria.Agencia = "0132"; c.ContaBancaria.Conta = "00542"; c.ContaBancaria.OperacaConta = "10"; + EspecieDocumento especiedocumento = new EspecieDocumento(_codigoBanco, "A"); - Boleto b = new Boleto(vencimento, Convert.ToDecimal(1460), "1", "17200001" , c, new EspecieDocumento(_codigoBanco, "A")); - + Boleto b = new Boleto(); + b.DataVencimento = vencimento; + b.ValorBoleto = Convert.ToDecimal(1460); + b.Carteira = "1"; + b.NossoNumero = "17200001"; + b.EspecieDocumento = especiedocumento; + b.Cedente = c; Endereco endCed = new Endereco(); - - b.NumeroParcela = 1; + b.NumeroParcela = 1; b.TotalParcela = 10; b.TipoImpressao = "B"; @@ -207,8 +212,15 @@ private void GeraBoletoItau(int qtde) Cedente c = new Cedente("00.000.000/0000-00", "Empresa de Atacado", "0542", "13000"); //Na carteira 198 o código do Cedente é a conta bancária c.Codigo = "13000"; + EspecieDocumento especiedocumento = new EspecieDocumento(341, "1"); - Boleto b = new Boleto(vencimento, 1642, "198", "92082835", c, new EspecieDocumento(341, "1")); + Boleto b = new Boleto(); + b.DataVencimento = vencimento; + b.ValorBoleto = 1642; + b.Carteira = "198"; + b.NossoNumero = "92082835"; + b.EspecieDocumento = especiedocumento; + b.Cedente = c; b.NumeroDocumento = Convert.ToString(10000 + i); b.Sacado = new Sacado("000.000.000-00", "Fulano de Silva"); diff --git a/src/Boleto.Net.Arquivo/Properties/Resources.Designer.cs b/src/Boleto.Net.Arquivo/Properties/Resources.Designer.cs index afb4640b..da11f2c6 100644 --- a/src/Boleto.Net.Arquivo/Properties/Resources.Designer.cs +++ b/src/Boleto.Net.Arquivo/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// O código foi gerado por uma ferramenta. +// Versão de Tempo de Execução:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// As alterações ao arquivo poderão causar comportamento incorreto e serão perdidas se +// o código for gerado novamente. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace BoletoNet.Arquivo.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// Uma classe de recurso de tipo de alta segurança, para pesquisar cadeias de caracteres localizadas etc. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // Essa classe foi gerada automaticamente pela classe StronglyTypedResourceBuilder + // através de uma ferramenta como ResGen ou Visual Studio. + // Para adicionar ou remover um associado, edite o arquivo .ResX e execute ResGen novamente + // com a opção /str, ou recrie o projeto do VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Retorna a instância de ResourceManager armazenada em cache usada por essa classe. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Substitui a propriedade CurrentUICulture do thread atual para todas as + /// pesquisas de recursos que usam essa classe de recurso de tipo de alta segurança. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Consulta um recurso localizado do tipo System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Loading { get { diff --git a/src/Boleto.Net.Arquivo/Properties/Settings.Designer.cs b/src/Boleto.Net.Arquivo/Properties/Settings.Designer.cs index 38459c8e..44e43885 100644 --- a/src/Boleto.Net.Arquivo/Properties/Settings.Designer.cs +++ b/src/Boleto.Net.Arquivo/Properties/Settings.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// O código foi gerado por uma ferramenta. +// Versão de Tempo de Execução:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// As alterações ao arquivo poderão causar comportamento incorreto e serão perdidas se +// o código for gerado novamente. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace BoletoNet.Arquivo.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "18.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Boleto.Net.Arquivo/app.config b/src/Boleto.Net.Arquivo/app.config index fcd0c937..3e0e37cf 100644 --- a/src/Boleto.Net.Arquivo/app.config +++ b/src/Boleto.Net.Arquivo/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/Boleto.Net.MVC/Boleto.Net.MVC.csproj b/src/Boleto.Net.MVC/Boleto.Net.MVC.csproj index e006ef9f..3886a202 100644 --- a/src/Boleto.Net.MVC/Boleto.Net.MVC.csproj +++ b/src/Boleto.Net.MVC/Boleto.Net.MVC.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ Properties Boleto.Net.MVC Boleto.Net.MVC - v4.0 + v4.8 ..\ SAK SAK @@ -30,6 +30,8 @@ true + + true @@ -39,6 +41,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -47,6 +50,7 @@ TRACE prompt 4 + false @@ -59,9 +63,9 @@ - + @@ -90,7 +94,7 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.20710.0\lib\net40\System.Web.Http.dll + ..\Boleto.Net.Site\Bin\System.Web.Http.dll ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll diff --git a/src/Boleto.Net.MVC/Content/Boletos/BoletoNet748.jpg b/src/Boleto.Net.MVC/Content/Boletos/BoletoNet748.jpg index e2cae683..0f0ea801 100644 Binary files a/src/Boleto.Net.MVC/Content/Boletos/BoletoNet748.jpg and b/src/Boleto.Net.MVC/Content/Boletos/BoletoNet748.jpg differ diff --git a/src/Boleto.Net.MVC/Web.config b/src/Boleto.Net.MVC/Web.config index b08c9474..6aa6fa41 100644 --- a/src/Boleto.Net.MVC/Web.config +++ b/src/Boleto.Net.MVC/Web.config @@ -1,4 +1,4 @@ - + -
+
- + - - - - - + + + + + + - - + + - + - + - - - - - - - + + + + + + + - + - - - - - - + + + + + + - - + + + + + + - - + + - - + + - + \ No newline at end of file diff --git a/src/Boleto.Net.MVC/packages.config b/src/Boleto.Net.MVC/packages.config index 9c923b0d..4670228a 100644 --- a/src/Boleto.Net.MVC/packages.config +++ b/src/Boleto.Net.MVC/packages.config @@ -6,7 +6,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/src/Boleto.Net.Site/Bancos/Itau.aspx.cs b/src/Boleto.Net.Site/Bancos/Itau.aspx.cs index f8279af6..5150e09a 100644 --- a/src/Boleto.Net.Site/Bancos/Itau.aspx.cs +++ b/src/Boleto.Net.Site/Bancos/Itau.aspx.cs @@ -22,10 +22,15 @@ protected void Page_Load(object sender, EventArgs e) //c.Endereco.UF = "DF"; //boletoBancario.MostrarEnderecoCedente = true; - - Boleto b = new Boleto(vencimento, 0.1m, "176", "00000001", c, new EspecieDocumento(341, "1")); + EspecieDocumento especiedocumento = new EspecieDocumento(341, "1"); + Boleto b = new Boleto(); + b.DataVencimento = vencimento; + b.ValorBoleto = 0.1m; + b.Carteira = "176"; + b.NossoNumero = "00000001"; + b.EspecieDocumento = especiedocumento; + b.Cedente = c; b.NumeroDocumento = "00000001"; - b.Sacado = new Sacado("000.000.000-00", "Nome do seu Cliente "); b.Sacado.Endereco.End = "Endereo do seu Cliente "; b.Sacado.Endereco.Bairro = "Bairro"; diff --git a/src/Boleto.Net.Site/Bancos/Real.aspx.cs b/src/Boleto.Net.Site/Bancos/Real.aspx.cs index dedcd564..a6d9d634 100644 --- a/src/Boleto.Net.Site/Bancos/Real.aspx.cs +++ b/src/Boleto.Net.Site/Bancos/Real.aspx.cs @@ -9,8 +9,16 @@ protected void Page_Load(object sender, EventArgs e) Cedente c = new Cedente("00.000.000/0000-00", "Coloque a Razo Social da sua empresa aqui", "1234", "12345"); c.Codigo = "12345"; + EspecieDocumento especiedocumento = new EspecieDocumento(356, "9"); + + Boleto b = new Boleto(); + b.DataVencimento = vencimento; + b.ValorBoleto = 0.1m; + b.Carteira = "57"; + b.NossoNumero = "123456"; + b.EspecieDocumento = especiedocumento; + b.Cedente = c; - Boleto b = new Boleto(vencimento, 0.1m, "57", "123456", c, new EspecieDocumento(356, "9")); b.NumeroDocumento = "1234567"; b.Sacado = new Sacado("000.000.000-00", "Nome do seu Cliente "); diff --git a/src/Boleto.Net.Site/Web.config b/src/Boleto.Net.Site/Web.config index b986648c..df526839 100644 --- a/src/Boleto.Net.Site/Web.config +++ b/src/Boleto.Net.Site/Web.config @@ -1,4 +1,4 @@ - + @@ -17,11 +17,13 @@ affects performance, set this value to true only during development. --> - + + +