Skip to content

Commit

Permalink
Merge pull request #37 from Mozu/Dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Sanjay committed Nov 25, 2014
2 parents 0cc28e7 + 0232b9b commit 679a275
Show file tree
Hide file tree
Showing 205 changed files with 1,735 additions and 1,728 deletions.
7 changes: 5 additions & 2 deletions SDK/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@

1) Add new mozu config property(ThrowExceptionOn404) - If an item(product/Order/Customer) does not exist in Mozu, null value is returned. if this is set to true an ApiException will be throw.
2) Add build files - Ability to build and generate a nuget package from command line
2) Add build files - Ability to build and generate a nuget package from command line


Operations
0. Added - commerce.catalog.admin.categories.FixCategoryTreeSequences - POST
20 changes: 10 additions & 10 deletions SDK/Mozu.Api/Contracts/AdminUser/DeveloperAdminUserAuthTicket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ public class DeveloperAdminUserAuthTicket
///
public DateTime AccessTokenExpiration { get; set; }

///
///Properties of the developer account for which the user authentication ticket grants access.
///
public DeveloperAccount Account { get; set; }

///
///Collection of developer accounts for which the user authentication ticket grants access.
///
public List<DeveloperAccount> AvailableAccounts { get; set; }

///
///Date and time when the entity was created, represented in UTC Date/Time.
///
Expand All @@ -50,16 +60,6 @@ public class DeveloperAdminUserAuthTicket
///
public DateTime RefreshTokenExpiration { get; set; }

///
///Properties of the developer account for which the user authentication ticket grants access.
///
public DeveloperAccount Account { get; set; }

///
///Collection of developer accounts for which the user authentication ticket grants access.
///
public List<DeveloperAccount> AvailableAccounts { get; set; }

///
///User information associated with the authentication ticket.
///
Expand Down
12 changes: 6 additions & 6 deletions SDK/Mozu.Api/Contracts/AdminUser/TenantAdminUserAuthTicket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
using System;
using System.Collections.Generic;

using Mozu.Api.Contracts.Tenant;
using Mozu.Api.Contracts.Core;
using Mozu.Api.Contracts.Tenant;

