@stacksjs/defaults 0.75.38 → 0.75.41

package/resources/views/checkout/payment.stx

@@ -14,6 +14,7 @@ interface CartSummaryRow {
 // migration creates any but `id` (see app/Storefront/StorefrontDatabase.ts).
 interface CartRow {
   id: number
+  currency: string | null
   email: string | null
   shipping_name: string | null
   shipping_address: string | null
@@ -26,6 +27,7 @@ interface StorefrontLineItem { lineTotal: number }
 
 const { verifyCartCookie } = require('../../../app/Storefront/CartCookie')
 const { readStorefront } = require('../../../app/Storefront/StorefrontDatabase')
+const { storefrontCurrency, storefrontMoney, storefrontSummary } = require('../../../app/Storefront/StorefrontMoney')
 
 // Signed by the storefront actions as the token, a dot and its HMAC. An
 // unsigned or tampered cookie is no cart, and is never looked up.
@@ -37,6 +39,8 @@ const found = token
       if (!row)
         return { cart: null, items: [] }
 
+      // Every amount below is integer minor units of the cart's currency.
+      const currency = storefrontCurrency(row.currency)
       const lines = db.query<CartSummaryRow, [number]>(`
         SELECT product_name, quantity, total_price
         FROM cart_items WHERE cart_id = ?1 ORDER BY id ASC
@@ -47,7 +51,7 @@ const found = token
           name: line.product_name,
           qty,
           lineTotal,
-          lineTotalLabel: `$${lineTotal.toFixed(2)}`,
+          lineTotalLabel: storefrontMoney(lineTotal, currency),
         }
       })
 
@@ -58,19 +62,15 @@ const found = token
 const cart = found.cart
 const items = found.items
 
-const FREE_SHIPPING_THRESHOLD = Number(process.env.STOREFRONT_FREE_SHIPPING_THRESHOLD ?? 40) || 40
-const FLAT_SHIPPING = Number(process.env.STOREFRONT_FLAT_SHIPPING ?? 5) || 5
+// The same shipping rule PlaceOrderAction charges with
+// (app/Actions/Storefront/_shipping.ts), in minor units, so the running
+// totals on every checkout step match what gets charged.
 const subtotal = items.reduce((s: number, i: StorefrontLineItem) => s + i.lineTotal, 0)
-const shipping = subtotal <= 0 ? 0 : (subtotal >= FREE_SHIPPING_THRESHOLD ? 0 : FLAT_SHIPPING)
-const total = subtotal + shipping
-const remainingForFree = Math.max(0, FREE_SHIPPING_THRESHOLD - subtotal)
-
-const subtotalLabel = `$${subtotal.toFixed(2)}`
-const shippingLabel = shipping === 0 ? 'Free' : `$${shipping.toFixed(2)}`
-const totalLabel = `$${total.toFixed(2)}`
-const freeShippingNote = (shipping > 0 && remainingForFree > 0)
-  ? `Add $${remainingForFree.toFixed(2)} more for free shipping.`
-  : ''
+const summary = storefrontSummary(subtotal, storefrontCurrency(cart?.currency))
+const subtotalLabel = summary.subtotalLabel
+const shippingLabel = summary.shippingLabel
+const totalLabel = summary.totalLabel
+const freeShippingNote = summary.freeShippingNote
 
 const ready = !!cart?.email && !!cart?.shipping_name && !!cart?.shipping_address
 </script>

package/resources/views/checkout/shipping.stx

@@ -14,6 +14,7 @@ interface CartSummaryRow {
 // migration creates any but `id` (see app/Storefront/StorefrontDatabase.ts).
 interface CartRow {
   id: number
+  currency: string | null
   email: string | null
   shipping_name: string | null
   shipping_address: string | null
@@ -26,6 +27,7 @@ interface StorefrontLineItem { lineTotal: number }
 
 const { verifyCartCookie } = require('../../../app/Storefront/CartCookie')
 const { readStorefront } = require('../../../app/Storefront/StorefrontDatabase')
+const { storefrontCurrency, storefrontMoney, storefrontSummary } = require('../../../app/Storefront/StorefrontMoney')
 
 // Signed by the storefront actions as the token, a dot and its HMAC. An
 // unsigned or tampered cookie is no cart, and is never looked up.
@@ -37,6 +39,8 @@ const found = token
       if (!row)
         return { cart: null, items: [] }
 
+      // Every amount below is integer minor units of the cart's currency.
+      const currency = storefrontCurrency(row.currency)
       const lines = db.query<CartSummaryRow, [number]>(`
         SELECT product_name, quantity, total_price
         FROM cart_items WHERE cart_id = ?1 ORDER BY id ASC
@@ -47,7 +51,7 @@ const found = token
           name: line.product_name,
           qty,
           lineTotal,
-          lineTotalLabel: `$${lineTotal.toFixed(2)}`,
+          lineTotalLabel: storefrontMoney(lineTotal, currency),
         }
       })
 
