Skip to content

Commit

Permalink
Latest release v1.1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
willrennie committed Nov 13, 2014
1 parent 5ff092f commit d1000ab
Show file tree
Hide file tree
Showing 10 changed files with 131 additions and 20 deletions.
12 changes: 11 additions & 1 deletion SugarCRMClient/Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions SugarCRMClient/Properties/Settings.settings
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SuiteCRMClient.Properties" GeneratedClassName="Settings">
<Profiles />
<Settings />
<Settings>
<Setting Name="SugarCRMClient_SuitecrmSoapTest_sugarsoap" Type="(Web Service URL)" Scope="Application">
<Value Profile="(Default)">http://suitecrm.com/suitedemo/service/v4_1/soap.php</Value>
</Setting>
</Settings>
</SettingsFile>
84 changes: 84 additions & 0 deletions SugarCRMClient/SuiteCRMClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Services" />
Expand Down Expand Up @@ -98,6 +99,11 @@
</Compile>
<Compile Include="clsMyExceptions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Web References\SuitecrmSoapTest\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
Expand All @@ -106,6 +112,84 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="SuiteCRMClient.snk" />
<None Include="Web References\SuitecrmSoapTest\entry_value.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\get_entries_count_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\get_entry_list_result_version2.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\get_entry_result_version2.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\get_server_info_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\item.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Web References\SuitecrmSoapTest\item0.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Web References\SuitecrmSoapTest\last_viewed_entry.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\modified_relationship_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\module_list.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_module_fields.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_return_document_revision.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_return_note_attachment.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_set_entries_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_set_entry_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\new_set_relationship_list_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
<None Include="Web References\SuitecrmSoapTest\return_search_result.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
<None Include="Web References\SuitecrmSoapTest\soap.wsdl" />
<None Include="Web References\SuitecrmSoapTest\upcoming_activity_entry.datasource">
<DependentUpon>Reference.map</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="https://suitecrm.com/suitedemo/service/v4_1/soap.php%3fwsdl">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\SuitecrmSoapTest\</RelPath>
<UpdateFromURL>https://suitecrm.com/suitedemo/service/v4_1/soap.php%3fwsdl</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
</CachedDynamicPropName>
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>SugarCRMClient_SuitecrmSoapTest_sugarsoap</CachedSettingsPropName>
</WebReferenceUrl>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
10 changes: 10 additions & 0 deletions SugarCRMClient/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
<configuration>
<configSections>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
<section name="SuiteCRMClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="SugarCRMClient.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</sectionGroup>
</configSections>
<applicationSettings>
<SuiteCRMClient.Properties.Settings>
<setting name="SugarCRMClient_SuitecrmSoapTest_sugarsoap" serializeAs="String">
<value>http://suitecrm.com/suitedemo/service/v4_1/soap.php</value>
</setting>
</SuiteCRMClient.Properties.Settings>
<SugarCRMClient.Properties.Settings>
<setting name="SugarCRMClient_SugarCRMServiceClient_sugarsoap"
serializeAs="String">
Expand All @@ -17,4 +23,8 @@
</setting>
</SugarCRMClient.Properties.Settings>
</applicationSettings>
<system.serviceModel>
<bindings />
<client />
</system.serviceModel>
</configuration>
10 changes: 5 additions & 5 deletions SugarCRMClient/clsSuiteCRMHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ namespace SuiteCRMClient
public static class clsSuiteCRMHelper
{
public static string InstallationPath { get; set; }

public static clsUsersession SuiteCRMUserSession;

public static eModuleList GetModules()
{
string strUserID = clsSuiteCRMHelper.GetUserId();
Expand Down Expand Up @@ -182,15 +182,15 @@ public static bool UploadAttahcment(clsEmailAttachments objAttachment, string em
public static eNameValue SetNameValuePair(string name, string value)
{
return new eNameValue { name = name, value = value };
}
}

public static eGetEntryListResult GetEntryList(string module, string query, int limit, string order_by, int offset, bool GetDeleted, string[] fields)
{
string strUserID = clsSuiteCRMHelper.GetUserId();
if (strUserID == "")
{
SuiteCRMUserSession.Login();
}
}
eGetEntryListResult _result = new eGetEntryListResult();
try
{
Expand All @@ -204,7 +204,7 @@ public static eGetEntryListResult GetEntryList(string module, string query, int
@select_fields = fields,
@max_results = limit,
@deleted = Convert.ToInt32(GetDeleted)
};
};
_result = clsGlobals.GetResponse<RESTObjects.eGetEntryListResult>("get_entry_list", data);
if (_result.error != null)
{
Expand Down
6 changes: 4 additions & 2 deletions SuiteCRMAddIn/ThisAddIn.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
using System.Globalization;
using SuiteCRMClient.RESTObjects;
using SuiteCRMClient;
using System.IO;

namespace SuiteCRMAddIn
{
Expand Down Expand Up @@ -477,7 +478,8 @@ public byte[] Base64Encode(Outlook.Attachment objMailAttachment, Outlook.MailIte
{
if (System.IO.Directory.Exists(Environment.SpecialFolder.MyDocuments.ToString() + "\\SuiteCRMTempAttachmentPath") == false)
{
System.IO.Directory.CreateDirectory(Environment.SpecialFolder.MyDocuments.ToString() + "\\SuiteCRMTempAttachmentPath");
string strPath = Environment.SpecialFolder.MyDocuments.ToString() + "\\SuiteCRMTempAttachmentPath";
System.IO.Directory.CreateDirectory(strPath);
}
try
{
Expand Down Expand Up @@ -533,7 +535,7 @@ public byte[] Base64Encode(Outlook.Attachment objMailAttachment, Outlook.MailIte
{
if (System.IO.Directory.Exists(Environment.SpecialFolder.MyDocuments.ToString() + "\\SuiteCRMTempAttachmentPath") == true)
{
System.IO.Directory.Delete(Environment.SpecialFolder.MyDocuments.ToString() + "\\SuiteCRMTempAttachmentPath", true);
System.IO.Directory.Delete(Environment.SpecialFolder.MyDocuments.ToString(), true);
}
}
}
Expand Down
19 changes: 10 additions & 9 deletions SuiteCRMAddIn/frmArchive.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ public void btnSearch_Click(object sender, EventArgs e)
this.tsResults.Nodes.Clear();
this.Cursor = Cursors.WaitCursor;

if (!UnallowedNumber(this.txtSearch.Text))
{
//if (!UnallowedNumber(this.txtSearch.Text))
//{
if (this.txtSearch.Text.Contains<char>(','))
{
foreach (string str in this.txtSearch.Text.Split(new char[] { ',' }))
Expand All @@ -146,13 +146,13 @@ public void btnSearch_Click(object sender, EventArgs e)
{
this.Search(this.txtSearch.Text);
}
}
else
{
this.tsResults.Nodes.Clear();
this.Cursor = Cursors.Default;
MessageBox.Show("The search cannot start with a number", "Invalid search", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
//}
//else
//{
// this.tsResults.Nodes.Clear();
// this.Cursor = Cursors.Default;
// MessageBox.Show("The search cannot start with a number", "Invalid search", MessageBoxButtons.OK, MessageBoxIcon.Error);
//}
}

private bool UnallowedNumber(string strText)
Expand All @@ -173,6 +173,7 @@ public void Search(string query)
{
try
{
this.Cursor = Cursors.WaitCursor;
List<string> list = new List<string> { "Accounts", "Contacts", "Leads", "Bugs", "Projects", "Cases", "Opportunties" };
this.tsResults.CheckBoxes = true;
if (query == string.Empty)
Expand Down
2 changes: 1 addition & 1 deletion SuiteCRMAddInSetup/SuiteCRMAddInSetup.isl
Original file line number Diff line number Diff line change
Expand Up @@ -4370,7 +4370,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{7D2339B3-980B-4AF0-8428-56ABB4CD7EF0}</td><td/></row>
<row><td>ProductName</td><td>SuiteCRMAddIn</td><td/></row>
<row><td>ProductVersion</td><td>1.2.0</td><td/></row>
<row><td>ProductVersion</td><td>1.1.0.7</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
Expand Down
Binary file added SuiteCRMOutlookAddIn.v11.suo
Binary file not shown.
Binary file modified setup.exe
Binary file not shown.

0 comments on commit d1000ab

Please sign in to comment.