-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Stock articles erroneously included in collective order #51
Labels
bug
Something isn't working
Comments
lentschi
added a commit
that referenced
this issue
Mar 15, 2024
Squashed commit of the following: commit 9457ec09b254937c98f0e213dd95283b75291f46 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 10:28:12 2024 +0100 rubocop -a with upstream rubocop commit a23f34f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 17:17:27 2024 +0100 Fixes #51 commit 3aa7f50 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 13:37:20 2024 +0100 Fixes #52 commit 8a288b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 12:11:17 2024 +0100 Fixes #48 (another fix) commit 6cb809e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 11:37:48 2024 +0100 Closes #24 again commit d0f321c Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:54:25 2024 +0100 Fixes #43 commit 943f178 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:41:08 2024 +0100 On #47: Escape commas in ratio unit names commit 614cfdc Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 14:29:46 2024 +0100 Some more fixes for #44 commit f351dee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 16 16:16:32 2024 +0100 Some more fixes for #44 commit 34b6a51 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 16:48:25 2024 +0100 Fixes #40 commit 5c12485 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 14:13:31 2024 +0100 On #47: Removed unused columns from import/export commit 3341d9d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 9 14:56:34 2024 +0100 Closes #31 commit 9b66b28 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Feb 5 08:04:38 2024 +0100 Fixes #45 commit da4e186 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 17:47:38 2024 +0100 Fixes parts of #44: - accounting menu: group order amounts (see posting above) - group order result (of a closed or settled order) - manage order menu: sorted in articles / sorted in groups commit 4644497 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 13:56:14 2024 +0100 Fixes #41 see incorrect bugfix for #7 in 34c198f commit 97f635a Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 15:14:38 2024 +0100 Fixes #38 commit 9642e9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 12:16:19 2024 +0100 Fixes #48 commit 683d2af Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jan 14 18:09:45 2024 +0100 First draft of #31 commit 88b7528 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 15:07:51 2024 +0100 Revert "Fixes with upstream rubocop 1.50.2" This reverts commit a5ce332. commit a5ce332 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 14:45:36 2024 +0100 Fixes with upstream rubocop 1.50.2 commit 4561797 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:58:45 2024 +0100 Closes #34 commit 5a06392 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:27:03 2024 +0100 Fixes #33 commit aac0546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:17:26 2024 +0100 Fixes #36 commit dd35ba6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 5 09:39:31 2024 +0100 Fixes article import (load extra units) commit ac81c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 17:27:49 2024 +0100 Fixed bug in import (related to #10) commit 38de812 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 15:41:04 2024 +0100 Adapted seeds commit d069d39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 11:24:15 2024 +0100 Fixes nasty bug with article unit migrations commit 43897db Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 20:38:37 2024 +0100 Closes #30 commit 545b368 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 18:35:01 2024 +0100 Fixes issue in units migration commit 56bfb79 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:34:28 2024 +0100 Fixes bug in order articles controller commit 9a0f813 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:20:41 2024 +0100 On #23: Added some translations commit 21740ad Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:29:07 2024 +0100 Fixes unit conversion tests commit a5205c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:04:10 2024 +0100 Closes #26 commit 275306f Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 09:10:57 2024 +0100 Changes for #10 and #25 commit 00b81f5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jan 2 18:16:38 2024 +0100 Closes #26 commit 0478db2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 16:51:23 2023 +0100 Fixes incorrect article units migration commit 68de953 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 11:05:28 2023 +0100 Fixes bug in stock takings commit 262e475 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 18:49:29 2023 +0100 Fixed exports commit 948c480 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 17:10:32 2023 +0100 Some more bugfixing commit 380f279 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Dec 27 20:15:07 2023 +0100 Bugfixing commit 6b8c112 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Dec 26 16:34:54 2023 +0100 Another fix for #28 commit 34c198f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 19:19:00 2023 +0100 Another fix for #7 commit 240f2d2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 10:15:09 2023 +0100 Some formatting issues commit 1942755 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 19:39:26 2023 +0100 On #25: Persist and display migration state (button no longer available if migration has been performed once) commit 85cb33c Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 14:45:22 2023 +0100 Closes #28 commit 3cb2c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:49:19 2023 +0100 Enhanced units display in dropdowns and order view commit be321b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:11:18 2023 +0100 On #25: Moved auto conversion unit tests commit c56cf44 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 19 16:47:44 2023 +0100 Started with #25 commit 56acdcb Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 4 16:38:25 2023 +0100 First implementations of #24 and #10 commit 700f9a5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Oct 29 18:00:19 2023 +0100 Added more available units commit 241e836 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 14:15:04 2023 +0200 Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script commit 4aad223 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 11:18:30 2023 +0200 Swapped XPA for XPK commit 948ef32 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 27 15:36:02 2023 +0200 Article form usability and bug fixes commit 0002749 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 21 13:25:27 2023 +0200 Implemented edit all form commit 3353cc7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 20 12:45:10 2023 +0200 shared articles list design enhancements commit b3218ed Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 14 10:30:27 2023 +0200 Fix for #19 commit 67c0e38 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Oct 12 11:32:04 2023 +0200 Fixes conversion error with stock articles commit a4316a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 23 15:24:36 2023 +0200 enable article sync via https commit b8574ee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 28 16:27:49 2023 +0200 Single article import form for #19 commit a196514 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Apr 23 19:15:25 2023 +0200 Continued with link generation for #19 commit c5a63c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 22 18:01:10 2023 +0200 Added link generation for #19 commit 5e2c91b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 8 18:31:57 2023 +0200 Continued with #19 commit 9337d08 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 7 14:44:05 2023 +0200 More additions to #19 commit 72c953f Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 25 14:43:57 2023 +0100 Continued with #19 commit 748f8b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 11 16:02:39 2023 +0100 Started with #19 commit 4c9a831 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 20:14:53 2023 +0100 Added temporary fake article JSON import generator commit 64493b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 17:30:03 2023 +0100 Partial fixes for #14 (will all be replaced by #20) commit c3f5168 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 11 12:37:46 2023 +0100 Closes #18 commit ef0660b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 10 10:33:02 2023 +0100 Fixes #17 see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120 commit 4b20a39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 11 11:33:44 2022 +0100 Fixes issue with article versioning (wrong ID in update) commit 4e1d3a9 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 20:07:25 2022 +0100 Fixed Stock logic and started repairing specs commit 3fa3526 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 15:24:25 2022 +0100 TODOs commit f2e6b76 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 26 18:47:28 2022 +0100 Proposal for #13 commit 4a7d4aa Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 25 11:38:26 2022 +0100 Closes #7 commit cd2caf0 Merge: 1907b02 aa307c3 Author: lentschi <office@florian-lentsch.at> Date: Sat Nov 26 17:09:52 2022 +0100 Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2 Article versioning refactoring commit aa307c3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 12:10:49 2022 +0100 Basic ordering workflow and exports are functioning commit 117bca3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 10:37:23 2022 +0100 Article model before_save versioning logic commit edc199b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:35:57 2022 +0100 Adapted model relations & adapted hackathon seeds commit cfbe59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:31:51 2022 +0100 Article versioning - Global replaces: Case-sensitive & regex: Case-sensitive & regex: \.price\.(?!to_) -> .article_version. oa\.article(?!_) -> oa.article_version order_article\.article(?!_) -> order_article.article_version \.article_version\.supplier(?!_) -> .article_version.article.supplier oa\.article_id -> oa.article_version.article_id (?<!_)article_price -> article_version ArticlePrice -> ArticleVersion Exclude: ./db/migrate/**/*.rb Renames: app/models/article_price.rb -> app/models/article_version.rb app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml commit 8d04a02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Oct 26 14:23:51 2022 +0200 Article versioning schema migration commit 1907b02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 21 13:22:08 2022 +0200 Adapted article price to use supplier_order_unit as base commit 9a31c07 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:48:14 2022 +0200 Reduced seeded price for potatoes commit c72ef55 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:43:40 2022 +0200 Fixes error in unit conversion commit 9e6d6e4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 12:04:58 2022 +0200 Fixes warnings in order accounting commit 354a0b6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 10:33:59 2022 +0200 Fixes missing units calculation with minimum order quantity commit fda2bb4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 18 07:51:48 2022 +0200 Some more price calculation fixes commit 0314133 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:58:04 2022 +0200 Revert "Fixes price calculation" This reverts commit d79ba4d. commit d79ba4d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:49:03 2022 +0200 Fixes price calculation commit 9a7f59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:42:38 2022 +0200 Fixes NaN error in receive form commit def95de Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:38:01 2022 +0200 Unit conversion fixes for receive form commit 045e0d1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 15:02:14 2022 +0200 Fixed group_order_article_quantities floating point values commit 2405832 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 10:01:57 2022 +0200 Fixes floating point error when posting group order commit 1e328cd Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 15:41:58 2022 +0200 Fixed calculation errors commit 32f478d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:33:29 2022 +0200 Removed TODO commit e9b8916 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:28:21 2022 +0200 Fixed rubocop warning commit be42e73 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:23:15 2022 +0200 Made order_articles units float commit 5760015 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jul 12 20:43:54 2022 +0200 Added hackathon seeds and fixed some rounding issues commit b33728b Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 11 19:33:23 2022 +0200 Fixes pack size calculation commit ec31210 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:35:08 2022 +0200 Made goa quantity and tolerance accept floats commit 9a58885 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:34:43 2022 +0200 Fixes bug in stepping commit b6b6b31 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 11:13:39 2022 +0200 group order form: round values commit 0f0bc0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 10:53:45 2022 +0200 group order granularity fixes commit c776081 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 09:36:40 2022 +0200 Don't show unit conversion field, if there's nothing to convert commit 8f330a7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 3 10:09:23 2022 +0200 Fixes conversion error, when there's no ratios commit 1bb36a4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 1 14:42:34 2022 +0200 Fixes article form issues commit a2f085b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 20:25:45 2022 +0200 Fixes error in accounting commit 49e3db0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 17:04:33 2022 +0200 Fixes another error in conversion field commit 63f6710 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 09:40:12 2022 +0200 Fixes error in conversion field commit 66b2459 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 19 12:19:52 2022 +0200 Fixes price in article form commit 870f5b7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:41:55 2022 +0200 Added unit convertes for billing article fields commit 35f3c54 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:05:26 2022 +0200 Fixed conversion error in article form commit 0acb048 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 12:25:01 2022 +0200 Done with billing in a first version commit 12228da Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 12 11:34:40 2022 +0200 Started with billing commit 1b484f3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 22:09:16 2022 +0200 Receive form edit article commit c2579a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 10:19:05 2022 +0200 Receive page adaptations commit 7b8f1b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 20:26:34 2022 +0200 Some more minimum order quantity fixes commit cde1f1d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 15:22:22 2022 +0200 Minimum order quantity fixes commit ec53546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun May 15 13:02:53 2022 +0200 Started with minimum order quantity commit 65f3bdd Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat May 14 12:36:33 2022 +0200 Article form fix commit 1708d23 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri May 13 13:38:17 2022 +0200 Conversion fixes commit b7f32d7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 29 14:53:22 2022 +0200 Added unit to article_prices commit 4ecf7d4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 23 20:23:02 2022 +0200 Adapted order fax (though this is still a matter of debate) commit 98f6bbf Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 22 14:35:23 2022 +0200 Duplicate new properties in ArticlePrice commit 07ed7a0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 15 15:35:31 2022 +0200 Continued with group order form commit d60b547 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 2 19:05:33 2022 +0200 Started remodelling group order form commit a1f4060 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Mar 27 14:51:52 2022 +0200 Unit conversions work in a first version commit f9ba668 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 25 11:38:12 2022 +0100 Flat ratios commit d86be97 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 18 12:10:17 2022 +0100 Added units file convertor and result to enable easier transformations between units with the same base unit commit 40fb822 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 4 09:54:38 2022 +0100 Articles form - all fields implemented in a first version commit f020ebb Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Mar 2 18:36:09 2022 +0100 Article edit form: Moved js to separate file commit 5e8e093 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 10:44:38 2022 +0100 Renamed fields commit 65e26a3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 09:18:51 2022 +0100 Fixes docker-compose foodsoft build commit 038b00e Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 19:36:18 2022 +0100 Saving conversions works in a first version commit 0153785 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:50:59 2022 +0100 Added minimum_order_amount to articles commit 57cb7c1 Merge: 979eebc f371f70 Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:44:59 2022 +0100 Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon commit 979eebc Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:43:47 2022 +0100 article data UI for new unit handling commit f371f70 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:26:23 2022 +0100 Added article unit conversions model and fixed migration commit 41adb65 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:16:08 2022 +0100 Added units of measure from https://datahub.io/core/unece-units-of-measure commit e0a7073 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:01:22 2022 +0100 rubocop fixes commit 5194e96 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 19 23:07:18 2022 +0100 First attempt at unit migration
lentschi
added a commit
that referenced
this issue
Mar 15, 2024
Squashed commit of the following: commit 8df48b744fbee9a5557c75782b47dfc4eb6ee18e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 11:36:13 2024 +0100 Another attempt at running rubocop commit a94f05d3062b2c9875f529c7cdc47f8c095caf9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 11:11:21 2024 +0100 Revert "rubocop -a with upstream rubocop" This reverts commit 9457ec09b254937c98f0e213dd95283b75291f46. commit 9457ec09b254937c98f0e213dd95283b75291f46 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 10:28:12 2024 +0100 rubocop -a with upstream rubocop commit a23f34f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 17:17:27 2024 +0100 Fixes #51 commit 3aa7f50 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 13:37:20 2024 +0100 Fixes #52 commit 8a288b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 12:11:17 2024 +0100 Fixes #48 (another fix) commit 6cb809e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 11:37:48 2024 +0100 Closes #24 again commit d0f321c Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:54:25 2024 +0100 Fixes #43 commit 943f178 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:41:08 2024 +0100 On #47: Escape commas in ratio unit names commit 614cfdc Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 14:29:46 2024 +0100 Some more fixes for #44 commit f351dee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 16 16:16:32 2024 +0100 Some more fixes for #44 commit 34b6a51 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 16:48:25 2024 +0100 Fixes #40 commit 5c12485 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 14:13:31 2024 +0100 On #47: Removed unused columns from import/export commit 3341d9d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 9 14:56:34 2024 +0100 Closes #31 commit 9b66b28 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Feb 5 08:04:38 2024 +0100 Fixes #45 commit da4e186 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 17:47:38 2024 +0100 Fixes parts of #44: - accounting menu: group order amounts (see posting above) - group order result (of a closed or settled order) - manage order menu: sorted in articles / sorted in groups commit 4644497 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 13:56:14 2024 +0100 Fixes #41 see incorrect bugfix for #7 in 34c198f commit 97f635a Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 15:14:38 2024 +0100 Fixes #38 commit 9642e9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 12:16:19 2024 +0100 Fixes #48 commit 683d2af Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jan 14 18:09:45 2024 +0100 First draft of #31 commit 88b7528 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 15:07:51 2024 +0100 Revert "Fixes with upstream rubocop 1.50.2" This reverts commit a5ce332. commit a5ce332 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 14:45:36 2024 +0100 Fixes with upstream rubocop 1.50.2 commit 4561797 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:58:45 2024 +0100 Closes #34 commit 5a06392 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:27:03 2024 +0100 Fixes #33 commit aac0546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:17:26 2024 +0100 Fixes #36 commit dd35ba6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 5 09:39:31 2024 +0100 Fixes article import (load extra units) commit ac81c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 17:27:49 2024 +0100 Fixed bug in import (related to #10) commit 38de812 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 15:41:04 2024 +0100 Adapted seeds commit d069d39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 11:24:15 2024 +0100 Fixes nasty bug with article unit migrations commit 43897db Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 20:38:37 2024 +0100 Closes #30 commit 545b368 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 18:35:01 2024 +0100 Fixes issue in units migration commit 56bfb79 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:34:28 2024 +0100 Fixes bug in order articles controller commit 9a0f813 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:20:41 2024 +0100 On #23: Added some translations commit 21740ad Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:29:07 2024 +0100 Fixes unit conversion tests commit a5205c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:04:10 2024 +0100 Closes #26 commit 275306f Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 09:10:57 2024 +0100 Changes for #10 and #25 commit 00b81f5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jan 2 18:16:38 2024 +0100 Closes #26 commit 0478db2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 16:51:23 2023 +0100 Fixes incorrect article units migration commit 68de953 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 11:05:28 2023 +0100 Fixes bug in stock takings commit 262e475 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 18:49:29 2023 +0100 Fixed exports commit 948c480 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 17:10:32 2023 +0100 Some more bugfixing commit 380f279 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Dec 27 20:15:07 2023 +0100 Bugfixing commit 6b8c112 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Dec 26 16:34:54 2023 +0100 Another fix for #28 commit 34c198f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 19:19:00 2023 +0100 Another fix for #7 commit 240f2d2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 10:15:09 2023 +0100 Some formatting issues commit 1942755 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 19:39:26 2023 +0100 On #25: Persist and display migration state (button no longer available if migration has been performed once) commit 85cb33c Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 14:45:22 2023 +0100 Closes #28 commit 3cb2c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:49:19 2023 +0100 Enhanced units display in dropdowns and order view commit be321b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:11:18 2023 +0100 On #25: Moved auto conversion unit tests commit c56cf44 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 19 16:47:44 2023 +0100 Started with #25 commit 56acdcb Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 4 16:38:25 2023 +0100 First implementations of #24 and #10 commit 700f9a5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Oct 29 18:00:19 2023 +0100 Added more available units commit 241e836 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 14:15:04 2023 +0200 Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script commit 4aad223 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 11:18:30 2023 +0200 Swapped XPA for XPK commit 948ef32 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 27 15:36:02 2023 +0200 Article form usability and bug fixes commit 0002749 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 21 13:25:27 2023 +0200 Implemented edit all form commit 3353cc7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 20 12:45:10 2023 +0200 shared articles list design enhancements commit b3218ed Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 14 10:30:27 2023 +0200 Fix for #19 commit 67c0e38 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Oct 12 11:32:04 2023 +0200 Fixes conversion error with stock articles commit a4316a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 23 15:24:36 2023 +0200 enable article sync via https commit b8574ee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 28 16:27:49 2023 +0200 Single article import form for #19 commit a196514 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Apr 23 19:15:25 2023 +0200 Continued with link generation for #19 commit c5a63c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 22 18:01:10 2023 +0200 Added link generation for #19 commit 5e2c91b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 8 18:31:57 2023 +0200 Continued with #19 commit 9337d08 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 7 14:44:05 2023 +0200 More additions to #19 commit 72c953f Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 25 14:43:57 2023 +0100 Continued with #19 commit 748f8b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 11 16:02:39 2023 +0100 Started with #19 commit 4c9a831 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 20:14:53 2023 +0100 Added temporary fake article JSON import generator commit 64493b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 17:30:03 2023 +0100 Partial fixes for #14 (will all be replaced by #20) commit c3f5168 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 11 12:37:46 2023 +0100 Closes #18 commit ef0660b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 10 10:33:02 2023 +0100 Fixes #17 see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120 commit 4b20a39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 11 11:33:44 2022 +0100 Fixes issue with article versioning (wrong ID in update) commit 4e1d3a9 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 20:07:25 2022 +0100 Fixed Stock logic and started repairing specs commit 3fa3526 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 15:24:25 2022 +0100 TODOs commit f2e6b76 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 26 18:47:28 2022 +0100 Proposal for #13 commit 4a7d4aa Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 25 11:38:26 2022 +0100 Closes #7 commit cd2caf0 Merge: 1907b02 aa307c3 Author: lentschi <office@florian-lentsch.at> Date: Sat Nov 26 17:09:52 2022 +0100 Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2 Article versioning refactoring commit aa307c3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 12:10:49 2022 +0100 Basic ordering workflow and exports are functioning commit 117bca3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 10:37:23 2022 +0100 Article model before_save versioning logic commit edc199b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:35:57 2022 +0100 Adapted model relations & adapted hackathon seeds commit cfbe59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:31:51 2022 +0100 Article versioning - Global replaces: Case-sensitive & regex: Case-sensitive & regex: \.price\.(?!to_) -> .article_version. oa\.article(?!_) -> oa.article_version order_article\.article(?!_) -> order_article.article_version \.article_version\.supplier(?!_) -> .article_version.article.supplier oa\.article_id -> oa.article_version.article_id (?<!_)article_price -> article_version ArticlePrice -> ArticleVersion Exclude: ./db/migrate/**/*.rb Renames: app/models/article_price.rb -> app/models/article_version.rb app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml commit 8d04a02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Oct 26 14:23:51 2022 +0200 Article versioning schema migration commit 1907b02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 21 13:22:08 2022 +0200 Adapted article price to use supplier_order_unit as base commit 9a31c07 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:48:14 2022 +0200 Reduced seeded price for potatoes commit c72ef55 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:43:40 2022 +0200 Fixes error in unit conversion commit 9e6d6e4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 12:04:58 2022 +0200 Fixes warnings in order accounting commit 354a0b6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 10:33:59 2022 +0200 Fixes missing units calculation with minimum order quantity commit fda2bb4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 18 07:51:48 2022 +0200 Some more price calculation fixes commit 0314133 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:58:04 2022 +0200 Revert "Fixes price calculation" This reverts commit d79ba4d. commit d79ba4d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:49:03 2022 +0200 Fixes price calculation commit 9a7f59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:42:38 2022 +0200 Fixes NaN error in receive form commit def95de Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:38:01 2022 +0200 Unit conversion fixes for receive form commit 045e0d1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 15:02:14 2022 +0200 Fixed group_order_article_quantities floating point values commit 2405832 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 10:01:57 2022 +0200 Fixes floating point error when posting group order commit 1e328cd Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 15:41:58 2022 +0200 Fixed calculation errors commit 32f478d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:33:29 2022 +0200 Removed TODO commit e9b8916 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:28:21 2022 +0200 Fixed rubocop warning commit be42e73 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:23:15 2022 +0200 Made order_articles units float commit 5760015 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jul 12 20:43:54 2022 +0200 Added hackathon seeds and fixed some rounding issues commit b33728b Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 11 19:33:23 2022 +0200 Fixes pack size calculation commit ec31210 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:35:08 2022 +0200 Made goa quantity and tolerance accept floats commit 9a58885 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:34:43 2022 +0200 Fixes bug in stepping commit b6b6b31 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 11:13:39 2022 +0200 group order form: round values commit 0f0bc0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 10:53:45 2022 +0200 group order granularity fixes commit c776081 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 09:36:40 2022 +0200 Don't show unit conversion field, if there's nothing to convert commit 8f330a7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 3 10:09:23 2022 +0200 Fixes conversion error, when there's no ratios commit 1bb36a4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 1 14:42:34 2022 +0200 Fixes article form issues commit a2f085b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 20:25:45 2022 +0200 Fixes error in accounting commit 49e3db0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 17:04:33 2022 +0200 Fixes another error in conversion field commit 63f6710 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 09:40:12 2022 +0200 Fixes error in conversion field commit 66b2459 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 19 12:19:52 2022 +0200 Fixes price in article form commit 870f5b7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:41:55 2022 +0200 Added unit convertes for billing article fields commit 35f3c54 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:05:26 2022 +0200 Fixed conversion error in article form commit 0acb048 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 12:25:01 2022 +0200 Done with billing in a first version commit 12228da Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 12 11:34:40 2022 +0200 Started with billing commit 1b484f3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 22:09:16 2022 +0200 Receive form edit article commit c2579a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 10:19:05 2022 +0200 Receive page adaptations commit 7b8f1b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 20:26:34 2022 +0200 Some more minimum order quantity fixes commit cde1f1d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 15:22:22 2022 +0200 Minimum order quantity fixes commit ec53546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun May 15 13:02:53 2022 +0200 Started with minimum order quantity commit 65f3bdd Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat May 14 12:36:33 2022 +0200 Article form fix commit 1708d23 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri May 13 13:38:17 2022 +0200 Conversion fixes commit b7f32d7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 29 14:53:22 2022 +0200 Added unit to article_prices commit 4ecf7d4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 23 20:23:02 2022 +0200 Adapted order fax (though this is still a matter of debate) commit 98f6bbf Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 22 14:35:23 2022 +0200 Duplicate new properties in ArticlePrice commit 07ed7a0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 15 15:35:31 2022 +0200 Continued with group order form commit d60b547 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 2 19:05:33 2022 +0200 Started remodelling group order form commit a1f4060 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Mar 27 14:51:52 2022 +0200 Unit conversions work in a first version commit f9ba668 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 25 11:38:12 2022 +0100 Flat ratios commit d86be97 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 18 12:10:17 2022 +0100 Added units file convertor and result to enable easier transformations between units with the same base unit commit 40fb822 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 4 09:54:38 2022 +0100 Articles form - all fields implemented in a first version commit f020ebb Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Mar 2 18:36:09 2022 +0100 Article edit form: Moved js to separate file commit 5e8e093 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 10:44:38 2022 +0100 Renamed fields commit 65e26a3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 09:18:51 2022 +0100 Fixes docker-compose foodsoft build commit 038b00e Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 19:36:18 2022 +0100 Saving conversions works in a first version commit 0153785 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:50:59 2022 +0100 Added minimum_order_amount to articles commit 57cb7c1 Merge: 979eebc f371f70 Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:44:59 2022 +0100 Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon commit 979eebc Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:43:47 2022 +0100 article data UI for new unit handling commit f371f70 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:26:23 2022 +0100 Added article unit conversions model and fixed migration commit 41adb65 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:16:08 2022 +0100 Added units of measure from https://datahub.io/core/unece-units-of-measure commit e0a7073 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:01:22 2022 +0100 rubocop fixes commit 5194e96 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 19 23:07:18 2022 +0100 First attempt at unit migration
lentschi
added a commit
that referenced
this issue
Mar 15, 2024
Squashed commit of the following: commit a23f34f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 17:17:27 2024 +0100 Fixes #51 commit 3aa7f50 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 13:37:20 2024 +0100 Fixes #52 commit 8a288b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 12:11:17 2024 +0100 Fixes #48 (another fix) commit 6cb809e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 11:37:48 2024 +0100 Closes #24 again commit d0f321c Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:54:25 2024 +0100 Fixes #43 commit 943f178 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:41:08 2024 +0100 On #47: Escape commas in ratio unit names commit 614cfdc Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 14:29:46 2024 +0100 Some more fixes for #44 commit f351dee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 16 16:16:32 2024 +0100 Some more fixes for #44 commit 34b6a51 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 16:48:25 2024 +0100 Fixes #40 commit 5c12485 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 14:13:31 2024 +0100 On #47: Removed unused columns from import/export commit 3341d9d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 9 14:56:34 2024 +0100 Closes #31 commit 9b66b28 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Feb 5 08:04:38 2024 +0100 Fixes #45 commit da4e186 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 17:47:38 2024 +0100 Fixes parts of #44: - accounting menu: group order amounts (see posting above) - group order result (of a closed or settled order) - manage order menu: sorted in articles / sorted in groups commit 4644497 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 13:56:14 2024 +0100 Fixes #41 see incorrect bugfix for #7 in 34c198f commit 97f635a Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 15:14:38 2024 +0100 Fixes #38 commit 9642e9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 12:16:19 2024 +0100 Fixes #48 commit 683d2af Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jan 14 18:09:45 2024 +0100 First draft of #31 commit 88b7528 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 15:07:51 2024 +0100 Revert "Fixes with upstream rubocop 1.50.2" This reverts commit a5ce332. commit a5ce332 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 14:45:36 2024 +0100 Fixes with upstream rubocop 1.50.2 commit 4561797 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:58:45 2024 +0100 Closes #34 commit 5a06392 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:27:03 2024 +0100 Fixes #33 commit aac0546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:17:26 2024 +0100 Fixes #36 commit dd35ba6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 5 09:39:31 2024 +0100 Fixes article import (load extra units) commit ac81c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 17:27:49 2024 +0100 Fixed bug in import (related to #10) commit 38de812 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 15:41:04 2024 +0100 Adapted seeds commit d069d39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 11:24:15 2024 +0100 Fixes nasty bug with article unit migrations commit 43897db Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 20:38:37 2024 +0100 Closes #30 commit 545b368 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 18:35:01 2024 +0100 Fixes issue in units migration commit 56bfb79 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:34:28 2024 +0100 Fixes bug in order articles controller commit 9a0f813 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:20:41 2024 +0100 On #23: Added some translations commit 21740ad Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:29:07 2024 +0100 Fixes unit conversion tests commit a5205c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:04:10 2024 +0100 Closes #26 commit 275306f Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 09:10:57 2024 +0100 Changes for #10 and #25 commit 00b81f5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jan 2 18:16:38 2024 +0100 Closes #26 commit 0478db2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 16:51:23 2023 +0100 Fixes incorrect article units migration commit 68de953 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 11:05:28 2023 +0100 Fixes bug in stock takings commit 262e475 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 18:49:29 2023 +0100 Fixed exports commit 948c480 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 17:10:32 2023 +0100 Some more bugfixing commit 380f279 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Dec 27 20:15:07 2023 +0100 Bugfixing commit 6b8c112 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Dec 26 16:34:54 2023 +0100 Another fix for #28 commit 34c198f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 19:19:00 2023 +0100 Another fix for #7 commit 240f2d2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 10:15:09 2023 +0100 Some formatting issues commit 1942755 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 19:39:26 2023 +0100 On #25: Persist and display migration state (button no longer available if migration has been performed once) commit 85cb33c Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 14:45:22 2023 +0100 Closes #28 commit 3cb2c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:49:19 2023 +0100 Enhanced units display in dropdowns and order view commit be321b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:11:18 2023 +0100 On #25: Moved auto conversion unit tests commit c56cf44 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 19 16:47:44 2023 +0100 Started with #25 commit 56acdcb Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 4 16:38:25 2023 +0100 First implementations of #24 and #10 commit 700f9a5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Oct 29 18:00:19 2023 +0100 Added more available units commit 241e836 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 14:15:04 2023 +0200 Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script commit 4aad223 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 11:18:30 2023 +0200 Swapped XPA for XPK commit 948ef32 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 27 15:36:02 2023 +0200 Article form usability and bug fixes commit 0002749 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 21 13:25:27 2023 +0200 Implemented edit all form commit 3353cc7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 20 12:45:10 2023 +0200 shared articles list design enhancements commit b3218ed Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 14 10:30:27 2023 +0200 Fix for #19 commit 67c0e38 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Oct 12 11:32:04 2023 +0200 Fixes conversion error with stock articles commit a4316a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 23 15:24:36 2023 +0200 enable article sync via https commit b8574ee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 28 16:27:49 2023 +0200 Single article import form for #19 commit a196514 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Apr 23 19:15:25 2023 +0200 Continued with link generation for #19 commit c5a63c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 22 18:01:10 2023 +0200 Added link generation for #19 commit 5e2c91b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 8 18:31:57 2023 +0200 Continued with #19 commit 9337d08 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 7 14:44:05 2023 +0200 More additions to #19 commit 72c953f Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 25 14:43:57 2023 +0100 Continued with #19 commit 748f8b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 11 16:02:39 2023 +0100 Started with #19 commit 4c9a831 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 20:14:53 2023 +0100 Added temporary fake article JSON import generator commit 64493b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 17:30:03 2023 +0100 Partial fixes for #14 (will all be replaced by #20) commit c3f5168 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 11 12:37:46 2023 +0100 Closes #18 commit ef0660b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 10 10:33:02 2023 +0100 Fixes #17 see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120 commit 4b20a39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 11 11:33:44 2022 +0100 Fixes issue with article versioning (wrong ID in update) commit 4e1d3a9 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 20:07:25 2022 +0100 Fixed Stock logic and started repairing specs commit 3fa3526 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 15:24:25 2022 +0100 TODOs commit f2e6b76 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 26 18:47:28 2022 +0100 Proposal for #13 commit 4a7d4aa Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 25 11:38:26 2022 +0100 Closes #7 commit cd2caf0 Merge: 1907b02 aa307c3 Author: lentschi <office@florian-lentsch.at> Date: Sat Nov 26 17:09:52 2022 +0100 Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2 Article versioning refactoring commit aa307c3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 12:10:49 2022 +0100 Basic ordering workflow and exports are functioning commit 117bca3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 10:37:23 2022 +0100 Article model before_save versioning logic commit edc199b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:35:57 2022 +0100 Adapted model relations & adapted hackathon seeds commit cfbe59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:31:51 2022 +0100 Article versioning - Global replaces: Case-sensitive & regex: Case-sensitive & regex: \.price\.(?!to_) -> .article_version. oa\.article(?!_) -> oa.article_version order_article\.article(?!_) -> order_article.article_version \.article_version\.supplier(?!_) -> .article_version.article.supplier oa\.article_id -> oa.article_version.article_id (?<!_)article_price -> article_version ArticlePrice -> ArticleVersion Exclude: ./db/migrate/**/*.rb Renames: app/models/article_price.rb -> app/models/article_version.rb app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml commit 8d04a02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Oct 26 14:23:51 2022 +0200 Article versioning schema migration commit 1907b02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 21 13:22:08 2022 +0200 Adapted article price to use supplier_order_unit as base commit 9a31c07 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:48:14 2022 +0200 Reduced seeded price for potatoes commit c72ef55 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:43:40 2022 +0200 Fixes error in unit conversion commit 9e6d6e4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 12:04:58 2022 +0200 Fixes warnings in order accounting commit 354a0b6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 10:33:59 2022 +0200 Fixes missing units calculation with minimum order quantity commit fda2bb4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 18 07:51:48 2022 +0200 Some more price calculation fixes commit 0314133 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:58:04 2022 +0200 Revert "Fixes price calculation" This reverts commit d79ba4d. commit d79ba4d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:49:03 2022 +0200 Fixes price calculation commit 9a7f59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:42:38 2022 +0200 Fixes NaN error in receive form commit def95de Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:38:01 2022 +0200 Unit conversion fixes for receive form commit 045e0d1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 15:02:14 2022 +0200 Fixed group_order_article_quantities floating point values commit 2405832 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 10:01:57 2022 +0200 Fixes floating point error when posting group order commit 1e328cd Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 15:41:58 2022 +0200 Fixed calculation errors commit 32f478d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:33:29 2022 +0200 Removed TODO commit e9b8916 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:28:21 2022 +0200 Fixed rubocop warning commit be42e73 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:23:15 2022 +0200 Made order_articles units float commit 5760015 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jul 12 20:43:54 2022 +0200 Added hackathon seeds and fixed some rounding issues commit b33728b Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 11 19:33:23 2022 +0200 Fixes pack size calculation commit ec31210 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:35:08 2022 +0200 Made goa quantity and tolerance accept floats commit 9a58885 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:34:43 2022 +0200 Fixes bug in stepping commit b6b6b31 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 11:13:39 2022 +0200 group order form: round values commit 0f0bc0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 10:53:45 2022 +0200 group order granularity fixes commit c776081 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 09:36:40 2022 +0200 Don't show unit conversion field, if there's nothing to convert commit 8f330a7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 3 10:09:23 2022 +0200 Fixes conversion error, when there's no ratios commit 1bb36a4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 1 14:42:34 2022 +0200 Fixes article form issues commit a2f085b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 20:25:45 2022 +0200 Fixes error in accounting commit 49e3db0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 17:04:33 2022 +0200 Fixes another error in conversion field commit 63f6710 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 09:40:12 2022 +0200 Fixes error in conversion field commit 66b2459 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 19 12:19:52 2022 +0200 Fixes price in article form commit 870f5b7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:41:55 2022 +0200 Added unit convertes for billing article fields commit 35f3c54 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:05:26 2022 +0200 Fixed conversion error in article form commit 0acb048 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 12:25:01 2022 +0200 Done with billing in a first version commit 12228da Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 12 11:34:40 2022 +0200 Started with billing commit 1b484f3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 22:09:16 2022 +0200 Receive form edit article commit c2579a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 10:19:05 2022 +0200 Receive page adaptations commit 7b8f1b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 20:26:34 2022 +0200 Some more minimum order quantity fixes commit cde1f1d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 15:22:22 2022 +0200 Minimum order quantity fixes commit ec53546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun May 15 13:02:53 2022 +0200 Started with minimum order quantity commit 65f3bdd Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat May 14 12:36:33 2022 +0200 Article form fix commit 1708d23 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri May 13 13:38:17 2022 +0200 Conversion fixes commit b7f32d7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 29 14:53:22 2022 +0200 Added unit to article_prices commit 4ecf7d4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 23 20:23:02 2022 +0200 Adapted order fax (though this is still a matter of debate) commit 98f6bbf Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 22 14:35:23 2022 +0200 Duplicate new properties in ArticlePrice commit 07ed7a0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 15 15:35:31 2022 +0200 Continued with group order form commit d60b547 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 2 19:05:33 2022 +0200 Started remodelling group order form commit a1f4060 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Mar 27 14:51:52 2022 +0200 Unit conversions work in a first version commit f9ba668 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 25 11:38:12 2022 +0100 Flat ratios commit d86be97 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 18 12:10:17 2022 +0100 Added units file convertor and result to enable easier transformations between units with the same base unit commit 40fb822 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 4 09:54:38 2022 +0100 Articles form - all fields implemented in a first version commit f020ebb Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Mar 2 18:36:09 2022 +0100 Article edit form: Moved js to separate file commit 5e8e093 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 10:44:38 2022 +0100 Renamed fields commit 65e26a3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 09:18:51 2022 +0100 Fixes docker-compose foodsoft build commit 038b00e Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 19:36:18 2022 +0100 Saving conversions works in a first version commit 0153785 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:50:59 2022 +0100 Added minimum_order_amount to articles commit 57cb7c1 Merge: 979eebc f371f70 Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:44:59 2022 +0100 Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon commit 979eebc Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:43:47 2022 +0100 article data UI for new unit handling commit f371f70 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:26:23 2022 +0100 Added article unit conversions model and fixed migration commit 41adb65 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:16:08 2022 +0100 Added units of measure from https://datahub.io/core/unece-units-of-measure commit e0a7073 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:01:22 2022 +0100 rubocop fixes commit 5194e96 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 19 23:07:18 2022 +0100 First attempt at unit migration
lentschi
added a commit
that referenced
this issue
Mar 15, 2024
commit 8df48b744fbee9a5557c75782b47dfc4eb6ee18e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 11:36:13 2024 +0100 Another attempt at running rubocop commit a94f05d3062b2c9875f529c7cdc47f8c095caf9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 11:11:21 2024 +0100 Revert "rubocop -a with upstream rubocop" This reverts commit 9457ec09b254937c98f0e213dd95283b75291f46. commit 9457ec09b254937c98f0e213dd95283b75291f46 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 15 10:28:12 2024 +0100 rubocop -a with upstream rubocop commit a23f34f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 17:17:27 2024 +0100 Fixes #51 commit 3aa7f50 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 13:37:20 2024 +0100 Fixes #52 commit 8a288b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 12:11:17 2024 +0100 Fixes #48 (another fix) commit 6cb809e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 1 11:37:48 2024 +0100 Closes #24 again commit d0f321c Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:54:25 2024 +0100 Fixes #43 commit 943f178 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 15:41:08 2024 +0100 On #47: Escape commas in ratio unit names commit 614cfdc Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 23 14:29:46 2024 +0100 Some more fixes for #44 commit f351dee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 16 16:16:32 2024 +0100 Some more fixes for #44 commit 34b6a51 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 16:48:25 2024 +0100 Fixes #40 commit 5c12485 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 11 14:13:31 2024 +0100 On #47: Removed unused columns from import/export commit 3341d9d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 9 14:56:34 2024 +0100 Closes #31 commit 9b66b28 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Feb 5 08:04:38 2024 +0100 Fixes #45 commit da4e186 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 17:47:38 2024 +0100 Fixes parts of #44: - accounting menu: group order amounts (see posting above) - group order result (of a closed or settled order) - manage order menu: sorted in articles / sorted in groups commit 4644497 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 4 13:56:14 2024 +0100 Fixes #41 see incorrect bugfix for #7 in 34c198f commit 97f635a Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 15:14:38 2024 +0100 Fixes #38 commit 9642e9b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 3 12:16:19 2024 +0100 Fixes #48 commit 683d2af Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jan 14 18:09:45 2024 +0100 First draft of #31 commit 88b7528 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 15:07:51 2024 +0100 Revert "Fixes with upstream rubocop 1.50.2" This reverts commit a5ce332. commit a5ce332 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 14:45:36 2024 +0100 Fixes with upstream rubocop 1.50.2 commit 4561797 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:58:45 2024 +0100 Closes #34 commit 5a06392 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:27:03 2024 +0100 Fixes #33 commit aac0546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 12 10:17:26 2024 +0100 Fixes #36 commit dd35ba6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jan 5 09:39:31 2024 +0100 Fixes article import (load extra units) commit ac81c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 17:27:49 2024 +0100 Fixed bug in import (related to #10) commit 38de812 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 15:41:04 2024 +0100 Adapted seeds commit d069d39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jan 4 11:24:15 2024 +0100 Fixes nasty bug with article unit migrations commit 43897db Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 20:38:37 2024 +0100 Closes #30 commit 545b368 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 18:35:01 2024 +0100 Fixes issue in units migration commit 56bfb79 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:34:28 2024 +0100 Fixes bug in order articles controller commit 9a0f813 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 13:20:41 2024 +0100 On #23: Added some translations commit 21740ad Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:29:07 2024 +0100 Fixes unit conversion tests commit a5205c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 11:04:10 2024 +0100 Closes #26 commit 275306f Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Jan 3 09:10:57 2024 +0100 Changes for #10 and #25 commit 00b81f5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jan 2 18:16:38 2024 +0100 Closes #26 commit 0478db2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 16:51:23 2023 +0100 Fixes incorrect article units migration commit 68de953 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Dec 30 11:05:28 2023 +0100 Fixes bug in stock takings commit 262e475 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 18:49:29 2023 +0100 Fixed exports commit 948c480 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 29 17:10:32 2023 +0100 Some more bugfixing commit 380f279 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Dec 27 20:15:07 2023 +0100 Bugfixing commit 6b8c112 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Dec 26 16:34:54 2023 +0100 Another fix for #28 commit 34c198f Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 19:19:00 2023 +0100 Another fix for #7 commit 240f2d2 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 15 10:15:09 2023 +0100 Some formatting issues commit 1942755 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 19:39:26 2023 +0100 On #25: Persist and display migration state (button no longer available if migration has been performed once) commit 85cb33c Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 10 14:45:22 2023 +0100 Closes #28 commit 3cb2c0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:49:19 2023 +0100 Enhanced units display in dropdowns and order view commit be321b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Dec 1 09:11:18 2023 +0100 On #25: Moved auto conversion unit tests commit c56cf44 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 19 16:47:44 2023 +0100 Started with #25 commit 56acdcb Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 4 16:38:25 2023 +0100 First implementations of #24 and #10 commit 700f9a5 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Oct 29 18:00:19 2023 +0100 Added more available units commit 241e836 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 14:15:04 2023 +0200 Fixed some of the errors in https://github.com/datasets/unece-units-of-measure by script commit 4aad223 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 28 11:18:30 2023 +0200 Swapped XPA for XPK commit 948ef32 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 27 15:36:02 2023 +0200 Article form usability and bug fixes commit 0002749 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 21 13:25:27 2023 +0200 Implemented edit all form commit 3353cc7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 20 12:45:10 2023 +0200 shared articles list design enhancements commit b3218ed Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Oct 14 10:30:27 2023 +0200 Fix for #19 commit 67c0e38 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Oct 12 11:32:04 2023 +0200 Fixes conversion error with stock articles commit a4316a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 23 15:24:36 2023 +0200 enable article sync via https commit b8574ee Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 28 16:27:49 2023 +0200 Single article import form for #19 commit a196514 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Apr 23 19:15:25 2023 +0200 Continued with link generation for #19 commit c5a63c7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 22 18:01:10 2023 +0200 Added link generation for #19 commit 5e2c91b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 8 18:31:57 2023 +0200 Continued with #19 commit 9337d08 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 7 14:44:05 2023 +0200 More additions to #19 commit 72c953f Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 25 14:43:57 2023 +0100 Continued with #19 commit 748f8b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Mar 11 16:02:39 2023 +0100 Started with #19 commit 4c9a831 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 20:14:53 2023 +0100 Added temporary fake article JSON import generator commit 64493b8 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 10 17:30:03 2023 +0100 Partial fixes for #14 (will all be replaced by #20) commit c3f5168 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 11 12:37:46 2023 +0100 Closes #18 commit ef0660b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 10 10:33:02 2023 +0100 Fixes #17 see https://forum.foodcoops.at/t/foodsoft-artikeleinheiten-hackerton-start-fixieren/5951/120 commit 4b20a39 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Dec 11 11:33:44 2022 +0100 Fixes issue with article versioning (wrong ID in update) commit 4e1d3a9 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 20:07:25 2022 +0100 Fixed Stock logic and started repairing specs commit 3fa3526 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 27 15:24:25 2022 +0100 TODOs commit f2e6b76 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Nov 26 18:47:28 2022 +0100 Proposal for #13 commit 4a7d4aa Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 25 11:38:26 2022 +0100 Closes #7 commit cd2caf0 Merge: 1907b02 aa307c3 Author: lentschi <office@florian-lentsch.at> Date: Sat Nov 26 17:09:52 2022 +0100 Merge pull request #5 from foodcoopsat/feature/article_versioning_two_tables_2 Article versioning refactoring commit aa307c3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 12:10:49 2022 +0100 Basic ordering workflow and exports are functioning commit 117bca3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Nov 18 10:37:23 2022 +0100 Article model before_save versioning logic commit edc199b Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:35:57 2022 +0100 Adapted model relations & adapted hackathon seeds commit cfbe59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Nov 6 18:31:51 2022 +0100 Article versioning - Global replaces: Case-sensitive & regex: Case-sensitive & regex: \.price\.(?!to_) -> .article_version. oa\.article(?!_) -> oa.article_version order_article\.article(?!_) -> order_article.article_version \.article_version\.supplier(?!_) -> .article_version.article.supplier oa\.article_id -> oa.article_version.article_id (?<!_)article_price -> article_version ArticlePrice -> ArticleVersion Exclude: ./db/migrate/**/*.rb Renames: app/models/article_price.rb -> app/models/article_version.rb app/views/shared/_article_price_info.html.haml -> app/views/shared/_article_version_info.html.haml commit 8d04a02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Oct 26 14:23:51 2022 +0200 Article versioning schema migration commit 1907b02 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Oct 21 13:22:08 2022 +0200 Adapted article price to use supplier_order_unit as base commit 9a31c07 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:48:14 2022 +0200 Reduced seeded price for potatoes commit c72ef55 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 15:43:40 2022 +0200 Fixes error in unit conversion commit 9e6d6e4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 12:04:58 2022 +0200 Fixes warnings in order accounting commit 354a0b6 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 22 10:33:59 2022 +0200 Fixes missing units calculation with minimum order quantity commit fda2bb4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 18 07:51:48 2022 +0200 Some more price calculation fixes commit 0314133 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:58:04 2022 +0200 Revert "Fixes price calculation" This reverts commit d79ba4d. commit d79ba4d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:49:03 2022 +0200 Fixes price calculation commit 9a7f59d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:42:38 2022 +0200 Fixes NaN error in receive form commit def95de Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 17 11:38:01 2022 +0200 Unit conversion fixes for receive form commit 045e0d1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 15:02:14 2022 +0200 Fixed group_order_article_quantities floating point values commit 2405832 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Jul 16 10:01:57 2022 +0200 Fixes floating point error when posting group order commit 1e328cd Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 15:41:58 2022 +0200 Fixed calculation errors commit 32f478d Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:33:29 2022 +0200 Removed TODO commit e9b8916 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:28:21 2022 +0200 Fixed rubocop warning commit be42e73 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 15 13:23:15 2022 +0200 Made order_articles units float commit 5760015 Author: Florian Lentsch <office@florian-lentsch.at> Date: Tue Jul 12 20:43:54 2022 +0200 Added hackathon seeds and fixed some rounding issues commit b33728b Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jul 11 19:33:23 2022 +0200 Fixes pack size calculation commit ec31210 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:35:08 2022 +0200 Made goa quantity and tolerance accept floats commit 9a58885 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 10 13:34:43 2022 +0200 Fixes bug in stepping commit b6b6b31 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 11:13:39 2022 +0200 group order form: round values commit 0f0bc0e Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 10:53:45 2022 +0200 group order granularity fixes commit c776081 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 8 09:36:40 2022 +0200 Don't show unit conversion field, if there's nothing to convert commit 8f330a7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jul 3 10:09:23 2022 +0200 Fixes conversion error, when there's no ratios commit 1bb36a4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jul 1 14:42:34 2022 +0200 Fixes article form issues commit a2f085b Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 20:25:45 2022 +0200 Fixes error in accounting commit 49e3db0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 17:04:33 2022 +0200 Fixes another error in conversion field commit 63f6710 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Jun 24 09:40:12 2022 +0200 Fixes error in conversion field commit 66b2459 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 19 12:19:52 2022 +0200 Fixes price in article form commit 870f5b7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:41:55 2022 +0200 Added unit convertes for billing article fields commit 35f3c54 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 20:05:26 2022 +0200 Fixed conversion error in article form commit 0acb048 Author: Florian Lentsch <office@florian-lentsch.at> Date: Thu Jun 16 12:25:01 2022 +0200 Done with billing in a first version commit 12228da Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 12 11:34:40 2022 +0200 Started with billing commit 1b484f3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 22:09:16 2022 +0200 Receive form edit article commit c2579a1 Author: Florian Lentsch <office@florian-lentsch.at> Date: Mon Jun 6 10:19:05 2022 +0200 Receive page adaptations commit 7b8f1b0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 20:26:34 2022 +0200 Some more minimum order quantity fixes commit cde1f1d Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Jun 5 15:22:22 2022 +0200 Minimum order quantity fixes commit ec53546 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun May 15 13:02:53 2022 +0200 Started with minimum order quantity commit 65f3bdd Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat May 14 12:36:33 2022 +0200 Article form fix commit 1708d23 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri May 13 13:38:17 2022 +0200 Conversion fixes commit b7f32d7 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 29 14:53:22 2022 +0200 Added unit to article_prices commit 4ecf7d4 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 23 20:23:02 2022 +0200 Adapted order fax (though this is still a matter of debate) commit 98f6bbf Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 22 14:35:23 2022 +0200 Duplicate new properties in ArticlePrice commit 07ed7a0 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Apr 15 15:35:31 2022 +0200 Continued with group order form commit d60b547 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Apr 2 19:05:33 2022 +0200 Started remodelling group order form commit a1f4060 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Mar 27 14:51:52 2022 +0200 Unit conversions work in a first version commit f9ba668 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 25 11:38:12 2022 +0100 Flat ratios commit d86be97 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 18 12:10:17 2022 +0100 Added units file convertor and result to enable easier transformations between units with the same base unit commit 40fb822 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Mar 4 09:54:38 2022 +0100 Articles form - all fields implemented in a first version commit f020ebb Author: Florian Lentsch <office@florian-lentsch.at> Date: Wed Mar 2 18:36:09 2022 +0100 Article edit form: Moved js to separate file commit 5e8e093 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 10:44:38 2022 +0100 Renamed fields commit 65e26a3 Author: Florian Lentsch <office@florian-lentsch.at> Date: Fri Feb 25 09:18:51 2022 +0100 Fixes docker-compose foodsoft build commit 038b00e Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 19:36:18 2022 +0100 Saving conversions works in a first version commit 0153785 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:50:59 2022 +0100 Added minimum_order_amount to articles commit 57cb7c1 Merge: 979eebc f371f70 Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:44:59 2022 +0100 Merge branch 'master' of https://github.com/foodcoopsat/foodsoft_hackathon commit 979eebc Author: Ostler, Leonard <leonard.ostler@student.tugraz.at> Date: Sun Feb 20 13:43:47 2022 +0100 article data UI for new unit handling commit f371f70 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 13:26:23 2022 +0100 Added article unit conversions model and fixed migration commit 41adb65 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:16:08 2022 +0100 Added units of measure from https://datahub.io/core/unece-units-of-measure commit e0a7073 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sun Feb 20 12:01:22 2022 +0100 rubocop fixes commit 5194e96 Author: Florian Lentsch <office@florian-lentsch.at> Date: Sat Feb 19 23:07:18 2022 +0100 First attempt at unit migration
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
I've created a stock article
001 Rice
withHackathon
as supplier.Now when a collective order is created for
Hackathon
,001 Rice
shows up among the order articles (unless I uncheck it), even though it isn't listed undersuppliers/1/articles
since it's a stock article.The text was updated successfully, but these errors were encountered: