ea2862fdef
Run rubocop --fix-layout and remove encoding comments
2021-03-02 09:12:19 +01:00
e1d50e5b9c
API v1 group_order_articles endpoints
2021-02-17 17:07:39 +01:00
44a198c7bc
Adopt Rails 5 belongs_to_required_by_default
2020-09-05 14:40:11 +02:00
4c567fece1
Add transport costs to Order
2020-08-07 00:52:43 +02:00
17059a8104
Adopt model to reference GroupOrder in generated FinancialTransaction
2020-03-17 09:38:44 +01:00
d925533366
Fix rendering of stock order in OrderByGroups
2019-02-05 23:31:45 +01:00
abe847c0ee
Add and inherit from ApplicationRecord to match Rails 5.0 style
2019-01-15 04:40:05 +01:00
9d588f70cc
Fix group_order for stock order
2017-10-29 20:44:05 +01: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
36706511c0
Be a bit more safe displaying stock ordergroup
2016-08-12 15:56:45 +02:00
020b75cac8
Fix group_orders document preloading
2016-06-09 19:14:52 +02:00
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
b11706f30a
sort ordergroups in order screen and pdfs
2013-09-17 00:25:38 +02:00
befe89d4ef
fix tolerance display in group_order form
2013-06-26 01:36:44 +02:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
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
c18fb20115
Ensure to get also deleted entries in belongs_to assoc.
2013-03-10 19:39:59 +01:00
3ab3ff2bc4
Minor speed improvements for group order load.
2013-01-26 15:18:35 +01:00
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
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
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
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
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
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
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
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
1791243b25
Fixed bug when distuingish between finished and closed orders.
2009-03-13 00:06:20 +01:00
37c9e2aeaf
Fixed wrong price value of GroupOrder when finishing an order.
2009-03-11 16:34:36 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
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
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
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
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
Patrick Gansterer
wvengen
Benjamin Meichsner
Benjamin Meichsner
sandoz