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

145 commits

Author SHA1 Message Date
viehlieb
eba84b2e15 add modal to choose column order for custom csv file 2023-02-14 16:51:22 +01:00
Patrick Gansterer
aad4fbd5b6 Add option to set all received items to zero 
When an order could not be delivered, this option makes it easy to
set all amounts to zero with only one click.
 2021-02-12 15:07:21 +01:00
Patrick Gansterer
979439f967 Hide stock order button in stock orders 2021-02-08 01:04:46 +01:00
lentschi
67ad202859
Fix permission issue in pickups (PR #800, #799) 2021-01-30 11:21:00 +01:00
Patrick Gansterer
2557645f4f Rails 5.0 2020-09-05 14:40:11 +02:00
Patrick Gansterer
0aa853c53d Add information text to the receive view 2020-06-22 16:35:22 +02:00
Patrick Gansterer
d73c206e29 Fix copy operation for stock orders 
Stock orders have the supplier_id set to zero, which will be ignored
in the url-method by rails. Only use the order_id to fix this.
 2020-03-23 17:20:21 +01:00
Patrick Gansterer
bd49a64cd7 Make the download button of orders reusable 2017-12-09 12:25:29 +01:00
Patrick Gansterer
f261272c7e Fix size of receive_button in list of finished orders 2017-11-06 14:15:15 +01:00
Patrick Gansterer
564492afe4 Add an option to automatically finish an order 2017-10-12 21:14:29 +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
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
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
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
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
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
dd799cf642 Allow to sort receive on unit 2015-04-22 20:08:24 +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
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
a699f95903 fix fax documents for stock orders (closes foodcoops#79) 2014-09-02 15:47:01 +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
4b6231129c only show undeleted articles in receive screen 2014-06-23 17:51:19 +02:00
wvengen
fee0cfbdc7 make orders helpers clearer 2014-06-23 17:51:19 +02:00
wvengen
86a5576dc3 fix delete order confirmation 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
5d9c9856d1 show proper error when all articles are deselected in order edit 2014-05-13 17:01:27 +02:00
wvengen
48e9a3e4f5 add fax csv 2014-05-13 17:01:25 +02: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
6e0489b25f Merge pull request #257 from wvengen/feature-touchclick 
Better workaround for touch devices
 2014-02-03 06:33:27 -08:00
wvengen
5aef8e445e add html units history line 2014-01-31 13:08:20 +01:00
wvengen
7ebb2459e0 make click work better on touch devices (closes foodcoops#104) 2014-01-25 15:19:50 +01: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
bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen
3b2d50b47d make receive delta work when unit_quantity changes 2014-01-13 11:37:18 +01:00