94 Commits

Author SHA1 Message Date
Maximilian Bosch
34ffdb2b4b
Adds a few small frontend fixes (#995)
* Add a few instructions to the readme on how to get `grocy` running locally

* Fix toggle for header-clock

I'm not 100% sure why, but with this change, the listener which calls
`CheckHeaderClockEnabled` will be invoked *before* the listener which
persists the setting.

If the setting is persisted before that, the clock doesn't show up when
enabling it in the settings-menu and appears/disappears in the exact
opposite way the setting is true/false.

* Allow replacing a product picture when removing it at first

Right now, a preview image of a product doesn't get updated when
pressing the delete-button at first and adding a new image the
upload-form which can be quite confusing for an end-user.

This patch allows to delete an image and add a new one in one go.

* Add `Save & return` button to product form

Same concept as for recipes: when pressing this button, the user will
stay at the form's site after saving.

* Removed unneeded class

* Revert "Add a few instructions to the readme on how to get `grocy` running locally"

This reverts commit 6ffad1d3c729de9ce4bdd19aa87d7577dd2fcd36.

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-09-08 17:46:37 +02:00
Bernd Bestel
9cea0c77cd
Applied VSCode JS formatting settings 2020-08-30 12:18:16 +02:00
Bernd Bestel
3b0d29bed0
Applied EditorConfig settings to all files 2020-08-29 16:41:27 +02:00
kriddles
e8845fe2e8
Qu factor purchase to stock & Product Barcode Details (#801)
* Puchase add qu_factor_to_stock

* qu_factor_purchase_to_stock for stock edit

* product barcodes with QU and Stores

* remove product barcode tags

* migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content

* Remove unused method

* StockService#GetProductDetails: include stock_value

* productcard: include stock_value

* Add Purchase Factor to Stock Overview

* update demo data with stock qu_factor_purchase_to_stock

* recipes_pos_resolved update

* avg_price and oldest_price in product details

* add average price to product card

* hint for recipe costs not included if not in stock

* Round value and factor_purchas_amount. Include currency for stock value

* Add factor_purchase_amount to product card stock amount

* Allow editing qu_factor_purchase_to_stock for stock entries

* fix update qu_factor_purchase_to_stock for Transfers

* Add barcode to existing product update to add to product_barcodes table

* Add barcode to new product workflow update to add to product_barcodes table

* *** Price now saved as 1 QU to stock in stock tables ***

* remove column product barcode and use product_barcodes

* Allow products to be deactivated instead of deleted

* Embedded barcode and qu-conversion with page reload on change

* Save current product barcode into new product_barcodes table

* Embedded popup for product group add/edit

* barcode scanner added to product barcodes input

* Edit product qu_stock is unavailable after first purchase

* StockOverview: Filters break when columns are reordered so for now just disable colReorder

* view stockoverview.blade: display product_group column

* Review

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-08-17 21:47:33 +02:00
Bernd Bestel
f4b70e9ae3
Fixed product edit page barcodes field tab handling (fixes #764) 2020-04-19 15:01:58 +02:00
Bernd Bestel
10f890ef89
Added a camera-barcode-scanner-button to the barcodes field on the product edit page (closes #723) 2020-04-13 15:55:27 +02:00
Mik-
a6dd794ce8
Add missing form validation on presetting QU id stock (#704) 2020-04-07 16:37:30 +02:00
Mik-
1aa788b6c2
Preset the stock qu with the purchase qu on new products. (#688) 2020-04-02 08:36:20 +02:00
Bernd Bestel
e515f21d3b
Fixed DataTables earch / don't search the first column with buttons/menus (fixes #440) 2020-01-03 14:18:56 +01:00
Bernd Bestel
da2c8d48ac
Changelog and code optimizations for pull request #420 2019-10-19 10:33:46 +02:00
Marc Ole Bulling
a0fc06f6ed Add GET parameter to close window after product creation (#420)
* Add GET parameter to close window after product creation

PR for issue #419

This only works when the window was opened by Javascript (eg. from a third party plugin like Barcode Buddy)

* Added flow if window closing fails

If the window could not be closed, the normal flow continues
Added comments

* Made GET parameter case insensitive
2019-10-19 10:26:18 +02:00
Bernd Bestel
9e1804252e
Centralize default DataTables init settings (references #424) 2019-10-15 19:38:51 +02:00
Bernd Bestel
b39866bda2
Immediately refresh the QU conversion hint on key presses on the product edit page 2019-09-26 13:59:41 +02:00
Bernd Bestel
3b29110500
Never show close buttons in modal dialogs, this is not needed 2019-09-24 10:24:47 +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
d4c76aaa76
Properly show qu plural forms on the product or qu conversion edit page 2019-09-20 10:30:46 +02:00
Bernd Bestel
e326e69d49
Allow decimal numbers in "Factor purchase to stock quantity unit" when "Allow partial units in stock" is enabled (closes #351) 2019-09-17 20:02:27 +02:00
Bernd Bestel
a799f2b43f
Finished qu unit conversion handling (closes #177) 2019-09-16 09:35:20 +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
7c7c5db28c
Fixed that a entered barcode on the product edit page was only saved when "adding" it to the barcodes list by pressing TAB (closes #269) 2019-06-09 09:21:56 +02:00
Bernd Bestel
dd148a8fc3
Use named arguments for all gettext strings which have more than 1 argument (again closes #161) 2019-05-05 14:13:50 +02:00
Bernd Bestel
78a230c5d5
Fixed again a problem with productpicker workflows and disabled URL rewriting (closes #232) 2019-05-03 20:22:48 +02:00
Bernd Bestel
9b2dba2397
Migrated (hopefully) all translations to PO/Gettext (references #161) 2019-05-01 20:19:18 +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
25c257bb2c
Allow partial minimum stock amount when enabled (closes #203) 2019-04-06 15:27:00 +02:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +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
5c622b9512
Fix product form was not validated when changing location (fixes #144) 2019-01-26 13:13:38 +01:00
Bernd Bestel
bfa59dd29c
Rework API to be more RESTful (references #139) 2019-01-19 14:51:51 +01:00
Chris Forkner
0ce8d706a6 API - A bit more RESTful (#140)
* Restful routes

* Change public/viewjs to match API routes

* Move the GET and POST together. Fixed Typos. PUT for object/user edits.

* Verb-less Generic Entity Interactions

* Create Grocy.Api.Put

* Create Grocy.Api.Delete

* Fix Volatile Slim Error order in routes and adjust to english noun
2019-01-19 08:37:21 +01:00
Bernd Bestel
a3617cffb8
Small different UI improvements
Show the cursor as pointer on stock overview page while hovering the product name cell to highlight that the productcard can be opened
Show a waiting cursor and disable all form inputs while doing background XHR calls to highlight that the user should wait
Place the search field (to search a table) on all pages to the left most place
2018-11-24 19:40:50 +01:00
Bernd Bestel
04c93d937e
Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
81ec011095
Product edit page: Slightly improved styling of barcodes 2018-10-03 13:34:38 +02:00
Bernd Bestel
2a371cc081
Product edit page: Enforce a quantity unit conversion factor > 1 when quantity unit purchase != quantity unit stock 2018-10-03 13:27:36 +02:00
Bernd Bestel
f1fc0ee549
Finished first version of "pictures for products" (references #58) 2018-10-01 20:20:50 +02:00
Bernd Bestel
44cd26ae77
Finish first early version of "pictures for products" (references #58) 2018-09-30 23:22:17 +02:00
Bernd Bestel
bb5fd8360b
Fix double form submit when using ENTER (fixes #72) 2018-09-29 13:41:56 +02:00
Bernd Bestel
b01b49d10c
Show generic error message on saving master data (this closes #45) 2018-09-08 09:26:12 +02:00
Bernd Bestel
778191fd11
Fixed all (or most of) the broken stuff after the dependency upgrade party 2018-07-11 19:43:05 +02:00
Bernd Bestel
607a90cccc
Use absolute URLs everywhere, this should fix #3 2018-04-18 19:03:39 +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
7dcd39f82f
Move public stuff into subdirectory 2018-04-11 20:47:03 +02:00