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
|
b30b424540
|
Merge branch 'master' into feature-receive
Conflicts:
app/helpers/finance/order_articles_helper.rb
|
2014-01-09 18:42:29 +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
|
bdb9499535
|
fix broken update password flow
|
2014-01-08 14:09:28 +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 |
|
wvengen
|
69a29b8296
|
Merge pull request #245 from fsmanuel/rss_feed + 1
|
2014-01-06 13:55:32 +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 |
|
Manuel Wiedenmann
|
0d0ff90a64
|
adds an RSS feed for pages/all
|
2014-01-04 20:12:01 +01:00 |
|
wvengen
|
b800da9b9b
|
use helper in ajax update too
|
2014-01-03 14:52:44 +01:00 |
|
wvengen
|
436ebc0190
|
Merge pull request #234 from foodcoop-adam/article-dialog
introduce new layout in balancing article screen as well
|
2014-01-03 05:16:03 -08: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
|
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
|
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
|
699be6a6d9
|
introduce new layout in balancing article screen as well
|
2013-12-23 16:11:14 +01: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 |
|
Julius
|
ed228c4bd7
|
Allow control of password autocomplete by flag
|
2013-12-22 23:21:14 +01:00 |
|
Julius
|
53e611c1c0
|
Allow browser to store new password after change
|
2013-12-22 18:26:28 +01:00 |
|