44 Commits

Author SHA1 Message Date
Bernd Bestel
5167ba1154
Add recipe name to note of the created stock entry when self producing products (closes #2497) 2024-03-17 17:11:09 +01:00
Bernd Bestel
3308e79027
Use bind params when copying a recipe (fixes #2337) 2023-09-15 13:58:57 +02:00
Bernd Bestel
1d7f7b2992
Cache expensive stock data calculations 2023-08-06 13:28:14 +02:00
Bernd Bestel
d006436d49
Upgraded PHP-CS-Fixer / applied optimized rules 2023-08-02 18:44:30 +02:00
Bernd Bestel
6857796ef0
Fixed produces product amount handling when consuming meal plan shadow recipes (references #2160) 2023-03-12 22:45:04 +01:00
Bernd Bestel
792c710bdc
Fixed produces product handling when consuming meal plan shadow recipes (fixes #2160) 2023-03-12 16:35:18 +01: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
0bd698c968
Print stock entry labels when consuming a "Produces product" recipe (closes #2123) 2023-02-05 15:24:28 +01:00
Bernd Bestel
7e2f30396f
Fixed consume recipe product_id handling /w parent/child products (closes #1982) 2022-08-27 14:25:55 +02:00
Bernd Bestel
f1bc2cc40f
Fixed that consuming partially fulfilled recipes was possible (fixes #1981) 2022-08-27 00:08:23 +02:00
Bernd Bestel
c0d0b8fc90
Fixed default consume rule ORDER BY handling related to stock_next_use (fixes #1979) 2022-08-26 11:15:15 +02:00
Bernd Bestel
e220b3e9f3
Fixed products product stock entry price (fixes #1791) 2022-02-19 09:03:42 +01:00
Bernd Bestel
1344e84534
Fixed recipe consume stock fulfillment checking (frontend and API) (fixes #1781) 2022-02-12 22:08:10 +01:00
Bernd Bestel
dfd6262f4a
Fixed missing recipe ingredient amount when "Only check if any amount is in stock" is enabled and when there are unit conversions (fixes #1718) 2022-01-23 13:56:41 +01:00
Bernd Bestel
c190002ebb
More recipes page performance optimizations (references #1750) 2022-01-16 16:08:57 +01:00
Bernd Bestel
edfa404ed6
Squashed commit
Always execute migration 9999 (can be used to fix things manually)
Optimized meal plan navigation / date range filtering
Prepared next release
Pulled translations from Transifex
Various code optimizations
2021-07-16 17:32: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
7ee15946c7
Improved page loading time of /recipes and /mealplan when having a big meal plan (closes #695) 2021-07-10 22:56:39 +02:00
Bernd Bestel
9b37c450ed
Fixed API error when adding missing products to the shopping list from a meal plan entry (references #b0d38b87de) 2021-07-10 19:56:35 +02:00
Bernd Bestel
90a0caf1dc
Fixed meal plan recipe servings stock fulfillment checking (fixes #1391) 2021-07-10 12:32:29 +02:00
Bernd Bestel
633b26bf7e
Add recipe ingredient notes to the corresponding shopping list item (closes #1397) 2021-07-06 20:19:50 +02:00
Bernd Bestel
bcf963ac49
Fixed self production amount was wrong for tare weight handling enabled products (fixes #1431) 2021-07-03 18:30:53 +02:00
Bernd Bestel
b0b3322266
Also relate the shopping list amount to QU stock 2020-11-13 17:30:57 +01:00
fipwmaqzufheoxq92ebc
a85998dd40
Improvements (#1049)
* Fixes #1035: Check available amount after filtering by stock_entry_id

* Fixes #1036: Remove stock-related buttons/options from Shopping-list  if FEATURE_FLAG_STOCK is disabled

* Fixes #1010: Repair recipe-picture upload.

* Fixes #958: Disable auto-reload of equipments-page.

* Fix uncaught exception in locationpicker.js

* Fixes #761 and #762: Add "Remove exact amount" for products with tare weight handling and use it for recipe-consumption.

* Fixes #1048: Repair product-group-filter on "Master Data"/Products

* Renamed variable

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-10-14 17:48:37 +02:00
Bernd Bestel
836bcc82e5
Applied PHP-CS-Fixer rules 2020-09-01 21:29:47 +02:00
fipwmaqzufheoxq92ebc
32a4f81f62
Filtering of API-Results (#985)
* Add FilteredApiResponse

* Use FilteredApiResponse for Generic-Entity-Search

* Use FilteredApiResponse for Recipe-Fullfillment

* Use FilteredApiResponse for GetUsers

* Use FilteredApiResponse for current Tasks

* Use FilteredApiResponse for ProductStockEntries & ProductStockLocations

* Use FilteredApiResponse for current chores

* Use FilteredApiResponse for batteries-current

* Fix missing highlighting of "< X days"

* Keep to use existing views

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-01 19:59:40 +02:00
Bernd Bestel
d4c5da2173
Applied PHP formatting rules 2020-08-31 20:40:31 +02:00
Bernd Bestel
3b564294e3
Allow decimal amounts in general for the shopping list 2020-08-24 20:25:50 +02:00
zebardy
1a5f3ce926
Convert services to singletons and use lazy loading to improve performance (#479)
* use singletons to reduce need to recreate the same objects

* unable to make the constructor private

* comment out debug printing to log file

* correct typo of treating self() as a var instead of a function

* utilise Localisation service as a singleton

* fix errent line that should have been commented

* remove phpinfo

* correct mistake in stock controller

* try storing app in apcu

* serialise inside the app closures

* get timings for db-changed-time

* get timings for db-changed-time

* store localisation service in apcu

* stor translations in apcu instead of localisation service (due to database connection)

* correct syntax error

* forgot to uncomment instance map

* correct indentation and variable out of scope

* more timings for app execution time

* try apc caching for views

* correct scope for Pot variable

* remove additional fopen

* correct timings for app build time

* correct timings for app object build time

* correct timings for app route build time

* get timings for routing timings

* get more in depth timings for routing loading

* fix more in depth timings for routing loading

* start investigating session auth middleware creation

* start investigating session auth middleware creation

* start investigating Login controller time

* start investigating Login controller time

* in depth look at Logincontroller timings

* comment out debug printing

* lazily obtain valus for page rendering

* correct syntax error

* correct scope of variable

* correct visibiity of methds inherited from BaseController

* missing use for Userfieldsservice

* lazy loading of open api spec

* lazy loading of users service

* lazy loading of batteries service

* lazy loading of services in controllers

* lazy loading of services in services

* correct mistake

* fix userservice

* fix userservice

* fix userfieldservice

* fix chores service

* fix calendar service

* remove Dockerfile used for development

* Remove docker compose file used for development

* Clean up app.php

* remove last diff

* Clean up base controller

* Clean up controllers

* lean up middleware

* Clean up and tuen all services into singletons

* remove debug from routes.php

* remove acpu from localisation

* Complete removal of acpu from localisation

* fixes for things broken

* More fixes following merge

* Fix for start up bug. Re factoring singleton code had brroken due to scope of clas var.

* fix bug where getUsersService is declared twice

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* bug fixes following merge

* Fix all the not working things...

* Deleted off-topic files

* Deleted off-topic files

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:47:47 +01:00
Bernd Bestel
e84c7063d3
Consume any subproduct when consuming a recipe ingredient which is not in stock (fixes #446) 2020-01-27 22:14:11 +01:00
Bernd Bestel
0816359867
Some refinements for #501 2020-01-21 20:45:34 +01:00
kriddles
3a36bdaf45 recipes can create products (#501) 2020-01-21 20:20:26 +01:00
Bernd Bestel
1eb1aa8b11
Added a "consume this recipe"-button to the meal plan (and also a button to consume all recipes for a whole week) (closes #283) 2019-07-06 20:02:40 +02:00
Bernd Bestel
8504eb9b38
Finished first version of meal planning (for now closes #146) 2019-05-07 19:48:14 +02:00
Bernd Bestel
4912dd56d1
Finished migration to use gettext (this now closes #161) 2019-05-02 20:20:18 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +02:00
Bernd Bestel
2d8ad24887
Implemented that included recipes can have a serving amount (closes #163 and references #127) 2019-03-05 23:45:04 +01:00
Bernd Bestel
8020f92d6b
Track on consume for which recipe it was (closes #64 and references #64) 2019-03-03 18:20:06 +01:00
Bernd Bestel
8c11d0f15d
Add an option per recipe to not check against the shopping list when adding missing recipe ingredients, only against stock (closes #154) 2019-03-03 15:23:39 +01:00
Bernd Bestel
e9ef7ea6d8
Allow recipe ingredients to be ignored when putting them on the shopping list (closes #125) 2019-03-03 14:49:46 +01:00
Bernd Bestel
0d145bbf1e
Respect QU purchase factor when adding or comparing recipe ingredients to shopping list entries (fixes #131) 2019-01-05 21:11:36 +01:00
Bernd Bestel
324487d395
Add a "consume all ingredients of this recipe" button (this now closes #32) 2018-08-11 11:48:25 +02:00
Bernd Bestel
734814d96b
More or less finalize recipes feature 2018-07-14 22:49:42 +02:00
Bernd Bestel
d9246b9b42
Start working on recipes feature 2018-07-14 18:23:41 +02:00