@@ -58,19 +62,15 @@ const found = token
 const cart = found.cart
 const items = found.items
 
-const FREE_SHIPPING_THRESHOLD = Number(process.env.STOREFRONT_FREE_SHIPPING_THRESHOLD ?? 40) || 40
-const FLAT_SHIPPING = Number(process.env.STOREFRONT_FLAT_SHIPPING ?? 5) || 5
+// The same shipping rule PlaceOrderAction charges with
+// (app/Actions/Storefront/_shipping.ts), in minor units, so the running
+// totals on every checkout step match what gets charged.
 const subtotal = items.reduce((s: number, i: StorefrontLineItem) => s + i.lineTotal, 0)
-const shipping = subtotal <= 0 ? 0 : (subtotal >= FREE_SHIPPING_THRESHOLD ? 0 : FLAT_SHIPPING)
-const total = subtotal + shipping
-const remainingForFree = Math.max(0, FREE_SHIPPING_THRESHOLD - subtotal)
-
-const subtotalLabel = `$${subtotal.toFixed(2)}`
-const shippingLabel = shipping === 0 ? 'Free' : `$${shipping.toFixed(2)}`
-const totalLabel = `$${total.toFixed(2)}`
-const freeShippingNote = (shipping > 0 && remainingForFree > 0)
-  ? `Add $${remainingForFree.toFixed(2)} more for free shipping.`
-  : ''
+const summary = storefrontSummary(subtotal, storefrontCurrency(cart?.currency))
+const subtotalLabel = summary.subtotalLabel
+const shippingLabel = summary.shippingLabel
+const totalLabel = summary.totalLabel
+const freeShippingNote = summary.freeShippingNote
 
 const ship = {
   name: cart?.shipping_name || '',

package/resources/views/cms/blocks/form.stx

@@ -8,6 +8,7 @@
 <div class="cms-form mx-auto max-w-xl px-6 py-8" data-form-uuid="{{ props.formUuid }}">
   <script client>
   import type { PublicFormDefinition, PublicFormField, SubmissionErrors } from '@stacksjs/forms'
+  import { moneyInputError, moneyInputStep, parseMoneyInput } from '@stacksjs/commerce/money'
 
   // `_form` carries a whole-form failure; the rest are keyed by field name.
   type FormErrors = SubmissionErrors & { _form?: string }
@@ -114,6 +115,54 @@
     }
   }
 
