Skip to content

fix for issue #238 - Adding an attachment to a service bill fails #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrasFromTransAxHealthCare wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix for issue #238 - Adding an attachment to a service bill fails #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions MYOB.API.SDK/SDK.NET45/Services/Version2/Banking/SpendMoneyAttachmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,9 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
// baseUrl/Banking/SpendMoneyTxn/spendMoneyUid/Attachment
public Uri BuildUri(CompanyFile companyFile, Guid spendMoneyUid, Guid? attachmentUid = null, string queryString = null)
{
var qs = string.IsNullOrEmpty(queryString) ? string.Empty : queryString;
var attchUid = attachmentUid.HasValue ? "/" + attachmentUid.ToString() : string.Empty;

return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Banking/SpendMoneyTxn", spendMoneyUid.ToString(), "/Attachment", attchUid, qs));
string text = (string.IsNullOrEmpty(queryString) ? string.Empty : (queryString.StartsWith("?") ? queryString : ("?" + queryString)));
string text2 = (attachmentUid.HasValue ? ("/" + attachmentUid.ToString()) : string.Empty);
return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Banking/SpendMoneyTxn", spendMoneyUid.ToString(), "/Attachment", text2, text));
}
}
}
6 changes: 3 additions & 3 deletions MYOB.API.SDK/SDK.NET45/Services/Version2/Purchase/ItemBillAttachmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
// baseUrl/Purchase/Bill/Item/billUid/Attachment
public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid = null, string queryString = null)
{
var qs = string.IsNullOrEmpty(queryString) ? string.Empty : queryString;
var attchUid = attachmentUid.HasValue ? "/" + attachmentUid.ToString() : string.Empty;
string text = (string.IsNullOrEmpty(queryString) ? string.Empty : (queryString.StartsWith("?") ? queryString : ("?" + queryString)));
string text2 = (attachmentUid.HasValue ? ("/" + attachmentUid.ToString()) : string.Empty);

return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Item", billUid.ToString(), "/Attachment", attchUid, qs));
return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Item", billUid.ToString(), "/Attachment", text2, text));
}
}
}
6 changes: 3 additions & 3 deletions MYOB.API.SDK/SDK.NET45/Services/Version2/Purchase/MiscellaneousBillAttachmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
// baseUrl/Purchase/Bill/Miscellaneous/billUid/Attachment
public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid = null, string queryString = null)
{
var qs = string.IsNullOrEmpty(queryString) ? string.Empty : queryString;
var attchUid = attachmentUid.HasValue ? "/" + attachmentUid.ToString() : string.Empty;
string text = (string.IsNullOrEmpty(queryString) ? string.Empty : (queryString.StartsWith("?") ? queryString : ("?" + queryString)));
string text2 = (attachmentUid.HasValue ? ("/" + attachmentUid.ToString()) : string.Empty);

return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Miscellaneous", billUid.ToString(), "/Attachment", attchUid, qs));
return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Miscellaneous", billUid.ToString(), "/Attachment", text2, text));
}
}
}
6 changes: 3 additions & 3 deletions MYOB.API.SDK/SDK.NET45/Services/Version2/Purchase/ProfessionalBillAttachmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
// baseUrl/Purchase/Bill/Professional/billUid/Attachment
public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid = null, string queryString = null)
{
var qs = string.IsNullOrEmpty(queryString) ? string.Empty : queryString;
var attchUid = attachmentUid.HasValue ? "/" + attachmentUid.ToString() : string.Empty;
string text = (string.IsNullOrEmpty(queryString) ? string.Empty : (queryString.StartsWith("?") ? queryString : ("?" + queryString)));
string text2 = (attachmentUid.HasValue ? ("/" + attachmentUid.ToString()) : string.Empty);

return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Professional", billUid.ToString(), "/Attachment", attchUid, qs));
return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Professional", billUid.ToString(), "/Attachment", text2, text));
}
}
}
6 changes: 3 additions & 3 deletions MYOB.API.SDK/SDK.NET45/Services/Version2/Purchase/ServiceBillAttachmentService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ private string GenerateQueryString(ErrorLevel errorLevel, bool returnBody = fals
// baseUrl/Purchase/Bill/Service/billUid/Attachment
public Uri BuildUri(CompanyFile companyFile, Guid billUid, Guid? attachmentUid = null, string queryString = null)
{
var qs = string.IsNullOrEmpty(queryString) ? string.Empty : queryString;
var attchUid = attachmentUid.HasValue ? "/" + attachmentUid.ToString() : string.Empty;
string text = (string.IsNullOrEmpty(queryString) ? string.Empty : (queryString.StartsWith("?") ? queryString : ("?" + queryString)));
string text2 = (attachmentUid.HasValue ? ("/" + attachmentUid.ToString()) : string.Empty);

return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Service", billUid.ToString(), "/Attachment", attchUid, qs));
return new Uri(string.Format("{0}/{1}/{2}{3}{4}{5}", companyFile.Uri, "Purchase/Bill/Service", billUid.ToString(), "/Attachment", text2, text));
}
}
}