47d9c79617
Use ActiveJob instead of Resque directly
...
This allows us to directly pass entities to the job.
2021-03-08 12:30:58 +01:00
4b7cbf111f
Fix small issues after 401c8f5 and 67ad202
2021-03-05 14:14:56 +01:00
ea2862fdef
Run rubocop --fix-layout and remove encoding comments
2021-03-02 09:12:19 +01:00
9a7d4bf07d
Add option to send mails when an order has been received
2021-02-27 17:24:25 +01:00
085562dbf4
#779 Received state for orders (PR #789 , #779 )
2021-02-03 20:57:53 +01:00
67ad202859
Fix permission issue in pickups (PR #800 , #799 )
2021-01-30 11:21:00 +01:00
44a198c7bc
Adopt Rails 5 belongs_to_required_by_default
2020-09-05 14:40:11 +02:00
266e9337be
Various small rails 5 adoptions
2020-09-04 12:54:42 +02:00
d73c206e29
Fix copy operation for stock orders
...
Stock orders have the supplier_id set to zero, which will be ignored
in the url-method by rails. Only use the order_id to fix this.
2020-03-23 17:20:21 +01:00
2100c738af
Change deprecated *_filter methods to *_action
2019-10-29 09:41:01 +01:00
5dab748fe3
Move sending of PDF into new ActiveSupport::Concern
2019-02-02 12:30:42 +01:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +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
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
65dee49cdb
Fixed broken eager loading in orders#edit.
2015-01-16 15:57:11 +01:00
7e0aa66936
Use more boolean comparators where it makes sense
2015-01-14 22:56:32 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
d906a7342f
workaround receive error with many articles
2014-09-02 12:35:57 +02:00
e61c3c9267
order articles by number then name in fax+receive
...
This makes it easier to enter the receive screen from an order pdf print
with received amounts.
Conflicts:
app/documents/order_fax.rb
2014-08-19 09:19:01 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
8853b3efdb
fix sort order
2014-03-08 17:15:09 +01: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
3e79304c5a
typo
2014-01-27 14:58:39 +01:00
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
8760d87a76
fix receive notice
2014-01-13 11:48:43 +01:00
ce17bf33e0
complete and improve receive i18n
2014-01-08 13:39:49 +01:00
98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +01:00
a28c6031a4
fix receive exception when input is set to nil
2013-12-21 17:39:20 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
94b4454a1b
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
2013-12-18 19:21:39 +01:00
de948d7692
fix and cleanup routing (closes foodcoops#190)
2013-10-30 02:27:04 +01:00
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
762292ef8e
small i18n move
2013-10-09 22:29:19 +02:00
28644dc334
Force update in Order#finish; rescue if error raised
2013-10-08 19:58:11 +02:00
70542c1ad7
update en translation
2013-04-12 01:30:02 +02:00
24d04b25db
fix some small i18n errors
2013-04-04 00:56:45 +02:00
e06524ca37
finish ordergroups and orders i18n + controller
2013-02-08 01:52:20 +01:00
8b2b70f8bf
Fixed saving user for new orders.
2013-01-26 16:24:45 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
Patrick Gansterer
lentschi
wvengen
Benjamin Meichsner
Julius
Benjamin Meichsner