Commit Graph

127 Commits

Author SHA1 Message Date
fce76143b4 + Gift 2023-10-31 16:50:45 +04:00
13ae751564 * Moved CDEK api to external_api module 2023-10-31 16:49:10 +04:00
a7b1f6981f + Recursive search of suitable commission price & delivery price 2023-10-15 10:45:43 +04:00
4ac1ee501a * Try to get delivery_price_CN_RU from parent category if it is zero 2023-10-12 15:26:09 +04:00
fcded2a50d * Get max commission value 2023-10-12 08:50:13 +04:00
e74af73dad * Fixed commission math 2023-10-12 02:14:14 +04:00
433837c2fe * Updated commission logic 2023-10-11 22:48:13 +04:00
875f1e8313 * Optional Checklist.size field 2023-10-11 22:32:22 +04:00
ba534a68f1 * Updated preview layout 2023-10-11 22:28:17 +04:00
b55e42c90f + Checklist.split_accepted field 2023-10-04 06:58:09 +04:00
8c0f5ac6fd + PriceSnapshot
* Category commission inside a commission_rub field
2023-10-04 06:57:53 +04:00
ce59792419 * Preview image: format price by 3 digits with spaces 2023-08-27 18:07:40 +04:00
eeb4325e6b * Fixed non-updatable children Categories 2023-08-26 17:28:21 +04:00
f39be4bb91 * missing split_payment_proof field in serializer 2023-08-21 16:47:36 +04:00
5a1afdf07b * payment_proof is now a single image + migration from m2m
+ split_payment_proof
2023-08-21 16:24:52 +04:00
1445c87c0a + migration of categories/subcategories 2023-08-21 16:22:03 +04:00
60ff4bb6b0 * Disable CDEK authorization during migration 2023-08-21 16:19:37 +04:00
2fe77442c3 + More info about client in statistics/clients 2023-08-19 20:02:19 +04:00
edf1118f9f * null-check for Checklist.category
* fixed missing deps
* cleanup
2023-08-19 20:01:30 +04:00
4ed1a74a16 + time_to_buy & buy_time_remaining fields
+ Category: hierarchy, removed slugs & added comission per category
* Promocode value in rubles instead of percentage
* Cleanup in GlobalSettings routes
2023-08-18 16:22:32 +04:00
bf3fe26dfa + Route for CDEK order editing 2023-08-18 16:03:57 +04:00
af4b3c6d01 * AllowAny permission for CDEK API 2023-07-23 17:49:33 +04:00
5bcd3c4745 * preview_image: dynamic size of "size" block 2023-07-22 21:27:42 +04:00
959ae4536d * Preview image: render price_rub as integer (without decimal places) 2023-07-17 20:52:16 +04:00
9e04fa354f * Round up price_rub & full_price fields 2023-07-17 20:48:33 +04:00
edcdc96d8e * Cleanup 2023-07-17 20:31:51 +04:00
dc22af6d4c Preview image:
* Title is rendered on separate lines, each 12 characters max
* calculate width of block on the left, paste good's image with that info in mind
2023-07-17 20:30:59 +04:00
ea6bcf0a42 * Made Checklist.category a not required field 2023-07-13 01:30:23 +04:00
42edb1ae4e + Allow GET /payment/ for unauthorized users 2023-07-13 01:26:32 +04:00
b103a07046 + DELETE for checklists 2023-07-13 00:29:52 +04:00
9221c1f8a8 * PaymentMethod: allow null for cardnumber & requisites 2023-07-13 00:24:25 +04:00
c464b069ba * renamed comission -> commission 2023-07-12 23:34:03 +04:00
2fdd009ca5 + djoser routes for user API 2023-07-12 23:18:31 +04:00
cea3c2a8ba * Cleanup 2023-07-12 21:14:50 +04:00
f4af85c2ce * Fixed checlist filtering & search 2023-07-12 21:14:27 +04:00
021d75587c * DISABLE_PERMISSIONS for list checklists 2023-07-12 20:53:42 +04:00
988e2c7ad4 * DISABLE_PERMISSIONS for Checklist creation 2023-07-12 20:33:22 +04:00
d12bd8db9f Checklist preview:
- render full_price instead of price_rub
- limit to 2 decimal places
2023-07-12 20:04:20 +04:00
4f901fe62e * allow empty promo fields 2023-07-12 20:03:39 +04:00
6a1e85d524 * renamed paymentproovement -> paymentprovement 2023-07-12 20:03:24 +04:00
a37fe8c851 * Fixed cdek orders API 2023-07-11 13:02:00 +04:00
fb5a80f0b4 + Auto update status NEW->PAYMENT if payment info is present
* Cleanup
2023-07-10 21:29:20 +04:00
568711fe63 + cdek_courier option for Checklist.delivery 2023-07-10 21:25:51 +04:00
7840af8fe2 * Disallow anonymous users to list Checklists 2023-07-10 20:27:03 +04:00
a528974347 * Allow anonymous users to edit a set of fields of Checklist 2023-07-10 20:07:53 +04:00
77f0838d2d * Checklist.delivery as a ChoiceField
* Checklist.delivery_display for human-readable text
2023-07-10 20:07:07 +04:00
5f0f8befcb * Cleanup 2023-07-10 20:06:11 +04:00
6b1a11d355 * missing migration 2023-07-07 18:37:35 +04:00
f79069faa5 * Checklist: blank=True for images & payment_proof 2023-07-07 08:35:52 +04:00
e23e4c2f4f * Cleanup 2023-07-07 08:33:29 +04:00
6676eaed0e * fixed discout calculation 2023-07-07 08:33:17 +04:00
fc2297b17c + array of payment_proof
+ Checklist.images is m2m now
+ Image.type & dynamic upload path
2023-07-07 08:22:15 +04:00
810fd7ce3a * fixed preview creation 2023-07-07 06:26:51 +04:00
b5ba146165 * Base64ImageField for paymentproovement & checkphoto fields of Checklist 2023-07-07 06:26:34 +04:00
44b4f11f72 * curencycurency2 is not required, defaults to 0 2023-07-07 06:07:05 +04:00
4269bfde8e * Upload base64 images & generate preview 2023-07-07 06:05:14 +04:00
dd52427ef5 * Cleanup 2023-07-07 03:26:17 +04:00
c730bdb20c * fixed Checklist search 2023-07-07 03:16:05 +04:00
2f456b70bb * managerid as Integer in serializers 2023-07-07 02:59:35 +04:00
ddceee5d7e + InMemoryCache for GlobalSettings 2023-07-07 02:48:30 +04:00
5bfae66ad5 + thread-safe cache for GlobalSettings 2023-07-07 02:28:46 +04:00
31412f25f0 * DISABLE_PERMISSIONS in settings 2023-07-07 02:07:41 +04:00
82bdd2a9ee * fixed float/decimal conversion 2023-07-07 01:52:36 +04:00
8145bb4ae3 * calculate full_price with promocode 2023-07-07 01:42:05 +04:00
01b1d6a4f5 * validate Promocode.discount to be 0 <= value <= 100 2023-07-07 01:33:38 +04:00
4f456d0809 * PATCH for YuanRateAPI
* Don't delete promocode, deactivate it
2023-07-07 01:19:00 +04:00
ae80c0de30 * on /login/ respond with user data 2023-07-07 00:21:13 +04:00
6842d64c19 * create_test_data: is_staff for admin test user 2023-07-07 00:13:43 +04:00
35c7d2632b - managerid field
* migrations
2023-07-06 17:52:59 +04:00
332ffa3a5f + create_test_data command 2023-07-06 17:51:14 +04:00
4e7575cc50 Updated uwsgi.ini 2023-07-06 16:56:29 +04:00
7888f09d12 * missing migration 2023-07-06 16:00:20 +04:00
cd8e591439 + split
* Upload payment_proof & receipt to docs/
* renamed cheque_photo -> receipt
* missing migrations
2023-07-06 15:54:52 +04:00
7a04f15aab + get_barcode CDEK API
* Upload payment_proof & cheque_photo to docs
2023-07-06 15:49:34 +04:00
bc91845074 * Missing migrations 2023-07-05 02:20:14 +04:00
4511a65b7f + statistics by clients
+ cdek_tracking
+ checklist create API
+ some permissions
* Cleanup
2023-07-05 02:19:58 +04:00
1d615b2735 Initial commit 2023-07-03 06:38:55 +04:00