namespace Mozu.Api.Contracts.AdminUser
{
Expand All @@ -31,6 +31,11 @@ public class TenantAdminUserAuthTicket
///
public DateTime AccessTokenExpiration { get; set; }

///
///Collection of tenants for which the user authentication ticket grants access.
///
public List<Tenant.Tenant> AvailableTenants { get; set; }

///
///Date and time when the entity was created, represented in UTC Date/Time.
///
Expand All @@ -51,11 +56,6 @@ public class TenantAdminUserAuthTicket
///
public DateTime RefreshTokenExpiration { get; set; }

///
///Collection of tenants for which the user authentication ticket grants access.
///
public List<Tenant.Tenant> AvailableTenants { get; set; }

///
///Tenant information associated with the user authentication ticket.
///
Expand Down
64 changes: 32 additions & 32 deletions SDK/Mozu.Api/Contracts/CommerceRuntime/Carts/Cart.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
using System;
using System.Collections.Generic;

using Mozu.Api.Contracts.Core;
using Mozu.Api.Contracts.CommerceRuntime.Commerce;
using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
using Mozu.Api.Contracts.CommerceRuntime.Discounts;
using Mozu.Api.Contracts.CommerceRuntime.Fulfillment;
using Mozu.Api.Contracts.Core;

namespace Mozu.Api.Contracts.CommerceRuntime.Carts
{
Expand All @@ -23,6 +23,16 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
///
public class Cart
{
///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///
public AuditInfo AuditInfo { get; set; }

///
///Messages logged or created each time the cart was modified.
///
public List<ChangeMessage> ChangeMessages { get; set; }

///
///Code that identifies the channel associated with the site where the shopping cart was created.
///
Expand Down Expand Up @@ -68,6 +78,11 @@ public class Cart
///
public decimal? FeeTotal { get; set; }

///
///Properties of the information required to fulfill this cart.
///
public FulfillmentInfo FulfillmentInfo { get; set; }

///
///If the handling fee for the cart is subject to sales tax, the total tax amount.
///
Expand All @@ -78,6 +93,16 @@ public class Cart
///
public string Id { get; set; }

///
///The list of invalid coupons the shopper attempted to enter for the cart.
///
public List<InvalidCoupon> InvalidCoupons { get; set; }

///
///An array list of objects in the returned collection.
///
public List<CartItem> Items { get; set; }

///
///The total amount of tax for items in the cart.
///
Expand All @@ -88,6 +113,11 @@ public class Cart
///
public DateTime? LastValidationDate { get; set; }

///
///List of order-level discounts projected to apply to the cart at checkout.
///
public List<AppliedDiscount> OrderDiscounts { get; set; }

///
///The shipping subtotal amount calculated without any applied discounts.
///
Expand Down Expand Up @@ -143,36 +173,6 @@ public class Cart
///
public string WebSessionId { get; set; }

///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///
public AuditInfo AuditInfo { get; set; }

///
///Messages logged or created each time the cart was modified.
///
public List<ChangeMessage> ChangeMessages { get; set; }

///
///Properties of the information required to fulfill this cart.
///
public FulfillmentInfo FulfillmentInfo { get; set; }

///
///The list of invalid coupons the shopper attempted to enter for the cart.
///
public List<InvalidCoupon> InvalidCoupons { get; set; }

///
///An array list of objects in the returned collection.
///
public List<CartItem> Items { get; set; }

///
///List of order-level discounts projected to apply to the cart at checkout.
///
public List<AppliedDiscount> OrderDiscounts { get; set; }

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
///
public class CartChangeMessageCollection
{
public int TotalCount { get; set; }

public List<ChangeMessage> Items { get; set; }

public int TotalCount { get; set; }

}

}
56 changes: 28 additions & 28 deletions SDK/Mozu.Api/Contracts/CommerceRuntime/Carts/CartItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
using System;
using System.Collections.Generic;

using Mozu.Api.Contracts.Core;
using Mozu.Api.Contracts.CommerceRuntime.Products;
using Mozu.Api.Contracts.CommerceRuntime.Discounts;
using Mozu.Api.Contracts.CommerceRuntime.Commerce;
using Mozu.Api.Contracts.CommerceRuntime.Discounts;
using Mozu.Api.Contracts.CommerceRuntime.Products;
using Mozu.Api.Contracts.Core;

namespace Mozu.Api.Contracts.CommerceRuntime.Carts
{
Expand All @@ -23,6 +23,11 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
///
public class CartItem
{
///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///
public AuditInfo AuditInfo { get; set; }

///
///The subtotal of the cart item including any applied discount calculations.
///
Expand Down Expand Up @@ -81,59 +86,54 @@ public class CartItem
public string LocaleCode { get; set; }

///
///The specified quantity of the cart item.
///
public int Quantity { get; set; }

///
///The total amount of tax incurred on the shipping charges in the cart.
///The properties of the associated product.
///
public decimal? ShippingTaxTotal { get; set; }
public Product Product { get; set; }

///
///The estimated total amount of shipping fees for the item in the cart.
///Product discounts displays a list of all applicable discount.
///
public decimal? ShippingTotal { get; set; }
public AppliedLineItemProductDiscount ProductDiscount { get; set; }

///
///Estimated amount of the item in the cart without sales tax, shipping costs, and other fees.
///List of product-level discounts projected to apply to the cart item at checkout.
///
public decimal? Subtotal { get; set; }
public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }

///
///The amount of the item in the cart that is subject to tax.
///The specified quantity of the cart item.
///
public decimal? TaxableTotal { get; set; }
public int Quantity { get; set; }

///
///Estimated total amount of the item, including the product price, sales tax, shipping costs, and other fees.
///List of shipping discounts projected to apply to the cart item at checkout.
///
public decimal? Total { get; set; }
public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }

///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///The total amount of tax incurred on the shipping charges in the cart.
///
public AuditInfo AuditInfo { get; set; }
public decimal? ShippingTaxTotal { get; set; }

///
///The properties of the associated product.
///The estimated total amount of shipping fees for the item in the cart.
///
public Product Product { get; set; }
public decimal? ShippingTotal { get; set; }

///
///Product discounts displays a list of all applicable discount.
///Estimated amount of the item in the cart without sales tax, shipping costs, and other fees.
///
public AppliedLineItemProductDiscount ProductDiscount { get; set; }
public decimal? Subtotal { get; set; }

///
///List of product-level discounts projected to apply to the cart item at checkout.
///The amount of the item in the cart that is subject to tax.
///
public List<AppliedLineItemProductDiscount> ProductDiscounts { get; set; }
public decimal? TaxableTotal { get; set; }

///
///List of shipping discounts projected to apply to the cart item at checkout.
///Estimated total amount of the item, including the product price, sales tax, shipping costs, and other fees.
///
public List<AppliedLineItemShippingDiscount> ShippingDiscounts { get; set; }
public decimal? Total { get; set; }

///
///Properties of the unit price associated with the cart item.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Carts
public class CartItemCollection
{
///
///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
///An array list of objects in the returned collection.
///
public int TotalCount { get; set; }
public List<CartItem> Items { get; set; }

///
///An array list of objects in the returned collection.
///The number of results listed in the query collection, represented by a signed 64-bit (8-byte) integer. This value is system-supplied and read-only.
///
public List<CartItem> Items { get; set; }
public int TotalCount { get; set; }

}

Expand Down
10 changes: 5 additions & 5 deletions SDK/Mozu.Api/Contracts/CommerceRuntime/Channels/Channel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
///
public class Channel
{
///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///
public AuditInfo AuditInfo { get; set; }

///
///User-defined code that uniquely identifies the channel.
///
Expand Down Expand Up @@ -52,11 +57,6 @@ public class Channel
///
public int TenantId { get; set; }

///
///Identifier and datetime stamp information recorded when a user or application creates, updates, or deletes a resource entity. This value is system-supplied and read-only.
///
public AuditInfo AuditInfo { get; set; }

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ namespace Mozu.Api.Contracts.CommerceRuntime.Channels
///
public class ChannelCollection
{
///
///An array list of objects in the returned collection.
///
public List<Channel> Items { get; set; }

///
///The number of pages returned based on the startIndex and pageSize values specified. This value is system-supplied and read-only.
///
Expand All @@ -39,11 +44,6 @@ public class ChannelCollection
///
public int TotalCount { get; set; }

///
///An array list of objects in the returned collection.
///
public List<Channel> Items { get; set; }

}

}
Loading

0 comments on commit 679a275

Please sign in to comment.