+  /**
+   * The currency a `currency` field is typed in: the form's payment currency,
+   * or USD, which is what the server's public definition defaults to.
+   */
+  function formCurrency(): string {
+    return definition()?.payment?.currency ?? 'USD'
+  }
+
+  /** What a text-like input records: the typed text, or minor units for a `currency` field. */
+  function setInput(field: PublicFormField, raw: string): void {
+    if (field.type === 'currency')
+      setAmount(field, raw)
+    else
+      values[field.name] = raw
+  }
+
+  /**
+   * Record what was typed into a `currency` field as integer minor units.
+   *
+   * The server takes a currency field as a whole number of minor units
+   * (`"19.99"` in USD is `1999`). This used to multiply the typed float by
+   * a hundred and round, which is float math (`1.005` came out as 100 cents,
+   * not 101), assumed two decimals for every currency, and turned an empty
+   * field into 0. The conversion is `@stacksjs/commerce/money`'s, at the
+   * form currency's precision.
+   *
+   * An amount the currency cannot hold (`19.999` in USD) is kept as typed and
+   * shown as an error, rather than rounded into a different amount, and the
+   * server rejects it on submit as well.
+   */
+  function setAmount(field: PublicFormField, raw: string): void {
+    const currency = formCurrency()
+    const error = moneyInputError(raw, currency, { required: false })
+    if (error) {
+      values[field.name] = raw
+      errors.set({ ...errors(), [field.name]: error })
+      return
+    }
+
+    const minor = parseMoneyInput(raw, currency, { required: false })
+    if (minor === null)
+      delete values[field.name]
+    else
+      values[field.name] = minor
+    if (errors()[field.name])
+      errors.set({ ...errors(), [field.name]: '' })
+  }
+
   /**
    * The `accept` attribute for a field's picker.
    *
@@ -210,7 +259,7 @@
                 <p :if="uploading[field.name]" class="mt-1.5 text-[13px] text-gray-500">Uploading...</p>
                 <p :else-if="attached[field.name]" class="mt-1.5 text-[13px] text-green-700">Attached {{ attached[field.name] }}</p>
               </div>
-              <input :else type="{{ field.type === 'email' ? 'email' : (field.type === 'phone' ? 'tel' : (field.type === 'date' ? 'date' : (field.type === 'currency' ? 'number' : 'text'))) }}" :required="field.required" placeholder="{{ field.options.placeholder ?? '' }}" @input="values[field.name] = field.type === 'currency' ? Math.round(Number($event.target.value) * 100) : $event.target.value" class="mt-1.5 w-full rounded-lg border border-gray-300 px-3.5 py-2.5 text-[15px]">
+              <input :else type="{{ field.type === 'email' ? 'email' : (field.type === 'phone' ? 'tel' : (field.type === 'date' ? 'date' : (field.type === 'currency' ? 'number' : 'text'))) }}" :required="field.required" placeholder="{{ field.options.placeholder ?? '' }}" :step="field.type === 'currency' ? moneyInputStep(formCurrency()) : null" @input="setInput(field, $event.target.value)" class="mt-1.5 w-full rounded-lg border border-gray-300 px-3.5 py-2.5 text-[15px]">
               <p :if="errors()[field.name]" class="mt-1.5 text-[13px] text-red-600">{{ errors()[field.name] }}</p>
             </template>
           </div>

package/resources/views/orders/[id].stx

@@ -18,6 +18,7 @@ interface StorefrontLineItem { lineTotal: number }
 
 const Database = require('bun:sqlite').Database
 const path = require('path')
+const { storefrontCurrency, storefrontMoney } = require('../../../app/Storefront/StorefrontMoney')
 
 const dbPath = path.resolve(process.cwd(), process.env.DB_DATABASE_PATH || 'database/stacks.sqlite')
 const db = new Database(dbPath, { readonly: true })
@@ -36,6 +37,10 @@ const order = orderId
     `).get(orderId)
   : null
 
+// Every amount is integer minor units of the order's currency (1999 is
+// $19.99): `order_items.price`, `orders.delivery_fee` and `orders.total_amount`.
+const currency = storefrontCurrency(order?.currency)
+
 const items = order
   ? db.query(`
       SELECT oi.quantity, oi.price, p.name, p.image_url, p.slug, p.weight_grams
@@ -51,12 +56,16 @@ const items = order
       qty: Number(row.quantity),
       price: Number(row.price),
       lineTotal: Number(row.quantity) * Number(row.price),
+      lineTotalLabel: storefrontMoney(Number(row.quantity) * Number(row.price), currency),
     }))
   : []
 
 const subtotal = items.reduce((s: number, i: StorefrontLineItem) => s + i.lineTotal, 0)
 const shipping = order ? Number(order.delivery_fee || 0) : 0
 const total = order ? Number(order.total_amount || 0) : 0
+const subtotalLabel = storefrontMoney(subtotal, currency)
+const shippingLabel = shipping === 0 ? 'Free' : storefrontMoney(shipping, currency)
+const totalLabel = storefrontMoney(total, currency)
 </script>
 
 @section('content')
@@ -90,7 +99,7 @@ const total = order ? Number(order.total_amount || 0) : 0
                 <p class="font-semibold text-stone-900">{{ item.name }}</p>
                 <p class="text-stone-500 text-xs">{{ item.weight }} · qty {{ item.qty }}</p>
               </div>
-              <p class="font-semibold text-stone-900">${{ item.lineTotal.toFixed(2) }}</p>
+              <p class="font-semibold text-stone-900">{{ item.lineTotalLabel }}</p>
             </li>
           @endforeach
         </ul>
@@ -98,9 +107,9 @@ const total = order ? Number(order.total_amount || 0) : 0
         <hr class="my-6 border-stone-200">
 
         <dl class="space-y-2 text-sm">
-          <div class="flex justify-between"><dt class="text-stone-600">Subtotal</dt><dd class="font-semibold text-stone-900">${{ subtotal.toFixed(2) }}</dd></div>
-          <div class="flex justify-between"><dt class="text-stone-600">Shipping</dt><dd class="font-semibold text-stone-900">{{ shipping === 0 ? 'Free' : `$${shipping.toFixed(2)}` }}</dd></div>
-          <div class="flex justify-between pt-2 text-base border-stone-200 border-t"><dt class="font-semibold text-stone-900">Total</dt><dd class="font-bold text-stone-900">${{ total.toFixed(2) }}</dd></div>
+          <div class="flex justify-between"><dt class="text-stone-600">Subtotal</dt><dd class="font-semibold text-stone-900">{{ subtotalLabel }}</dd></div>
+          <div class="flex justify-between"><dt class="text-stone-600">Shipping</dt><dd class="font-semibold text-stone-900">{{ shippingLabel }}</dd></div>
+          <div class="flex justify-between pt-2 text-base border-stone-200 border-t"><dt class="font-semibold text-stone-900">Total</dt><dd class="font-bold text-stone-900">{{ totalLabel }}</dd></div>
         </dl>
 
         <div class="mt-6 p-4 text-sm bg-stone-100 rounded-xl">

package/vcs/github/workflows/buddy-bot.yml

@@ -83,9 +83,9 @@ jobs:
           persist-credentials: true
 
       - name: Setup Pantry
-        uses: pantry-pm/pantry/packages/action@fa35547da630b14beda5b26a2625490864d5c963 # v0.11.60
+        uses: pantry-pm/pantry/packages/action@bc2f37441f1a7ed160c201bbe6e0552b81ca931e # v0.11.65
         with:
-          version: '0.11.60'
+          version: '0.11.65'
           install: 'false'
 
       - name: Install Dependencies
@@ -98,12 +98,12 @@ jobs:
 
       - name: Open and refresh update pull requests
         if: ${{ github.event.schedule == '0 */2 * * *' || (github.event_name == 'workflow_dispatch' && contains(fromJSON('["all", "update"]'), inputs.job)) }}
