almet/copanier
1
0
Fork 0
mirror of https://github.com/almet/copanier.git synced 2025-05-02 05:12:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
190 commits 3 branches 0 tags 1.4 MiB
Commit graph

150 commits

Author SHA1 Message Date
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
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
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
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
Alexis Metaireau
5d8f9ad512 Delivery edition 2019-04-22 15:11:52 +02:00
Alexis Metaireau
b3286e5d86 Merge branch 'delivery-contact' into 'master' 
Add Delivery.contact

See merge request ybon/copanier!9
 2019-04-21 13:02:34 +02:00
Alexis Metaireau
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
Alexis Metaireau
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
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
Yohan Boniface
38272577d8 Allow negative ajustment 
(bad copy paste and no dedicated test…)
 2019-04-16 21:47:54 +02:00
Yohan Boniface
0c2e2f5444 Explicit "ajust" button in delivery page 2019-04-16 21:07:25 +02:00
Yohan Boniface
5deae74c9a Use thead and tbody in tables 2019-04-16 20:58:17 +02:00
Yohan Boniface
d604259f57 Force white-space: normal on modal container 
When it's included in a th it has inherti "nowrap"
 2019-04-14 17:50:26 +02:00
Yohan Boniface
bf25a9c785 Add amount in delivery balance page 2019-04-14 17:31:07 +02:00
Yohan Boniface
815eb9543f Basic "manage delivery balance" page 2019-04-14 17:10:48 +02:00
Yohan Boniface
e9ec238754 Very basic "adjust product" page 2019-04-14 16:00:07 +02:00
Yohan Boniface
425222a0a2 Allow to define ProductOrder.ajustment when product needs adjustment 2019-04-14 09:41:55 +02:00
Yohan Boniface
165427bf8f WIP: deal with product packing 2019-04-14 09:41:55 +02:00
Alexis Metaireau
6c2f07bc3c More labels configuration 2019-04-14 09:18:00 +02:00
Yohan Boniface
2e6cedca44 Remove CORS 2019-04-14 00:31:51 +02:00
Yohan Boniface
dafb3d2c9b Add more details about columns to import products 2019-04-13 11:15:26 +02:00
Yohan Boniface
f81b303b56 Add margin top to input type submit 2019-04-13 11:15:26 +02:00
Yohan Boniface
d2cb557f8a Rename Product.weight to Product.unit 2019-04-13 11:15:26 +02:00
Yohan Boniface
3d4aec6deb Cleaner default factories 2019-04-12 15:45:41 +02:00
Yohan Boniface
8324136533 Use product.label in reports 2019-04-12 15:44:56 +02:00
Yohan Boniface
b190f1dd4e Remove perf_counter 
Copy pasted from an old project, we don't need that here
 2019-04-09 19:09:26 +02:00
Yohan Boniface
8684e83880 Make everyone staff if not staff is on the config 2019-04-09 18:48:42 +02:00
Yohan Boniface
fa377aa290 Workaround static extension not marked as "unprotected" 2019-04-09 18:45:15 +02:00
Yohan Boniface
075f1cfbf6 Use Product.label in order table 2019-04-07 17:13:02 +02:00
Yohan Boniface
4704211b55 Manage staff through env var 2019-04-07 09:34:28 +02:00
Yohan Boniface
abc5fd019d Wording 2019-04-07 08:56:27 +02:00
Yohan Boniface
7ce15a79e9 Add xlsx import 2019-04-06 20:06:22 +02:00
Yohan Boniface
f7b90a392f Add Response.xlsx 2019-04-06 18:45:16 +02:00
Yohan Boniface
be5275053b Add products export endpoint 2019-04-06 18:28:12 +02:00
Yohan Boniface
d73386a58a Always print traceback 2019-04-03 19:54:21 +02:00
Yohan Boniface
f06eb52d58 Add link to modify order in summary email 2019-04-03 16:26:47 +02:00
Yohan Boniface
db08ef7a68 Deal with empty quantities in place order 
A user may add a value in place of the "0" and then delete it,
so it will send an empty string to the server.
 2019-04-03 16:08:09 +02:00
