Patrick Gansterer
233ed415c7
Add "Copy" button for settled orders #383
2017-01-21 22:41:44 +01:00
wvengen
d06a9ed3f0
Fix dynamic select2 usage (oops!)
2016-08-12 15:54:28 +02:00
wvengen
326016dfb5
Fix tricky i18n error on html render (not js)
2016-08-09 20:38:55 +02:00
wvengen
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
wvengen
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
wvengen
dd799cf642
Allow to sort receive on unit
2015-04-22 20:08:24 +02:00
wvengen
bc1eb3bc44
Show receive button in grey when already received
2015-04-10 21:25:09 +02:00
wvengen
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
wvengen
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
Patrick Gansterer
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
wvengen
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
wvengen
27fe8a4d42
Merge pull request #347 from foodcoop1040/suppliers_with_articles
...
Show only suppliers with articles in the dropdown-menu for new orders
2015-02-18 23:42:37 +01:00
Patrick Gansterer
5b309d3d51
Show only suppliers with articles in the dropdown-menu for new orders
...
When there are many suppliers to be able to select them for invoices,
the menu for creating new orders gets unclear.
2015-02-18 22:35:38 +01:00
Patrick Gansterer
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
wvengen
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
wvengen
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
wvengen
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
wvengen
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
wvengen
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
wvengen
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
wvengen
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
wvengen
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
6e0489b25f
Merge pull request #257 from wvengen/feature-touchclick
...
Better workaround for touch devices
2014-02-03 06:33:27 -08:00
wvengen
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
wvengen
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
wvengen
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
wvengen
1129cf4094
include comments link
2014-01-17 14:32:12 +01:00
wvengen
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
wvengen
42d622d1b2
cleanup orders and add search
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
wvengen
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
wvengen
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
wvengen
0b4cfde1b2
put footer below body, now that is allowed in html5
2014-01-09 14:47:05 +01:00
wvengen
dcb17e04b5
do not show article hint in order view after all, since "old price" is
...
actually the price of the current article, which will probably be
different in the future
2014-01-09 13:24:40 +01:00
wvengen
bea2706005
fix receive dynamic update (complements 90c81de872)
2014-01-09 13:19:27 +01:00
wvengen
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
wvengen
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
wvengen
5a7c9b817c
fix receive js for document updates [ci skip]
2014-01-09 10:14:05 +01:00
wvengen
65e79d7e1b
small receive usability changes
2014-01-08 19:28:39 +01:00
wvengen
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
Julius
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
Julius
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
Julius
8479678530
Improve unlock button for receiving OrderArticles manually adjusted
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-04 20:51:42 +01:00
wvengen
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
wvengen
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
