209ad615b4
Add view to sort orders by pickup day
2017-12-09 12:56:34 +01:00
dae4d075fe
Add UI to manage the financial transaction types and classes
2017-12-09 11:51:23 +01:00
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
b05ac2ab64
Add deleted_at for User
...
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
7bc9d0ede6
Upgrade to rails 4.2
2015-01-02 17:43:44 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
b961037fff
Fixed broken login#update_password route.
2014-10-05 20:35:28 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
9308096e96
Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi
...
fix root redirect when using suburi
2014-01-20 03:13:25 -08:00
151f851799
do not require authentication for root redirect
2014-01-15 16:33:13 +01:00
ecb2f2a015
fix root redirect when using suburi
2014-01-15 15:43:29 +01:00
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
bdb9499535
fix broken update password flow
2014-01-08 14:09:28 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
bceabfec5c
Apply publish/subscribe pattern to stock_article manipulation in delivery form
2013-12-07 16:42:25 +01:00
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
70c12b7c1f
move wiki functionality to plugin
2013-10-29 22:42:06 +01:00
fef8c6d99f
Move StockArticle#history to StockArticle#show
2013-10-03 22:24:21 +02:00
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
730dc7cf2a
Move StockChanges#index to StockArticles#history
2013-07-13 09:32:27 +02:00
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
4a208c83c0
Separate actions for new StockArticle
2013-07-07 14:14:32 +02:00
dd70b84ef0
Linearize and clean up delivery form
2013-06-26 15:16:52 +02:00
65f61e09d5
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
2013-06-13 23:36:22 +02:00
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
c2c1961bd0
adds i18n support to routes and application controller; default_locale is set to :en
2013-05-31 18:42:28 +02:00
13e921a632
Fixed some errors in articles#sync. Show better error messages.
2013-04-08 01:00:49 +02:00
915e1b9e79
Fixed bug in reset password error handling.
2013-03-27 22:12:46 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
Patrick Gansterer
wvengen
Benjamin Meichsner
Robert Waltemath
wvengen
Julius
Manuel Wiedenmann
Benjamin Meichsner