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

558 commits

Author SHA1 Message Date
benni
fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni
ee3da51ad3 Fixed bug in new stockit article form. 2012-10-24 12:19:53 +02:00
benni
f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni
fd361090b4 Nice breadcrumb 2012-10-18 23:43:31 +02:00
benni
9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
Robert Waltemath
f0bf196934 order group recepient list ascending 2012-10-15 17:33:33 +02:00
benni
e9383e0d17 Remove searching shared articles by list. 
This is necessary to go with newest fixes in sharedlists app.
 2012-10-13 22:19:01 +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
92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. 2012-10-03 20:08:54 +02:00
benni
eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +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
5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni
c936813967 Some fixes for mailer module. 2012-08-17 19:08:02 +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
af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni
dc0d1b3e46 Fixed bug in apples stats. 2012-07-22 21:12:53 +02:00
davidrabel
cda3c37e20 Umlaute eingefügt 2012-07-19 15:37:17 +02:00
davidrabel
2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. 2012-07-18 22:16:08 +02:00
benni
182742fbec Merge branch 'master' into rails3 
Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
 2012-06-26 11:51:56 +02:00
benni
f1b71a5588 Minor refactoring in stats partial. 2012-06-24 21:43:36 +02:00
benni
7d54a416df Allow changing number of automaticly created next weekly tasks. 2012-06-24 11:01:16 +02:00
benni
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni
6bd4bbec86 Deactivated broken links in balancing. 2012-05-12 11:18:46 +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
4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +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
38b5dcba1f Refactored ordering part two. Integrated stock order. 2011-06-19 19:56:04 +02:00
benni
eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni
45e0048490 Minor refactoring for ordering js data. 2011-06-13 16:45:37 +02:00
benni
f3773314a7 Fixed ordering view. 2011-06-13 16:23:56 +02:00
benni
adbe93f39e Fixed open_orders partial. 2011-06-13 15:26:06 +02:00
benni
afb2c26ab3 Fixed orders form. 2011-06-10 13:53:51 +02:00
benni
a27c0c67fc Fixed some typos. 2011-06-10 13:31:01 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni
689cfcfe01 Fixed items_per_page helper. 2011-06-10 12:03:32 +02:00
benni
a47d4b1f0e Unobtrusive pagination_links_remote 2011-06-10 11:43:56 +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
013637a4fc Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +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
6ac04d5e19 Fixed foodcoop/ordergroups view. 2011-05-18 11:47:00 +02:00
benni
2ee30fee16 Refactored home/ordergroup. 2011-05-16 11:00:52 +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
c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
benni
6c98c7c755 Some fixes for task module. 2011-05-15 22:06:54 +02:00
benni
79f8836da0 Fixed some html safe strings. 2011-05-15 21:17:01 +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
197516b7fc Fixed language and flash divs. 2011-05-11 17:41:43 +02:00
benni
2eb714b603 Fixed missing js for login layout. 2011-05-11 15:24:34 +02:00
benni
2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni
e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +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
c2496aa4fd Consider task duration in ordergroup stats. 
* Also added duration to task template in workgroup task_duration.
 2011-05-07 21:54:00 +02:00
Benjamin Meichsner
80691c441b Fixed bug on new delivery page. 2010-09-17 18:45:07 +02:00
Benjamin Meichsner
f640c673de Fixed bad when selecting same page as parent. 2010-07-08 10:57:42 +02:00
Benjamin Meichsner
fbf6a283a0 Fixed bug in orders index if order.ends.nil? 2010-06-19 12:25:35 +02:00
Benjamin Meichsner
db52c6e4ed Fixed bug on wiki page. 2010-06-18 10:33:13 +02:00
Benjamin Meichsner
833862df93 Fixed bug on wiki page when an author was deleted. 2010-06-14 23:00:09 +02:00
Benjamin Meichsner
be321798a7 Fixed some links in tasks module. 2010-06-10 23:25:13 +02:00
Benjamin Meichsner
0e4b6107ba Fixed wrong path in task form. 2010-06-10 12:55:06 +02:00
Benjamin Meichsner
74407a5912 Fixed paths in task-menu. 2010-06-01 16:18:20 +02:00
Benjamin Meichsner
3a85d4f49f Fixed bug on ordergroups account managment page. 2010-05-28 11:50:18 +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
fc823bb6d6 Fixed wrong my-tasks-path on home page. 2010-03-28 16:56:24 +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
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
sandoz
662f8bf3d7 Round number of EUR per which you should to a job. 
* Just polishing for better user experience :-)
 2010-02-23 20:46:34 +01:00
