Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1663 commits 22 branches 1 tag 31 MiB
Commit graph

590 commits

Author SHA1 Message Date
benni
620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
 2012-12-11 10:32:59 +01:00
Robert Waltemath
1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). 2012-11-28 10:13:54 +01:00
benni
ecc31641aa Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
benni
1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni
dce79802e0 Fixed feedback. 2012-11-10 17:05:43 +01:00
benni
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
benni
699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni
acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni
52e62f8ddb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
benni
c0c41a7752 Fixed foodcoop/ordergroups and workgroups views. 2012-10-08 16:20:24 +02:00
benni
ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni
1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni
f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni
0a1c326f14 Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
benni
29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni
cd91436f7f Allow ignoring apple restriction for specific ordergroup. 2012-09-30 13:34:16 +02:00
benni
ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00
benni
ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni
7bc23698d1 Updated README_DEVEL. 2012-08-24 15:20:33 +02:00
benni
b0c9580b53 Added delayed_job as new background queue manager. 2012-08-24 13:48:45 +02:00
benni
5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni
6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni
fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni
f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni
8a74e7d77f Removed annoate and hirb Gemfiles. 
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
 2012-07-27 18:07:42 +02:00
benni
af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni
c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00
benni
b295f62322 Updated finance/invoices 2012-04-20 18:33:47 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
benni
88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni
eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00
benni
a787b3cf24 Admin/users refactored. 2011-06-09 22:03:27 +02:00
benni
ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni
fc1d130113 Refactored stockit, delivery an stock_takings. 2011-05-27 14:09:01 +02:00
benni
3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni
1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni
9388e918a7 Implemented fancy box for ajax forms. Refactored articles modul. 2011-05-18 17:37:10 +02:00
benni
0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni
0b1682af7c Fixed suppliers module. 2011-05-18 15:52:06 +02:00
benni
772cf87c92 Fixed wiki module. 2011-05-18 15:29:38 +02:00
benni
d5552059ce Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
benni
1cf63fc40b Some fixes to home view. 2011-05-16 10:34:14 +02:00
benni
06f2cc2007 Fixed and refactored foodcoop/workgroups. 2011-05-16 00:34:43 +02:00
benni
5d028ccf3a Added new autocomplete for task assignments. 
Introduced the cool jquery token plugin.
 2011-05-14 19:41:46 +02:00
benni
2e56bfe895 Some fixes for tasks. 2011-05-14 19:02:52 +02:00
benni
03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni
ca15bb1102 Include session_store in git repo, but not the secret token. 2011-05-14 16:51:10 +02:00
benni
0757be8319 Updated rails i18n translations. 2011-05-14 16:34:10 +02:00
benni
e589ad5274 Updated rails i18n translations. 2011-05-13 22:44:18 +02:00
benni
197516b7fc Fixed language and flash divs. 2011-05-11 17:41:43 +02:00
benni
2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni
bdb177dfa6 Fixed bug in routes.rb 2011-05-11 14:21:06 +02:00
benni
e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni
eab16e337e Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
benni
b71fcdf371 Do not load exception notifier in development mode. 2011-05-11 11:20:10 +02:00
benni
d09d3922c1 Upgraded exception notifier plugin. 2011-05-11 11:03:36 +02:00
benni
8679356ccf Updated development.rb.SAMPLE. 2011-05-11 10:13:56 +02:00
benni
dbe86b4f0f Modified new session store initializers. 2011-05-11 10:11:47 +02:00
benni
4eba5fbc9c First step for upgrading to rails 3. 
Check rake rails:upgrade:check for next steps.
 2011-05-11 01:32:21 +02:00
