-
- `;
+ // next time :(
+ // return /* html */`
+ //
- Refine results
-
-
-
-
- Weight
- Tag
-
-
-
+ //
+ // `;
+ return '';
}
Render() {
diff --git a/client/public/components/product-listing.mjs b/client/public/components/product-listing.mjs
index 60e8da6..1975705 100644
--- a/client/public/components/product-listing.mjs
+++ b/client/public/components/product-listing.mjs
@@ -1,5 +1,7 @@
import { RegisterComponent, Component, SideLoad } from './components.mjs';
import { AddProductToBasket } from '../basket.mjs';
+import * as LocalStorageListener from '../localstorage-listener.mjs';
+import * as Auth from '../auth.mjs';
class ProductListing extends Component {
static __IDENTIFY() { return 'product-listing'; }
@@ -142,11 +144,22 @@ class ProductListing extends Component {
+ // Refine results
+ //
+ //
+ //
+ //
+ // Weight
+ // Tag
+ //
+ //
+ //
-
+
{this.state.stock} in stock
+ ${localStorage.getItem('stock-mode') === 'true'
+ ? /* html */`
+
+ Change Stock
+
+
+
+ `
+ : ''
+ }
+
@@ -178,6 +191,37 @@ class ProductListing extends Component {
}
OnRender() {
+ LocalStorageListener.ListenOnKey('stock-mode', () => {
+ this.__INVOKE_RENDER();
+ });
+
+ if (localStorage.getItem('stock-mode') === 'true') {
+ const updateStockButton = this.root.querySelector('.product-stock-mode-button');
+ updateStockButton.addEventListener('click', async () => {
+ const input = this.root.querySelector('.product-stock-mode-input');
+ const stock = parseInt(input.value);
+ this.state.stock = stock;
+ this.__INVOKE_RENDER();
+
+ // tell the server to update the stock
+ const productId = this.state.id;
+ const productType = this.state.type;
+
+ const params = {
+ method: 'PUT',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': `Bearer ${await Auth.GetToken()}`,
+ },
+ body: JSON.stringify({
+ new_stock_level: stock,
+ }),
+ };
+
+ fetch(`/api/auth/staff/stock/${productType}/${productId}`, params).then(response => response.json()).then(data => console.log(data));
+ });
+ }
+
const backButton = this.root.querySelector('.back-button-svg');
backButton.addEventListener('click', () => {
@@ -188,8 +232,16 @@ class ProductListing extends Component {
const quantityInput = this.root.querySelector('.quantity-input');
const increaseQuantityButton = this.root.querySelector('.increase-quantity');
const reduceQuantityButton = this.root.querySelector('.reduce-quantity');
+ const addToBasket = this.root.querySelector('.add-to-basket-button');
quantityInput.value = 1;
+ if (this.state.stock === 0) {
+ quantityInput.value = 0;
+ increaseQuantityButton.disabled = true;
+ reduceQuantityButton.disabled = true;
+ addToBasket.disabled = true;
+ addToBasket.innerText = 'Out of Stock';
+ }
quantityInput.addEventListener('change', () => {
quantityInput.value = parseInt(quantityInput.value);
@@ -225,8 +277,6 @@ class ProductListing extends Component {
}));
// add quantity to basket and then update the basket count
- const addToBasket = this.root.querySelector('.add-to-basket-button');
-
addToBasket.addEventListener('click', () => {
// if it is a brick, get potential modifier from the drop down menu
const brick = this.state.type === 'brick';
diff --git a/client/public/components/stock-audit.mjs b/client/public/components/stock-audit.mjs
index d212b7c..8736664 100644
--- a/client/public/components/stock-audit.mjs
+++ b/client/public/components/stock-audit.mjs
@@ -12,14 +12,12 @@ class StockEditor extends Component {
template: /* html */`
Stock Editor
-
+
-
- 
+
-
`,
@@ -46,16 +47,6 @@ class StockEditor extends Component {
}
OnRender() {
- const collapseButton = this.root.querySelectorAll('.menu-header');
-
- collapseButton.forEach(el => el.addEventListener('click', (e) => {
- const parent = e.path[2].querySelector('.collapsible-menu') ? e.path[1] : e.path[2];
- const collapseContent = parent.querySelector('.menu-content');
- const collapseArrow = parent.querySelector('.menu-header-arrow');
- collapseContent.classList.toggle('details-open');
- collapseArrow.classList.toggle('menu-header-arrow-down');
- }));
-
// remove
const removeStockLookup = this.root.querySelector('.stock-lookup-button');
removeStockLookup.addEventListener('click', () => {
@@ -66,6 +57,76 @@ class StockEditor extends Component {
preview.setAttribute('id', id);
preview.setAttribute('type', type);
});
+
+ const removeStockButton = this.root.querySelector('.remove-stock-button');
+ removeStockButton.addEventListener('click', () => {
+ const preview = this.root.querySelector('.stock-remove-preview');
+ const id = preview.getAttribute('id');
+ const type = preview.getAttribute('type');
+
+ preview.removeAttribute('id');
+ preview.removeAttribute('type');
+ });
+
+
+ // add stock
+ const dropArea = this.root.querySelector('.drop-area');
+ const selectedImage = this.root.querySelector('.selected-img');
+ const previewImage = this.root.querySelector('.preview-img');
+ const fileSelect = this.root.querySelector('.file-select');
+
+ let file = null;
+
+ const handleDrag = (e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ };
+
+ const updateSelected = () => {
+ selectedImage.innerText = 'Selected image: ' + file.name;
+ const reader = new FileReader();
+ reader.readAsDataURL(file);
+ reader.onloadend = () => {
+ const img = this.root.createElement('img');
+ img.src = reader.result;
+ previewImage.append(img);
+ };
+ };
+
+ const handleSelect = (images) => {
+ console.log(images);
+ if (images.length) {
+ file = images[0];
+ updateSelected();
+ return;
+ }
+ file = images;
+ updateSelected();
+ };
+
+ document.onpaste = (event) => {
+ const items = (event.clipboardData || event.originalEvent.clipboardData).items;
+ let blob = null;
+ for (let i = 0; i < items.length; i++) {
+ if (items[i].type.indexOf('image') === 0) {
+ blob = items[i].getAsFile();
+ }
+ }
+ handleSelect(blob);
+ };
+
+ const handleDrop = (e) => {
+ const dt = e.dataTransfer;
+ file = dt.files[0];
+ updateSelected();
+ };
+
+ fileSelect.addEventListener('onchange', handleSelect, false);
+ dropArea.addEventListener('dragenter', handleDrag, false);
+ dropArea.addEventListener('dragleave', handleDrag, false);
+ dropArea.addEventListener('dragover', handleDrag, false);
+ dropArea.addEventListener('drop', handleDrag, false);
+ dropArea.addEventListener('drop', handleDrop, false);
}
}
diff --git a/client/public/components/super-compact-listing.mjs b/client/public/components/super-compact-listing.mjs
index 9599965..c543297 100644
--- a/client/public/components/super-compact-listing.mjs
+++ b/client/public/components/super-compact-listing.mjs
@@ -8,7 +8,7 @@ class SuperCompactProductListing extends Component {
super(SuperCompactProductListing);
}
- async Update() {
+ async OnMount() {
if (!this.state.name || !this.state.price) {
const product = (await fetch(`/api/${this.state.type}/${this.state.id}`).then(res => res.json())).data;
const name = product.name;
@@ -28,12 +28,7 @@ class SuperCompactProductListing extends Component {
colours,
quantity: product.quantity,
}, false);
- }
-
- if (this.state.tags) {
- if (this.state.tags.length >= 1) {
- return;
- }
+ } else if (this.state.tags) {
const tags = JSON.parse(this.state.tags);
this.setState({
...this.getState,
@@ -42,6 +37,16 @@ class SuperCompactProductListing extends Component {
}
}
+ Update(attributeChanged, newState) {
+ // console.log(attributeChanged, newState);
+ // if (attributeChanged === 'stock') {
+ // return;
+ // }
+ // if (newState.id !== this.state.id || newState.type !== this.state.type) {
+ // this.OnMount();
+ // }
+ }
+
Render() {
let modifierPreview = '';
if (this.state.modifier) {
diff --git a/docs/API.md b/docs/API.md
index 93ab50a..fd503ef 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -26,8 +26,8 @@ automatically every request
| GET | /api/auth/staff/orders/ | | ✔️ | All unshipped orders |
| PUT | /api/auth/staff/order/:id | | ✔️ | Update order to shipped, recieved (carrier) |
| PUT | /api/auth/staff/stock/:type/:id | | ✔️ | Update stock on item |
-| POST | /api/auth/staff/stock/ | | ✔️ | Add item to inventory |
-| DEL | /api/auth/staff/stock/:type/:id | | ✔️ | Remove item from inventory |
+| POST | /api/auth/staff/stock/ | NOT IMPLEMENTED | ✔️ | Add item to inventory |
+| DEL | /api/auth/staff/stock/:type/:id | NOT IMPLEMENTED | ✔️ | Remove item from inventory |
Query endpoints do not return the full data on a brick/set, they return
a subset for product listing pages
diff --git a/src/controllers/brick-controller.js b/src/controllers/brick-controller.js
index f25df07..fd77f69 100644
--- a/src/controllers/brick-controller.js
+++ b/src/controllers/brick-controller.js
@@ -215,6 +215,48 @@ async function GetBrick(brickId) {
// U
+async function RemoveBrickStock(brickIdList, quantityList) {
+ await Database.Query('BEGIN TRANSACTION;');
+ for (let i = 0; i < brickIdList.length; i++) {
+ const dbres = await Database.Query(`
+ UPDATE lego_brick_inventory
+ SET stock = stock - $2
+ WHERE brick_id = $1
+ `, [brickIdList[i], quantityList[i]]).catch(() => {
+ return {
+ error: 'Database error',
+ };
+ });
+ if (dbres.error) {
+ Database.Query('ROLLBACK TRANSACTION;');
+ Logger.Error(dbres.error);
+ return dbres;
+ }
+ }
+ Database.Query('COMMIT TRANSACTION;');
+ return true;
+}
+
+async function UpdateStock(brickId, newStock) {
+ await Database.Query('BEGIN TRANSACTION;');
+ const dbres = await Database.Query(`
+ UPDATE lego_brick_inventory
+ SET stock = $2
+ WHERE brick_id = $1
+ `, [brickId, newStock]).catch(() => {
+ return {
+ error: 'Database error',
+ };
+ });
+ if (dbres.error) {
+ Database.Query('ROLLBACK TRANSACTION;');
+ Logger.Error(dbres.error);
+ return dbres;
+ }
+ Database.Query('COMMIT TRANSACTION;');
+ return true;
+}
+
// D
module.exports = {
@@ -222,4 +264,6 @@ module.exports = {
SumPrices,
GetBulkBricks,
GetBrick,
+ RemoveBrickStock,
+ UpdateStock,
};
diff --git a/src/controllers/set-controller.js b/src/controllers/set-controller.js
index 63df1a9..a5de692 100644
--- a/src/controllers/set-controller.js
+++ b/src/controllers/set-controller.js
@@ -229,6 +229,48 @@ async function GetSets(page, resPerPage) {
// U
+async function RemoveSetStock(setIdList, quantityList) {
+ await Database.Query('BEGIN TRANSACTION;');
+ for (let i = 0; i < setIdList.length; i++) {
+ const dbres = await Database.Query(`
+ UPDATE lego_set_inventory
+ SET stock = stock - $1
+ WHERE set_id = $2;
+ `, [quantityList[i], setIdList[i]]).catch(() => {
+ return {
+ error: 'Database error',
+ };
+ });
+ if (dbres.error) {
+ Database.Query('ROLLBACK TRANSACTION;');
+ Logger.Error(dbres.error);
+ return dbres;
+ }
+ }
+ Database.Query('COMMIT TRANSACTION;');
+ return true;
+}
+
+async function UpdateStock(setId, newStock) {
+ await Database.Query('BEGIN TRANSACTION;');
+ const dbres = await Database.Query(`
+ UPDATE lego_set_inventory
+ SET stock = $1
+ WHERE set_id = $2;
+ `, [newStock, setId]).catch(() => {
+ return {
+ error: 'Database error',
+ };
+ });
+ if (dbres.error) {
+ Database.Query('ROLLBACK TRANSACTION;');
+ Logger.Error(dbres.error);
+ return dbres;
+ }
+ Database.Query('COMMIT TRANSACTION;');
+ return true;
+}
+
// D
module.exports = {
@@ -236,4 +278,6 @@ module.exports = {
SumPrices,
GetSet,
GetSets,
+ RemoveSetStock,
+ UpdateStock,
};
diff --git a/src/routes/api.js b/src/routes/api.js
index 6335b0f..4d983f0 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -5,6 +5,7 @@ const Helpers = require('./helpers.js');
const CDN = require('./cdn.js');
const Bricks = require('./bricks-router.js');
const Sets = require('./sets-router.js');
+const Stock = require('./stock-router.js');
const Query = require('./query-router.js');
const Auth0 = require('./auth0-router.js');
const Order = require('./order-router.js');
@@ -33,6 +34,7 @@ function Init() {
Server.App.get('/api/auth/staff/orders/', Auth0.JWTMiddleware, Auth0.AdminOnlyEndpoint, Order.GetUnFinishedOrders);
Server.App.put('/api/auth/staff/order/:id', Auth0.JWTMiddleware, Auth0.AdminOnlyEndpoint, Order.UpdateOrderStatus);
+ Server.App.put('/api/auth/staff/stock/:type/:id', Auth0.JWTMiddleware, Auth0.AdminOnlyEndpoint, Stock.Update);
Logger.Module('API', 'API Routes Initialized');
}
diff --git a/src/routes/order-router.js b/src/routes/order-router.js
index 5352a60..026852c 100644
--- a/src/routes/order-router.js
+++ b/src/routes/order-router.js
@@ -136,6 +136,23 @@ async function ProcessNew(req, res) {
const order = await OrderController.NewOrder(userID, total, basket, discountCode, discount.discount);
+ if (newBrickList.length > 0) {
+ const stockRemovalBrick = await BrickController.RemoveBrickStock(newBrickList, newBrickQuantities);
+ if (stockRemovalBrick.error) {
+ return res.send({
+ error: stockRemovalBrick.error,
+ });
+ }
+ }
+ if (setList.length > 0) {
+ const stockRemovalSet = await SetController.RemoveSetStock(setList, setQuantities);
+ if (stockRemovalSet.error) {
+ return res.send({
+ error: stockRemovalSet.error,
+ });
+ }
+ }
+
if (order.error) {
return res.send({
error: order.error,
diff --git a/src/routes/stock-router.js b/src/routes/stock-router.js
new file mode 100644
index 0000000..505e9c7
--- /dev/null
+++ b/src/routes/stock-router.js
@@ -0,0 +1,63 @@
+const BrickController = require('../controllers/brick-controller');
+const SetController = require('../controllers/set-controller');
+
+async function Update(req, res) {
+ const type = req.params.type;
+ const id = req.params.id;
+
+ console.log(req.params);
+
+ if (!type) {
+ return res.send({
+ error: 'No type in request',
+ });
+ }
+
+ if (!id) {
+ return res.send({
+ error: 'No id in request',
+ });
+ }
+
+ const data = req.body;
+
+ if (!data || !data.new_stock_level) {
+ return res.send({
+ error: 'No data in request',
+ });
+ }
+
+ if (type === 'brick') {
+ const stock = await BrickController.UpdateStock(id, data.new_stock_level);
+ if (stock.error) {
+ return res.send({
+ error: stock.error,
+ });
+ }
+
+ return res.send({
+ data: stock,
+ });
+ }
+
+ if (type === 'set') {
+ const stock = await SetController.UpdateStock(id, data.new_stock_level);
+ if (stock.error) {
+ return res.send({
+ error: stock.error,
+ });
+ }
+
+ return res.send({
+ data: stock,
+ });
+ }
+
+ return res.send({
+ error: 'Invalid type',
+ });
+}
+
+module.exports = {
+ Update,
+};