Benjamin Meichsner
1b9ae83496 Few design improvements for order pages. 2010-02-11 23:22:50 +01:00
Benjamin Meichsner
b5df80b7dd Fixed bug in wiki "all pages" view. 2010-02-10 00:13:51 +01:00
Benjamin Meichsner
e93dd9e046 Zeige Wert der Äpfel. 2010-02-09 23:56:16 +01:00
Benjamin Meichsner
94d1a897e7 Fixed bug in stock orders (orderfooter commit). 2010-02-09 22:34:04 +01:00
Benjamin Meichsner
a6646d06a6 Fixed bug during css caching. 2010-02-09 21:40:02 +01:00
Benjamin Meichsner
48ee593d8d Merge branch 'orderfooter' 2010-02-09 21:07:12 +01:00
Benjamin Meichsner
7a77d1aa66 Caching of css and javascript for better speed results. 2010-02-09 21:06:24 +01:00
Benjamin Meichsner
05d88d6178 Few css changes for performance improvement. 2010-02-09 20:38:48 +01:00
Benjamin Meichsner
45039bf60f Replaced js article-info control with pure css. 2009-11-20 01:28:01 +01:00
sandoz
d31b40bd66 Show also articles to get because of tolerance. 
* Closes #54
 2009-11-15 12:44:32 +01:00
Benjamin Meichsner
74ed02e11e Fixed broken link on start navigation menu. 
Closes #53
 2009-11-10 14:15:06 +01:00
Benjamin Meichsner
5e9ffa7cb1 Orderfooter design improvements. 2009-11-08 19:26:28 +01:00
sandoz
b8e336b9e8 Minor layout change of order footer. 2009-11-01 19:27:48 +01:00
sandoz
e4ef6556b8 Do not display tolerance column in stock order. 2009-11-01 18:57:55 +01:00
sandoz
fd1eb8a1d7 Refactor orderfooter and quantity display 
* Unit, others_quantitiy and other_tolerance is now in orderfooter
* We display the missing units in the article row now.
 2009-11-01 18:33:14 +01:00
Benjamin Meichsner
2309fbe76b Reduced max articles per page for article matrix. 
Sometimes the last column wasn't displayed correctly.
 2009-10-20 23:13:08 +02:00
Benjamin Meichsner
646a6b11f5 Nice green +/- buttons for order page. 2009-10-20 23:05:41 +02:00
Benjamin Meichsner
a4a48dc4fe Css fixes. 2009-10-18 14:19:02 +02:00
Benjamin Meichsner
65a0a30f5a Introduced order footer. 
An fixed element to present article meta data and other stuff.
 2009-10-17 22:50:33 +02:00
Benjamin Meichsner
036bc10282 Hide/show unavailable articles via js. 2009-10-17 20:33:36 +02:00
Benjamin Meichsner
84610cc9a5 Fixed broken link. Closes #44 2009-10-17 18:53:01 +02:00
Benjamin Meichsner
0b6b5eb0b5 Improved noscript warning on login page. 
Also add 'foodsoft' to title. closes #48
 2009-10-17 18:42:07 +02:00
Benjamin Meichsner
1f218f77a0 Corrected message in order result. Closes #47 2009-10-17 18:25:33 +02:00
Benjamin Meichsner
1f629ff861 Hide ignored articles in order result. 
* also added js-link to show them if wanted
 2009-10-17 12:22:13 +02: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