benni
bea145f33d Upgrade rails to 2.3.11. 2011-05-10 23:29:36 +02:00
benni
be85296ddb Enabled hirb for better console formatting. 2011-05-07 21:14:11 +02:00
benni
face58ebef Updated README_DEVEL. 2011-05-06 20:38:39 +02:00
benni
50a45cfa7d Updated config/boot.rb to rails 2.3.10 2011-05-06 20:07:54 +02:00
benni
0df0519947 Upgrade to rails 2.3.10. 2011-05-06 19:52:50 +02:00
benni
20b7db306b Implemented bundler. No more confusiong with gem versions! 2011-01-30 22:59:32 +01:00
Benjamin Meichsner
be321798a7 Fixed some links in tasks module. 2010-06-10 23:25:13 +02:00
Benjamin Meichsner
74407a5912 Fixed paths in task-menu. 2010-06-01 16:18:20 +02:00
Benjamin Meichsner
7067294133 Fixed broken links/paths. 2010-05-25 23:36:05 +02:00
Benjamin Meichsner
00d9f060cc Merge branch 'routing-filter' 2010-05-25 23:16:49 +02:00
Benjamin Meichsner
ca1c5d7db4 Start with I18n implementation. 2010-05-15 11:11:09 +02:00
Benjamin Meichsner
571548dfbc Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
Benjamin Meichsner
18e8a11b7d Removed unnecessary config params. Improved error handling. 2010-03-22 01:25:24 +01:00
Benjamin Meichsner
61a87dacb6 Fixed routing bug in last commit. 2010-03-21 00:08:02 +01:00
Benjamin Meichsner
f49c6493f4 Removed hard coded links from mailer and views. 
* Not tested every mail template. Hopefully everything works ;-)
 2010-03-20 14:49:46 +01:00
Benjamin Meichsner
2c1952d625 Removed hardcoded links from main tabnav. 
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
 2010-03-20 13:45:58 +01:00
Benjamin Meichsner
9cb367463c Merge branch 'master' into routing-filter 2010-03-20 13:45:27 +01:00
Benjamin Meichsner
d11c619c82 Removed session key from version control. 
* Maybe you have to delete your cookies after pulling this commit.
 2010-03-20 02:46:06 +01:00
Benjamin Meichsner
e7af7e82b5 Implemented routing filter for foodcoop select. 
* Allows now a multi coop installation for one domain!
* SSL, we are coming...
* TODO: Remove all the hardcoded urls, check email-links etc.
 2010-03-20 02:26:30 +01:00
sandoz
356d922eb4 New prawn gem breaks application. 
* Require specific version.
 2010-02-23 21:02:17 +01:00
Benjamin Meichsner
7a77d1aa66 Caching of css and javascript for better speed results. 2010-02-09 21:06:24 +01:00
Benjamin Meichsner
20c7c0ef02 Revert "Tasks should be default page in foodcoop module." 
This reverts commit b5b27cee6e.
 2009-10-17 11:53:17 +02:00
Benjamin Meichsner
b5b27cee6e Tasks should be default page in foodcoop module. 2009-10-16 21:10:52 +02:00
Benjamin Meichsner
e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner
fd97c1fc60 Made multi coop installation available as an option in app_config.yml. 2009-08-13 16:36:01 +02:00
Benjamin Meichsner
5d9385cde4 Changed wiki parser to wikicloth. 
* Temporarly removing of TOC.
 2009-08-11 14:30:35 +02:00
Benjamin Meichsner
8c3c8a1f95 Extended config sample for the new tolerance_not_costly feature. 2009-08-05 12:15:37 +02:00
Benjamin Meichsner
178fba7b30 Create restful invites controller and ajaxified the workflow. 2009-08-02 19:41:09 +02:00
Benjamin Meichsner
5cf75ee32a Moved foodcoop/members into new foodcoop/users restful controller. 2009-08-02 19:01:45 +02:00
Benjamin Meichsner
0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner
1a8026c5a7 Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful. 2009-08-02 18:12:13 +02:00
Benjamin Meichsner
709425855e Added validation for unit_quantity and localization for article attributes. 2009-07-21 15:09:55 +02:00
Benjamin Meichsner
55729e20f9 Create a redirect when editing the title of a page. 2009-06-11 23:51:26 +02:00
Benjamin Meichsner
434fc4b2ff Change wiki-parser again. Now wikitext is used. 2009-06-11 22:40:56 +02:00
Benjamin Meichsner
d371839eba Prefer textile over markup because markup doesn't support any tables. bähh. 2009-05-20 13:03:58 +02:00
Benjamin Meichsner
43fc7b06f8 Upgrade foodsoft to rails 2.3.2. 2009-05-17 15:01:36 +02:00
Benjamin Meichsner
053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner
f83d2659de Added better routing for wiki-root-path. 2009-05-15 13:53:45 +02:00
Benjamin Meichsner
dafbb077b6 wiki-syntax: Use markup instead of textile. 2009-05-07 17:59:34 +02:00
Benjamin Meichsner
f450070dbf First steps for an own wiki. 
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
 2009-03-25 19:54:04 +01:00
