Commit graph

939 commits

Author SHA1 Message Date
wvengen
56bd527a8b keep white input background with package class [ci skip] 2014-01-09 10:51:54 +01:00
wvengen
5a7c9b817c fix receive js for document updates [ci skip] 2014-01-09 10:14:05 +01:00
wvengen
b331d9a2a9 better css responsiveness [ci skip] 2014-01-08 19:58:51 +01:00
wvengen
65e79d7e1b small receive usability changes 2014-01-08 19:28:39 +01:00
wvengen
d1c3c83ed7 use plural in table headings by default 2014-01-08 18:23:34 +01:00
wvengen
ce17bf33e0 complete and improve receive i18n 2014-01-08 13:39:49 +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
Julius
a8e604c196 When receiving: hide OrderArticle unit fields also after failed validation 2014-01-04 20:46:50 +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
133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
wvengen
1a5dc3ebe4 consider group_order_article without result not manually changed 2014-01-03 13:03:28 +01:00
wvengen
438de97464 fix non-closed order display 2014-01-03 13:00:14 +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
0af8a065a1 Fix calculation of OrderArticle.total_price and .total_gross_price 2014-01-03 10:33:31 +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
dd138da1a6 Change comment according to 9d61e2e61569159489098eda1bd6c30d7322ce76 2014-01-02 19:17:51 +01:00
Julius
8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius
a384532619 Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b 2014-01-02 19:17:41 +01:00
Julius
033aa90698 Use OrderArticle#create in receive form instead of Order#add_article 2014-01-02 19:16:09 +01:00
Julius
59c118a171 Apply publish/subscribe for OrderArticle#create 2014-01-02 19:16:03 +01:00
Julius
5349ee142e Offer _undeleted_ StockArticles for new OrderArticle only 2014-01-02 19:14:50 +01:00
Julius
01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +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
Julius
81dfe8110c Apply publish/subscribe for OrderArticle#update 2014-01-02 19:14:07 +01:00
wvengen
27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
Julius
b22677eced Change order link from invoice form to avoid access problems 2013-12-30 11:26:10 +01:00
wvengen
4f80fd0e8c Merge pull request #231 from wvengen/feature-autocomplete-fixes-2
fix user form field order and autocompletion
2013-12-30 02:03:48 -08:00
wvengen
19f583381d Merge pull request #232 from wvengen/feature-remove_unused_redirect_to
Security improvements
2013-12-30 01:46:28 -08:00
wvengen
f5bd7a43e4 update balancing order article edit screen to support received units 2013-12-23 15:25:45 +01:00
wvengen
03bb83ecc0 show different warning signs for mismatch with ordered and received 2013-12-23 12:35:09 +01:00
wvengen
5d8f71f834 move javascript a little 2013-12-23 11:51:38 +01:00
wvengen
45ad8e6524 move helper to new module 2013-12-23 11:48:17 +01:00
Julius
ed228c4bd7 Allow control of password autocomplete by flag 2013-12-22 23:21:14 +01:00
wvengen
d071c5bba8 fix user search 2013-12-22 23:21:02 +01:00
Julius
53e611c1c0 Allow browser to store new password after change 2013-12-22 18:26:28 +01:00
wvengen
7ef6832ab3 fix invite authentication 2013-12-22 14:20:25 +01:00
wvengen
cee96915f9 remove unused redirect_to functionality 2013-12-22 13:59:16 +01:00