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
6a0147d2e7
Improve article header consistency
2015-11-18 22:44:38 +01:00
dcf921dc8d
Improve delta-input styling
2015-11-18 22:44:38 +01:00
90b21ecc3a
Allow increasing just tolerance in the boxfill phase
2015-11-13 18:10:46 +01:00
9d7735849d
Disable relevant ordering buttons in boxfill phase
2015-11-13 18:10:46 +01:00
adb6089773
Disable +/- buttons on boundaries in ordering
2015-11-13 18:10:46 +01:00
945a9e4d4a
Use bootstrap buttons for ordering
2015-11-13 18:10:46 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
c1413ff817
Allow clearing default order schedule
2015-10-23 14:53:01 +02:00
4a9cf862be
Merge pull request #373 from foodcoops/feature/current-orders-plugin
...
Add current_orders plugin
2015-08-07 19:36:05 +02:00
cb000a0438
Fix current_order PDFs and update article/group PDFs too
2015-07-21 00:13:15 +02:00
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
58df186a2a
Make sharedlists optional (and disabled by default)
2015-07-20 22:33:28 +02:00
b07e855235
Make compatible with Ruby 2.0
2015-06-05 15:35:19 +02:00
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
d9b3064c2e
fix missing units calculation, change missing-none background color
2015-05-19 17:58:29 +02:00
1a62ce55e3
Fix task form
2015-05-08 20:54:48 +02:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a00e7c94be
Rework user-interface for editing recurring tasks
2015-05-08 17:39:20 +02:00
75967bad22
Add color marking to items in group orders that have missing items
2015-05-04 06:16:14 +02:00
a8a434ef7b
Move due date according to delta
2015-05-01 21:31:06 +02:00
fd51b07e21
Allow editing recurring task groups, basic functionality for #152
2015-05-01 21:14:16 +02:00
aa7a2a31ae
Bundle update & restructure tests (RSpec 3)
2015-04-25 17:14:37 +02:00
dd799cf642
Allow to sort receive on unit
2015-04-22 20:08:24 +02:00
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
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
5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +02:00
c08c29b0e7
Don't show deleted ordergroups ( closes foodcoops/foodsoft#362 )
2015-04-17 18:27:50 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
d5a7f6a074
Move file import logic to model
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
08c8d25a9d
New message form and checkbox papercuts
2015-04-11 02:32:30 +02:00
f47e0b5b2a
Give a bit more space to token inputs
2015-04-11 02:18:55 +02:00
379dc86ffa
Make order_pdf more generally useful
2015-04-10 21:30:04 +02:00
bc1eb3bc44
Show receive button in grey when already received
2015-04-10 21:25:09 +02:00
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
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
497488ef0e
Improve associations
2015-04-10 18:30:12 +02:00
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
c59ee3a6a7
Show wikipage on login screen when present
2015-02-28 14:50:25 +01:00
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
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
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
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
65c7673a41
Allow updating profile without ordergroup
2015-01-16 20:25:58 +01:00
65dee49cdb
Fixed broken eager loading in orders#edit.
2015-01-16 15:57:11 +01:00
7e0aa66936
Use more boolean comparators where it makes sense
2015-01-14 22:56:32 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
2687da357a
Fix mailer warnings
2015-01-13 18:02:30 +01:00
d1ece157c6
Get rid of last empty page in PDFs
2015-01-03 00:24:33 +01:00
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
f340b127dc
Fix fast test failing
2015-01-02 18:08:38 +01:00
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
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
12bf2198e5
fix simple_form deprecations
2014-12-10 22:04:32 +01:00
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
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
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
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
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
0e1cde9e2b
more extensive database seeds (in two languages) (closes foodcoops#277)
2014-09-29 17:26:27 +02:00
cc4e925c1a
Fixed ensure_open_order filter on missing id params.
2014-09-23 10:39:10 +02:00
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
71324ce5db
be more robust showing config list
2014-09-22 09:38:23 +02:00
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +02:00
0231df9d5b
Delete memberships when deleting associated groups.
2014-09-21 12:47:58 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
cf360335ee
fix articles with zero quantity showing
...
complements 8913ad615c
2014-09-11 13:47:03 +02:00
ee1874a15f
fix upload error
2014-09-10 14:42:44 +02:00
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
0f7dc37015
fix config value override
...
Conflicts:
app/helpers/admin/configs_helper.rb
2014-09-02 15:02:25 +02:00
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
6115979bae
allow protected keys to be set/unset + config_db tests
2014-09-02 14:21:32 +02:00
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
429e111db4
hide protected keys from config
2014-09-02 14:21:32 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
b5ddbcae21
make custom css more robust
2014-09-02 14:15:59 +02:00
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
wvengen
wvengen
Alexander Kirk
Robert
Patrick Gansterer
Benjamin Meichsner
wvengen