Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1650 commits 22 branches 1 tag 31 MiB
Commit graph

1093 commits

Author SHA1 Message Date
wvengen
d9c61b2db3 allow to match category names on import/sync 2014-09-02 12:58:31 +02:00
wvengen
16b78ba2a0 fix shared import paging without query 2014-09-02 12:58:31 +02:00
wvengen
d906a7342f workaround receive error with many articles 2014-09-02 12:35:57 +02:00
wvengen
63d52db91b more sensible mailer option defaults 
Conflicts:
	app/mailers/base_mailer.rb
	config/app_config.yml.SAMPLE
	spec/app_config.yml
 2014-09-02 12:35:57 +02:00
wvengen
ecf5601023 make missing_units get correct details for closed orders 2014-09-01 12:25:42 +02:00
wvengen
0b08d461fa remove html escaping from all text mails 2014-09-01 11:08:32 +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
d8f4ac47dd handle ajax errors (closes foodcoops#300) 2014-07-02 13:55:05 +02:00
wvengen
fa725dbf38 fix csv download also when searching 2014-07-02 09:37:03 +02:00
wvengen
c80a9cd68b fix csv download (closes foodcoop-adam#129) 2014-07-01 11:14:35 +02:00
wvengen
59ab628e2f fix layout bug 2014-06-23 17:51:20 +02:00
wvengen
873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen
6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen
b112028935 fix invititation form 
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
 2014-06-23 17:51:19 +02:00
wvengen
4b6231129c only show undeleted articles in receive screen 2014-06-23 17:51:19 +02:00
wvengen
9e58a6f2b1 fix csv download + template optional parameters 
Conflicts:
	app/views/finance/financial_transactions/_transactions.html.haml
	app/views/home/ordergroup.html.haml
	app/views/login/_accept_invitation_form.html.haml
 2014-06-23 17:51:19 +02:00
wvengen
a43020463d normalize article and category attributes (closes foodcoops#294) 2014-06-23 17:51:19 +02:00
wvengen
7c2ecd8658 add some model api docs 2014-06-23 17:51:19 +02:00
wvengen
2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen
fee0cfbdc7 make orders helpers clearer 2014-06-23 17:51:19 +02:00
wvengen
e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen
2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00
wvengen
86a5576dc3 fix delete order confirmation 2014-06-23 17:51:18 +02:00
wvengen
c64a7ba3cd validate date and time inputs 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
ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen
b5b4ccd922 make data-submit-onchange work with datepicker 2014-06-23 17:51:17 +02:00
wvengen
7b51f7aabe fix negative balance email 2014-05-30 10:22:47 +02:00
wvengen
71a922a034 use locale in mails 
Conflicts:
	app/workers/supplier_notifier.rb
	app/workers/user_notifier.rb
 2014-05-13 17:01:28 +02:00
wvengen
5d9c9856d1 show proper error when all articles are deselected in order edit 2014-05-13 17:01:27 +02:00
wvengen
4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen
3a41e9530f fix order bug 2014-05-13 17:01:27 +02:00
wvengen
3953c21ae2 use capture instead of layout-hack to allow deface overrides 2014-05-13 17:01:27 +02:00
wvengen
64bb8e043d enable/disable plugins by config option 2014-05-13 17:01:26 +02:00
wvengen
852f3484ad make settle directly less dangerous 
(closes foodcoops#275)
 2014-05-13 17:01:26 +02:00
wvengen
ea8e4ee560 add pdf configuration options 2014-05-13 17:01:26 +02:00
wvengen
25854f2de7 do not store GroupOrderArticles with zero quantity and tolerance 2014-05-13 17:01:26 +02:00
Robert Waltemath
7556c753d0 Extract message system to plugin. 2014-05-13 17:01:25 +02:00
wvengen
fe0b17cdb0 cleanup email footer 2014-05-13 17:01:25 +02:00
wvengen
c25d4d3f4f use ruby-units for unit parsing (closes foodcoops/foodsoft#200) 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-05-13 17:01:25 +02:00
wvengen
48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02:00
wvengen
3f032e5dd9 make apple points optional 
a next step would be to move this to a plugin
 2014-05-13 17:01:25 +02:00
wvengen
f71b78665e allow 500 items per page 2014-05-13 17:01:24 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen
0014435663 improved shared database import ui 2014-05-13 17:01:24 +02:00
wvengen
950480941a expanded data-ignore-onchange support 2014-05-13 17:01:24 +02:00
wvengen
8853b3efdb fix sort order 2014-03-08 17:15:09 +01:00
wvengen
d9326dd984 allow plugins to override login redirection when authentication failed 2014-02-25 10:18:14 +01:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
wvengen
f8fca4d630 fix order article add + test 2014-02-24 11:37:06 +01:00
wvengen
8fba40eba6 fix submit-onchange 2014-02-19 11:41:10 +01:00
wvengen
a4dca6ae11 show more info in add article dialog 2014-02-15 00:18:49 +01:00
wvengen
2c85618284 fix balancing and matrix since receive 2014-02-13 16:06:45 +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
f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen
2de4a2a3a0 Merge pull request #256 from wvengen/feature-partial_shared_sync 
Small change to allow non-shared articles with shared suppliers
 2014-02-07 11:24:33 +01:00
wvengen
c322545f85 fix i18n buglet 2014-02-06 10:15:20 +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
4bfd7fa6f8 fix database sync when value is nil 2014-02-03 15:32:53 +01:00
wvengen
84e02b795c proper history line 2014-01-31 17:53:10 +01:00
wvengen
5e7925366d allow to view stock orders too 2014-01-31 13:12:29 +01:00
wvengen
5aef8e445e add html units history line 2014-01-31 13:08:20 +01:00
wvengen
3e79304c5a typo 2014-01-27 14:58:39 +01:00
wvengen
7ebb2459e0 make click work better on touch devices (closes foodcoops#104) 2014-01-25 15:19:50 +01:00
wvengen
23ee2ef0fb Revert "make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)" 
This reverts commit add4afd172.

Conflicts:
	app/assets/javascripts/application.js
 2014-01-25 15:15:42 +01:00
wvengen
d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +01:00
wvengen
49e563af89 allow non-shared articles to be part of a shared supplier using a blank order number 2014-01-24 22:10:00 +01:00
wvengen
8db516c5f0 Merge branch 'master' into feature-cleaner_order_details 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2014-01-20 13:36:46 +01:00
wvengen
9308096e96 Merge pull request #252 from wvengen/feature-fix_redirect_with_suburi 
fix root redirect when using suburi
 2014-01-20 03:13:25 -08:00
wvengen
6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update' 
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
 2014-01-20 12:12:00 +01:00
wvengen
8b4c292ea0 Merge pull request #222 from wvengen/feature-receive 
New receive screen
 2014-01-20 03:02:27 -08: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
151f851799 do not require authentication for root redirect 2014-01-15 16:33:13 +01:00
wvengen
ecb2f2a015 fix root redirect when using suburi 2014-01-15 15:43:29 +01:00
wvengen
bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen
b2f032ac8e fix bootstrap menu on mobile [ci skip] 2014-01-13 14:45:48 +01:00
wvengen
f0b65bd738 Merge pull request #247 from wvengen/feature-center_rows_vertically 
Center table rows vertically
 2014-01-13 03:22:20 -08:00
wvengen
8760d87a76 fix receive notice 2014-01-13 11:48:43 +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
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
bdb9499535 fix broken update password flow 2014-01-08 14:09:28 +01:00
wvengen
0e8e93204a Merge pull request #240 from foodcoop-rostock/fix-order-article-helper-undeleted 
Offer _undeleted_ StockArticles for new OrderArticle only
 2014-01-08 04:42:55 -08: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
wvengen
dcc3d21b4d center table rows vertically [ci skip] 2014-01-08 10:32:30 +01:00
Julius
563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00