Commit graph

293 commits

Author SHA1 Message Date
Yohan Boniface
5b40b9aac8 Split back home page to distinguish between active commands and past ones 2019-06-07 12:51:21 +02:00
Yohan Boniface
28cb3220e1 Allow to control remote HOST for emails 2019-06-07 12:50:33 +02:00
Yohan Boniface
9afe04ccf5 Make sure we cannot set an ajustment below what user ordered 2019-05-25 19:25:53 +02:00
Yohan Boniface
c2c466ce27 Add product reference in order summary
Useful in post delivery checks (it appears in the liste
d'émargement) and it's always better non ambigous which product
it is
2019-05-25 19:17:41 +02:00
Yohan Boniface
c410a4558f Catch SMTP errors 2019-05-25 19:16:46 +02:00
Yohan Boniface
b3062fd385 Allow to remove a product from a delivery with orders
Eg. when some products are missing from the real delivery while
being ordered.
2019-05-25 17:33:20 +02:00
Yohan Boniface
bd2fb3958e Allow to force ajustment on closed deliveries
This is useful for deliveries with missing products to adjust
totals before sending
2019-05-25 17:12:52 +02:00
Yohan Boniface
2aeceeca3c Display user order info on home page (total + unpaid) 2019-05-22 15:32:44 +02:00
Yohan Boniface
132884385e Simpler home page
- remove category titles
- we still show first open deliveries, ordered by dead line
- passed but non archived delivery status label is "À solder"
2019-05-22 15:32:44 +02:00
Yohan Boniface
049ef6260c Depending on the email client, link may or may not be visible
So let's make the link visible
2019-05-05 17:55:13 +02:00
Yohan Boniface
e18ad297fa Add a dedicated view to download products of archived delivery 2019-05-05 17:34:36 +02:00
Yohan Boniface
1f3dd960b0 Allow to download products of an archived delivery
This is how we make a new delivery from an old one.
2019-05-05 17:28:18 +02:00
Alexis Métaireau
626004313f Display the order button only when products have been imported 2019-05-01 01:49:59 +02:00
Alexis Métaireau
f450742e39 Make deliveries actions visible only when useful. 2019-05-01 01:49:34 +02:00
Alexis Métaireau
ae2d9b2994 Add a button to see the list of orders 2019-05-01 01:18:28 +02:00
Alexis Métaireau
fb44a83590 Add missing dependency 2019-05-01 01:18:28 +02:00
Alexis Métaireau
20df999dc0 Add a multi import mechanism 2019-05-01 01:18:28 +02:00
Alexis Métaireau
1794913997 Create multiple tabs for full delivery reports 2019-05-01 01:18:28 +02:00
Alexis Métaireau
ec291e4c85 Rename delivery.producer to delivery.name 2019-05-01 01:18:28 +02:00
Alexis Métaireau
6abe77de05 Handle multiple producers per delivery 2019-05-01 01:18:28 +02:00
04d5fca259 Merge branch 'archive' into 'master'
Archive deliveries

See merge request ybon/copanier!15
2019-05-01 01:09:36 +02:00
Yohan Boniface
012e746ffd Review from @almet 2019-04-30 14:49:47 +02:00
Yohan Boniface
85521846e6 danger button CSS 2019-04-24 17:53:56 +02:00
Yohan Boniface
6db17fa56e Allow to archive deliveries
- Delivery.id is not persisted anymore: the file name and relaltive
  directory *is* the id, and we don't want to denormalize this info
- Delivery.load will filter out non fields keys from the storage: this
  allows more resilient upgrade of the data model, and is usefull when
  dealing with multiple branches with different data models
- Delivery.archive/unarchive will move the delivery storage from
  root to archive/
- Delivery.all now accepts "is_archived" to retrieve archived instead
  of active deliveries
- import products is now moved to a modal
- archived deliveries are now listed in a separate page
2019-04-24 17:51:56 +02:00
Yohan
95c5f26f8e Merge branch 'delivery-url' into 'master'
Add Delivery.url to a link to an external source

See merge request ybon/copanier!14
2019-04-24 17:39:51 +02:00
Yohan Boniface
5437508b03 Use more specific property Delivery.infos_url 2019-04-23 23:16:04 +02:00
Yohan Boniface
77bf047974 Truncate Delivery.url in delivery head 2019-04-23 14:46:12 +02:00
Yohan
2d90546775 Merge branch 'round-again' into 'master'
Add rounding in the generated reports

See merge request ybon/copanier!13
2019-04-22 23:25:11 +02:00
Yohan Boniface
c1ea72455c Add Delivery.url to a link to an external source 2019-04-22 23:14:14 +02:00
Yohan Boniface
437a3e0c36 Make sure not staff is set for tests 2019-04-22 23:13:41 +02:00
Yohan Boniface
53a9f6b560 Wording 2019-04-22 22:34:19 +02:00
Alexis Métaireau
14ebdab7c8 Add rounding in the generated reports 2019-04-22 15:29:44 +02:00
5e933ec775 Merge branch 'dev-friendly' into 'master'
Make some changes to the README

See merge request ybon/copanier!12
2019-04-22 15:20:30 +02:00
598f61e860 Make some changes to the README 2019-04-22 15:20:30 +02:00
d62ecbf0af Merge branch 'multiple-deliveries' into 'master'
Delivery edition

See merge request ybon/copanier!11
2019-04-22 15:11:53 +02:00
5d8f9ad512 Delivery edition 2019-04-22 15:11:52 +02:00
b3286e5d86 Merge branch 'delivery-contact' into 'master'
Add Delivery.contact

See merge request ybon/copanier!9
2019-04-21 13:02:34 +02:00
Yohan
f9b69f815c Merge branch 'round-prices' into 'master'
Round prices to two decimals max

See merge request ybon/copanier!10
2019-04-21 10:12:46 +02:00
5c93a05524 Round prices to two decimals max 2019-04-21 10:12:46 +02:00
Yohan Boniface
34d6183ad4 Add delivery balance report 2019-04-19 16:48:11 +02:00
434d9f293e Merge branch 'remove-ref' into 'master'
Remove ref from delivery page

See merge request ybon/copanier!8
2019-04-17 22:50:05 +02:00
2f331d981e Merge branch 'skip-empty' into 'master'
Skip products without orders in order form

See merge request ybon/copanier!7
2019-04-17 22:49:19 +02:00
Yohan Boniface
b6ed2b412b Add Delivery.contact 2019-04-17 22:12:14 +02:00
Yohan Boniface
97ae6daaae Remove ref from delivery page 2019-04-17 21:36:00 +02:00
Yohan Boniface
a6a504d0ca Skip products without orders in order form 2019-04-17 21:31:53 +02:00
Yohan Boniface
c020ec89fa Display adjustement col on closed delivery if order has adjustements 2019-04-16 23:14:55 +02:00
Yohan Boniface
edc0a44857 Wording 2019-04-16 22:37:10 +02:00
Yohan Boniface
1bd2c93b30 Try to make clearer that "ajustment" completes and does not replace 2019-04-16 22:36:03 +02:00
Yohan Boniface
9f3c19ddbe Add order wanted/ajustment details as cell title in delivery page 2019-04-16 22:11:49 +02:00
Yohan Boniface
4e608f9858 hot fix: show adjustements in place_order even when delivery is closed 2019-04-16 21:54:06 +02:00