Benjamin Meichsner
ffc3adf907 Second (last) part of multiple foodcoop installation. 
* When before_filter select_foodcoop is activated,
  the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
 2009-03-24 17:25:33 +01:00
Benjamin Meichsner
1c24127928 First part of multiple foodcoop installation. 2009-03-24 17:01:10 +01:00
Benjamin Meichsner
e4c394d881 New foodcoop configuration option. Use own mailinglist instead of messaging system. 2009-03-17 18:13:00 +01:00
Benjamin Meichsner
3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner
a0e10141dc Translations and other little improvements. 2009-02-12 21:38:41 +01:00
Benjamin Meichsner
951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! 2009-02-12 18:32:20 +01:00
Benjamin Meichsner
86b2b28dc9 Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices. 2009-02-11 18:09:04 +01:00
Benjamin Meichsner
24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00
Benjamin Meichsner
c17b63b192 Second part of stock-integration. 
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
 2009-02-06 16:26:35 +01:00
Benjamin Meichsner
1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. 2009-02-05 16:40:02 +01:00
Benjamin Meichsner
aec93d4b73 Fixed bugs from last commit and in ExceptionNotification-config. 2009-02-02 17:12:08 +01:00
Benjamin Meichsner
0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +01:00
Benjamin Meichsner
aa47a24fda Refactoring of invitations. 2009-02-02 00:09:50 +01:00
Benjamin Meichsner
d75c206db5 Fixed some wrong links in startpage. Added gettext-help for controllers. 2009-02-01 23:09:03 +01:00
Benjamin Meichsner
7f09bb55e4 Fixed some wrong links in admin-startpage and bugs in ordergroup-model. 2009-02-01 21:53:08 +01:00
Benjamin Meichsner
e16bebd042 Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'. 2009-02-01 20:56:23 +01:00
Benjamin Meichsner
9eb2125f15 Complete refactoring of orders-workflow. 
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
 2009-01-29 01:57:51 +01:00
lasse
80287aeea4 Updating README_DEVEL and fixing environment.rb so foodsoft runs on a clean system. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-01-27 19:57:07 +08:00
Benjamin Meichsner
fc45345e0d Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results) 2009-01-20 19:37:15 +01:00
Benjamin Meichsner
b820577382 Update License (to GPL3) and install instructions. 2009-01-20 15:59:06 +01:00
Benjamin Meichsner
2630ca2b14 Removed finance-controller for more clarity. 2009-01-19 16:40:06 +01:00
Benjamin Meichsner
936e6ef69a Refactoring of articles and article_categories. articles are now a nested resource of supplier. 2009-01-16 16:19:26 +01:00
Benjamin Meichsner
b38025869a Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity. 2009-01-16 02:17:49 +01:00
Benjamin Meichsner
e8d55e50c0 Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task. 2009-01-15 18:26:37 +01:00
Benjamin Meichsner
6ce6c2c75a Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace). 2009-01-15 12:14:01 +01:00
Benjamin Meichsner
fadc951208 Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary. 2009-01-14 12:46:01 +01:00
Benjamin Meichsner
2d5dc03b90 Groups are now workgroups. First part of moving groups-logic into admin-namespace. 2009-01-13 19:01:56 +01:00
Benjamin Meichsner
461dfa8531 Moved users into new admin-namespace and made the controller restful. Also moved some logic from the controller into the user-model (dry it up..). 2009-01-12 18:26:09 +01:00
Benjamin Meichsner
47398c6a70 Moved balancing logic into new namespace 'finance'. 2009-01-10 22:22:16 +01:00
Benjamin Meichsner
c282cae79c Moved financial_transaction into the new finance-namespace. 2009-01-10 21:28:22 +01:00
Benjamin Meichsner
1d85b880f2 Created namespace 'finance' and moved invoices into it. 2009-01-10 19:36:58 +01:00
Benjamin Meichsner
30f3d199d3 Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet. 2009-01-08 16:33:27 +01:00
Benjamin Meichsner
a6c7b04e33 Replaced rfpdf with prawn and prawnto. Start to convert pdf-views. 2009-01-07 15:29:23 +01:00
Benjamin Meichsner
da309f03b0 Add missing method for gettext-string-converter. 2009-01-06 15:55:29 +01:00
Benjamin Meichsner
9f8d0d28ac Removed gettext and simplified_localization-plugin. L18n is now the appropriate module. 
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
 2009-01-06 15:45:19 +01:00
Benjamin Meichsner
5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00