Changeset 3603307

Timestamp:

07/10/2026 06:49:28 PM (4 months ago)

Author:

pfhowe

Message:

Release 0.4.45

Location:

pfh-shop-manager

Files:

• tags/0.4.45 (added)
• tags/0.4.45/assets (added)
• tags/0.4.45/assets/app-0.4.45.js (added)
• tags/0.4.45/assets/app-icon.ico (added)
• tags/0.4.45/assets/app-icon.png (added)
• tags/0.4.45/assets/app.css (added)
• tags/0.4.45/assets/app.js (added)
• tags/0.4.45/includes (added)
• tags/0.4.45/includes/class-pfhsm-cash-flow.php (added)
• tags/0.4.45/includes/class-pfhsm-csv.php (added)
• tags/0.4.45/includes/class-pfhsm-login-log.php (added)
• tags/0.4.45/includes/class-pfhsm-plugin.php (added)
• tags/0.4.45/includes/class-pfhsm-rest-controller.php (added)
• tags/0.4.45/includes/class-pfhsm-session-timeout.php (added)
• tags/0.4.45/readme.txt (added)
• tags/0.4.45/templates (added)
• tags/0.4.45/templates/portal.php (added)
• tags/0.4.45/woo-shop-manager.php (added)
• trunk/assets/app-0.4.40.js (deleted)
• trunk/assets/app-0.4.45.js (added)
• trunk/assets/app.css (modified) (2 diffs)
• trunk/assets/app.js (modified) (16 diffs)
• trunk/includes/class-pfhsm-plugin.php (modified) (1 diff)
• trunk/includes/class-pfhsm-rest-controller.php (modified) (12 diffs)
• trunk/readme.txt (modified) (5 diffs)
• trunk/templates/portal.php (modified) (5 diffs)
• trunk/woo-shop-manager.php (modified) (2 diffs)

pfh-shop-manager/trunk/assets/app.css

