diff --git a/application/poe/sql/receipts/getPLUItems.sql b/application/poe/sql/receipts/getPLUItems.sql index 96538fa..eb4c818 100644 --- a/application/poe/sql/receipts/getPLUItems.sql +++ b/application/poe/sql/receipts/getPLUItems.sql @@ -1,4 +1,5 @@ -SELECT items.item_uuid, items.item_name -FROM %%site_name%%_items items +SELECT items.item_uuid, items.item_name, item_info.cost, item_info.uom +FROM %%site_name%%_items items +LEFT JOIN %%site_name%%_item_info item_info ON item_info.id = items.item_info_id WHERE items.item_type = 'FOOD_PLU' ORDER BY items.item_name ASC LIMIT %s OFFSET %s; \ No newline at end of file diff --git a/application/poe/static/js/receiptsHandler.js b/application/poe/static/js/receiptsHandler.js index bd5bba1..490caee 100644 --- a/application/poe/static/js/receiptsHandler.js +++ b/application/poe/static/js/receiptsHandler.js @@ -299,8 +299,8 @@ async function addPLUToReceipt(item) { item_uuid: item.item_uuid , item_name: item.item_name, qty: 1, - uom: 1, - data: {'cost': 0.00, 'expires': false} + uom: item.uom, + data: {'cost': item.cost, 'expires': false} }, type: 'PLU SKU'}) await replenishScannedReceiptTable(scannedReceiptItems) } diff --git a/application/receipts/static/js/receiptHandler.js b/application/receipts/static/js/receiptHandler.js index 0d8addf..988f4dc 100644 --- a/application/receipts/static/js/receiptHandler.js +++ b/application/receipts/static/js/receiptHandler.js @@ -92,13 +92,14 @@ async function replenishLinesTable(receipt_items) { if(receipt_items[i].type == 'api'){ label_color = 'purple' } + if(receipt_items[i].type == 'PLU SKU'){ + label_color = 'blue' + } typeCell.innerHTML = `${receipt_items[i].type}` let nameCell = document.createElement('td') nameCell.innerHTML = receipt_items[i].name - - let operationsCell = document.createElement('td') let apiOp = document.createElement('a') @@ -285,6 +286,14 @@ async function openLineEditModal(line_data) { document.getElementById('lineUOM').classList.remove('uk-disabled') } + if(line_data.type === 'PLU SKU'){ + document.getElementById('lineUOM').classList.add('uk-disabled') + } else { + document.getElementById('lineUOM').classList.remove('uk-disabled') + } + + + if(!line_data.data.expires){ document.getElementById('lineExpires').classList.add('uk-disabled') } else { diff --git a/application/receipts/static/pictures/logo.jpg b/static/pictures/logo.jpg similarity index 100% rename from application/receipts/static/pictures/logo.jpg rename to static/pictures/logo.jpg