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

1454 commits

Author SHA1 Message Date
wvengen
4cacb740d1 Small improvement in invoice edit 2016-03-04 16:14:54 +01:00
Patrick Gansterer
1315103a7d Add role_invoices 
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
 2016-03-04 16:06:02 +01:00
Patrick Gansterer
273969ac90 Change sort order of ordergroups to ascending 
Since we sort usually sort list ascending it seams strange to do this
different for ordergroups. So align the sort order with the other lists.
 2016-03-04 15:59:35 +01:00
Patrick Gansterer
460cf1e82c Change relationship of invoices #390 
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
 2016-03-04 15:55:39 +01:00
Patrick Gansterer
53b51f0f5c Remove useless upper bound of 99 items #388 2016-02-24 00:39:57 +01:00
Patrick Gansterer
a97eee68b1 Make date clickable in finance overview #392 2016-02-24 00:39:50 +01:00
Patrick Gansterer
a42dd07d5c Make invoice date clickable #391 2016-02-24 00:39:34 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills 
Add optional boxfill phase to orders (+ bootstrap buttons)
 2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
dcf921dc8d Improve delta-input styling 2015-11-18 22:44:38 +01:00
wvengen
90b21ecc3a Allow increasing just tolerance in the boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
adb6089773 Disable +/- buttons on boundaries in ordering 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen
4a9cf862be Merge pull request #373 from foodcoops/feature/current-orders-plugin 
Add current_orders plugin
 2015-08-07 19:36:05 +02:00
wvengen
cb000a0438 Fix current_order PDFs and update article/group PDFs too 2015-07-21 00:13:15 +02:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
58df186a2a Make sharedlists optional (and disabled by default) 2015-07-20 22:33:28 +02:00
wvengen
b07e855235 Make compatible with Ruby 2.0 2015-06-05 15:35:19 +02:00
wvengen
6ded06a8ce Merge pull request #365 from akirk/master 
Add color marking to items in group orders that have missing items
 2015-06-04 10:02:09 +02:00
Alexander Kirk
d9b3064c2e fix missing units calculation, change missing-none background color 2015-05-19 17:58:29 +02:00
wvengen
1a62ce55e3 Fix task form 2015-05-08 20:54:48 +02:00
wvengen
ec03d579d0 Merge branch 'feature/edit-recurring-task' 
Conflicts:
	config/locales/en.yml
 2015-05-08 20:10:23 +02:00
wvengen
a00e7c94be Rework user-interface for editing recurring tasks 2015-05-08 17:39:20 +02:00
Alexander Kirk
75967bad22 Add color marking to items in group orders that have missing items 2015-05-04 06:16:14 +02:00
Robert
a8a434ef7b Move due date according to delta 2015-05-01 21:31:06 +02:00
Robert
fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen
aa7a2a31ae Bundle update & restructure tests (RSpec 3) 2015-04-25 17:14:37 +02:00
wvengen
dd799cf642 Allow to sort receive on unit 2015-04-22 20:08:24 +02:00
wvengen
17cbc57850 Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197) 2015-04-17 20:09:40 +02:00
wvengen
b028431bf0 Merge pull request #361 from foodcoops/feature/spreadsheets 
Let upload provide same functionality as shared database sync
 2015-04-17 19:18:44 +02:00
wvengen
5d47171b76 Improve upload error handling 2015-04-17 18:44:38 +02:00
wvengen
c08c29b0e7 Don't show deleted ordergroups (closes foodcoops/foodsoft#362) 2015-04-17 18:27:50 +02:00
wvengen
c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen
4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen
6ce1b7f928 Handle errors in upload and sync form 2015-04-11 02:52:57 +02:00
wvengen
d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen
0d92007274 Improve upload form 2015-04-11 02:52:57 +02:00
wvengen
16e9210035 Fix title of new upload screen 2015-04-11 02:52:57 +02:00
wvengen
07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen
08c8d25a9d New message form and checkbox papercuts 2015-04-11 02:32:30 +02:00
wvengen
f47e0b5b2a Give a bit more space to token inputs 2015-04-11 02:18:55 +02:00
wvengen
379dc86ffa Make order_pdf more generally useful 2015-04-10 21:30:04 +02:00
wvengen
bc1eb3bc44 Show receive button in grey when already received 2015-04-10 21:25:09 +02:00
wvengen
507651f5ba Move small close button to helper. 
Workaround for show order deface override nuking attributes of the close button.
 2015-04-10 18:58:51 +02:00
