Patrick Gansterer
66e9629858
Fix balancing with financial_transaction_types
2018-06-11 15:54:18 +02:00
Patrick Gansterer
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
Patrick Gansterer
209ad615b4
Add view to sort orders by pickup day
2017-12-09 12:56:34 +01:00
Patrick Gansterer
dae4d075fe
Add UI to manage the financial transaction types and classes
2017-12-09 11:51:23 +01:00
Patrick Gansterer
924f346b4c
Show the financial transaction type if there are more than one type #367
2017-12-09 11:51:23 +01:00
Patrick Gansterer
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
Patrick Gansterer
47e4a9afdf
Show only 2 tasks of the same periodic_task_group at dashboard
2017-10-28 20:17:45 +02:00
Patrick Gansterer
ad96159336
Sort the task at dashboard by due_date
2017-10-28 20:17:45 +02:00
Patrick Gansterer
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
Patrick Gansterer
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
Patrick Gansterer
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
Patrick Gansterer
7d112516a1
Fix error code when opening an invalid group order
2017-10-12 01:28:26 +02:00
Patrick Gansterer
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
Patrick Gansterer
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +02:00
Patrick Gansterer
b4ce8c31cc
Use only the HTML format during rendering of error responses
2017-10-10 20:24:50 +02:00
Patrick Gansterer
8fe633fc42
Include nested objects in database queries of Finance::BaseController
2017-10-02 19:06:39 +02:00
Patrick Gansterer
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
Patrick Gansterer
01950b48a1
Add Discourse SSO to allow login into Discourse via Foodsoft
2017-10-01 00:48:05 +02:00
Patrick Gansterer
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
Patrick Gansterer
0edc780ec7
Add Discourse plugin
2017-09-22 13:58:00 +02:00
Patrick Gansterer
f8662c9184
Redirect to root_url of default_scope when no slug is given
2017-08-29 23:40:48 +02:00
Patrick Gansterer
329ac66cf1
Show only undeleted users in user select input fields (PR #486 )
2017-08-21 11:27:02 +02:00
Patrick Gansterer
c6297f2864
Sort workgroups of tasks by name
2017-08-20 01:08:47 +02:00
Patrick Gansterer
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
Patrick Gansterer
8ed87730a8
Fix listing of shared suppliers
2017-03-04 13:17:46 +01:00
wvengen
be287cf67e
Fix new stock article failing
2016-05-20 21:30:56 +02:00
Patrick Gansterer
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
wvengen
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer
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
wvengen
6a7b0ae409
Fix sync ignored article count
2016-04-16 21:15:53 +02:00
wvengen
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
Patrick Gansterer
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
4cae94eff9
Sort Task index
2016-03-04 17:14:43 +01:00
Patrick Gansterer
9ae7c05a89
Create next tasks directly after creating a periodic task
2016-03-04 17:13:16 +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
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +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
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
wvengen
b07e855235
Make compatible with Ruby 2.0
2015-06-05 15:35:19 +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
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
5d47171b76
Improve upload error handling
2015-04-17 18:44:38 +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
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
Patrick Gansterer
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
wvengen
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +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
2687da357a
Fix mailer warnings
2015-01-13 18:02:30 +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
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
wvengen
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +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
9a7b3378c3
Make invalid login message depend on use_nick (closes foodcoops#321)
2014-10-09 09:42:13 +02:00
Benjamin Meichsner
cc4e925c1a
Fixed ensure_open_order filter on missing id params.
2014-09-23 10:39:10 +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
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
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +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
647b7f0430
allow to synchronize all articles of a shared supplier
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
d906a7342f
workaround receive error with many articles
2014-09-02 12:35:57 +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
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
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
wvengen
64bb8e043d
enable/disable plugins by config option
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
48e9a3e4f5
add fax csv
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
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
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +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
3e79304c5a
typo
2014-01-27 14:58:39 +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