remove deprecated get...OrderStatusString methods

diff --git a/enyo-client/application/source/models/sales_order.js b/enyo-client/application/source/models/sales_order.js
index 7b41b30..0090086 100644 (file)
--- a/enyo-client/application/source/models/sales_order.js
+++ b/enyo-client/application/source/models/sales_order.js
@@ -85,11 +85,6 @@ white:true*/
       }
     },
 
-    getSalesOrderStatusString: function () {
-      // XXX #refactor
-      return XM.SalesOrder.prototype.getOrderStatusString.call(this);
-    },
-
     holdTypeDidChange: function () {
       if (!this.get("holdType")) {
         _.each(this.get("workflow").where(

diff --git a/enyo-client/application/source/models/sales_order_base.js b/enyo-client/application/source/models/sales_order_base.js
index ab8d82b..2e441ba 100644 (file)
--- a/enyo-client/application/source/models/sales_order_base.js
+++ b/enyo-client/application/source/models/sales_order_base.js
@@ -253,15 +253,6 @@ white:true*/
       case K.CANCELLED_STATUS:
         return '_cancelled'.loc();
       }
-    },
-
-    /**
-    Deprecated. Use `formatStatus`.
-
-    @returns {String}
-    */
-    getOrderStatusString: function () {
-      return this.formatStatus();
     }
   };
 
@@ -302,7 +293,7 @@ white:true*/
 
     readOnlyAttributes: [
       "freightWeight",
-      "getOrderStatusString",
+      "formatStatus",
       "lineItems",
       "allocatedCredit",
       "balance",

diff --git a/enyo-client/application/source/views/list.js b/enyo-client/application/source/views/list.js
index cf275ba..877db18 100644 (file)
--- a/enyo-client/application/source/views/list.js
+++ b/enyo-client/application/source/views/list.js
@@ -1734,7 +1734,7 @@ trailing:true, white:true, strict: false*/
           {kind: "XV.ListColumn", classes: "first", components: [
             {kind: "FittableColumns", components: [
               {kind: "XV.ListAttr", attr: "number", isKey: true, fit: true},
-              {kind: "XV.ListAttr", attr: "getOrderStatusString",
+              {kind: "XV.ListAttr", attr: "formatStatus",
                 style: "padding-left: 24px"},
               {kind: "XV.ListAttr", attr: "scheduleDate",
                 classes: "right", placeholder: "_noSchedule".loc()}

diff --git a/enyo-client/application/source/views/workspace.js b/enyo-client/application/source/views/workspace.js
index a46798c..3350994 100644 (file)
--- a/enyo-client/application/source/views/workspace.js
+++ b/enyo-client/application/source/views/workspace.js
@@ -2034,7 +2034,7 @@ strict: false*/
               label: "_quoteDate".loc()},
             {kind: "XV.DateWidget", attr: "scheduleDate"},
             {kind: "XV.DateWidget", attr: "expireDate"},
-            {kind: "XV.InputWidget", attr: "getOrderStatusString",
+            {kind: "XV.InputWidget", attr: "formatStatus",
               label: "_status".loc()},
             {kind: "onyx.GroupboxHeader", content: "_billTo".loc()},
             {kind: "XV.CustomerProspectWidget", attr: "customer",
@@ -2284,7 +2284,7 @@ strict: false*/
             {kind: "XV.DateWidget", name: "dateField", attr: "orderDate",
               label: "_orderDate".loc()},
             {kind: "XV.DateWidget", attr: "scheduleDate"},
-            {kind: "XV.InputWidget", attr: "getOrderStatusString",
+            {kind: "XV.InputWidget", attr: "formatStatus",
               label: "_status".loc()},
             {kind: "onyx.GroupboxHeader", content: "_billTo".loc()},
             {kind: "XV.SalesCustomerWidget", attr: "customer",

diff --git a/enyo-client/extensions/source/purchasing/client/models/purchase_order.js b/enyo-client/extensions/source/purchasing/client/models/purchase_order.js
index 78ea0ae..c4c8ee4 100644 (file)
--- a/enyo-client/extensions/source/purchasing/client/models/purchase_order.js
+++ b/enyo-client/extensions/source/purchasing/client/models/purchase_order.js
@@ -77,14 +77,6 @@ white:true*/
         case K.CLOSED_STATUS:
           return "_closed".loc();
         }
-      },
-      /**
-        Returns Purchase order status as a localized string.
-
-        @returns {String}
-      */
-      getPurchaseOrderStatusString: function () {
-        return this.formatStatus();
       }
     };
 
@@ -496,7 +488,7 @@ white:true*/
     XM.PurchaseOrder = XM.PurchaseOrder.extend({
       emailDocumentName: "_purchaseOrder".loc(),
       emailProfileAttribute: "purchaseType.emailProfile",
-      emailStatusMethod: "getPurchaseOrderStatusString"
+      emailStatusMethod: "formatStatus"
     });
 
     // ..........................................................

diff --git a/enyo-client/extensions/source/purchasing/client/views/grid_box.js b/enyo-client/extensions/source/purchasing/client/views/grid_box.js
index de8639e..32557ac 100644 (file)
--- a/enyo-client/extensions/source/purchasing/client/views/grid_box.js
+++ b/enyo-client/extensions/source/purchasing/client/views/grid_box.js
@@ -116,7 +116,7 @@ trailing:true, white:true, strict:false*/
           {readOnlyAttr: "vouchered",
             editor: {kind: "XV.QuantityWidget", attr: "vouchered",
               name: "voucheredWidget"}},
-          {readOnlyAttr: "getPurchaseOrderStatusString",
+          {readOnlyAttr: "formatStatus",
             editor: {kind: "XV.PurchaseOrderStatusPicker", attr: "status"}}
         ]},
       ]

diff --git a/enyo-client/extensions/source/purchasing/client/views/list.js b/enyo-client/extensions/source/purchasing/client/views/list.js
index a20a7f7..8b90cd5 100644 (file)
--- a/enyo-client/extensions/source/purchasing/client/views/list.js
+++ b/enyo-client/extensions/source/purchasing/client/views/list.js
@@ -105,7 +105,7 @@ trailing:true, white:true, strict:false*/
             {kind: "XV.ListColumn", classes: "first", components: [
               {kind: "FittableColumns", components: [
                 {kind: "XV.ListAttr", attr: "number", isKey: true, fit: true},
-                {kind: "XV.ListAttr", attr: "getPurchaseOrderStatusString",
+                {kind: "XV.ListAttr", attr: "formatStatus",
                   style: "padding-left: 24px"},
                 {kind: "XV.ListAttr", attr: "orderDate",
                   classes: "right"}

diff --git a/enyo-client/extensions/source/purchasing/client/views/list_relations.js b/enyo-client/extensions/source/purchasing/client/views/list_relations.js
index de63a64..6d2e6c8 100644 (file)
--- a/enyo-client/extensions/source/purchasing/client/views/list_relations.js
+++ b/enyo-client/extensions/source/purchasing/client/views/list_relations.js
@@ -120,7 +120,7 @@ trailing:true, white:true*/
             {kind: "XV.ListColumn", classes: "money", components: [
               {kind: "XV.ListAttr", attr: "received"},
               {kind: "XV.ListAttr", attr: "vouchered"},
-              {kind: "XV.ListAttr", attr: "getPurchaseOrderStatusString"}
+              {kind: "XV.ListAttr", attr: "formatStatus"}
             ]},
           ]}
         ]}