wvengen
4239843b3e Merge foodcoop1040:order_message into master 
Conflicts:
	plugins/messages/app/models/message.rb
 2015-04-10 18:30:54 +02:00
wvengen
497488ef0e Improve associations 2015-04-10 18:30:12 +02:00
wvengen
de794a48b0 Reorder roles and add icons 2015-04-04 10:56:42 +02:00
Patrick Gansterer
700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
wvengen
c59ee3a6a7 Show wikipage on login screen when present 2015-02-28 14:50:25 +01:00
wvengen
1447b38bb3 Use foodsoft expansion variables in footer 2015-02-28 14:50:25 +01:00
Patrick Gansterer
124f77f2ab Add messaging to order (closes #327) 2015-02-19 00:53:57 +01:00
wvengen
1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
wvengen
27fe8a4d42 Merge pull request #347 from foodcoop1040/suppliers_with_articles 
Show only suppliers with articles in the dropdown-menu for new orders
 2015-02-18 23:42:37 +01:00
Patrick Gansterer
5b309d3d51 Show only suppliers with articles in the dropdown-menu for new orders 
When there are many suppliers to be able to select them for invoices,
the menu for creating new orders gets unclear.
 2015-02-18 22:35:38 +01:00
Patrick Gansterer
e57fd500fc Add possibility to copy an order 
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
 2015-02-18 22:09:37 +01:00
wvengen
65c7673a41 Allow updating profile without ordergroup 2015-01-16 20:25:58 +01:00
Benjamin Meichsner
65dee49cdb Fixed broken eager loading in orders#edit. 2015-01-16 15:57:11 +01:00
wvengen
7e0aa66936 Use more boolean comparators where it makes sense 2015-01-14 22:56:32 +01:00
wvengen
118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen
2687da357a Fix mailer warnings 2015-01-13 18:02:30 +01:00
wvengen
d1ece157c6 Get rid of last empty page in PDFs 2015-01-03 00:24:33 +01:00
wvengen
1b9b81fa75 Make sync work when unit has no name 
(closes foodcoops#337)

Conflicts:
	app/models/article.rb
 2015-01-02 23:20:36 +01:00
wvengen
f340b127dc Fix fast test failing 2015-01-02 18:08:38 +01:00
wvengen
1c0db4374f Merge pull request #332 from foodcoops/feature/edit-address 
Allow to edit address from user profile
 2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen
86eee94249 Add hint for ordergroup address in user form 2014-12-16 20:53:38 +01:00
wvengen
12bf2198e5 fix simple_form deprecations 2014-12-10 22:04:32 +01:00
wvengen
56f6efa590 Allow to edit address from user profile 2014-12-10 21:27:53 +01:00
wvengen
cee2ac8f9f Merge pull request #331 from foodcoops/feature/configure-upfront-tasks 
Configure upfront tasks
 2014-12-06 14:35:22 +01:00
wvengen
5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +01:00
wvengen
f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9 Allow to specify an order schedule for new orders. 2014-11-23 00:38:13 +01:00
wvengen
6e990fed4c Upgrade to rails 4.1 2014-11-21 14:37:56 +01:00
wvengen
6188567931 hide message preferences when messages are disabled 2014-11-20 23:11:04 +01:00
wvengen
68d54e7e25 add sudo functionality 2014-10-18 17:58:31 +02:00
wvengen
7826d2f674 move login and logout to separate methods 
Conflicts:
	app/controllers/sessions_controller.rb

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
 2014-10-18 17:57:07 +02:00
wvengen
c585f53f54 Merge pull request #315 from wvengen/feature/db_seeds 
more extensive database seeds (in two languages)
 2014-10-16 20:43:11 +02:00
wvengen
9e7b2321cd Merge pull request #316 from wvengen/feature/disable_config_validation 
disable config validation (closes foodcoops#313)
 2014-10-09 09:45:53 +02:00
wvengen
9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen
a594dffed2 disable config validation (closes foodcoops#313) 2014-09-30 15:09:47 +02:00
wvengen
0e1cde9e2b more extensive database seeds (in two languages) (closes foodcoops#277) 2014-09-29 17:26:27 +02:00
Benjamin Meichsner
cc4e925c1a Fixed ensure_open_order filter on missing id params. 2014-09-23 10:39:10 +02:00
Benjamin Meichsner
91bcf0c580 Avoid out of range error when using big numbers in financial transactions. 
The database schema allows numbers up (+/-) 999_999.99. But as we are also adding the amount to the Ordergroup#account_balance, we use lower barriers to avoid running in errors when updating the account balance.

So, technically the user has to make 10 times the maximum input to raise an account balance error. This should be sufficient, I hope.
 2014-09-22 11:36:10 +02:00
wvengen
71324ce5db be more robust showing config list 2014-09-22 09:38:23 +02:00
wvengen
668ba1e5d6 add webstats_tracking_code to configuration screen (closes foodcoops#311) 2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077 Allow adding tracking code for webstatistics service. E.g. piwik. 2014-09-22 09:15:47 +02:00
Benjamin Meichsner
0231df9d5b Delete memberships when deleting associated groups. 2014-09-21 12:47:58 +02:00
wvengen
418a8b5806 fix i18n issues + localeapp roundtrip 
thanks, i18n-tasks!
 2014-09-15 13:52:35 +02:00
wvengen
cf360335ee fix articles with zero quantity showing 
complements 8913ad615c
 2014-09-11 13:47:03 +02:00
wvengen
ee1874a15f fix upload error 2014-09-10 14:42:44 +02:00
wvengen
f18cc367ae workaround for CVE-2014-4920 2014-09-10 13:27:45 +02:00
wvengen
a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +02:00
wvengen
1a3b690757 add custom css to config screen 2014-09-02 15:02:26 +02:00
wvengen
cf680d3410 add page break to config screen 2014-09-02 15:02:26 +02:00
wvengen
0f7dc37015 fix config value override 
Conflicts:
	app/helpers/admin/configs_helper.rb
 2014-09-02 15:02:25 +02:00
wvengen
68ccc19c70 allow to configure currency (closes foodcoops#258) 2014-09-02 15:02:25 +02:00
wvengen
3fee071a10 specify timezone in configuration (closes foodcoops#282) 2014-09-02 14:21:33 +02:00
wvengen
6115979bae allow protected keys to be set/unset + config_db tests 2014-09-02 14:21:32 +02:00
wvengen
9beaac2627 allow to specify (un)checked values for config boolean 
Conflicts:
	app/helpers/admin/configs_helper.rb
 2014-09-02 14:21:32 +02:00
wvengen
429e111db4 hide protected keys from config 2014-09-02 14:21:32 +02:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen
b5ddbcae21 make custom css more robust 2014-09-02 14:15:59 +02:00
wvengen
97dc090e4d Merge pull request #306 from wvengen/feature-styling 
allow foodcoops to add custom css
 2014-09-02 13:59:18 +02:00
wvengen
19630e8607 allow foodcoops to add custom css 2014-09-02 13:35:45 +02:00
wvengen
8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen
647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen
3918e22214 synchronize price on two decimal places only 2014-09-02 12:58:31 +02:00
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
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
dc92de771e Comment on ArticlePrices without Article association 2014-01-04 21:39:11 +01:00
Julius
f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Julius
3c88f572a4 When updating OrderArticle: save ArticlePrice association 2014-01-04 21:22:57 +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
Robert Waltemath
a0f55ba812 Clear return_to URL in session when signing out. 2014-01-03 19:42:08 +01:00
wvengen
933f4fe67a Merge pull request #243 from foodcoop-rostock/fix-access-denied-cycle 
Redirect to home page on denied access (fixes #237).
 2014-01-03 06:59:43 -08:00
Robert Waltemath
2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +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
133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
Robert Waltemath
03f61668aa Redirect to home page on denied access (fixes #237). 2014-01-03 13:51:00 +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
3819fa012e Offer _undeleted_ StockArticles for new OrderArticle only 2013-12-31 12:35:30 +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
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
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
wvengen
3e1d561a5e fix user form field order and autocompletion 2013-12-22 13:28:33 +01:00
wvengen
df9cff0eee Do not escape mailing list wiki link in the message form (foodcoops#227) 2013-12-22 01:59:33 +01:00
wvengen
537ac52f4e Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint 
Do not escape mailing list links in message form
 2013-12-21 16:14:20 -08:00
Julius
3099e740ca Do not escape mailing list links in message form 2013-12-21 22:52:39 +01:00
wvengen
a28c6031a4 fix receive exception when input is set to nil 2013-12-21 17:39:20 +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
54e98474b1 remove unused helper [ci skip] 2013-12-18 22:35:01 +01:00
wvengen
68c4affb02 better disabled button 2013-12-18 22:22:34 +01:00
wvengen
3d511ea2fb only show receive in finance when access to ordering 2013-12-18 22:19:36 +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
wvengen
94b4454a1b add receive to order screen, and distinguish between finished and closed orders to put it in nicely 2013-12-18 19:21:39 +01:00
wvengen
1ab09b41bd fix articles_for_select2 helper 2013-12-18 17:34:45 +01:00
wvengen
2b511ee559 Merge branch 'master' into fresh-flow 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-18 17:03:26 +01:00
wvengen
a0c6cf8afe fix warning without text 2013-12-18 16:04:30 +01:00
wvengen
94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup 
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
 2013-12-17 15:58:47 +01:00
wvengen
b26b124b0c Merge pull request #211 from foodcoop-adam/group_order-cleanup 
make order result calculation a bit cleaner
 2013-12-17 06:29:15 -08:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog 
Edit article user-interface update
 2013-12-17 06:29:04 -08:00
wvengen
5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch 
Publish/subscribe pattern for DOM updates after AJAX database manipulation
 2013-12-17 06:28:25 -08:00
wvengen
452db61af8 i18n fix (thanks @JuliusR) 2013-12-14 23:52:59 +01:00
Julius
9b92d6ff10 Mark two i18n issues 2013-12-14 14:48:58 +01:00
wvengen
142e8a0473 i18n fixes 2013-12-14 13:34:58 +01:00
wvengen
4e54388b83 Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup 2013-12-14 13:20:03 +01:00
wvengen
46ab4dcc01 proper i18n of last ordergroup order (thanks @JuliusR) 2013-12-14 13:15:47 +01:00
wvengen
d67a0083f1 fix price hint escaping (thanks @JuliusR) 2013-12-14 13:15:16 +01:00
Julius
40e9e82295 Mark two i18n issues 2013-12-14 10:03:32 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen
b53cb36714 give proper block to link_to_ordering (closes #201) 2013-12-11 22:58:50 +01:00
wvengen
e25570d870 Merge remote-tracking branch 'tg-x/master' 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-12-11 22:39:37 +01:00
wvengen
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
675f0e6d16 fix workgroup link task list 2013-12-10 19:12:29 +01:00
wvengen
e42e27957d improve task i18n (affects foodcoops#137) 2013-12-10 17:58:32 +01:00
wvengen
da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
wvengen
58de1a231b update price during editing as well 2013-12-10 13:30:15 +01:00
Julius
30b35cdd11 Improve usability of supplier selection for stock_articles in delivery form 2013-12-09 00:03:07 +01:00
Julius
cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
Julius
012327dd7c Slightly cleanup delivery form 2013-12-07 16:57:53 +01:00
Julius
bceabfec5c Apply publish/subscribe pattern to stock_article manipulation in delivery form 2013-12-07 16:42:25 +01:00
Julius Rapp
11117738ce Resolve merge conflicts 2013-12-07 11:50:37 +01:00
Julius Rapp
dd08e277c7 AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates 2013-12-07 11:20:44 +01:00
wvengen
112fa3be23 fix forgotten i18n string (affects foodcoops#137) 2013-12-06 23:08:28 +01:00
wvengen
111c061efa more i18n cleanup (affects foodcoops#137) 2013-12-06 22:53:59 +01:00
wvengen
a475a27f79 i18n cleanup (affects foodcoops#137) 2013-12-06 22:43:36 +01:00
Julius Rapp
e99752e483 disable escape of html from local (one place) 2013-12-06 18:33:35 +01:00
wvengen
62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen
2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen
c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen
923b579bd1 Merge branch 'master' into article-dialog 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
 2013-12-06 14:26:50 +01:00
wvengen
3937400683 fix modal dialog margin [ci skip] 2013-12-06 14:26:04 +01:00
wvengen
1c4b9591a2 fix edit article dialog title 2013-12-06 12:34:14 +01:00
wvengen
05b934e79f update fc price dynamically in article edit form 2013-12-06 12:19:13 +01:00
wvengen
b1e81dc1d7 make simple_form see that first_name is required 2013-12-03 22:04:22 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
2d99141229 only allow to add articles not already present in receive 2013-11-26 13:31:07 +01:00
wvengen
beabe22a01 simplify model 2013-11-26 13:22:44 +01:00
wvengen
9cb9bf6c1a focus newly added input in receive 2013-11-26 13:00:34 +01:00
wvengen
853e8ba9d2 add package images [ci skip] 2013-11-25 15:25:13 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +01:00
wvengen
9c340ec08e more clarity whether a number is number units or boxes 2013-11-25 15:13:54 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00
wvengen
1f08ee4759 Merge remote-tracking branch 'foodcoops/master' into feature-link_to_group_order 
Conflicts:
	app/views/shared/_open_orders.html.haml
 2013-11-25 10:11:56 +01:00
wvengen
810656a53b small link_to_ordering refactoring 2013-11-25 10:04:44 +01:00
wvengen
9a0100e382 Merge pull request #207 from sjmulder/bug/130 
Remove apple-touch-icon link
 2013-11-25 00:39:52 -08:00
wvengen
935fdedd66 hide row when information not present 2013-11-24 02:16:15 +01:00
wvengen
20bd86fe65 make heading_helper work with empty _short translation 2013-11-24 01:59:44 +01:00
wvengen
e5471b9f73 more i18n cleanup 2013-11-24 01:47:34 +01:00
wvengen
652a392b37 simplify i18n and fix some small ui issues 2013-11-23 17:49:43 +01:00
wvengen
135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00
wvengen
ed9a6cca39 make result calculation a bit cleaner 2013-11-22 23:40:44 +01:00
wvengen
84191ddcd0 first shot on improving edit article form 
(see also foodcoops#209)
 2013-11-20 23:46:11 +01:00
Sijmen Mulder
630aa383cb Remove apple-touch-icon links 
Safari will fall back to request the default touch icons if the href of the
link 404s, so having them point at nothing generates 4 404s for nothing.
 2013-11-19 22:57:55 +01:00
wvengen
66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen
9b47e5d6c4 use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values 2013-11-18 11:31:30 +01:00
wvengen
588898d7b0 do not error when calling shared_article on non-shared article 2013-11-13 23:20:48 +01:00
tg(x)
de9453fa24 dashboard: link to view order page 2013-11-13 16:42:32 +01:00
wvengen
a5a29aff5c Merge pull request #195 from foodcoop-adam/grouporder-many-products 
Allow large product lists in member order
 2013-11-12 08:41:48 -08:00
wvengen
bb5a67033d Merge pull request #194 from foodcoop-adam/plugin-move 
Better support for plugins (engines) + move wiki to plugin
 2013-11-12 03:46:15 -08:00
wvengen
768796407f Merge pull request #192 from foodcoop-adam/cleanup-stale 
Cleanup unused views&controllers
 2013-11-11 09:05:19 -08:00