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

1262 commits

Author SHA1 Message Date
Patrick Gansterer
8ed87730a8 Fix listing of shared suppliers 2017-03-04 13:17:46 +01:00
Patrick Gansterer
e0dbd396e1 Hide break in shared group template if empty 2017-02-03 20:30:28 +01:00
Patrick Gansterer
1056b86f9d Make sure that newly created periodic task are not done 2017-01-26 20:54:53 +01:00
wvengen
2072fbb4d5 Allow plugins to override some document prices 2017-01-21 22:44:11 +01:00
Patrick Gansterer
c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
Patrick Gansterer
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
Patrick Gansterer
233ed415c7 Add "Copy" button for settled orders #383 2017-01-21 22:41:44 +01:00
wvengen
36706511c0 Be a bit more safe displaying stock ordergroup 2016-08-12 15:56:45 +02:00
wvengen
d06a9ed3f0 Fix dynamic select2 usage (oops!) 2016-08-12 15:54:28 +02:00
wvengen
326016dfb5 Fix tricky i18n error on html render (not js) 2016-08-09 20:38:55 +02:00
wvengen
b9bdd04311 Fix current_order's ordergroups document preloading 2016-06-09 19:14:53 +02:00
wvengen
78604ae09f Fix order document preloading 2016-06-09 19:14:53 +02:00
wvengen
70c79137cf Fix order_articles document preloading 2016-06-09 19:14:53 +02:00
wvengen
020b75cac8 Fix group_orders document preloading 2016-06-09 19:14:52 +02:00
wvengen
f08d131842 Fix Heroku deployment 2016-05-25 02:05:55 +02:00
wvengen
be287cf67e Fix new stock article failing 2016-05-20 21:30:56 +02:00
wvengen
961c50b7e5 Hide delete attachment button when none present 2016-05-06 15:57:15 +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
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
wvengen
2e2efec5e7 Get rid of coffeescript. 2016-04-25 20:34:30 +02:00
wvengen
6a7b0ae409 Fix sync ignored article count 2016-04-16 21:15:53 +02:00
Patrick Gansterer
5c56ae6775 Add missing changes for the stock order 2016-03-11 22:52:49 +01:00
wvengen
42eb6c8509 Make ordergroup break fields a bit nicer 2016-03-11 13:56:02 +01:00
wvengen
b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break 
Add break to ordergroup
 2016-03-11 13:48:57 +01: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
b8010fedca Add ordergroup_name to GroupOrder 2016-03-11 13:36:49 +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
wvengen
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
Patrick Gansterer
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
wvengen
14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups 
Add messagegroups
 2016-03-07 22:36:37 +01:00
wvengen
d358278333 Merge pull request #416 from foodcoop1040/invite_config 
Add config option to disable the invites
 2016-03-07 19:47:00 +01:00
wvengen
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
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm 
Get rid of duplicated confirm_delete translations
 2016-03-07 19:44:06 +01:00
Patrick Gansterer
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
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
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
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
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
wvengen
f5b6fbcf18 Merge pull request #408 from foodcoop1040/count_to_any 
Replace "count > 0" with "any?"
 2016-03-04 21:37:21 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
wvengen
97f81d9826 Merge pull request #406 from foodcoop1040/delete_user 
Add deleted_at for User
 2016-03-04 19:12:04 +01:00
Patrick Gansterer
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
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
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
Patrick Gansterer
b30b4e46d8 Order items in select boxes 2016-03-04 18:28:00 +01:00
Patrick Gansterer
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
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
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
wvengen
d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
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