Merge pull request #908 from SoftLayer/issues902

Updated 'account invoices' help text

Author: allmightyspiff

plugin/commands/account/invoices.go

@@ -1,6 +1,7 @@
 package account
 
 import (
+	"fmt"
 	"github.com/spf13/cobra"
 
 	"github.ibm.com/SoftLayer/softlayer-cli/plugin/errors"
@@ -27,6 +28,14 @@ func NewInvoicesCommand(sl *metadata.SoftlayerCommand) *InvoicesCommand {
 	cobraCmd := &cobra.Command{
 		Use:   "invoices",
 		Short: T("List invoices."),
+		Long: T("Lists the most recent invoices in the OPEN status."),
+		Example: fmt.Sprintf(`${COMMAND_NAME} sl account invoices --all
+%s
+
+	${COMMAND_NAME} sl account invoices --limit 100 --closed
+%s`,
+	T(`Lists all open and closed invoices on the account.`),
+	T(`Lists 100 invoices, ordered by latest create date, including invoices in the CLOSED status.`)),
 		Args:  metadata.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return thisCmd.Run(args)

plugin/i18n/v2Resources/active.en-US.json

@@ -4421,6 +4421,9 @@
   "List {{.storageType}} storage snapshots": {
     "other": "List {{.storageType}} storage snapshots"
   },
+  "Lists 100 invoices, ordered by latest create date, including invoices in the CLOSED status.": {
+    "other": "Lists 100 invoices, ordered by latest create date, including invoices in the CLOSED status."
+  },
   "Lists Email Delivery Service.": {
     "other": "Lists Email Delivery Service."
   },
@@ -4430,9 +4433,15 @@
   "Lists account orders.": {
     "other": "Lists account orders."
   },
+  "Lists all open and closed invoices on the account.": {
+    "other": "Lists all open and closed invoices on the account."
+  },
   "Lists billing items with some other useful information.": {
     "other": "Lists billing items with some other useful information."
   },
+  "Lists the most recent invoices in the OPEN status.": {
+    "other": "Lists the most recent invoices in the OPEN status."
+  },
   "Lists the prices for each item in this preset": {
     "other": "Lists the prices for each item in this preset"
   },

plugin/managers/account.go

@@ -184,7 +184,7 @@ func (a accountManager) GetInvoices(limit int, closed bool, getAll bool) ([]data
 	mask := "mask[invoiceTotalAmount, itemCount]"
 	filters := filter.New()
 	filters = append(filters, filter.Path("invoices.id").OrderBy("DESC"))
-	if !closed {
+	if !closed || !getAll {
 		filters = append(filters, filter.Path("invoices.statusCode").Eq("OPEN"))
 	}
 	resourceList := []datatypes.Billing_Invoice{}