github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-27 23:29:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,550 Commits 2 Branches 81 Tags 29 MiB
master
Commit Graph

410 Commits

Author SHA1 Message Date
kriddles
ac1be1e90f 450 updates (#518) 
* prevent seeing undefinde if no recipes

* disable weekRecipeConsume if weekCosts are zero

* reword title

* Add meal plan notes and products to Calendar
 2020-01-26 08:50:44 +01:00
Bernd Bestel
fd5a72264d
Meal plan recipe and notes also fit into one table (references #477) 2020-01-23 21:57:47 +01:00
Bernd Bestel
99d4b05a3c
Make purchased date on /stockedit editable / Dirty workaround for 2 datetimepickers on the same page (references #506) 2020-01-23 18:58:05 +01:00
kriddles
3baffcfe7b typo (#511) 2020-01-23 09:34:17 +01:00
Bernd Bestel
6300a8fd09
Typo... 2020-01-22 22:36:01 +01:00
Bernd Bestel
ec2551d263
Little refinements for #507 2020-01-22 21:17:04 +01:00
kriddles
ef9f28d154 421 (#507) 
* refactor to be stock/entry/{entryId}

* Allow recipeform add productworkflow

* on document ready stockdetail filter based on ProductPicker

* openDate fixes for undo

* RefreshStockDetailRow refresh location-id
 2020-01-22 21:08:49 +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
c22496ca7c
Fixed /stockedit opened checkbox (references #506) 2020-01-21 20:04:33 +01:00
Bernd Bestel
d0036e8034
Tried to simplify #503 (also references #487) 2020-01-19 09:52:23 +01:00
Grégory SACRE
61a45c030f Feature request : api/stock can return detailed products #487 (#503) 
The response of the call '/api/stock' now returns a new attribute
('product') which contains the details of the related product.
 2020-01-19 09:14:07 +01:00
kriddles
2a608c41e9 Stock detail updates (#493) 
* Fix spelling

* stockdetail refresh with location name

* Stock updates

* change stock_row_id to id

* fix stockdetail refresh rows after clicking undo

* fix stockdetail consume spoiled
 2020-01-17 17:54:34 +01:00
Bernd Bestel
8e26bd2c31
Allow partial units during inventory (fixes #459) 2020-01-03 13:55:14 +01:00
kriddles
6c7420ea08 Stock Service Updates (#421) 
* viewjs consume: implement location and update stock specific

* Transfer Products

* services StockService#GetProductStockEntriesByLocation: add method

* services StockService#AddProduct: check for stock and locations

* services StockService: include location_id

* services StockService#LocationExists: add method

* services StockService#UndoBooking: fix based on stockRow

* Reimplement StockServer->TransferProduct (one loop for the whole action to preserve stock_id)

* Ensure that the location_id is never NULL in the stock and stock_log table (checked by an INSERT trigger, sets the products default location if empty)

* Only consider stock amount at the given location on consume, if supplied

* Restore more/old display text for "specific stock entry"

* Don't allow transfering tare weight enabled products

* Various small changes (code style, missing OpenAPI endpoint, remove location_id null checking)

* Updated translations strings

* Added transaction_id and correlation_id to stock_log entries to group them together

* ProductCard - location to default location label change

* Also undo correlated bookings on undo

* Added API endpoints for listing and undoing transactions and use them on purchase/consume/inventory/stockoverview

* Initial Stock detail page

* Allow Undo for Tranfers

* Price step to .01

* Some localization string changes & fixes
 2019-12-19 19:48:36 +01:00
Bernd Bestel
21b9c1a8aa
Always use the proper URL for meal plan links in iCal calendar export (references #417) 2019-10-12 10:22:17 +02:00
kriddles
c6ae8cc348 Calendar descriptions (iCal export) (#417) 
* controllers CalendarApiController: setDescription for events

* services CalendarService: include link to mealplan in calendar descriptions
 2019-10-12 10:16:06 +02:00
Bernd Bestel
ba6bfa6a2c
Added a chore period type "yearly" (closes #407) 2019-10-04 11:24:51 +02:00
Bernd Bestel
e59a35c6d1
Also refresh the parent product on sub product actions on the stock overview page (closes #394) 2019-09-27 08:30:08 +02:00
Bernd Bestel
cf3217ada4
Fixed expired products count on stock overview page (fixes #392) 2019-09-26 16:42:59 +02:00
Bernd Bestel
5351828e79
Reuse existing shopping list items when adding products from the stock overview page (closes #375) 2019-09-24 18:27:50 +02:00
Marc Ole Bulling
f444d3e095 Fixed API call AddProductToShoppingList (#376) 
$productId->id was undefined, therefore all items added to the shopping list with the API call had a null entry for "product_id"
 2019-09-24 15:50:35 +02:00
Bernd Bestel
53c56cc1cb
Include meal plan recipes in the calendar (closes #368) 2019-09-24 09:40:56 +02:00
Bernd Bestel
66571f662f
Hotfix (will be included in v2.5.0 release): Don't break image loading when php-gd extension is not installed 2019-09-22 14:48:50 +02:00
Bernd Bestel
d16f3c2daf
Optimized demo instance localization & data handling 2019-09-22 08:21:15 +02:00
Bernd Bestel
d8360993cc
Internal change that the demo instances (stable and pre-release) can be served through a single instance for all localizations (references #241) 2019-09-21 15:07:29 +02:00
Bernd Bestel
e4437f5db1
Fixed that "Spoil rate" and "Average shelf life" on the product card was wrong in most cases 2019-09-21 13:30:44 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +02:00
Bernd Bestel
292b652437
Updated localizations & improved some special and demo translation string data handling 2019-09-20 16:26:50 +02:00
Bernd Bestel
35a409f462
Fixed/refined some things regarding purchase/consume/inventory of products with enabled tare weight handling 2019-09-19 21:10:36 +02:00
Bernd Bestel
a4d479d047
Also consider opened products for minimum stock amounts (optionally, but by default) (closes #353) 2019-09-19 18:11:03 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning (closes #102) 2019-09-19 12:48:02 +02:00
Bernd Bestel
ca470ed4ee
Fixed version display in prerelease mode 2019-09-18 17:27:47 +02:00
Bernd Bestel
096fb7a116
Implement custom entities / objects (closes #242) 2019-09-18 16:18:15 +02:00
Bernd Bestel
918f84f568
Lazy load all images to increase page load times (references #275) 2019-09-18 13:59:37 +02:00
Bernd Bestel
d209c0bd22
Automatically downscale pictures to reduce page loading times (closes #275) 2019-09-18 11:04:59 +02:00
Bernd Bestel
3df44697bf
Implemented the option to automatically consume a product on tracking a chore execution (closes #279) 2019-09-18 10:02:52 +02:00
Bernd Bestel
0fa0138972
Implemented new Userfield type "Link" (references #258) 2019-09-17 19:33:06 +02:00
Bernd Bestel
0c27157db6
Implemented new Userfield type "Select list" (closes #325) 2019-09-17 19:11:06 +02:00
Bernd Bestel
bbd5ce1dc4
Typo... 2019-09-17 17:54:09 +02:00
Bernd Bestel
0771d58fe7
Fixed that /api/system/db-changed-time always returned the current time 2019-09-17 17:49:58 +02:00
Bernd Bestel
b5761ae544
Show to whom the chore execution is assigned in calendar events (references #253) 2019-09-17 16:28:11 +02:00
Bernd Bestel
74f9470769
Implemented that chores can be assigned to users (closes #253) 2019-09-17 13:13:26 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations (closes #196) 2019-09-14 17:34:36 +02:00
Bernd Bestel
a4454f825a
Fixes/changes for pull request #349 2019-08-31 14:08:15 +02:00
Marc Ole Bulling
d4eb767f1b Add API call for adding products to shoppinglist 2019-08-30 09:21:11 +02:00
Forceu
411aad2398
Set stock amount to 0 instead of null if product not in stock 
Without this the API returns null instead of 0 when queried for product stock amount
 2019-08-13 12:20:14 +02:00
Bernd Bestel
28716ed96c
First draft for printable location content sheets (references #341) 2019-08-10 16:34:29 +02:00
Bernd Bestel
cc1c6a6442
Little changes for pull request #338 2019-08-10 08:33:30 +02:00
Marc Ole Bulling
1e33975a96 Use default best before date when adding product through API 2019-08-04 20:58:11 +02:00
Forceu
1a23eaabf1
Add API call to remove an item from the shopping list by productid 
This adds an API call, so a shopping list item can easily be removed

Please note: This is UNTESTED, as I was unable to run the current grocy master commit on my server.
 2019-08-04 20:31:47 +02:00
Bernd Bestel
87976b86d9
Also display price data from inventory corrections, not only purchases (fixes #303) 2019-07-07 09:25:13 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task (closes #252) 2019-07-06 20:34:01 +02: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
b1adaa24cf
Fix session problem on 32 bit systems when using "stay logged in permanently" (fixes #278) 2019-06-08 16:47:45 +02:00
Bernd Bestel
9f2481a6a8
Fixed an issue when a plural translation is empty/null (can be the case for quantity units, fixes #259) 2019-06-08 16:32:23 +02:00
Bernd Bestel
d412b81eae
Hotfix (will be included in v2.4.0 release): Fixed a potential problem when the plural form of a translation (e. g. plural forms for user defined quantity units) is NULL 2019-05-10 21:22:53 +02:00
Bernd Bestel
338c6c0a9d
Added a new userfield type "preset-list" (closes #239) 2019-05-07 21:24:59 +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
3f53919ddd
Also allow placeholders for plural translations (references #161) 2019-05-07 19:42:35 +02:00
Bernd Bestel
57233dba1a
Added first basic version of meal planning (references #146) 2019-05-06 19:38:47 +02:00
Bernd Bestel
9ef55f1f01
Make it possible to track a chore execution without the time part, only the day 2019-05-04 16:13:05 +02:00
Bernd Bestel
970e5edfa3
Fixed an issue with translations string without an placeholder (references #161) 2019-05-04 15:13:01 +02:00
Bernd Bestel
bcae9f9292
Added price field on inventory page (for added products) (references #225) 2019-05-03 22:11:20 +02:00
Bernd Bestel
7fc4992b3a
Fixed API response for /api/stock/products/{productId}/inventory when the new amount equals the current stock amount (references #224) 2019-05-03 18:37:02 +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
40b5afe926
Backup current state of LocalizationService.php (references #161) 
This will serve as a permanent backup for the migration algorithm used to migrate all current translation files to PO/Gettext
 2019-05-01 20:04:06 +02:00
Bernd Bestel
fc11da3c3f
Started working on user-defined-fields for all entities (references #176) 2019-04-22 22:16:35 +02:00
Bernd Bestel
77f3b80540
Implemented daily/weekly/monthly recurrence patterns for chores (closes #151) 2019-04-22 14:01:31 +02:00
Bernd Bestel
d72fe69a17
Show more info in product card (closes #173) 2019-04-22 10:11:58 +02:00
Bernd Bestel
162adeb359
Improve API related changes regarding multiple shopping lists (references #190) 2019-04-22 08:21:57 +02:00
Bernd Bestel
cdd02efcc6
Implemented multiple/named shopping lists (closes #190) 2019-04-20 17:04:40 +02:00
Bernd Bestel
b6e80580ed
Make it possible to provide a different location for added product during inventory (closes #183) 2019-04-05 21:26:44 +02:00
Bernd Bestel
12082b52ab
Fixed differences in highlighting for expiring/expired items in header vs table on stock overview page (fixes #198) 2019-04-05 18:41:21 +02:00
Bernd Bestel
1b26a6277b
Make demo product locations a little bit more realistic 2019-03-10 16:18:24 +01:00
Bernd Bestel
9d02fbc13c
Again some changes for the new product-by-barcode API method (references #171) 2019-03-10 14:53:06 +01:00
Bernd Bestel
61f582554f
Return a proper API response when booking amount for consume/open is > current stock amount (references #170) 2019-03-10 13:50:28 +01:00
Bernd Bestel
75241fc61f
Just some changes for the new product-by-barcode API method (references #171) 2019-03-10 13:43:58 +01:00
Matej Drobnič
3f4a5cc0d6 Add fetch by barcode API method 2019-03-10 12:20:31 +01:00
Bernd Bestel
6de4b120b3
Include changelog as markdown files and show it in the about dialog 2019-03-09 15:54:16 +01: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
816eb03147 Added a "recipe gallery" view (closes #147) 2019-03-05 17:59:33 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
90291fdbca Added possibility to export the calendar in iCal format (closes #141) 2019-03-04 17:44:48 +01:00
Bernd Bestel
77b0bc675c Varios small UI changes / improve UI consistency 2019-03-04 17:43:12 +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
bb5daa5f8b
Display total cost of recipes based on last purchase prices (closes #128) 2019-03-03 16:33:48 +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
b89643ddb1
Allow different locations per product in stock (closes #124) 
Kind of basic for now, a different location can be set on purchase, the filters on the stock overview page handles different locations
 2019-03-01 20:25:01 +01:00
Bernd Bestel
01e9e3f5ce
Move about dialog into separate view and add API endpoint for system info 2019-02-09 13:41:40 +01:00
Bernd Bestel
dfc05e0bec
Allow optional partial units of products in stock (closes #123) 2019-01-26 14:17:02 +01:00
Bernd Bestel
eec3515b6d
Don't use a second hidden amount field for shopping list entries which were added by "Add missing products to shopping list" (fixes #149) 2019-01-26 13:09:01 +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
8041dd9c26
Support single quotes in demo data 2018-11-24 20:39:17 +01:00
Bernd Bestel
306d0f7da6
Add "one click shopping list to stock workflow" (closes #110) 2018-11-21 19:08:36 +01:00
Bernd Bestel
2ff5faacc0
Prevent opening more products than are unopened in stock 2018-11-18 13:35:21 +01:00
Bernd Bestel
a489190e81
Add some opened products to demo 2018-11-18 13:21:57 +01:00
Bernd Bestel
a403bb687a
Show amount of opened products on stock overview page and in product card 2018-11-18 13:17:36 +01:00
Bernd Bestel
c71e46191f
Optimized stock logic 2018-11-18 12:34:05 +01:00
Bernd Bestel
10ea9c44fd
Make it possible to mark a product as opened (closes #86) 2018-11-17 19:39:37 +01:00
Bernd Bestel
816ca6460f
Make it possible to pick a specific stock item on consume (closes #62) 2018-11-17 17:51:35 +01:00
Bernd Bestel
83985e9f21
Migrate translations to use Transifex 2018-11-03 14:29:14 +01:00
Bernd Bestel
364f6b2051
Add journal and undo UI for stock bookings, chore executions and battery charge cycles (closes #63, closes #97) 2018-10-27 17:26:00 +02:00
Bernd Bestel
fe83e2fa6f
Created API endpoints to undo battery charge cycles and chore executions (references #63) 2018-10-27 10:55:30 +02:00
Bernd Bestel
da98efa833
Finalize nested recipes / group recipe positions feature (closes #77) 2018-10-27 10:37:31 +02:00
Bernd Bestel
3e6cf545d7
Finalize stock booking undo API (references #63 and #97) 2018-10-27 10:19:06 +02:00
Bernd Bestel
1080c3486c
Created first version of an API endpoint to undo stock bookings (references #63 and #97) 2018-10-26 22:28:58 +02:00
Bernd Bestel
fc3a4c6899
Finish first version of nested recipes feature (references #77) 2018-10-25 20:36:29 +02:00
Bernd Bestel
0e723a0a9b Fixed reported login problem ("PHP Warning: date() expects parameter 2 to be integer, float given") 2018-10-16 18:21:38 +02:00
Bernd Bestel
ebd24bf30e
Use new editor also for recipes 2018-10-03 16:41:21 +02:00
Bernd Bestel
b242a5de52
Finish equipment / instruction manuals feature (references #25) 2018-10-03 16:11:39 +02:00
Bernd Bestel
edb986ce24
Added a quick mockup for equipment / instruction manuals (references #25) 2018-10-02 20:03:08 +02:00
Bernd Bestel
bb9caf9cc9
Fixed volatil stock logic (fixes #69) 2018-10-02 17:06:21 +02:00
Bernd Bestel
9dd57decdf
Finish "pictures for products" features (now closes #58) 2018-10-02 16:48:39 +02:00
Bernd Bestel
f1c78659be
Optimize user settings 2018-09-30 17:14:04 +02:00
Bernd Bestel
f451e65278
Also log missing localization found in frontend (only when MODE == dev) 2018-09-30 13:02:07 +02:00
Bernd Bestel
d4227d2e41
Make auto reloading the page on external database changes configurable (closes #74) 2018-09-30 11:17:28 +02:00
Bernd Bestel
0bbd2d9880
Prepare user settings API (references #74 and #71) 2018-09-30 10:47:56 +02:00
Bernd Bestel
9c2c2c1fa2
Prepare file upload API (references #58) 2018-09-27 14:01:00 +02:00
Bernd Bestel
2a0ec30bb0
Auto reload the current page when the database has changed and when idling (closes #59) 2018-09-24 13:53:18 +02:00
Bernd Bestel
8540fc44f3
Added option to stay logged in permanently 2018-09-24 13:16:57 +02:00
Bernd Bestel
66095738e3
Added product groups (this closes #55) 2018-09-24 13:02:52 +02:00
Bernd Bestel
06f25b7006
Finish first version of tasks feature 2018-09-23 19:26:13 +02:00
Bernd Bestel
f85a67a1ff
Continue working on tasks feature 2018-09-23 09:22:54 +02:00
Bernd Bestel
6fe0100927
Start working on tasks feature 2018-09-22 22:01:32 +02:00
Bernd Bestel
4075067a10
Renamed habits to chores as this is more what it is about 2018-09-22 13:26:58 +02: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
9a8c61497b Fixed typo 2018-08-09 17:32:21 +02:00
Bernd Bestel
71b9d11ff5 Implement that recipe ingredients can have arbitrary quantity units (references #32) 2018-08-09 17:24:04 +02:00
Bernd Bestel
c4b0ef4d49
Refresh the complete row on all overview pages on changes, including the background color (closes #39) 2018-08-07 20:11:08 +02:00
Bernd Bestel
5833364e51
Add pluralization of demo and default quantity units 2018-08-04 17:37:43 +02:00
Bernd Bestel
e830805443
Refresh also habit/battery statistics on changes on overview pages (references #26) 2018-08-04 15:44:58 +02:00
Bernd Bestel
ca3f28b615
Refresh stock statistics on consume on stock overview page (references #26) 2018-08-04 14:25:32 +02:00
Bernd Bestel
6081b8ee67
Fix some form validation problems (closes #36) 2018-08-04 07:45:24 +02:00
Bernd Bestel
f5b5c4c7e1 Add default quantity units and locations to reduce confusion (only for new installations) (references #38) 2018-08-03 08:14:23 +02:00
Bernd Bestel
c64eb27ca1
Add something for product price tracking (references #22) 2018-07-26 20:27:38 +02:00
Bernd Bestel
42c1709633
Optimize and refactor latest changes 2018-07-25 19:28:15 +02:00
Bernd Bestel
249b01d7a8
Added possibility to track who did a habit (this implements and closes #21) 2018-07-24 20:45:14 +02:00
Bernd Bestel
bcbdf58376
Prefix all global vars 2018-07-24 19:41:35 +02:00
Bernd Bestel
7f8540ff4e
Replace the single user (defined in /data/config.php) with a multi user management thing 2018-07-24 19:31:43 +02:00
Bernd Bestel
3b4141eb4d
Prepare for embedded mode 2018-07-16 21:17:32 +02:00
Bernd Bestel
254e1a9bc1
Fix all the little things for the next release 2018-07-15 13:33:59 +02:00
Bernd Bestel
82bfb6a3c3
Improve demo data 2018-07-15 11:24:36 +02:00
Bernd Bestel
be650d093d
Add a button to clear the whole shopping list 2018-07-15 08:29:26 +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
Bernd Bestel
89bae8d25e
Changed how version information is stored and displayed 2018-05-12 15:49:21 +02:00
Bernd Bestel
3e394a3840
Also show due/overdue on bateries- and habitoverview 2018-05-12 15:30:13 +02:00
Bernd Bestel
a9a1358b08
Added a plugin system for looking up products against external services by barcode (references #6) 2018-04-22 19:50:24 +02:00
Bernd Bestel
4853174d03
Validate all API request as the API is now open for third parties (references #5) 2018-04-22 14:25:08 +02:00
Bernd Bestel
99b2a84667
Finish API documentation and token auth (references #5) 2018-04-21 19:18:00 +02:00
Bernd Bestel
eae5b8bad9
Revise session handling to prepare API authentication via token 2018-04-20 11:34:53 +02:00
Bernd Bestel
4656a85732
Added localization support 2018-04-16 19:11:32 +02:00
Bernd Bestel
642f95a3f8
Finalize project reorganization 2018-04-14 11:10:38 +02:00
Bernd Bestel
5a1d21ef31
Reorganize project part 3 2018-04-12 21:13:38 +02:00
Bernd Bestel
feb88ab685
Reorganize project part 2 2018-04-11 19:51:05 +02:00
Bernd Bestel
bcd5092427
Reorganize project part 1 2018-04-10 20:30:11 +02:00