merged in-store and willcall to InStorePickup, renamed enums to have Order-prefix. Tidied markup.
--- a/schema.org/ext/neworder.html Mon Nov 25 18:03:20 2013 +0100
+++ b/schema.org/ext/neworder.html Mon Nov 25 22:49:45 2013 +0100
@@ -32,47 +32,46 @@
<span property="rdfs:comment">Enumerated status values for Order.</span>
<span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Enumeration">Enumeration</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/AvailableForPickup">
- <span class="h" property="rdfs:label">AvailableForPickup</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderPickupAvailable">
+ <span class="h" property="rdfs:label">OrderPickupAvailable</span>
<span property="rdfs:comment">OrderStatus representing availability of an order for pickup.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/Cancelled">
- <span class="h" property="rdfs:label">Cancelled</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderCancelled">
+ <span class="h" property="rdfs:label">OrderCancelled</span>
<span property="rdfs:comment">OrderStatus representing cancellation of an order.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/Delivered">
- <span class="h" property="rdfs:label">Delivered</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderDelivered">
+ <span class="h" property="rdfs:label">OrderDelivered</span>
<span property="rdfs:comment">OrderStatus representing successful delivery of an order.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/InTransit">
- <span class="h" property="rdfs:label">InTransit</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderInTransit">
+ <span class="h" property="rdfs:label">OrderInTransit</span>
<span property="rdfs:comment">OrderStatus representing that an order is in transit.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/PaymentDue">
- <span class="h" property="rdfs:label">PaymentDue</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderPaymentDue">
+ <span class="h" property="rdfs:label">OrderPaymentDue</span>
<span property="rdfs:comment">OrderStatus representing that payment is due on an order.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/ProblemWithOrder">
- <span class="h" property="rdfs:label">ProblemWithOrder</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderProblem">
+ <span class="h" property="rdfs:label">OrderProblem</span>
<span property="rdfs:comment">OrderStatus representing that there is a problem with the order.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/Processing">
- <span class="h" property="rdfs:label">Processing</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderProcessing">
+ <span class="h" property="rdfs:label">OrderProcessing</span>
<span property="rdfs:comment">OrderStatus representing that an order is being processed.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
- <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/Returned">
- <span class="h" property="rdfs:label">Returned</span>
+ <div typeof="http://schema.org/OrderStatus" resource="http://schema.org/OrderReturned">
+ <span class="h" property="rdfs:label">OrderReturned</span>
<span property="rdfs:comment">OrderStatus representing that an order has been returned.</span>
<span>type: <a href="http://schema.org/OrderStatus">OrderStatus</a></span>
</div>
-
<div typeof="rdfs:Class" resource="http://schema.org/ParcelDelivery">
<span class="h" property="rdfs:label">ParcelDelivery</span>
<span property="rdfs:comment">The delivery of a parcel either via the postal service or a commercial service.</span>
@@ -83,9 +82,6 @@
<span property="rdfs:comment">An event involving the delivery of an item.</span>
<span>Subclass of: <a property="rdfs:subClassOf" href="http://schema.org/Event">Event</a></span>
</div>
-
- <!-- removed, but we had in earlier drafts: pending, tentative, confirmed, cancelled event status types. -->
-
<div typeof="rdfs:Class" resource="http://schema.org/OnSitePickup">
<span class="h" property="rdfs:label">OnSitePickup</span>
<span property="rdfs:comment">A DeliveryMethod in which an item is collected on site, e.g. in a store or at a box office.</span>