cf9fa69ac2 Minor improvements to task show view. 2009-10-16 21:06:55 +02:00
Benjamin Meichsner
d0e04a05ec Removed unecessary weekly task templates. 2009-10-16 20:45:20 +02:00
sandoz
90f760858e Added site map and titel list to pages/all 
* pages/all now consists of three alternativ views: recent changes, site map and title list
 2009-10-06 22:24:51 +02:00
sandoz
305a4ac895 Don't show action "Create invoice" for stock order 2009-10-05 13:36:57 +02:00
Benjamin Meichsner
c3ca3e23f9 Hide redirected pages in collection for parent ids. 2009-09-28 17:22:24 +02:00
Benjamin Meichsner
de86fcadd3 Made blank parent_id for wikipages possible. 2009-09-28 15:41:00 +02:00
Benjamin Meichsner
7c192bbad3 Redirect /pages/id to /wiki/permalink 2009-09-28 15:31:20 +02:00
Benjamin Meichsner
eca24d30f2 Show up tabnav link for wikipages. 2009-09-28 15:05:00 +02:00
Benjamin Meichsner
529956ea5a Merge branch 'wiki' 
Conflicts:
	app/helpers/pages_helper.rb
	public/stylesheets/main.css
	public/stylesheets/print.css
 2009-09-28 15:04:07 +02:00
Benjamin Meichsner
67661cb716 Added toc to wikipages. Patched wikicloth. 
* patched wikicloth to serve anchor links for sections
* added table of contents
* subpages list doesn't show up per default
 2009-09-28 14:57:11 +02:00
sandoz
741815e24e Fixed help for numbered lists in pages/_form 2009-09-28 13:53:56 +02:00
Benjamin Meichsner
8bba70594d Fixed bugs on my-ordergroup page and typos on invitation page. 2009-09-23 12:08:21 +02:00
Benjamin Meichsner
8a37a0e746 Fixed bug in comments partial on missing users. 2009-09-11 16:10:18 +02:00
Benjamin Meichsner
5a93ca1641 Added tax to stockit index view. 2009-09-07 11:29:56 +02:00
Benjamin Meichsner
2cb0516e8c Fixed some broken links on admin user page. 2009-09-07 11:21:12 +02:00
sandoz
8df679163e Change line "edited by" in pages/show 
* The line "Zuletzt bearbeitet" display now first the user and then the date.
* The user name is displayed in bold characters.
 2009-08-25 23:30:49 +02:00
sandoz
8927a80246 You can change the page parent now at pages/edit. 
* Increased text area size for better layout with the new feature.
* Closes #39
 2009-08-22 23:04:51 +02:00
sandoz
7ec5381ca0 Improved wiki layout for sidebar and version sections 
* Added new helper function format_datetime_timespec
 2009-08-22 18:14:56 +02:00
sandoz
f7e24d26b4 Better layout with equal distance from each sides. 
* Added css class middle_column
 2009-08-21 23:37:05 +02:00
sandoz
004ce464c1 Fix problem in breadcrumps, when no "Home"-page exists. 2009-08-21 20:59:50 +02:00
sandoz
47d3232e4e Fix problem in breadcrumps, when no "Home"-page exists. 2009-08-19 22:59:53 +02:00
Benjamin Meichsner
42b5e7a73f Cherrypick of sandoz last commit 
Conflicts:
	app/views/pages/all.html.haml
	public/stylesheets/main.css
	public/stylesheets/print.css
 2009-08-16 10:13:50 +02:00
sandoz
6866c4eada Merge branch 'wiki' of git@github.com:bennibu/foodsoft into wiki 2009-08-16 01:15:47 +02:00
sandoz
57023cd018 Neues Breadcrump-Layout 
* Die Breadcrump-Links sind jetzt überdem Seiten-Titel.
* Breadcrumps sind jetzt auf allen Wiki-Ansichten: edit, show, new, versions, all
* Bei edit und version ist der Breadcrump-Teil zur aktuellen Seite auch eine Link.
* Bei all wird nur der Foodcoop-Wiki-Teil angezeigt.
 2009-08-16 01:09:11 +02:00
