Commit Graph

143 Commits

Author SHA1 Message Date
Bernd Bestel
d03175f75a Added a separate QU for displaying prices (closes #2225) 2023-05-18 13:37:13 +02:00
Travis Raup
340832c361 Feature: Stock Purchase Metrics (#2135)
* Feature: Stock Purchase Metrics

* chart update

* Refactor to chartjs

* More suggestion edits

- locale in javascript
- global translations
- commit migrations sql file

* Rename 0215.sql to 0216.sql

Fixed merge conflict

* Fixed merge conflict

* Applied code style

* Added missing demo data translations

* Removed unused package "canvasjs"

* Don't include daterangepicker globally when only needed on a single page / fixed view section imports

* Rename this to "Spendings" / name it more generically "Stock reports"

* Reuse the existing product_price_history view

* Final cleanup

* Whitespace fix

---------

Co-authored-by: Travis Raup <travis.raup@platform.sh>
Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2023-04-01 17:05:41 +02:00
Bernd Bestel
d9667b4534 Removed type conversions where no longer needed
PHP 8.1 PDO SQLite now returns native data types
2023-02-06 20:22:10 +01:00
Bernd Bestel
d8d3c3ef0b Split the quick consume and open amount product option (closes #2127) 2023-02-05 20:37:39 +01:00
Bernd Bestel
c0fbc4adaf Fixed /stockoverview value column sort format (fixes #2088) 2023-01-01 20:33:08 +01:00
Bernd Bestel
0585e80c70 Implemented "Default quantity unit consume" (closes #1845) 2022-12-26 11:11:55 +01:00
Bernd Bestel
6036786153 Fix/Workaround for DataTables ColReorder bug with data-order attributes (fixes #2019) 2022-11-12 18:10:32 +01:00
Bernd Bestel
150cfba455 Don't show invisible columns in table options 2022-04-07 19:46:13 +02:00
Bernd Bestel
a676e06c65 Optimized clear filter buttons 2022-04-04 22:42:10 +02:00
Bernd Bestel
cca35a302c Make clear filter buttons more compact 2022-04-04 21:07:14 +02:00
Bernd Bestel
e336f24225 Upgraded Font Awesome to v6 2022-04-04 20:27:51 +02:00
Bernd Bestel
6a50f74a14 Optimizations regarding displaying prices (closes #1743) 2022-04-02 17:49:35 +02:00
Bernd Bestel
ccc59dfc8b Added a new product option "Disable own stock" (closes #564) 2022-04-01 18:49:17 +02:00
Bernd Bestel
cd60c239af Squashed commit
Improved locale number display on stockoverview page
Fixed choresoverview chore execution color highlighting
Highlight recipe ingredients based on the new due score (references #1813)
Reworked current price handling views (mostly needed for recipes)
2022-03-31 22:52:38 +02:00
Bernd Bestel
926b7d8aea Table options: Only allow columns to be grouped for which it makes sense (closes #1535) 2022-02-15 18:40:42 +01:00
Bernd Bestel
2457c2c2fd Optimized returnto-links handling (fixes #1785) 2022-02-13 20:07:29 +01:00
Bernd Bestel
222c518a5f Added grocycode for recipes (closes #1562) 2022-02-11 17:49:30 +01:00
Bernd Bestel
12e5377c40 Split application translation strings and QU strings (fixes #1705) 2022-02-06 21:09:34 +01:00
Bernd Bestel
aef646e9df Highlight chores/tasks/batteries due today in a separate color + status filter (closes #1740) 2022-01-23 17:42:55 +01:00
Bernd Bestel
8455b5a64a Allow HTML tags for the product description column on the stock overview page (fixes #1735) 2022-01-06 13:38:00 +01:00
Tallyrald
98bf36dbc8 Replace Timeago with momentjs (#1687)
* Replaced timeago with moment.fromNow

* Fixed datetime when best_before_date is empty

* Removed the now unnecessary timeago package

* Removed not longer localization strings

* Check for empty instead of string comparison

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-11-15 20:05:10 +01:00
Bernd Bestel
beae32ef23 Added the products average price as a hidden by default column on the stock overview page (closes #1677) 2021-11-09 19:39:32 +01:00
Bernd Bestel
edddfe234c Include duesoon/overdue/expired products for the belowminstockamount filter on the stock overview page (closes #1666) 2021-11-08 17:06:20 +01:00
Bernd Bestel
3f850c540b Fixed stock overview context menu item disabled handling (fixes #1609) 2021-09-15 14:24:50 +02:00
Bernd Bestel
8b6f882edc Fixed missing FEATURE_FLAG_SHOPPINGLIST handling on /stockoverview, /mealplan and /stockentries pages (references #322) 2021-07-13 21:24:08 +02:00
Bernd Bestel
91d8eaeb74 Squashed commit
Improve journal pages loading time (new date range filter)
Various small style adjustments (meal plan page and others)
Pulled German translations from Transifex
Show the shopping list total value (closes #1309)
Make it possible to copy recipes (closes #714)
Implemented optional "auto decimal separator for price inputs" (closes #1345)
Removed table grouped column fixed order restriction (closes #1402)
Don't filter out style, class, id attributes of html text (closes #1298)
Added product picture as column on the stock overview page (closes #1283)
Added grocycodes also for chores and batteries (+ camera barcode scanning for /choretracking and /batterytracking, this now closes #221)
2021-07-13 19:29:23 +02:00
Bernd Bestel
70433aace5 Added an status filter to only show in-stock products on the stock overview page (closes #1263) 2021-07-12 18:02:57 +02:00
Bernd Bestel
8c5c12cb47 Added new columns on the stock overview page (closes #1351) 2021-07-08 20:42:07 +02:00
Bernd Bestel
8b977644f7 Added the product descrption as a column on the stock overview page (closes #1362) 2021-07-08 20:22:51 +02:00
Bernd Bestel
ffad8bfa7f Make it possible to search on the stock overview page for product barcodes (closes #1443) 2021-07-06 19:25:34 +02:00
Bernd Bestel
b8e15b990b Typo 2021-06-28 18:39:08 +02:00
Bernd Bestel
44d6173569 Also disable generic consume context menu item on /stockoverview when the item is not in stock (fixes #1523) 2021-06-27 18:34:58 +02:00
Katharina Bogad
f5da53a761 Migrated bootstrap3 col-xs-* to bootstrap4 col-* classes (#1521) 2021-06-24 22:46:47 +02:00
Katharina Bogad
2471e78188 Grocycode, label printing (#1500)
* Grocycode: Productpicker, StockService

* Grocycode: Datamatrix generation

* Grocycode: Display in UI, make Images downloadable

* Grocycode: Do not show on product card

* Grocycode: Stockentry Label view

* Grocycode: Webhooks & Labelprinter Feature

* Grocycode: Manual Label printing

* Grocycode: Print Label from product form

* Quagga2: use zxing for DataMatrix recognition

* Grocycode: Default settings for label printing

* Prepare merge of master

* Grocycode: docs

* Docs: label printing webhook

* Review

- "grocy" is currently written lower-case everywhere, so let's do this also for "grocycode"
- Unified phrases / capitalization
- Minor UI adjustments (mainly context menu item ordering / ordering/spacing on product edit page)
- Documented API changes for Swagger UI (grocy.openapi.json)
- Reverted German localizations (those are managed via Transifex; would cause conflicts when manually edited - will import them later there)
- Reverted a somehow messed up localization string (productform/help text for `cumulate_min_stock_amount_of_sub_products`)
- Suppress deprecation warnings when generating Datamatrix PNG (otherwise the PNG is invalid, https://github.com/jucksearm/php-barcode/issues/3)
- Default `FEATURE_FLAG_LABELPRINTER` to disabled

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2021-06-12 17:21:12 +02:00
Bernd Bestel
5953e42d70 Updated icons 2020-12-21 19:04:48 +01:00
Bernd Bestel
6eaee0c6f9 Fixed number display for quick consume buttons 2020-12-20 15:02:22 +01:00
Bernd Bestel
362b3f8508 Added min. stock amount column to stock overview (closes #856) 2020-12-19 17:25:13 +01:00
Bernd Bestel
7ef5bc6f77 Add some more columns (hidden by default) (references https://github.com/grocy/grocy/issues/1058#issuecomment-744059155) 2020-12-19 10:51:07 +01:00
Bernd Bestel
b5fc64cf5d Fixed DataTables numeric/datetime sorting (fixes #1085) 2020-12-17 17:33:24 +01:00
Robert Resch
07ff28da39 Add row group customization (#1189)
* Add row group customization

* fix rowGroup state loading

* activate rowGroup for all datatables

* add reset button

* reload page done on success callback

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-12-16 18:18:03 +01:00
Bernd Bestel
cf34df5e3f Squashed commit
Fixed some localization strings
Reviewed/optimized product deletion handling
Add option to hide products from the stock overview page (closes #906)
Prefill default_due_days also on the inventory page (closes #591)
Added DataTables accent chinese-string plugin (closes #872)
Show costs and calories per recipe ingredient (closes #1072)
Fixed user permission saving (fixes #1099)
User permissions should not have an effect for demo mode (closes #972)
Handle QU conversion when consuming a substituation (child) product (fixes #1118)
Consume/open any child product when the parent product is not in stock (closes #899)
Added a retry camera barcode scanning button to product picker workflow (closes #736)
2020-12-07 19:48:33 +01:00
Bernd Bestel
e85b21384f Remove "Allow partial units in stock" product option / unify number input validation messages 2020-11-16 17:10:41 +01:00
Bernd Bestel
1bbd7787d8 More proper number formatting 2020-11-15 22:29:47 +01:00
Bernd Bestel
b393998601 Distinguish expiry/best before dates (closes #851) 2020-11-15 19:53:44 +01:00
Bernd Bestel
1d1642b464 Make the quick consume buttons on the stock overview page configurable per product (closes #613) 2020-11-15 09:57:45 +01:00
Bernd Bestel
c360cbec4c UI strings/tooltips/basic handling review/optimizations 2020-11-12 21:35:10 +01:00
Bernd Bestel
6f3a3f62af Typo 2020-11-11 22:39:24 +01:00
Bernd Bestel
0c8b6c55c1 Added total calories as a column to stock overview (references #1058) 2020-11-11 22:38:01 +01:00
Bernd Bestel
0a600d3277 Fix hide/view columns dialog did not work on pages with more than 1 table (references #1058) 2020-11-11 22:28:05 +01:00
Bernd Bestel
7c8a17ce78 Add calories as a column to stock overview (references #1058) 2020-11-11 22:06:01 +01:00