@questwork/q-store-model 0.1.36 → 0.1.38

package/.github/workflows/publish.yml

@@ -0,0 +1,46 @@
+name: Publish to npm on Tag
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    # environment: production
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Needed to get tag information
+      
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          registry-url: https://registry.npmjs.org/
+          cache: 'pnpm'
+      
+      - name: Install dependencies
+        run: pnpm install
+      
+      - name: Build
+        run: |
+          BUILD_COMMAND=$(node -p "(require('./package.json').scripts || {}).build")
+          if [ "$BUILD_COMMAND" = "undefined" ]; then
+            echo "::notice::Can't find a build script in package.json, skip."
+          else
+            pnpm run build
+          fi
+      
+      - name: Publish to npm
+        # if: steps.version-check.outputs.should_publish == 'true'
+        run: pnpm publish --no-git-checks --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.QW_NPM_TOKEN }}

package/dist/index.min.cjs

@@ -1809,12 +1809,14 @@ 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.name = options.name || ''
     this.prices = this._Price.initOnlyValidFromArray(options.prices)
     this.productCodes = options.productCodes || []
     this.priority = options.priority || 100
     this.sku = options.sku || ''
     this.stock = options.stock || 0
+    this.targets = options.targets || []
   }
 
   // Class Mehtods
@@ -1884,6 +1886,12 @@ class Merchandise extends q_utilities_namespaceObject.TenantAwareEntity {
   get isAvailableByDate() {
     return !this.afterEnd && !this.beforeBegin
   }
+  get isForPersonal() {
+    return !Array.isArray(this.targets) || this.targets.length === 0
+  }
+  get isForGroup() {
+    return Array.isArray(this.targets) && this.targets.includes('GROUP')
+  }
   get isPrintable() {
     return this.printOut.isPrintable
   }
@@ -2431,6 +2439,7 @@ class Status {
     this.onHold = options.onHold || null
     this.processing = options.processing || null
     this.paid = options.paid || null
+    this.payLater = options.payLater || null
     this.pending = options.pending
     this.redeemed = options.redeemed || null
     this.refunded = options.refunded || null
@@ -2438,6 +2447,7 @@ class Status {
     this.rejected = options.rejected || null
     this.shared = options.shared || null
     this.submitted = options.submitted || null
+    this.terminated = options.terminated || null
     this.used = options.used || null
     this.waived = options.waived || null
   }
@@ -2510,6 +2520,9 @@ class Status {
   get isPaid() {
     return this.paid !== null
   }
+  get isPayLater() {
+    return this.payLater !== null
+  }
   get isPending() {
     return !this.isSettled && !this.isCancelled && !this.isRefundRequested
   }
@@ -2534,6 +2547,9 @@ class Status {
   get isSubmitted() {
     return this.submitted !== null
   }
+  get isTerminated() {
+    return this.terminated !== null
+  }
   get isUsed() {
     return this.used !== null
   }
@@ -2633,6 +2649,10 @@ class Status {
     this.waived = null
     return this
   }
+  setPayLater(value) {
+    this.payLater = value || (new Date()).valueOf()
+    return this
+  }
   setPending(value) {
     this.pending = value || (new Date()).valueOf()
     return this
@@ -2661,6 +2681,10 @@ class Status {
     this.submitted = value || (new Date()).valueOf()
     return this
   }
+  setTerminated(value) {
+    this.terminated = value || (new Date()).valueOf()
+    return this
+  }
   setUsed(value) {
     this.used = value || (new Date()).valueOf()
     this.delivered = this.delivered || this.used
@@ -2910,6 +2934,9 @@ class Cart extends q_utilities_namespaceObject.TenantAwareEntity {
   //   }, [])
   //   return initWalletItems
   // }
+  getRelatedRegistrationGroupCode() {
+    return q_utilities_namespaceObject.KeyValueObject.getValueByKey(this.remarks || [], 'registrationGroupCode')
+  }
   setCartItems(cartItems) {
     this.cartItems = this._CartItem.initOnlyValidFromArray(cartItems)
     return this
@@ -5406,7 +5433,7 @@ class ChainCategoryLimit extends Chain {
 function groupCategory(categories = [], walletItems = []) {
   return categories.reduce((acc, category) => {
     const {
-      categoryCode, name, max, min, productCodes = [],
+      categoryCode, codes, name, max, min, productCodes = [],
     } = category
     const filtered = walletItems.filter((w) => {
       if (w.status.cancelled !== null) {
@@ -5416,6 +5443,7 @@ function groupCategory(categories = [], walletItems = []) {
     })
     acc.push({
       categoryCode,
+      codes,
       max,
       min,
       name,
@@ -5431,7 +5459,7 @@ function handleCategory(line, groupedCategory) {
   const { productsQty, updatedItem } = line
   // const productsQty = merchandise.getProductsQty(item.qty)
   Object.keys(productsQty).forEach((key) => {
-    const found = groupedCategory.find((g) => g.productCodes.includes(key))
+    const found = groupedCategory.find((g) => g.productCodes.includes(key) && g.codes.includes(updatedItem.merchandiseCode))
     if (found) {
       const balance = found.max - (found.used + found.owned)
       if (balance === 0) {
@@ -6632,11 +6660,12 @@ function _calculateAmountChainsFactoryforGroup(payload) {
 
 
 ;// ./lib/helpers/adminSettle/adminSettle.js
-function adminSettle({ component, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
+function adminSettle({ component, eventRegistration, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
+  const _eventRegistration = eventRegistration || component.registration
   component.invoice = invoice
   component.adminSettleFormData = {
     ...invoice,
-    email: component.registration ? component.registration.getEmail() || '' : '',
+    email: _eventRegistration ? _eventRegistration.getEmail() || '' : '',
     payeeName,
     payeeAddress,
     payeeCountry,

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

@@ -1847,12 +1847,14 @@ class Merchandise extends q_utilities_.TenantAwareEntity {
     this.merchandiseCategoryCodes = options.merchandiseCategoryCodes || []
     this.merchandiseCode = merchandise_setCode(options, 'merchandiseCode')
     this.merchandiseOptions = initMerchandiseOptions(this, options)
+    this.merchandiseType = options.merchandiseType || 'merchandise'
     this.name = options.name || ''
     this.prices = this._Price.initOnlyValidFromArray(options.prices)
     this.productCodes = options.productCodes || []
     this.priority = options.priority || 100
     this.sku = options.sku || ''
     this.stock = options.stock || 0
+    this.targets = options.targets || []
   }
 
   // Class Mehtods
@@ -1922,6 +1924,12 @@ class Merchandise extends q_utilities_.TenantAwareEntity {
   get isAvailableByDate() {
     return !this.afterEnd && !this.beforeBegin
   }
+  get isForPersonal() {
+    return !Array.isArray(this.targets) || this.targets.length === 0
+  }
+  get isForGroup() {
+    return Array.isArray(this.targets) && this.targets.includes('GROUP')
+  }
   get isPrintable() {
     return this.printOut.isPrintable
   }
@@ -2469,6 +2477,7 @@ class Status {
     this.onHold = options.onHold || null
     this.processing = options.processing || null
     this.paid = options.paid || null
+    this.payLater = options.payLater || null
     this.pending = options.pending
     this.redeemed = options.redeemed || null
     this.refunded = options.refunded || null
@@ -2476,6 +2485,7 @@ class Status {
     this.rejected = options.rejected || null
     this.shared = options.shared || null
     this.submitted = options.submitted || null
+    this.terminated = options.terminated || null
     this.used = options.used || null
     this.waived = options.waived || null
   }
@@ -2548,6 +2558,9 @@ class Status {
   get isPaid() {
     return this.paid !== null
   }
+  get isPayLater() {
+    return this.payLater !== null
+  }
   get isPending() {
     return !this.isSettled && !this.isCancelled && !this.isRefundRequested
   }
@@ -2572,6 +2585,9 @@ class Status {
   get isSubmitted() {
     return this.submitted !== null
   }
+  get isTerminated() {
+    return this.terminated !== null
+  }
   get isUsed() {
     return this.used !== null
   }
@@ -2671,6 +2687,10 @@ class Status {
     this.waived = null
     return this
   }
+  setPayLater(value) {
+    this.payLater = value || (new Date()).valueOf()
+    return this
+  }
   setPending(value) {
     this.pending = value || (new Date()).valueOf()
     return this
@@ -2699,6 +2719,10 @@ class Status {
     this.submitted = value || (new Date()).valueOf()
     return this
   }
+  setTerminated(value) {
+    this.terminated = value || (new Date()).valueOf()
+    return this
+  }
   setUsed(value) {
     this.used = value || (new Date()).valueOf()
     this.delivered = this.delivered || this.used
@@ -2948,6 +2972,9 @@ class Cart extends q_utilities_.TenantAwareEntity {
   //   }, [])
   //   return initWalletItems
   // }
+  getRelatedRegistrationGroupCode() {
+    return q_utilities_.KeyValueObject.getValueByKey(this.remarks || [], 'registrationGroupCode')
+  }
   setCartItems(cartItems) {
     this.cartItems = this._CartItem.initOnlyValidFromArray(cartItems)
     return this
@@ -5444,7 +5471,7 @@ class ChainCategoryLimit extends Chain {
 function groupCategory(categories = [], walletItems = []) {
   return categories.reduce((acc, category) => {
     const {
-      categoryCode, name, max, min, productCodes = [],
+      categoryCode, codes, name, max, min, productCodes = [],
     } = category
     const filtered = walletItems.filter((w) => {
       if (w.status.cancelled !== null) {
@@ -5454,6 +5481,7 @@ function groupCategory(categories = [], walletItems = []) {
     })
     acc.push({
       categoryCode,
+      codes,
       max,
       min,
       name,
@@ -5469,7 +5497,7 @@ function handleCategory(line, groupedCategory) {
   const { productsQty, updatedItem } = line
   // const productsQty = merchandise.getProductsQty(item.qty)
   Object.keys(productsQty).forEach((key) => {
-    const found = groupedCategory.find((g) => g.productCodes.includes(key))
+    const found = groupedCategory.find((g) => g.productCodes.includes(key) && g.codes.includes(updatedItem.merchandiseCode))
     if (found) {
       const balance = found.max - (found.used + found.owned)
       if (balance === 0) {
@@ -6670,11 +6698,12 @@ function _calculateAmountChainsFactoryforGroup(payload) {
 
 
 ;// ./lib/helpers/adminSettle/adminSettle.js
-function adminSettle({ component, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
+function adminSettle({ component, eventRegistration, invoice, payeeName, payeeAddress, payeeCountry, cb }) {
+  const _eventRegistration = eventRegistration || component.registration
   component.invoice = invoice
   component.adminSettleFormData = {
     ...invoice,
-    email: component.registration ? component.registration.getEmail() || '' : '',
+    email: _eventRegistration ? _eventRegistration.getEmail() || '' : '',
     payeeName,
     payeeAddress,
     payeeCountry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/q-store-model",
-  "version": "0.1.36",
+  "version": "0.1.38",
   "description": "Questwork QStore Model",
   "type": "module",
   "exports": {
@@ -9,13 +9,6 @@
       "default": "./dist/q-store-model.min.js"
     }
   },
-  "scripts": {
-    "build": "cross-env NODE_ENV=production minimize=false gulp",
-    "build:umd": "cross-env NODE_ENV=production minimize=false gulp umd",
-    "build:wp": "cross-env NODE_ENV=production minimize=false gulp wp",
-    "lint": "eslint .",
-    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
-  },
   "author": {
     "name": "Questwork Consulting Limited",
     "email": "info@questwork.com",
@@ -44,5 +37,12 @@
   },
   "engines": {
     "node": ">=10.0.0"
+  },
+  "scripts": {
+    "build": "cross-env NODE_ENV=production minimize=false gulp",
+    "build:umd": "cross-env NODE_ENV=production minimize=false gulp umd",
+    "build:wp": "cross-env NODE_ENV=production minimize=false gulp wp",
+    "lint": "eslint .",
+    "test:models": "NODE_ENV=test mocha --exit 'lib/models/test.setup.js' 'lib/models/**/*.spec.js'"
   }
-}
+}