sandoz
b46d7ca19c Abbrechen-Link in wiki/edit etwas robuster gemacht. 
* wiki/edit zeigt jetzt auf @page und nicht mehr auf :back.
* Man kann durchaus direkt zu einer Edit-Seite surfen, dann kann :back Beliebiges sein.
 2009-08-16 01:07:12 +02:00
Benjamin Meichsner
73c1137715 Removed another new wiki page link. 2009-08-15 17:39:14 +02:00
Benjamin Meichsner
fd99125136 Temporarly removing of wiki tab. 2009-08-15 17:38:10 +02:00
Benjamin Meichsner
e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner
6fae1e8b64 Begin with h2 for the wiki content. 2009-08-15 17:14:07 +02:00
sandoz
aa5166bb16 Hübschified "Schnelle Formatierungshilfe" 2009-08-15 15:08:02 +02:00
sandoz
8d243c8e60 Show supplier email in suppliers/show.haml 
* Closes: #38
 2009-08-15 12:29:08 +02:00
Benjamin Meichsner
27bec1f860 Remember per_page number when updating multiple articles. Closes #36 2009-08-13 17:23:14 +02:00
Benjamin Meichsner
d470c660d8 Fixed broken link in ordergroups view. 2009-08-13 00:38:12 +02:00
Benjamin Meichsner
d5342f5ff9 Added warn message, when deleting a page. 2009-08-12 19:06:15 +02:00
Benjamin Meichsner
d7b65a304e Removed new page link in wiki menu. 2009-08-12 19:02:03 +02:00
Benjamin Meichsner
469c2473ca Fixed some bugs on version page. 2009-08-12 19:00:45 +02:00
Benjamin Meichsner
9516f349ce Improved wikipage sidebar. 2009-08-12 18:55:36 +02:00
Benjamin Meichsner
a8c93c08b7 Added parent-child relationship to pages to visualize a breadcrump and subpages. 2009-08-12 18:41:25 +02:00
Benjamin Meichsner
83e741c1af Improved delivery creating/updating prozess. 2009-08-12 13:38:03 +02:00
Benjamin Meichsner
16346e3529 Added note to deliveries. Closes #34 2009-08-12 13:09:10 +02:00
Benjamin Meichsner
aedfcae03b Added stock_article number to stockit view. Closes #33 2009-08-12 11:46:27 +02:00
Benjamin Meichsner
3656dac3cb Fixed display bug with new ajax_box. 2009-08-11 19:49:31 +02:00
Benjamin Meichsner
49be55238b Added rake task to notify workgroup members if not enough users assigned an upcoming task. 2009-08-11 18:10:14 +02:00
Benjamin Meichsner
d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
Benjamin Meichsner
00619ccf55 Updated wiki format help. 2009-08-11 14:41:58 +02:00
Benjamin Meichsner
5d9385cde4 Changed wiki parser to wikicloth. 
* Temporarly removing of TOC.
 2009-08-11 14:30:35 +02:00
root
7e2506baa2 Fixed haml bug. 2009-08-06 16:14:36 +02:00
Benjamin Meichsner
f45509fc07 Merge branch 'tolerance_not_costly' 2009-08-05 17:02:12 +02:00
Benjamin Meichsner
ad94006978 Hide ordergroup link for non ordergroup members. 2009-08-05 11:49:07 +02:00
sandoz
0adce9d54c First try making tolerance not costly. 
A new configuration setting was introduced: tolerance_is_costly
If set to false, article tolerance values do not count for total article price as long as the order is not finished.
This reduces the negative effect on using tolerance for the user.
 2009-08-04 23:44:11 +02:00
Benjamin Meichsner
c7e37fc7b2 Added possibility to give feedbacks via ajax form. Closes #2 
* Feedback message will send to error_recipients, configured in app_config.yml
 2009-08-04 15:22:11 +02:00
