Added the ability to purchase add-ons using the order feature. (#89)

Author: idwilliams-2

docs/help/Connect-PartnerCenter.md

@@ -15,18 +15,21 @@ Connects to Partner Center with an authenticated account for use with cmdlet req
 ## SYNTAX
 
 ### User (Default)
+
 ```powershell
 Connect-PartnerCenter -ApplicationId <String> [-EnforceMFA] [-Environment <EnvironmentName>]
  [-TenantId <String>] [<CommonParameters>]
 ```
 
 ### AccessToken
+
 ```powershell
 Connect-PartnerCenter -AccessToken <String> -ApplicationId <String> [-Credential <PSCredential>] [-EnforceMFA]
  [-Environment <EnvironmentName>] [-TenantId <String>] [<CommonParameters>]
 ```
 
 ### ServicePrincipal
+
 ```powershell
 Connect-PartnerCenter [-ApplicationId <String>] -Credential <PSCredential> [-EnforceMFA]
  [-Environment <EnvironmentName>] -TenantId <String> [<CommonParameters>]

docs/help/Get-PartnerCustomerSubscriptionAddOn.md

@@ -0,0 +1,79 @@
+---
+content_git_url: https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/docs/help/Get-PartnerCustomerSubscriptionAddOn.md
+external help file: Microsoft.Store.PartnerCenter.PowerShell.dll-Help.xml
+Module Name: PartnerCenter
+online version: https://docs.microsoft.com/powershell/module/partnercenter/Get-PartnerCustomerSubscriptionAddOn
+original_content_git_url: https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/docs/help/Get-PartnerCustomerSubscriptionAddOn.md
+
+schema: 2.0.0
+---
+
+# Get-PartnerCustomerSubscriptionAddOn
+
+## SYNOPSIS
+Gets the purchased add-ons for the specified subscription.
+
+## SYNTAX
+
+```powershell
+Get-PartnerCustomerSubscriptionAddOn -CustomerId <String> -SubscriptionId <String> [<CommonParameters>]
+```
+
+## DESCRIPTION
+Gets the purchased add-ons for the specified subscription.
+
+## EXAMPLES
+
+### Example 1
+```powershell
+PS C:\> Get-PartnerCustomerSubscriptionAddOn -CustomerId '46a62ece-10ad-42e5-b3f1-b2ed53e6fc08' -SubscriptionId '775440e2-3a09-4685-bc9e-f1638955c41e'
+```
+
+Gets the add-ons for the specified subscription.
+
+## PARAMETERS
+
+### -CustomerId
+The identifier for the customer.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -SubscriptionId
+The identifier for the subscription.
+
+```yaml
+Type: String
+Parameter Sets: (All)
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### CommonParameters
+This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
+
+## INPUTS
+
+### None
+
+## OUTPUTS
+
+### Microsoft.Store.PartnerCenter.PowerShell.Models.Subscriptions.PSSubscription
+
+## NOTES
+
+## RELATED LINKS

docs/help/New-PartnerCustomerOrder.md

@@ -14,11 +14,18 @@ Create a new order for the specified services on behalf of the customer.
 
 ## SYNTAX
 
-```powershell
+### Subscription (Default)
+```
 New-PartnerCustomerOrder -CustomerId <String> -LineItems <PSOrderLineItem[]> [-WhatIf] [-Confirm]
  [<CommonParameters>]
 ```
 
+### AddOn
+```
+New-PartnerCustomerOrder -CustomerId <String> -LineItems <PSOrderLineItem[]> -OrderId <String> [-WhatIf]
+ [-Confirm] [<CommonParameters>]
+```
+
 ## DESCRIPTION
 Create a new order for the specified services on behalf of the customer.
 
@@ -33,10 +40,29 @@ PS C:\> $lineItem.LineItemNumber = 0
 PS C:\> $lineItem.OfferId = '031C9E47-4802-4248-838E-778FB1D2CC05'
 PS C:\> $lineItem.Quantity = 1
 PS C:\>
-PS C:\> New-PartnerCustomerOrder -CustomerId '46a62ece-10ad-42e5-b3f1-b2ed53e6fc08' -LineItems $lineItem
+PS C:\> New-PartnerCustomerOrder -CustomerId '46a62ece-10ad-42e5-b3f1-b2ed53e6fc08' -LineItems @($lineItem)
 ```
 
-Create a new order for the specified services on behalf of the customer.
+Creates a new order for the specified services on behalf of the customer.
+
+### Example 2
+
+```powershell
+PS C:\> $s = Get-PartnerCustomer -CustomerId '46a62ece-10ad-42e5-b3f1-b2ed53e6fc08' -SubscriptionId '10704f2f-3fc6-4e42-8acf-08df4f81c93c'
+PS C:\> $addOn = Get-PartnerOfferAddon -OfferId $s.OfferId | Where-Object {$_.Name -eq 'Microsoft MyAnalytics'}
+PS C:\>
+PS C:\> $lineItem = New-Object -TypeName Microsoft.Store.PartnerCenter.PowerShell.Models.Orders.PSOrderLineItem
+PS C:\>
+PS C:\> $lineItem.LineItemNumber = 0
+PS C:\> $lineItem.OfferId = $addOn.OfferId
+PS C:\> $lineItem.Quantity = 1
+PS C:\> $lineItem.FriendlyName = $addOn.Name
+PS C:\> $lineItem.ParentSubscriptionId = $s.SubscriptionId
+PS C:\>
+PS C:\> New-PartnerCustomerOrder -CustomerId '46a62ece-10ad-42e5-b3f1-b2ed53e6fc08' -LineItems @($lineItem) -OrderId $s.OrderId
+```
+
+Creates an order to purchase an add-on for the specific subscription on behalf of the customer. This example shows how to purchase the Microsoft MyAnalytics add-on for the specified subscription. In this case the specified subscription is an Office 365 E3 subscription.
 
 ## PARAMETERS
 
@@ -71,6 +97,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -OrderId
+The order identifier used when purchasing an add-on.
+
+```yaml
+Type: String
+Parameter Sets: AddOn
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 Prompts you for confirmation before running the cmdlet.
 

docs/help/PartnerCenter.md

@@ -86,6 +86,9 @@ Gets a list of licenses available to users of the specified customer.
 ### [Get-PartnerCustomerSubscription](Get-PartnerCustomerSubscription.md)
 Gets a list or a single customer subscription.
 
+### [Get-PartnerCustomerSubscriptionAddOn](Get-PartnerCustomerSubscriptionAddOn.md)
+Gets the purchased add-ons for the specified subscription.
+
 ### [Get-PartnerCustomerSubscriptionProvisioningStatus](Get-PartnerCustomerSubscriptionProvisioningStatus.md)
 Gets the provisioning status for the specified subscription.
 
@@ -258,7 +261,7 @@ Update a subscription's support contact to one of the partner's value added rese
 Updates the specified customer user account.
 
 ### [Set-PartnerCustomerUserLicense](Set-PartnerCustomerUserLicense.md)
-Adds or removes licenses for a Microsoft online service to the list of assigned licenses for a user. 
+Adds or removes licenses for a Microsoft online service to the list of assigned licenses for a user.
 
 ### [Set-PartnerLegalProfile](Set-PartnerLegalProfile.md)
 Updates the partner's legal profile.
@@ -279,4 +282,5 @@ Checks out the specified cart.
 Tests whether or not the specified address is valid.
 
 ### [Test-PartnerDomainAvailability](Test-PartnerDomainAvailability.md)
-Tests if the specified domain name is available for creating a new tenant.
+Tests if the specified domain name is available for creating a new tenant.
+

src/PartnerCenter.TestFramework/PartnerCenter.TestFramework.csproj

@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>1.5.1902.4</Version>
+    <Version>1.5.1902.5</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
   </PropertyGroup>
 

src/PartnerCenter/Models/Orders/Order.cs

@@ -8,7 +8,6 @@ namespace Microsoft.Store.PartnerCenter.Models.Orders
 {
     using System;
     using System.Collections.Generic;
-    using Newtonsoft.Json;
     using Offers;
 
     /// <summary>
@@ -17,44 +16,43 @@ namespace Microsoft.Store.PartnerCenter.Models.Orders
     public sealed class Order : ResourceBase
     {
         /// <summary>
-        /// Gets or sets the order identifier.
+        /// Gets or sets the type of billing cycle for the selected offers.
         /// </summary>
-        public string Id { get; set; }
+        public BillingCycleType BillingCycle { get; set; }
 
         /// <summary>
-        /// Gets or sets the reference customer identifier.
+        /// Gets or sets the creation date of the order.
         /// </summary>
-        public string ReferenceCustomerId { get; set; }
+        public DateTime? CreationDate { get; set; }
 
         /// <summary>
-        /// Gets or sets the type of billing cycle for the selected offers.
+        /// Gets or sets the currency code.
         /// </summary>
-        public BillingCycleType BillingCycle { get; set; }
+        public string CurrencyCode { get; set; }
 
         /// <summary>
-        /// Gets or sets the currency code.
+        /// Gets or sets the order identifier.
         /// </summary>
-        [JsonProperty]
-        public string CurrencyCode { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the Order line items. Each order line item refers to one offer's purchase data.
         /// </summary>
         public IEnumerable<OrderLineItem> LineItems { get; set; }
 
         /// <summary>
-        /// Gets or sets the creation date of the order.
+        /// Gets or sets the links corresponding to the order.
         /// </summary>
-        public DateTime? CreationDate { get; set; }
+        public OrderLinks Links { get; set; }
 
         /// <summary>
         /// Gets or sets the order status.
         /// </summary>
         public string Status { get; set; }
 
         /// <summary>
-        /// Gets or sets the links corresponding to the order.
+        /// Gets or sets the reference customer identifier.
         /// </summary>
-        public OrderLinks Links { get; set; }
+        public string ReferenceCustomerId { get; set; }
     }
-}
+}

src/PartnerCenter/Models/Orders/OrderLineItems.cs

@@ -13,6 +13,14 @@ namespace Microsoft.Store.PartnerCenter.Models.Orders
     /// </summary>
     public sealed class OrderLineItem : ResourceBaseWithLinks<OrderLineItemLinks>
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OrderLineItem" /> class.
+        /// </summary>
+        public OrderLineItem()
+        {
+            ProvisioningContext = new Dictionary<string, string>();
+        }
+
         /// <summary>
         /// Gets or sets the line item number.
         /// </summary>
@@ -52,6 +60,6 @@ public sealed class OrderLineItem : ResourceBaseWithLinks<OrderLineItemLinks>
         /// <summary>
         /// Gets or sets the provisioning context for the offer.
         /// </summary>
-        public Dictionary<string, string> ProvisioningContext { get; set; }
+        public Dictionary<string, string> ProvisioningContext { get; private set; }
     }
-}
+}

src/PartnerCenter/Network/PartnerServiceClient.cs

@@ -920,6 +920,7 @@ private JsonSerializerSettings GetSerializationSettings(JsonConverter converter
                     }
                 },
                 ContractResolver = new PrivateContractResolver(),
+                CheckAdditionalContent = true,
                 DateFormatHandling = DateFormatHandling.IsoDateFormat,
                 DateTimeZoneHandling = DateTimeZoneHandling.Utc,
                 NullValueHandling = NullValueHandling.Ignore,

src/PartnerCenter/PartnerCenter.csproj

@@ -9,7 +9,7 @@
     <Copyright>Copyright ©  2019</Copyright>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Product>Microsoft Partner Center</Product>
-    <Version>1.5.1902.4</Version>
+    <Version>1.5.1902.5</Version>
     <PackageLicenseUrl>https://github.com/Microsoft/Partner-Center-PowerShell/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/Microsoft/Partner-Center-PowerShell</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Microsoft/Partner-Center-PowerShell.git</RepositoryUrl>

src/PowerShell/Commands/GetPartnerCustomerSubscriptionAddOn.cs

@@ -0,0 +1,42 @@
+// -----------------------------------------------------------------------
+// <copyright file=GetPartnerCustomerSubscriptionAddOn.cs" company="Microsoft">
+//     Copyright (c) Microsoft Corporation. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Microsoft.Store.PartnerCenter.PowerShell.Commands
+{
+    using System.Linq;
+    using System.Management.Automation;
+    using System.Text.RegularExpressions;
+    using Models.Subscriptions;
+    using PartnerCenter.Models;
+    using PartnerCenter.Models.Subscriptions;
+
+    [Cmdlet(VerbsCommon.Get, "PartnerCustomerSubscriptionAddOn"), OutputType(typeof(PSSubscription))]
+    public class GetPartnerCustomerSubscriptionAddOn : PartnerPSCmdlet
+    {
+        /// <summary>
+        /// Gets or sets the customer identifier.
+        /// </summary>
+        [Parameter(HelpMessage = "The identifier for the customer.", Mandatory = true)]
+        [ValidatePattern(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$", Options = RegexOptions.Compiled | RegexOptions.IgnoreCase)]
+        public string CustomerId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the subscription identifier.
+        /// </summary>
+        [Parameter(HelpMessage = "The identifier for the subscription.", Mandatory = true)]
+        [ValidatePattern(@"^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$", Options = RegexOptions.Compiled | RegexOptions.IgnoreCase)]
+        public string SubscriptionId { get; set; }
+
+        /// <summary>
+        /// Executes the operations associated with the cmdlet.
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            ResourceCollection<Subscription> subscripions = Partner.Customers[CustomerId].Subscriptions[SubscriptionId].AddOns.Get();
+            WriteObject(subscripions.Items.Select(s => new PSSubscription(s)), true);
+        }
+    }
+}