Commit Graph

65 Commits

Author SHA1 Message Date
ht
353efdc012 docs: 修正 README 与实际代码不符的环境与数据库说明
版本徽章 Django 3.2+/Python 3.7+ 与 requirements.txt(Django>=4.2)不符;
快速开始教用 MySQL 且指向错误的 project/settings.py,照做无法启动。改为
默认 SQLite 开箱即用、配置路径修正为 inventory/settings.py,并注明生产可
切换 PostgreSQL。中/英两份 README 同步修正。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-29 00:25:05 +08:00
ht
f126f06ab1 fix: 救活销售单状态功能(取消/完成此前因缺字段直接崩溃)
sale_cancel / sale_delete_item 引用了 Sale.status,sale_cancel 还引用了
已在 0008 迁移中重命名为 remark 的 notes 字段,导致这两个视图一进入就
AttributeError。补回 status 字段(DRAFT/COMPLETED/CANCELLED,存量单迁移为
COMPLETED)使状态流转可用:sale_create/sale_complete 标记 COMPLETED 并防止
重复结算,sale_cancel 改用 remark,sale_delete_item 补上漏掉的 save() 使
删除商品后的总额真正落库。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 23:55:36 +08:00
ht
7ec6febf23 fix: 修复销售价格校验崩溃与备份日志无效外键
1) SaleItemForm.clean 中 product.price * 0.5 是 Decimal * float,会抛
   TypeError,导致添加/编辑销售单商品时崩溃。改用 Decimal('0.5')/Decimal('2')。
2) 备份/恢复写 LogEntry 时用 content_type_id=0,0 号 ContentType 不存在,
   违反外键约束抛 IntegrityError;且该调用在 try 内,失败会连带删掉刚生成的
   备份目录。改为 content_type_id=None(该字段可空)。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 23:40:35 +08:00