Benjamin Meichsner
b84ec884bd Highlight javascript dependencies. Closes #19 2009-08-04 13:49:14 +02:00
Benjamin Meichsner
4d57bd2e73 Show current stock value on stockit page. 2009-08-04 13:41:28 +02:00
Benjamin Meichsner
6761a41048 Hide articles with a stock amount of zero. Closes #17 2009-08-04 13:35:52 +02:00
Benjamin Meichsner
f72dccae18 Added edit invoice link to balancing sheet. Closes #8 2009-08-04 13:25:59 +02:00
Benjamin Meichsner
ce375e1637 Fixed bad link in tasks/workgroups. Closes #23 2009-08-04 12:57:19 +02:00
root
68f8d00930 Fixed bug in stats on a fresh installation. 2009-08-04 12:32:25 +02:00
Benjamin Meichsner
d9d800b41f Fixed bug in stats modul. Consider missing ordergroup. 2009-08-02 20:04:54 +02:00
Benjamin Meichsner
6659fe90f3 Merge branch 'stats' 2009-08-02 19:57:19 +02:00
Benjamin Meichsner
4545a5f17c Fixed wrong url during last commits. 2009-08-02 19:56:08 +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
d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner
d2efe64343 Fixed display bug in menu when using IE. Closes #15 2009-06-19 21:38:51 +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
255a4cd6c7 Fixed problems in interacting of acts_as_versioned and optimistic locking. 2009-05-20 15:26:53 +02:00
Benjamin Meichsner
2660d86b89 Added table of contents to wiki page. 2009-05-20 14:06:40 +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
7de45543c4 Added page-preview feature to wiki module. 2009-05-20 12:42:01 +02:00
Benjamin Meichsner
0fb8ee214f Added helpful links to submenu. 2009-05-20 11:54:18 +02:00
Benjamin Meichsner
2af35e55bc Improved stockit overiew. Fixed article ordering by suppliers. 2009-05-17 16:50:13 +02:00
Benjamin Meichsner
e59ce8c313 Added deliveries counter to suppliers overview. 2009-05-17 16:18:14 +02:00
Benjamin Meichsner
a8e35bd421 Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery. 2009-05-17 16:11:39 +02:00
Benjamin Meichsner
c03f3da21a Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items. 2009-05-15 17:58:02 +02:00
Benjamin Meichsner
053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner
7ba6bc3680 Added optimistic locking to wiki pages. 2009-05-15 13:54:42 +02:00
Benjamin Meichsner
f83d2659de Added better routing for wiki-root-path. 2009-05-15 13:53:45 +02:00
Benjamin Meichsner
0d11e68bad Added syntax help to wiki form. 2009-05-13 17:32:43 +02:00
Benjamin Meichsner
7e4409bc11 Few improvements to wiki module. 2009-05-07 18:15:14 +02:00
Benjamin Meichsner
e8fa912e8c Removed contact data from ordergroups-page. Added names of users and date of last order. 2009-05-04 17:06:08 +02:00
Benjamin Meichsner
ecc0340a70 Added message-link and notes to new foodcoop/ordergroups page. 2009-04-20 14:33:24 +02:00
Benjamin Meichsner
a3fbc2d37b Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-04-20 14:13:47 +02:00
Benjamin Meichsner
4db8184daa Fixed some bugs in orders lists. Closes #3 2009-04-20 14:11:11 +02:00
Benjamin Meichsner
e71cacfe50 Fixed typing error and changed default foodcoop tab to /tasks 2009-04-20 13:58:22 +02:00
sandoz
e32e97d178 Added "ordergroups" view to list the ordergroups 
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
  labels
 2009-04-18 15:39:07 +02:00
sandoz
e95cdad5ec Added ordergroups view to foodcoop namespace. 
* For now just a searchable list. Nothing more.
 2009-04-18 15:39:07 +02:00
Benjamin Meichsner
c6187ebade Fixed bug in password reset feature. 
* Translated messages
* Cleaned up some code
 2009-04-17 12:06:36 +02:00
