wvengen
3ed8e0bc84
allow longer supplier phone number
2013-07-15 17:57:00 +02:00
Julius
0e66414534
Allow creation of StockArticles also if there are no Articles for a supplier in delivery form
2013-07-14 22:00:38 +02:00
Julius
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
wvengen
126f7e7459
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
...
Show StockChanges index
2013-07-13 03:16:31 -07:00
Julius
12506e54b8
Remove stock_changes_helper.rb
2013-07-13 09:34:19 +02:00
Julius
730dc7cf2a
Move StockChanges#index to StockArticles#history
2013-07-13 09:32:27 +02:00
Julius
edaf91b029
Inline before_filter of stock_changes_controller
2013-07-12 22:19:11 +02:00
Julius
e5eff07abd
Move Select2 for stock_article_creation to tfoot of delivery form
2013-07-12 21:15:12 +02:00
wvengen
f57038ff56
show quantity/tolerance in order screen when unit_quantity=1
2013-07-11 23:20:37 +02:00
wvengen
db8a929f0b
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
...
Great!
2013-07-11 12:48:41 -07:00
Julius
469abb753d
Merge branch 'master' into improve-delivery-workflow-further
2013-07-11 19:24:37 +02:00
Julius
620686fa46
Merge branch 'master' into stock_article_quantity_history
2013-07-11 19:23:52 +02:00
Julius
7c27017306
Link delivery/stock_taking/order in stock_changes index
2013-07-11 18:37:55 +02:00
Julius
ffcb9490c9
Make stock_changes readonly in index view
2013-07-11 18:20:24 +02:00
Robert Waltemath
65c0b555c2
Added warning/ hint when updating periodic task.
2013-07-11 10:30:55 +02:00
wvengen
2ef7e58b0b
Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles
...
only add undeleted articles in balancing screen
2013-07-10 13:05:50 -07:00
wvengen
33d3b9c466
merge branch minimum_balance into master ( closes #133 )
2013-07-10 22:03:57 +02:00
Julius
de9541a0df
Ask how to fetch readonly associations
2013-07-09 21:49:39 +02:00
Julius
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
Julius
5ed2659bc6
Fix StockArticle update in Delivery form
2013-07-09 17:08:59 +02:00
Julius
164b3f7415
Replace deprecated $.fn.live in delivery form
2013-07-08 22:49:49 +02:00
wvengen
33b27d2fa7
proper usage of jQuery.on(), and update javascript in views as well
2013-07-08 22:41:06 +02:00
Julius
f76b9da1e9
Separate columns for article price and unit in delivery form
2013-07-08 22:19:27 +02:00
Julius
a6228bdcf2
Style bootstrap tooltip; show FC share in article price info
2013-07-08 22:10:36 +02:00
Julius
bba70dc875
Change DOM sort style to match existing style
2013-07-08 21:51:15 +02:00
Julius
ff1317b17b
Add hint to copy stock_article if price change desired in delivery process
2013-07-08 21:02:43 +02:00
Julius
5fcc14a36d
Fix trailing '*/' in application.css
2013-07-08 20:46:05 +02:00
wvengen
e9e7135639
run bundle update and make it work again
2013-07-08 14:32:24 +02:00
wvengen
1eeec23c80
only add undeleted articles in balancing screen
2013-07-08 02:31:54 +02:00
Julius Rapp
a5565b436f
Resolve merge conflicts
2013-07-07 14:58:57 +02:00
Julius Rapp
1ebd4e3ce6
Use foodsoft button and table styles (no btn-group, no table-condensed)
2013-07-07 14:19:30 +02:00
Julius Rapp
4a208c83c0
Separate actions for new StockArticle
2013-07-07 14:14:32 +02:00
wvengen
d397132f7b
be safe even with locale string
2013-07-07 02:31:42 +02:00
wvengen
8080cd6b7e
pass locale to datepicker, use gem for that
2013-07-07 01:47:22 +02:00
wvengen
76645ebd12
add default tax percentage to app_config
2013-07-06 23:11:50 +02:00
wvengen
3da27734c7
allow import of files with categories that do not exist (map to no category)
2013-07-06 17:49:10 +02:00
wvengen
a6688b3b43
import manufacturer and origin too ( closes #140 )
2013-07-06 17:48:40 +02:00
wvengen
497c9e0cf1
fix closed group_order totals
2013-07-02 12:01:25 +02:00
wvengen
d7540bdd20
fix i18n key
2013-06-30 13:08:13 +02:00
wvengen
b807e9d059
beautify order mail
2013-06-29 02:54:00 +02:00
wvengen
f11d10ff07
update order result mail (fixing html quoting of quotes)
2013-06-29 02:22:01 +02:00
wvengen
9d406bbc08
make resque worker function on non-multi-coop-installs too
2013-06-29 01:48:57 +02:00
wvengen
0978b84f4d
set user language on login to override session
2013-06-28 13:30:26 +02:00
Robert Waltemath
e5d790021c
Add repeated symbol to task list.
2013-06-27 10:22:22 +02:00
Julius
69060a6da6
Fix ordering of stock_changes in delivery 2
2013-06-27 09:10:46 +02:00
Julius
d0ccf07bc5
Merge latest changes in master of http://github.com/foodcoops/foodsoft
2013-06-26 20:23:11 +02:00
Julius
a29d52dcae
Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors)
2013-06-26 20:14:33 +02:00
Julius
8a79dfd167
Add tooltip for article prices
2013-06-26 20:06:38 +02:00
Julius
2ee7f716ae
Improve delivery validation: StockArticles must not be associated more than once
2013-06-26 17:58:55 +02:00
Julius
dd70b84ef0
Linearize and clean up delivery form
2013-06-26 15:16:52 +02:00
wvengen
befe89d4ef
fix tolerance display in group_order form
2013-06-26 01:36:44 +02:00
wvengen
c31e864c73
internationalise currency in order screen
2013-06-26 01:17:04 +02:00
wvengen
dddd11d8f0
do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone
2013-06-26 00:42:09 +02:00
wvengen
7dbe1363ed
fix adding article balancing failing with 'already taken' ( closes foodcoops/foodsoft#125 )
2013-06-24 13:32:07 +02:00
Robert Waltemath
c27127c745
Added i18n strings.
2013-06-24 11:53:52 +02:00
Robert Waltemath
3d1faa9ed3
Skip save callback when migrating data.
2013-06-24 10:36:14 +02:00
Robert Waltemath
d081a2c66b
Validate done/weekly combination only on creation of task.
2013-06-24 09:49:06 +02:00
Robert Waltemath
577945e591
Add validation for task.done in combination with periodic task.
2013-06-22 18:56:17 +02:00
Robert Waltemath
a7fd7a7936
Removed obsolete code of old workgroup-centric weekly task concept.
2013-06-22 18:14:11 +02:00
Robert Waltemath
ef329b5647
Added up and down migration for weekly task data.
2013-06-22 17:35:45 +02:00
Robert Waltemath
990397a7f0
Delete only the FOLLOWING tasks.
2013-06-21 22:04:36 +02:00
Robert Waltemath
c52e482743
Exclude tasks from groups when changing attributes.
2013-06-21 20:54:24 +02:00
wvengen
cab6ada8b8
small invoice i18n cleanup/refactoring
2013-06-21 14:24:05 +02:00
wvengen
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
Robert Waltemath
6b62fc90d8
Now creating periodic task via button
2013-06-21 13:48:48 +02:00
wvengen
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
wvengen
931b3bef5e
fix touch event twice bug (complements ac62dcce9d
)
2013-06-20 01:20:13 +02:00
Julius
bf32e72414
Improve delivery form validation
2013-06-19 11:21:55 +02:00
wvengen
c48ce138f3
cleanup of profile layout
2013-06-18 12:25:05 +02:00
Julius
04c9770e80
Complete I18n
2013-06-18 10:59:53 +02:00
Julius
cc1a839246
Allow to create stock_article as copy of article in delivery form
2013-06-18 10:48:19 +02:00
Julius
cc5574f8b5
Revert ac62dcce9d
2013-06-18 09:10:31 +02:00
wvengen
1e984df3aa
more beautiful ordergroup edit form
2013-06-18 01:35:12 +02:00
Julius
6e6cce1cb7
Add Select2 jQuery plugin
2013-06-17 16:15:19 +02:00
Julius
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
Julius
a9938df443
Clean up sort functionality; Remove title attributes due to hard I18n
2013-06-17 15:43:42 +02:00
Benjamin Meichsner
eee5d4a896
Fixed indentation bug in sync template.
2013-06-16 15:10:50 +02:00
Benjamin Meichsner
8c4da55561
Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign
2013-06-16 14:55:48 +02:00
wvengen
713c030213
i18n and translate missing entry
2013-06-15 18:43:42 +02:00
Manuel Wiedenmann
6569579c02
styles the preferences in user profile
2013-06-14 22:38:07 +02:00
Julius
b5acd9b116
Merge master branch of base
2013-06-14 18:59:17 +02:00
Manuel Wiedenmann
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +02:00
Manuel Wiedenmann
5b7ec86ed6
Merge branch master into i18n
2013-06-14 02:02:57 +02:00
wvengen
ac62dcce9d
make touch device events work on buttons ( closes foodcoop-rostock/foodsoft#34 , closes foodcoops/foodsoft#104 )
2013-06-14 01:42:47 +02:00
wvengen
8141ad0233
remove duplicate code
2013-06-14 01:39:30 +02:00
wvengen
13f2c128c6
do not use string values for integers ( closes foodcoops/foodsoft#128 )
2013-06-14 01:36:41 +02:00
Julius
3a48d1576f
Remove broken sort-by-price; comment redundancy of stock_change template
2013-06-13 23:51:37 +02:00
Julius
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
wvengen
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
Robert Waltemath
4037ef12da
Users may delete all tasks of a group, i.e. delete the whole group.
2013-06-12 12:02:13 +02:00
Benjamin Meichsner
f4a0e29297
Fixed bug in with new shared multiple suppliers feature.
2013-06-12 10:47:54 +02:00
Benjamin Meichsner
25fbb47320
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
2013-06-12 10:40:20 +02:00
Robert Waltemath
46b07a6136
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
...
Conflicts:
config/locales/de.yml
2013-06-12 10:00:11 +02:00
Julius
49cfa9aded
Cleanup StockArticle creation during delivery
2013-06-11 15:05:19 +02:00
Julius
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
wvengen
b7f71f5859
fix reset password breakage by avoiding encoding ampersand in url ( closes #123 )
2013-06-11 00:01:57 +02:00
Julius
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
Robert Waltemath
6bdb7b35f0
Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing.
2013-06-10 11:37:59 +02:00
Robert Waltemath
b7416b2210
Fixed percent sign in sync-view.
2013-06-10 11:01:31 +02:00
Manuel Wiedenmann
7a63394dac
Merge remote-tracking branch 'origin/rails3'
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-10 01:53:31 +02:00
Benjamin Meichsner
241c5666ec
Merge pull request #119 from balkansalat/rails3-improve-checkall-performance
...
Improve performance of *check-all* checkbox
2013-06-09 09:19:19 -07:00
Benjamin Meichsner
fd091d9b89
Merge pull request #118 from balkansalat/rails3-order-delivery-articles
...
Order articles for delivery selection by name only
2013-06-09 09:15:20 -07:00
Benjamin Meichsner
7c4ee01ff2
Define autofill attributes when creating new supplier from shared_supplier.
2013-06-09 18:02:47 +02:00
Benjamin Meichsner
60afa85ece
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
...
Update ordergroup prices in OrderArticles via Order.
2013-06-09 08:26:38 -07:00
Julius
0ebe38b7a9
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-improve-checkall-performance
2013-06-07 09:52:56 +02:00
Julius
966902ff55
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-order-delivery-articles
2013-06-07 09:51:50 +02:00
Julius
ff343933dd
Merge branch 'rails3' of http://github.com/balkansalat/foodsoft into rails3-show-percent-sign-in-views
2013-06-07 09:49:32 +02:00
Julius
0058e826b2
Reorder delivery articles
2013-06-07 09:35:22 +02:00
Julius
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
Julius
b8a23a396c
Remove test variable
2013-06-06 17:09:22 +02:00
Julius
0d3c23f814
Improve performance of data-check-all
2013-06-06 17:06:05 +02:00
Manuel Wiedenmann
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
Manuel Wiedenmann
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
wvengen
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
wvengen
c38ce28347
fix i18n bug
2013-06-06 02:13:40 +02:00
Robert Waltemath
82fb6d1dbe
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-06-06 00:37:50 +02:00
wvengen
043fc6391c
show header on fax PDF (closes bennibu#109)
2013-06-04 13:08:50 +02:00
Robert Waltemath
c194d2545f
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
2013-06-04 11:28:25 +02:00
Manuel Wiedenmann
c2c1961bd0
adds i18n support to routes and application controller; default_locale is set to :en
2013-05-31 18:42:28 +02:00
Robert Waltemath
2a1176c31a
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-05-30 10:54:22 +02:00
wvengen
3b7cbf71e0
fix i18n typos
2013-05-16 00:05:47 +02:00
wvengen
0c94ef5912
also translate mail subjects
2013-05-07 13:28:14 +02:00
wvengen
8b559269c9
add deliveries, pages, tasks translation in English
2013-05-06 12:43:57 +02:00
wvengen
53d5eabf79
fix login i18n
2013-04-26 21:35:23 +02:00
wvengen
5e2a3fb3f0
fix articles controller i18n
...
Conflicts:
app/controllers/articles_controller.rb
2013-04-12 16:17:12 +02:00
wvengen
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
wvengen
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
wvengen
368d44e26b
fix tasks error reference
2013-04-12 01:08:35 +02:00
wvengen
692c70d324
finish pages i18n
2013-04-12 00:59:45 +02:00
wvengen
1a8c8537a4
finish tasks i18n
2013-04-12 00:00:02 +02:00
wvengen
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
wvengen
a501fac76f
helpers i18n
2013-04-10 17:29:06 +02:00
wvengen
3f82138d84
finish deliveries i18n
2013-04-10 17:02:16 +02:00
wvengen
ee5f7ff1b8
small i18n/translation fixes
2013-04-10 14:07:59 +02:00
Benjamin Meichsner
3e9ca336a8
Fixed loosing assignments when updating a task.
2013-04-10 10:55:43 +02:00
Benjamin Meichsner
93f4239db6
Fixed wrong articles total in group_order#show.
...
Conflicts:
app/views/group_orders/show.html.haml
2013-04-10 10:54:56 +02:00
Benjamin Meichsner
d4b9370541
Fixed setting all user setting to false in user profile.
2013-04-10 10:52:41 +02:00
Benjamin Meichsner
79d1c5a66d
Allow article price equal to zero. Closes #111
2013-04-10 10:51:36 +02:00
Benjamin Meichsner
5b81c53a73
Fixed setting all user setting to false in user profile.
2013-04-08 15:08:57 +02:00
Benjamin Meichsner
20e439c2a7
Allow article price equal to zero. Closes #111
2013-04-08 14:40:02 +02:00
Benjamin Meichsner
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
Benjamin Meichsner
9c21a14c7e
Update group results when editing order article in balancing.
2013-04-08 14:26:40 +02:00
Benjamin Meichsner
220343128c
Fixed wrong articles total in group_order#show.
2013-04-08 13:39:02 +02:00
Benjamin Meichsner
03ea8e194e
Fixed loosing assignments when updating a task.
2013-04-08 01:31:21 +02:00
Benjamin Meichsner
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
wvengen
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
wvengen
4aa40b387a
finish article_categories controllers i18n + translation
2013-04-04 02:10:52 +02:00
wvengen
8c8778459e
finish documents i18n
2013-04-04 02:04:31 +02:00
wvengen
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
wvengen
ec1ef0289b
finish i18n of article_categories + translation
2013-04-04 00:44:07 +02:00
wvengen
0bb080526a
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
2013-04-04 00:29:50 +02:00
wvengen
e1f5969719
use short form plus title for unit quantity
2013-04-04 00:24:14 +02:00
Benjamin Meichsner
53518039f1
Fixed error message, when using GET for password reset actions.
2013-03-27 22:20:54 +01:00
Benjamin Meichsner
915e1b9e79
Fixed bug in reset password error handling.
2013-03-27 22:12:46 +01:00
Benjamin Meichsner
18f6cadca2
Ensure mail privacy in message reply and show view.
...
Thanks to @JuliusR for reporting.
2013-03-24 01:37:58 +01:00
Benjamin Meichsner
da72d3a61c
Only show undeleted articles in delivery/stock_taking forms.
...
Fixed 100.
2013-03-23 18:25:54 +01:00
Benjamin Meichsner
80b203a8da
Fixed missing templates in accept invitation action.
2013-03-23 17:51:33 +01:00
wvengen
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
wvengen
75a1051668
finish articles i18n, controller+model
2013-03-22 00:59:42 +01:00
wvengen
aabeb1a332
finish articles i18n
2013-03-22 00:20:37 +01:00
wvengen
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
Benjamin Meichsner
22550029b3
Added missing ajax support for messages index. Fixed #101
2013-03-20 23:31:13 +01:00
Benjamin Meichsner
e275403cdd
Do not destroy articles in supplier sync. Mark them as deleted.
2013-03-18 19:05:11 +01:00
Benjamin Meichsner
528295884e
Allow deleting of category, when there are only deleted articles left.
2013-03-17 20:13:11 +01:00
Benjamin Meichsner
931bb1d7ca
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
2013-03-17 20:03:18 +01:00
Benjamin Meichsner
6745b79bb9
Allow importing articles again, when article was deleted before.
2013-03-17 20:02:14 +01:00
bennibu
28343fc124
Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2
...
Prevent sold-out articles from being removed from stock order when editing
2013-03-17 11:50:56 -07:00
bennibu
033d3459a0
Merge pull request #98 from balkansalat/rails3-stock-taking-article-name
...
Prevent article name from being truncated in StockTaking form
2013-03-17 11:41:32 -07:00
bennibu
bd0c251313
Merge pull request #97 from balkansalat/rails3-stockit-increase
...
Fix stockit increase formula in javascript
2013-03-17 11:34:16 -07:00
Benjamin Meichsner
59de2e42a9
Fixed showing deleted articles when asking for available articles.
2013-03-17 18:36:34 +01:00
Benjamin Meichsner
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
Benjamin Meichsner
f7e885de7e
Fixed bug in fax template when there are missing supplier infos.
2013-03-17 18:10:48 +01:00
Benjamin Meichsner
3a9ec5a3dd
Fixed wiki site-map, when there is no homepage.
2013-03-17 17:57:35 +01:00
Benjamin Meichsner
707f989768
Fixed routes in redirect after direct_close of orders.
2013-03-17 17:50:50 +01:00
Benjamin Meichsner
329c451774
Fixed articles sync view.
2013-03-17 17:47:37 +01:00
Benjamin Meichsner
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
Benjamin Meichsner
9cc98b4662
Added some more eager loading for balancing view.
2013-03-17 15:12:14 +01:00
Benjamin Meichsner
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
Robert Waltemath
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
Julius
6aa0e0b736
Rename and comment new functions for fixing stock ordering
2013-03-15 08:50:55 +01:00
Julius
396e220369
Prevent article names from being truncated in StockTaking form
2013-03-14 22:30:22 +01:00
Julius
3208321319
Fix stockit increase formula for present behavior
2013-03-14 21:55:10 +01:00
Julius
8d0761a6c8
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
2013-03-14 21:14:42 +01:00
Benjamin Meichsner
8bafb3f4b2
Show supplier name for articles in stockit order.
2013-03-12 19:08:18 +01:00
Benjamin Meichsner
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
Benjamin Meichsner
c4376f35bf
Removed article from includes in as it does not work with acts_as_paranoid.
...
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62 .
Better we remove acts_as_paranoid and filter manually?
2013-03-12 12:50:56 +01:00
Benjamin Meichsner
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
Benjamin Meichsner
40d9195eac
Fixed broken group_orders after editing order.
...
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
2013-03-12 11:26:14 +01:00
Benjamin Meichsner
c18fb20115
Ensure to get also deleted entries in belongs_to assoc.
2013-03-10 19:39:59 +01:00
Benjamin Meichsner
b0e12d177e
Fixed editing an order and take care of group_orders.
2013-03-10 19:22:26 +01:00
Benjamin Meichsner
762d529894
Added info link for apple restriction feature.
2013-03-09 18:14:53 +01:00
Benjamin Meichsner
50873addf8
Fixed deleting of articles. Added missing id.
2013-03-09 16:46:33 +01:00
wvengen
19527f8425
fix some link handling in i18n (using html_safe)
2013-03-09 00:48:52 +01:00
wvengen
cb537bc11c
start articles i18n
2013-03-09 00:40:07 +01:00
wvengen
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +01:00
Robert Waltemath
63d8a3a1a6
Do not exclude ordered articles (with zero quantity) when editing orders.
2013-03-07 20:43:02 +01:00
Robert Waltemath
93a99c45d8
Revert "Do not subtract articles in open orders when calculating quantity."
...
This reverts commit 6bf3b241e6
.
2013-03-07 20:39:35 +01:00
Robert Waltemath
6bf3b241e6
Do not subtract articles in open orders when calculating quantity.
2013-03-06 14:19:06 +01:00
wvengen
c9b2d01fa5
i18n last merge
2013-03-06 01:24:57 +01:00
wvengen
2d382df1f1
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
wvengen
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
wvengen
d9949681a2
localize invite model
2013-02-27 11:59:03 +01:00
Julius
467b53c009
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete
2013-02-25 11:14:48 +01:00
Julius
0e1bd5c75e
Improve (AJAX) deletion of StockArticles
2013-02-25 11:12:28 +01:00
Benjamin Meichsner
2d1ae0ad97
Fixed bad syntax (from already dropped meta_where gem).
...
Thanks to wvengen, closed #91
Conflicts:
app/models/workgroup.rb
2013-02-25 10:51:01 +01:00
Benjamin Meichsner
3fb5c313ee
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
Conflicts:
app/models/ordergroup.rb
2013-02-25 10:49:55 +01:00
Julius
5dc3fc30ad
Revert 099e2b9b06
2013-02-25 10:29:47 +01:00
Julius
8f15cfb446
Revert 396a47b6af
2013-02-25 10:13:44 +01:00
Julius
ccf0d010b4
Apply AJAX for deleting a StockArticle
2013-02-25 10:02:21 +01:00
Benjamin Meichsner
6685012a3e
Fixed bad syntax (from already dropped meta_where gem).
...
Thanks to wvengen, closed #91
2013-02-24 23:56:56 +01:00
Benjamin Meichsner
82178161fa
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
...
Fixed #88
2013-02-24 23:26:16 +01:00
wvengen
569cdce2db
finish finance controller i18n
2013-02-22 00:44:39 +01:00
wvengen
8043fd2164
finish foodcoop i18n + controller + model
2013-02-22 00:19:22 +01:00
wvengen
c693f697ff
workgroups i18n
2013-02-13 01:34:58 +01:00
wvengen
02f04be6e8
finish stock_takings i18n + controller
2013-02-13 01:20:20 +01:00
wvengen
734179a2bd
clarify group_orders i18n
2013-02-12 00:06:23 +01:00
wvengen
cb2c724abd
fix typo
2013-02-11 23:37:52 +01:00
wvengen
20533a5163
fix orders i18n
2013-02-11 15:34:31 +01:00
wvengen
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
Manuel Wiedenmann
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
Manuel Wiedenmann
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
Manuel Wiedenmann
2d58054d1c
added order for interpolation
2013-02-10 15:05:31 +07:00
wvengen
22b3f3a491
fix bug in javascript i18n
2013-02-09 10:19:48 +01:00
wvengen
36b18bcfbd
finish messages i18n + controller + model
2013-02-09 10:18:52 +01:00
Manuel Wiedenmann
5941bbbf4f
i18n feedback + controller
2013-02-09 13:01:44 +07:00
Manuel Wiedenmann
6a564f0a25
admin controllers
2013-02-09 12:47:21 +07:00
wvengen
8d899581bd
finish group_orders i18n + controller
2013-02-09 02:01:31 +01:00
wvengen
28c66642f5
finish shared i18n
2013-02-08 19:16:06 +01:00
wvengen
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
wvengen
d818ea5d53
finish suppliers controller I18n
2013-02-08 00:31:09 +01:00
wvengen
eb1e02015e
finish suppliers i18n
2013-02-08 00:11:58 +01:00
wvengen
de730808e7
finish mailer i18n
2013-02-06 00:50:59 +01:00
wvengen
b12a906a74
finish login i18n + controller
2013-02-05 12:54:55 +01:00
wvengen
c5de69bfc5
typo
2013-02-05 12:30:44 +01:00
wvengen
39812bef99
finish layouts i18n, use help url from config, use html language from locale
2013-02-05 12:11:29 +01:00
wvengen
5b53749fe6
fix small format bug in template
2013-02-04 13:13:04 +01:00
wvengen
ecce8041a1
invites controller i18n
2013-02-04 13:01:06 +01:00
wvengen
034f6a8f5c
finish invites i18n
2013-02-04 12:59:04 +01:00
wvengen
9138f0da03
also internationalize home controller
2013-02-04 02:12:24 +01:00
wvengen
1860e1c4cc
also internationalize sessions controller
2013-02-04 02:00:27 +01:00
wvengen
0c09696b2c
finish sessions i18n
2013-02-04 01:46:07 +01:00
wvengen
2b11549d33
finished home i18n
2013-02-04 00:46:22 +01:00
Manuel Wiedenmann
64b3d7e17d
finished admin/users i18n + dry the admin i18n
2013-02-04 01:38:18 +07:00
Manuel Wiedenmann
75c9338fd9
finished admin/workgroups i18n
2013-02-04 00:36:03 +07:00
Manuel Wiedenmann
e949257912
finished admin/ordergroups i18n
2013-02-04 00:10:11 +07:00
Manuel Wiedenmann
42c97520a1
started with admin views
2013-02-03 23:16:42 +07:00
wvengen
e0b781fca6
split locales into directory, and load from there
2013-02-01 17:56:34 +01:00
Julius
a511da9ae3
Prevent stock_articles from appearing in supplier article index
2013-01-30 21:21:49 +01:00
Julius
2c9fdcd79e
Show customer number in fax pdf
2013-01-30 19:46:18 +01:00
Julius
8c7a4f0331
Fix empty dd in horizontal dl
2013-01-29 17:52:44 +01:00
Julius
396a47b6af
Improve stock_article_selections
2013-01-28 20:46:35 +01:00
Julius
524819b86f
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
...
Conflicts:
app/helpers/application_helper.rb
2013-01-27 22:01:53 +01:00
Benjamin Meichsner
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
Benjamin Meichsner
04b611a080
Temporairly deactivated helper in new delivery form.
2013-01-26 15:57:29 +01:00
Benjamin Meichsner
310a97912c
Fixed disabling submit_button in group order form.
2013-01-26 15:41:46 +01:00
Benjamin Meichsner
3ab3ff2bc4
Minor speed improvements for group order load.
2013-01-26 15:18:35 +01:00
Benjamin Meichsner
2a66d37c3a
Fixed wrong start balance in new group order.
2013-01-26 15:17:56 +01:00
Julius
ce0300df43
Fix order.created_by
2013-01-12 16:24:13 +01:00
Julius
099e2b9b06
Add stock_article_selection (deleting multiple stock articles at once)
2013-01-12 16:14:06 +01:00
benni
0364562273
Fixed return_to when authorization gets lost.
2012-12-30 16:34:01 +01:00
benni
f6ff422405
Fixed missing line breaks in haml email templates.
2012-12-30 16:24:36 +01:00
benni
349cadd5e9
Renabled mail delivering in invites and login contrller.
2012-12-30 16:11:35 +01:00
benni
28aec7e4d6
Replace ordergroup.account_updated with non database attr.
2012-12-30 15:31:37 +01:00
benni
a489079334
Fixed wrong request method in deny_access.
2012-12-30 15:13:50 +01:00
benni
ba75a6e328
Fixed accidently switching to english locale in production.
2012-12-29 17:48:14 +01:00
benni
cd583cc9b2
Set host infos for urls in emails via app_config.
2012-12-28 13:55:18 +01:00
benni
db07b28b1c
Fixed bug in accessing foodsoft config.
2012-12-28 13:28:03 +01:00
benni
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
benni
b9138efa79
Fixed floating error in group_order new.
2012-12-22 14:42:19 +01:00
benni
d954279d6a
Show accept/reject button in task show view.
2012-12-22 14:29:59 +01:00
benni
807d476e44
Fixed missing scoping by ordergroup in financial index.
2012-12-22 14:23:58 +01:00
benni
1298af8377
Small improvement for update price. Removed delayed job.
...
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
2012-12-16 21:46:24 +01:00
benni
0dff5ea784
Fixed some bugs in tasks, apple feature:
...
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
2012-12-16 19:07:45 +01:00
benni
9919183cb0
Fixed missing group_order_article in group_order show.
...
Also add eager loading for associated objects.
2012-12-16 16:50:09 +01:00
benni
0fcd5abb3a
Fixed strange RecordReadOnly exception in task done.
2012-12-16 14:13:54 +01:00
benni
cabcd201a6
Improvements for Ordergroup.avg_jobs_per_euro.
...
Tip #2 , Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
2012-12-16 13:56:47 +01:00
benni
b86172bc62
Performance improvements for ordergroup.update_stats!
...
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
2012-12-16 13:48:15 +01:00
benni
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
benni
d9681eaf30
Added validation for article_price. Avoid unit_quantity of 0.
2012-12-11 10:59:50 +01:00
benni
bae09624b7
Avoid deleting categories which still have articles.
2012-12-11 10:53:01 +01:00
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
ddcb4a9b2d
Moved acts_as_configurable to gemfile.
2012-11-24 16:49:19 +01:00
benni
7e6ac8c924
Moved acts_as_tree to gemfile.
2012-11-24 16:41:34 +01:00
benni
7fc0462fc4
Upgrade to rails 3.2.9. Moved acts_as_versioned to gem.
2012-11-24 16:36:40 +01:00
benni
7c9d666909
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
...
Conflicts:
Gemfile
2012-11-24 15:27:48 +01:00
benni
ecc31641aa
Changed header to copy old foodsoft style.
2012-11-24 15:23:12 +01:00
benni
e1cb866935
Remove html5 support for IE Browsers.
2012-11-24 13:53:19 +01:00
Robert Waltemath
1822b330d1
Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap
...
Conflicts:
Gemfile
2012-11-15 09:53:36 +01:00
Robert Waltemath
2bd52b9270
Corrected config hash index to ':mailing_list_subscribe'
2012-11-13 10:18:40 +01:00
Robert Waltemath
c032fdca6e
Merge remote-tracking branch 'upstream/master'
2012-11-13 08:55:50 +01:00
Julius
d086fe7cc7
Fix task validation again #16 ; mark assignment validation TODO
2012-11-12 21:31:04 +01:00
Julius
e561ddb064
Fix task validation #16
2012-11-12 20:14:06 +01:00
Julius
95efe554fc
Add another option for mailing list subscription tip
2012-11-12 18:08:47 +01:00
Julius
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
benni
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +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
181695d1bd
Small fixes for article_categories.
2012-11-10 16:51:30 +01:00
benni
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
benni
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
benni
8f7e21b918
Fixed stockit.
2012-10-29 18:28:17 +01:00
benni
27c719d8da
Fixed article categories.
2012-10-29 17:35:50 +01:00
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
31735f35ab
Reenabled sidebar..
2012-10-03 20:27:40 +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
971e80b505
Fixed foodsoft rake tasks.
2012-08-27 08:38:43 +02:00
benni
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
benni
2860a3ca44
Fixed authentication when User is deleted during session.
2012-08-24 15:20:58 +02:00
benni
8f8d866bb9
Moved notification about negative account balance to background.
2012-08-24 15:04:54 +02:00
benni
edadb7d8d1
Moved message delivering into background process.
2012-08-24 14:33:45 +02:00
benni
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +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
ef2ce98e46
Performance improvement for stockit view.
2012-07-31 17:37:32 +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
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
5b2df07378
Fixed ordering before filter.
2011-06-10 13:58:50 +02:00
benni
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
benni
9ad93e9c06
Catch exceptions when deleting ordegroups.
2011-06-10 13:33:10 +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
5bf6503a8f
Included new localize_input gem.
2011-05-20 00:19:58 +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
185376d53d
Some improved validations for task.
2011-05-14 16:34:10 +02:00
benni
8da229316c
Some improved validations for task.
2011-05-13 22:43:23 +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
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
benni
8db221ca5f
New validate_on/before syntax.
2011-05-11 11:17:02 +02:00
benni
2d7d0d3b94
Updated actionmailer classes and API.
2011-05-11 10:54:02 +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
46450cebef
New annotation, because of db switch to mysql.
...
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +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
benni
dcd2a514a6
Added duration to tasks. Annotated all models.
2011-05-07 20:50:39 +02:00
yep
383241621c
increased invite link lifetime from 2 days to 7 days.
2011-05-02 14:53:22 +02:00
benni
6c82d0e06a
Avoid setting page as parent id, which has current page as parent.
2011-03-09 13:36:02 +01:00
Benjamin Meichsner
80691c441b
Fixed bug on new delivery page.
2010-09-17 18:45:07 +02:00
Benjamin Meichsner
7742403bbe
Hide deleted stockarticles when creating new deliveries.
2010-07-24 20:28:37 +02:00
Benjamin Meichsner
f640c673de
Fixed bad when selecting same page as parent.
2010-07-08 10:57:42 +02:00
Benjamin Meichsner
5f51afb5ee
Fixed input control in balancing mode.
2010-07-01 16:12:02 +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
b71e809f34
Fixed ajax bug on categories page.
2010-05-28 12:01:19 +02:00
Benjamin Meichsner
a8a243b5fa
Avoid exception on blank comments.
2010-05-28 11:55:12 +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
d6ee00db17
Fixed hard coded links in wiki pages.
2010-03-22 03:11:32 +01:00
Benjamin Meichsner
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
Benjamin Meichsner
9a54d8504c
Secured users session, considering foodcoop token.
2010-03-22 01:38:23 +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
Benjamin Meichsner
9cb367463c
Merge branch 'master' into routing-filter
2010-03-20 13:45:27 +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
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
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +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
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +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
164653dbfc
Limited page versions number to 20.
2009-12-01 20:20:41 +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
Benjamin Meichsner
f34c307540
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-10-12 14:44:48 +02:00
Benjamin Meichsner
42d85c63be
Allow to have equal article and stockarticle.
...
* Modified validation to allow the same name.
2009-10-12 14:42:31 +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
65e41efc18
Fixed problems when deleting redirected pages.
2009-09-28 17:18:09 +02:00
Benjamin Meichsner
6eba04d30d
Better messages and redirect when a page is deleted.
2009-09-28 16:26:53 +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
aa341628a6
Fixed bug when ending the group membership on profile page.
2009-09-11 16:13:04 +02:00
Benjamin Meichsner
8a37a0e746
Fixed bug in comments partial on missing users.
2009-09-11 16:10:18 +02:00
Benjamin Meichsner
84a026a677
Fixed bug in new ordergroup stats feature.
2009-09-11 16:03:48 +02:00
Benjamin Meichsner
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +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
Benjamin Meichsner
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
Benjamin Meichsner
8276ff57f8
Fixed bug in messaging system.
2009-09-05 21:08:32 +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
fd97c1fc60
Made multi coop installation available as an option in app_config.yml.
2009-08-13 16:36:01 +02:00
Benjamin Meichsner
f4edfacd91
Fixed missing error message.
2009-08-13 16:09:06 +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
3b766af2a6
Fixed wikicloth bug "missing last row". (Better: implemented a workaround)
2009-08-12 18:47:33 +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
5e1fc73c29
Avoid creating of duplicate articles. (Tests on article.name) Closes #10
2009-08-12 12:33:07 +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
f0caabfb53
Check account balance after creating a transaction.
2009-08-04 13:13:46 +02:00
Benjamin Meichsner
116b1c4ed9
Fixed broken link on startpage for non ordergroup members.
2009-08-04 13:05:37 +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
709425855e
Added validation for unit_quantity and localization for article attributes.
2009-07-21 15:09:55 +02:00
Benjamin Meichsner
ecc1176020
Member search now includes the attribute 'nick'. Closes #18
2009-07-20 19:29:24 +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
eddf20b063
Added TOC (Table of contents) for wiki pages.
2009-06-11 17:59:21 +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