Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,537 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

712 Commits

Author SHA1 Message Date
wvengen 19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +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 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 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 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 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 ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen 7b51f7aabe fix negative balance email 2014-05-30 10:22:47 +02:00
wvengen 5d9c9856d1 show proper error when all articles are deselected in order edit 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 852f3484ad make settle directly less dangerous 
(closes foodcoops#275)
 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 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 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 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 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 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 d08f120b27 show message when ignoring articles due to missing order number 2014-01-24 22:20:29 +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 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 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