Commit graph

289 commits

Author SHA1 Message Date
Yohan
22da3d771c Merge branch 'delivery-balance' into 'master'
Basic "manage delivery balance" page

See merge request ybon/copanier!5
2019-04-14 17:43:15 +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
35e68bd2ac Merge branch 'packing' into 'master'
Product.packing management

See merge request ybon/copanier!1
2019-04-14 16:27:09 +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
Yohan
4b329b7378 Merge branch 'name-agnostic' into 'master'
A few changes while reading the code

See merge request ybon/copanier!2
2019-04-14 09:18:00 +02:00
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
5c12463bf7 Use framagit to deploy 2019-04-13 10:08:06 +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
6f8d9247c4 A bit more README 2019-04-09 19:05:02 +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
02ff34dff7 Do not send emails during unit tests… 2019-04-09 17:30:17 +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
dadbe750cc Typo in logs dir 2019-04-02 19:57:00 +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