Commit Graph

982 Commits

Author SHA1 Message Date
Zeb Fross
24610af873 Remove unnecessary use of StockService 2020-03-28 15:42:55 -07:00
Zeb Fross
ae72f14888 Added KrogerToGrocyConverter class for real
Missed staging it in last commit
2020-03-28 12:37:16 -07:00
Zeb Fross
ac53c5abf7 Add KrogerToGrocyConverter class with tests
Kroger grocery stores allow manual access to past purchases in json form
through a browser's developer tools.  This class converts the Kroger
json data into something Grocy can understand while doing minor error
checking.  Also added appropriate unit tests.

In order to get this json, open developer tools and navigate to
https://www.qfc.com/mypurchases (or another Kroger grocer, aka
https://www.fredmeyer.com/mypurchases) and look for a call to
/mypurchases/api/v1/receipt/details.  The entire response will contain
all recent purchases.
2020-03-28 12:32:00 -07:00
Bernd Bestel
375865d80e
Changelog and some small changes for #639 2020-03-22 18:02:19 +01:00
Marc Ole Bulling
3fc14db5d5
Check if all dependencies are installed (#639)
* Added check if all dependencies are installed and config.php/config-dist.php exists

* Also check for php modules

* Uncomment code that was accidentally disabled for debug purposes
2020-03-22 17:55:23 +01:00
Bernd Bestel
dcfd9d848d
Added changelog for #637 / #638 2020-03-22 09:27:49 +01:00
Marc Runkel
03eee1329c
Fix recipes page (#638)
* My config

* Add check to see if any recipe is selected

* Add check to see if a recipe is actually selected

Co-authored-by: Marc Runkel <marc.runkel@plusforta.de>
2020-03-22 09:24:49 +01:00
Bernd Bestel
03566d0644
Added changelog for #633 / #629 2020-03-21 15:56:59 +01:00
Mik-
71b62d5708
629 Make ellipsis menu in stock overview more responsive (#633)
* Make popup menues in table rows responsive

* Move "consum all" button to ellipsis menu on small devices
2020-03-21 15:52:51 +01:00
Bernd Bestel
eb3c0f9397
Typo... 2020-03-06 21:46:14 +01:00
Bernd Bestel
40034ed7bd
Prepared next release 2020-03-06 21:29:37 +01:00
Bernd Bestel
c67a5bf77d
Updated dependencies 2020-03-06 21:28:36 +01:00
Bernd Bestel
9f6daac010
Added new demo data localization string 2020-03-06 21:23:31 +01:00
Bernd Bestel
e0f71aa308
Pulled translations from Transifex 2020-03-06 21:14:50 +01:00
Bernd Bestel
f1496894b5
Fixed adding new chores did not work (references #479) 2020-03-06 21:01:41 +01:00
Bernd Bestel
48dc8e45ba
Fixed localization string (references #588) 2020-03-06 20:58:01 +01:00
Bernd Bestel
f440604007
Fixed Location Content Sheet product ordering (fixes #590) 2020-03-06 20:56:11 +01:00
Bernd Bestel
5cfe7cf34d
Fixed that the recipe page was reloaded when expanding a collapsed row on mobile (fixes #589) 2020-03-06 20:51:09 +01:00
Bernd Bestel
e2bb3a7d00
Changelog & little changes for #592 2020-03-06 20:46:27 +01:00
DarienFord
b0ddc026f8
Added chore name when getting list of all chores. (#592) 2020-03-06 20:43:38 +01:00
Bernd Bestel
8be14768df
Added new config.php setting for subdirectory base path (closes #568) 2020-03-06 20:41:00 +01:00
Bernd Bestel
c73ce21ef5
Removed selective/basepath (references #568) 2020-03-06 20:33:36 +01:00
Bernd Bestel
c38c519b18
Fixed that images did not work after merging #479 2020-03-01 19:48:08 +01:00
Bernd Bestel
fc131f5598
Little changes and changelog for #574 2020-03-01 17:58:10 +01:00
Radim Kabeláč
51cd81422e
Button to Flashlight ON in Barcodescanner (#574)
* Button to Flash lights ON in barcodereader

Only to ON, not OFF (you can Cancel)

* First documentation files for ReadThedoc

* Delete index.md

* Delete mkdocs.yml

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-03-01 17:53:28 +01:00
Bernd Bestel
14c9c045e7
Added changelog for #479 2020-03-01 17:50:34 +01: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
2b1dc7756d
Added new demo localization string 2020-02-24 13:44:23 +01:00
Bernd Bestel
de20699580
Updated recommended nginx try_files directive 2020-02-13 22:29:05 +01:00
Bernd Bestel
c58b396a55
Try 1 to fix the problem after Slim Framework 4 upgrade when running grocy in a subdirectory 2020-02-13 22:10:39 +01:00
Bernd Bestel
5dd78aa19a
Remove accidentally added function 2020-02-11 19:36:15 +01:00
Bernd Bestel
3c4264c3a0
Reload the meal plan after consuming a recipe 2020-02-11 19:24:34 +01:00
Bernd Bestel
d4fa1a64c2
Upgrade Slim Framework to v4 (closes #561) 2020-02-11 17:42:03 +01:00
Bernd Bestel
d56aebc9b8
Don't crash when @stack['componentScripts'] is empty and properly format the output 2020-02-10 21:20:21 +01:00
Bernd Bestel
c266b53ff1
Added an ugly hack to prevent including the same component JS file multiple times 2020-02-10 20:21:52 +01:00
Bernd Bestel
a32206834b
Make product card recipe ingredient indentation dynamic (references #556) 2020-02-10 19:30:49 +01:00
Bernd Bestel
aa787e765e
Changelog, small changes and added missing localization strings for #556 2020-02-10 18:24:15 +01:00
kriddles
c5f38689fa
Include product_group in recipe ingredient list (#556)
* Include product_group in recipe ingredient list

* Delete 0098.sql

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
2020-02-10 18:04:57 +01:00
Bernd Bestel
6b8169a1f1
Changelog and small changes for #557) 2020-02-10 18:00:42 +01:00
kriddles
898ea26139
Recipe Overview recipePositionsResolved should only include normal recipes (#557) 2020-02-10 17:56:52 +01:00
Bernd Bestel
49edd011b4
Changelog and small fixes for #545 2020-02-09 21:50:56 +01:00
kriddles
7638254f14
Mealplan - use mealplan recipe_servings when consuming and adding missing recipe ingredients (#545) 2020-02-09 21:43:31 +01:00
Bernd Bestel
472c083bca
Little changes, changelog and added missing localization strings for #555 2020-02-09 21:16:47 +01:00
kriddles
7be2d94cf7
View base servings on recipecard (#555) 2020-02-09 21:08:11 +01:00
Bernd Bestel
5a65f37f4a
Little wording change/fix 2020-02-09 21:03:11 +01:00
Bernd Bestel
540ae2627a
Changelog & small changes for #554 2020-02-09 21:01:29 +01:00
kriddles
2c0f7f0883 Default initial recipe add for mealplan to use recipe's base_servings (#554) 2020-02-09 20:57:25 +01:00
Bernd Bestel
97095d6e68
Typo... 2020-02-09 17:33:02 +01:00
Bernd Bestel
785dd30724
Fixed that the wrong FEATURE_FLAG was used (references #552) 2020-02-09 17:28:49 +01:00
Bernd Bestel
1953a26d7f
Changelog and small changes for #552) 2020-02-09 17:27:46 +01:00