@questwork/q-store-model 0.1.41 → 0.1.42

package/dist/index.min.cjs

@@ -84,6 +84,7 @@ __webpack_require__.d(__webpack_exports__, {
   Status: () => (/* reexport */ Status),
   StatusQStore: () => (/* reexport */ StatusQStore),
   StatusQStoreInvoice: () => (/* reexport */ StatusQStoreInvoice),
+  StatusQStoreOrder: () => (/* reexport */ StatusQStoreOrder),
   StatusQStoreOrderLine: () => (/* reexport */ StatusQStoreOrderLine),
   StoreItem: () => (/* reexport */ StoreItem),
   Transaction: () => (/* reexport */ Transaction),
@@ -145,6 +146,7 @@ __webpack_require__.d(models_namespaceObject, {
   Status: () => (Status),
   StatusQStore: () => (StatusQStore),
   StatusQStoreInvoice: () => (StatusQStoreInvoice),
+  StatusQStoreOrder: () => (StatusQStoreOrder),
   StatusQStoreOrderLine: () => (StatusQStoreOrderLine),
   StoreItem: () => (StoreItem),
   Transaction: () => (Transaction),
@@ -1949,7 +1951,7 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     super(options)
 
     const { _ItemOption, _ItemOptionFillIn, _MerchandiseOption, _Price, _Product } = options._constructor || {}
-    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _I_ItemOptiontemOptionFillIn : ItemOption
+    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _ItemOption : ItemOption
     this._ItemOptionFillIn = _ItemOptionFillIn && (_ItemOptionFillIn._superclass === ItemOptionFillIn._superclass) ? _ItemOptionFillIn : ItemOptionFillIn
     this._MerchandiseOption = _MerchandiseOption && (_MerchandiseOption._superclass === MerchandiseOption._superclass) ? _MerchandiseOption : MerchandiseOption
     this._Price = _Price && (_Price._superclass === Price._superclass) ? _Price : Price
@@ -2286,11 +2288,20 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   }
   getPreservedData() {
     return {
+      allowEditQty: this.allowEditQty,
+      allowEditUnitPrice: this.allowEditUnitPrice,
+      defaultCurrency: this.defaultCurrency,
+      description: this.description,
+      merchandiseCategoryCodes: this.merchandiseCategoryCodes,
       merchandiseCode: this.merchandiseCode,
+      merchandiseOptions: this.merchandiseOptions,
       merchandiseType: this.merchandiseType,
       metadata: this.metadata,
       name: this.name,
+      priority: this.priority,
       productCodes: this.productCodes,
+      sku: this.sku,
+      stock: this.stock,
       tenantCode: this.tenantCode,
     }
   }
@@ -3917,10 +3928,10 @@ class StatusQStoreInvoice extends StatusQStore {
     return 'StatusQStoreInvoice'
   }
   get isClosed() {
-    return this.closed?.timestamp > Date.now()
+    return this.closed?.timestamp > 0
   }
   get isOpen() {
-    return this.open?.timestamp > Date.now()
+    return this.open?.timestamp > 0
   }
   get isValid() {
     return super.isValid
@@ -3933,6 +3944,64 @@ class StatusQStoreInvoice extends StatusQStore {
   }
 }
 
+;// ./lib/models/statusQStore/statusQStoreOrder.js
+
+
+const statusQStoreOrder_notUpdateAllowedProps = (/* unused pure expression or super */ null && ([
+]))
+
+class StatusQStoreOrder extends StatusQStore {
+  constructor(options) {
+    options = options || {}
+    super(options)
+    this.closed = this._ActionRecord.init(options.closed)
+    // this.expired = this._ActionRecord.init(options.expired)
+    // this.fulfilled = this._ActionRecord.init(options.fulfilled)
+    // this.invalid = this._ActionRecord.init(options.invalid)
+    // this.posted = this._ActionRecord.init(options.posted)
+  }
+
+  static get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get isClosed() {
+    return this.closed?.timestamp > 0
+  }
+  // get isExpired() {
+  //   return this.expired?.timestamp < Date.now()
+  // }
+  // get isFulfilled() {
+  //   return this.fulfilled?.timestamp > 0
+  // }
+  // get isInvalid() {
+  //   return this.invalid?.timestamp < Date.now()
+  // }
+  // get isPosted() {
+  //   return this.posted?.timestamp > 0
+  // }
+  // get isValid() {
+  //   return super.isValid
+  // }
+  setClosed(value, actorCode) {
+    return this.setValue(value, actorCode, 'closed')
+  }
+  // setExpired(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'expired')
+  // }
+  // setFulfilled(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'fulfilled')
+  // }
+  // setInvalid(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'invalid')
+  // }
+  // setPosted(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'posted')
+  // }
+}
+
 ;// ./lib/models/statusQStore/statusQStoreOrderLine.js
 
 
@@ -3945,7 +4014,9 @@ class StatusQStoreOrderLine extends StatusQStore {
     super(options)
 
     this.expired = this._ActionRecord.init(options.expired)
+    this.fulfilled = this._ActionRecord.init(options.fulfilled)
     this.invalid = this._ActionRecord.init(options.invalid)
+    this.posted = this._ActionRecord.init(options.posted)
   }
 
   static get _classname() {
@@ -3955,20 +4026,32 @@ class StatusQStoreOrderLine extends StatusQStore {
     return 'StatusQStoreOrderLine'
   }
   get isExpired() {
-    return this.expired?.timestamp > Date.now()
+    return this.expired?.timestamp < Date.now()
+  }
+  get isFulfilled() {
+    return this.fulfilled?.timestamp > 0
   }
   get isInvalid() {
-    return this.invalid?.timestamp > Date.now()
+    return this.invalid?.timestamp < Date.now()
   }
-  get isValid() {
-    return super.isValid
+  get isPosted() {
+    return this.posted?.timestamp > 0
   }
+  // get isValid() {
+  //   return super.isValid
+  // }
   setExpired(value, actorCode) {
     return this.setValue(value, actorCode, 'expired')
   }
+  setFulfilled(value, actorCode) {
+    return this.setValue(value, actorCode, 'fulfilled')
+  }
   setInvalid(value, actorCode) {
     return this.setValue(value, actorCode, 'invalid')
   }
+  setPosted(value, actorCode) {
+    return this.setValue(value, actorCode, 'posted')
+  }
   // update(update) {
   //   Object.keys(update).forEach((key) => {
   //     if (!notUpdateAllowedProps.includes(key)) {
@@ -3986,6 +4069,7 @@ class StatusQStoreOrderLine extends StatusQStore {
 
 
 
+
 ;// ./lib/models/paymentCharge/paymentCharge.js
 
 
@@ -5789,17 +5873,53 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return 'OrderLine'
   }
 
+  get currentStatus() {
+    if (this.isPosted) {
+      return 'posted'
+    } else if (this.isBillable) {
+      return 'billable'
+    } else if (this.isCancelled) {
+      return 'cancelled'
+    } else if (this.isInvalid) {
+      return 'invalid'
+    } else if (this.isExpired) {
+      return 'expired'
+    } else {
+      return 'open'
+    }
+  }
+  get isActive() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid
+  }
+  get isBillable() {
+    return this.isFulfilled && !this.isPosted && !this.isCancelled
+  }
+  get isOpen() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid && !this.isFulfilled
+  }
+
   get isCompleted() {
     return this.status.isCompleted
   }
-
-  get isProcessing() {
-    return this.status.isProcessing
+  get isCancelled() {
+    return this.status.isCancelled
   }
-
-  get isTerminated() {
-    return this.status.isTerminated
+  get isExpired() {
+    return !this.isPosted && !this.isCancelled && this.status.isExpired
   }
+  get isFulfilled() {
+    return this.status.isFulfilled
+  }
+  get isInvalid() {
+    return !this.isPosted && !this.isCancelled && this.status.isInvalid
+  }
+  get isPosted() {
+    return this.status.isPosted
+  }
+
+  // get isTerminated() {
+  //   return this.status.isTerminated
+  // }
 
   get isValid() {
     return super.isValid && !!this.merchandiseCode
@@ -5843,6 +5963,7 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
 
   getPreservedData() {
     return {
+      created: this.created,
       orderCode: this.orderCode,
       orderLineCode: this.orderLineCode,
       orderLineType: this.orderLineType,
@@ -5867,11 +5988,31 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.amount ? this.amount.getCurrencyCode() : null
   }
 
+  setCancelled(value, actorCode) {
+    this.status.setCancelled(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted(value, actorCode) {
     this.status.setCompleted(value, actorCode)
     return this.setModified()
   }
 
+  setFulfilled(value, actorCode) {
+    this.status.setFulfilled(value, actorCode)
+    return this.setModified()
+  }
+
+  setInvalid(value, actorCode) {
+    this.status.setInvalid(value, actorCode)
+    return this.setModified()
+  }
+
+  setPosted(value, actorCode) {
+    this.status.setPosted(value, actorCode)
+    return this.setModified()
+  }
+
   setQty(qty) {
     if (typeof qty === 'number' && qty > 0) {
       this.qty = qty
@@ -5880,42 +6021,20 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.qty
   }
 
-  settle(service) {
-    if (!service) {
-      return this
-    }
-
-    if (service.end) {
-      this.setCompleted()
-    }
-
-    return this
-  }
-
-  // setCompleted() {
-  //   this.status.setCompleted()
+  // setProcessing() {
+  //   this.status.setProcessing()
   //   return this.setModified()
   // }
 
-  setCancelled() {
-    this.status.setCancelled()
-    return this.setModified()
-  }
-
-  setProcessing() {
-    this.status.setProcessing()
-    return this.setModified()
-  }
-
-  setTerminated() {
-    this.status.setTerminated()
+  setTerminated(value, actorCode) {
+    this.status.setTerminated(value, actorCode)
     return this.setModified()
   }
 
-  setWaived() {
-    this.status.setWaived()
-    return this.setModified()
-  }
+  // setWaived() {
+  //   this.status.setWaived()
+  //   return this.setModified()
+  // }
 
   update(obj) {
     Object.keys(obj).forEach((key) => {
@@ -5982,7 +6101,7 @@ class Order extends q_utilities_namespaceObject.TenantAwareEntity {
     const { _Amount, _OrderLine, _Status } = options._constructor || {}
     this._Amount = _Amount && (_Amount._superclass === Amount._superclass) ? _Amount : Amount
     this._OrderLine = _OrderLine && (_OrderLine._superclass === OrderLine._superclass) ? _OrderLine : OrderLine
-    this._Status = _Status && (_Status._superclass === StatusQStore._superclass) ? _Status : StatusQStore
+    this._Status = _Status && (_Status._superclass === StatusQStoreOrder._superclass) ? _Status : StatusQStoreOrder
 
     this._orderLines = options._orderLines
 
@@ -6049,6 +6168,11 @@ class Order extends q_utilities_namespaceObject.TenantAwareEntity {
     return this
   }
 
+  setClosed(value, actorCode) {
+    this.status.setClosed(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted() {
     this.status.setCompleted()
     return this.setModified()

package/dist/index.min.js

@@ -72,6 +72,7 @@ __webpack_require__.d(__webpack_exports__, {
   nW: () => (/* reexport */ Status),
   TM: () => (/* reexport */ StatusQStore),
   M: () => (/* reexport */ StatusQStoreInvoice),
+  z9: () => (/* reexport */ StatusQStoreOrder),
   Dy: () => (/* reexport */ StatusQStoreOrderLine),
   vB: () => (/* reexport */ StoreItem),
   ZX: () => (/* reexport */ Transaction),
@@ -133,6 +134,7 @@ __webpack_require__.d(models_namespaceObject, {
   Status: () => (Status),
   StatusQStore: () => (StatusQStore),
   StatusQStoreInvoice: () => (StatusQStoreInvoice),
+  StatusQStoreOrder: () => (StatusQStoreOrder),
   StatusQStoreOrderLine: () => (StatusQStoreOrderLine),
   StoreItem: () => (StoreItem),
   Transaction: () => (Transaction),
@@ -1945,7 +1947,7 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     super(options)
 
     const { _ItemOption, _ItemOptionFillIn, _MerchandiseOption, _Price, _Product } = options._constructor || {}
-    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _I_ItemOptiontemOptionFillIn : ItemOption
+    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _ItemOption : ItemOption
     this._ItemOptionFillIn = _ItemOptionFillIn && (_ItemOptionFillIn._superclass === ItemOptionFillIn._superclass) ? _ItemOptionFillIn : ItemOptionFillIn
     this._MerchandiseOption = _MerchandiseOption && (_MerchandiseOption._superclass === MerchandiseOption._superclass) ? _MerchandiseOption : MerchandiseOption
     this._Price = _Price && (_Price._superclass === Price._superclass) ? _Price : Price
@@ -2282,11 +2284,20 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   }
   getPreservedData() {
     return {
+      allowEditQty: this.allowEditQty,
+      allowEditUnitPrice: this.allowEditUnitPrice,
+      defaultCurrency: this.defaultCurrency,
+      description: this.description,
+      merchandiseCategoryCodes: this.merchandiseCategoryCodes,
       merchandiseCode: this.merchandiseCode,
+      merchandiseOptions: this.merchandiseOptions,
       merchandiseType: this.merchandiseType,
       metadata: this.metadata,
       name: this.name,
+      priority: this.priority,
       productCodes: this.productCodes,
+      sku: this.sku,
+      stock: this.stock,
       tenantCode: this.tenantCode,
     }
   }
@@ -3913,10 +3924,10 @@ class StatusQStoreInvoice extends StatusQStore {
     return 'StatusQStoreInvoice'
   }
   get isClosed() {
-    return this.closed?.timestamp > Date.now()
+    return this.closed?.timestamp > 0
   }
   get isOpen() {
-    return this.open?.timestamp > Date.now()
+    return this.open?.timestamp > 0
   }
   get isValid() {
     return super.isValid
@@ -3929,6 +3940,64 @@ class StatusQStoreInvoice extends StatusQStore {
   }
 }
 
+;// ./lib/models/statusQStore/statusQStoreOrder.js
+
+
+const statusQStoreOrder_notUpdateAllowedProps = (/* unused pure expression or super */ null && ([
+]))
+
+class StatusQStoreOrder extends StatusQStore {
+  constructor(options) {
+    options = options || {}
+    super(options)
+    this.closed = this._ActionRecord.init(options.closed)
+    // this.expired = this._ActionRecord.init(options.expired)
+    // this.fulfilled = this._ActionRecord.init(options.fulfilled)
+    // this.invalid = this._ActionRecord.init(options.invalid)
+    // this.posted = this._ActionRecord.init(options.posted)
+  }
+
+  static get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get isClosed() {
+    return this.closed?.timestamp > 0
+  }
+  // get isExpired() {
+  //   return this.expired?.timestamp < Date.now()
+  // }
+  // get isFulfilled() {
+  //   return this.fulfilled?.timestamp > 0
+  // }
+  // get isInvalid() {
+  //   return this.invalid?.timestamp < Date.now()
+  // }
+  // get isPosted() {
+  //   return this.posted?.timestamp > 0
+  // }
+  // get isValid() {
+  //   return super.isValid
+  // }
+  setClosed(value, actorCode) {
+    return this.setValue(value, actorCode, 'closed')
+  }
+  // setExpired(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'expired')
+  // }
+  // setFulfilled(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'fulfilled')
+  // }
+  // setInvalid(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'invalid')
+  // }
+  // setPosted(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'posted')
+  // }
+}
+
 ;// ./lib/models/statusQStore/statusQStoreOrderLine.js
 
 
@@ -3941,7 +4010,9 @@ class StatusQStoreOrderLine extends StatusQStore {
     super(options)
 
     this.expired = this._ActionRecord.init(options.expired)
+    this.fulfilled = this._ActionRecord.init(options.fulfilled)
     this.invalid = this._ActionRecord.init(options.invalid)
+    this.posted = this._ActionRecord.init(options.posted)
   }
 
   static get _classname() {
@@ -3951,20 +4022,32 @@ class StatusQStoreOrderLine extends StatusQStore {
     return 'StatusQStoreOrderLine'
   }
   get isExpired() {
-    return this.expired?.timestamp > Date.now()
+    return this.expired?.timestamp < Date.now()
+  }
+  get isFulfilled() {
+    return this.fulfilled?.timestamp > 0
   }
   get isInvalid() {
-    return this.invalid?.timestamp > Date.now()
+    return this.invalid?.timestamp < Date.now()
   }
-  get isValid() {
-    return super.isValid
+  get isPosted() {
+    return this.posted?.timestamp > 0
   }
+  // get isValid() {
+  //   return super.isValid
+  // }
   setExpired(value, actorCode) {
     return this.setValue(value, actorCode, 'expired')
   }
+  setFulfilled(value, actorCode) {
+    return this.setValue(value, actorCode, 'fulfilled')
+  }
   setInvalid(value, actorCode) {
     return this.setValue(value, actorCode, 'invalid')
   }
+  setPosted(value, actorCode) {
+    return this.setValue(value, actorCode, 'posted')
+  }
   // update(update) {
   //   Object.keys(update).forEach((key) => {
   //     if (!notUpdateAllowedProps.includes(key)) {
@@ -3982,6 +4065,7 @@ class StatusQStoreOrderLine extends StatusQStore {
 
 
 
+
 ;// ./lib/models/paymentCharge/paymentCharge.js
 
 
@@ -5785,17 +5869,53 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return 'OrderLine'
   }
 
+  get currentStatus() {
+    if (this.isPosted) {
+      return 'posted'
+    } else if (this.isBillable) {
+      return 'billable'
+    } else if (this.isCancelled) {
+      return 'cancelled'
+    } else if (this.isInvalid) {
+      return 'invalid'
+    } else if (this.isExpired) {
+      return 'expired'
+    } else {
+      return 'open'
+    }
+  }
+  get isActive() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid
+  }
+  get isBillable() {
+    return this.isFulfilled && !this.isPosted && !this.isCancelled
+  }
+  get isOpen() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid && !this.isFulfilled
+  }
+
   get isCompleted() {
     return this.status.isCompleted
   }
-
-  get isProcessing() {
-    return this.status.isProcessing
+  get isCancelled() {
+    return this.status.isCancelled
   }
-
-  get isTerminated() {
-    return this.status.isTerminated
+  get isExpired() {
+    return !this.isPosted && !this.isCancelled && this.status.isExpired
   }
+  get isFulfilled() {
+    return this.status.isFulfilled
+  }
+  get isInvalid() {
+    return !this.isPosted && !this.isCancelled && this.status.isInvalid
+  }
+  get isPosted() {
+    return this.status.isPosted
+  }
+
+  // get isTerminated() {
+  //   return this.status.isTerminated
+  // }
 
   get isValid() {
     return super.isValid && !!this.merchandiseCode
@@ -5839,6 +5959,7 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
 
   getPreservedData() {
     return {
+      created: this.created,
       orderCode: this.orderCode,
       orderLineCode: this.orderLineCode,
       orderLineType: this.orderLineType,
@@ -5863,11 +5984,31 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.amount ? this.amount.getCurrencyCode() : null
   }
 
+  setCancelled(value, actorCode) {
+    this.status.setCancelled(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted(value, actorCode) {
     this.status.setCompleted(value, actorCode)
     return this.setModified()
   }
 
+  setFulfilled(value, actorCode) {
+    this.status.setFulfilled(value, actorCode)
+    return this.setModified()
+  }
+
+  setInvalid(value, actorCode) {
+    this.status.setInvalid(value, actorCode)
+    return this.setModified()
+  }
+
+  setPosted(value, actorCode) {
+    this.status.setPosted(value, actorCode)
+    return this.setModified()
+  }
+
   setQty(qty) {
     if (typeof qty === 'number' && qty > 0) {
       this.qty = qty
@@ -5876,42 +6017,20 @@ class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.qty
   }
 
-  settle(service) {
-    if (!service) {
-      return this
-    }
-
-    if (service.end) {
-      this.setCompleted()
-    }
-
-    return this
-  }
-
-  // setCompleted() {
-  //   this.status.setCompleted()
+  // setProcessing() {
+  //   this.status.setProcessing()
   //   return this.setModified()
   // }
 
-  setCancelled() {
-    this.status.setCancelled()
-    return this.setModified()
-  }
-
-  setProcessing() {
-    this.status.setProcessing()
-    return this.setModified()
-  }
-
-  setTerminated() {
-    this.status.setTerminated()
+  setTerminated(value, actorCode) {
+    this.status.setTerminated(value, actorCode)
     return this.setModified()
   }
 
-  setWaived() {
-    this.status.setWaived()
-    return this.setModified()
-  }
+  // setWaived() {
+  //   this.status.setWaived()
+  //   return this.setModified()
+  // }
 
   update(obj) {
     Object.keys(obj).forEach((key) => {
@@ -5978,7 +6097,7 @@ class Order extends q_utilities_namespaceObject.TenantAwareEntity {
     const { _Amount, _OrderLine, _Status } = options._constructor || {}
     this._Amount = _Amount && (_Amount._superclass === Amount._superclass) ? _Amount : Amount
     this._OrderLine = _OrderLine && (_OrderLine._superclass === OrderLine._superclass) ? _OrderLine : OrderLine
-    this._Status = _Status && (_Status._superclass === StatusQStore._superclass) ? _Status : StatusQStore
+    this._Status = _Status && (_Status._superclass === StatusQStoreOrder._superclass) ? _Status : StatusQStoreOrder
 
     this._orderLines = options._orderLines
 
@@ -6045,6 +6164,11 @@ class Order extends q_utilities_namespaceObject.TenantAwareEntity {
     return this
   }
 
+  setClosed(value, actorCode) {
+    this.status.setClosed(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted() {
     this.status.setCompleted()
     return this.setModified()
@@ -8843,6 +8967,7 @@ var __webpack_exports__ReceiptLine = __webpack_exports__.Hx;
 var __webpack_exports__Status = __webpack_exports__.nW;
 var __webpack_exports__StatusQStore = __webpack_exports__.TM;
 var __webpack_exports__StatusQStoreInvoice = __webpack_exports__.M;
+var __webpack_exports__StatusQStoreOrder = __webpack_exports__.z9;
 var __webpack_exports__StatusQStoreOrderLine = __webpack_exports__.Dy;
 var __webpack_exports__StoreItem = __webpack_exports__.vB;
 var __webpack_exports__Transaction = __webpack_exports__.ZX;
@@ -8868,4 +8993,4 @@ var __webpack_exports__objectComparator = __webpack_exports__.aL;
 var __webpack_exports__objectOrderInArrayComparator = __webpack_exports__.il;
 var __webpack_exports__setQuery = __webpack_exports__.NY;
 var __webpack_exports__stringHelper = __webpack_exports__.yO;
-export { __webpack_exports__Amount as Amount, __webpack_exports__BillingAccount as BillingAccount, __webpack_exports__BillingProject as BillingProject, __webpack_exports__Cart as Cart, __webpack_exports__CartItem as CartItem, __webpack_exports__Category as Category, __webpack_exports__Chain as Chain, __webpack_exports__ChainManager as ChainManager, __webpack_exports__ChainManagerFactory as ChainManagerFactory, __webpack_exports__ChainTarget as ChainTarget, __webpack_exports__CouponManager as CouponManager, __webpack_exports__CreditNote as CreditNote, __webpack_exports__CreditNoteLine as CreditNoteLine, __webpack_exports__CreditNoteRepo as CreditNoteRepo, __webpack_exports__Currency as Currency, __webpack_exports__Invoice as Invoice, __webpack_exports__InvoiceLine as InvoiceLine, __webpack_exports__ItemOption as ItemOption, __webpack_exports__ItemOptionLocale as ItemOptionLocale, __webpack_exports__KeyValueObject as KeyValueObject, __webpack_exports__Merchandise as Merchandise, __webpack_exports__Order as Order, __webpack_exports__OrderLine as OrderLine, __webpack_exports__PaymentCharge as PaymentCharge, __webpack_exports__PaymentGateway as PaymentGateway, __webpack_exports__PaymentItem as PaymentItem, __webpack_exports__PaymentResult as PaymentResult, __webpack_exports__Price as Price, __webpack_exports__PriceStrategy as PriceStrategy, __webpack_exports__Product as Product, __webpack_exports__Receipt as Receipt, __webpack_exports__ReceiptLine as ReceiptLine, __webpack_exports__Status as Status, __webpack_exports__StatusQStore as StatusQStore, __webpack_exports__StatusQStoreInvoice as StatusQStoreInvoice, __webpack_exports__StatusQStoreOrderLine as StatusQStoreOrderLine, __webpack_exports__StoreItem as StoreItem, __webpack_exports__Transaction as Transaction, __webpack_exports__WalletItem as WalletItem, __webpack_exports__adminSettle as adminSettle, __webpack_exports__calculateByCoupon as calculateByCoupon, __webpack_exports__calculator as calculator, __webpack_exports__checkDuplicate as checkDuplicate, __webpack_exports__convertTimestampToString as convertTimestampToString, __webpack_exports__defaultComparator as defaultComparator, __webpack_exports__defaultSort as defaultSort, __webpack_exports__eleInArrayComparator as eleInArrayComparator, __webpack_exports__firstLetterToLower as firstLetterToLower, __webpack_exports__getFakeClass as getFakeClass, __webpack_exports__getSubClass as getSubClass, __webpack_exports__handlerOrderList as handlerOrderList, __webpack_exports__isAllEqual as isAllEqual, __webpack_exports__isDescendingOrder as isDescendingOrder, __webpack_exports__makeResponseHelper as makeResponseHelper, __webpack_exports__models as models, __webpack_exports__objectAllInArrayComparator as objectAllInArrayComparator, __webpack_exports__objectComparator as objectComparator, __webpack_exports__objectOrderInArrayComparator as objectOrderInArrayComparator, __webpack_exports__setQuery as setQuery, __webpack_exports__stringHelper as stringHelper };
+export { __webpack_exports__Amount as Amount, __webpack_exports__BillingAccount as BillingAccount, __webpack_exports__BillingProject as BillingProject, __webpack_exports__Cart as Cart, __webpack_exports__CartItem as CartItem, __webpack_exports__Category as Category, __webpack_exports__Chain as Chain, __webpack_exports__ChainManager as ChainManager, __webpack_exports__ChainManagerFactory as ChainManagerFactory, __webpack_exports__ChainTarget as ChainTarget, __webpack_exports__CouponManager as CouponManager, __webpack_exports__CreditNote as CreditNote, __webpack_exports__CreditNoteLine as CreditNoteLine, __webpack_exports__CreditNoteRepo as CreditNoteRepo, __webpack_exports__Currency as Currency, __webpack_exports__Invoice as Invoice, __webpack_exports__InvoiceLine as InvoiceLine, __webpack_exports__ItemOption as ItemOption, __webpack_exports__ItemOptionLocale as ItemOptionLocale, __webpack_exports__KeyValueObject as KeyValueObject, __webpack_exports__Merchandise as Merchandise, __webpack_exports__Order as Order, __webpack_exports__OrderLine as OrderLine, __webpack_exports__PaymentCharge as PaymentCharge, __webpack_exports__PaymentGateway as PaymentGateway, __webpack_exports__PaymentItem as PaymentItem, __webpack_exports__PaymentResult as PaymentResult, __webpack_exports__Price as Price, __webpack_exports__PriceStrategy as PriceStrategy, __webpack_exports__Product as Product, __webpack_exports__Receipt as Receipt, __webpack_exports__ReceiptLine as ReceiptLine, __webpack_exports__Status as Status, __webpack_exports__StatusQStore as StatusQStore, __webpack_exports__StatusQStoreInvoice as StatusQStoreInvoice, __webpack_exports__StatusQStoreOrder as StatusQStoreOrder, __webpack_exports__StatusQStoreOrderLine as StatusQStoreOrderLine, __webpack_exports__StoreItem as StoreItem, __webpack_exports__Transaction as Transaction, __webpack_exports__WalletItem as WalletItem, __webpack_exports__adminSettle as adminSettle, __webpack_exports__calculateByCoupon as calculateByCoupon, __webpack_exports__calculator as calculator, __webpack_exports__checkDuplicate as checkDuplicate, __webpack_exports__convertTimestampToString as convertTimestampToString, __webpack_exports__defaultComparator as defaultComparator, __webpack_exports__defaultSort as defaultSort, __webpack_exports__eleInArrayComparator as eleInArrayComparator, __webpack_exports__firstLetterToLower as firstLetterToLower, __webpack_exports__getFakeClass as getFakeClass, __webpack_exports__getSubClass as getSubClass, __webpack_exports__handlerOrderList as handlerOrderList, __webpack_exports__isAllEqual as isAllEqual, __webpack_exports__isDescendingOrder as isDescendingOrder, __webpack_exports__makeResponseHelper as makeResponseHelper, __webpack_exports__models as models, __webpack_exports__objectAllInArrayComparator as objectAllInArrayComparator, __webpack_exports__objectComparator as objectComparator, __webpack_exports__objectOrderInArrayComparator as objectOrderInArrayComparator, __webpack_exports__setQuery as setQuery, __webpack_exports__stringHelper as stringHelper };

package/dist/q-store-model.min.js

@@ -122,6 +122,7 @@ __webpack_require__.d(__webpack_exports__, {
   Status: () => (/* reexport */ Status),
   StatusQStore: () => (/* reexport */ StatusQStore),
   StatusQStoreInvoice: () => (/* reexport */ StatusQStoreInvoice),
+  StatusQStoreOrder: () => (/* reexport */ StatusQStoreOrder),
   StatusQStoreOrderLine: () => (/* reexport */ StatusQStoreOrderLine),
   StoreItem: () => (/* reexport */ StoreItem),
   Transaction: () => (/* reexport */ Transaction),
@@ -183,6 +184,7 @@ __webpack_require__.d(models_namespaceObject, {
   Status: () => (Status),
   StatusQStore: () => (StatusQStore),
   StatusQStoreInvoice: () => (StatusQStoreInvoice),
+  StatusQStoreOrder: () => (StatusQStoreOrder),
   StatusQStoreOrderLine: () => (StatusQStoreOrderLine),
   StoreItem: () => (StoreItem),
   Transaction: () => (Transaction),
@@ -1987,7 +1989,7 @@ class Merchandise extends q_utilities_.TenantAwareEntity {
     super(options)
 
     const { _ItemOption, _ItemOptionFillIn, _MerchandiseOption, _Price, _Product } = options._constructor || {}
-    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _I_ItemOptiontemOptionFillIn : ItemOption
+    this._ItemOption = _ItemOption && (_ItemOption._superclass === ItemOption._superclass) ? _ItemOption : ItemOption
     this._ItemOptionFillIn = _ItemOptionFillIn && (_ItemOptionFillIn._superclass === ItemOptionFillIn._superclass) ? _ItemOptionFillIn : ItemOptionFillIn
     this._MerchandiseOption = _MerchandiseOption && (_MerchandiseOption._superclass === MerchandiseOption._superclass) ? _MerchandiseOption : MerchandiseOption
     this._Price = _Price && (_Price._superclass === Price._superclass) ? _Price : Price
@@ -2324,11 +2326,20 @@ class Merchandise extends q_utilities_.TenantAwareEntity {
   }
   getPreservedData() {
     return {
+      allowEditQty: this.allowEditQty,
+      allowEditUnitPrice: this.allowEditUnitPrice,
+      defaultCurrency: this.defaultCurrency,
+      description: this.description,
+      merchandiseCategoryCodes: this.merchandiseCategoryCodes,
       merchandiseCode: this.merchandiseCode,
+      merchandiseOptions: this.merchandiseOptions,
       merchandiseType: this.merchandiseType,
       metadata: this.metadata,
       name: this.name,
+      priority: this.priority,
       productCodes: this.productCodes,
+      sku: this.sku,
+      stock: this.stock,
       tenantCode: this.tenantCode,
     }
   }
@@ -3955,10 +3966,10 @@ class StatusQStoreInvoice extends StatusQStore {
     return 'StatusQStoreInvoice'
   }
   get isClosed() {
-    return this.closed?.timestamp > Date.now()
+    return this.closed?.timestamp > 0
   }
   get isOpen() {
-    return this.open?.timestamp > Date.now()
+    return this.open?.timestamp > 0
   }
   get isValid() {
     return super.isValid
@@ -3971,6 +3982,64 @@ class StatusQStoreInvoice extends StatusQStore {
   }
 }
 
+;// ./lib/models/statusQStore/statusQStoreOrder.js
+
+
+const statusQStoreOrder_notUpdateAllowedProps = (/* unused pure expression or super */ null && ([
+]))
+
+class StatusQStoreOrder extends StatusQStore {
+  constructor(options) {
+    options = options || {}
+    super(options)
+    this.closed = this._ActionRecord.init(options.closed)
+    // this.expired = this._ActionRecord.init(options.expired)
+    // this.fulfilled = this._ActionRecord.init(options.fulfilled)
+    // this.invalid = this._ActionRecord.init(options.invalid)
+    // this.posted = this._ActionRecord.init(options.posted)
+  }
+
+  static get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get _classname() {
+    return 'StatusQStoreOrder'
+  }
+  get isClosed() {
+    return this.closed?.timestamp > 0
+  }
+  // get isExpired() {
+  //   return this.expired?.timestamp < Date.now()
+  // }
+  // get isFulfilled() {
+  //   return this.fulfilled?.timestamp > 0
+  // }
+  // get isInvalid() {
+  //   return this.invalid?.timestamp < Date.now()
+  // }
+  // get isPosted() {
+  //   return this.posted?.timestamp > 0
+  // }
+  // get isValid() {
+  //   return super.isValid
+  // }
+  setClosed(value, actorCode) {
+    return this.setValue(value, actorCode, 'closed')
+  }
+  // setExpired(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'expired')
+  // }
+  // setFulfilled(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'fulfilled')
+  // }
+  // setInvalid(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'invalid')
+  // }
+  // setPosted(value, actorCode) {
+  //   return this.setValue(value, actorCode, 'posted')
+  // }
+}
+
 ;// ./lib/models/statusQStore/statusQStoreOrderLine.js
 
 
@@ -3983,7 +4052,9 @@ class StatusQStoreOrderLine extends StatusQStore {
     super(options)
 
     this.expired = this._ActionRecord.init(options.expired)
+    this.fulfilled = this._ActionRecord.init(options.fulfilled)
     this.invalid = this._ActionRecord.init(options.invalid)
+    this.posted = this._ActionRecord.init(options.posted)
   }
 
   static get _classname() {
@@ -3993,20 +4064,32 @@ class StatusQStoreOrderLine extends StatusQStore {
     return 'StatusQStoreOrderLine'
   }
   get isExpired() {
-    return this.expired?.timestamp > Date.now()
+    return this.expired?.timestamp < Date.now()
+  }
+  get isFulfilled() {
+    return this.fulfilled?.timestamp > 0
   }
   get isInvalid() {
-    return this.invalid?.timestamp > Date.now()
+    return this.invalid?.timestamp < Date.now()
   }
-  get isValid() {
-    return super.isValid
+  get isPosted() {
+    return this.posted?.timestamp > 0
   }
+  // get isValid() {
+  //   return super.isValid
+  // }
   setExpired(value, actorCode) {
     return this.setValue(value, actorCode, 'expired')
   }
+  setFulfilled(value, actorCode) {
+    return this.setValue(value, actorCode, 'fulfilled')
+  }
   setInvalid(value, actorCode) {
     return this.setValue(value, actorCode, 'invalid')
   }
+  setPosted(value, actorCode) {
+    return this.setValue(value, actorCode, 'posted')
+  }
   // update(update) {
   //   Object.keys(update).forEach((key) => {
   //     if (!notUpdateAllowedProps.includes(key)) {
@@ -4024,6 +4107,7 @@ class StatusQStoreOrderLine extends StatusQStore {
 
 
 
+
 ;// ./lib/models/paymentCharge/paymentCharge.js
 
 
@@ -5827,17 +5911,53 @@ class OrderLine extends q_utilities_.TenantAwareEntity {
     return 'OrderLine'
   }
 
+  get currentStatus() {
+    if (this.isPosted) {
+      return 'posted'
+    } else if (this.isBillable) {
+      return 'billable'
+    } else if (this.isCancelled) {
+      return 'cancelled'
+    } else if (this.isInvalid) {
+      return 'invalid'
+    } else if (this.isExpired) {
+      return 'expired'
+    } else {
+      return 'open'
+    }
+  }
+  get isActive() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid
+  }
+  get isBillable() {
+    return this.isFulfilled && !this.isPosted && !this.isCancelled
+  }
+  get isOpen() {
+    return !this.isPosted && !this.isCancelled && !this.isExpired && !this.isInvalid && !this.isFulfilled
+  }
+
   get isCompleted() {
     return this.status.isCompleted
   }
-
-  get isProcessing() {
-    return this.status.isProcessing
+  get isCancelled() {
+    return this.status.isCancelled
   }
-
-  get isTerminated() {
-    return this.status.isTerminated
+  get isExpired() {
+    return !this.isPosted && !this.isCancelled && this.status.isExpired
   }
+  get isFulfilled() {
+    return this.status.isFulfilled
+  }
+  get isInvalid() {
+    return !this.isPosted && !this.isCancelled && this.status.isInvalid
+  }
+  get isPosted() {
+    return this.status.isPosted
+  }
+
+  // get isTerminated() {
+  //   return this.status.isTerminated
+  // }
 
   get isValid() {
     return super.isValid && !!this.merchandiseCode
@@ -5881,6 +6001,7 @@ class OrderLine extends q_utilities_.TenantAwareEntity {
 
   getPreservedData() {
     return {
+      created: this.created,
       orderCode: this.orderCode,
       orderLineCode: this.orderLineCode,
       orderLineType: this.orderLineType,
@@ -5905,11 +6026,31 @@ class OrderLine extends q_utilities_.TenantAwareEntity {
     return this.amount ? this.amount.getCurrencyCode() : null
   }
 
+  setCancelled(value, actorCode) {
+    this.status.setCancelled(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted(value, actorCode) {
     this.status.setCompleted(value, actorCode)
     return this.setModified()
   }
 
+  setFulfilled(value, actorCode) {
+    this.status.setFulfilled(value, actorCode)
+    return this.setModified()
+  }
+
+  setInvalid(value, actorCode) {
+    this.status.setInvalid(value, actorCode)
+    return this.setModified()
+  }
+
+  setPosted(value, actorCode) {
+    this.status.setPosted(value, actorCode)
+    return this.setModified()
+  }
+
   setQty(qty) {
     if (typeof qty === 'number' && qty > 0) {
       this.qty = qty
@@ -5918,42 +6059,20 @@ class OrderLine extends q_utilities_.TenantAwareEntity {
     return this.qty
   }
 
-  settle(service) {
-    if (!service) {
-      return this
-    }
-
-    if (service.end) {
-      this.setCompleted()
-    }
-
-    return this
-  }
-
-  // setCompleted() {
-  //   this.status.setCompleted()
+  // setProcessing() {
+  //   this.status.setProcessing()
   //   return this.setModified()
   // }
 
-  setCancelled() {
-    this.status.setCancelled()
-    return this.setModified()
-  }
-
-  setProcessing() {
-    this.status.setProcessing()
-    return this.setModified()
-  }
-
-  setTerminated() {
-    this.status.setTerminated()
+  setTerminated(value, actorCode) {
+    this.status.setTerminated(value, actorCode)
     return this.setModified()
   }
 
-  setWaived() {
-    this.status.setWaived()
-    return this.setModified()
-  }
+  // setWaived() {
+  //   this.status.setWaived()
+  //   return this.setModified()
+  // }
 
   update(obj) {
     Object.keys(obj).forEach((key) => {
@@ -6020,7 +6139,7 @@ class Order extends q_utilities_.TenantAwareEntity {
     const { _Amount, _OrderLine, _Status } = options._constructor || {}
     this._Amount = _Amount && (_Amount._superclass === Amount._superclass) ? _Amount : Amount
     this._OrderLine = _OrderLine && (_OrderLine._superclass === OrderLine._superclass) ? _OrderLine : OrderLine
-    this._Status = _Status && (_Status._superclass === StatusQStore._superclass) ? _Status : StatusQStore
+    this._Status = _Status && (_Status._superclass === StatusQStoreOrder._superclass) ? _Status : StatusQStoreOrder
 
     this._orderLines = options._orderLines
 
@@ -6087,6 +6206,11 @@ class Order extends q_utilities_.TenantAwareEntity {
     return this
   }
 
+  setClosed(value, actorCode) {
+    this.status.setClosed(value, actorCode)
+    return this.setModified()
+  }
+
   setCompleted() {
     this.status.setCompleted()
     return this.setModified()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-store-model",
-  "version": "0.1.41",
+  "version": "0.1.42",
   "description": "Questwork QStore Model",
   "main": "dist/index.min.js",
   "type": "module",
@@ -24,7 +24,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@questwork/q-utilities": "^0.1.24",
+    "@questwork/q-utilities": "^0.1.30",
     "lodash": "^4.17.21"
   },
   "devDependencies": {