diff --git a/README.md b/README.md index 02441b82..dd9c742c 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ before making a package-level licence statement. [![Latest release](https://img.shields.io/github/v/release/Posnic/POS?include_prereleases&label=latest&color=blue)](https://github.com/Posnic/POS/releases/latest) [![Tests](https://img.shields.io/badge/tests-9%2C000%2B%20passing-brightgreen)](docs/DEVELOPMENT.md#running-the-tests) [![Coverage](https://img.shields.io/badge/coverage-69%25%20statements-yellow)](docs/DEVELOPMENT.md#running-the-tests) -[![API](https://img.shields.io/badge/REST%20API-869%20endpoints-blue)](docs/API.md) +[![API](https://img.shields.io/badge/REST%20API-870%20endpoints-blue)](docs/API.md) [![Source licence](https://img.shields.io/badge/source%20licence-AGPL--3.0-blue)](LICENSE) [![Package notices](https://img.shields.io/badge/package%20notices-component%20licences-informational)](THIRD-PARTY-NOTICES.md) [![Platforms](https://img.shields.io/badge/platforms-Windows%20%7C%20macOS%20%7C%20Linux-lightgrey)](https://github.com/Posnic/POS/releases/latest) @@ -235,7 +235,7 @@ the free edition worse. This is written down in [GOVERNANCE.md](docs/GOVERNANCE. | [Contributor quickstart](docs/CONTRIBUTOR_QUICKSTART.md) | Local setup, test commands, issue map, PR flow and safety rules | | [Developer guide](docs/DEVELOPMENT.md) | Setup, tests, conventions, good first issues | | [Architecture](docs/ARCHITECTURE.md) | How it fits together, and the parts that bite | -| [REST API](docs/API.md) | 869 endpoints, generated from the routes | +| [REST API](docs/API.md) | 870 endpoints, generated from the routes | | [Hardware](docs/HARDWARE_MATRIX.md) | Printers, scanners, drawers, scales — and how far each claim is checked | | [India e-invoicing](docs/INDIA_EINVOICING_DESIGN.md) | Research, readiness inventory and design for GST e-invoicing as an optional feature; no live IRP submission is built | | [India GST return gaps](docs/INDIA_GST_RETURNS_GAPS.md) | What the GST reports compute today, measured against GSTR-1, 3B and 9 | diff --git a/api/app.js b/api/app.js index a9485ed2..6edc46cc 100644 --- a/api/app.js +++ b/api/app.js @@ -1506,16 +1506,23 @@ app.post(['/push/test', '/api/push/test'], sseProtect, async (req, res) => { try { const result = req.db && req.user - ? await pushInfra.sendToUser(req.db, req.user._id, { - title: 'Posnic', - body: 'Notifications are working on this device.', - url: '/dashboard.html#/dashboard', - }) + ? await pushInfra.sendToUser( + req.db, + req.user._id, + { + title: 'Posnic', + body: 'Notifications are working on this device.', + url: '/dashboard.html#/dashboard', + }, + typeof req.body?.endpoint === 'string' ? req.body.endpoint : undefined + ) : { sent: 0 }; res.json({ - type: 'success', + type: result.sent ? 'success' : 'error', data: result, - message: result.sent ? 'Sent' : 'No subscriptions on this device yet', + message: result.sent + ? 'Sent' + : 'Notification could not be delivered. Check device registration and try again.', }); } catch (e) { res.status(500).json({ type: 'error', message: 'Send failed' }); diff --git a/api/src/realtime/push.js b/api/src/realtime/push.js index f61ad682..a420b6c3 100644 --- a/api/src/realtime/push.js +++ b/api/src/realtime/push.js @@ -82,7 +82,7 @@ async function subscribe(db, userId, subscription) { * Deliver to every device of one user. 404/410 mean the browser revoked the * subscription; those rows are pruned so the store never accumulates ghosts. */ -async function sendToUser(db, userId, payload) { +async function sendToUser(db, userId, payload, endpoint) { const wp = webpush(); if (!wp || !db) return { sent: 0 }; const vapid = await getVapid(db); @@ -90,7 +90,7 @@ async function sendToUser(db, userId, payload) { const rows = await db .collection(COLLECTION) - .find({ user_id: String(userId) }) + .find({ user_id: String(userId), ...(endpoint ? { endpoint } : {}) }) .toArray(); let sent = 0; for (const row of rows) { diff --git a/api/src/routes/items.routes.js b/api/src/routes/items.routes.js index b796816c..ba029785 100644 --- a/api/src/routes/items.routes.js +++ b/api/src/routes/items.routes.js @@ -98,6 +98,7 @@ const expiryReminders = require('../services/item-expiry-reminders'); router.get('/expiryReminders/preference', preferenceHandler(expiryReminders.read)); router.put('/expiryReminders/preference', preferenceHandler(expiryReminders.save)); router.get('/expiryReminders', preferenceHandler(expiryReminders.list)); +router.get('/expiryReport', preferenceHandler(expiryReminders.report)); /* * A dish that has run out, said by whoever found out first. diff --git a/api/src/services/item-expiry-reminders.js b/api/src/services/item-expiry-reminders.js index e89da211..39bf654c 100644 --- a/api/src/services/item-expiry-reminders.js +++ b/api/src/services/item-expiry-reminders.js @@ -35,13 +35,22 @@ function windowFor(branch, days, now) { const today = moment(now).tz(timezone).format('YYYY-MM-DD'); return { today, through: moment.utc(today).add(days, 'days').format('YYYY-MM-DD'), timezone }; } -async function list(req, now = new Date()) { +async function list(req, now = new Date(), report = false) { const c = await scoped(req), settings = preference(c.branch); const page = Number(req.query?.page ?? 1); if (!Number.isSafeInteger(page) || page < 1 || page > 100000) fail('Choose a valid page.'); - const range = windowFor(c.branch, settings.days, now); - if (!settings.enabled) + const days = report ? Number(req.query?.days ?? 30) : settings.days; + if (!Number.isInteger(days) || days < 0 || days > 365) + fail('Choose a period between 0 and 365 days.'); + const status = report ? req.query?.status || 'all' : 'all'; + const sort = report ? req.query?.sort || 'asc' : 'asc'; + if (!['all', 'expired', 'upcoming'].includes(status) || !['asc', 'desc'].includes(sort)) + fail('Invalid report filter.'); + const search = report ? String(req.query?.search || '').trim() : ''; + if (search.length > 100) fail('Search must be at most 100 characters.'); + const range = windowFor(c.branch, days, now); + if (!report && !settings.enabled) return { ...settings, ...range, @@ -57,6 +66,9 @@ async function list(req, now = new Date()) { $or: [{ branch_id: c.branchId }, { 'branch_access.branch_id': c.branchId }], item_status: { $ne: 'instant' }, available_quantity: { $gt: 0 }, + ...(search + ? { name: { $regex: search.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), $options: 'i' } } + : {}), }, }, // Item expiry is a calendar date; never shift it to the browser timezone. @@ -71,7 +83,19 @@ async function list(req, now = new Date()) { }, }, }, - { $match: { expiryDay: { $regex: '^\\d{4}-\\d{2}-\\d{2}$', $lte: range.through } } }, + { + $match: { + expiryDay: { + $regex: '^\\d{4}-\\d{2}-\\d{2}$', + $lte: range.through, + ...(status === 'expired' + ? { $lt: range.today } + : status === 'upcoming' + ? { $gte: range.today } + : {}), + }, + }, + }, { $set: { expiryParsed: { @@ -90,7 +114,7 @@ async function list(req, now = new Date()) { }, }, }, - { $sort: { expiryDay: 1, _id: 1 } }, + { $sort: { expiryDay: sort === 'desc' ? -1 : 1, _id: 1 } }, { $facet: { count: [{ $count: 'total' }], @@ -122,4 +146,11 @@ async function list(req, now = new Date()) { })), }; } -module.exports = { read, save, list, preference, windowFor }; +module.exports = { + read, + save, + list, + report: (req, now) => list(req, now, true), + preference, + windowFor, +}; diff --git a/api/tests/item-expiry-reminders.integration.cjs b/api/tests/item-expiry-reminders.integration.cjs index a964fbfb..fbbdc5a3 100644 --- a/api/tests/item-expiry-reminders.integration.cjs +++ b/api/tests/item-expiry-reminders.integration.cjs @@ -56,3 +56,17 @@ test('only current shop stocked products in date window; invalid dates ignored; assert.equal(new Set([...first.rows, ...next.rows].map(row => row.id)).size, 30); req.body.enabled = false; await service.save(req); assert.equal((await service.list(req, now)).total, 0); }); +test('report works with reminders off, filters literal search, sorts and rejects invalid filters', async () => { + const req = await fixture(); + const base = { license:req.tenantContext.licenseId,branch_id:req.tenantContext.branchId,available_quantity:3 }; + await db.collection('items').insertMany([{...base,name:'Milk (small)',items_expiry_date:'2026-10-07'}, {...base,name:'Milk large',items_expiry_date:'2026-10-12'}, {...base,name:'Later',items_expiry_date:'2026-11-12'}]); + const now = new Date('2026-10-08T12:00:00Z'); + assert.equal((await service.list(req,now)).total,0); + assert.equal((await service.report(req,now)).total,2); + req.query={sort:'desc'};assert.equal((await service.report(req,now)).rows[0].name,'Milk large'); + req.query={status:'expired'};assert.equal((await service.report(req,now)).total,1); + req.query={status:'upcoming'};assert.equal((await service.report(req,now)).rows[0].name,'Milk large'); + req.query={search:'(small)'};assert.equal((await service.report(req,now)).total,1); + req.query={search:'.*'};assert.equal((await service.report(req,now)).total,0); + for(const query of [{days:366},{days:-1},{status:'bad'},{sort:'bad'},{page:0}]) {req.query=query;await assert.rejects(service.report(req,now),{status:422});} +}); diff --git a/docs/API.md b/docs/API.md index 4c08b0a3..2d79c84e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -3,7 +3,7 @@ Generated from `api/src/routes/` by `npm run docs:api`. Do not edit this file by hand; edit the routes and regenerate. -**869 endpoints across 53 route groups.** +**870 endpoints across 53 route groups.** All paths below are relative to the API root. On a desktop install the API runs on a port derived per installation (see `local-ports.js`); in the cloud it sits @@ -15,8 +15,8 @@ behind the tenant hostname. Postman, Insomnia or Bruno, point Swagger UI or Redoc at it, or generate a client from it. It is OpenAPI 3.0.3. -**103 of 869 endpoints carry a request schema** (12%), recovered from -their `express-validator` middleware. The remaining 766 are listed with +**103 of 870 endpoints carry a request schema** (12%), recovered from +their `express-validator` middleware. The remaining 767 are listed with path, method and handler but no body, because inventing a schema is worse than admitting the gap. @@ -598,6 +598,7 @@ Mounted at `/items`. Source: `api/src/routes/items.routes.js`. | GET | `/items/expiryReminders/preference` | — | `expiryReminders.read` | | PUT | `/items/expiryReminders/preference` | — | `expiryReminders.save` | | GET | `/items/expiryReminders` | — | `expiryReminders.list` | +| GET | `/items/expiryReport` | — | `expiryReminders.report` | | POST | `/items/soldOut` | yes | `itemsController.markSoldOut` | | GET | `/items/icon-suggestion` | — | `itemsController.iconSuggestion` | | GET | `/items/printable-menu` | — | `itemsController.printableMenu` | diff --git a/docs/openapi.json b/docs/openapi.json index feaa36fe..da24ea79 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -10234,6 +10234,29 @@ } } }, + "/items/expiryReport": { + "get": { + "summary": "report", + "operationId": "get_items_expiryReport", + "tags": [ + "Items" + ], + "responses": { + "200": { + "description": "Success" + }, + "400": { + "description": "Validation failed" + }, + "401": { + "description": "Authentication required" + }, + "500": { + "description": "Server error" + } + } + } + }, "/items/soldOut": { "post": { "summary": "markSoldOut", diff --git a/frontend/layouts/sidebar.html b/frontend/layouts/sidebar.html index 14f86d84..583c509b 100644 --- a/frontend/layouts/sidebar.html +++ b/frontend/layouts/sidebar.html @@ -195,6 +195,8 @@
Categories +
  • Expiry report
    • +
  • Item settings
  • Stock CountsStock Counts
  • diff --git a/frontend/modules/expiryReport.html b/frontend/modules/expiryReport.html new file mode 100644 index 00000000..49db3b9c --- /dev/null +++ b/frontend/modules/expiryReport.html @@ -0,0 +1,12 @@ + diff --git a/frontend/modules/itemSettings.html b/frontend/modules/itemSettings.html new file mode 100644 index 00000000..1b7776c1 --- /dev/null +++ b/frontend/modules/itemSettings.html @@ -0,0 +1,15 @@ + diff --git a/frontend/modules/items.html b/frontend/modules/items.html index d7354eff..de943d53 100644 --- a/frontend/modules/items.html +++ b/frontend/modules/items.html @@ -19,8 +19,7 @@

    It -->
    - - + Item settings @@ -928,12 +927,3 @@
    -
    Stock for new items
    - -

    Always available: Sell without entering stock quantities. No low-stock alerts. Suitable for made-to-order dishes.

    -

    Track quantities: Enter stock received and count each sale. Low-stock alerts apply. Suitable for packaged goods.

    -

    Applies to new items in this branch. Existing items keep their stock settings. You can still mark an item sold out manually.

    -
    -
    diff --git a/frontend/pages_css_js_map.json b/frontend/pages_css_js_map.json index 5b33a171..b62ca9e1 100644 --- a/frontend/pages_css_js_map.json +++ b/frontend/pages_css_js_map.json @@ -109,6 +109,8 @@ "static/script/js/core/nutrition-pass.js", "static/script/js/modules/js/items.js", "static/script/js/modules/js/expiry-reminders.js", + "static/script/js/modules/js/item-settings-report.js", + "static/script/js/modules/js/device-notifications.js", "static/script/js/modules/js/item-translations.js", "static/script/js/modules/js/quick_items.js", "static/script/js/modules/js/item-translations-v2.js", diff --git a/frontend/pages_html_map.json b/frontend/pages_html_map.json index 7ae2de3d..4b33205c 100644 --- a/frontend/pages_html_map.json +++ b/frontend/pages_html_map.json @@ -34,6 +34,8 @@ "modules/itemReport.html", "modules/items.html", "modules/inventoryCounts.html", + "modules/itemSettings.html", + "modules/expiryReport.html", "modules/quick_items.html", "modules/items_v2.html", "modules/items_write.html", diff --git a/frontend/static/script/js/core/PosnicPro.js b/frontend/static/script/js/core/PosnicPro.js index 77a42237..032c7e92 100644 --- a/frontend/static/script/js/core/PosnicPro.js +++ b/frontend/static/script/js/core/PosnicPro.js @@ -1553,62 +1553,8 @@ PosnicPro = { * person SEES it work. Hidden wherever push cannot work (Electron * never registers the worker; unsupported browsers). */ - _pushSetup: function () { - var $btn = $('#bell_feed_push'); - if (!$btn.length) return; - if (!('Notification' in window) || !navigator.serviceWorker || !('PushManager' in window)) { - $btn.hide(); - return; - } - navigator.serviceWorker.getRegistration().then(function (reg) { - if (!reg) { $btn.hide(); return; } - reg.pushManager.getSubscription().then(function (sub) { - $btn.text(sub ? PosnicPro.i18n.t('lang_send_test_notification', 'Send test notification') : PosnicPro.i18n.t('lang_enable_notifications_on_this_device', 'Enable notifications on this device')) - .data('subscribed', !!sub).show(); - }); - }).catch(function () { $btn.hide(); }); - }, - _pushClick: function () { - var $btn = $('#bell_feed_push'); - if ($btn.data('subscribed')) { - PosnicPro.post({ url: 'push/test', data: JSON.stringify({}) }, function (response) { - PosnicPro.alert(response.type, response.message); - }, function () { PosnicPro.alert('error', PosnicPro.i18n.t('lang_could_not_send_the_test', 'Could not send the test.')); }); - return; - } - Notification.requestPermission().then(function (perm) { - if (perm !== 'granted') return; - return navigator.serviceWorker.getRegistration().then(function (reg) { - if (!reg) return; - return new Promise(function (resolve) { - PosnicPro.get({ url: 'push/key', data: {} }, function (r) { - resolve(r && r.data && r.data.key); - }, function () { resolve(null); }); - }).then(function (key) { - if (!key) return; - var raw = atob(key.replace(/-/g, '+').replace(/_/g, '/') - + '='.repeat((4 - key.length % 4) % 4)); - var bytes = new Uint8Array(raw.length); - for (var i = 0; i < raw.length; i++) bytes[i] = raw.charCodeAt(i); - return reg.pushManager.subscribe({ - userVisibleOnly: true, - applicationServerKey: bytes, - }).then(function (sub) { - return new Promise(function (resolve) { - PosnicPro.post({ - url: 'push/subscribe', - data: JSON.stringify({ subscription: sub.toJSON() }), - }, function () { - PosnicPro.alert('success', PosnicPro.i18n.t('lang_notifications_enabled_on_this_device', 'Notifications enabled on this device.')); - PosnicPro.bellFeed._pushSetup(); - resolve(); - }, function () { resolve(); }); - }); - }); - }); - }); - }).catch(function () { /* declined or unsupported - the bell still works */ }); - }, + _pushSetup: function () { if (PosnicPro.deviceNotifications) PosnicPro.deviceNotifications.setup(); }, + _pushClick: function () { if (PosnicPro.deviceNotifications) return PosnicPro.deviceNotifications.click(); }, /* Wire the dropdown: opening it marks activity seen, paints the feed fresh, and refreshes the push button's state. */ init: function () { diff --git a/frontend/static/script/js/modules/js/device-notifications.js b/frontend/static/script/js/modules/js/device-notifications.js new file mode 100644 index 00000000..f37e992d --- /dev/null +++ b/frontend/static/script/js/modules/js/device-notifications.js @@ -0,0 +1,74 @@ +PosnicPro.deviceNotifications = (function () { + var busy = false; + function unavailable() { return !window.isSecureContext || !('Notification' in window) || !navigator.serviceWorker || !('PushManager' in window); } + function message(text, kind) { + var hint = $('#bell_push_status'); + if (!hint.length) hint = $('

    ').insertAfter('#bell_feed_push'); + hint.text(text); + if (kind) PosnicPro.alert(kind, text); + } + function timeout(promise) { + return new Promise(function (resolve, reject) { + var timer = setTimeout(function () { reject(new Error('timeout')); }, 15000); + Promise.resolve(promise).then(function (value) { clearTimeout(timer); resolve(value); }, function (err) { clearTimeout(timer); reject(err); }); + }); + } + function call(method, options) { + return timeout(new Promise(function (resolve, reject) { + PosnicPro[method](options, function (r) { if (r && r.type === 'success') resolve(r); else reject(new Error('server')); }, function () { reject(new Error('network')); }); + })); + } + function setup() { + var button = $('#bell_feed_push'); + if (!button.length || busy) return; + button.show().prop('disabled', false); + if (unavailable()) { + button.prop('disabled', true); + message(PosnicPro.i18n.t('lang_push_unsupported', 'Device notifications are unavailable in this browser. Use Chrome or Edge over HTTPS. The POS bell still works.')); return; + } + if (Notification.permission === 'denied') { + button.prop('disabled', true); + message(PosnicPro.i18n.t('lang_push_blocked', 'Notifications are blocked. Allow notifications in this site’s browser settings, then reload.')); return; + } + timeout(navigator.serviceWorker.getRegistration()).then(function (reg) { + if (!reg || !reg.active) throw new Error('worker'); + return timeout(reg.pushManager.getSubscription()); + }).then(function (sub) { + button.text(sub ? PosnicPro.i18n.t('lang_send_test_notification', 'Send test notification') : PosnicPro.i18n.t('lang_enable_notifications_on_this_device', 'Enable notifications on this device')).data('subscribed', !!sub); + }).catch(function () { message(PosnicPro.i18n.t('lang_push_reload', 'Notification setup is not ready. Reload this page and try again.')); }); + } + async function click() { + if (busy) return; + if (unavailable() || Notification.permission === 'denied') { setup(); return; } + busy = true; + var button = $('#bell_feed_push'), testing = button.data('subscribed') === true; + button.prop('disabled', true); + button.text(PosnicPro.i18n.t('lang_push_setting_up', 'Setting up device notifications…')); + message(PosnicPro.i18n.t('lang_push_setting_up', 'Setting up device notifications…'), 'info'); + try { + // Request permission immediately within the user's click, before any network wait. + var permission = Notification.permission === 'granted' ? 'granted' : await timeout(Notification.requestPermission()); + if (permission !== 'granted') { message(PosnicPro.i18n.t('lang_push_permission_needed', 'Notifications were not enabled. Allow the browser permission to receive device notifications.'), 'info'); return; } + var reg = await timeout(navigator.serviceWorker.getRegistration()); + if (!reg || !reg.active) throw new Error('worker'); + var key = (await call('get', {url:'push/key',data:{}})).data.key; + if (!key) throw new Error('key'); + var sub = await timeout(reg.pushManager.getSubscription()); + if (!sub) { + var raw = atob(key.replace(/-/g,'+').replace(/_/g,'/') + '='.repeat((4-key.length%4)%4)); + var bytes = new Uint8Array(raw.length); for(var i=0;i

    '); - $('#expiry_reminders_title').text(PosnicPro.i18n.t('lang_expiry_reminders', 'Expiry reminders')); - $('#expiry_reminders_help').text(PosnicPro.i18n.t('lang_expiry_reminders_help', 'Reminders appear in the POS bell for products with stock and a saved expiry date. Dates use the shop timezone. No email or WhatsApp messages are sent.')); - $('#expiry_reminders_enabled_label').text(PosnicPro.i18n.t('lang_enable_expiry_reminders', 'Enable expiry reminders')); - $('#expiry_reminders_days_label').text(PosnicPro.i18n.t('lang_expiry_days_ahead', 'Days before expiry')); - $('#expiry_reminders_save').text(PosnicPro.i18n.t('lang_save_title', 'Save')).on('click', save); - $('#expiry_reminders_previous').text(PosnicPro.i18n.t('lang_previous', 'Previous')).on('click', function () { load(page - 1); }); - $('#expiry_reminders_next').text(PosnicPro.i18n.t('lang_next', 'Next')).on('click', function () { load(page + 1); }); - $('#expiry_reminders_close').text(PosnicPro.i18n.t('lang_close_title', 'Close')); - [PosnicPro.i18n.t('lang_itemname_title', 'Item Name'), PosnicPro.i18n.t('lang_expiry_date', 'Expiry Date'), PosnicPro.i18n.t('lang_quantity', 'Quantity'), PosnicPro.i18n.t('lang_status', 'Status:')].forEach(function (label) { $('').text(label).appendTo('#expiry_reminders_head'); }); - } - function paint(data) { - page = data.page; - $('#expiry_reminders_settings').toggle(data.canManage === true); - $('#expiry_reminders_enabled').prop('checked', data.enabled); - $('#expiry_reminders_days').val(data.days); - $('#expiry_reminders_summary').text(data.enabled ? data.total + ' ' + PosnicPro.i18n.t('lang_products_due_for_expiry_review', 'products due for expiry review') + ' | ' + data.today + ' - ' + data.through + ' | ' + data.timezone : PosnicPro.i18n.t('lang_expiry_reminders_off', 'Expiry reminders are off.')); - var body = $('#expiry_reminders_rows').empty(); - data.rows.forEach(function (row) { - var tr = $('').appendTo(body); - $('').text(row.name).appendTo(tr); - $('').text(row.expiryDate).appendTo(tr); - $('').text(row.quantity).appendTo(tr); - $('').text(row.daysRemaining < 0 ? PosnicPro.i18n.t('lang_expired', 'Expired') : row.daysRemaining === 0 ? PosnicPro.i18n.t('lang_expires_today', 'Expires today') : row.daysRemaining + ' ' + PosnicPro.i18n.t('lang_days_remaining', 'days remaining')).appendTo(tr); - }); - if (!data.rows.length) $('').append($('').text(PosnicPro.i18n.t('lang_no_products_expiry_review', 'No products to review.'))).appendTo(body); - $('#expiry_reminders_previous').prop('disabled', page <= 1); - $('#expiry_reminders_next').prop('disabled', page * 25 >= data.total); - } - function load(next) { - if (loading) return; - loading = true; - var branch = PosnicPro.local.get('branch_id_set'), ticket = ++generation; - $('#expiry_reminders_summary').text(PosnicPro.i18n.t('lang_loading', 'Loading…')); - PosnicPro.get({ url: 'items/expiryReminders', data: { page: next } }, function (r) { - loading = false; - if (ticket !== generation || branch !== PosnicPro.local.get('branch_id_set')) return; - if (r.type === 'success') paint(r.data); else error(); - }, function () { loading = false; error(); }); - } - function save() { - var days = Number($('#expiry_reminders_days').val()); - if (!Number.isInteger(days) || days < 0 || days > 365 || $('#expiry_reminders_days').val() === '') { - PosnicPro.alert('error', PosnicPro.i18n.t('lang_expiry_days_invalid', 'Choose a reminder period between 0 and 365 days.')); return; - } - $('#expiry_reminders_save').prop('disabled', true); - PosnicPro.put({ url: 'items/expiryReminders/preference', data: JSON.stringify({ enabled: $('#expiry_reminders_enabled').prop('checked'), days: days }) }, function (r) { - $('#expiry_reminders_save').prop('disabled', false); - if (r.type !== 'success') { error(); return; } - PosnicPro.alert('success', PosnicPro.i18n.t('lang_expiry_preferences_saved', 'Expiry reminder settings saved.')); - load(1); refresh(); - }, function () { $('#expiry_reminders_save').prop('disabled', false); error(); }); - } function refresh() { var branch = PosnicPro.local.get('branch_id_set'); if (activeBranch !== branch) { activeBranch = branch; PosnicPro.bellFeed._expiryCount = 0; PosnicPro.bellFeed._expirySignature = ''; $('#expiry_bell_section').hide(); PosnicPro.bellFeed._badge(); } @@ -73,12 +18,12 @@ PosnicPro.expiryReminders = (function () { }, function () {}); } return { - open: function () { modal(); $('#expiry_reminders_modal').modal('show'); load(1); }, + open: function () { window.location.hash = '#/expiryreport'; }, refresh: refresh, init: function () { if (initialized) return; initialized = true; if (!$('#expiry_bell_section').length) $('').insertAfter('#bell_feed_list'); - $('#expiry_bell_link').off('click.expiry').on('click.expiry', function () { window.location.hash = '#/items'; PosnicPro.expiryReminders.open(); }); + $('#expiry_bell_link').off('click.expiry').on('click.expiry', function () { $('#notoficationlink').dropdown('hide'); PosnicPro.expiryReminders.open(); }); $('#dropdown-notification').on('shown.bs.dropdown.expiry', function () { PosnicPro.local.set('expiry_reminders_seen', PosnicPro.bellFeed._expirySignature || ''); PosnicPro.bellFeed._expiryCount = 0; PosnicPro.bellFeed._badge(); refresh(); diff --git a/frontend/static/script/js/modules/js/item-settings-report.js b/frontend/static/script/js/modules/js/item-settings-report.js new file mode 100644 index 00000000..7b763338 --- /dev/null +++ b/frontend/static/script/js/modules/js/item-settings-report.js @@ -0,0 +1,65 @@ +(function () { + function show(id) { + PosnicPro.HideSideBarModal(); + $('.page_loader,#osk-container').hide(); + $('.nav-link-active,.tab-pane-active,.dropdown-item,.vertical-menu li a').removeClass('active'); + $('#v-pills-inventory-tab,#view_' + id + '_page').addClass('active'); + $('#v-pills-inventory').addClass('show active'); + $('.page-title-box,#' + id).show(); + } + function failed() { PosnicPro.alert('error', PosnicPro.i18n.t('lang_expiry_load_failed', 'Could not load expiry reminders. Please try again.')); } + PosnicPro.itemsettings = { + showDataTablePage: function () { + show('itemsettings'); + $('#item_settings_status').text(PosnicPro.i18n.t('lang_loading', 'Loading…')); + $('#item_settings_save_stock,#expiry_reminders_save').prop('disabled', true); + PosnicPro.itemStockPreference.load('#item_stock_preference'); + PosnicPro.get({url:'items/expiryReminders'}, function (r) { + if (r.type !== 'success') { failed(); return; } + $('#item_stock_preference,#item_settings_save_stock,#expiry_reminders_enabled,#expiry_reminders_days,#expiry_reminders_save').prop('disabled', !r.data.canManage); + $('#expiry_reminders_enabled').prop('checked', r.data.enabled); + $('#expiry_reminders_days').val(r.data.days); + $('#item_settings_status').text(r.data.canManage ? '' : PosnicPro.i18n.t('lang_item_settings_admin', 'An administrator can change item settings.')); + }, failed); + } + }; + var page = 1, request = 0; + PosnicPro.expiryreport = { + showDataTablePage: function () { show('expiryreport'); this.load(1); }, + load: function (next) { + var ticket = ++request, branch = PosnicPro.local.get('branch_id_set'); + var days = Number($('#expiry_report_days').val()); + if (!Number.isInteger(days) || days < 0 || days > 365 || $('#expiry_report_days').val() === '') { failed(); return; } + $('#expiry_report_summary').text(PosnicPro.i18n.t('lang_loading', 'Loading…')); + $('#expiry_report_previous,#expiry_report_next').prop('disabled', true); + $('#expiry_report_rows').empty(); + PosnicPro.get({url:'items/expiryReport', data:{ page:next, days:days, search:$('#expiry_report_search').val(), status:$('#expiry_report_status').val(), sort:$('#expiry_report_sort').val() }}, function (r) { + if (ticket !== request || branch !== PosnicPro.local.get('branch_id_set')) return; + if (r.type !== 'success') { $('#expiry_report_summary').text(''); failed(); return; } + var d = r.data; page = d.page; + $('#expiry_report_summary').text(d.total + ' ' + PosnicPro.i18n.t('lang_products_due_for_expiry_review', 'products due for expiry review') + ' | ' + d.today + ' - ' + d.through + ' | ' + d.timezone); + d.rows.forEach(function (row) { + var tr = $('').appendTo('#expiry_report_rows'); + [row.name, row.sku, row.expiryDate, row.quantity, row.daysRemaining < 0 ? PosnicPro.i18n.t('lang_expired', 'Expired') : row.daysRemaining === 0 ? PosnicPro.i18n.t('lang_expires_today', 'Expires today') : row.daysRemaining + ' ' + PosnicPro.i18n.t('lang_days_remaining', 'days remaining')].forEach(function (value) { $('').text(value).appendTo(tr); }); + }); + if (!d.rows.length) $('').append($('').text(PosnicPro.i18n.t('lang_no_products_expiry_review', 'No products to review.'))).appendTo('#expiry_report_rows'); + $('#expiry_report_page').text(page + ' / ' + Math.max(1, Math.ceil(d.total / 25))); + $('#expiry_report_previous').prop('disabled', page <= 1); + $('#expiry_report_next').prop('disabled', page * 25 >= d.total); + }, function () { if (ticket === request) { $('#expiry_report_summary').text(''); failed(); } }); + } + }; + $(document).on('submit', '#expiry_report_filters', function (e) { e.preventDefault(); PosnicPro.expiryreport.load(1); }); + $(document).on('click', '#expiry_report_previous', function () { PosnicPro.expiryreport.load(page - 1); }); + $(document).on('click', '#expiry_report_next', function () { PosnicPro.expiryreport.load(page + 1); }); + $(document).on('click', '#item_settings_save_stock', function () { + var button = $(this).prop('disabled', true); + PosnicPro.itemStockPreference.save($('#item_stock_preference').val(), function () { button.prop('disabled', false); PosnicPro.alert('success', PosnicPro.i18n.t('lang_item_settings_saved', 'Item settings saved.')); }, function () { button.prop('disabled', false); }); + }); + $(document).on('click', '#expiry_reminders_save', function () { + var days = Number($('#expiry_reminders_days').val()), button = $(this); + if (!Number.isInteger(days) || days < 0 || days > 365 || $('#expiry_reminders_days').val() === '') { PosnicPro.alert('error', PosnicPro.i18n.t('lang_expiry_days_invalid', 'Choose a reminder period between 0 and 365 days.')); return; } + button.prop('disabled', true); + PosnicPro.put({url:'items/expiryReminders/preference',data:JSON.stringify({enabled:$('#expiry_reminders_enabled').prop('checked'),days:days})},function(r){button.prop('disabled',false);if(r.type!=='success'){failed();return;}PosnicPro.alert('success',PosnicPro.i18n.t('lang_expiry_preferences_saved','Expiry reminder settings saved.'));PosnicPro.expiryReminders.refresh();},function(){button.prop('disabled',false);failed();}); + }); +})(); diff --git a/languages/_english.json b/languages/_english.json index b156a190..047c8f96 100644 --- a/languages/_english.json +++ b/languages/_english.json @@ -230,6 +230,7 @@ "lang_ai_spent_short": "Spent so far", "lang_ai_title": "Let the software write and read for you", "lang_align_left": "Left", + "lang_all": "All", "lang_all_apps": "All apps", "lang_all_changes": "All changes", "lang_all_customers": "All customers", @@ -918,7 +919,6 @@ "lang_could_not_save_the_signature": "Could not save the signature", "lang_could_not_save_the_voice_key": "Could not save the voice key", "lang_could_not_save_the_voice_settings": "Could not save the voice settings", - "lang_could_not_send_the_test": "Could not send the test.", "lang_could_not_stop_that_phone": "Could not stop that phone.", "lang_could_not_switch_sample_data_off": "Could not switch sample data off", "lang_could_not_update_the_document": "Could not update the document.", @@ -1038,6 +1038,7 @@ "lang_day_end": "Day-End", "lang_day_end_summary": "Day-End Summary", "lang_days_ago": "days ago", + "lang_days_ahead": "Days ahead", "lang_days_remaining": "days remaining", "lang_dayss": "day)", "lang_deactivate_title": "InActive", @@ -1314,6 +1315,7 @@ "lang_each_item_can_have_only_one_price_in_this": "Each item can have only one price in this list.", "lang_ean13": "EAN13", "lang_ean8": "EAN8", + "lang_earliest_expiry_first": "Earliest expiry first", "lang_earn_multiplier": "Earn multiplier", "lang_earn_rate_needs_a_points_value_and_an_amou": "Earn rate needs a points value and an amount greater than zero.", "lang_earning": "Earning", @@ -1556,7 +1558,9 @@ "lang_expiry_preferences_saved": "Expiry reminder settings saved.", "lang_expiry_reminders": "Expiry reminders", "lang_expiry_reminders_help": "Reminders appear in the POS bell for products with stock and a saved expiry date. Dates use the shop timezone. No email or WhatsApp messages are sent.", - "lang_expiry_reminders_off": "Expiry reminders are off.", + "lang_expiry_report": "Expiring products report", + "lang_expiry_report_help": "Products with stock and a saved expiry date. Available even when reminders are off.", + "lang_expiry_report_short": "Expiry report", "lang_expiry_title": "Items Expiry Date", "lang_export_csv": "Export CSV", "lang_export_excel": "Export Excel", @@ -1980,6 +1984,9 @@ "lang_item_saved": "Item saved", "lang_item_sell_out_of_stock": "Sell when out of stock", "lang_item_service_unit": "Item service unit", + "lang_item_settings": "Item settings", + "lang_item_settings_admin": "An administrator can change item settings.", + "lang_item_settings_saved": "Item settings saved.", "lang_item_stock_behavior": "Stock & selling", "lang_item_stock_variants_help": "For variants, enter opening stock in each variant row.", "lang_item_title": "Item", @@ -2157,6 +2164,7 @@ "lang_last_purchase": "Last purchase", "lang_last_used": "Last used", "lang_lastname": "Last Name", + "lang_latest_expiry_first": "Latest expiry first", "lang_lato": "Lato", "lang_leave_a_role_list_empty_to_rely_on_the_nor": "Leave a role list empty to rely on the normal Posnic permissions.", "lang_leave_all_unchecked_to_serve_this_dish_all": "Leave all unchecked to serve this dish all day.", @@ -3195,6 +3203,13 @@ "lang_purchaseprint": "Receiving Print", "lang_purchases": "purchases", "lang_purchse_title": "Purchase", + "lang_push_blocked": "Notifications are blocked. Allow notifications in this site’s browser settings, then reload.", + "lang_push_failed": "Could not enable or send device notifications. Check browser permissions and your connection, then try again. The POS bell still works.", + "lang_push_permission_needed": "Notifications were not enabled. Allow the browser permission to receive device notifications.", + "lang_push_reload": "Notification setup is not ready. Reload this page and try again.", + "lang_push_setting_up": "Setting up device notifications…", + "lang_push_test_sent": "Test notification sent. If it is not visible, check your device notification settings.", + "lang_push_unsupported": "Device notifications are unavailable in this browser. Use Chrome or Edge over HTTPS. The POS bell still works.", "lang_qe_disc_type": "Qe disc type", "lang_qe_valid_until": "Qe valid until", "lang_qr_code_generation_timeout_please_try_agai": "QR code generation timeout. Please try again.", @@ -3461,6 +3476,7 @@ "lang_reference_utr_optional": "Reference / UTR (optional)", "lang_referrals": "Referrals", "lang_referred_by": "Referred by", + "lang_refresh": "Refresh", "lang_refresh_failed": "Refresh failed", "lang_refresh_failed_try_again": "Refresh failed. Try again.", "lang_refresh_orders": "Refresh orders", @@ -3916,6 +3932,7 @@ "lang_skip_items_whose_new_price_would_go_above": "Skip items whose new price would go above MRP", "lang_skip_setup_and_start_selling": "Skip setup and start selling", "lang_skipped": "Skipped", + "lang_sku": "SKU", "lang_sku_barcode": "SKU / Barcode", "lang_sku_item_code": "SKU / item code", "lang_sku_title": "SKU", @@ -4279,6 +4296,7 @@ "lang_to_date": "To date", "lang_to_email_address": "To email address", "lang_to_use_questions_insights_actions_and_sche": "to use questions, insights, actions and schedules.", + "lang_today_and_upcoming": "Today and upcoming", "lang_token": "Token", "lang_token_copied": "Token copied", "lang_tomorrow": "Tomorrow", diff --git a/languages/nl.json b/languages/nl.json index 93b14f51..2e722357 100644 --- a/languages/nl.json +++ b/languages/nl.json @@ -4627,5 +4627,25 @@ "lang_no_products_expiry_review": "Geen producten om te controleren.", "lang_expiry_days_invalid": "Kies een herinneringsperiode tussen 0 en 365 dagen.", "lang_expiry_preferences_saved": "Instellingen voor vervalherinneringen opgeslagen.", - "lang_expired": "Verlopen" + "lang_expired": "Verlopen", + "lang_expiry_report": "Rapport vervallende producten", + "lang_item_settings": "Artikelinstellingen", + "lang_expiry_report_help": "Producten met voorraad en een opgeslagen vervaldatum. Ook beschikbaar als herinneringen uitstaan.", + "lang_days_ahead": "Dagen vooruit", + "lang_refresh": "Vernieuwen", + "lang_sku": "SKU", + "lang_all": "Alle", + "lang_today_and_upcoming": "Vandaag en binnenkort", + "lang_earliest_expiry_first": "Vroegste vervaldatum eerst", + "lang_latest_expiry_first": "Laatste vervaldatum eerst", + "lang_push_unsupported": "Apparaatmeldingen zijn niet beschikbaar in deze browser. Gebruik Chrome of Edge via HTTPS. De POS-meldingen blijven werken.", + "lang_push_blocked": "Meldingen zijn geblokkeerd. Sta meldingen toe in de browserinstellingen voor deze site en laad opnieuw.", + "lang_push_reload": "Meldingen zijn nog niet gereed. Laad deze pagina opnieuw en probeer het nogmaals.", + "lang_push_setting_up": "Apparaatmeldingen instellen…", + "lang_push_permission_needed": "Meldingen zijn niet ingeschakeld. Geef toestemming in de browser om apparaatmeldingen te ontvangen.", + "lang_push_test_sent": "Testmelding verzonden. Controleer de meldingsinstellingen van uw apparaat als deze niet zichtbaar is.", + "lang_push_failed": "Apparaatmeldingen konden niet worden ingeschakeld of verzonden. Controleer de browsermachtigingen en uw verbinding en probeer opnieuw. De POS-meldingen blijven werken.", + "lang_item_settings_admin": "Een beheerder kan artikelinstellingen wijzigen.", + "lang_item_settings_saved": "Artikelinstellingen opgeslagen.", + "lang_expiry_report_short": "Vervalrapport" } diff --git a/tests/device-notifications.test.js b/tests/device-notifications.test.js new file mode 100644 index 00000000..c71f6b16 --- /dev/null +++ b/tests/device-notifications.test.js @@ -0,0 +1,14 @@ +const test=require('node:test'),assert=require('node:assert/strict'),vm=require('node:vm'),fs=require('node:fs'),path=require('node:path'); +function fixture(options={}) { + const elements={},calls=[],alerts=[];const $=selector=>elements[selector] ||= {length:1,values:{},show(){return this;},prop(k,v){this.values[k]=v;return this;},text(v){this.value=v;return this;},data(k,v){if(arguments.length===1)return this.values[k];this.values[k]=v;return this;}}; + const subscription={endpoint:'https://push.example/device',toJSON(){return {endpoint:this.endpoint};}}; + const reg={active:{},pushManager:{getSubscription:async()=>options.existing?subscription:null,subscribe:async()=>{if(options.subscribeError)throw Error('browser');return subscription;}}}; + const Notification={permission:options.permission||'granted',requestPermission:async()=>options.grant||'granted'}; + const PosnicPro={i18n:{t:(k,f)=>f},alert:(type,text)=>alerts.push({type,text}),get:(p,done)=>{calls.push(p.url);done({type:'success',data:{key:'AQID'}});},post:(p,done)=>{calls.push(p.url);done(p.url===options.fail?{type:'error'}:{type:'success',data:{sent:options.sent??1}});}}; + vm.runInNewContext(fs.readFileSync(path.join(__dirname,'../frontend/static/script/js/modules/js/device-notifications.js'),'utf8'),{PosnicPro,$,window:{isSecureContext:true,Notification,PushManager:{}},Notification,navigator:{serviceWorker:{getRegistration:async()=>options.noWorker?null:reg}},setTimeout,clearTimeout,Uint8Array,atob:s=>Buffer.from(s,'base64').toString('binary')}); + return {api:PosnicPro.deviceNotifications,calls,alerts,elements,$}; +} +test('notification setup persists before reporting success',async()=>{const f=fixture();await f.api.click();assert.deepEqual(f.calls,['push/key','push/subscribe']);assert.equal(f.alerts.at(-1).type,'success');}); +test('notification registration and browser failures are visible, never false successes',async()=>{for(const options of [{fail:'push/subscribe'},{subscribeError:true},{noWorker:true}]){const f=fixture(options);await f.api.click();assert.equal(f.alerts.at(-1).type,'error');assert.equal(f.$('#bell_feed_push').values.disabled,false);}}); +test('blocked permission explains how to recover without a server request',async()=>{const f=fixture({permission:'denied'});await f.api.click();assert.equal(f.calls.length,0);assert.match(f.$('#bell_push_status').value,/blocked/);assert.equal(f.$('#bell_feed_push').values.disabled,true);}); +test('existing browser subscription repairs server registration before testing delivery',async()=>{const f=fixture({existing:true,sent:0});f.$('#bell_feed_push').data('subscribed',true);await f.api.click();assert.deepEqual(f.calls,['push/key','push/subscribe','push/test']);assert.equal(f.alerts.at(-1).type,'error');});