washday-sdk 1.6.67 → 1.6.69

package/dist/api/order/post.js

@@ -136,6 +136,7 @@ export const payAndCollect = function (params) {
                 headers: { Authorization: `Bearer ${this.apiToken}` }
             };
             return yield this.axiosInstance.post(PAY_AND_COLLECT(params.sequence, params.storeId), {
+                orderId: params.orderId,
                 paymentMethod: params.paymentMethod,
                 cashierBoxId: params.cashierBoxId,
                 amount: params.amount,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "washday-sdk",
-  "version": "1.6.67",
+  "version": "1.6.69",
   "description": "Washday utilities functions and API",
   "main": "dist/index.js",
   "type": "module",

package/src/api/order/post.ts

@@ -138,6 +138,7 @@ export const setOrderUncollected = async function (this: WashdayClientInstance,
 };
 
 export const payAndCollect = async function (this: WashdayClientInstance, params: {
+    orderId?: string;
     sequence: string;
     storeId: string;
     paymentMethod: string;
@@ -156,6 +157,7 @@ export const payAndCollect = async function (this: WashdayClientInstance, params
         return await this.axiosInstance.post(
             PAY_AND_COLLECT(params.sequence, params.storeId),
             {
+                orderId: params.orderId,
                 paymentMethod: params.paymentMethod,
                 cashierBoxId: params.cashierBoxId,
                 amount: params.amount,

package/src/api/order/put.ts

@@ -36,6 +36,7 @@ export const updatePaymentLineById = async function (this: WashdayClientInstance
 };
 
 export const setOrderCancelledBySequence = async function (this: WashdayClientInstance, sequence: string, storeId: string, data: {
+    orderId?: string,
     cancelledDateTime: string
 }): Promise<any> {
     try {
@@ -82,6 +83,7 @@ export const setOrderCleanedBySequence = async function (this: WashdayClientInst
 };
 
 export const setOrderCollectedBySequence = async function (this: WashdayClientInstance, sequence: string, storeId: string, data: {
+    orderId?: string,
     collectedDateTime: string;
     collectWithAmountDue?: boolean,
     pinUserId?: string

package/test/orders.orderIdFallbackBody.test.ts

@@ -0,0 +1,49 @@
+import { payAndCollect } from "../src/api/order/post";
+import { setOrderCancelledBySequence } from "../src/api/order/put";
+
+describe("orders orderId body fallback", () => {
+  it("sends orderId in payAndCollect body while keeping sequence/store route", async () => {
+    const post = jest.fn().mockResolvedValue({ data: { ok: true } });
+    const client = {
+      apiToken: "token-123",
+      axiosInstance: { post },
+    } as any;
+
+    await payAndCollect.call(client, {
+      orderId: "order-1",
+      sequence: "4",
+      storeId: "store-1",
+      paymentMethod: "card",
+      amount: 25,
+    });
+
+    expect(post).toHaveBeenCalledWith(
+      "/api/v2/order/4/store-1/pay-and-collect",
+      expect.objectContaining({ orderId: "order-1" }),
+      {
+        headers: { Authorization: "Bearer token-123" },
+      }
+    );
+  });
+
+  it("sends orderId in setOrderCancelledBySequence body", async () => {
+    const put = jest.fn().mockResolvedValue({ data: { data: true } });
+    const client = {
+      apiToken: "token-123",
+      axiosInstance: { put },
+    } as any;
+
+    await setOrderCancelledBySequence.call(client, "4", "store-1", {
+      orderId: "order-1",
+      cancelledDateTime: "2026-06-05T00:00:00.000Z",
+    });
+
+    expect(put).toHaveBeenCalledWith(
+      "api/order/4/store-1/cancelled",
+      expect.objectContaining({ orderId: "order-1" }),
+      {
+        headers: { Authorization: "Bearer token-123" },
+      }
+    );
+  });
+});

package/test/sdk.publishWorkflow.test.ts

@@ -0,0 +1,27 @@
+import fs from "fs";
+import path from "path";
+
+const repoRoot = path.resolve(__dirname, "../../..");
+const workflowPath = path.join(repoRoot, ".github/workflows/sdk-publish.yml");
+
+describe("sdk publish workflow", () => {
+  it("is manually runnable and bumps patch before publishing", () => {
+    expect(fs.existsSync(workflowPath)).toBe(true);
+
+    const workflow = fs.readFileSync(workflowPath, "utf8");
+
+    expect(workflow).toContain("workflow_dispatch:");
+    expect(workflow).not.toContain("push:");
+    expect(workflow).toContain("contents: write");
+    expect(workflow).toContain("id-token: write");
+    expect(workflow).toContain("working-directory: packages/sdk");
+    expect(workflow).toContain("registry-url: https://registry.npmjs.org");
+    expect(workflow).toContain('npm view "$PACKAGE_NAME@$CURRENT_VERSION" version');
+    expect(workflow).toContain("npm version patch --no-git-tag-version");
+    expect(workflow).toContain("git commit -m \"chore(sdk): bump patch version for publish\"");
+    expect(workflow).toContain("git push origin HEAD:main");
+    expect(workflow).toContain("npm publish --access public --no-provenance");
+    expect(workflow).not.toContain("NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}");
+    expect(workflow).not.toContain('NPM_CONFIG_PROVENANCE: "false"');
+  });
+});

package/.github/workflows/bump-version-pr.yml

@@ -1,58 +0,0 @@
-name: Bump Version on PR
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-    branches:
-      - main
-
-permissions:
-  contents: write
-
-jobs:
-  bump-version:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.base.ref == 'main'
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Use Node.js 24
-        uses: actions/setup-node@v4
-        with:
-          node-version: 24
-
-      - name: Configure git identity
-        run: |
-          git config --global user.name "washday-bot"
-          git config --global user.email "ci@washday.dev"
-
-      - name: Fetch main branch
-        run: git fetch origin main:main
-
-      - name: Check if version already bumped
-        id: check_version
-        run: |
-          CURRENT_VERSION=$(node -p "require('./package.json').version")
-          git show main:package.json > /tmp/main-package.json
-          MAIN_VERSION=$(node -p "require('/tmp/main-package.json').version")
-          echo "Current PR version: $CURRENT_VERSION"
-          echo "Main branch version: $MAIN_VERSION"
-          if [ "$CURRENT_VERSION" != "$MAIN_VERSION" ]; then
-            echo "already_bumped=true" >> $GITHUB_OUTPUT
-            echo "✅ Version already bumped in this PR"
-          else
-            echo "already_bumped=false" >> $GITHUB_OUTPUT
-            echo "⚠️ Version needs bumping"
-          fi
-
-      - name: Bump version patch
-        if: steps.check_version.outputs.already_bumped == 'false'
-        run: |
-          npm version patch --no-git-tag-version
-          git add package.json package-lock.json
-          git commit -m "chore: bump version [skip ci]"
-          git push origin ${{ github.head_ref }}

package/.github/workflows/publish-on-merge.yml

@@ -1,35 +0,0 @@
-name: Publish SDK on Merge
-
-on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: read
-  id-token: write # Required for OIDC
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    environment: publish
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Use Node.js 24
-        uses: actions/setup-node@v4
-        with:
-          node-version: 24
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Clear NODE_AUTH_TOKEN for OIDC
-        run: |
-          unset NODE_AUTH_TOKEN || true
-
-      - name: Build and publish
-        run: npm run build && npm publish --access public --no-provenance --verbose
-        env:
-          NODE_AUTH_TOKEN: ""