sandoz
00696c0e64 Replaced account balance by available funds on start page. 
* Closes #206

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:35 +08:00
sandoz
e3f9df0a0c Replaced account_balance by available_funds in ordergroup view. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:33 +08:00
Benjamin Meichsner
d62d45e4a4 Hide zero results in matrix pdf. 2009-04-03 23:32:24 +02:00
Benjamin Meichsner
de1aa2ac38 Headers and table improvements for matrix pdf. Fixed #204 2009-04-03 19:20:16 +02:00
Benjamin Meichsner
578002501b Hide ordergroups with result = 0. 2009-04-03 18:01:19 +02:00
Benjamin Meichsner
8fb4334610 Modified sort_link helper method to allo non ajax links. 2009-04-03 17:16:39 +02:00
sandoz
5a7fe17437 Make list of ordered articles sortable in _edit_results_by_articles 
* For the moment you can sort by article name and order number

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-03 22:14:48 +08:00
sandoz
2db8aec0e5 Improved warning message when finishing an order. 
* Hope this makes unwanted ending of an order like last week less
  possible.
* Finally Closes #159

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-03 22:14:46 +08: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
37199bae1d Implemented pagination for messages overview. 2009-03-23 11:31:36 +01:00
Benjamin Meichsner
759217763e Added pagination to task archiv. 2009-03-23 11:23:41 +01:00
Benjamin Meichsner
f018db5b15 Translated tasks/workgroup page. 2009-03-23 11:08:56 +01:00
Benjamin Meichsner
549c03f223 Updated workgroups page. 
* Make use of render :collection helper.
* Translated some links.
 2009-03-23 10:57:41 +01:00
sandoz
48b6515c08 Genderchanged string 'Lieferant' 
* Since s.b. started this already. I changed every string 'Lieferant' to
 'Lieferantin' to give note on female existance in this world :-)
 2009-03-22 15:04:29 +01:00
sandoz
7c6a01b0fc Genderneutralization in stockit/index.html.haml 
* Genderneutralized string 'Lieferant'
 2009-03-22 15:04:29 +01:00
sandoz
1c62bf8786 Genderneutralized/Fixed strings in suppliers/index.haml 
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
 2009-03-22 15:04:28 +01:00
sandoz
a4900bf8e0 Translation/Genderneutralization in admin/index.html.haml 
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
 2009-03-22 15:04:28 +01:00
sandoz
8cdcb10c69 Translation in foodcoop/members.html.haml 
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
 2009-03-22 14:16:53 +01:00
sandoz
8171d3d173 Translation in foodcoop/_users.html.haml 
* Transalated 'Nick' to 'Benutzername'
 2009-03-22 14:16:53 +01:00
sandoz
fea8c0993b Translation in profile.html.erb 
* Translated "cancal membership" and warning.
 2009-03-22 14:16:53 +01:00
sandoz
8d4acac081 Removed string "Benutzername: in home/profile.html.erb 
* I think it doubles it self to have the same string again on the next
 line. Hope you find it more beautiful too :-)
 2009-03-22 14:16:52 +01:00
sandoz
584431d00a Translations in shared/_user_form.rhtml 
* Added German text in order not to user default text.
 2009-03-22 14:16:52 +01:00
sandoz
ceec784e62 Translation in profile.html.erb 
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
 2009-03-22 14:16:52 +01:00