@@ -6 +6 @@
 .wsm-section,.wsm-shipping-panel,.wsm-help{background:#fff;border:1px solid var(--wsm-border);border-radius:6px;margin-bottom:20px}.wsm-section>h2,.wsm-shipping-panel>h2{font-size:17px;margin:0;padding:18px 20px;border-bottom:1px solid var(--wsm-border)}.wsm-action-row{display:flex;justify-content:space-between;align-items:center;gap:20px;padding:20px;border-bottom:1px solid var(--wsm-border)}.wsm-action-row:last-child{border-bottom:0}.wsm-action-row p,.wsm-upload p{margin:3px 0 0;color:var(--wsm-muted)}.wsm-upload{padding:22px;display:grid;justify-items:start;gap:14px}.wsm-upload input{border:1px dashed #aebbc0;padding:22px;border-radius:6px;width:min(520px,100%)}
 .wsm-subheading{display:flex;align-items:center;justify-content:space-between;padding:17px 20px;border-bottom:1px solid var(--wsm-border)}.wsm-subheading h2{font-size:17px;margin:0}.wsm-tabs{display:flex;gap:2px;border-bottom:1px solid var(--wsm-border);margin-bottom:18px}.wsm-tabs button{border:0;background:transparent;padding:11px 16px;color:var(--wsm-muted);font-weight:700;cursor:pointer;border-bottom:2px solid transparent}.wsm-tabs button.active{color:var(--wsm-green);border-color:var(--wsm-green)}.wsm-shipping-panel{display:none}.wsm-shipping-panel.active{display:block}.wsm-list-row{display:flex;align-items:center;justify-content:space-between;gap:18px;padding:15px 20px;border-bottom:1px solid var(--wsm-border)}.wsm-list-row:last-child{border-bottom:0}.wsm-list-row p{margin:2px 0 0;color:var(--wsm-muted)}.wsm-settings-form{padding:20px;display:grid;gap:16px}.wsm-check{display:flex!important;grid-template-columns:none!important;align-items:center;gap:9px;font-weight:500!important}.wsm-check input{width:17px!important;height:17px!important;min-height:0!important}.wsm-settings-form .wsm-button{justify-self:start;margin-top:8px}
-.wsm-periods{display:flex;align-items:end;gap:9px;flex-wrap:wrap;margin-bottom:18px}.wsm-periods>button:not(.wsm-button){min-height:40px;border:1px solid #cbd4d8;background:#fff;padding:8px 12px;cursor:pointer}.wsm-periods>button.active{background:var(--wsm-green-soft);border-color:#76bfa9;color:var(--wsm-green-dark)}.wsm-periods label{display:grid;gap:3px;color:var(--wsm-muted);font-size:12px}.wsm-periods input{height:40px;border:1px solid #cbd4d8;border-radius:6px;padding:0 9px}.wsm-summary{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));background:#fff;border:1px solid var(--wsm-border);border-radius:6px;margin-bottom:18px;overflow:hidden}.wsm-summary div{padding:15px 18px;border-right:1px solid var(--wsm-border);border-bottom:1px solid var(--wsm-border)}.wsm-summary div:last-child{border-right:0}.wsm-summary span{display:block;color:var(--wsm-muted);font-size:12px}.wsm-summary strong{font-size:20px}#wsmCogsSummary{grid-template-columns:repeat(7,minmax(0,1fr))}#wsmCogsSummary div{padding:15px 16px}#wsmCogsSummary strong{font-size:19px}@media(max-width:1100px){#wsmCogsSummary{grid-template-columns:repeat(auto-fit,minmax(150px,1fr))}#wsmCogsSummary strong{font-size:20px}}.wsm-help{display:grid;grid-template-columns:220px 1fr;min-height:420px}.wsm-help nav{padding:12px;border-right:1px solid var(--wsm-border);display:flex;flex-direction:column;gap:3px}.wsm-help nav button{text-align:left;border:0;background:transparent;padding:10px;border-radius:5px;cursor:pointer}.wsm-help nav button.active{background:var(--wsm-green-soft);color:var(--wsm-green-dark);font-weight:700}.wsm-help article{padding:28px;max-width:760px}.wsm-help article h2{margin-top:0;font-size:22px}.wsm-help article h3{font-size:16px;margin-top:24px}.wsm-help article li{margin-bottom:8px}.wsm-readme{white-space:pre-wrap;overflow:auto;max-height:680px;margin:0;padding:16px;border:1px solid var(--wsm-border);border-radius:6px;background:#f8faf9;color:var(--wsm-text);font:13px/1.55 ui-monospace,SFMono-Regular,Consolas,monospace}
+.wsm-periods{display:flex;align-items:end;gap:9px;flex-wrap:wrap;margin-bottom:18px}.wsm-periods>button:not(.wsm-button){min-height:40px;border:1px solid #cbd4d8;background:#fff;padding:8px 12px;cursor:pointer}.wsm-periods>button.active{background:var(--wsm-green-soft);border-color:#76bfa9;color:var(--wsm-green-dark)}.wsm-periods label{display:grid;gap:3px;color:var(--wsm-muted);font-size:12px}.wsm-periods input{height:40px;border:1px solid #cbd4d8;border-radius:6px;padding:0 9px}.wsm-summary{display:grid;grid-template-columns:repeat(5,1fr);background:#fff;border:1px solid var(--wsm-border);border-radius:6px;margin-bottom:18px}.wsm-summary div{padding:15px 18px;border-right:1px solid var(--wsm-border)}.wsm-summary div:last-child{border:0}.wsm-summary span{display:block;color:var(--wsm-muted);font-size:12px}.wsm-summary strong{font-size:20px}.wsm-help{display:grid;grid-template-columns:220px 1fr;min-height:420px}.wsm-help nav{padding:12px;border-right:1px solid var(--wsm-border);display:flex;flex-direction:column;gap:3px}.wsm-help nav button{text-align:left;border:0;background:transparent;padding:10px;border-radius:5px;cursor:pointer}.wsm-help nav button.active{background:var(--wsm-green-soft);color:var(--wsm-green-dark);font-weight:700}.wsm-help article{padding:28px;max-width:760px}.wsm-help article h2{margin-top:0;font-size:22px}.wsm-help article h3{font-size:16px;margin-top:24px}.wsm-help article li{margin-bottom:8px}.wsm-readme{white-space:pre-wrap;overflow:auto;max-height:680px;margin:0;padding:16px;border:1px solid var(--wsm-border);border-radius:6px;background:#f8faf9;color:var(--wsm-text);font:13px/1.55 ui-monospace,SFMono-Regular,Consolas,monospace}
 .wsm-drawer{position:fixed;z-index:60;inset:0 0 0 auto;width:min(var(--wsm-drawer),100%);background:#fff;box-shadow:-12px 0 35px rgba(15,35,42,.14);transform:translateX(105%);transition:transform .2s ease;display:flex;flex-direction:column}.wsm-drawer.open{transform:translateX(0)}.wsm-drawer-header{display:flex;justify-content:space-between;align-items:center;padding:19px 20px;border-bottom:1px solid var(--wsm-border)}.wsm-drawer-header h2{margin:0;font-size:19px}.wsm-drawer form{display:flex;flex-direction:column;min-height:0;flex:1}.wsm-drawer #wsmDrawerBody{padding:20px;overflow:auto;display:grid;gap:16px}.wsm-drawer-actions{margin-top:auto;padding:15px 20px;border-top:1px solid var(--wsm-border);display:grid;grid-template-columns:auto 1fr auto auto;gap:9px}.wsm-form-grid{display:grid;grid-template-columns:1fr 1fr;gap:14px}.wsm-form-grid .wide{grid-column:1/-1}.wsm-field textarea{min-height:88px;resize:vertical}.wsm-image-picker{display:flex;align-items:center;gap:14px}.wsm-image-picker img{width:82px;height:82px;object-fit:cover;border-radius:6px;border:1px solid var(--wsm-border)}.wsm-scrim{position:fixed;z-index:50;inset:0;background:rgba(13,25,29,.35)}.wsm-empty{text-align:center!important;color:var(--wsm-muted);padding:36px!important}
 @media(max-width:900px){.wsm-sidebar{transform:translateX(-105%);transition:transform .2s ease}.wsm-app.menu-open .wsm-sidebar{transform:translateX(0)}.wsm-main{margin-left:0;padding:74px 18px 40px}.wsm-mobile-header{position:fixed;z-index:20;display:flex;align-items:center;gap:12px;inset:0 0 auto 0;height:56px;padding:0 15px;background:#fff;border-bottom:1px solid var(--wsm-border)}.wsm-mobile-header button{border:0;background:transparent;font-size:22px}.wsm-summary{grid-template-columns:repeat(2,1fr)}.wsm-summary div{border-bottom:1px solid var(--wsm-border)}.wsm-help{grid-template-columns:1fr}.wsm-help nav{border-right:0;border-bottom:1px solid var(--wsm-border);flex-direction:row;overflow:auto}.wsm-help nav button{white-space:nowrap}}
@@ -53 +53 @@
 .wsm-users-panel{display:none;background:#fff;border:1px solid var(--wsm-border);border-radius:6px;overflow:hidden}.wsm-users-panel.active{display:block}.wsm-users-panel .wsm-table-wrap{border:0;border-radius:0}.wsm-system-label{display:block;color:var(--wsm-muted);font-size:11px;font-weight:500}.wsm-permission-list{display:flex;flex-wrap:wrap;gap:5px;max-width:620px}.wsm-permission-list span{display:inline-block;padding:2px 7px;border-radius:999px;background:var(--wsm-green-soft);color:var(--wsm-green-dark);font-size:11px;font-weight:650}.wsm-group-permissions{display:grid;grid-template-columns:1fr 1fr;gap:10px;margin-top:7px;padding:12px;border:1px solid var(--wsm-border);border-radius:6px;background:#fafbfb}
 .wsm-activity-toolbar{margin:0;padding:16px 20px;border-bottom:1px solid var(--wsm-border)}.wsm-activity-table{min-width:680px}.wsm-activity-event{display:inline-block;min-width:64px;padding:3px 8px;border-radius:999px;font-size:12px;font-weight:750;text-align:center}.wsm-activity-event.login{background:var(--wsm-green-soft);color:var(--wsm-green-dark)}.wsm-activity-event.logout{background:#edf1f2;color:#46545c}.wsm-activity-pagination{margin:0;padding:14px 20px;border-top:1px solid var(--wsm-border)}
+#wsmSalesSummary{grid-template-columns:repeat(6,1fr)}
 #wsmCustomerCount{margin-top:5px;font-size:12px}.wsm-customer-table{min-width:1080px}.wsm-customer-table td:nth-child(4),.wsm-customer-table td:nth-child(5),.wsm-customer-table td:nth-child(6){white-space:nowrap}.wsm-customer-table a{color:var(--wsm-green);text-decoration:none}.wsm-customer-table a:hover{text-decoration:underline}.wsm-rank{display:inline-grid;place-items:center;min-width:38px;padding:4px 7px;border-radius:999px;background:var(--wsm-green-soft);color:var(--wsm-green-dark)}#wsmCustomerSummary{grid-template-columns:repeat(4,1fr)}
 #wsmBestSellerCount{margin-top:5px;font-size:12px}.wsm-best-seller-table{min-width:1020px}.wsm-best-seller-table td:nth-child(4),.wsm-best-seller-table td:nth-child(5),.wsm-best-seller-table td:nth-child(6),.wsm-best-seller-table td:nth-child(7){white-space:nowrap}#wsmBestSellerSummary{grid-template-columns:repeat(4,1fr)}
-.wsm-product-select-field{min-width:min(520px,100%)}.wsm-cogs-table{min-width:980px}.wsm-cogs-table input{width:100%;min-width:112px;border:1px solid #cbd4d8;border-radius:6px;padding:8px 9px;background:#fff}.wsm-cogs-table td:nth-child(3) input{min-width:220px}#wsmCogsSummary{grid-template-columns:repeat(7,minmax(0,1fr))}
+.wsm-cogs-toolbar{align-items:end;flex-wrap:wrap}.wsm-cogs-toolbar .wsm-field{flex:0 0 auto}.wsm-cogs-toolbar .wsm-cogs-status-field{width:170px}.wsm-cogs-toolbar .wsm-cogs-product-search{align-self:end;width:min(280px,100%)}.wsm-cogs-toolbar .wsm-product-select-field{flex:1 1 460px;min-width:min(460px,100%)}.wsm-cogs-toolbar .wsm-button{align-self:end}.wsm-product-select-field{min-width:min(520px,100%)}.wsm-cogs-table{min-width:980px}.wsm-cogs-table input{width:100%;min-width:112px;border:1px solid #cbd4d8;border-radius:6px;padding:8px 9px;background:#fff}.wsm-cogs-table td:nth-child(3) input{min-width:220px}#wsmCogsSummary{grid-template-columns:repeat(6,1fr)}#wsmCogsSummary span{min-height:36px;line-height:1.35}#wsmCogsSummary strong{display:block}
 @media(max-width:900px){.wsm-settings-grid{grid-template-columns:repeat(2,minmax(160px,1fr))}}
 @media(max-width:600px){.wsm-pdf-modal{padding:0}.wsm-pdf-window{width:100%;height:100vh;border-radius:0}}
-@media(max-width:600px){.wsm-heading-actions{align-items:stretch;flex-direction:column}.wsm-cash-filters>*{flex:1 1 100%}.wsm-cash-filters input,.wsm-cash-filters select{width:100%}.wsm-settings-grid{grid-template-columns:1fr}.wsm-form-actions{align-items:stretch;flex-direction:column}.wsm-form-actions .wsm-button{width:100%}}
+@media(max-width:600px){.wsm-cogs-toolbar .wsm-cogs-status-field,.wsm-cogs-toolbar .wsm-cogs-product-search,.wsm-cogs-toolbar .wsm-product-select-field{width:100%;min-width:0;flex:1 1 100%}.wsm-heading-actions{align-items:stretch;flex-direction:column}.wsm-cash-filters>*{flex:1 1 100%}.wsm-cash-filters input,.wsm-cash-filters select{width:100%}.wsm-settings-grid{grid-template-columns:1fr}.wsm-form-actions{align-items:stretch;flex-direction:column}.wsm-form-actions .wsm-button{width:100%}}
 @media(max-width:600px){.wsm-group-permissions{grid-template-columns:1fr}.wsm-users-panel .wsm-subheading{align-items:stretch;flex-direction:column;gap:12px}.wsm-users-panel .wsm-subheading .wsm-button{width:100%}}
 .wsm-alert.success{color:#14532d;background:#ecfdf3;border:1px solid #a7e1bb}.wsm-login-links{margin:20px 0 0;text-align:center}.wsm-login-links a{color:var(--wsm-green-dark);font-weight:650}.wsm-login-card>a.wsm-button{display:flex;align-items:center;justify-content:center;text-decoration:none}

pfh-shop-manager/trunk/assets/app.js

@@ -4 +4 @@
   if (!window.pfhsmConfig || !document.getElementById('wsmApp')) return;
 
-  const state = { bootstrap: null, products: [], productPage: 1, productPages: 1, categories: [], shipping: null, sales: null, customers: null, customerView: [], bestSellers: null, bestSellerView: [], cashFlow: null, cogs: null, cogsSearch: null, users: null, groups: null, loginActivity: null, loginActivityPage: 1, loginActivityPages: 1, session: null, sessionSettings: null, drawer: null };
+  const state = { bootstrap: null, products: [], productPage: 1, productPages: 1, categories: [], shipping: null, sales: null, salesPage: 1, salesPages: 1, customers: null, customerView: [], customerPage: 1, customerPages: 1, bestSellers: null, bestSellerView: [], bestSellerPage: 1, bestSellerPages: 1, cashFlow: null, cogs: null, cogsSearch: null, users: null, groups: null, loginActivity: null, loginActivityPage: 1, loginActivityPages: 1, session: null, sessionSettings: null, drawer: null };
   const API_TIMEOUT_MS = 15000;
+  const REPORT_PAGE_SIZE = 20;
   const $ = (selector, root = document) => root.querySelector(selector);
   const $$ = (selector, root = document) => Array.from(root.querySelectorAll(selector));
@@ -201 +202 @@
   function showProductFailure(message) {
     $('#wsmProductCount').textContent = 'Products could not be loaded';
-    $('#wsmProductRows').innerHTML = `<tr><td colspan="7" class="wsm-empty"><p>${esc(message)}</p><button class="wsm-button secondary" type="button" data-retry-products>Try again</button></td></tr>`;
+    $('#wsmProductRows').innerHTML = `<tr><td colspan="6" class="wsm-empty"><p>${esc(message)}</p><button class="wsm-button secondary" type="button" data-retry-products>Try again</button></td></tr>`;
   }
 
   function showProductLoading() {
     $('#wsmProductCount').textContent = 'Loading products...';
-    $('#wsmProductRows').innerHTML = '<tr><td colspan="7" class="wsm-empty">Loading products...</td></tr>';
+    $('#wsmProductRows').innerHTML = '<tr><td colspan="6" class="wsm-empty">Loading products...</td></tr>';
   }
 
@@ -225 +226 @@
   }
 
+  function reportPageCount(rows) {
+    return Math.max(1, Math.ceil(rows.length / REPORT_PAGE_SIZE));
+  }
+
+  function reportPageRows(rows, page) {
+    const start = (page - 1) * REPORT_PAGE_SIZE;
+    return rows.slice(start, start + REPORT_PAGE_SIZE);
+  }
+
+  function updateReportPager(prefix, page, pages) {
+    const label = $(`#wsm${prefix}Page`);
+    const previous = $(`#wsmPrev${prefix}`);
+    const next = $(`#wsmNext${prefix}`);
+    if (label) label.textContent = `Page ${page} of ${pages}`;
+    if (previous) previous.disabled = page <= 1;
+    if (next) next.disabled = page >= pages;
+  }
+
+  function cogsSkuStartDateKey(product) {
+    const date = String(product?.sku || '').slice(0, 10);
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(date)) return '';
+    const parsed = new Date(`${date}T00:00:00Z`);
+    return parsed.getUTCFullYear() === Number(date.slice(0, 4)) && parsed.getUTCMonth() + 1 === Number(date.slice(5, 7)) && parsed.getUTCDate() === Number(date.slice(8, 10)) ? date : '';
+  }
+
   function sortCogsProducts(items) {
     return [...items].sort((left, right) => {
+      const leftDate = cogsSkuStartDateKey(left);
+      const rightDate = cogsSkuStartDateKey(right);
+      if (!leftDate || !rightDate) {
+        if (leftDate !== rightDate) return leftDate ? -1 : 1;
+      }
+      const dateCompare = leftDate.localeCompare(rightDate);
+      if (dateCompare) return dateCompare;
+      const skuCompare = String(left.sku || '').localeCompare(String(right.sku || ''), undefined, { numeric: true, sensitivity: 'base' });
+      if (skuCompare) return skuCompare;
       const nameCompare = String(left.name || '').localeCompare(String(right.name || ''), undefined, { numeric: true, sensitivity: 'base' });
-      if (nameCompare) return nameCompare;
-      const skuCompare = String(left.sku || '').localeCompare(String(right.sku || ''), undefined, { numeric: true, sensitivity: 'base' });
-      return skuCompare || Number(left.id || 0) - Number(right.id || 0);
+      return nameCompare || Number(left.id || 0) - Number(right.id || 0);
     });
   }
@@ -283 +316 @@
       $('#wsmPrevProducts').disabled = state.productPage <= 1;
       $('#wsmNextProducts').disabled = state.productPage >= state.productPages;
-      rows.innerHTML = result.items.length ? result.items.map(productRow).join('') : '<tr><td colspan="7" class="wsm-empty">No products found.</td></tr>';
+      rows.innerHTML = result.items.length ? result.items.map(productRow).join('') : '<tr><td colspan="6" class="wsm-empty">No products found.</td></tr>';
     } catch (error) {
       showProductFailure(error.message);
@@ -292 +325 @@
     const quantity = product.manage_stock ? Number(product.stock_quantity || 0) : product.stock_status === 'instock' ? 'In stock' : 'Out of stock';
     const stockClass = product.stock_status === 'outofstock' || quantity === 0 ? 'none' : (typeof quantity === 'number' && quantity < 10 ? 'low' : 'good');
-    const cogs = product.current_cogs === null || product.current_cogs === undefined || product.current_cogs === '' ? 'Not set' : money(product.current_cogs);
-    return `<tr><td><div class="wsm-product-cell"><img src="${esc(product.image)}" alt=""><div><strong>${esc(product.name)}</strong><small>${product.sale_price ? `${money(product.sale_price)} sale price` : 'Simple product'}</small></div></div></td><td>${esc(product.sku || 'Not set')}</td><td>${money(product.regular_price)}</td><td>${esc(cogs)}</td><td><span class="wsm-stock ${stockClass}">${esc(quantity)}</span></td><td><span class="wsm-status ${esc(product.status)}">${product.status === 'publish' ? 'Published' : esc(product.status)}</span></td><td><button class="wsm-link-button" data-edit-product="${product.id}">Edit</button></td></tr>`;
+    return `<tr><td><div class="wsm-product-cell"><img src="${esc(product.image)}" alt=""><div><strong>${esc(product.name)}</strong><small>${product.sale_price ? `${money(product.sale_price)} sale price` : 'Simple product'}</small></div></div></td><td>${esc(product.sku || 'Not set')}</td><td>${money(product.regular_price)}</td><td><span class="wsm-stock ${stockClass}">${esc(quantity)}</span></td><td><span class="wsm-status ${esc(product.status)}">${product.status === 'publish' ? 'Published' : esc(product.status)}</span></td><td><button class="wsm-link-button" data-edit-product="${product.id}">Edit</button></td></tr>`;
   }
 
@@ -390 +422 @@
       } while (page <= pages);
       state.sales = combined;
-      const s = combined.summary;
-      $('#wsmSalesSummary').innerHTML = [['Orders', s.orders], ['Items sold', s.items], ['Gross', money(s.gross, combined.currency)], ['Tax', money(s.tax, combined.currency)], ['Net', money(s.net, combined.currency)], ['Refunds', money(s.refunds, combined.currency)]].map(([label, value]) => `<div><span>${label}</span><strong>${value}</strong></div>`).join('');
-      $('#wsmSalesRows').innerHTML = combined.rows.length ? combined.rows.map(row => `<tr><td>${row.pdf_url ? `<a class="wsm-order-link" href="${esc(row.pdf_url)}" target="_blank" rel="noopener" data-order-pdf="${row.id}">#${row.id}</a>` : `#${row.id}`}</td><td>${esc(row.date)}</td><td>${esc(row.customer)}</td><td>${esc(row.status)}</td><td>${row.items}</td><td>${money(row.gross, combined.currency)}</td><td>${money(row.tax, combined.currency)}</td><td>${money(row.net, combined.currency)}</td><td>${money(row.refunds, combined.currency)}</td></tr>`).join('') : '<tr><td colspan="9" class="wsm-empty">No orders in this period.</td></tr>';
+      state.salesPage = 1;
+      renderSales();
       $('#wsmExportSales').disabled = false;
       if (combined.skipped) notice(`${combined.skipped} order${combined.skipped === 1 ? ' could' : 's could'} not be included in this report.`, 'error');
     } catch (error) {
+      state.sales = null;
+      state.salesPages = 1;
+      updateReportPager('Sales', 1, 1);
       $('#wsmSalesSummary').innerHTML = '';
       $('#wsmSalesRows').innerHTML = `<tr><td colspan="9" class="wsm-empty">${esc(error.message)}</td></tr>`;
@@ -404 +438 @@
       $('#wsmRunSales').textContent = 'Run report';
     }
+  }
+
+  function renderSales() {
+    if (!state.sales) return;
+    const combined = state.sales;
+    state.salesPages = reportPageCount(combined.rows);
+    state.salesPage = Math.min(Math.max(1, state.salesPage), state.salesPages);
+    const s = combined.summary;
+    $('#wsmSalesSummary').innerHTML = [['Orders', s.orders], ['Items sold', s.items], ['Gross', money(s.gross, combined.currency)], ['Tax', money(s.tax, combined.currency)], ['Net', money(s.net, combined.currency)], ['Refunds', money(s.refunds, combined.currency)]].map(([label, value]) => `<div><span>${label}</span><strong>${value}</strong></div>`).join('');
+    const rows = reportPageRows(combined.rows, state.salesPage);
+    $('#wsmSalesRows').innerHTML = rows.length ? rows.map(row => `<tr><td>${row.pdf_url ? `<a class="wsm-order-link" href="${esc(row.pdf_url)}" target="_blank" rel="noopener" data-order-pdf="${row.id}">#${row.id}</a>` : `#${row.id}`}</td><td>${esc(row.date)}</td><td>${esc(row.customer)}</td><td>${esc(row.status)}</td><td>${row.items}</td><td>${money(row.gross, combined.currency)}</td><td>${money(row.tax, combined.currency)}</td><td>${money(row.net, combined.currency)}</td><td>${money(row.refunds, combined.currency)}</td></tr>`).join('') : '<tr><td colspan="9" class="wsm-empty">No orders in this period.</td></tr>';
+    updateReportPager('Sales', state.salesPage, state.salesPages);
   }
 
@@ -434 +480 @@
     $('#wsmCustomerCategory').disabled = true;
     $('#wsmExportCustomers').disabled = true;
+    state.customerPage = 1;
+    state.customerPages = 1;
+    updateReportPager('Customers', 1, 1);
     $('#wsmCustomerRows').innerHTML = '<tr><td colspan="8" class="wsm-empty">Add a customer to create their account and send a setup email.</td></tr>';
   }
@@ -509 +558 @@
     const rows = ranked.filter(row => !search || row.name.toLowerCase().includes(search) || row.email.toLowerCase().includes(search));
     state.customerView = rows;
+    state.customerPages = reportPageCount(rows);
+    state.customerPage = Math.min(Math.max(1, state.customerPage), state.customerPages);
+    const pageRows = reportPageRows(rows, state.customerPage);
     const totals = rows.reduce((summary, row) => ({ value: summary.value + row.total, orders: summary.orders + row.orders, items: summary.items + row.items }), { value: 0, orders: 0, items: 0 });
     $('#wsmCustomerCount').textContent = category ? `${rows.length} customer${rows.length === 1 ? '' : 's'} shown for ${category}` : `${rows.length} customer${rows.length === 1 ? '' : 's'} shown from ${state.customers.rows.length} purchasing customer${state.customers.rows.length === 1 ? '' : 's'}`;
     $('#wsmCustomerSummary').innerHTML = [['Customers', rows.length], [category ? 'Category value' : 'Accumulated value', money(totals.value, state.customers.currency)], [category ? 'Category orders' : 'Orders', totals.orders], [category ? 'Category items' : 'Items purchased', totals.items]].map(([label, value]) => `<div><span>${label}</span><strong>${value}</strong></div>`).join('');
-    $('#wsmCustomerRows').innerHTML = rows.length ? rows.map(row => `<tr><td><strong class="wsm-rank">#${row.rank}</strong></td><td><strong>${esc(row.name)}</strong></td><td><a href="mailto:${esc(row.email)}">${esc(row.email)}</a></td><td>${row.orders}</td><td>${row.items}</td><td><strong>${money(row.total, state.customers.currency)}</strong></td><td><div class="wsm-permission-list">${row.categories.length ? row.categories.map(item => `<span>${esc(item)}</span>`).join('') : '<span>Uncategorised</span>'}</div></td><td>${esc(row.last_purchase)}</td></tr>`).join('') : '<tr><td colspan="8" class="wsm-empty">No purchasing customers match these filters.</td></tr>';
+    $('#wsmCustomerRows').innerHTML = pageRows.length ? pageRows.map(row => `<tr><td><strong class="wsm-rank">#${row.rank}</strong></td><td><strong>${esc(row.name)}</strong></td><td><a href="mailto:${esc(row.email)}">${esc(row.email)}</a></td><td>${row.orders}</td><td>${row.items}</td><td><strong>${money(row.total, state.customers.currency)}</strong></td><td><div class="wsm-permission-list">${row.categories.length ? row.categories.map(item => `<span>${esc(item)}</span>`).join('') : '<span>Uncategorised</span>'}</div></td><td>${esc(row.last_purchase)}</td></tr>`).join('') : '<tr><td colspan="8" class="wsm-empty">No purchasing customers match these filters.</td></tr>';
+    updateReportPager('Customers', state.customerPage, state.customerPages);
   }
 
@@ -574 +627 @@
     const rows = ranked.filter(row => (!search || row.name.toLowerCase().includes(search) || String(row.sku || '').toLowerCase().includes(search)) && (!category || row.categories.includes(category)));
     state.bestSellerView = rows;
+    state.bestSellerPages = reportPageCount(rows);
+    state.bestSellerPage = Math.min(Math.max(1, state.bestSellerPage), state.bestSellerPages);
+    const pageRows = reportPageRows(rows, state.bestSellerPage);
     const totals = rows.reduce((summary, row) => ({ value: summary.value + row.value, quantity: summary.quantity + row.quantity, orders: summary.orders + row.orders }), { value: 0, quantity: 0, orders: 0 });
     $('#wsmBestSellerCount').textContent = `${rows.length} product${rows.length === 1 ? '' : 's'} shown from ${ranked.length} product${ranked.length === 1 ? '' : 's'} sold`;
     $('#wsmBestSellerSummary').innerHTML = [['Products', rows.length], ['Accumulated value', money(totals.value, state.bestSellers.currency)], ['Quantity sold', formatQuantity(totals.quantity)], ['Average item value', money(totals.quantity ? totals.value / totals.quantity : 0, state.bestSellers.currency)]].map(([label, value]) => `<div><span>${label}</span><strong>${value}</strong></div>`).join('');
-    $('#wsmBestSellerRows').innerHTML = rows.length ? rows.map(row => `<tr><td><strong class="wsm-rank">#${row.rank}</strong></td><td><strong>${esc(row.name)}</strong></td><td>${esc(row.sku || 'Not set')}</td><td><strong>${formatQuantity(row.quantity)}</strong></td><td><strong>${money(row.value, state.bestSellers.currency)}</strong></td><td>${row.orders}</td><td>${money(row.quantity ? row.value / row.quantity : 0, state.bestSellers.currency)}</td><td><div class="wsm-permission-list">${row.categories.length ? row.categories.map(item => `<span>${esc(item)}</span>`).join('') : '<span>Uncategorised</span>'}</div></td></tr>`).join('') : '<tr><td colspan="8" class="wsm-empty">No sold products match these filters.</td></tr>';
+    $('#wsmBestSellerRows').innerHTML = pageRows.length ? pageRows.map(row => `<tr><td><strong class="wsm-rank">#${row.rank}</strong></td><td><strong>${esc(row.name)}</strong></td><td>${esc(row.sku || 'Not set')}</td><td><strong>${formatQuantity(row.quantity)}</strong></td><td><strong>${money(row.value, state.bestSellers.currency)}</strong></td><td>${row.orders}</td><td>${money(row.quantity ? row.value / row.quantity : 0, state.bestSellers.currency)}</td><td><div class="wsm-permission-list">${row.categories.length ? row.categories.map(item => `<span>${esc(item)}</span>`).join('') : '<span>Uncategorised</span>'}</div></td></tr>`).join('') : '<tr><td colspan="8" class="wsm-empty">No sold products match these filters.</td></tr>';
+    updateReportPager('BestSellers', state.bestSellerPage, state.bestSellerPages);
   }
 
@@ -760 +817 @@
   }
 
+  function cogsProductLabel(product) {
+    return `${esc(product.name)}${product.sku ? ` (${esc(product.sku)})` : ''}`;
+  }
+
+  function filteredCogsProducts() {
+    const items = state.cogsSearch?.items || [];
+    const term = String($('#wsmCogsProductSearch')?.value || '').trim().toLowerCase();
+    if (!term) return items;
+    return items.filter(product => [product.name, product.sku].some(value => String(value || '').toLowerCase().includes(term)));
+  }
+
+  function renderCogsProductOptions() {
+    const select = $('#wsmCogsProductSelect');
+    const items = filteredCogsProducts();
+    const selected = String(select.value || state.cogs?.id || '');
+    const selectedProduct = selected && !(items.some(product => String(product.id) === selected)) ? (state.cogsSearch?.items || []).find(product => String(product.id) === selected) : null;
+    select.innerHTML = '<option value="">Choose a product...</option>' + (selectedProduct ? `<option value="${selectedProduct.id}">${cogsProductLabel(selectedProduct)}</option>` : '') + items.map(product => `<option value="${product.id}">${cogsProductLabel(product)}</option>`).join('');
+    select.disabled = !(items.length || selectedProduct);
+    if (selected && Array.from(select.options).some(option => option.value === selected)) select.value = selected;
+    const total = Number(state.cogsSearch?.total || 0);
+    const searchTerm = String($('#wsmCogsProductSearch')?.value || '').trim();
+    $('#wsmCogsStatus').textContent = items.length ? (searchTerm ? `${items.length} matching product${items.length === 1 ? '' : 's'} from ${total}.` : `${total} product${total === 1 ? '' : 's'} available.`) : (searchTerm ? 'No products match that search.' : 'No products are available for COGS entry.');
+  }
+
   async function loadCogsProducts() {
     const select = $('#wsmCogsProductSelect');
@@ -768 +849 @@
     state.cogs = null;
     try {
-      state.cogsSearch = await api(`cogs/products?${new URLSearchParams({ limit: 500, status: $('#wsmCogsProductStatus').value || 'all', order_filter: $('#wsmCogsOrderFilter').value || 'all', search: $('#wsmCogsProductSearch').value || '' })}`);
+      state.cogsSearch = await api(`cogs/products?${new URLSearchParams({ limit: 500, status: $('#wsmCogsProductStatus').value || 'all' })}`);
       state.cogsSearch.items = sortCogsProducts(state.cogsSearch.items || []);
-      select.innerHTML = '<option value="">Choose a product...</option>' + state.cogsSearch.items.map(product => `<option value="${product.id}">${esc(product.name)}${product.sku ? ` (${esc(product.sku)})` : ''}</option>`).join('');
-      select.disabled = !state.cogsSearch.items.length;
-      $('#wsmCogsStatus').textContent = state.cogsSearch.items.length ? `${state.cogsSearch.total} product${state.cogsSearch.total === 1 ? '' : 's'} available.` : 'No products match the current COGS filters.';
+      renderCogsProductOptions();
     } catch (error) {
       select.innerHTML = '<option value="">Products could not be loaded</option>';
@@ -825 +904 @@
     const profitability = state.cogs.profitability || {};
     const netRevenue = Number(profitability.net_revenue || 0);
-    const grossRevenue = Number(profitability.gross_revenue || 0);
-    const quantity = Number(profitability.quantity || 0);
-    const soldCogsNet = totals.net * quantity;
-    const profit = netRevenue - soldCogsNet;
+    const profit = netRevenue - totals.net;
     const margin = netRevenue > 0 ? (profit / netRevenue) * 100 : null;
     const rows = state.cogs.entries.filter(entry => entry.date || entry.net || entry.tax || entry.gross || entry.reference || entry.description).length;
     $('#wsmCogsSummary').innerHTML = [
-      ['Accumulated net revenue', money(netRevenue, state.cogs.currency)],
-      ['Accumulated gross revenue', money(grossRevenue, state.cogs.currency)],
-      ['Total COGS (net)', money(soldCogsNet, state.cogs.currency)],
+      ['Accumulated net revenue (before tax)', money(netRevenue, state.cogs.currency)],
+      ['Total COGS (net)', money(totals.net, state.cogs.currency)],
       ['Profit', money(profit, state.cogs.currency)],
       ['Margin', margin === null ? 'n/a' : `${margin.toFixed(2)}%`],
-      ['Qty sold', formatQuantity(quantity)],
+      ['Qty sold', formatQuantity(profitability.quantity)],
       ['Orders', Number(profitability.orders || 0)]
     ].map(([label, value]) => `<div><span>${label}</span><strong>${value}</strong></div>`).join('');
@@ -843 +918 @@
       $('#wsmCogsStatus').textContent = profitability.truncated ? 'Profitability is based on the most recent order pages.' : `${profitability.skipped} order item${Number(profitability.skipped) === 1 ? '' : 's'} could not be included in profitability.`;
     } else {
-      $('#wsmCogsStatus').textContent = rows ? 'COGS entries ready. Profit uses accumulated net revenue from net sales minus unit COGS multiplied by quantity sold.' : 'Profit uses accumulated net revenue from net sales minus unit COGS multiplied by quantity sold.';
+      $('#wsmCogsStatus').textContent = rows ? 'COGS entries ready. Profit uses accumulated net revenue from net sales minus total COGS (net).' : 'Profit uses accumulated net revenue from net sales minus total COGS (net).';
     }
   }
@@ -1082 +1157 @@
   $('#wsmSalesTo').addEventListener('change', () => $$('[data-period]').forEach(button => button.classList.remove('active')));
   $('#wsmSalesStatus').addEventListener('change', runSales);
-  let customerSearchTimer; $('#wsmCustomerSearch').addEventListener('input', () => { clearTimeout(customerSearchTimer); customerSearchTimer = setTimeout(renderCustomers, 200); });
+  $('#wsmPrevSales').addEventListener('click', () => { if (state.salesPage > 1) { state.salesPage--; renderSales(); } });
+  $('#wsmNextSales').addEventListener('click', () => { if (state.salesPage < state.salesPages) { state.salesPage++; renderSales(); } });
+  let customerSearchTimer; $('#wsmCustomerSearch').addEventListener('input', () => { clearTimeout(customerSearchTimer); customerSearchTimer = setTimeout(() => { state.customerPage = 1; renderCustomers(); }, 200); });
   $('#wsmAddCustomer').addEventListener('click', () => editCustomer());
-  $('#wsmCustomerCategory').addEventListener('change', renderCustomers); $('#wsmExportCustomers').addEventListener('click', exportCustomers);
-  let bestSellerSearchTimer; $('#wsmBestSellerSearch').addEventListener('input', () => { clearTimeout(bestSellerSearchTimer); bestSellerSearchTimer = setTimeout(renderBestSellers, 200); });
-  $('#wsmBestSellerCategory').addEventListener('change', renderBestSellers); $('#wsmBestSellerRanking').addEventListener('change', renderBestSellers); $('#wsmExportBestSellers').addEventListener('click', exportBestSellers);
+  $('#wsmCustomerCategory').addEventListener('change', () => { state.customerPage = 1; renderCustomers(); }); $('#wsmExportCustomers').addEventListener('click', exportCustomers);
+  $('#wsmPrevCustomers').addEventListener('click', () => { if (state.customerPage > 1) { state.customerPage--; renderCustomers(); } });
+  $('#wsmNextCustomers').addEventListener('click', () => { if (state.customerPage < state.customerPages) { state.customerPage++; renderCustomers(); } });
+  let bestSellerSearchTimer; $('#wsmBestSellerSearch').addEventListener('input', () => { clearTimeout(bestSellerSearchTimer); bestSellerSearchTimer = setTimeout(() => { state.bestSellerPage = 1; renderBestSellers(); }, 200); });
+  $('#wsmBestSellerCategory').addEventListener('change', () => { state.bestSellerPage = 1; renderBestSellers(); }); $('#wsmBestSellerRanking').addEventListener('change', () => { state.bestSellerPage = 1; renderBestSellers(); }); $('#wsmExportBestSellers').addEventListener('click', exportBestSellers);
+  $('#wsmPrevBestSellers').addEventListener('click', () => { if (state.bestSellerPage > 1) { state.bestSellerPage--; renderBestSellers(); } });
+  $('#wsmNextBestSellers').addEventListener('click', () => { if (state.bestSellerPage < state.bestSellerPages) { state.bestSellerPage++; renderBestSellers(); } });
   $('#wsmCashFilters').addEventListener('submit', runCashFlow);
   $$('.wsm-tabs [data-forecast-tab]').forEach(button => button.addEventListener('click', () => {
@@ -1099 +1180 @@
   $('#wsmCogsProductSelect').addEventListener('change', event => selectCogsProduct(Number(event.currentTarget.value || 0)));
   $('#wsmCogsProductStatus').addEventListener('change', loadCogsProducts);
-  $('#wsmCogsOrderFilter').addEventListener('change', loadCogsProducts);
-  $('#wsmCogsProductSearch').addEventListener('input', () => { clearTimeout(loadCogsProducts.searchTimer); loadCogsProducts.searchTimer = setTimeout(loadCogsProducts, 300); });
+  $('#wsmCogsProductSearch').addEventListener('input', renderCogsProductOptions);
   $('#wsmCogsReloadProducts').addEventListener('click', loadCogsProducts);
   $('#wsmAddCogsEntry').addEventListener('click', addCogsEntry);

pfh-shop-manager/trunk/includes/class-pfhsm-plugin.php

@@ -506 +506 @@
 
                 wp_enqueue_style( 'pfhsm-app', PFHSM_URL . 'assets/app.css', array(), PFHSM_VERSION );
-                wp_enqueue_script( 'pfhsm-app', PFHSM_URL . 'assets/app-0.4.40.js', array(), PFHSM_VERSION, true );
+                wp_enqueue_script( 'pfhsm-app', PFHSM_URL . 'assets/app-0.4.45.js', array(), PFHSM_VERSION, true );
                 wp_localize_script(
                         'pfhsm-app',

pfh-shop-manager/trunk/includes/class-pfhsm-rest-controller.php

@@ -133 +133 @@
 
         private function order_customer_label( WC_Order $order ): string {
-                if ( ! $this->order_has_billing_address( $order ) ) {
-                        return self::GUEST_CHECKOUT_LABEL;
-                }
-
                 $name = trim( (string) $order->get_formatted_billing_full_name() );
                 if ( '' !== $name ) {
                         return $name;
+                }
+
+                $name_parts = array();
+                foreach ( array( 'get_billing_first_name', 'get_billing_last_name' ) as $method ) {
+                        if ( method_exists( $order, $method ) ) {
+                                $name_parts[] = trim( (string) $order->{$method}() );
+                        }
+                }
+                $name = trim( implode( ' ', array_filter( $name_parts ) ) );
+                if ( '' !== $name ) {
+                        return $name;
+                }
+
+                $name_parts = array( trim( (string) $order->get_meta( '_billing_first_name', true ) ), trim( (string) $order->get_meta( '_billing_last_name', true ) ) );
+                $name = trim( implode( ' ', array_filter( $name_parts ) ) );
+                if ( '' !== $name ) {
+                        return $name;
+                }
+
+                if ( method_exists( $order, 'get_formatted_shipping_full_name' ) ) {
+                        $name = trim( (string) $order->get_formatted_shipping_full_name() );
+                        if ( '' !== $name ) {
+                                return $name;
+                        }
+                }
+
+                if ( method_exists( $order, 'get_customer_id' ) ) {
+                        $user = $order->get_customer_id() ? get_userdata( $order->get_customer_id() ) : false;
+                        if ( $user && ! empty( $user->display_name ) ) {
+                                return (string) $user->display_name;
+                        }
+                }
+
+                if ( ! $this->order_has_billing_address( $order ) ) {
+                        return self::GUEST_CHECKOUT_LABEL;
                 }
 
@@ -204 +235 @@
                         'regular_price'     => $product->get_regular_price(),
                         'sale_price'        => $product->get_sale_price(),
-                        'current_cogs'      => method_exists( $product, 'get_cogs_value' ) ? $product->get_cogs_value() : null,
                         'short_description' => $product->get_short_description(),
                         'description'       => $product->get_description(),
@@ -358 +388 @@
                 } while ( $page <= $pages && $page <= $max_pages );
 
-                $sold_cogs_net = $cogs_net * $quantity;
-                $profit = $net_revenue - $sold_cogs_net;
+                $profit = $net_revenue - $cogs_net;
                 return array(
                         'orders'         => count( $orders ),
@@ -366 +395 @@
                         'tax'            => wc_format_decimal( $tax, 2 ),
                         'gross_revenue'  => wc_format_decimal( $gross_revenue, 2 ),
-                        'unit_cogs_net'  => wc_format_decimal( $cogs_net, 2 ),
-                        'cogs_net'       => wc_format_decimal( $sold_cogs_net, 2 ),
+                        'cogs_net'       => wc_format_decimal( $cogs_net, 2 ),
                         'profit'         => wc_format_decimal( $profit, 2 ),
                         'margin_percent' => $net_revenue > 0 ? wc_format_decimal( ( $profit / $net_revenue ) * 100, 2 ) : null,
@@ -375 +403 @@
         }
 
-        private function cogs_sold_product_ids(): array {
-                $paid_statuses = function_exists( 'wc_get_is_paid_statuses' ) ? wc_get_is_paid_statuses() : array( 'processing', 'completed' );
-                $statuses = array_values( array_unique( array_merge( $paid_statuses, array( 'refunded' ) ) ) );
-                $max_pages = min( 100, max( 1, (int) apply_filters( 'pfhsm_cogs_sold_product_order_pages', 50 ) ) );
-                $page = 1;
-                $pages = 1;
-                $product_ids = array();
-
-                do {
-                        try {
-                                $result = wc_get_orders(
-                                        array(
-                                                'limit'    => 100,
-                                                'page'     => $page,
-                                                'paginate' => true,
-                                                'orderby'  => 'date',
-                                                'order'    => 'DESC',
-                                                'status'   => $statuses,
-                                        )
-                                );
-                        } catch ( Throwable $exception ) {
-                                $this->log_exception( 'cogs sold products query failed', $exception );
-                                break;
-                        }
-
-                        $pages = max( 1, (int) $result->max_num_pages );
-                        foreach ( $result->orders as $order ) {
-                                if ( is_a( $order, 'WC_Order_Refund' ) || ( method_exists( $order, 'get_type' ) && 'shop_order_refund' === $order->get_type() ) ) {
-                                        continue;
-                                }
-
-                                foreach ( $order->get_items( 'line_item' ) as $item ) {
-                                        $product_id = absint( $item->get_product_id() );
-                                        if ( $product_id ) {
-                                                $product_ids[ $product_id ] = true;
-                                        }
-
-                                        $variation_id = absint( $item->get_variation_id() );
-                                        if ( $variation_id ) {
-                                                $product_ids[ $variation_id ] = true;
-                                        }
-                                }
-                        }
-                        $page++;
-                } while ( $page <= $pages && $page <= $max_pages );
-
-                return array_keys( $product_ids );
-        }
-
         public function cogs_products( WP_REST_Request $request ) {
                 if ( $error = $this->require_woocommerce() ) {
@@ -433 +412 @@
                 $status_filter = sanitize_key( (string) $request->get_param( 'status' ) );
                 $statuses = in_array( $status_filter, array( 'publish', 'draft' ), true ) ? array( $status_filter ) : array( 'publish', 'draft' );
-                $order_filter = sanitize_key( (string) $request->get_param( 'order_filter' ) );
-                $with_orders = 'with_orders' === $order_filter;
-                $sold_product_ids = $with_orders ? array_flip( $this->cogs_sold_product_ids() ) : array();
 
                 $products = array();
@@ -441 +417 @@
                 if ( $sku_id ) {
                         $product = wc_get_product( $sku_id );
-                        if ( $product instanceof WC_Product && in_array( $product->get_status(), $statuses, true ) && ( ! $with_orders || isset( $sold_product_ids[ $product->get_id() ] ) ) ) {
+                        if ( $product instanceof WC_Product && in_array( $product->get_status(), $statuses, true ) ) {
                                 $products[ $product->get_id() ] = $product;
                         }
                 }
 
-                $product_query = array(
-                        'limit'   => $limit,
-                        'status'  => $statuses,
-                        'orderby' => 'title',
-                        'order'   => 'ASC',
-                );
-                if ( $with_orders ) {
-                        $product_query['include'] = array_keys( $sold_product_ids );
-                }
-
-                $result = $sold_product_ids || ! $with_orders ? wc_get_products( $product_query ) : array();
+                $result = wc_get_products(
+                        array(
+                                'limit'  => $limit,
+                                'status' => $statuses,
+                                'orderby' => 'date',
+                                'order'  => 'DESC',
+                        )
+                );
                 if ( '' !== $search ) {
                         $result = wc_get_products(
@@ -463 +436 @@
                                         'status'  => $statuses,
                                         's'       => $search,
-                                        'orderby' => 'title',
-                                        'order'   => 'ASC',
+                                        'orderby' => 'date',
+                                        'order'   => 'DESC',
                                 )
                         );
@@ -470 +443 @@
                 foreach ( $result as $product ) {
                         if ( $product instanceof WC_Product ) {
-                                if ( $with_orders && ! isset( $sold_product_ids[ $product->get_id() ] ) ) {
-                                        continue;
-                                }
                                 $products[ $product->get_id() ] = $product;
                         }
@@ -481 +451 @@
                         $product_list,
                         function ( WC_Product $left, WC_Product $right ): int {
-                                $name_compare = strnatcasecmp( (string) $left->get_name(), (string) $right->get_name() );
-                                if ( 0 !== $name_compare ) {
-                                        return $name_compare;
+                                $left_date = $this->product_sku_start_date_key( $left );
+                                $right_date = $this->product_sku_start_date_key( $right );
+                                if ( '' === $left_date || '' === $right_date ) {
+                                        if ( $left_date !== $right_date ) {
+                                                return '' === $left_date ? 1 : -1;
+                                        }
+                                }
+
+                                $date_compare = strcmp( $left_date, $right_date );
+                                if ( 0 !== $date_compare ) {
+                                        return $date_compare;
                                 }
 
@@ -491 +469 @@
                                 }
 
-                                return $left->get_id() <=> $right->get_id();
+                                $name_compare = strnatcasecmp( (string) $left->get_name(), (string) $right->get_name() );
+                                return 0 !== $name_compare ? $name_compare : $left->get_id() <=> $right->get_id();
                         }
                 );
@@ -1603 +1582 @@
                         'pfhsm_view_cash_flow'    => 'Sales Forecast',
                         'pfhsm_manage_cash_flow_schedule' => 'Sales Forecast schedules',
-                        'pfhsm_manage_cogs'       => 'COGS',
                         'pfhsm_manage_users'      => 'Users and groups',
                         'pfhsm_view_help'         => 'Help',

pfh-shop-manager/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.0
 Requires PHP: 8.0
-Stable tag: 0.4.40
+Stable tag: 0.4.45
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -15 +15 @@
 PFH Shop Manager provides a branded portal at /pfh-shop-manager/ for managing one WooCommerce shop.
 
-Version 0.4.40 includes:
+Version 0.4.45 includes:
 
 * Product creation and editing, including prices, descriptions, stock and dimensions.
@@ -29 +29 @@
 * Potential-sales reporting, CSV/PDF exports and scheduled sales forecast emails.
 * COGS entry management for WooCommerce stores with Cost of Goods Sold enabled.
-* COGS profitability on the COGS screen, showing accumulated net and gross revenue, sold COGS, profit and margin.
-* A COGS product filter for products that have orders.
-* Native WooCommerce COGS values on the Products list.
+* COGS profitability on the COGS screen, showing accumulated net revenue, total COGS, profit and margin.
 * Shop Manager, Shop Assistant and Accountant user roles.
 * Permission-protected login and explicit logout activity for portal users, retained for 90 days.
@@ -42 +40 @@
 = Development and source =
 
-The human-readable source used to build this plugin is included in the plugin package. The frontend source is `assets/app.js`; the versioned `assets/app-0.4.40.js` file is a release copy of the same source used for cache busting. No npm, webpack or minification step is required. Release packages are built from this repository with `scripts/build-release.ps1`.
+The human-readable source used to build this plugin is included in the plugin package. The frontend source is `assets/app.js`; the versioned `assets/app-0.4.45.js` file is a release copy of the same source used for cache busting. No npm, webpack or minification step is required. Release packages are built from this repository with `scripts/build-release.ps1`.
 
 == Installation ==
@@ -61 +59 @@
 == Changelog ==
 
-= 0.4.40 =
-* Sorts the COGS product dropdown alphabetically by product title instead of SKU date.
-* Adds COGS product search while retaining the order filter.
-* Adds COGS to the editable user group permissions list.
-* Updates the cache-busting portal script filename for the 0.4.40 release.
-
-= 0.4.39 =
-* Adds a Users action for sending branded PFH Shop Manager password reset emails.
-* Keeps password reset emails on the PFH Shop Manager reset flow instead of the default WordPress lost-password page.
-* Updates the cache-busting portal script filename for the 0.4.39 release.
-
-= 0.4.38 =
-* Adds a COGS order filter for showing products that have orders.
-* Shows native WooCommerce COGS values on the Products list.
-* Shows accumulated gross revenue in the selected-product COGS profitability summary.
-* Calculates total COGS as unit COGS multiplied by quantity sold.
-* Updates the cache-busting portal script filename for the 0.4.38 release.
+= 0.4.45 =
+* Adds product-style pagination to Sales, Customers and Best Sellers report tables.
+* Uses a fresh script filename to make the 0.4.45 deployment visible.
+
+= 0.4.44 =
+* Aligns the COGS status, product search, product picker and refresh controls cleanly.
+* Uses a fresh script filename to make the 0.4.44 deployment visible.
+
+= 0.4.43 =
+* Adds a product/SKU search box to the COGS product picker.
+* Uses a fresh script filename to make the 0.4.43 deployment visible.
+
+= 0.4.42 =
+* Shows the billing customer name in Sales even when a manually completed BACS order has no full billing address.
+* Uses a fresh script filename to make the 0.4.42 deployment visible.
+
+= 0.4.41 =
+* Keeps the COGS profitability summary focused on accumulated net revenue before tax.
+* Removes accumulated gross revenue from the COGS summary tiles.
+* Updates the cache-busting portal script filename for the 0.4.41 release.
+
+= 0.4.37 =
+* Shows legacy Woo Shop Manager role assignments on the PFH Shop Manager Users screen.
+* Maps legacy built-in staff roles to the current PFH Shop Manager groups for safe display and editing.
+* Updates the cache-busting portal script filename for the 0.4.37 release.
 
 = 0.4.36 =

pfh-shop-manager/trunk/templates/portal.php

@@ -107 +107 @@
                                 <div class="wsm-page-heading"><div><h1>Products</h1><p id="wsmProductCount">Loading products...</p></div><button id="wsmAddProduct" class="wsm-button primary">+ Add product</button></div>
                                 <div class="wsm-toolbar"><label class="wsm-search"><span>&#9906;</span><input id="wsmProductSearch" type="search" placeholder="Search products..."></label><select id="wsmProductStatus" aria-label="Product status"><option value="all">All statuses</option><option value="publish">Published</option><option value="draft">Draft</option><option value="private">Private</option></select></div>
-                                <div class="wsm-table-wrap"><table class="wsm-table"><thead><tr><th>Product</th><th>SKU</th><th>Price</th><th>COGS</th><th>Stock</th><th>Status</th><th><span class="screen-reader-text">Actions</span></th></tr></thead><tbody id="wsmProductRows"><tr><td colspan="7" class="wsm-empty">Loading products...</td></tr></tbody></table></div>
+                                <div class="wsm-table-wrap"><table class="wsm-table"><thead><tr><th>Product</th><th>SKU</th><th>Price</th><th>Stock</th><th>Status</th><th><span class="screen-reader-text">Actions</span></th></tr></thead><tbody id="wsmProductRows"><tr><td colspan="6" class="wsm-empty">Loading products...</td></tr></tbody></table></div>
                                 <div class="wsm-pagination"><button id="wsmPrevProducts" class="wsm-icon-button" aria-label="Previous page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m15 18-6-6 6-6"/></svg></button><span id="wsmProductPage">Page 1</span><button id="wsmNextProducts" class="wsm-icon-button" aria-label="Next page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m9 18 6-6-6-6"/></svg></button></div>
                         </section>
@@ -134 +134 @@
                                 <div class="wsm-periods"><button type="button" data-period="year">Current year</button><button type="button" data-period="month" class="active">Current month</button><button type="button" data-period="prior">Prior month</button><label>From<input id="wsmSalesFrom" type="date"></label><label>To<input id="wsmSalesTo" type="date"></label><label>Status<select id="wsmSalesStatus" aria-label="Order status"><option value="">All statuses</option></select></label><button id="wsmRunSales" class="wsm-button primary" type="button">Run report</button></div>
                                 <div id="wsmSalesSummary" class="wsm-summary"></div><div class="wsm-table-wrap"><table class="wsm-table"><thead><tr><th>Order</th><th>Date</th><th>Customer</th><th>Status</th><th>Items</th><th>Gross</th><th>Tax</th><th>Net</th><th>Refunds</th></tr></thead><tbody id="wsmSalesRows"></tbody></table></div>
+                                <div class="wsm-pagination"><button id="wsmPrevSales" class="wsm-icon-button" aria-label="Previous page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m15 18-6-6 6-6"/></svg></button><span id="wsmSalesPage">Page 1 of 1</span><button id="wsmNextSales" class="wsm-icon-button" aria-label="Next page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m9 18 6-6-6-6"/></svg></button></div>
                         </section>
 
@@ -141 +142 @@
                                 <div id="wsmCustomerSummary" class="wsm-summary"></div>
                                 <div class="wsm-table-wrap"><table class="wsm-table wsm-customer-table"><thead><tr><th>Rank</th><th>Customer</th><th>Email</th><th>Orders</th><th>Items</th><th>Total order value</th><th>Purchase categories</th><th>Last purchase</th></tr></thead><tbody id="wsmCustomerRows"></tbody></table></div>
+                                <div class="wsm-pagination"><button id="wsmPrevCustomers" class="wsm-icon-button" aria-label="Previous page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m15 18-6-6 6-6"/></svg></button><span id="wsmCustomersPage">Page 1 of 1</span><button id="wsmNextCustomers" class="wsm-icon-button" aria-label="Next page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m9 18 6-6-6-6"/></svg></button></div>
                         </section>
 
@@ -148 +150 @@
                                 <div id="wsmBestSellerSummary" class="wsm-summary"></div>
                                 <div class="wsm-table-wrap"><table class="wsm-table wsm-best-seller-table"><thead><tr><th>Rank</th><th>Product</th><th>SKU</th><th>Qty sold</th><th>Sales value</th><th>Orders</th><th>Average item value</th><th>Categories</th></tr></thead><tbody id="wsmBestSellerRows"></tbody></table></div>
+                                <div class="wsm-pagination"><button id="wsmPrevBestSellers" class="wsm-icon-button" aria-label="Previous page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m15 18-6-6 6-6"/></svg></button><span id="wsmBestSellersPage">Page 1 of 1</span><button id="wsmNextBestSellers" class="wsm-icon-button" aria-label="Next page"><svg aria-hidden="true" viewBox="0 0 24 24"><path d="m9 18 6-6-6-6"/></svg></button></div>
                         </section>
 
@@ -184 +187 @@
                         <section class="wsm-view" data-panel="cogs">
                                 <div class="wsm-page-heading"><div><h1>COGS</h1><p>Enter dated Cost of Goods Sold rows for a product.</p><p id="wsmCogsStatus">Choose a product to begin.</p></div></div>
-                                <div class="wsm-toolbar"><label class="wsm-field">Status<select id="wsmCogsProductStatus" aria-label="Product status"><option value="all">Published and draft</option><option value="publish">Published products</option><option value="draft">Draft products</option></select></label><label class="wsm-field">Orders<select id="wsmCogsOrderFilter" aria-label="Order filter"><option value="all">All products</option><option value="with_orders">Products with orders</option></select></label><label class="wsm-field">Search<input id="wsmCogsProductSearch" type="search" placeholder="Search product title" aria-label="Search COGS products"></label><label class="wsm-field wsm-product-select-field">Product<select id="wsmCogsProductSelect" aria-label="Product"><option value="">Loading products...</option></select></label><button id="wsmCogsReloadProducts" class="wsm-button secondary" type="button">Refresh products</button></div>
+                                <div class="wsm-toolbar wsm-cogs-toolbar"><label class="wsm-field wsm-cogs-status-field">Status<select id="wsmCogsProductStatus" aria-label="Product status"><option value="all">Published and draft</option><option value="publish">Published products</option><option value="draft">Draft products</option></select></label><label class="wsm-search wsm-cogs-product-search"><span>&#9906;</span><input id="wsmCogsProductSearch" type="search" placeholder="Search product or SKU..." aria-label="Search COGS products"></label><label class="wsm-field wsm-product-select-field">Product<select id="wsmCogsProductSelect" aria-label="Product"><option value="">Loading products...</option></select></label><button id="wsmCogsReloadProducts" class="wsm-button secondary" type="button">Refresh products</button></div>
                                 <div id="wsmCogsEditor" class="wsm-section" hidden>
                                         <div class="wsm-subheading"><div><h2 id="wsmCogsProductName">Selected product</h2><p id="wsmCogsProductMeta"></p></div><button id="wsmAddCogsEntry" class="wsm-button secondary" type="button">+ Add cost row</button></div>

pfh-shop-manager/trunk/woo-shop-manager.php

@@ -3 +3 @@
  * Plugin Name: PFH Shop Manager
  * Description: A simplified, permission-controlled WooCommerce management portal for products, customers, shipping, sales and sales forecasting.
- * Version: 0.4.40
+ * Version: 0.4.45
  * Author: Paul Howe
  * License: GPL-2.0-or-later
@@ -16 +16 @@
 defined( 'ABSPATH' ) || exit;
 
-define( 'PFHSM_VERSION', '0.4.40' );
+define( 'PFHSM_VERSION', '0.4.45' );
 define( 'PFHSM_EDITION', 'lite' );
 define( 'PFHSM_FILE', __FILE__ );