Skip to content

Add cost price + fractional quantities support #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omar2023 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add cost price + fractional quantities support #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions api/inventory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,16 @@ app.post("/product", function (req, res) {
_id: parseInt(validator.escape(req.body.id)),
barcode: parseInt(validator.escape(req.body.barcode)),
expirationDate: validator.escape(req.body.expirationDate),
price: validator.escape(req.body.price),
price: validator.escape(req.body.price) == "" ? 0 : parseFloat(validator.escape(req.body.price)),
cost: validator.escape(req.body.cost) == "" ? 0 : parseFloat(validator.escape(req.body.cost)),
category: validator.escape(req.body.category),
quantity:
validator.escape(req.body.quantity) == ""
? 0
: validator.escape(req.body.quantity),
: parseFloat(validator.escape(req.body.quantity)),
name: validator.escape(req.body.name),
stock: req.body.stock === "on" ? 0 : 1,
minStock: validator.escape(req.body.minStock),
minStock: validator.escape(req.body.minStock) == "" ? 0 : parseFloat(validator.escape(req.body.minStock)),
img: image,
};

Expand Down Expand Up @@ -280,8 +281,10 @@ app.decrementInventory = function (products) {
callback();
} else {
let updatedQuantity =
parseInt(product.quantity) -
parseInt(transactionProduct.quantity);
(parseFloat(product.quantity) || 0) -
(parseFloat(transactionProduct.quantity) || 0);

if (updatedQuantity < 0) updatedQuantity = 0;

inventoryDB.update(
{
Expand Down
121 changes: 100 additions & 21 deletions assets/js/pos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,57 @@ $.fn.allowOnlyNumbers = function() {
};
$('.number-input').allowOnlyNumbers();

// ---- Fractional quantity support (0.5, 1/2, ½, نصف, ثلث, ربع...) ----
function parseQuantity(input) {
if (typeof input === "number") return input;
let s = String(input ?? "").trim();
if (!s) return NaN;

// normalize: Arabic decimal comma, extra spaces
s = s.replace(/,/g, ".").replace(/\s+/g, " ").trim();

// Arabic keywords
const ar = {
"نصف": 0.5,
"ثلث": 1 / 3,
"ثلثين": 2 / 3,
"ربع": 0.25,
"ثلاثة ارباع": 0.75,
"ثلاثة أرباع": 0.75,
"ربعين": 0.5,
};
if (ar[s] != null) return ar[s];

// Unicode fractions
const uni = { "½": 0.5, "⅓": 1 / 3, "⅔": 2 / 3, "¼": 0.25, "¾": 0.75 };
if (uni[s] != null) return uni[s];

// mixed number: "1 1/2"
let m = s.match(/^(\d+)\s+(\d+)\s*\/\s*(\d+)$/);
if (m) return Number(m[1]) + Number(m[2]) / Number(m[3]);

// fraction: "1/2"
m = s.match(/^(\d+)\s*\/\s*(\d+)$/);
if (m) return Number(m[1]) / Number(m[2]);

// decimal
const v = Number(s);
return Number.isFinite(v) ? v : NaN;
}

function roundQty(q) {
// 3 decimals is enough for 1/3, 1/4, etc.
return Math.round(q * 1000) / 1000;
}

function formatQty(q) {
const n = parseQuantity(q);
if (!Number.isFinite(n)) return String(q ?? "");
if (Math.abs(n - Math.round(n)) < 1e-9) return String(Math.round(n));
return String(roundQty(n));
}


//Serialize Object
$.fn.serializeObject = function () {
var o = {};
Expand Down Expand Up @@ -267,6 +318,7 @@ if (auth == undefined) {
$.get(api + "inventory/products", function (data) {
data.forEach((item) => {
item.price = parseFloat(item.price).toFixed(2);
item.cost = parseFloat(item.cost ?? 0).toFixed(2);
});

allProducts = [...data];
Expand Down Expand Up @@ -424,7 +476,7 @@ if (auth == undefined) {
success: function (product) {
$(".search-barcode-btn").html(searchBarCodeIcon);
const expired = isExpired(product.expirationDate);
if (product._id != undefined && product.quantity >= 1 && !expired) {
if (product._id != undefined && (parseFloat(product.quantity) || 0) > 0 && !expired) {
$(this).addProductToCart(product);
$("#searchBarCode").get(0).reset();
$("#basic-addon2").empty();
Expand All @@ -437,7 +489,7 @@ if (auth == undefined) {
`${product.name} is expired`,
"Ok",
);
} else if (product.quantity < 1) {
} else if ((parseFloat(product.quantity) || 0) <= 0) {
notiflix.Report.info(
"Out of stock!",
"This item is currently unavailable",
Expand Down Expand Up @@ -495,7 +547,8 @@ if (auth == undefined) {
id: data._id,
product_name: data.name,
sku: data.sku,
price: data.price,
price: parseFloat(data.price) || 0,
cost: parseFloat(data.cost ?? 0) || 0,
quantity: 1,
};

Expand Down Expand Up @@ -527,10 +580,10 @@ if (auth == undefined) {
let grossTotal;
let total_items = 0;
$.each(cart, function (index, data) {
total += data.quantity * data.price;
total_items += parseInt(data.quantity);
total += (parseQuantity(data.quantity) || 0) * (parseFloat(data.price) || 0);
total_items += (parseQuantity(data.quantity) || 0);
});
$("#total").text(total_items);
$("#total").text(formatQty(total_items));
total = total - $("#inputDiscount").val();
$("#price").text(validator.unescape(settings.symbol) + moneyFormat(total.toFixed(2)));

Expand Down Expand Up @@ -572,9 +625,9 @@ if (auth == undefined) {
$("<input>", {
class: "form-control",
type: "text",
readonly: "",
value: data.quantity,
min: "1",
value: formatQty(data.quantity),
inputmode: "decimal",
placeholder: "e.g. 0.5 / 1/2 / ½ / نصف",
onInput: "$(this).qtInput(" + index + ")",
}),
$("<span>", { class: "input-group-btn" }).append(
Expand All @@ -589,7 +642,7 @@ if (auth == undefined) {
class: "col-md-3",
text:
validator.unescape(settings.symbol) +
moneyFormat((data.price * data.quantity).toFixed(2)),
moneyFormat(((parseFloat(data.price) || 0) * (parseQuantity(data.quantity) || 0)).toFixed(2)),
}),
$("<div>", { class: "col-md-1" }).append(
$("<button>", {
Expand All @@ -613,9 +666,14 @@ if (auth == undefined) {
return selected._id == parseInt(item.id);
});

if (product[0].stock == 1) {
if (item.quantity < product[0].quantity) {
item.quantity = parseInt(item.quantity) + 1;
const step = 1; // set to 0.25 to make +/- work in quarters by default
const current = parseQuantity(item.quantity) || 0;
const next = roundQty(current + step);

if (product[0] && product[0].stock == 1) {
const max = parseQuantity(product[0].quantity) || 0;
if (next <= max) {
item.quantity = next;
$(this).renderTable(cart);
} else {
notiflix.Report.info(
Expand All @@ -625,22 +683,41 @@ if (auth == undefined) {
);
}
} else {
item.quantity = parseInt(item.quantity) + 1;
item.quantity = next;
$(this).renderTable(cart);
}
};

$.fn.qtDecrement = function (i) {
if (item.quantity > 1) {
item = cart[i];
item.quantity = parseInt(item.quantity) - 1;
item = cart[i];
const step = 1; // set to 0.25 to make +/- work in quarters by default
const current = parseQuantity(item.quantity);
if (!Number.isFinite(current)) return;

const next = roundQty(current - step);
if (next > 0) {
item.quantity = next;
$(this).renderTable(cart);
}
};

$.fn.qtInput = function (i) {
item = cart[i];
item.quantity = $(this).val();
const q = roundQty(parseQuantity($(this).val()));
if (!Number.isFinite(q) || q <= 0) return;

let product = allProducts.filter(function (selected) {
return selected._id == parseInt(item.id);
});
if (product[0] && product[0].stock == 1) {
const max = parseQuantity(product[0].quantity) || 0;
if (q > max) {
notiflix.Notify.warning("Quantity exceeds available stock");
return;
}
}

item.quantity = q;
$(this).renderTable(cart);
};

Expand Down Expand Up @@ -1334,6 +1411,7 @@ if (auth == undefined) {

$("#productName").val(allProducts[index].name);
$("#product_price").val(allProducts[index].price);
$("#product_cost").val(allProducts[index].cost ?? 0);
$("#quantity").val(allProducts[index].quantity);
$("#barcode").val(allProducts[index].barcode || allProducts[index]._id);
$("#expirationDate").val(allProducts[index].expirationDate);
Expand Down Expand Up @@ -1615,6 +1693,7 @@ if (auth == undefined) {
<td>${product.name}
${product.expiryAlert}</td>
<td>${validator.unescape(settings.symbol)}${product.price}</td>
<td>${validator.unescape(settings.symbol)}${product.cost ?? 0}</td>
<td>${product.stock == 1 ? product.quantity : "N/A"}
${product.stockAlert}
</td>
Expand Down Expand Up @@ -2045,7 +2124,7 @@ function loadTransactions() {
result[item].forEach((i) => {
id = i.id;
price = i.price;
quantity = quantity + parseInt(i.quantity);
quantity = quantity + (parseQuantity(i.quantity) || 0);
});

sold.push({
Expand Down Expand Up @@ -2106,7 +2185,7 @@ function loadSoldProducts() {
$("#product_sales").empty();

sold.forEach((item, index) => {
items = items + parseInt(item.qty);
items = items + (parseQuantity(item.qty) || 0);
products++;

let product = allProducts.filter(function (selected) {
Expand All @@ -2117,7 +2196,7 @@ function loadSoldProducts() {

sold_list += `<tr>
<td>${item.product}</td>
<td>${item.qty}</td>
<td>${formatQty(item.qty)}</td>
<td>${
product[0].stock == 1
? product.length > 0
Expand Down
6 changes: 6 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,11 @@ <h4 class="modal-title" id="mySmallModalLabel">Product
<label for="product_price">Price</label>
<input type="text" required="required" name="price" placeholder="Price" class="form-control number-input" id="product_price">
</div>
<div class="form-group">
<label for="product_cost">Cost Price</label>
<input type="text" name="cost" placeholder="Cost Price" class="form-control number-input" id="product_cost">
<small class="text-muted">Used for profit/margin reporting (optional).</small>
</div>
<div class="form-group">
<label for="expirationDate">Expiry Date</label>
<input type="text" name="expirationDate" parsley-trigger="change" placeholder="dd/mm/yyyy" class="form-control" id="expirationDate" readonly>
Expand Down Expand Up @@ -589,6 +594,7 @@ <h4 class="modal-title" id="mySmallModalLabel">Products
<th>Item</th>
<th>Name</th>
<th>Price</th>
<th>Cost</th>
<th>Stock</th>
<th>Expiry Date</th>
<th>Category</th>
Expand Down