studio-os 0.3.0 → 0.5.0

package/test/web.test.js

@@ -160,7 +160,30 @@ test('returning client with signed waiver books without checkbox, uses pack cred
   const res = await agent.post(`/class/${inst}/book`).type('form')
     .send({ email: 'returning@test.hk', _csrf });
   assert.equal(res.status, 200);
-  assert.match(res.text, /credit deducted from your class pack/);
+  assert.match(res.text, /1 credit deducted from your class pack/);
+});
+
+test('a two-credit class says two credits came off the pack', async () => {
+  const { db, app } = makeApp();
+  const inst = makeInstance(db, makeClassType(db, { credits: 2 }), { hoursFromNow: 48 });
+  makePass(db, makeClient(db, { email: 'double@test.hk', waiver: true }));
+  const agent = request.agent(app);
+  const _csrf = await csrfToken(agent, `/class/${inst}`);
+  const res = await agent.post(`/class/${inst}/book`).type('form').send({ email: 'double@test.hk', _csrf });
+  assert.match(res.text, /2 credits deducted from your class pack/);
+});
+
+test("booking with an existing client's email does not rename them", async () => {
+  const { db, app } = makeApp();
+  const inst = makeInstance(db, makeClassType(db), { hoursFromNow: 48 });
+  const clientId = makeClient(db, { name: 'Mei Chan', email: 'mei@test.hk', waiver: true });
+
+  const agent = request.agent(app);
+  const _csrf = await csrfToken(agent, `/class/${inst}`);
+  const res = await agent.post(`/class/${inst}/book`).type('form')
+    .send({ name: 'Someone Else', email: 'mei@test.hk', _csrf });
+  assert.equal(res.status, 200);
+  assert.equal(db.prepare('SELECT name FROM clients WHERE id = ?').get(clientId).name, 'Mei Chan');
 });
 
 test('full class books to waitlist via HTTP', async () => {
@@ -178,6 +201,59 @@ test('full class books to waitlist via HTTP', async () => {
     .send({ email: 'b@t.hk', waiver_agree: '1', name: 'B', _csrf });
   assert.equal(res.status, 200);
   assert.match(res.text, /waitlist/i);
+  assert.match(res.text, /You're #1 in line/);
+
+  const second = await agent.post(`/class/${inst}/book`).type('form')
+    .send({ email: 'c@t.hk', waiver_agree: '1', name: 'C', _csrf });
+  assert.match(second.text, /You're #2 in line/);
+});
+
+test('drop-in dues: nothing owed on the waitlist, and a cancelled booking owes nothing', async () => {
+  const { db, app } = makeApp();
+  const inst = makeInstance(db, makeClassType(db, { capacity: 1, price: 15000 }), { hoursFromNow: 48 });
+  const agent = request.agent(app);
+  const _csrf = await csrfToken(agent, `/class/${inst}`);
+  for (const email of ['first@t.hk', 'second@t.hk']) {
+    await agent.post(`/class/${inst}/book`).type('form').send({ email, waiver_agree: '1', _csrf });
+  }
+  const owing = () => db.prepare(
+    `SELECT c.email FROM payments p JOIN clients c ON c.id = p.client_id
+     WHERE p.status = 'pending' ORDER BY p.id`
+  ).all().map((r) => r.email);
+  assert.deepEqual(owing(), ['first@t.hk']);
+
+  const { cancelBooking } = await import('../src/services/booking.js');
+  const first = db.prepare("SELECT id FROM bookings WHERE status = 'booked'").get();
+  cancelBooking(db, first.id);
+  assert.deepEqual(owing(), ['second@t.hk']);
+});
+
+test('admin: editing a class from the roster moves the waitlist up and emails them', async () => {
+  const { db, app } = makeApp();
+  const agent = request.agent(app);
+  const _csrf = await adminLogin(agent);
+  const inst = makeInstance(db, makeClassType(db, { capacity: 1 }), { hoursFromNow: 48 });
+  const kim = db.prepare("INSERT INTO instructors (name) VALUES ('Kim')").run().lastInsertRowid;
+  const { book } = await import('../src/services/booking.js');
+  book(db, makeClient(db, { email: 'first@edit.hk' }), inst);
+  const { booking: wl } = book(db, makeClient(db, { email: 'waiting@edit.hk' }), inst);
+
+  const roster = await agent.get(`/admin/instances/${inst}`);
+  assert.match(roster.text, /Edit class/);
+  const res = await agent.post(`/admin/instances/${inst}/edit`).type('form')
+    .send({ capacity: '2', instructor_id: String(kim), notes: 'Room B', _csrf });
+  assert.equal(res.status, 302);
+  const row = db.prepare('SELECT capacity, instructor_id, notes FROM class_instances WHERE id = ?').get(inst);
+  assert.deepEqual({ ...row }, { capacity: 2, instructor_id: kim, notes: 'Room B' });
+  assert.equal(db.prepare('SELECT status FROM bookings WHERE id = ?').get(wl.id).status, 'booked');
+  await new Promise((r) => setTimeout(r, 100));
+  const mails = fs.readdirSync(OUTBOX).map((f) => fs.readFileSync(path.join(OUTBOX, f), 'utf8'));
+  assert.ok(mails.some((m) => m.includes('To: waiting@edit.hk') && m.includes('/me?token=')));
+
+  const bad = await agent.post(`/admin/instances/${inst}/edit`).type('form')
+    .send({ capacity: '2', instructor_id: '999', _csrf });
+  assert.equal(bad.status, 302, 'an unknown instructor is a flash, not a 500');
+  assert.equal(db.prepare('SELECT instructor_id FROM class_instances WHERE id = ?').get(inst).instructor_id, kim);
 });
 
 test('magic link: verify round-trip, view bookings, cancel within policy', async () => {
@@ -274,6 +350,42 @@ test('admin: rules CRUD generates instances; roster check-in works over HTTP', a
   assert.equal(db.prepare('SELECT status FROM bookings WHERE id=?').get(booking.id).status, 'attended');
 });
 
+test('admin: editing a rule moves its empty classes instead of adding a second slot', async () => {
+  const { db, app } = makeApp();
+  const agent = request.agent(app);
+  const _csrf = await adminLogin(agent);
+  const { book } = await import('../src/services/booking.js');
+  const { localTimeStr } = await import('../src/lib/time.js');
+
+  const type = makeClassType(db, { name: 'Pilates' });
+  await agent.post('/admin/rules').type('form').send({
+    class_type_id: String(type), weekday: '4', start_time: '18:00', _csrf,
+  });
+  const ruleId = db.prepare('SELECT id FROM schedule_rules').get().id;
+  const nowIso = new Date().toISOString();
+  const future = () => db.prepare(
+    'SELECT starts_at FROM class_instances WHERE rule_id = ? AND starts_at > ? ORDER BY starts_at'
+  ).all(ruleId, nowIso).map((ci) => localTimeStr('Asia/Hong_Kong', ci.starts_at));
+  const slots = future().length;
+  const last = db.prepare('SELECT id FROM class_instances WHERE rule_id = ? ORDER BY starts_at DESC').get(ruleId).id;
+  book(db, makeClient(db), last);
+
+  const edit = await agent.post(`/admin/rules/${ruleId}`).type('form').send({
+    class_type_id: String(type), weekday: '4', start_time: '19:00', _csrf,
+  });
+  assert.equal(edit.status, 302);
+  const times = future();
+  assert.equal(times.filter((t) => t === '18:00').length, 1, 'only the booked class stays at the old time');
+  assert.equal(times.filter((t) => t === '19:00').length, slots);
+  assert.match((await agent.get('/admin/rules')).text, /1 booked class\(es\) are still at the old time/);
+
+  const bad = await agent.post(`/admin/rules/${ruleId}`).type('form').send({
+    class_type_id: String(type), weekday: '4', start_time: 'seven', _csrf,
+  });
+  assert.equal(bad.status, 302);
+  assert.equal(db.prepare('SELECT start_time FROM schedule_rules WHERE id = ?').get(ruleId).start_time, '19:00');
+});
+
 test('admin: manual pass sale + payment, revenue report and CSV export', async () => {
   const { db, app } = makeApp();
   const agent = request.agent(app);

package/views/admin/roster.ejs

@@ -5,6 +5,7 @@
      <% if (inst.instructor_name) { %> · <%= inst.instructor_name %><% } %>
      <% if (inst.status === 'cancelled') { %> · <mark>CANCELLED</mark><% } %></p>
 </hgroup>
+<% if (inst.notes) { %><p><small><%= inst.notes %></small></p><% } %>
 <table>
   <thead><tr><th>Client</th><th>Paid with</th><th>Status</th><th>Actions</th></tr></thead>
   <tbody>
@@ -38,6 +39,24 @@
   <% } %>
   </ol>
 <% } %>
+<% if (inst.status === 'scheduled') { %>
+<details>
+  <summary role="button" class="outline">Edit class</summary>
+  <form method="post" action="/admin/instances/<%= inst.id %>/edit"><input type="hidden" name="_csrf" value="<%= csrfToken %>">
+    <div class="grid">
+      <label>Capacity <input type="number" name="capacity" min="1" required value="<%= inst.capacity %>"></label>
+      <label>Instructor
+        <select name="instructor_id"><option value="">—</option>
+          <% for (const i of instructors) { %><option value="<%= i.id %>" <%= i.id === inst.instructor_id ? 'selected' : '' %>><%= i.name %></option><% } %>
+        </select>
+      </label>
+    </div>
+    <label>Notes <input name="notes" value="<%= inst.notes || '' %>"></label>
+    <small>Extra spots go to the waitlist in order, and they're emailed.</small>
+    <button>Save</button>
+  </form>
+</details>
+<% } %>
 <details>
   <summary role="button" class="outline">Add walk-in</summary>
   <form method="post" action="/admin/instances/<%= inst.id %>/walkin"><input type="hidden" name="_csrf" value="<%= csrfToken %>">

package/views/public/book_result.ejs

@@ -3,24 +3,24 @@
   <% if (result.waitlisted) { %>
     <h2>You're on the waitlist</h2>
     <p><strong><%= inst.class_name %></strong> on <%= fmtDt(inst.starts_at) %> is currently full.
-       You're #<%= result.booking.id ? '' : '' %> in line — if a spot opens we'll book you in automatically<%= smtpConfigured ? ' and email you' : '' %>.</p>
+       You're #<%= waitlistPosition %> in line — if a spot opens we'll book you in automatically<%= smtpConfigured ? ' and email you' : '' %>.</p>
   <% } else { %>
     <h2>You're booked!</h2>
     <p><strong><%= inst.class_name %></strong> · <%= fmtDt(inst.starts_at) %></p>
     <p>Payment:
-      <% if (result.booking.paid_with === 'pack') { %>1 credit deducted from your class pack.
+      <% if (result.booking.paid_with === 'pack') { const n = result.instance.credits_required ?? 1; %><%= n %> credit<%= n === 1 ? '' : 's' %> deducted from your class pack.
       <% } else if (result.booking.paid_with === 'membership') { %>covered by your membership.
       <% } else if (result.paymentId) { %>please pay <%= fmtMoney(inst.drop_in_price_cents) %> at the studio (cash/FPS) before class.
       <% } else { %>drop-in.
       <% } %>
     </p>
   <% } %>
-  <p>Manage or cancel your bookings any time:</p>
-  <p><a href="<%= magicUrl %>" role="button" class="outline">My bookings</a></p>
-  <% if (!smtpConfigured) { %>
+  <% if (magicUrl) { %>
+    <p>Manage or cancel your bookings any time:</p>
+    <p><a href="<%= magicUrl %>" role="button" class="outline">My bookings</a></p>
     <p><small>Save that link — it's your personal booking manager (valid 7 days; you can request a new one from “My bookings” in the menu).</small></p>
   <% } else { %>
-    <p><small>A confirmation email with your personal link is on its way.</small></p>
+    <p>A confirmation email with a link to manage or cancel your booking is on its way.</p>
   <% } %>
 </article>
 <%- include('../partials/foot') %>

package/views/public/buy_thanks.ejs

@@ -1,7 +1,7 @@
 <%- include('../partials/head', { adminNav: false }) %>
 <article>
   <h2>Thank you!</h2>
-  <p>Your payment was received. Your pass or membership is now active on your account — just book with the same email.</p>
+  <p>Your pass or membership goes on your account as soon as Stripe confirms the payment. For cards that's usually within a minute. Some bank payments take a few days. Book with the same email you paid with.</p>
   <p><a href="/" role="button">Browse the schedule</a></p>
 </article>
 <%- include('../partials/foot') %>