-        run: bunx buddy-bot update --strategy "${{ inputs.strategy || 'patch' }}" ${{ inputs.dry_run && '--dry-run' || '' }}
+        run: bunx @buddysh/buddy update --strategy "${{ inputs.strategy || 'patch' }}" ${{ inputs.dry_run && '--dry-run' || '' }}
 
       - name: Update the dependency dashboard
         if: ${{ github.event.schedule == '15 */2 * * *' || (github.event_name == 'workflow_dispatch' && contains(fromJSON('["all", "dashboard"]'), inputs.job)) }}
-        run: bunx buddy-bot dashboard ${{ inputs.dry_run && '--dry-run' || '' }}
+        run: bunx @buddysh/buddy dashboard ${{ inputs.dry_run && '--dry-run' || '' }}
 
       - name: Close landed pull requests and clean up branches
         if: ${{ github.event.schedule == '0 4 * * *' || (github.event_name == 'workflow_dispatch' && contains(fromJSON('["all", "check"]'), inputs.job)) }}
-        run: bunx buddy-bot update-check ${{ inputs.dry_run && '--dry-run' || '' }}
+        run: bunx @buddysh/buddy update-check ${{ inputs.dry_run && '--dry-run' || '' }}

package/vcs/github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Pantry
-        uses: pantry-pm/pantry/packages/action@fa35547da630b14beda5b26a2625490864d5c963 # v0.11.60
+        uses: pantry-pm/pantry/packages/action@bc2f37441f1a7ed160c201bbe6e0552b81ca931e # v0.11.65
         with:
           install: 'false'
 
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Pantry
-        uses: pantry-pm/pantry/packages/action@fa35547da630b14beda5b26a2625490864d5c963 # v0.11.60
+        uses: pantry-pm/pantry/packages/action@bc2f37441f1a7ed160c201bbe6e0552b81ca931e # v0.11.65
         with:
           install: 'false'
 
@@ -99,7 +99,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Pantry
-        uses: pantry-pm/pantry/packages/action@fa35547da630b14beda5b26a2625490864d5c963 # v0.11.60
+        uses: pantry-pm/pantry/packages/action@bc2f37441f1a7ed160c201bbe6e0552b81ca931e # v0.11.65
         with:
           install: 'false'
 

package/vcs/github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Pantry
-        uses: pantry-pm/pantry/packages/action@fa35547da630b14beda5b26a2625490864d5c963 # v0.11.60
+        uses: pantry-pm/pantry/packages/action@bc2f37441f1a7ed160c201bbe6e0552b81ca931e # v0.11.65
         with:
           install: 'false'