Yohan Boniface
69b5b6cf0b Bcc all emails for now 2019-04-03 15:46:54 +02:00
Yohan Boniface
5aeeb5f3b8 Fix email called without being defined 2019-04-02 22:22:33 +02:00
Yohan Boniface
4278c95d81 Mail wording 2019-04-02 21:33:46 +02:00
Yohan Boniface
86dc78e820 Add a link from place order to delivery page 2019-04-02 21:20:31 +02:00
Yohan Boniface
72cad21536 Control img size in modal box 2019-04-02 21:19:14 +02:00
Yohan Boniface
44bfa0d730 Change order button wording when user has no order yet 2019-04-02 20:45:37 +02:00
Yohan Boniface
a584e03e0f Also display weekday in dates 2019-04-02 20:01:05 +02:00
Yohan Boniface
6962810210 iwyu 2019-04-02 19:58:01 +02:00
Yohan Boniface
1601719b9a Use French locale for dates 2019-04-02 19:55:02 +02:00
Yohan Boniface
782c08d5ee For now, log all incoming POST 
We want to be able to debug any issue during a command.
Hint: DO MORE TESTS!
 2019-04-02 19:51:38 +02:00
Yohan Boniface
8227f1566c Add Delivery.instructions field 2019-04-02 19:51:28 +02:00
Yohan Boniface
d8e9e6f714 Display product weigth when available 2019-04-02 09:56:29 +02:00
Yohan Boniface
1a0bda56b0 Strip € from prices at import 2019-04-02 09:56:10 +02:00
Yohan Boniface
9388365078 Use a dedicated from email 2019-04-02 09:55:49 +02:00
Yohan Boniface
a00f64a172 Add "copy emails" button in delivery page 2019-03-31 20:11:29 +02:00
Yohan Boniface
da1af28aaa Add Anne in staff 2019-03-31 19:58:50 +02:00
Yohan Boniface
21578d0c81 Allow to mark orders as paid 
And display in orange unpaid colmuns
 2019-03-31 19:46:18 +02:00
Yohan Boniface
bc802cae42 Allow to resend order by email 2019-03-24 22:05:26 +01:00
Yohan Boniface
24d278f04d Hide edit link on users email when user is not staff 2019-03-24 21:41:51 +01:00
Yohan Boniface
1ee0b20bca Redirect to delivery page after order has been placed 2019-03-24 21:37:36 +01:00
Yohan Boniface
7cccbad9e5 Very minimal staff management 2019-03-24 21:29:10 +01:00
Yohan Boniface
84c4e6e3be Add max_age to session cookie 2019-03-24 20:43:06 +01:00
Yohan Boniface
d7af4a8030 Use button styled a in header 2019-03-24 20:28:56 +01:00
Yohan Boniface
e0b182dff7 Split incoming and former deliveries in home page 2019-03-24 20:23:54 +01:00
Yohan Boniface
f5484bb90a Add a "manage my order" button on home page 2019-03-24 19:48:52 +01:00
Yohan Boniface
890523e5a3 Deal with empty orders 2019-03-24 19:04:47 +01:00
Yohan Boniface
0d1352df9f Allow the table to extend right without expending all the body 2019-03-24 18:56:09 +01:00
Yohan Boniface
b68d75b5a0 Only send summary email if order has been placed by user itself 2019-03-24 18:46:11 +01:00
Yohan Boniface
fba14dc45a Align left product column in signing sheet and summary email 2019-03-24 18:40:23 +01:00
Yohan Boniface
ea5ccedb00 Format order_before properly 2019-03-24 18:40:11 +01:00
Yohan Boniface
aa33599391 Basic email with order summary 2019-03-24 17:49:54 +01:00
Yohan Boniface
4cb3e10e93 Fix Delivery.when => Delivery.from_date 2019-03-24 17:08:03 +01:00
Yohan Boniface
0480cc585a Place order: merge GET and POST views 2019-03-24 17:03:31 +01:00
Yohan Boniface
59783879b6 Place order: use session email if not email is provided 2019-03-24 16:55:49 +01:00
Yohan Boniface
4922cff66e NAming again 2019-03-24 16:28:31 +01:00
Yohan Boniface
73a8d96af7 Make hupper an optional dep 2019-03-24 16:14:51 +01:00
Yohan Boniface
3216aeac11 Renamed + remote 2019-03-24 15:45:58 +01:00