kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 12:20:22 +00:00
Code Issues Projects Releases Wiki Activity
1,176 Commits 2 Branches 80 Tags
4a030b7ffce274187a44f79f173f8213f13e6ad3
Commit Graph

57 Commits

Author SHA1 Message Date
Bernd Bestel
471a8665d0 Remove the new help icons where not needed and translate help text 2020-08-25 19:28:44 +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
kriddles
45c14723b0 Fix Product Shopping Location Prefill for Edits (#796) 2020-04-26 17:28:02 +02:00
Zack Arnett
4629df17b4 Cosmetic Update (#753) 
* UI changes

* New (header) style was missing on some pages

* Added/changed new localization strings

* Unify page titles / apply .title class everywhere

* Reduce spacing below page title

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
 2020-04-19 14:51:02 +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
Bernd Bestel
5b314351dd Don't show disabled product options (fixes #724) 2020-04-12 15:59:08 +02:00
kriddles
2fee4b45ff set default store for product, purchase set last store purchased if available or use product default (#672) 2020-03-27 19:27:40 +01:00
Bernd Bestel
2764bb680c Changed some localization strings 2020-01-26 20:13:15 +01:00
Bernd Bestel
71a57c9dcb Implement "Free products" (closes #426) 2020-01-26 20:01:30 +01:00
Bernd Bestel
6f035fd64d Allow decimal numbers for the kcal field (closes #492) 2020-01-21 21:31:42 +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
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
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
Bernd Bestel
b57fd83cb8 Fixed various smaller problems after some testing 2019-09-21 13:08:42 +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
c228126c3a Added a new field calories for products (closes #268) 2019-09-20 20:06:24 +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
cbf1d1ca40 Implemented stock sub-feature-flags (closes #314) 2019-09-19 17:46:52 +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
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
f9036f0248 Use the summernote editor for product description (closes #288) 2019-08-15 14:35:28 +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
fa6f09679f Made "Disable stock fulfillment checking for this ingredient" a default option per product (closes #182) 2019-04-06 15:42:40 +02:00
Bernd Bestel
cd0ca4a67c Prepared next release 2019-03-09 16:42:46 +01:00
Bernd Bestel
643f6272e4 Fixed file name case sensitivity issue with tagmanager jQuery Plugin (references 165) 2019-03-08 22:13:47 +01:00
Bernd Bestel
8504429f5f Implemented tare weight handling (closes #132) 2019-03-05 17:51:50 +01:00
Bernd Bestel
77b0bc675c Varios small UI changes / improve UI consistency 2019-03-04 17:43:12 +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
276bc94cc6 More improvements on the REST API (references #139) 2019-01-21 22:13:42 +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
04c93d937e Make presets for new products configurable (closes #92) 2018-10-20 14:55:49 +02:00
Bernd Bestel
8cf68ade30 Fix missing translation (references #85) 2018-10-06 18:02:13 +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
f90faca62e Accept only files for product picture file input 2018-10-02 18:33:16 +02:00
Bernd Bestel
9dd57decdf Finish "pictures for products" features (now closes #58) 2018-10-02 16:48:39 +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
66095738e3 Added product groups (this closes #55) 2018-09-24 13:02:52 +02:00
Bernd Bestel
6b38cd450f Finalized latest changes 2018-09-08 14:06:19 +02:00
Bernd Bestel
e777be4d3b Replaced the default number input arrow buttons with own ones to better support touch input (references #44) 2018-09-08 12:04:31 +02:00
Bernd Bestel
339d81318f Add a checkbox to set the "never expires date" (closes #40) 2018-08-06 22:41:35 +02:00