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 |
|
wvengen
|
9219d099c8
|
ui update for packages display
|
2014-01-03 12:42:36 +01:00 |
|
wvengen
|
4c9e84ecc6
|
change layout of receive unlock
|
2014-01-03 12:40:43 +01:00 |
|
wvengen
|
014a62aa11
|
use disabled property for input and fix style
|
2014-01-03 10:59:42 +01:00 |
|
wvengen
|
f1ae2724c6
|
fix unit quantity display after ajax update
|
2014-01-03 10:45:15 +01:00 |
|
wvengen
|
5ead0fb441
|
show correct price
|
2014-01-03 10:44:57 +01:00 |
|
Julius
|
f230d39055
|
Merge price columns in receive form into one
Conflicts:
app/views/orders/_edit_amount.html.haml
|
2014-01-03 10:36:57 +01:00 |
|
Julius
|
2ec3d38238
|
Set readonly property with javascript by .prop instead of .attr
|
2014-01-03 10:33:23 +01:00 |
|
wvengen
|
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 |
|
wvengen
|
a439f26b67
|
ui design update
|
2014-01-02 22:30:04 +01:00 |
|
Julius
|
8e52fca304
|
Do not set quantity of newly created OrderArticles to 1
|
2014-01-02 19:17:46 +01:00 |
|
Julius
|
033aa90698
|
Use OrderArticle#create in receive form instead of Order#add_article
|
2014-01-02 19:16:09 +01:00 |
|
Julius
|
baa5f16cfc
|
Free order_article resource from finance namespace; also unlock for role_orders
|
2014-01-02 19:14:41 +01:00 |
|
Julius
|
9ed906f425
|
Correct haml comment from '#' to '-#'
|
2014-01-02 19:14:37 +01:00 |
|
Julius
|
cf1e68f11d
|
Allow to edit OrderArticle in Order#receive form
|
2014-01-02 19:14:33 +01:00 |
|
wvengen
|
41ea9ed66e
|
hide receive screen for stock orders
|
2013-12-21 17:36:25 +01:00 |
|
wvengen
|
aa6041d337
|
show all articles in receive screen (not just of this order)
|
2013-12-21 17:33:06 +01:00 |
|
wvengen
|
bb331f99a7
|
fix units_to_order display [ci skip]
|
2013-12-19 00:45:39 +01:00 |
|
wvengen
|
68c4affb02
|
better disabled button
|
2013-12-18 22:22:34 +01:00 |
|
wvengen
|
7f813f2c0f
|
fix order add_article
|
2013-12-18 22:16:19 +01:00 |
|
wvengen
|
84fe791078
|
update balancing screen
|
2013-12-18 22:10:38 +01:00 |
|
wvengen
|
873a1ff108
|
update texts
|
2013-12-18 21:58:15 +01:00 |
|
wvengen
|
4fede30a19
|
hide invoice columns until implemented
|
2013-12-18 21:53:31 +01:00 |
|
wvengen
|
82d1c41e9f
|
update show order
|
2013-12-18 21:46:34 +01:00 |
|
wvengen
|
d299fa4870
|
move receive screen to orders
|
2013-12-18 21:08:58 +01:00 |
|