diff --git a/application/administration/sql/CREATE/receipt_items.sql b/application/administration/sql/CREATE/receipt_items.sql index 2e04a88..8dbdc16 100644 --- a/application/administration/sql/CREATE/receipt_items.sql +++ b/application/administration/sql/CREATE/receipt_items.sql @@ -6,7 +6,7 @@ CREATE TABLE IF NOT EXISTS %%site_name%%_receipt_items ( item_uuid UUID, name VARCHAR(255) NOT NULL, qty FLOAT8 NOT NULL, - uom VARCHAR(32) NOT NULL, + uom INTEGER NOT NULL, data JSONB, status VARCHAR (64), CONSTRAINT fk_receipt diff --git a/application/administration/templates/admin_index.html b/application/administration/templates/admin_index.html index 7505fe6..8ab4149 100644 --- a/application/administration/templates/admin_index.html +++ b/application/administration/templates/admin_index.html @@ -115,7 +115,7 @@ - add_circle + add_circle @@ -151,7 +151,7 @@ - add_circle + add_circle @@ -187,7 +187,7 @@ - add_circle + add_circle diff --git a/application/administration/templates/role.html b/application/administration/templates/role.html index 7253e34..62bed40 100644 --- a/application/administration/templates/role.html +++ b/application/administration/templates/role.html @@ -141,6 +141,7 @@ payload: payload }), }); + location.href = '/administration' } async function postEditRole(){ diff --git a/application/administration/templates/site.html b/application/administration/templates/site.html index 40a8315..72e5095 100644 --- a/application/administration/templates/site.html +++ b/application/administration/templates/site.html @@ -216,6 +216,7 @@ payload: payload }), }); + location.href = '/administration' } async function postEditSite(){ diff --git a/application/receipts/sql/getReceiptByID.sql b/application/receipts/sql/getReceiptByID.sql index 029c4c6..32d2e08 100644 --- a/application/receipts/sql/getReceiptByID.sql +++ b/application/receipts/sql/getReceiptByID.sql @@ -4,6 +4,7 @@ WITH passed_id AS (SELECT %s AS passed_id), (SELECT COALESCE(row_to_json(un), '{}') FROM units un WHERE un.id = items.uom LIMIT 1) AS uom FROM %%site_name%%_receipt_items items WHERE items.receipt_id = (SELECT passed_id FROM passed_id) + ORDER BY items.name ASC ) SELECT (SELECT passed_id FROM passed_id) AS passed_id, diff --git a/logs/database.log b/logs/database.log index 821babb..214d91e 100644 --- a/logs/database.log +++ b/logs/database.log @@ -61,4 +61,7 @@ sql='INSERT INTO test_receipt_items(type, receipt_id, barcode, name, qty, uom, data, status) VALUES (%s, %s, %s, %s, %s, %s, %s, %s) RETURNING *;') 2025-08-09 15:57:58.332708 --- ERROR --- DatabaseError(message='invalid input syntax for type uuid: ""LINE 3: VALUES ('custom', 36, '', '', 'test1', '1', '2', '{"cost": "... ^', payload=('custom', 36, '', '', 'test1', '1', '2', '{"cost": "0.99", "expires": false}', 'Unresolved'), - sql='INSERT INTO test_receipt_items(type, receipt_id, barcode, item_uuid, name, qty, uom, data, status) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING *;') \ No newline at end of file + sql='INSERT INTO test_receipt_items(type, receipt_id, barcode, item_uuid, name, qty, uom, data, status) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING *;') +2025-08-09 16:10:49.684466 --- ERROR --- DatabaseError(message='operator does not exist: integer = character varyingLINE 4: ...(row_to_json(un), '{}') FROM units un WHERE un.id = items.uo... ^HINT: No operator matches the given name and argument types. You might need to add explicit type casts.', + payload=(1,), + sql='WITH passed_id AS (SELECT %s AS passed_id), cte_receipt_items AS ( SELECT items.* , (SELECT COALESCE(row_to_json(un), '{}') FROM units un WHERE un.id = items.uom LIMIT 1) AS uom FROM testa_receipt_items items WHERE items.receipt_id = (SELECT passed_id FROM passed_id) ORDER BY items.name ASC )SELECT (SELECT passed_id FROM passed_id) AS passed_id, testa_receipts.*, logins.username as submitted_by, (SELECT COALESCE(array_agg(row_to_json(ris)), '{}') FROM cte_receipt_items ris) AS receipt_items, row_to_json(testa_vendors.*) as vendorFROM testa_receiptsJOIN logins ON testa_receipts.submitted_by = logins.idLEFT JOIN testa_vendors ON testa_receipts.vendor_id = testa_vendors.id WHERE testa_receipts.id=(SELECT passed_id FROM passed_id)') \ No newline at end of file diff --git a/logs/process.log b/logs/process.log index 6d3202d..b5329cd 100644 --- a/logs/process.log +++ b/logs/process.log @@ -501,3 +501,230 @@ 2025-08-06 15:30:30.365281 --- INFO --- sku_prefix Created! 2025-08-06 15:30:30.369764 --- INFO --- barcodes Created! 2025-08-06 15:30:30.373731 --- INFO --- Admin User Created! +2025-08-09 16:06:00.300373 --- INFO --- item_info DROPPED! +2025-08-09 16:06:00.309583 --- INFO --- items DROPPED! +2025-08-09 16:06:00.316780 --- INFO --- cost_layers DROPPED! +2025-08-09 16:06:00.324352 --- INFO --- linked_items DROPPED! +2025-08-09 16:06:00.331594 --- INFO --- transactions DROPPED! +2025-08-09 16:06:00.338370 --- INFO --- brands DROPPED! +2025-08-09 16:06:00.345148 --- INFO --- food_info DROPPED! +2025-08-09 16:06:00.352760 --- INFO --- logistics_info DROPPED! +2025-08-09 16:06:00.359893 --- INFO --- zones DROPPED! +2025-08-09 16:06:00.366873 --- INFO --- locations DROPPED! +2025-08-09 16:06:00.373860 --- INFO --- vendors DROPPED! +2025-08-09 16:06:00.381182 --- INFO --- group_items DROPPED! +2025-08-09 16:06:00.388102 --- INFO --- groups DROPPED! +2025-08-09 16:06:00.395154 --- INFO --- receipt_items DROPPED! +2025-08-09 16:06:00.402185 --- INFO --- receipts DROPPED! +2025-08-09 16:06:00.409277 --- INFO --- recipe_items DROPPED! +2025-08-09 16:06:00.416123 --- INFO --- recipes DROPPED! +2025-08-09 16:06:00.423366 --- INFO --- shopping_list_items DROPPED! +2025-08-09 16:06:00.430292 --- INFO --- shopping_lists DROPPED! +2025-08-09 16:06:00.437234 --- INFO --- item_locations DROPPED! +2025-08-09 16:06:00.444059 --- INFO --- conversions DROPPED! +2025-08-09 16:06:00.450920 --- INFO --- sku_prefix DROPPED! +2025-08-09 16:06:00.457821 --- INFO --- barcodes DROPPED! +2025-08-09 16:08:45.017164 --- INFO --- logins Created! +2025-08-09 16:08:45.024319 --- INFO --- sites Created! +2025-08-09 16:08:45.031072 --- INFO --- roles Created! +2025-08-09 16:08:45.037686 --- INFO --- units Created! +2025-08-09 16:08:45.047683 --- INFO --- cost_layers Created! +2025-08-09 16:08:45.057002 --- INFO --- linked_items Created! +2025-08-09 16:08:45.064887 --- INFO --- brands Created! +2025-08-09 16:08:45.073564 --- INFO --- food_info Created! +2025-08-09 16:08:45.083812 --- INFO --- item_info Created! +2025-08-09 16:08:45.092875 --- INFO --- zones Created! +2025-08-09 16:08:45.101721 --- INFO --- locations Created! +2025-08-09 16:08:45.111468 --- INFO --- logistics_info Created! +2025-08-09 16:08:45.120169 --- INFO --- transactions Created! +2025-08-09 16:08:45.131324 --- INFO --- item Created! +2025-08-09 16:08:45.139496 --- INFO --- vendors Created! +2025-08-09 16:08:45.149036 --- INFO --- groups Created! +2025-08-09 16:08:45.159378 --- INFO --- group_items Created! +2025-08-09 16:08:45.169493 --- INFO --- receipts Created! +2025-08-09 16:08:45.176387 --- INFO --- receipt_items Created! +2025-08-09 16:08:45.185296 --- INFO --- recipes Created! +2025-08-09 16:08:45.196407 --- INFO --- recipe_items Created! +2025-08-09 16:08:45.206511 --- INFO --- shopping_lists Created! +2025-08-09 16:08:45.217383 --- INFO --- shopping_list_items Created! +2025-08-09 16:08:45.227557 --- INFO --- item_locations Created! +2025-08-09 16:08:45.236300 --- INFO --- conversions Created! +2025-08-09 16:08:45.245770 --- INFO --- sku_prefix Created! +2025-08-09 16:08:45.253628 --- INFO --- barcodes Created! +2025-08-09 16:08:45.257589 --- INFO --- Admin User Created! +2025-08-09 16:14:50.935814 --- INFO --- item_info DROPPED! +2025-08-09 16:14:50.941713 --- INFO --- items DROPPED! +2025-08-09 16:14:50.946033 --- INFO --- cost_layers DROPPED! +2025-08-09 16:14:50.950314 --- INFO --- linked_items DROPPED! +2025-08-09 16:14:50.954572 --- INFO --- transactions DROPPED! +2025-08-09 16:14:50.958479 --- INFO --- brands DROPPED! +2025-08-09 16:14:50.962398 --- INFO --- food_info DROPPED! +2025-08-09 16:14:50.966849 --- INFO --- logistics_info DROPPED! +2025-08-09 16:14:50.971104 --- INFO --- zones DROPPED! +2025-08-09 16:14:50.975191 --- INFO --- locations DROPPED! +2025-08-09 16:14:50.979416 --- INFO --- vendors DROPPED! +2025-08-09 16:14:50.983567 --- INFO --- group_items DROPPED! +2025-08-09 16:14:50.987667 --- INFO --- groups DROPPED! +2025-08-09 16:14:50.991691 --- INFO --- receipt_items DROPPED! +2025-08-09 16:14:50.995715 --- INFO --- receipts DROPPED! +2025-08-09 16:14:50.999829 --- INFO --- recipe_items DROPPED! +2025-08-09 16:14:51.004317 --- INFO --- recipes DROPPED! +2025-08-09 16:14:51.008453 --- INFO --- shopping_list_items DROPPED! +2025-08-09 16:14:51.012401 --- INFO --- shopping_lists DROPPED! +2025-08-09 16:14:51.016419 --- INFO --- item_locations DROPPED! +2025-08-09 16:14:51.020317 --- INFO --- conversions DROPPED! +2025-08-09 16:14:51.024247 --- INFO --- sku_prefix DROPPED! +2025-08-09 16:14:51.027995 --- INFO --- barcodes DROPPED! +2025-08-09 16:15:15.911584 --- INFO --- logins Created! +2025-08-09 16:15:15.915309 --- INFO --- sites Created! +2025-08-09 16:15:15.918829 --- INFO --- roles Created! +2025-08-09 16:15:15.922298 --- INFO --- units Created! +2025-08-09 16:15:15.929481 --- INFO --- cost_layers Created! +2025-08-09 16:15:15.936687 --- INFO --- linked_items Created! +2025-08-09 16:15:15.941894 --- INFO --- brands Created! +2025-08-09 16:15:15.947888 --- INFO --- food_info Created! +2025-08-09 16:15:15.955055 --- INFO --- item_info Created! +2025-08-09 16:15:15.962121 --- INFO --- zones Created! +2025-08-09 16:15:15.968642 --- INFO --- locations Created! +2025-08-09 16:15:15.975882 --- INFO --- logistics_info Created! +2025-08-09 16:15:15.982386 --- INFO --- transactions Created! +2025-08-09 16:15:15.990741 --- INFO --- item Created! +2025-08-09 16:15:15.996978 --- INFO --- vendors Created! +2025-08-09 16:15:16.004105 --- INFO --- groups Created! +2025-08-09 16:15:16.011665 --- INFO --- group_items Created! +2025-08-09 16:15:16.018961 --- INFO --- receipts Created! +2025-08-09 16:15:16.028584 --- INFO --- receipt_items Created! +2025-08-09 16:15:16.035173 --- INFO --- recipes Created! +2025-08-09 16:15:16.043728 --- INFO --- recipe_items Created! +2025-08-09 16:15:16.051083 --- INFO --- shopping_lists Created! +2025-08-09 16:15:16.059427 --- INFO --- shopping_list_items Created! +2025-08-09 16:15:16.067602 --- INFO --- item_locations Created! +2025-08-09 16:15:16.074113 --- INFO --- conversions Created! +2025-08-09 16:15:16.081458 --- INFO --- sku_prefix Created! +2025-08-09 16:15:16.086185 --- INFO --- barcodes Created! +2025-08-09 16:15:16.090175 --- INFO --- Admin User Created! +2025-08-09 16:16:07.245148 --- INFO --- item_info DROPPED! +2025-08-09 16:16:07.251868 --- INFO --- items DROPPED! +2025-08-09 16:16:07.256175 --- INFO --- cost_layers DROPPED! +2025-08-09 16:16:07.260404 --- INFO --- linked_items DROPPED! +2025-08-09 16:16:07.264689 --- INFO --- transactions DROPPED! +2025-08-09 16:16:07.268692 --- INFO --- brands DROPPED! +2025-08-09 16:16:07.272661 --- INFO --- food_info DROPPED! +2025-08-09 16:16:07.277515 --- INFO --- logistics_info DROPPED! +2025-08-09 16:16:07.281855 --- INFO --- zones DROPPED! +2025-08-09 16:16:07.286046 --- INFO --- locations DROPPED! +2025-08-09 16:16:07.290362 --- INFO --- vendors DROPPED! +2025-08-09 16:16:07.294759 --- INFO --- group_items DROPPED! +2025-08-09 16:16:07.298883 --- INFO --- groups DROPPED! +2025-08-09 16:16:07.303095 --- INFO --- receipt_items DROPPED! +2025-08-09 16:16:07.307219 --- INFO --- receipts DROPPED! +2025-08-09 16:16:07.311568 --- INFO --- recipe_items DROPPED! +2025-08-09 16:16:07.315535 --- INFO --- recipes DROPPED! +2025-08-09 16:16:07.319886 --- INFO --- shopping_list_items DROPPED! +2025-08-09 16:16:07.324078 --- INFO --- shopping_lists DROPPED! +2025-08-09 16:16:07.328253 --- INFO --- item_locations DROPPED! +2025-08-09 16:16:07.332254 --- INFO --- conversions DROPPED! +2025-08-09 16:16:07.336522 --- INFO --- sku_prefix DROPPED! +2025-08-09 16:16:07.340341 --- INFO --- barcodes DROPPED! +2025-08-09 16:18:00.202484 --- INFO --- logins Created! +2025-08-09 16:18:00.207009 --- INFO --- sites Created! +2025-08-09 16:18:00.210720 --- INFO --- roles Created! +2025-08-09 16:18:00.214380 --- INFO --- units Created! +2025-08-09 16:18:00.221264 --- INFO --- cost_layers Created! +2025-08-09 16:18:00.227684 --- INFO --- linked_items Created! +2025-08-09 16:18:00.232452 --- INFO --- brands Created! +2025-08-09 16:18:00.237989 --- INFO --- food_info Created! +2025-08-09 16:18:00.244246 --- INFO --- item_info Created! +2025-08-09 16:18:00.250499 --- INFO --- zones Created! +2025-08-09 16:18:00.256474 --- INFO --- locations Created! +2025-08-09 16:18:00.262745 --- INFO --- logistics_info Created! +2025-08-09 16:18:00.268495 --- INFO --- transactions Created! +2025-08-09 16:18:00.278072 --- INFO --- item Created! +2025-08-09 16:18:00.284317 --- INFO --- vendors Created! +2025-08-09 16:18:00.291417 --- INFO --- groups Created! +2025-08-09 16:18:00.299016 --- INFO --- group_items Created! +2025-08-09 16:18:00.306210 --- INFO --- receipts Created! +2025-08-09 16:18:00.312608 --- INFO --- receipt_items Created! +2025-08-09 16:18:00.318574 --- INFO --- recipes Created! +2025-08-09 16:18:00.326132 --- INFO --- recipe_items Created! +2025-08-09 16:18:00.332517 --- INFO --- shopping_lists Created! +2025-08-09 16:18:00.339616 --- INFO --- shopping_list_items Created! +2025-08-09 16:18:00.346571 --- INFO --- item_locations Created! +2025-08-09 16:18:00.352198 --- INFO --- conversions Created! +2025-08-09 16:18:00.358553 --- INFO --- sku_prefix Created! +2025-08-09 16:18:00.363015 --- INFO --- barcodes Created! +2025-08-09 16:18:00.367331 --- INFO --- Admin User Created! +2025-08-09 16:19:03.194143 --- INFO --- item_info DROPPED! +2025-08-09 16:19:03.201333 --- INFO --- items DROPPED! +2025-08-09 16:19:03.205600 --- INFO --- cost_layers DROPPED! +2025-08-09 16:19:03.210035 --- INFO --- linked_items DROPPED! +2025-08-09 16:19:03.214558 --- INFO --- transactions DROPPED! +2025-08-09 16:19:03.218631 --- INFO --- brands DROPPED! +2025-08-09 16:19:03.222803 --- INFO --- food_info DROPPED! +2025-08-09 16:19:03.227827 --- INFO --- logistics_info DROPPED! +2025-08-09 16:19:03.232450 --- INFO --- zones DROPPED! +2025-08-09 16:19:03.236818 --- INFO --- locations DROPPED! +2025-08-09 16:19:03.241265 --- INFO --- vendors DROPPED! +2025-08-09 16:19:03.245859 --- INFO --- group_items DROPPED! +2025-08-09 16:19:03.250145 --- INFO --- groups DROPPED! +2025-08-09 16:19:03.254571 --- INFO --- receipt_items DROPPED! +2025-08-09 16:19:03.258850 --- INFO --- receipts DROPPED! +2025-08-09 16:19:03.263441 --- INFO --- recipe_items DROPPED! +2025-08-09 16:19:03.267604 --- INFO --- recipes DROPPED! +2025-08-09 16:19:03.272210 --- INFO --- shopping_list_items DROPPED! +2025-08-09 16:19:03.276448 --- INFO --- shopping_lists DROPPED! +2025-08-09 16:19:03.280786 --- INFO --- item_locations DROPPED! +2025-08-09 16:19:03.284974 --- INFO --- conversions DROPPED! +2025-08-09 16:19:03.289323 --- INFO --- sku_prefix DROPPED! +2025-08-09 16:19:03.293280 --- INFO --- barcodes DROPPED! +2025-08-09 16:19:12.314762 --- INFO --- logins Created! +2025-08-09 16:19:12.319321 --- INFO --- sites Created! +2025-08-09 16:19:12.323074 --- INFO --- roles Created! +2025-08-09 16:19:12.326720 --- INFO --- units Created! +2025-08-09 16:19:12.333107 --- INFO --- cost_layers Created! +2025-08-09 16:19:12.339695 --- INFO --- linked_items Created! +2025-08-09 16:19:12.344588 --- INFO --- brands Created! +2025-08-09 16:19:12.350314 --- INFO --- food_info Created! +2025-08-09 16:19:12.356615 --- INFO --- item_info Created! +2025-08-09 16:19:12.363142 --- INFO --- zones Created! +2025-08-09 16:19:12.369310 --- INFO --- locations Created! +2025-08-09 16:19:12.375769 --- INFO --- logistics_info Created! +2025-08-09 16:19:12.381719 --- INFO --- transactions Created! +2025-08-09 16:19:12.389163 --- INFO --- item Created! +2025-08-09 16:19:12.394919 --- INFO --- vendors Created! +2025-08-09 16:19:12.401356 --- INFO --- groups Created! +2025-08-09 16:19:12.408407 --- INFO --- group_items Created! +2025-08-09 16:19:12.415390 --- INFO --- receipts Created! +2025-08-09 16:19:12.421792 --- INFO --- receipt_items Created! +2025-08-09 16:19:12.427990 --- INFO --- recipes Created! +2025-08-09 16:19:12.435714 --- INFO --- recipe_items Created! +2025-08-09 16:19:12.442701 --- INFO --- shopping_lists Created! +2025-08-09 16:19:12.450772 --- INFO --- shopping_list_items Created! +2025-08-09 16:19:12.457862 --- INFO --- item_locations Created! +2025-08-09 16:19:12.463866 --- INFO --- conversions Created! +2025-08-09 16:19:12.470947 --- INFO --- sku_prefix Created! +2025-08-09 16:19:12.475760 --- INFO --- barcodes Created! +2025-08-09 16:19:12.479939 --- INFO --- Admin User Created! +2025-08-09 16:19:19.886072 --- INFO --- item_info DROPPED! +2025-08-09 16:19:19.892893 --- INFO --- items DROPPED! +2025-08-09 16:19:19.897304 --- INFO --- cost_layers DROPPED! +2025-08-09 16:19:19.901852 --- INFO --- linked_items DROPPED! +2025-08-09 16:19:19.906270 --- INFO --- transactions DROPPED! +2025-08-09 16:19:19.910202 --- INFO --- brands DROPPED! +2025-08-09 16:19:19.914590 --- INFO --- food_info DROPPED! +2025-08-09 16:19:19.920441 --- INFO --- logistics_info DROPPED! +2025-08-09 16:19:19.924877 --- INFO --- zones DROPPED! +2025-08-09 16:19:19.929137 --- INFO --- locations DROPPED! +2025-08-09 16:19:19.933482 --- INFO --- vendors DROPPED! +2025-08-09 16:19:19.937945 --- INFO --- group_items DROPPED! +2025-08-09 16:19:19.942105 --- INFO --- groups DROPPED! +2025-08-09 16:19:19.946356 --- INFO --- receipt_items DROPPED! +2025-08-09 16:19:19.950544 --- INFO --- receipts DROPPED! +2025-08-09 16:19:19.954933 --- INFO --- recipe_items DROPPED! +2025-08-09 16:19:19.958968 --- INFO --- recipes DROPPED! +2025-08-09 16:19:19.963538 --- INFO --- shopping_list_items DROPPED! +2025-08-09 16:19:19.967716 --- INFO --- shopping_lists DROPPED! +2025-08-09 16:19:19.971768 --- INFO --- item_locations DROPPED! +2025-08-09 16:19:19.975659 --- INFO --- conversions DROPPED! +2025-08-09 16:19:19.979690 --- INFO --- sku_prefix DROPPED! +2025-08-09 16:19:19.983693 --- INFO --- barcodes DROPPED!