@questwork/q-store-model 0.1.38 → 0.1.39

package/dist/index.min.cjs

@@ -68,12 +68,16 @@ __webpack_require__.d(__webpack_exports__, {
   ItemOptionLocale: () => (/* reexport */ ItemOptionLocale),
   KeyValueObject: () => (/* reexport */ q_utilities_namespaceObject.KeyValueObject),
   Merchandise: () => (/* reexport */ Merchandise),
+  Order: () => (/* reexport */ Order),
+  OrderLine: () => (/* reexport */ OrderLine),
   PaymentGateway: () => (/* reexport */ PaymentGateway),
   PaymentResult: () => (/* reexport */ PaymentResult),
   Price: () => (/* reexport */ Price),
   PriceStrategy: () => (/* reexport */ PriceStrategy),
   Product: () => (/* reexport */ Product),
   Status: () => (/* reexport */ Status),
+  StatusQStore: () => (/* reexport */ StatusQStore),
+  StatusQStoreOrderLine: () => (/* reexport */ StatusQStoreOrderLine),
   StoreItem: () => (/* reexport */ StoreItem),
   Transaction: () => (/* reexport */ Transaction),
   WalletItem: () => (/* reexport */ WalletItem),
@@ -118,12 +122,16 @@ __webpack_require__.d(models_namespaceObject, {
   ItemOptionLocale: () => (ItemOptionLocale),
   KeyValueObject: () => (q_utilities_namespaceObject.KeyValueObject),
   Merchandise: () => (Merchandise),
+  Order: () => (Order),
+  OrderLine: () => (OrderLine),
   PaymentGateway: () => (PaymentGateway),
   PaymentResult: () => (PaymentResult),
   Price: () => (Price),
   PriceStrategy: () => (PriceStrategy),
   Product: () => (Product),
   Status: () => (Status),
+  StatusQStore: () => (StatusQStore),
+  StatusQStoreOrderLine: () => (StatusQStoreOrderLine),
   StoreItem: () => (StoreItem),
   Transaction: () => (Transaction),
   WalletItem: () => (WalletItem)
@@ -1015,7 +1023,7 @@ class QtyPerTransaction {
   constructor(options = {}) {
     options = options || {}
     this.max = options.max === null || options.max > 0 ? options.max : 1 // options.max || 1
-    this.min = options.min === null || options.min >= 0 ? options.min : 1
+    this.min = options.min === null || options.min >= 0 ? options.min : 0
   }
   static init(options = {}) {
     if (options instanceof this) {
@@ -1069,8 +1077,10 @@ const priceStrategy_updateAllowedProps = [
   'amounts',
   'deductions',
   'discount',
+  'metadata',
   'name',
   'qtyPerTransaction',
+  'remarks'
 ]
 
 class PriceStrategy {
@@ -1084,6 +1094,7 @@ class PriceStrategy {
     this.amounts = this._Amount.initOnlyValidFromArray(options.amounts)
     this.deductions = this._Amount.initOnlyValidFromArray(options.deductions)
     this.discount = options.discount || 0
+    this.metadata = q_utilities_namespaceObject.Metadata.initOnlyValidFromArray(options.metadata)
     this.name = options.name
     // this.order = options.order || 1
     this.qtyPerTransaction = this._QtyPerTransaction.init(options.qtyPerTransaction)
@@ -1123,7 +1134,15 @@ class PriceStrategy {
 
   // getters
   get isValid() {
-    return this.amounts.length > 0 && !!this.name && !!this.qtyPerTransaction && (typeof this.discount === 'number' && this.discount >= 0 && this.discount <= 100)
+    return this.amounts.length > 0 && (typeof this.discount === 'number' && this.discount >= 0 && this.discount <= 100)
+  }
+  get restrictions() {
+    let _restrictions = []
+    _restrictions = q_utilities_namespaceObject.Metadata.getValuesByKey(this.metadata, 'RESTRICTIONS')
+    if (_restrictions.length === 0) {
+      _restrictions = q_utilities_namespaceObject.KeyValueObject.getValuesByKey(this.remarks, 'restrictions')
+    }
+    return _restrictions[0] || []
   }
 
   // instance methods
@@ -1142,7 +1161,7 @@ class PriceStrategy {
   //   return this.priceStrategyType === priceStrategyType
   // }
 
-  getAmount({ cartItems, currencyCode, qty }) {
+  getAmount({ currencyCode, qty }) {
     const amount = this.getAmountByCurrencyCode(currencyCode)
     if (amount) {
       const { value } = amount
@@ -1174,7 +1193,7 @@ class PriceStrategy {
 
   deductionHasCurrencyCode(currencyCode) {
     if (this.deductions.length === 0) {
-      return false
+      return true
     }
     const amount = this.getDeductionByCurrencyCode(currencyCode)
     return (amount !== null)
@@ -1201,11 +1220,10 @@ class PriceStrategy {
   }
 
   isMatchedRestrictions(payload = {}) {
-    const [restrictions = []] = q_utilities_namespaceObject.KeyValueObject.getValuesByKey(this.remarks, 'restrictions')
-    if (restrictions.length === 0) {
+    if (this.restrictions.length === 0) {
       return true
     }
-    const res = restrictions.reduce((acc, restriction) => {
+    const res = this.restrictions.reduce((acc, restriction) => {
       const { key, value = {} } = restriction
       acc = acc || matchAnd(key, value, payload)
       // Object.keys(value).forEach((path) => {
@@ -1214,10 +1232,10 @@ class PriceStrategy {
       // })
       return acc
     }, false)
-    return res
+    return res || false
   }
 
-  iaValidQty(qty) {
+  isQtyValid(qty) {
     if (this.qtyPerTransaction.min > qty) {
       return false
     }
@@ -1307,7 +1325,13 @@ function _match({ action, formulaValue, val }) {
     case '$gte':
       return val >= formulaValue
     case '$in':
-      return formulaValue.includes(val)
+      if (Array.isArray(val)) {
+        return !!val.find((e) => (formulaValue.includes(e)))
+      }
+      if (typeof val !== 'object') {
+        return !!formulaValue.includes(val)
+      }
+      return false
     case '$includes':
       return val.includes(formulaValue)
     case '$keyValue':
@@ -1364,11 +1388,9 @@ class Price {
     this.dateBegin = options.dateBegin || (new Date()).valueOf()
     this.dateEnd = options.dateEnd || null
     this.modified = options.modified || (new Date()).valueOf()
-    this.name = options.name
+    this.name = options.name || ''
     this.priceStrategies = this._PriceStrategy.initOnlyValidFromArray(options.priceStrategies)
-    // this.qtyPerTransaction = QtyPerTransaction.init(options.qtyPerTransaction)
     this.remarks = q_utilities_namespaceObject.KeyValueObject.initOnlyValidFromArray(options.remarks)
-    // this.roleCodes = options.roleCodes || []
   }
 
   // class method
@@ -1383,8 +1405,6 @@ class Price {
       dateBegin: new Date().valueOf(),
       dateEnd: new Date().valueOf() + 1,
       priceStrategies: [PriceStrategy.dummyData()],
-      // roles: []
-      // qtyPerTransaction: QtyPerTransaction.init()
     }
   }
   static init(options = {}) {
@@ -1425,12 +1445,8 @@ class Price {
 
 
   // getters
-  // get displayPricing() {
-  //   const amount = this.getAmount(1)
-  //   return `${amount.currency}: ${amount.value} (${this.name})`
-  // }
   get isValid() {
-    return !!this.name && this.priceStrategies.length > 0
+    return this.priceStrategies.length > 0
   }
 
   // instance methods
@@ -1438,17 +1454,17 @@ class Price {
   getStrategies() {
     return this.priceStrategies ? this.priceStrategies : []
   }
-  getStrategiesByRestrictions(payload) {
+  getStrategiesByRestrictions(payload) { // payload = { user: {} }
     return this.priceStrategies.filter((p) => p.isMatchedRestrictions(payload))
   }
-  getStrategiesByCurrencyAndQty(currency, qty) {
-    let priceStrategies = this.getStrategiesByCurrency(currency, this.priceStrategies)
+  getStrategiesByCurrencyAndQty(currencyCode, qty) {
+    let priceStrategies = this.getStrategiesByCurrencyCode(currencyCode, this.priceStrategies)
     priceStrategies = this.getStrategiesByQty(qty, priceStrategies)
     return priceStrategies
   }
   getStrategiesByCurrencyCode(currencyCode, priceStrategies) {
-    const copy = priceStrategies || this.priceStrategies
-    return copy.reduce((acc, priceStrategy) => {
+    const _priceStrategies = priceStrategies || this.priceStrategies
+    return _priceStrategies.reduce((acc, priceStrategy) => {
       if (priceStrategy.hasCurrencyCode(currencyCode) && priceStrategy.deductionHasCurrencyCode(currencyCode)) {
         acc.push(priceStrategy)
       }
@@ -1456,17 +1472,17 @@ class Price {
     }, [])
   }
   getStrategiesByQty(qty, priceStrategies) {
-    const copy = priceStrategies || this.priceStrategies
-    return copy.reduce((acc, priceStrategy) => {
-      if (priceStrategy.iaValidQty(qty)) {
+    const _priceStrategies = priceStrategies || this.priceStrategies
+    return _priceStrategies.reduce((acc, priceStrategy) => {
+      if (priceStrategy.isQtyValid(qty)) {
         acc.push(priceStrategy)
       }
       return acc
     }, [])
   }
   isAvailableByDate(timestamp) {
-    const copyTimestamp = timestamp || (new Date()).valueOf()
-    if (copyTimestamp >= this.dateBegin && (copyTimestamp < this.dateEnd || this.dateEnd === null)) {
+    const _timestamp = timestamp || (new Date()).valueOf()
+    if (_timestamp >= this.dateBegin && (_timestamp < this.dateEnd || this.dateEnd === null)) {
       return true
     }
     return false
@@ -1628,6 +1644,9 @@ class Product extends q_utilities_namespaceObject.TenantAwareEntity {
   get isReachedLimitPercentage() {
     return this.soldPercentage >= this.limitPercentage
   }
+  get isTotalCoupon() {
+    return this.couponDetails ? this.couponDetails.total : false
+  }
   get soldPercentage() {
     return ((this.originalStock - this.stock) / this.originalStock) * 100
   }
@@ -1677,7 +1696,10 @@ class Product extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.stock >= qty
   }
   isApplicableCoupon(obj) {
-    const { merchandiseCodes = [] } = this.couponDetails || {}
+    if (!this.couponDetails) {
+      return false
+    }
+    const { merchandiseCodes = [] } = this.couponDetails
     return merchandiseCodes.length > 0 ? merchandiseCodes.includes(obj.merchandiseCode) : true
   }
   isQualified(data) {
@@ -1764,6 +1786,8 @@ class ProductRepo extends q_utilities_namespaceObject.Repo {
 
 
 const merchandise_updateAllowedProps = [
+  'allowEditQty',
+  'allowEditUnitPrice',
   'defaultCurrency',
   'description',
   'eventSessionCode',
@@ -1775,7 +1799,6 @@ const merchandise_updateAllowedProps = [
   'name',
   'onlyFor',
   'prices',
-  'pricings',
   'priority',
   'productCodes',
   'sku',
@@ -1801,6 +1824,8 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     const id = options._id || options.id
     this.id = merchandise_setId(id)
 
+    this.allowEditQty = options.allowEditQty || false
+    this.allowEditUnitPrice = options.allowEditUnitPrice || false
     this.defaultCurrency = options.defaultCurrency || 'HKD'
     this.description = options.description
     this.free = options.free || false
@@ -1809,7 +1834,7 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     this.merchandiseCategoryCodes = options.merchandiseCategoryCodes || []
     this.merchandiseCode = merchandise_setCode(options, 'merchandiseCode')
     this.merchandiseOptions = initMerchandiseOptions(this, options)
-    this.merchandiseType = options.merchandiseType || 'merchandise'
+    this.merchandiseType = options.merchandiseType || 'Merchandise'
     this.name = options.name || ''
     this.prices = this._Price.initOnlyValidFromArray(options.prices)
     this.productCodes = options.productCodes || []
@@ -1847,17 +1872,20 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   // getters
   get afterEnd() {
     const dates = this.getBeginAndEndDates()
-    return dates.dateEnd > (new Date()).valueOf()
+    return dates.dateEnd > Date.now()
   }
   get beforeBegin() {
     const dates = this.getBeginAndEndDates()
-    return dates.dateBegin <= (new Date()).valueOf()
+    return dates.dateBegin <= Date.now()
   }
   get currentPrice() {
+    if (this.free) {
+      return null
+    }
+    const now = Date.now()
     const prices = this.prices.filter((p) => {
-      return p.isAvailableByDate()
+      return p.isAvailableByDate(now)
     })
-    prices.push({dummy: true})
     if (prices.length === 1) {
       return prices[0]
     }
@@ -1881,7 +1909,7 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.deleted === true
   }
   get isAvailable() {
-    return this.isActive && this.isAvailableByDate
+    return this.isActive && !this.isDeleted && this.hasStock && (this.free || this.currentPrice)
   }
   get isAvailableByDate() {
     return !this.afterEnd && !this.beforeBegin
@@ -1904,9 +1932,12 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   get summary() {
     return {
       currentPrice: this.currentPrice,
+      free: this.free,
+      max: this.max,
       merchandise: this,
       merchandiseCode: this.merchandiseCode,
       name: this.name,
+      stock: this.stock
     }
   }
 
@@ -1955,20 +1986,20 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
       qty,
       value: null
     }
-    const copyCurrency = currency || this.defaultCurrency
+    const _currencyCode = currency || this.defaultCurrency
     const price = this.getPriceByTimeAndRoleCodes(dateTimestamp, roleCodes)
     if (!price) {
       obj.errorMessages.push("Can't get available price for you.")
       return obj
     }
     obj.price = price
-    const priceStrategies = price.getStrategiesByCurrencyAndQty(copyCurrency, qty)
+    const priceStrategies = price.getStrategiesByCurrencyAndQty(_currencyCode, qty)
     if (priceStrategies.length === 0) {
       obj.errorMessages.push("Can't get available strategies from price.")
       return obj
     }
     const { convertedPriceStrategies, maxQty } = priceStrategies.reduce((acc, priceStrategy) => {
-      const strategy = priceStrategy.toCalculatorRule({ currency: copyCurrency, qty })
+      const strategy = priceStrategy.toCalculatorRule({ currency: _currencyCode, qty })
       acc.convertedPriceStrategies.push(strategy)
       if (strategy.max === null) {
         acc.maxQty = null
@@ -2028,10 +2059,10 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
       info.unavailableMessages.push('No available price for you in this time.')
     }
     info.price = price // may be no need
-    const copyCurrency = currency || this.defaultCurrency
+    const _currencyCode = currency || this.defaultCurrency
     // const currencyCode = currency.code
-    if (price && !price.hasCurrencyWithQty(copyCurrency, info.qty)) {
-      info.unavailableMessages.push(`The price not support currency '${copyCurrency}'.`)
+    if (price.getStrategiesByCurrencyAndQty(_currencyCode, info.qty).length === 0) {
+      info.unavailableMessages.push(`The price not support currency '${_currencyCode}'.`)
     }
     const { cartItemInfos, hasProblem } = this.getItemOptionInfos(cartItems)
     info.cartItemInfos = cartItemInfos
@@ -2044,35 +2075,45 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     return info
   }
   getBeginAndEndDates() {
-    const dates = {
+    const beginAndEnd = {
       dateBegin: null,
       dateEnd: null
     }
-    // BUG this.pricings is undefind
-    return this.pricings.reduce((acc, pricing) => {
-      if (!acc.dateBegin || (pricing.dateBegin > acc.dateBegin)) {
-        acc.dateBegin = pricing.dateBegin
+    return this.prices.reduce((acc, price) => {
+      if (!acc.dateBegin || (price.dateBegin > acc.dateBegin)) {
+        acc.dateBegin = price.dateBegin
       }
 
-      if (!acc.dateEnd || (pricing.dateEnd <= acc.dateEnd)) {
-        acc.dateEnd = pricing.dateEnd
+      if (!acc.dateEnd || (price.dateEnd <= acc.dateEnd)) {
+        acc.dateEnd = price.dateEnd
       }
       return acc
-    }, dates)
+    }, beginAndEnd)
   }
   getCode() {
     return this.merchandiseCode
   }
-  getCurrentPrice() {
-    const timestamp = (new Date()).valueOf()
-    const prices = this.getPricesByTime(timestamp)
+  getCurrentAmount({ currencyCode, payload, ignoreRestriction = fasle }) {
+    if (!this.currentPrice) {
+      return null
+    }
+    let priceStrategies = ignoreRestriction ? this.currentPrice.priceStrategies : this.currentPrice.getStrategiesByRestrictions(payload)
+    priceStrategies = this.currentPrice.getStrategiesByCurrencyCode(currencyCode, priceStrategies)
+    if (priceStrategies.length === 0) {
+      return null
+    }
+    return priceStrategies[0].getAmountByCurrencyCode(currencyCode)
+  }
+  getCurrentPrice(timestamp) {
+    const _timestamp = timestamp || Date.now()
+    const prices = this.getPricesByTime(_timestamp)
     if (prices.length === 1) {
       return prices[0]
     }
     return null
   }
   getCurrentPriceByRoleCodes(roleCodes) {
-    const timestamp = (new Date()).valueOf()
+    const timestamp = Date.now()
     let prices = this.getPricesByTime(timestamp)
     prices = Price.getPricesByRoleCodes(prices, roleCodes)
     if (prices.length === 1) {
@@ -2110,8 +2151,8 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.prices ? this.prices : []
   }
   getPricesByTime(timestamp) {
-    const copyDate = timestamp || (new Date()).valueOf()
-    return Price.getPricesByTime(this.prices, copyDate)
+    const _timestamp = timestamp || Date.now()
+    return Price.getPricesByTime(this.prices, _timestamp)
   }
   getPriceByTimeAndRoleCodes(timestamp, roleCodes) {
     let prices = this.getPricesByTime(timestamp)
@@ -2145,6 +2186,12 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   getStock() {
     return this.stock || 0
   }
+  getSummary(options) {
+    return {
+      ...this.summary,
+      currentAmount: this.getCurrentAmount(options)
+    }
+  }
 
   reachLimit(qty) {
     return this.max < qty
@@ -2705,9 +2752,21 @@ class Status {
   //   this.cancelled = null
   //   return this
   // }
+  unSetAssigned() {
+    this.assigned = null
+  }
+  unsetDelivered() {
+    this.delivered = null
+  }
   unSetOnHold() {
     this.onHold = null
   }
+  unSetRefundRequested() {
+    this.refundRequested = null
+  }
+  unsetUsed() {
+    this.used = null
+  }
   update(update) {
     Object.keys(update).forEach((key) => {
       if (!notUpdateAllowedProps.includes(key)) {
@@ -3194,6 +3253,7 @@ class CreditNoteLine extends q_utilities_namespaceObject.TenantAwareEntity {
     // this.deduction = this._Amount.init(options.deduction)
     this.description = options.description
     // this.discount = options.discount || 0
+    this.handlingCharge = this._Amount.init(options.handlingCharge)
     this.qty = options.qty || 1
     // this.unitPrice = Amount.init(options.unitPrice)
   }
@@ -3317,11 +3377,12 @@ class CreditNote extends q_utilities_namespaceObject.TenantAwareEntity {
     const id = options._id || options.id
     this.id = creditNote_setId(id)
 
-    this.amount = this._Amount.init(options.amount)
+    this.amount = this._Amount.init(options.amount) // refundAmount
     this.creditNoteCode = creditNote_setCode(options, 'creditNoteCode')
     this.creditNoteLines = this._CreditNoteLine.initOnlyValidFromArray(options.creditNoteLines)
     this.description = options.description
     this.invoiceCode = options.invoiceCode
+    this.handlingCharge = this._Amount.init(options.handlingCharge)
     this.status = this._Status.init(options.status)
   }
 
@@ -3351,6 +3412,18 @@ class CreditNote extends q_utilities_namespaceObject.TenantAwareEntity {
   get isValid() {
     return super.isValid && !!this.invoiceCode
   }
+
+  get displayCreated() {
+    return (0,q_utilities_namespaceObject.formatDate)(this.meta.created, 'YYYY/MM/DD hh:mm')
+  }
+
+  get displayRefundedDate() {
+    return (0,q_utilities_namespaceObject.formatDate)(this.meta.created, 'YYYY/MM/DD hh:mm')
+  }
+
+  get refundedDetail() {
+    return q_utilities_namespaceObject.KeyValueObject.foundValueByKey(this.metadata, 'REFUNDED_DETAIL') || {}
+  }
   getCode() {
     return this.creditNoteCode
   }
@@ -3624,6 +3697,7 @@ const invoiceLine_updateAllowedProps = [
   'deduction',
   'description',
   'discount',
+  'note',
   'purchaseOptions',
   'qty',
   'unitPrice'
@@ -3652,7 +3726,9 @@ class InvoiceLine extends q_utilities_namespaceObject.TenantAwareEntity {
     this.discount = options.discount || 0
     this.invoiceCode = options.invoiceCode
     this.invoiceLineCode = invoiceLine_setCode(options, 'invoiceLineCode')
+    this.invoiceLineType = options.invoiceLineType || 'InvoiceLine'
     this.merchandiseCode = options.merchandiseCode
+    this.note = options.note
     this.purchaseOptions = q_utilities_namespaceObject.KeyValueObject.initOnlyValidFromArray(options.purchaseOptions)
     this.qty = options.qty || 1
     this.status = this._Status.init(options.status)
@@ -3686,6 +3762,12 @@ class InvoiceLine extends q_utilities_namespaceObject.TenantAwareEntity {
     return this._Merchandise.init(this._merchandise)
   }
 
+  get usedCoupons() {
+    const usedItemCoupons = q_utilities_namespaceObject.KeyValueObject.getValueByKey(this.remarks, 'USED_ITEM_COUPONS') || []
+    const usedTotalCoupons = q_utilities_namespaceObject.KeyValueObject.getValueByKey(this.remarks, 'USED_TOTAL_COUPONS') || []
+    return [...usedItemCoupons, ...usedTotalCoupons]
+  }
+
   // instance methods
   getPurchaseOptionValue(options) {
     const { delimiter, key, tag } = options || {}
@@ -3817,6 +3899,7 @@ class Issuer {
 
 
 
+
 // import { Transaction } from '../transaction/index.js'
 
 const walletItem_updateAllowedProps = [
@@ -3878,6 +3961,9 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
   get isAssigned() {
     return this.status.isAssigned
   }
+  get isAvailable() {
+    return this.isInWallet && (!this.isUsed || !this.isDelivered)
+  }
   get isAvailableCoupon() {
     return this.isCoupon && !this.isCancelled && !this.isUsed
   }
@@ -3897,7 +3983,7 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
     return this.status.isDelivered
   }
   get isInWallet() {
-    return !this.isCancelled && !this.isRefundRequested
+    return !this.isCancelled && !this.isRejected && !this.isRefunded && !this.isRefundRequested
   }
   get isItemCoupon() {
     return this.product ? this.product.isItemCoupon : false
@@ -3907,7 +3993,7 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
   }
   get isOwned() {
     return (
-      !this.isCancelled && !this.isRejected && !this.isRefunded
+      this.isInWallet
       && (
         (this.isPaid && !this.isAssigned && !this.isConfirmed)
         || (this.isWaived && !this.isAssigned && !this.isConfirmed)
@@ -3940,6 +4026,9 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
   get isSubmitted() {
     return this.status.isSubmitted
   }
+  get isTotalCoupon() {
+    return this.product ? this.product.isTotalCoupon : false
+  }
   get isUsed() {
     return this.status.isUsed
   }
@@ -3950,9 +4039,35 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
   get couponDetails() {
     return this.product ? this.product.couponDetails : null
   }
+
+  get displayPurchaseOptions() {
+    return this.purchaseOptions.length > 0
+      ? this.purchaseOptions.reduce((acc, purchaseOption) => {
+        const { value } = purchaseOption
+        return acc += value.reduce((_acc, item) => {
+          const { label, value } = item
+          return _acc += `<div><span>${label}: </span><span>${value}</span></div>`
+        }, '')
+      }, '')
+      : ''
+  }
+
+  get lastRefundRejectedDetail() {
+    return Array.isArray(this.refundRejectedHistory) && this.refundRejectedHistory.length > 0 ? this.refundRejectedHistory[this.refundRejectedHistory.length - 1] : null
+  }
+
   get product() {
     return this._Product.init(this._product)
   }
+  get refundedDetail() {
+    return q_utilities_namespaceObject.Metadata.getValueByKey(this.metadata, 'REFUNDED_DETAIL') || {}
+  }
+  get refundRejectedHistory() {
+    return q_utilities_namespaceObject.Metadata.getValueByKey(this.metadata, 'REFUND_REJECTED_HISTORY') || {}
+  }
+  get refundRequestedDetail() {
+    return q_utilities_namespaceObject.Metadata.getValueByKey(this.metadata, 'REFUND_REQUESTED_DETAIL') || {}
+  }
   get tenant() {
     return this._tenant
   }
@@ -4005,6 +4120,10 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
     this.status.setAssigned(value)
     return this
   }
+  setCancelled(value) {
+    this.status.setCancelled(value)
+    return this
+  }
   setConfirmed(value) {
     this.status.setConfirmed(value)
     return this
@@ -4038,6 +4157,33 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
     this.status.setRejected()
     return this
   }
+  setRefunded(obj) {
+    if (!this.status.cancelled) {
+      this.setCancelled()
+    }
+    const timestamp = this.status.cancelled + 1
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'REFUNDED_DETAIL', obj)
+    this.status.setRefunded(timestamp)
+    return this
+  }
+  setRefundRequested(obj) {
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'REFUND_REQUESTED_DETAIL', obj)
+    this.status.setRefundRequested()
+    return this
+  }
+
+  setRefundRejected(datail) {
+    const last = this.status.refundRequested
+    this.unSetRefundRequested()
+    const history = q_utilities_namespaceObject.Metadata.foundValueByKey(this.metadata, 'REFUND_REJECTED_HISTORY') || []
+    history.push({
+      ...datail,
+      refundRequested: last,
+      created: (new Date()).valueOf(),
+    })
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'REFUND_REJECTED_HISTORY', history)
+  }
+
   setShared() {
     this.status.setShared()
     return this
@@ -4072,10 +4218,45 @@ class WalletItem extends q_utilities_namespaceObject.TenantAwareEntity {
   //     walletItemCode: this.walletItemCode
   //   }
   // }
+  updatePurchaseOptions(purchaseOptions) {
+    const { purchaseOptions: _purchaseOptions } = this
+    const history = q_utilities_namespaceObject.Metadata.foundValueByKey(this.metadata, 'PURCHASE_OPTION_HISTORY') || []
+    history.push({
+      purchaseOptions: external_lodash_namespaceObject.cloneDeep(_purchaseOptions),
+      created: (new Date()).valueOf(),
+    })
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'PURCHASE_OPTION_HISTORY', history)
+    _purchaseOptions.forEach((_purchaseOption) => {
+      const { key, value } = _purchaseOption
+      const { value: updatedValue } = purchaseOptions.find((i) => i.key === key)
+      value.forEach((i, idx) => {
+        Object.assign(i, updatedValue[idx])
+      })
+    })
+    return this
+  }
+  unSetAssigned() {
+    this.status.unSetAssigned()
+    return this
+  }
+  unsetDelivered() {
+    this.status.unsetDelivered()
+    return this
+  }
   unSetOnHold() {
     this.status.unSetOnHold()
     return this
   }
+
+  unSetRefundRequested() {
+    this.status.unSetRefundRequested()
+    return this
+  }
+  unsetUsed() {
+    this.status.unsetUsed()
+    return this
+  }
+
   update(update) {
     Object.keys(update).forEach((key) => {
       if (walletItem_updateAllowedProps.includes(key)) {
@@ -4155,8 +4336,9 @@ class Transaction extends q_utilities_namespaceObject.TenantAwareEntity {
     options = options || {}
     super(options)
 
-    const { _Amount, _Status, _WalletItem } = options._constructor || {}
+    const { _Amount, _PaymentResultFactory, _Status, _WalletItem } = options._constructor || {}
     this._Amount = _Amount && (_Amount._superclass === Amount._superclass) ? _Amount : Amount
+    this._PaymentResultFactory = _PaymentResultFactory
     this._Status = _Status && (_Status._superclass === Status._superclass) ? _Status : Status
     this._WalletItem = _WalletItem && (_WalletItem._superclass === WalletItem._superclass) ? _WalletItem : WalletItem
 
@@ -4199,6 +4381,9 @@ class Transaction extends q_utilities_namespaceObject.TenantAwareEntity {
   get isValid() {
     return super.isValid
   }
+  get billedAmount() {
+    return this.amount?.displayAmount()
+  }
   get isActive() {
     return this.active === true
   }
@@ -4252,6 +4437,25 @@ class Transaction extends q_utilities_namespaceObject.TenantAwareEntity {
   get isWaived() {
     return this.status.isWaived
   }
+  get paymentResults() {
+    return this._PaymentResultFactory.initOnlyValidFromArray(this._paymentResults || [])
+  }
+  get paymentResultAmounts() {
+    return this.paymentResults.filter((p) => {
+      return p.isSuccess()
+    }).map((p) => {
+      return {
+        billedAmount: p.billedAmount,
+        paidTimestamp: p.getPaidTimestamp(),
+        paymentMethod: p.paymentMethod,
+        paymentResultCode: p.paymentResultCode,
+        receivedAmount: p.receivedAmount
+      }
+    })
+  }
+  get successedPaymentResult() {
+    return this.paymentResults.find((p) => (p.isSuccess()))
+  }
   get walletItems() {
     return this._WalletItem.initOnlyValidFromArray(this._walletItems)
   }
@@ -4511,6 +4715,7 @@ class Invoice extends q_utilities_namespaceObject.TenantAwareEntity {
     this.invoiceCode = invoice_setCode(options, 'invoiceCode')
     this.invoiceDate = options.invoiceDate || (new Date()).valueOf()
     this.invoiceNumber = options.invoiceNumber
+    this.invoiceType = options.invoiceType || 'Invoice'
     this.issuer = this._Issuer.init(options.issuer)
     this.revisionNumber = options.revisionNumber || 1
     this.status = this._Status.init(options.status)
@@ -4704,196 +4909,711 @@ class InvoiceRepo extends q_utilities_namespaceObject.Repo {
 ;// ./lib/models/keyValueObject/index.js
 
 
-;// ./lib/models/paymentGateway/paymentGateway.js
-
+;// ./lib/models/statusQStore/statusQStore.js
 
 
-const paymentGateway_updateAllowedProps = [
-  'label',
-  'logoUrl',
-  'name',
-  'sandbox',
-  'setting'
-]
+const statusQStore_notUpdateAllowedProps = (/* unused pure expression or super */ null && ([
+]))
 
-class PaymentGateway extends q_utilities_namespaceObject.TenantAwareEntity {
-  constructor(options = {}) {
+class StatusQStore extends q_utilities_namespaceObject.Status {
+  constructor(options) {
     options = options || {}
     super(options)
 
-    const id = options._id || options.id
-    this.id = paymentGateway_setId(id)
-    this._type = options._type || 'PaymentGateway'
-
-    this.hasWebhook = options.hasWebhook || false
-    this.label = options.label
-    this.logoUrl = options.logoUrl
-    this.name = options.name || ''
-    this.paymentGatewayCode = paymentGateway_setCode(options, 'paymentGatewayCode')
-    this.paymentGatewayType = options.paymentGatewayType || 'PaymentGateway'
-    this.paymentResultType = options.paymentResultType || 'PaymentResult'
-    this.sandbox = options.sandbox || false
-    this.setting = options.setting || null
-  }
-  static dummyData() {
-    return {
-      name: 'name',
-      tenantCode: 'tenantCode'
-    }
+    this.cancelled = this._ActionRecord.init(options.cancelled)
+    this.completed = this._ActionRecord.init(options.completed)
+    this.confirmed = this._ActionRecord.init(options.confirmed)
+    this.deleted = this._ActionRecord.init(options.deleted)
+    this.terminated = this._ActionRecord.init(options.terminated)
   }
+
   static get _classname() {
-    return 'PaymentGateway'
+    return 'StatusQStore'
   }
-  static get _superclass() {
-    return 'PaymentGateway'
+  get _classname() {
+    return 'StatusQStore'
   }
-
-  // getters
-  get isValid() {
-    return super.isValid && !!this.name
+  get isCancelled() {
+    return this.cancelled?.timestamp > 0
   }
-
-  // instance methods
-  async createPayment() {
-    throw new Error(`${this._classname} subclass should implement createPayment`)
+  get isCompleted() {
+    return this.completed?.timestamp > 0
   }
-  async getAppPayParams() {
-    throw new Error(`${this._classname} subclass should implement getAppPayParams`)
+  get isConfirmed() {
+    return this.confirmed?.timestamp > 0
   }
-  getCode() {
-    return this.paymentGatewayCode
+  get isDeleted() {
+    return this.deleted?.timestamp > 0
   }
-  async updatePayment() {
-    throw new Error(`${this._classname} subclass should implement updatePayment`)
+  get isTerminated() {
+    return this.terminated?.timestamp > 0
   }
-  async query() {
-    throw new Error(`${this._classname} subclass should implement query`)
+  get isValid() {
+    return super.isValid
   }
-  async submit() {
-    throw new Error(`${this._classname} subclass should implement submit`)
+  setCancelled(value, actorCode) {
+    return this.setValue(value, actorCode, 'cancelled')
   }
-
-  setCompletedRelatedStatus(status) {
-    throw new Error(`${this.name} subclass should implement setCompletedRelatedStatus`)
+  setCompleted(value, actorCode) {
+    return this.setValue(value, actorCode, 'completed')
   }
-  update(update) {
-    Object.keys(update).forEach((key) => {
-      if (paymentGateway_updateAllowedProps.includes(key)) {
-        this[key] = update[key]
-      }
-    })
-    return super.update(update)
+  setConfirmed(value, actorCode) {
+    return this.setValue(value, actorCode, 'confirmed')
   }
-}
-
-function paymentGateway_setCode(options, key) {
-  const copyOptions = options || {}
-  if (copyOptions[key]) {
-    return copyOptions[key]
+  setDeleted(value, actorCode) {
+    return this.setValue(value, actorCode, 'deleted')
   }
-  return stringHelper.setCode()
-}
-
-function paymentGateway_setId(id) {
-  if (id && typeof id.toString === 'function') {
-    return id.toString()
+  setTerminated(value, actorCode) {
+    return this.setValue(value, actorCode, 'terminated')
   }
-  return id
+  // update(update) {
+  //   Object.keys(update).forEach((key) => {
+  //     if (!notUpdateAllowedProps.includes(key)) {
+  //       this[key] = this[key] instanceof this._ActionRecord ? this[key].update(update[key]) : this._ActionRecord.init(update[key])
+  //     }
+  //   })
+  //   return super.update(update)
+  // }
 }
 
+;// ./lib/models/statusQStore/statusQStoreOrderLine.js
 
 
-;// ./lib/models/paymentGateway/paymentGatewayRepo.js
-
-
+const statusQStoreOrderLine_notUpdateAllowedProps = (/* unused pure expression or super */ null && ([
+]))
 
-class PaymentGatewayRepo extends q_utilities_namespaceObject.Repo {
-  constructor(options = {}) {
+class StatusQStoreOrderLine extends StatusQStore {
+  constructor(options) {
     options = options || {}
     super(options)
-    const { _PaymentGateway } = options._constructor || {}
-    this._PaymentGateway = _PaymentGateway && (_PaymentGateway._superclass === PaymentGateway._superclass) ? _PaymentGateway : PaymentGateway
+
+    this.expired = this._ActionRecord.init(options.expired)
+    this.invalid = this._ActionRecord.init(options.invalid)
   }
+
   static get _classname() {
-    return 'PaymentGatewayRepo'
+    return 'StatusQStoreOrderLine'
   }
-  init(options) {
-    return this._PaymentGateway.init(options)
+  get _classname() {
+    return 'StatusQStoreOrderLine'
+  }
+  get isExpired() {
+    return this.expired?.timestamp > Date.now()
+  }
+  get isInvalid() {
+    return this.invalid?.timestamp > Date.now()
+  }
+  get isValid() {
+    return super.isValid
+  }
+  setExpired(value, actorCode) {
+    return this.setValue(value, actorCode, 'expired')
   }
+  setInvalid(value, actorCode) {
+    return this.setValue(value, actorCode, 'invalid')
+  }
+  // update(update) {
+  //   Object.keys(update).forEach((key) => {
+  //     if (!notUpdateAllowedProps.includes(key)) {
+  //       this[key] = this[key] instanceof this._ActionRecord ? this[key].update(update[key]) : this._ActionRecord.init(update[key])
+  //     }
+  //   })
+  //   return super.update(update)
+  // }
 }
 
+;// ./lib/models/statusQStore/index.js
 
 
-;// ./lib/models/paymentGateway/index.js
-
 
 
 
+;// ./lib/models/orderLine/orderLine.js
 
+// import { Amount, Merchandise, Status, stringHelper } from '@questwork/q-store-model'
 
-;// ./lib/models/paymentResult/paymentResult.js
 
 
 
+// import { OrderService } from '../orderService/index.js'
 
-const paymentResult_updateAllowedProps = [
-  'active',
-  'deleted',
-  'remarks',
-  'result'
+const orderLine_updateAllowedProps = [
+  'amount',
+  'deduction',
+  'discount',
+  'note',
+  'unitPrice',
+  // 'purchaseOptions',
+  'status',
+  // 'orderLineCode',
+  // 'merchandiseCode',
+  'waived',
+  'qty'
 ]
 
-class PaymentResult extends q_utilities_namespaceObject.TenantAwareEntity {
-  constructor(options = {}) {
+class OrderLine extends q_utilities_namespaceObject.TenantAwareEntity {
+  constructor(options) {
     options = options || {}
     super(options)
 
-    const { _Transaction } = options._constructor || {}
-    this._Transaction = _Transaction && (_Transaction._superclass === Transaction._superclass) ? _Transaction : Transaction
+    const { _Amount, _Merchandise, _Order, _OrderService, _Status } = options._constructor || {}
+    this._Amount = _Amount && (_Amount._superclass === Amount._superclass) ? _Amount : Amount
+    this._Merchandise = _Merchandise && (_Merchandise._superclass === Merchandise._superclass) ? _Merchandise : Merchandise
+    this._Order = _Order && (_Order._superclass === Order._superclass) ? _Order : Order
+    // this._OrderService = _OrderService && (_OrderService._superclass === OrderService._superclass) ? _OrderService : OrderService
+    this._Status = _Status && (_Status._superclass === StatusQStoreOrderLine._superclass) ? _Status : StatusQStoreOrderLine
 
-    this._transaction = options._transaction
-    this._type = options._type || 'PaymentResult'
+    this._merchandise = options._merchandise
+    this._order = options._order
+    // this._orderService = options._orderService
 
     const id = options._id || options.id
-    this.id = paymentResult_setId(id)
-
-    this.paymentResultCode = paymentResult_setCode(options, 'paymentResultCode')
-    this.paymentResultType = options.paymentResultType || 'PaymentResult'
-    this.result = options.result
-    this.resultRef = options.resultRef
-    this.resultType = options.resultType
-    // this.transaction = this._Transaction.init(options.transaction)
-    this.transactionCode = options.transactionCode
+    this.id = orderLine_setId(id)
+    this._type = options._type || 'OrderLine'
+    this.amount = this._Amount.init(options.amount)
+    this.deduction = this._Amount.init(options.deduction)
+    this.discount = options.discount || 0
+    this.note = options.note
+    this.unitPrice = this._Amount.init(options.unitPrice)
+    // this.purchaseOptions = KeyValueObject.initOnlyValidFromArray(options.purchaseOptions)
+    this.status = this._Status.init(options.status)
+    this.orderCode = options.orderCode
+    this.orderLineCode = options.orderLineCode
+    this.orderLineType = 'OrderLine'
+    this.merchandiseCode = options.merchandiseCode
+    this.waived = options.waived || 0
+    this.qty = options.qty || 1
   }
 
-  // class method
   static dummyData() {
     return {
-      paymentResultType: 'PaymentResult',
-      result: { id: 'resultId' },
-      resultType: 'resultType',
-      tenantCode: 'tenantCode',
-      transactionCode: 'transactionCode'
+      amount: Amount.dummyData(),
+      orderCode: 'orderCode',
+      tenantCode: 'tenantCode'
     }
   }
+
   static get _classname() {
-    return 'PaymentResult'
+    return 'OrderLine'
   }
+
   static get _superclass() {
-    return 'PaymentResult'
+    return 'OrderLine'
   }
 
-  // getters
-  get isValid() {
-    return super.isValid && !!this.resultType && !!this.transactionCode
-    // return !!this.result && !!this.resultType && !!this.tenantCode
+  get isCompleted() {
+    return this.status.isCompleted
   }
-  get amount() {
+
+  get isProcessing() {
+    return this.status.isProcessing
+  }
+
+  get isTerminated() {
+    return this.status.isTerminated
+  }
+
+  get isValid() {
+    return super.isValid && !!this.merchandiseCode
+  }
+
+  get order() {
+    return this._Order.init(this._order)
+  }
+
+  get merchandise() {
+    return this._Merchandise.init(this._merchandise)
+  }
+
+  allowCancel() {
+    return this.status.allowCancel()
+  }
+
+  createInvoiceLine() {
+    return {
+      invoiceLineType: 'InvoiceLine',
+      amount: this.amount,
+      unitPrice: this.unitPrice,
+      deduction: this.deduction,
+      discount: this.discount,
+      qty: this.qty,
+      merchandiseCode: this.merchandiseCode,
+      metadata: this.metadata,
+      note: this.note,
+      purchaseOptions: this.purchaseOptions,
+      remarks: this.remarks,
+      waived: this.waived,
+      owner: this.owner,
+      tenantCode: this.tenantCode,
+    }
+  }
+
+  getAmount() {
+    return this.amount
+  }
+
+  toCaculateAmountItem() {
+    return {
+      merchandiseCode: this.merchandiseCode,
+      qty: this.qty,
+      price: this.unitPrice,
+      discount: this.discount,
+      subTotal: this.amount,
+      priceStrategy: null,
+      purchaseOptions: this.purchaseOptions || [],
+      remarks: this.remarks,
+      waived: this.waived
+    }
+  }
+
+  getCurrencyCode() {
+    return this.amount ? this.amount.getCurrencyCode() : null
+  }
+
+  setCompleted(value, actorCode) {
+    this.status.setCompleted(value, actorCode)
+    return this.setModified()
+  }
+
+  setQty(qty) {
+    if (typeof qty === 'number' && qty > 0) {
+      this.qty = qty
+      this.setModified()
+    }
+    return this.qty
+  }
+
+  settle(service) {
+    if (!service) {
+      return this
+    }
+
+    if (service.end) {
+      this.setCompleted()
+    }
+
+    return this
+  }
+
+  // setCompleted() {
+  //   this.status.setCompleted()
+  //   return this.setModified()
+  // }
+
+  setCancelled() {
+    this.status.setCancelled()
+    return this.setModified()
+  }
+
+  setProcessing() {
+    this.status.setProcessing()
+    return this.setModified()
+  }
+
+  setTerminated() {
+    this.status.setTerminated()
+    return this.setModified()
+  }
+
+  setWaived() {
+    this.status.setWaived()
+    return this.setModified()
+  }
+
+  update(obj) {
+    Object.keys(obj).forEach((key) => {
+      if (orderLine_updateAllowedProps.includes(key)) {
+        if (key === 'purchaseOptions') {
+          this[key] = q_utilities_namespaceObject.KeyValueObject.initOnlyValidFromArray(obj[key])
+        } else if (key === 'amount' || key === 'deduction' || key === 'unitPrice') {
+          this[key] = this[key] instanceof this._Amount ? this[key].update(obj[key]) : this._Amount.init(obj[key])
+        } else if (key === 'status') {
+          this[key] = this[key] instanceof this._Status ? this[key].update(obj[key]) : this._Status.init(obj[key])
+        } else {
+          this[key] = obj[key]
+        }
+      }
+    })
+    return super.update(obj)
+  }
+}
+
+// function setCode(options, key) {
+//   const copyOptions = options || {}
+//   if (copyOptions[key]) {
+//     return copyOptions[key]
+//   }
+//   return stringHelper.setCode()
+// }
+
+function orderLine_setId(id) {
+  if (id && typeof id.toString === 'function') {
+    return id.toString()
+  }
+  return id
+}
+
+
+
+;// ./lib/models/orderLine/index.js
+
+
+
+
+;// ./lib/models/order/order.js
+
+// import { Amount, Status, stringHelper } from '@questwork/q-store-model'
+
+
+
+// import { Status } from '../status/index.js'
+// import { stringHelper } from '../../helpers/stringHelper/index.js'
+
+const order_updateAllowedProps = [
+  'amount',
+  // 'orderNumber',
+  // 'revisionNumber',
+  'status',
+  'name',
+]
+
+class Order extends q_utilities_namespaceObject.TenantAwareEntity {
+  constructor(options) {
+    options = options || {}
+    super(options)
+
+    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._orderLines = options._orderLines
+
+    const id = options._id || options.id
+    this.id = order_setId(id)
+    this._type = options._type || 'Order'
+    this.amount = this._Amount.init(options.amount)
+    this.orderCode = options.orderCode
+    // this.orderNumber = options.orderNumber
+    this.orderType = 'Order'
+    // this.revisionNumber = options.revisionNumber || 1
+    this.status = this._Status.init(options.status)
+    this.name = options.name
+  }
+
+  static dummyData() {
+    return {
+      tenantCode: 'tenantCode'
+    }
+  }
+
+  static get _classname() {
+    return 'Order'
+  }
+
+  static get _superclass() {
+    return 'Order'
+  }
+
+  // get isValid() {
+  //   return super.isValid
+  // }
+
+  get isCompleted() {
+    return this.status.isCompleted
+  }
+
+  get isProcessing() {
+    return this.status.isProcessing
+  }
+
+  get isTerminated() {
+    return this.status.isTerminated
+  }
+
+  get orderLines() {
+    return this._OrderLine.initOnlyValidFromArray(this._orderLines || [])
+  }
+
+  getAmount() {
+    return this.amount
+  }
+
+  getCurrencyCode() {
+    return this.amount ? this.amount.getCurrencyCode() : null
+  }
+
+  getFullOrderNumber(delimiter = '.') {
+    return `${this.orderNumber}${delimiter}${this.revisionNumber}`
+  }
+
+  increaseRevisionNumber() {
+    this.revisionNumber += 1
+    return this
+  }
+
+  setCompleted() {
+    this.status.setCompleted()
+    return this.setModified()
+  }
+
+  setCancelled() {
+    this.status.setCancelled()
+    return this.setModified()
+  }
+
+  setProcessing() {
+    this.status.setProcessing()
+    return this.setModified()
+  }
+
+  setTerminated() {
+    this.status.setTerminated()
+    return this.setModified()
+  }
+
+  setWaived() {
+    this.status.setWaived()
+    return this.setModified()
+  }
+
+  update(obj) {
+    Object.keys(obj).forEach((key) => {
+      if (order_updateAllowedProps.includes(key)) {
+        if (key === 'amount') {
+          this[key] = this.amount instanceof this._Amount ? this.amount.update(obj[key]) : this._Amount.init(obj[key])
+        } else if (key === 'status') {
+          this[key] = this.status instanceof this._Status ? this.status.update(obj[key]) : this._Status.init(obj[key])
+        } else {
+          this[key] = obj[key]
+        }
+      }
+    })
+    return super.update(obj)
+  }
+}
+
+// function setCode(options, key) {
+//   const copyOptions = options || {}
+//   if (copyOptions[key]) {
+//     return copyOptions[key]
+//   }
+//   return stringHelper.setCode()
+// }
+
+function order_setId(id) {
+  if (id && typeof id.toString === 'function') {
+    return id.toString()
+  }
+  return id
+}
+
+
+
+;// ./lib/models/order/index.js
+
+
+
+
+;// ./lib/models/paymentGateway/paymentGateway.js
+
+
+
+const paymentGateway_updateAllowedProps = [
+  'label',
+  'logoUrl',
+  'name',
+  'sandbox',
+  'setting'
+]
+
+class PaymentGateway extends q_utilities_namespaceObject.TenantAwareEntity {
+  constructor(options = {}) {
+    options = options || {}
+    super(options)
+
+    const id = options._id || options.id
+    this.id = paymentGateway_setId(id)
+    this._type = options._type || 'PaymentGateway'
+
+    this.hasWebhook = options.hasWebhook || false
+    this.label = options.label
+    this.logoUrl = options.logoUrl
+    this.name = options.name || ''
+    this.paymentGatewayCode = paymentGateway_setCode(options, 'paymentGatewayCode')
+    this.paymentGatewayType = options.paymentGatewayType || 'PaymentGateway'
+    this.paymentResultType = options.paymentResultType || 'PaymentResult'
+    this.sandbox = options.sandbox || false
+    this.setting = options.setting || null
+  }
+  static dummyData() {
+    return {
+      name: 'name',
+      tenantCode: 'tenantCode'
+    }
+  }
+  static get _classname() {
+    return 'PaymentGateway'
+  }
+  static get _superclass() {
+    return 'PaymentGateway'
+  }
+
+  // getters
+  get isValid() {
+    return super.isValid && !!this.name
+  }
+
+  // instance methods
+  async createPayment() {
+    throw new Error(`${this._classname} subclass should implement createPayment`)
+  }
+  async getAppPayParams() {
+    throw new Error(`${this._classname} subclass should implement getAppPayParams`)
+  }
+  getCode() {
+    return this.paymentGatewayCode
+  }
+  async updatePayment() {
+    throw new Error(`${this._classname} subclass should implement updatePayment`)
+  }
+  async query() {
+    throw new Error(`${this._classname} subclass should implement query`)
+  }
+  async submit() {
+    throw new Error(`${this._classname} subclass should implement submit`)
+  }
+
+  setCompletedRelatedStatus(status) {
+    throw new Error(`${this.name} subclass should implement setCompletedRelatedStatus`)
+  }
+  update(update) {
+    Object.keys(update).forEach((key) => {
+      if (paymentGateway_updateAllowedProps.includes(key)) {
+        this[key] = update[key]
+      }
+    })
+    return super.update(update)
+  }
+}
+
+function paymentGateway_setCode(options, key) {
+  const copyOptions = options || {}
+  if (copyOptions[key]) {
+    return copyOptions[key]
+  }
+  return stringHelper.setCode()
+}
+
+function paymentGateway_setId(id) {
+  if (id && typeof id.toString === 'function') {
+    return id.toString()
+  }
+  return id
+}
+
+
+
+;// ./lib/models/paymentGateway/paymentGatewayRepo.js
+
+
+
+class PaymentGatewayRepo extends q_utilities_namespaceObject.Repo {
+  constructor(options = {}) {
+    options = options || {}
+    super(options)
+    const { _PaymentGateway } = options._constructor || {}
+    this._PaymentGateway = _PaymentGateway && (_PaymentGateway._superclass === PaymentGateway._superclass) ? _PaymentGateway : PaymentGateway
+  }
+  static get _classname() {
+    return 'PaymentGatewayRepo'
+  }
+  init(options) {
+    return this._PaymentGateway.init(options)
+  }
+}
+
+
+
+;// ./lib/models/paymentGateway/index.js
+
+
+
+
+
+
+;// ./lib/models/paymentResult/paymentResult.js
+
+
+
+
+const paymentResult_updateAllowedProps = [
+  'active',
+  'deleted',
+  'remarks',
+  'result'
+]
+
+class PaymentResult extends q_utilities_namespaceObject.TenantAwareEntity {
+  constructor(options = {}) {
+    options = options || {}
+    super(options)
+
+    const { _Transaction } = options._constructor || {}
+    this._Transaction = _Transaction && (_Transaction._superclass === Transaction._superclass) ? _Transaction : Transaction
+
+    this._transaction = options._transaction
+    this._type = options._type || 'PaymentResult'
+
+    const id = options._id || options.id
+    this.id = paymentResult_setId(id)
+
+    this.paymentResultCode = paymentResult_setCode(options, 'paymentResultCode')
+    this.paymentResultType = options.paymentResultType || 'PaymentResult'
+    this.result = options.result
+    this.resultRef = options.resultRef
+    this.resultType = options.resultType
+    // this.transaction = this._Transaction.init(options.transaction)
+    this.transactionCode = options.transactionCode
+  }
+
+  // class method
+  static dummyData() {
+    return {
+      paymentResultType: 'PaymentResult',
+      result: { id: 'resultId' },
+      resultType: 'resultType',
+      tenantCode: 'tenantCode',
+      transactionCode: 'transactionCode'
+    }
+  }
+  static get _classname() {
+    return 'PaymentResult'
+  }
+  static get _superclass() {
+    return 'PaymentResult'
+  }
+
+  // getters
+  get isValid() {
+    return super.isValid && !!this.resultType && !!this.transactionCode
+    // return !!this.result && !!this.resultType && !!this.tenantCode
+  }
+  get amount() {
     throw new Error(`${this._classname} subclass should implement get amount`)
   }
+  get billedAmount() {
+    throw new Error(`${this._classname} subclass should implement get billedAmount`)
+  }
   get paymentMethod() {
     throw new Error(`${this._classname} subclass should implement get paymentMethod`)
   }
+  get receivedAmount() {
+    throw new Error(`${this._classname} subclass should implement get receivedAmount`)
+  }
+  get resultStatus() {
+    throw new Error(`${this._classname} subclass should implement get resultStatus`)
+  }
   get transaction() {
     return this._Transaction.init(this._transaction)
   }
@@ -4903,11 +5623,11 @@ class PaymentResult extends q_utilities_namespaceObject.TenantAwareEntity {
   //   throw new Error(`${this.paymentResultType} subclass should implement getPaymentId`)
   // }
   addMetadata(key, value) {
-    q_utilities_namespaceObject.Metadata.addItem(this.metadata, key, value)
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, key, value)
     return this
   }
   addRemark(key, value) {
-    q_utilities_namespaceObject.KeyValueObject.addItem(this.remarks, key, value)
+    this.remarks = q_utilities_namespaceObject.KeyValueObject.insertOrUpdateRecord(this.remarks, key, value)
     return this
   }
 
@@ -4961,10 +5681,10 @@ class PaymentResult extends q_utilities_namespaceObject.TenantAwareEntity {
   setupMetadata() {
     const amount = this.amount
     const paymentMethod = this.paymentMethod
-    q_utilities_namespaceObject.Metadata.addItem(this.metadata, 'AMOUNT', amount)
-    q_utilities_namespaceObject.Metadata.addItem(this.metadata, 'PAYMENT_METHOD', paymentMethod)
-    q_utilities_namespaceObject.KeyValueObject.addItem(this.remarks, 'amount', amount)
-    q_utilities_namespaceObject.KeyValueObject.addItem(this.remarks, 'paymentMethod', paymentMethod)
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'AMOUNT', amount)
+    this.metadata = q_utilities_namespaceObject.Metadata.insertOrUpdateRecord(this.metadata, 'PAYMENT_METHOD', paymentMethod)
+    this.remarks = q_utilities_namespaceObject.KeyValueObject.insertOrUpdateRecord(this.remarks, 'amount', amount)
+    this.remarks = q_utilities_namespaceObject.KeyValueObject.insertOrUpdateRecord(this.remarks, 'paymentMethod', paymentMethod)
     return this
   }
   setupRemarks() {
@@ -5249,6 +5969,9 @@ function storeItem_getDataByKey(key, data) {
 
 
 
+
+
+
 
 
 
@@ -5366,7 +6089,8 @@ class Chain {
 
 ;// ./lib/helpers/calculateByCoupon/calculateCoupon.js
 
-function calculateByCoupon({ coupon, price }) {
+
+function calculateByCoupon({ coupon, price, currencyCode }) {
   const { couponDetails } = coupon
   if (!couponDetails) {
     return 0
@@ -5374,8 +6098,11 @@ function calculateByCoupon({ coupon, price }) {
   const { type, item } = couponDetails
   if (item) {
     switch(type) {
+      case ('Deduction'): {
+        return _caculateByDeduction({ price, couponDetails, currencyCode })
+      }
       case ('Percentage'): {
-        return _caculateByPercentage(price, couponDetails)
+        return _caculateByPercentage({ price, couponDetails })
       }
       default: {
         return 0
@@ -5384,7 +6111,11 @@ function calculateByCoupon({ coupon, price }) {
   }
 }
 
-function _caculateByPercentage(price, couponDetails) {
+function _caculateByDeduction({ price, couponDetails, currencyCode }) {
+  const { value } = couponDetails
+  return q_utilities_namespaceObject.KeyValueObject.foundValueByKey(value, currencyCode)
+}
+function _caculateByPercentage({ price, couponDetails }) {
   const { value } = couponDetails
   return price.value * (value / 100)
 }
@@ -5392,6 +6123,11 @@ function _caculateByPercentage(price, couponDetails) {
 
 
 
+;// ./lib/helpers/calculateByCoupon/index.js
+
+
+
+
 ;// ./lib/eventManager/chains/helpers.js
 
 
@@ -5566,6 +6302,10 @@ function cutEntitlements(lines, entitlements = [], currencyCode) {
     const subTotal = Amount.init({ value, currencyCode })
     const discountValue = ((price ? price.value : 0) * restQty) - (subTotal ? subTotal.value : 0) + ((price ? price.value : 0) * waived)
     const discount = Amount.init({ value: discountValue, currencyCode })
+    let remarks = q_utilities_namespaceObject.KeyValueObject.initOnlyValidFromArray([...(updatedItem.remarks || [])])
+    remarks = q_utilities_namespaceObject.KeyValueObject.updateOrInsertRecord(remarks, 'entitlements', entitlementsRemarkValue)
+    let metadata = q_utilities_namespaceObject.Metadata.initOnlyValidFromArray([...(updatedItem.metadata || [])])
+    metadata = q_utilities_namespaceObject.Metadata.updateOrInsertRecord(metadata, 'entitlements', entitlementsRemarkValue)
     const obj = {
       merchandiseCode,
       price,
@@ -5573,7 +6313,9 @@ function cutEntitlements(lines, entitlements = [], currencyCode) {
       subTotal,
       qty,
       waived,
-      remarks: [{ key: 'entitlements', value: entitlementsRemarkValue }],
+      // remarks: [{ key: 'entitlements', value: entitlementsRemarkValue }],
+      remarks,
+      metadata,
       priceStrategies,
       priceStrategy: strategy
     }
@@ -5667,7 +6409,7 @@ function getAmount(priceStrategies, currencyCode, line) {
   const discount = Amount.init({ value: discountValue, currencyCode })
   return {
     merchandiseCode,
-    remarks: [],
+    // remarks: [],
     price,
     discount,
     subTotal,
@@ -5720,14 +6462,18 @@ function getPricesByTime(line, dateTime) {
 }
 
 function getStrategiesByRestrictions(prices, line, user) {
-  if (prices.length === 0) {
-    return []
-  }
+  // if (prices.length === 0) {
+  //   return []
+  // }
   const { updatedItem } = line
-  const priceStrategies = prices.reduce((acc, price) => {
-    const strategies = price.getStrategiesByRestrictions({ user })
-    return acc.concat(strategies)
-  }, [])
+  let priceStrategies = []
+  if (prices.length !== 0) {
+    priceStrategies = prices.reduce((acc, price) => {
+      const strategies = price.getStrategiesByRestrictions({ user })
+      return acc.concat(strategies)
+    }, [])
+  }
+
   if (priceStrategies.length === 0) {
     updatedItem.qty = 0
     line.available = false
@@ -5814,6 +6560,10 @@ function ChainGetPriceForGroup_cutEntitlements(lines, entitlements = [], currenc
     const subTotal = Amount.init({ value, currencyCode })
     const discountValue = (price.value * restQty) - subTotal.value + (price.value * waived)
     const discount = Amount.init({ value: discountValue, currencyCode })
+    let remarks = KeyValueObject.initOnlyValidFromArray([...(updatedItem.remarks || [])])
+    remarks = KeyValueObject.updateOrInsertRecord(remarks, 'entitlements', entitlementsRemarkValue)
+    let metadata = Metadata.initOnlyValidFromArray([...(updatedItem.metadata || [])])
+    metadata = Metadata.updateOrInsertRecord(metadata, 'entitlements', entitlementsRemarkValue)
     const obj = {
       merchandiseCode,
       price,
@@ -5821,7 +6571,9 @@ function ChainGetPriceForGroup_cutEntitlements(lines, entitlements = [], currenc
       subTotal,
       qty,
       waived,
-      remarks: [{ key: 'entitlements', value: entitlementsRemarkValue }],
+      // remarks: [{ key: 'entitlements', value: entitlementsRemarkValue }],
+      remarks,
+      metadata,
       priceStrategies,
       priceStrategy: strategy
     }
@@ -5876,7 +6628,7 @@ function ChainGetPriceForGroup_getAmount(priceStrategies, currencyCode, line) {
   const discount = Amount.init({ value: discountValue, currencyCode })
   return {
     merchandiseCode,
-    remarks: [],
+    // remarks: [],
     price,
     discount,
     subTotal,
@@ -5961,7 +6713,8 @@ class ChainInitLines extends Chain {
         line.updatedItem = {
           ...item,
           waived: 0,
-          remarks: [],
+          remarks: q_utilities_namespaceObject.KeyValueObject.initOnlyValidFromArray(item.remarks),
+          metadata: q_utilities_namespaceObject.Metadata.initOnlyValidFromArray(item.metadata),
           price: Amount.init(item.price),
           discount: Amount.init(item.discount),
           subTotal: Amount.init(item.subTotal),
@@ -6016,6 +6769,61 @@ class ChainMerchandiseLimit extends Chain {
 
 
 
+;// ./lib/eventManager/chains/chainPriceAdjustment.js
+
+
+class ChainPriceAdjustment extends Chain {
+  constructor(options = {}) {
+    super(options)
+    this.currency = options.currency
+  }
+
+  async handleRequest(chainTarget) {
+    try {
+      const { lines } = chainTarget
+
+      // for item coupon
+      lines.forEach((line) => {
+        _calculate({ line, currency: this.currency })
+      })
+      await this.next(chainTarget)
+    } catch (err) {
+      chainTarget.addException('handle related coupons fail', err.message)
+      this.exitChain()
+    }
+  }
+}
+
+function _calculate({ line, currency }) {
+  const { updatedItem } = line
+  const { price, qty, discount, purchaseOptions, remarks, subTotal } = updatedItem
+  if (purchaseOptions.length === 0 || updatedItem.qty === 0) {
+    return
+  }
+  const priceAdjustment = _findPriceAdjustmentValue(purchaseOptions)
+  if (!priceAdjustment) {
+    return
+  }
+  const subTotalValue = subTotal.value + priceAdjustment * (currency.factor || 1)
+  const obj = {
+    subTotal: Amount.init({ value: subTotalValue, currencyCode: currency.code })
+  }
+  Object.assign(updatedItem, obj)
+}
+
+function _findPriceAdjustmentValue(dataArray) {
+  for (const obj of dataArray) {
+    const priceAdjustment = obj.value?.find(item => item.key === 'priceAdjustment')
+    if (priceAdjustment) {
+      return Number(priceAdjustment.value)
+    }
+  }
+  return null
+}
+
+
+
+
 ;// ./lib/eventManager/chains/chainProductLimit.js
 
 
@@ -6210,7 +7018,6 @@ class ChainPurchaseOptions extends Chain {
 
 ;// ./lib/eventManager/chains/chainRelatedCoupons.js
 
-// import { WalletItem } from '../../models/walletItem/index.js'
 
 class ChainRelatedCoupons extends Chain {
   constructor(options = {}) {
@@ -6222,40 +7029,143 @@ class ChainRelatedCoupons extends Chain {
 
   async handleRequest(chainTarget) {
     try {
-      const { lines, users } = chainTarget
-      // const walletItems = WalletItem.initOnlyValidFromArray(this.walletItems)
+      const { lines, relatedTotalCoupons = [], users } = chainTarget
       const couponWalletItems = this.walletItems.filter((i) => i.isCoupon)
+      // for item coupon
       lines.forEach((line) => {
-        _calculateAmountByCoupons({ line, currencyCode: this.currency.code })
-        _updateRelatedCoupons(line, couponWalletItems, this.autoUseCoupon, this.currency.code)
+        _calculateAmountByItemCoupons({ line, currencyCode: this.currency.code })
+        _updateRelatedItemCoupons(line, couponWalletItems, this.autoUseCoupon, this.currency.code)
       })
       lines.forEach((line) => {
-        _getAvailableCoupons(line)
+        _getAvailableItemCoupons(line)
       })
+      // for total ptice coupon
+      _calculateAmountByTotalCoupons({ lines, currencyCode: this.currency.code, relatedTotalCoupons })
+      _autoUsedTotalCoupons({ lines, autoUseCoupon: this.autoUseCoupon, currencyCode: this.currency.code, relatedTotalCoupons})
       await this.next(chainTarget)
     } catch (err) {
-      chainTarget.addException('calculate categories limit fail', err.message)
+      chainTarget.addException('handle related coupons fail', err.message)
       this.exitChain()
     }
   }
 }
-function _calculateAmountByCoupons({ line, currencyCode }) {
+
+
+function _autoUsedTotalCoupons({ lines, autoUseCoupon, currencyCode, relatedTotalCoupons }) {
+  if (autoUseCoupon) {
+  relatedTotalCoupons.forEach((item) => {
+    const obj = _autoUsedTotalCoupon(item, lines, currencyCode)
+    Object.assign(item, obj)
+  })
+  }
+}
+
+
+function _autoUsedTotalCoupon(item, lines, currencyCode) {
+  const { availableCoupons, usedCoupons, product } = item
+  if (availableCoupons.length > 0) {
+    const availableLines = lines.filter((line) => (product.isApplicableCoupon(line.merchandise)))
+    const total = availableLines.reduce((acc, l) => {
+      const { updatedItem = {} } = l
+      const { subTotal = {} } = updatedItem
+      if (subTotal && subTotal.value) {
+        acc += subTotal.value
+      }
+      return acc
+    }, 0)
+    if (total > 0) {
+      const [coupon] = availableCoupons.splice(0, 1)
+      coupon.setOnHold()
+      usedCoupons.push(coupon)
+      _calculateAmountByOneTotalCoupon({ lines, currencyCode, coupon })
+      return _autoUsedTotalCoupon(item, lines, currencyCode)
+    }
+  }
+  return item
+}
+
+function _calculateAmountByItemCoupons({ line, currencyCode }) {
   const { usedCoupons = {}, updatedItem } = line
   Object.keys(usedCoupons).forEach((key) => {
     usedCoupons[key].forEach((coupon) => {
-      const obj = _calculateAmountByOneCoupon({ updatedItem, coupon, currencyCode })
+      const obj = _calculateAmountByOneItemCoupon({ updatedItem, coupon, currencyCode })
       Object.assign(updatedItem, obj)
     })
   })
 }
 
-function _calculateAmountByOneCoupon({ updatedItem, coupon, currencyCode }) {
+function _calculateAmountByTotalCoupons({ lines, currencyCode, relatedTotalCoupons }) {
+  relatedTotalCoupons.forEach((i) => {
+    const { usedCoupons } = i
+    usedCoupons.forEach((coupon) => {
+      _calculateAmountByOneTotalCoupon({ lines, currencyCode, coupon })
+    })
+  })
+} 
+
+function _calculateAmountByOneTotalCoupon({ lines, currencyCode, coupon }) {
+  const availableLines = lines.filter((line) => (coupon.isApplicableCoupon(line.merchandise)))
+  // const qty = availableLines.reduce((acc, i) => (acc += i.updatedItem.qty), 0)
+  const totalPrice = availableLines.reduce((acc, i) => {
+    const { price = {}, qty } = i.updatedItem || {}
+    return acc += price.value * qty
+  }, 0)
+  const { couponDetails, walletItemCode } = coupon
+  if (couponDetails) {
+    const { type, total } = couponDetails
+    const { value } = couponDetails
+    switch(type) {
+      case ('Deduction'): {
+        const _discount = q_utilities_namespaceObject.KeyValueObject.foundValueByKey(value, currencyCode)
+        availableLines.forEach((line) => {
+          const { updatedItem } = line
+          const { price, qty, discount, remarks, subTotal } = updatedItem
+          const discountValue = _discount * (price.value * qty / totalPrice) + discount.value
+          const subTotalValue = subTotal.value > _discount ? subTotal.value - _discount : 0
+          const _usedCoupons = q_utilities_namespaceObject.KeyValueObject.foundValueByKey(remarks, 'USED_TOTAL_COUPONS') || []
+          _usedCoupons.push(walletItemCode)
+          const obj = {
+            discount: Amount.init({ value: discountValue, currencyCode }),
+            remarks: q_utilities_namespaceObject.KeyValueObject.insertOrUpdateRecord(remarks, 'USED_TOTAL_COUPONS', _usedCoupons ),
+            subTotal: Amount.init({ value: subTotalValue, currencyCode })
+          }
+          Object.assign(updatedItem, obj)
+        })
+        break
+      }
+      case ('Percentage'): {
+        availableLines.forEach((line) => {
+          const { updatedItem } = line
+          const { price, qty, discount, remarks, subTotal } = updatedItem
+          const _discount = price.value * (value / 100) * qty
+          const discountValue = _discount + discount.value
+          const subTotalValue = subTotal.value > _discount ? subTotal.value - _discount : 0
+          const _usedCoupons = q_utilities_namespaceObject.KeyValueObject.foundValueByKey(remarks, 'USED_TOTAL_COUPONS') || []
+          _usedCoupons.push(walletItemCode)
+          const obj = {
+            discount: Amount.init({ value: discountValue, currencyCode }),
+            remarks: q_utilities_namespaceObject.KeyValueObject.insertOrUpdateRecord(remarks, 'USED_TOTAL_COUPONS', _usedCoupons ),
+            subTotal: Amount.init({ value: subTotalValue, currencyCode })
+          }
+          Object.assign(updatedItem, obj)
+        })
+        break
+      }
+      default: {
+        
+      }
+    }
+  }
+
+}
+
+function _calculateAmountByOneItemCoupon({ updatedItem, coupon, currencyCode }) {
   const { couponDetails, walletItemCode } = coupon
   if (!couponDetails) {
     return updatedItem
   }
   const { price, qty, discount, remarks, subTotal } = updatedItem
-  const _discount = calculateByCoupon({ coupon, price })
+  const _discount = calculateByCoupon({ coupon, price, currencyCode })
   const discountValue = _discount + discount.value
   const subTotalValue = subTotal.value > _discount ? subTotal.value - _discount : 0
   const _usedCoupons = q_utilities_namespaceObject.KeyValueObject.foundValueByKey(remarks, 'USED_ITEM_COUPONS') || []
@@ -6269,7 +7179,7 @@ function _calculateAmountByOneCoupon({ updatedItem, coupon, currencyCode }) {
 }
 
 
-function _getAvailableCoupons(line) {
+function _getAvailableItemCoupons(line) {
   const { relatedCoupons = [] } = line
   line.relatedCoupons = relatedCoupons.map((c) => ({
     ...c,
@@ -6277,7 +7187,7 @@ function _getAvailableCoupons(line) {
   }))
 }
 
-function _getRelatedCoupons(cartItemLine, couponWalletItems, autoUseCoupon, currencyCode) {
+function _getRelatedItemCoupons(cartItemLine, couponWalletItems, autoUseCoupon, currencyCode) {
   const { merchandise, usedCoupons = {}, updatedItem = {} } = cartItemLine
   const relatedWalletItems = couponWalletItems.filter(
     item => item.isApplicableCoupon(merchandise) && item.isItemCoupon
@@ -6307,7 +7217,7 @@ function _getRelatedCoupons(cartItemLine, couponWalletItems, autoUseCoupon, curr
         ...usedCoupons[productCode] || [],
         w
       ]
-      const obj = _calculateAmountByOneCoupon({ updatedItem, currencyCode, coupon: w })
+      const obj = _calculateAmountByOneItemCoupon({ updatedItem, currencyCode, coupon: w })
       Object.assign(updatedItem, obj)
       exist.usedQty = usedCoupons[productCode].length
     }
@@ -6316,9 +7226,9 @@ function _getRelatedCoupons(cartItemLine, couponWalletItems, autoUseCoupon, curr
 }
 
 
-function _updateRelatedCoupons(line, couponWalletItems, autoUseCoupon, currencyCode) {
+function _updateRelatedItemCoupons(line, couponWalletItems, autoUseCoupon, currencyCode) {
   if (couponWalletItems.length > 0) {
-    line.relatedCoupons = _getRelatedCoupons(line, couponWalletItems, autoUseCoupon, currencyCode)
+    line.relatedCoupons = _getRelatedItemCoupons(line, couponWalletItems, autoUseCoupon, currencyCode)
   }
 }
 
@@ -6340,6 +7250,7 @@ function _updateRelatedCoupons(line, couponWalletItems, autoUseCoupon, currencyC
 
 
 
+
 ;// ./lib/helpers/corHelper/chainException.js
 
 class ChainException {
@@ -6448,12 +7359,15 @@ class ChainTargetCalculateAmount extends ChainTarget {
   constructor(options = {}) {
     super(options)
     this.lines = options.lines
+    this.relatedTotalCoupons = options.relatedTotalCoupons
     this.user = options.user
   }
 
   getResult() {
     return {
-      lines: this.lines
+      lines: this.lines,
+      relatedTotalCoupons: this.relatedTotalCoupons
+
     }
   }
 }
@@ -6589,10 +7503,11 @@ class ChainManagerFactory {
   static calculateAmount({ chains = [], payload = {}, serviceAppName }) {
     const {
       lines,
+      relatedTotalCoupons,
       user,
     } = payload
     // const chains = _calculateAmountChainsFactory(payload)
-    const chainTarget = new ChainTargetCalculateAmount({ lines, user })
+    const chainTarget = new ChainTargetCalculateAmount({ lines, relatedTotalCoupons, user })
     const chainManager = new ChainManager({ chainTarget })
     chainManager.createChains({ chains })
     return chainManager
@@ -6626,6 +7541,7 @@ function _calculateAmountChainsFactory(payload) {
       currency, dateTime, entitlements, merchandises
     }),
     new ChainRelatedCoupons({ currency, autoUseCoupon, walletItems }),
+    new ChainPriceAdjustment({ currency }),
   ]
 }
 
@@ -6660,11 +7576,12 @@ function _calculateAmountChainsFactoryforGroup(payload) {
 
 
 ;// ./lib/helpers/adminSettle/adminSettle.js
-function adminSettle({ component, eventRegistration, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
+function adminSettle({ adminSettleFormData = {}, component, eventRegistration, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
   const _eventRegistration = eventRegistration || component.registration
   component.invoice = invoice
   component.adminSettleFormData = {
     ...invoice,
+    ...adminSettleFormData,
     email: _eventRegistration ? _eventRegistration.getEmail() || '' : '',
     payeeName,
     payeeAddress,
@@ -6768,11 +7685,6 @@ function getFakeClass() {
 
 
 
-;// ./lib/helpers/calculateByCoupon/index.js
-
-
-
-
 ;// ./lib/helpers/corHelper/index.js
 
 
@@ -7087,6 +7999,7 @@ function convert(date, dateFormat) {
 
 
 
+let _config = null
 let _isAdmin = null
 let _label = {}
 let orderList_self = null
@@ -7137,6 +8050,17 @@ function actionBuilder(row, header, qRow) {
         label: _label.ADMIN_SETTLE,
         onClick: orderList_self.onOrderListAction('adminSettle')
       })
+      if (_config && _config.allowWaived) {
+        actions.push({
+          css: {
+            element: '__button'
+          },
+          icon: 'fa fa-edit',
+          label: _label.WAIVED,
+          onClick: orderList_self.onOrderListAction('waived')
+        })
+      }
+      
     }
     actions.push({
       css: {
@@ -7235,9 +8159,10 @@ function handlerHeaders(defaultHeaders) {
 }
 
 function handlerOrderList({
-  component, merchandises, invoices, defaultHeaders, isAdmin, label = {}
+  component, config, merchandises, invoices, defaultHeaders, isAdmin, label = {}
 }) {
   orderList_self = component
+  _config = config
   _isAdmin = isAdmin
   _label = label.button || {}
   const orderList = qListArr(merchandises, invoices)