ht
06f52a54f7 fix: 修复销售单余额支付不扣减会员余额的问题
会员选"余额"支付时前端提交 payment_method=account,旧代码既不校验余额也不扣款,
等于会员可白拿货且无流水记录。合并 cursor/critical-correctness-bugs-0978:
事务内锁定会员、校验余额、并发安全扣款、记录 balance_paid 与 PURCHASE 流水,
并将销售单保存移入事务避免余额不足时留下孤儿单。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 23:08:55 +08:00
Cursor Agent
87eb63fbf8
Fix balance payment deduction on sale creation
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-05-22 11:07:38 +00:00
ht
01315fad76 Merge remote-tracking branch 'origin/cursor/critical-correctness-bugs-4fac' 2026-05-17 19:35:39 +08:00
ht
47ae8b0903 Merge remote-tracking branch 'origin/cursor/critical-bug-inspection-abeb' 2026-05-17 19:35:35 +08:00
ht
3d385f1be3 Merge remote-tracking branch 'origin/cursor/critical-bug-inspection-ac6f' 2026-05-17 19:35:31 +08:00
Cursor Agent
8e5a028c6b
Fix atomic member balance updates
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-05-16 11:13:23 +00:00
Cursor Agent
9d39eee5d4
fix logout redirect target
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-05-13 11:08:54 +00:00
Cursor Agent
3d8c0dbe38
Fix unsafe backup path handling
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-05-10 11:08:48 +00:00
Cursor Agent
ab61f5ed2d
test: use valid member discount fixture
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-04-28 11:09:58 +00:00
Cursor Agent
f37f76a272
fix: require login for member search api
Co-authored-by: zhtyyx <zhtyyx@users.noreply.github.com>
2026-04-28 11:08:59 +00:00
zhtyyx
453545b763
Merge pull request #35 from libinpg/main
用cursor修复了相关问题,还有部分ui问题。
2026-02-09 16:30:14 +08:00
libinpg
7329f598b3 修复无法在会员管理页面-会员列表下为用户充值的问题 2026-01-01 13:44:59 +08:00
libinpg
f501a571ef 修复分类无法删除的问题,还有小bug 2026-01-01 13:19:29 +08:00
IOE Admin
219bca9a25 Merge branch 'main' of github.com:zhtyyx/ioe into main 2025-12-18 16:40:44 +08:00
IOE Admin
0d73dba700 chore: add production domain to ALLOWED_HOSTS 2025-12-18 16:39:46 +08:00
zhtyyx
59cd935e1d Update wxqun.png 2025-11-20 11:55:41 +08:00
zhtyyx
379d65c600
Revise WeChat contact instructions in README
Updated the text for adding WeChat contact information.
2025-11-20 11:38:42 +08:00
zhtyyx
c81da3565a
Add files via upload 2025-10-23 11:01:56 +08:00
hunterzhang
a9a34b4242 update wxqun 2025-07-09 10:06:37 +08:00
zhtyyx
f92c6a9ddd
Update README.md 2025-06-12 10:06:05 +08:00
hunterzhang
7c3eec51e2 add wxqun 2025-06-10 14:28:56 +08:00
zhtyyx
a8b8b52ed1
Merge pull request #29 from pimp50/main
fix:修复退出登录问题
2025-06-06 14:21:33 +08:00
pimp50
8fc8a852fb fix:修复退出登录问题 2025-06-06 14:07:47 +08:00
hunterzhang
6c924566c6 add qun 2025-06-03 10:55:15 +08:00
hunterzhang
64995c649b add thx 2025-05-20 16:17:49 +08:00
hunterzhang
22c03a9141 add thx 2025-05-19 20:34:10 +08:00
hunterzhang
73d15c9e48 add thx 2025-05-19 17:29:20 +08:00
hunterzhang
15679121ec add thx 2025-05-19 17:28:14 +08:00
hunterzhang
baf81883e0 feat: fix add product error 2025-05-15 11:58:54 +08:00
hunterzhang
a738ca3aa3 feat: add wx 2025-05-15 09:48:46 +08:00
zhtyyx
00baea9c3d
Merge pull request #19 from hzh0292/main
fix: sale list page search and report data
2025-05-07 11:36:24 +08:00
Jeanphy
0608c24c32 fix: sale list page search and report data 2025-05-07 11:27:22 +08:00
hunterzhang
b5a8499501 feat: add wx 2025-05-07 10:13:59 +08:00
zhtyyx
86b5a48b95
Merge pull request #16 from Beyondone4/master
fix: 修复商品结算默认折扣以及数量异常问题
2025-05-04 07:24:51 +08:00
zhtyyx
38f86c75b9
Merge pull request #17 from hzh0292/main
fix: sale list order total quantity
2025-05-04 07:24:31 +08:00
Junglejia
423bc340ef fix: 修复商城首页最近操作显示格式问题,修复扫码添加商品is_active默认为0问题 2025-04-30 18:08:42 +08:00
Jeanphy
fbf4dd2a63 fix: sale list order total quantity 2025-04-30 17:11:07 +08:00
Junglejia
56fcc14d95 fix: 修复商品结算默认折扣以及数量异常问题 2025-04-30 16:08:33 +08:00
zhtyyx
483dd6d83c
Merge pull request #14 from hzh0292/main
fix: update requirements, fix member phone display
2025-04-29 11:38:07 +08:00
Jeanphy
5370ebafd3 fix: update requirements, fix member phone display 2025-04-29 09:45:35 +08:00
hunterzhang
c25631f3c1 fix: update readme file 2025-04-27 14:53:27 +08:00
hunterzhang
85837ff646 feat: create several useful function 2025-04-27 14:50:32 +08:00
zhtyyx
73e9b25a55
Merge pull request #10 from zjzjzjzj1874/main
chore: update docker readme command
2025-04-14 14:52:28 +08:00
zjzjzjzj1874
18ef9c22a1
chore: update docker readme command
Signed-off-by: zjzjzjzj1874 <zjzjzjzj1874@gmail.com>
2025-04-14 14:03:37 +08:00
zhtyyx
7b2e861e2c
Merge pull request #8 from Chever-John/fix/dockerfile
fix: dockerfile add python migrate
2025-04-08 16:32:20 +08:00
Chever John
cafd72f087
fix: dockerfile add python migrate cmd 2025-04-08 11:07:46 +08:00
hunterzhang
afdfdd7d88 fix: adapt for mobile device 2025-04-07 18:33:12 +08:00