sandoz
92e2bdd187 Renamed 'Help' to 'Hilfe' in top loginInfo bar 2009-03-22 14:16:52 +01:00
sandoz
54715e50fc Changed caption of group orders sum price 
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
 (FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
 2009-03-22 14:16:52 +01:00
sandoz
cde1fb3525 Show total price of ordered units per article in finance/balancing 
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
 _order_article (Closed #108)
 2009-03-22 14:16:52 +01:00
sandoz
2e490d1a52 Capitalized first letter of 'netto' and 'brutto' in Captions. 2009-03-22 14:16:52 +01:00
sandoz
6da9190b03 Added buttons to in/decrease group order article results. 2009-03-20 20:37:13 +01:00
sandoz
8fbce954e3 Correct 'brutto'-price to be price.gross not fc_price. 
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
 2009-03-20 20:28:44 +01:00
sandoz
2c52944956 Fixed buggy link in finance/balancing/new.html.haml 
* Link to "Rechnung anlegen" did not send supplier id.
 2009-03-20 16:32:47 +01:00
Benjamin Meichsner
da08365816 Fixed bug order.profit calculation. 
Order.profit will also be saved, when order is closed.
 2009-03-17 19:43:41 +01:00
Benjamin Meichsner
843e4a7233 Added ability to send private messages. 2009-03-17 18:28:09 +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
1791243b25 Fixed bug when distuingish between finished and closed orders. 2009-03-13 00:06:20 +01:00
Benjamin Meichsner
20d4177990 Added net|gross sum for deliveries-show-page. (Fixed #193) 2009-03-11 18:03:28 +01:00
Benjamin Meichsner
35251576fa Fixed failures in show-view of StockOrders. (#195) 2009-03-11 17:08:12 +01:00
Benjamin Meichsner
714197eea1 Made order-finish-confirm-message consistently. Fixed #196 2009-03-11 17:00:51 +01:00
Benjamin Meichsner
ce2156d75f Send order-finish-notifications in background. 2009-03-11 16:58:31 +01:00
Benjamin Meichsner
dd940fb414 Send messages directly instead of using controller filter. Litte improvements to the messages lists. 2009-03-09 13:02:43 +01:00
Benjamin Meichsner
de4f1d573b Fixed bug in order_result-message. 2009-03-09 00:10:43 +01:00
Benjamin Meichsner
a30444a602 Fixed bug in messaging system. Moved navigation 'messages' to 'foodcoop' tab. 2009-03-06 19:38:06 +01:00
Benjamin Meichsner
a29053b4e9 Some language fixes. Finished migration path. 2009-03-01 18:45:34 +01:00
Benjamin Meichsner
857475af1b Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch. 
This reverts commit c04819e8c4.
 2009-02-18 12:01:51 +01:00
Benjamin Meichsner
c04819e8c4 First parts of new 'web-app-theme'. 2009-02-18 11:41:03 +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
2bb4cdb9d6 Fixed bug in ordering page. 2009-02-12 14:35:29 +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
325d47b22f Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'. 2009-02-11 15:23:59 +01:00
Benjamin Meichsner
cd9636a650 Improved the creation/updating of deliveries. 2009-02-10 20:06:08 +01:00
Benjamin Meichsner
67743cd014 Implement notification for upcoming tasks via a daily fired rake-task. 2009-02-10 15:07:47 +01:00
Benjamin Meichsner
053593f718 Translations for articles-pages. 2009-02-10 13:26:10 +01:00
Benjamin Meichsner
6202e05841 Last part of order refactoring. Now order_article create/update is possible. 2009-02-09 20:12:56 +01:00
Benjamin Meichsner
4d796b8e73 Since there are StockArticles for each supplier, the StockArticles has 
to be excluded in normal articles-view.
 2009-02-07 15:19:07 +01:00
Benjamin Meichsner
24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00
Benjamin Meichsner
96442477d1 Fixed broken links in tasks-module. Translated some views into german. 2009-02-06 20:51:14 +01:00
Benjamin Meichsner
0a87294ed4 Fixed bug in deliveries. Extended test fixtures. 2009-02-06 17:06:08 +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
251ced4fa1 Introduced group_order_article.result to save the result for each group/article. 2009-02-04 16:41:01 +01:00
Benjamin Meichsner
6fd5d825f9 Order-refactoring part II. 2009-02-03 21:14:48 +01:00
Benjamin Meichsner
f7b9582261 Bugfixing in memberships-filter. 2009-02-02 17:28:59 +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
eedee9f070 Fixed gug in startpage. 2009-02-01 21:08:04 +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
ec402ffa7b Fixed order.close workflow. (formerly known as order.balance) 2009-01-30 22:27:55 +01:00
Benjamin Meichsner
288566f000 Moved 'shared' partial into shared-folder. Easer to maintain. 2009-01-30 19:02:35 +01:00
Benjamin Meichsner
190a777278 Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing. 2009-01-29 21:28:22 +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
Benjamin Meichsner
2630ca2b14 Removed finance-controller for more clarity. 2009-01-19 16:40:06 +01:00
Benjamin Meichsner
ff6b460cfc Improved delivery-invoice-workflow. 2009-01-18 17:42:51 +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
7ff0467b16 Some fixes of bugs during last commit. 2009-01-15 20:10:50 +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