github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-03-31 18:19:25 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,007 Commits 2 Branches 81 Tags 29 MiB
808745dbfa
Commit Graph

414 Commits

Author SHA1 Message Date
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
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
6f035fd64d
Allow decimal numbers for the kcal field (closes #492) 2020-01-21 21:31:42 +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
f543a3a472
Fixed and optimized some things related to #421 (& some more cleanup) 2020-01-21 17:30:09 +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
d4bec3bd10
Added a "keep screen on" option using NoSleep.js (closes #427) 2020-01-05 10:03:02 +01:00
Bernd Bestel
0be672aa48
Fixed that when FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS was set to false, the shopping list appeared empty after some actions (fixes #428) 2020-01-03 13:35:48 +01:00
kriddles
36e8484046 Recipe form updates (#476) 
* recipePosForm - hide when embeded productcard

* recipeposform: remove prefillByName for productPicker

* recipeform add data-product-id

* recipeposform cleanup extra clicks

* recipeform: bootbox the recipe pos edit button

* recipeform: bootbox the recipe pos add button

* recipeposform postMessage back

* recipeform reload if IngredientsChanged

* Fix page reload for new recipes (URL = /recipe/new)

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2019-12-21 12:36:02 +01:00
Bernd Bestel
d617a72397
Again small localization string changes (references #421) 2019-12-19 20:03:27 +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
Lewis Juggins
9ba66aeac2 Rename location to "Default location" on product page (#416) 
* Rename location to default location on product page

* Move resource
 2019-10-12 14:27:15 +02:00
Bernd Bestel
3328c789d4
Fixed that the meal plan menu item was not visible when the calendar was disabled (through feature flags) (closes #415) 2019-10-12 10:35:47 +02:00
Bernd Bestel
700db9ae00
Added a new sub feature flag FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS 2019-10-05 13:10:56 +02:00
Bernd Bestel
ba6bfa6a2c
Added a chore period type "yearly" (closes #407) 2019-10-04 11:24:51 +02:00
Bernd Bestel
28b23fd313
Implemented chore period intervals to have more flexible schedules (closes #312) 2019-10-04 11:14:11 +02:00
Bernd Bestel
420e4b933f
Don't display QU conversions for other products on the product edit page (fixes #400) 2019-10-02 15:53:36 +02:00
Bernd Bestel
95208f5582
Updated unmanaged dependencies (font) 2019-09-28 08:53:59 +02:00
Bernd Bestel
dea2ffeaaf
Added a "clear" button above the new notes field on the shopping list page 2019-09-28 08:48:58 +02:00
Bernd Bestel
1b9a3c7f57
Fix that the barcode scanner start button overlaps everything 2019-09-27 17:03:50 +02:00
Bernd Bestel
2636456461
Show the journal of the product/chore/battery cards in a dialog 2019-09-27 16:54:40 +02:00
Bernd Bestel
81f6b58fe4
Added a button to jump to the journal on the product/chore/battery card 2019-09-27 14:19:06 +02:00
Bernd Bestel
765f908966
Make it possible to provide the purchase price also as a total price (closes #390) 2019-09-27 13:50:16 +02:00
Bernd Bestel
9527305311
Userobjects list page print optimizations (closes #396) 2019-09-27 13:23:10 +02:00
DeeeeLAN
6522aca30e Fixed navigation menu and full screen recipe smooth scrolling on iOS (#397) 
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation

* fixed recipe ingredient layout issue in safari

* fixed navigation menu and full screen recipe smooth scrolling on iOS
 2019-09-27 08:33:08 +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
cf2e6f1039
Added a sub feature flag to disable chore assignments when not needed 2019-09-26 17:20:25 +02:00
Bernd Bestel
21503c26d2
Use properly formatted numbers "everywhere" (partly references #389) 2019-09-26 15:25:30 +02:00
Bernd Bestel
a2b6d9ae39
Various small UI refinements 2019-09-26 13:14:24 +02:00
Bernd Bestel
2809cc1454
Typo... 2019-09-26 12:45:35 +02:00
Bernd Bestel
828ab8eba0
Allow accumulating min. stock amounts on parent product level (closes #384) 2019-09-26 10:36:49 +02:00
DeeeeLAN
c0d79b1518 Fixed #378 (#380) 
* fixed barcode button on iOS and made nicer on the desktop

* fixed indentation

* fixed indentation
 2019-09-25 09:00:36 +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
Bernd Bestel
d8be254ff3
Link /barcodescannertesting page in settings menu 2019-09-24 10:43:10 +02:00
Bernd Bestel
50e829f270
Hide the recipe interaction buttons when displayed as a fullscreen card (as the dialogs would be behind the fullscreen card) 2019-09-24 10:28:42 +02:00
Bernd Bestel
099ac7e75a
Use exact matches for product barcode lookups (closes #366) 2019-09-24 09:52:05 +02:00
Bernd Bestel
6bb9d2c51d
Some little changes for pull request #369 (also references #367) 2019-09-24 08:35:30 +02:00
Bernd Bestel
4c57bf8b9d
Always navigate back to the previous page after saving a product (closes #364) 2019-09-22 09:03:59 +02:00
Bernd Bestel
363dcf448e
Give the main page content section an id 2019-09-22 08:35:03 +02:00
Bernd Bestel
fc2a37d3fc
Typo... 2019-09-21 20:20:32 +02:00
Bernd Bestel
c32ea087df
Added a little barcode scanner testing page (references #362) 2019-09-21 20:01:49 +02:00
Bernd Bestel
b57fd83cb8
Fixed various smaller problems after some testing 2019-09-21 13:08:42 +02:00
Bernd Bestel
ab44566890
Small style refinements 2019-09-21 08:38:28 +02:00
Bernd Bestel
d2a841143e
Don't show the sidebar on other menus on the login page 2019-09-21 08:28:08 +02:00
Bernd Bestel
d580990b25
Fixed JS errors on the login page 2019-09-21 08:25:32 +02:00
Bernd Bestel
78b658e86e
Also the product calories field is not required 2019-09-20 20:19:12 +02:00
Bernd Bestel
051cb816fe
Disabled CSS class was applied to calories product field by mistake 2019-09-20 20:17:54 +02:00
Bernd Bestel
91c275e66b
Slightly reordered the header of the shopping list page 2019-09-20 20:14:47 +02:00
Bernd Bestel
653098a81e
Improved product picture display on the productcard 2019-09-20 20:10:03 +02:00
Bernd Bestel
c228126c3a
Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +02:00
Bernd Bestel
1ae5f552d1
Inventory is always possible, also when the produc is not in stock currently (references #327) 2019-09-20 18:26:32 +02:00
Bernd Bestel
4754cc306a
Currently there are no multiple shopping lists output options, so no dropdown button needed (this now closes #245) 2019-09-20 18:13:38 +02:00
Bernd Bestel
339a25d1e3
Added a notes field to shopping lists (references #245) 2019-09-20 18:08:38 +02:00
Bernd Bestel
5a91c86b81
Added an option to print a shopping list (references #245) 2019-09-20 17:40:45 +02:00
Bernd Bestel
a95d6be4f4
Added more product actions on the stock overview page (closes #327) 2019-09-20 13:37:53 +02:00
Bernd Bestel
9f8216378e
Only show the "Test plural forms"-button on the qu edit page when the current language requires more than 2 plural forms (references #261) 2019-09-20 10:33:44 +02:00
Bernd Bestel
d4c76aaa76
Properly show qu plural forms on the product or qu conversion edit page 2019-09-20 10:30:46 +02:00
Bernd Bestel
aa670adefc
Added a say-thanks-button on the about page 2019-09-20 10:08:10 +02:00
Bernd Bestel
e720311572
Fixed hidden price_factor field in recipeposform.blade.php 2019-09-19 21:31:37 +02:00
Bernd Bestel
7c114cfec3
Implemented a price factor option for recipe ingredients (closes #295) 2019-09-19 21:30:24 +02:00
Bernd Bestel
412653d67d
Small Swagger UI refinements 2019-09-19 19:59:17 +02:00
Bernd Bestel
cbf1d1ca40
Implemented stock sub-feature-flags (closes #314) 2019-09-19 17:46:52 +02:00
Bernd Bestel
5e9a7fb7ca
Implemented browser barcode scanning (closes #102) 2019-09-19 12:48:02 +02:00
Bernd Bestel
9f18b75526
Auto focus the amount field on the qu plural form testing page (references #261) 2019-09-18 20:27:35 +02:00
Bernd Bestel
346b589534
Make it possible to test quantity unit plural forms (closes #261) 2019-09-18 20:21:09 +02:00
Bernd Bestel
ce12202c86
Make it configurable if calendars shows week numbers or not (closes #333) 2019-09-18 18:30:25 +02:00
Bernd Bestel
2522b3748c
Just name it "fields" not "userfields" for custom objects (references #242) 2019-09-18 16:25:38 +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
9b5f3ba7b8
Render product Userfields also on the shopping list (this now closes #258) 2019-09-17 19:39:55 +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
4dd804003b
Re-apply filter after chore execution on the chores overview page 2019-09-17 17:17:33 +02:00
Bernd Bestel
182d063886
Fixed user filter button on chores overview page (references #253) 2019-09-17 16:58:42 +02:00
Bernd Bestel
bc487b4867
Make it possible to also filter by chore assignments on the chore overview page (references #253) 2019-09-17 16:50:29 +02:00
Bernd Bestel
597a9e3d21
Show aggregated product amounts also on the productcard (references #196) 2019-09-17 16:18:00 +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
3dcd513094
Fixed new translation strings 2019-09-16 11:02:03 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +02:00
Bernd Bestel
c532a67884
Started working on qu unit conversion handling (references #177) 2019-09-15 17:06:52 +02:00
Bernd Bestel
6094096675
Started working on qu unit conversion handling (references #177) 2019-09-15 16:40:54 +02:00
Bernd Bestel
a0a0e104b0
Implemented product variations (closes #196) 2019-09-14 17:34:36 +02:00
Bernd Bestel
f9036f0248
Use the summernote editor for product description (closes #288) 2019-08-15 14:35:28 +02:00
Bernd Bestel
257dd644aa
Render checkbox Userfields in tables as checkmark (closes #326) 2019-08-15 14:05:33 +02:00
Bernd Bestel
7004cf4400
Finished the implementation of "Location Content Sheet" (closes #341) 2019-08-11 09:24:47 +02:00
Bernd Bestel
28716ed96c
First draft for printable location content sheets (references #341) 2019-08-10 16:34:29 +02:00
Bernd Bestel
e6020432c6
Add chores due date rollover (closes #340) 2019-08-10 12:44:09 +02:00
Oncleben31
b61d569247
Use list title when display a used filed form 
To replace the default string `Product group`
 2019-07-13 01:34:57 +02:00
Bernd Bestel
6e3407b157
Always show "Track date only" shore execution times without the time part 2019-07-07 19:38:57 +02:00
Bernd Bestel
52dd01f313
Fixed that a string was never translated 2019-07-07 09:29:04 +02:00
Bernd Bestel
b4d2e2a20a
Added the possibility to undo a task (closes #252) 2019-07-06 20:34:01 +02:00
Bernd Bestel
914dde4609
Added a new config.php setting CALENDAR_FIRST_DAY_OF_WEEK to be able to change the first day of a week used for calendar views (closes #256) 2019-07-06 20:19:21 +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
8c205941c7
Added that products can now also be consumed as spoiled from the stock overview page (option in the more/context menu per line) (closes #251) 2019-07-06 18:15:53 +02:00
Bernd Bestel
b24683f954
Added the possibility to mark a shopping list item as "done" (closes #257) 2019-07-06 17:56:59 +02:00
Bernd Bestel
e4d26bb8fd
Make it possible to switch shopping list items between shopping lists (closes #284) 2019-07-06 17:31:17 +02:00
Bernd Bestel
0c0e8c6957
Fixed the consume success message on stock overview page (fixes #302) 2019-07-06 13:13:38 +02:00