4c567fece1
Add transport costs to Order
2020-08-07 00:52:43 +02:00
5eb8abf431
Potential fix for one of the issues mentioned in #49
...
Reduces the number of SQL queries used on group_orders/index and
group_orders/archive, but adds extra complexity to the code
2020-07-29 13:15:11 +02:00
739914ad43
Show only started orders to members for ordering
2020-03-23 16:25:54 +01:00
4b1e9a6f53
improve usability when ordering (PR #552 )
...
also show box with links to currently open orders after the order has been saved
2018-10-11 22:15:00 +02:00
72b5a5ca82
Add option to show account balance instead of available funds
...
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
9d7735849d
Disable relevant ordering buttons in boxfill phase
2015-11-13 18:10:46 +01:00
945a9e4d4a
Use bootstrap buttons for ordering
2015-11-13 18:10:46 +01:00
75967bad22
Add color marking to items in group orders that have missing items
2015-05-04 06:16:14 +02:00
507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
935fdedd66
hide row when information not present
2013-11-24 02:16:15 +01:00
e5471b9f73
more i18n cleanup
2013-11-24 01:47:34 +01:00
652a392b37
simplify i18n and fix some small ui issues
2013-11-23 17:49:43 +01:00
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
a535fbc517
allow large product lists in member order
2013-11-05 10:55:28 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
34a4951e28
Merge branch 'master' into i18n
...
Conflicts:
Gemfile
config/locales/de.yml
config/locales/en.yml
2013-10-09 23:57:43 +02:00
3a948e9b73
Move list.js extensions to plugins
2013-10-04 18:28:45 +02:00
64a597c689
use i18n-js
2013-10-04 15:01:10 +02:00
a87ced2646
Hide article category if no article matches the search
2013-09-24 21:21:08 +02:00
9f083dd4d0
Add button to clear article search (list.js customization)
2013-09-23 21:31:54 +02:00
3c8f56b24f
Add dismiss button to sidebars in group_order form (idea stolen from foodcoops#143)
2013-09-22 22:07:34 +02:00
6ec81ace18
Always show article category headers (do not unlist them on list.js search)
2013-09-22 22:04:29 +02:00
891293af84
Add delay to list.js search
2013-09-22 21:50:59 +02:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
14d4d2f12d
Add list.js for filtering articles (another try for foodcoops#143)
2013-09-18 23:28:18 +02:00
33d3b9c466
merge branch minimum_balance into master ( closes #133 )
2013-07-10 22:03:57 +02:00
c31e864c73
internationalise currency in order screen
2013-06-26 01:17:04 +02:00
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
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
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
8bafb3f4b2
Show supplier name for articles in stockit order.
2013-03-12 19:08:18 +01:00
734179a2bd
clarify group_orders i18n
2013-02-12 00:06:23 +01:00
8d899581bd
finish group_orders i18n + controller
2013-02-09 02:01:31 +01:00
2a66d37c3a
Fixed wrong start balance in new group order.
2013-01-26 15:17:56 +01:00
b9138efa79
Fixed floating error in group_order new.
2012-12-22 14:42:19 +01:00
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
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
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
Patrick Gansterer
Florian Lentsch
Martin Ortbauer
wvengen
Alexander Kirk
Julius
Benjamin Meichsner