e4b1280952
User clearer syntax for setting values when not already set
2017-10-02 16:08:16 +02:00
287cce2e92
Make "via Foodsoft" in mail From-header translateable
2017-10-02 16:08:16 +02:00
578e929e0d
Add handling for bounce mails
2017-10-02 16:02:39 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
01950b48a1
Add Discourse SSO to allow login into Discourse via Foodsoft
2017-10-01 00:48:05 +02:00
2264351cf5
Remove code duplication for catching errors when sending mails
2017-09-30 12:20:17 +02:00
d93aa23d1c
Avoid disclosure of internal hostname via Message-ID header of mails
...
Use the host of default_url_options for generating that header instead.
2017-09-30 12:14:16 +02:00
add281c738
Remove email from subject of feedback mail
...
The mail address of the user sending the feedback is now set in the
Reply-To header of the mail already.
2017-09-30 12:14:16 +02:00
c71b91a32f
Allow User objects in From mail field and set Reply-To if not set already
2017-09-30 12:14:16 +02:00
b5c9634315
Allow User objects in Bcc, Cc Reply-To, Sencer and To mail fields
2017-09-30 12:14:16 +02:00
04bf994c9a
Override the mail method of Mailer to automatically add the foodcoop name
2017-09-30 12:14:16 +02:00
96a01daa34
Set the X-Auto-Response-Suppress header for all outgoing mails
...
Since Foodsoft can not forward any auto responses to the relevant users
it makes sense to tell MTAs to avoid them at all.
2017-09-30 12:14:15 +02:00
639a99fcfb
Match the From for mails with the implementation in the messages plugin
2017-09-30 12:14:15 +02:00
0785eb2f22
Do not set :sender and :errors_to when sending mails
...
:sender matches :from in all relevant cases, while :errors_to is an
invalid (and very very outdated) option.
2017-09-30 12:14:15 +02:00
43c1833cd7
Set ActionMailer configuration in FoodsoftConfig
2017-09-30 12:14:15 +02:00
7bb5e74e0c
Fix mailer/not_enough_users_assigned view
2017-09-30 12:07:47 +02:00
ba052efe5e
Set the path of the _foodsoft_session cookie to the slug
...
This allows the usage of different foodcoops at the same time.
2017-09-29 00:47:00 +02:00
ac00942f34
Fix list of invoices when an invoice has an invalid created_by user
2017-09-26 13:13:20 +02:00
52dc7b1387
Raise a RoutingError for unknown foodcoop in multi_coop_installs
...
This gives the correct error code for request to files in the root
folder (e.g. /apple-touch-icon.png), which do not exist.
2017-09-25 10:16:03 +02:00
0edc780ec7
Add Discourse plugin
2017-09-22 13:58:00 +02:00
f8662c9184
Redirect to root_url of default_scope when no slug is given
2017-08-29 23:40:48 +02:00
329ac66cf1
Show only undeleted users in user select input fields (PR #486 )
2017-08-21 11:27:02 +02:00
8798b886db
Fix mailing of order_result (PR #493 )
2017-08-21 11:17:54 +02:00
c6297f2864
Sort workgroups of tasks by name
2017-08-20 01:08:47 +02:00
6a110ca429
Show the Help link only when a help_url is set
2017-08-20 01:07:48 +02:00
c312bd5ebd
Fall back to default_scope if an invalid foodcoop is provided
...
Before this change foodsoft redirect to the last active foodcoop, when
an invalid foodcoop is provided. After this change the default_scope
will be used all the time to avoid data disclosure.
2017-07-08 00:09:42 +02:00
4713539a09
Fix order by groups document after 020b75c
...
Use a OUTER JOIN instead of a INNER JOIN to include also the stock order
which does not have an entry in the groups table.
2017-06-28 13:53:38 +02:00
8ed87730a8
Fix listing of shared suppliers
2017-03-04 13:17:46 +01:00
e0dbd396e1
Hide break in shared group template if empty
2017-02-03 20:30:28 +01:00
1056b86f9d
Make sure that newly created periodic task are not done
2017-01-26 20:54:53 +01:00
2072fbb4d5
Allow plugins to override some document prices
2017-01-21 22:44:11 +01:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
925727d3ae
Show button for creating invoices also at finished orders
...
Check if a order is not opened instead of checking if it is closed.
2017-01-21 22:42:16 +01:00
233ed415c7
Add "Copy" button for settled orders #383
2017-01-21 22:41:44 +01:00
36706511c0
Be a bit more safe displaying stock ordergroup
2016-08-12 15:56:45 +02:00
d06a9ed3f0
Fix dynamic select2 usage (oops!)
2016-08-12 15:54:28 +02:00
326016dfb5
Fix tricky i18n error on html render (not js)
2016-08-09 20:38:55 +02:00
b9bdd04311
Fix current_order's ordergroups document preloading
2016-06-09 19:14:53 +02:00
78604ae09f
Fix order document preloading
2016-06-09 19:14:53 +02:00
70c79137cf
Fix order_articles document preloading
2016-06-09 19:14:53 +02:00
020b75cac8
Fix group_orders document preloading
2016-06-09 19:14:52 +02:00
f08d131842
Fix Heroku deployment
2016-05-25 02:05:55 +02:00
be287cf67e
Fix new stock article failing
2016-05-20 21:30:56 +02:00
961c50b7e5
Hide delete attachment button when none present
2016-05-06 15:57:15 +02:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
86d8e90c06
Merge pull request #424 from foodcoop1040/stock_order_fixes
...
Add missing changes for the stock order
2016-04-29 15:06:58 +02:00
2e2efec5e7
Get rid of coffeescript.
2016-04-25 20:34:30 +02:00
6a7b0ae409
Fix sync ignored article count
2016-04-16 21:15:53 +02:00
5c56ae6775
Add missing changes for the stock order
2016-03-11 22:52:49 +01:00
42eb6c8509
Make ordergroup break fields a bit nicer
2016-03-11 13:56:02 +01:00
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
b56df39623
Merge pull request #417 from foodcoop1040/deliveries_col
...
Hide deliveries column if there are no deliveries
2016-03-11 11:53:40 +01:00
253512eb51
Add break to ordergroup
...
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
7d7dfd7155
Hide deliveries column if there are no deliveries
...
For foodcoops which do not use the delivery feature the column occupies
space in the table, which could be user better with something else.
2016-03-06 14:01:24 +01:00
e16a0fb336
Add config option to disable the invites
...
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
a5d0c5ccab
Add a button to add all ordergroups to a new finanacial transaction collection
...
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
2016-03-06 11:53:31 +01:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
5e744453f8
Add more infos to the invoice page
...
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
f5b6fbcf18
Merge pull request #408 from foodcoop1040/count_to_any
...
Replace "count > 0" with "any?"
2016-03-04 21:37:21 +01:00
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +01:00
1efd3745df
Replace "count > 0" with "any?"
2016-03-04 20:01:56 +01:00
97f81d9826
Merge pull request #406 from foodcoop1040/delete_user
...
Add deleted_at for User
2016-03-04 19:12:04 +01:00
b623b6abbf
Remove useless if in invoices form
...
The created_at field has a value all the time, so the check if it is set
make no sense since it evaluates to true all the time.
2016-03-04 19:06:05 +01:00
b05ac2ab64
Add deleted_at for User
...
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
01cf6431a9
Add messagegroup
...
Messagegroups are a new kind of group. Every user can join and leave such a
group on her own. They are useful to create topics for mails.
E.g. if there is a weekly newsletter we can create a new messagegroup for
it and every user which is interested in receiving the newsletter can join
the corresponding group.
2016-03-04 18:32:57 +01:00
b30b4e46d8
Order items in select boxes
2016-03-04 18:28:00 +01:00
72ef31c0ec
Make unassigned tasks more prominent in the dashboard
...
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
4cae94eff9
Sort Task index
2016-03-04 17:14:43 +01:00
9ae7c05a89
Create next tasks directly after creating a periodic task
2016-03-04 17:13:16 +01:00
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
36dd19f324
Require due_date for periodic tasks
2016-03-04 17:11:47 +01:00
d383288f4f
Add missing class="btn" to edit button of invoice
...
This aligns the interface with all other pages.
2016-03-04 17:04:00 +01:00
8ac1471a89
Add message threads #394
...
This new view sorts the messages by threads based on the reply_to.
Now we store only the message which started a new thread in the reply_to
field to avoid recursive queries.
2016-03-04 16:52:34 +01:00
d56828fa4d
Show last user activity in admin ordergroups too
2016-03-04 16:28:22 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
4cacb740d1
Small improvement in invoice edit
2016-03-04 16:14:54 +01:00
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
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
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
53b51f0f5c
Remove useless upper bound of 99 items #388
2016-02-24 00:39:57 +01:00
a97eee68b1
Make date clickable in finance overview #392
2016-02-24 00:39:50 +01:00
a42dd07d5c
Make invoice date clickable #391
2016-02-24 00:39:34 +01:00
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
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
8473f16091
query performance improvements
2014-09-02 12:58:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
3918e22214
synchronize price on two decimal places only
2014-09-02 12:58:31 +02:00
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
d906a7342f
workaround receive error with many articles
2014-09-02 12:35:57 +02:00
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
ecf5601023
make missing_units get correct details for closed orders
2014-09-01 12:25:42 +02:00
0b08d461fa
remove html escaping from all text mails
2014-09-01 11:08:32 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
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
d8f4ac47dd
handle ajax errors (closes foodcoops#300)
2014-07-02 13:55:05 +02:00
fa725dbf38
fix csv download also when searching
2014-07-02 09:37:03 +02:00
c80a9cd68b
fix csv download (closes foodcoop-adam#129)
2014-07-01 11:14:35 +02:00
59ab628e2f
fix layout bug
2014-06-23 17:51:20 +02:00
873e8d44a2
harmonize foodsoft capitalisation
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
b112028935
fix invititation form
...
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
2014-06-23 17:51:19 +02:00
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
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
a43020463d
normalize article and category attributes (closes foodcoops#294)
2014-06-23 17:51:19 +02:00
7c2ecd8658
add some model api docs
2014-06-23 17:51:19 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02:00
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
2a6e0e0460
fix asset url in css (unbreaks heroku image 404)
2014-06-23 17:51:18 +02:00
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +02:00
c64a7ba3cd
validate date and time inputs
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
b5b4ccd922
make data-submit-onchange work with datepicker
2014-06-23 17:51:17 +02:00
7b51f7aabe
fix negative balance email
2014-05-30 10:22:47 +02:00
71a922a034
use locale in mails
...
Conflicts:
app/workers/supplier_notifier.rb
app/workers/user_notifier.rb
2014-05-13 17:01:28 +02:00
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
4c1e5e2b00
fix default textarea height
2014-05-13 17:01:27 +02:00
3a41e9530f
fix order bug
2014-05-13 17:01:27 +02:00
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +02:00
64bb8e043d
enable/disable plugins by config option
2014-05-13 17:01:26 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
ea8e4ee560
add pdf configuration options
2014-05-13 17:01:26 +02:00
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
c25d4d3f4f
use ruby-units for unit parsing ( closes foodcoops/foodsoft#200 )
...
Conflicts:
Gemfile
Gemfile.lock
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
f71b78665e
allow 500 items per page
2014-05-13 17:01:24 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
0014435663
improved shared database import ui
2014-05-13 17:01:24 +02:00
950480941a
expanded data-ignore-onchange support
2014-05-13 17:01:24 +02:00
8853b3efdb
fix sort order
2014-03-08 17:15:09 +01:00
d9326dd984
allow plugins to override login redirection when authentication failed
2014-02-25 10:18:14 +01:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
8fba40eba6
fix submit-onchange
2014-02-19 11:41:10 +01:00
a4dca6ae11
show more info in add article dialog
2014-02-15 00:18:49 +01:00
2c85618284
fix balancing and matrix since receive
2014-02-13 16:06:45 +01:00
Patrick Gansterer
wvengen
wvengen
Alexander Kirk
Robert
Benjamin Meichsner
wvengen