diff --git a/inventory/templates/inventory/sale_form.html b/inventory/templates/inventory/sale_form.html index 0694e29..ed755f9 100644 --- a/inventory/templates/inventory/sale_form.html +++ b/inventory/templates/inventory/sale_form.html @@ -1346,10 +1346,6 @@
支付方式
余额 - diff --git a/inventory/templates/inventory/sale_item_form.html b/inventory/templates/inventory/sale_item_form.html index 6193151..f3c72c5 100644 --- a/inventory/templates/inventory/sale_item_form.html +++ b/inventory/templates/inventory/sale_item_form.html @@ -476,16 +476,19 @@

添加销售商品

- {% for item in sale.saleitems.all %} + {% for item in items %} {{ item.product.name }} {{ item.quantity }} {{ item.actual_price }} {{ item.subtotal }} - - - +
+ {% csrf_token %} + +
{% endfor %} diff --git a/inventory/templates/inventory/system/delete_backup.html b/inventory/templates/inventory/system/delete_backup.html new file mode 100644 index 0000000..fdd8db5 --- /dev/null +++ b/inventory/templates/inventory/system/delete_backup.html @@ -0,0 +1,30 @@ +{% extends 'inventory/base.html' %} + +{% block title %}删除备份 - {{ block.super }}{% endblock %} + +{% block content %} +
+
+
+
+
+ 删除备份 +
+
+
+

确定要删除备份 {{ backup_name }} 吗？

+

此操作不可恢复。

+ +
+ {% csrf_token %} + +
+ 取消 + +
+
+
+
+
+
+{% endblock %} diff --git a/inventory/tests/test_sale_status.py b/inventory/tests/test_sale_status.py index 270e7a3..42663b4 100644 --- a/inventory/tests/test_sale_status.py +++ b/inventory/tests/test_sale_status.py @@ -141,6 +141,32 @@ def test_cannot_delete_item_from_cancelled_sale(self): self.inventory.refresh_from_db() self.assertEqual(self.inventory.quantity, restored_quantity) + def test_cannot_delete_item_from_completed_sale(self): + sale = self._make_sale(status='COMPLETED') + item = sale.items.get() + self.inventory.refresh_from_db() + before = self.inventory.quantity + + response = self.client.post(reverse('sale_item_delete', args=[sale.id, item.id])) + + self.assertRedirects(response, reverse('sale_detail', args=[sale.id])) + self.assertTrue(SaleItem.objects.filter(pk=item.pk).exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, before) + + def test_delete_item_requires_post(self): + sale = self._make_sale(status='DRAFT') + item = sale.items.get() + self.inventory.refresh_from_db() + before = self.inventory.quantity + + response = self.client.get(reverse('sale_item_delete', args=[sale.id, item.id])) + + self.assertEqual(response.status_code, 405) + self.assertTrue(SaleItem.objects.filter(pk=item.pk).exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, before) + def test_delete_item_persists_recalculated_total(self): sale = self._make_sale(status='DRAFT') extra = SaleItem.objects.create( @@ -160,6 +186,20 @@ def test_delete_item_persists_recalculated_total(self): sale.refresh_from_db() self.assertEqual(sale.total_amount, Decimal('20.00')) # 删除后总额已落库 + def test_sale_detail_does_not_rewrite_historical_amounts(self): + sale = self._make_sale(status='COMPLETED') + sale.total_amount = Decimal('15.00') + sale.discount_amount = Decimal('0.00') + sale.final_amount = Decimal('15.00') + sale.save() + + response = self.client.get(reverse('sale_detail', args=[sale.id])) + + self.assertEqual(response.status_code, 200) + sale.refresh_from_db() + self.assertEqual(sale.total_amount, Decimal('15.00')) + self.assertEqual(sale.final_amount, Decimal('15.00')) + def test_sale_complete_page_renders_for_draft_sale(self): sale = self._make_sale(status='DRAFT') diff --git a/inventory/tests/test_sales_balance_payment.py b/inventory/tests/test_sales_balance_payment.py index ab5edc8..34ab790 100644 --- a/inventory/tests/test_sales_balance_payment.py +++ b/inventory/tests/test_sales_balance_payment.py @@ -97,3 +97,12 @@ def test_sale_create_balance_payment_rolls_back_when_balance_is_insufficient(sel self.assertEqual(self.member.balance, Decimal('5.00')) self.inventory.refresh_from_db() self.assertEqual(self.inventory.quantity, 10) + + def test_sale_create_rejects_unsupported_payment_method(self): + response = self.client.post(reverse('sale_create'), self.sale_post_data('credit')) + + self.assertRedirects(response, reverse('sale_create')) + self.assertFalse(Sale.objects.exists()) + self.assertFalse(MemberTransaction.objects.exists()) + self.inventory.refresh_from_db() + self.assertEqual(self.inventory.quantity, 10) diff --git a/inventory/tests/test_views.py b/inventory/tests/test_views.py index 5ed657d..ebbdb20 100644 --- a/inventory/tests/test_views.py +++ b/inventory/tests/test_views.py @@ -1,6 +1,8 @@ import json import os +import shutil import tempfile +from unittest import mock from django.core import management from django.test import TestCase, Client @@ -321,3 +323,93 @@ def test_restore_backup_flushes_records_missing_from_snapshot(self): self.assertEqual(response.status_code, 302) self.assertEqual(response['Location'], reverse('system_settings')) self.assertFalse(Product.objects.filter(pk=product.pk).exists()) + + def test_restore_backup_page_renders_backup_context(self): + backup_name = 'pagecontext' + backup_dir = os.path.join(self.backup_root, backup_name) + os.makedirs(backup_dir, exist_ok=True) + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': True, + }, + backup_info, + ) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir): + response = self.client.get(reverse('restore_backup', args=[backup_name])) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, backup_name) + + def test_restore_backup_media_replace_failure_restores_current_media_and_db(self): + backup_name = 'mediafail' + backup_dir = os.path.join(self.backup_root, backup_name) + backup_media_dir = os.path.join(backup_dir, 'media') + media_root = os.path.join(self.temp_parent.name, 'media') + os.makedirs(backup_media_dir, exist_ok=True) + os.makedirs(media_root, exist_ok=True) + db_file = os.path.join(backup_dir, 'db.json') + + with open(os.path.join(media_root, 'current.txt'), 'w', encoding='utf-8') as current: + current.write('current media') + with open(os.path.join(backup_media_dir, 'replacement.txt'), 'w', encoding='utf-8') as replacement: + replacement.write('backup media') + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=media_root): + management.call_command( + 'dumpdata', + '--exclude', + 'auth.permission', + '--exclude', + 'contenttypes', + '--exclude', + 'sessions.session', + '--indent', + '4', + '--output', + db_file, + verbosity=0, + ) + + with open(os.path.join(backup_dir, 'backup_info.json'), 'w', encoding='utf-8') as backup_info: + json.dump( + { + 'name': backup_name, + 'created_at': '2026-05-30T11:00:00', + 'created_by': self.user.username, + 'includes_media': True, + }, + backup_info, + ) + + category = Category.objects.create(name='恢复失败后仍应存在分类') + product = Product.objects.create( + barcode='restore-failure-product', + name='恢复失败后仍应存在商品', + category=category, + price=Decimal('10.00'), + cost=Decimal('5.00'), + ) + + real_move = shutil.move + + def fail_staged_media_move(src, dst, *args, **kwargs): + if os.path.basename(src) == 'media' and os.path.abspath(dst) == os.path.abspath(media_root): + raise OSError('cannot replace media') + return real_move(src, dst, *args, **kwargs) + + with self.settings(BACKUP_ROOT=self.backup_root, TEMP_DIR=self.temp_dir, MEDIA_ROOT=media_root): + with mock.patch('inventory.views.system.backup.shutil.move', side_effect=fail_staged_media_move): + response = self.client.post( + reverse('restore_backup', args=[backup_name]), + {'confirm': 'on', 'restore_media': 'on'}, + ) + + self.assertEqual(response.status_code, 200) + self.assertTrue(Product.objects.filter(pk=product.pk).exists()) + self.assertTrue(os.path.exists(os.path.join(media_root, 'current.txt'))) + self.assertFalse(os.path.exists(os.path.join(media_root, 'replacement.txt'))) diff --git a/inventory/views/sales.py b/inventory/views/sales.py index 0fc02a4..1431a45 100644 --- a/inventory/views/sales.py +++ b/inventory/views/sales.py @@ -13,6 +13,7 @@ from django.conf import settings from django.utils.safestring import mark_safe from django.urls import reverse +from django.views.decorators.http import require_POST from inventory.models import Sale, SaleItem, Inventory, InventoryTransaction, Member, MemberTransaction, OperationLog, Product, Category, Supplier, MemberLevel from inventory.forms import SaleForm, SaleItemForm @@ -80,31 +81,6 @@ def sale_detail(request, sale_id): sale = get_object_or_404(Sale, pk=sale_id) items = SaleItem.objects.filter(sale=sale).select_related('product') - # 确保销售单金额与商品项总和一致 - items_total = sum(item.subtotal for item in items) - if items_total > 0 and (sale.total_amount == 0 or abs(sale.total_amount - items_total) > 1): - print(f"警告: 销售单金额({sale.total_amount})与商品项总和({items_total})不一致，正在修复") - # 更新销售单金额 - discount_rate = Decimal('1.0') - if sale.member and sale.member.level and sale.member.level.discount: - try: - discount_rate = Decimal(str(sale.member.level.discount)) - except: - discount_rate = Decimal('1.0') - - discount_amount = items_total * (Decimal('1.0') - discount_rate) - final_amount = items_total - discount_amount - - # 使用原始SQL直接更新数据库 - with connection.cursor() as cursor: - cursor.execute( - "UPDATE inventory_sale SET total_amount = %s, discount_amount = %s, final_amount = %s WHERE id = %s", - [items_total, discount_amount, final_amount, sale.id] - ) - - # 重新加载销售单数据 - sale = get_object_or_404(Sale, pk=sale_id) - context = { 'sale': sale, 'items': items, @@ -331,11 +307,8 @@ def sale_create(request): # 最终安全检查，确保总金额大于0 if total_amount <= 0 and valid_products_data: - print("警告：计算的总金额仍然为0或负数，使用固定价格作为最后的保障") - # 使用855.33作为固定价格，这只是一个保底措施 - total_amount = Decimal('855.33') - discount_amount = Decimal('0.00') - final_amount = total_amount + messages.error(request, '销售单创建失败，商品金额必须大于0。') + return redirect('sale_create') form = SaleForm(request.POST) if form.is_valid(): @@ -361,6 +334,10 @@ def sale_create(request): payment_method = request.POST.get('payment_method', 'cash') if payment_method == 'account': payment_method = 'balance' + allowed_payment_methods = {'cash', 'wechat', 'alipay', 'card', 'balance', 'other'} + if payment_method not in allowed_payment_methods: + messages.error(request, '销售单创建失败，不支持的支付方式。') + return redirect('sale_create') sale.payment_method = payment_method # 收银台是一次性下单并结算，直接标记为已完成 @@ -649,6 +626,8 @@ def sale_complete(request, sale_id): payment_method = request.POST.get('payment_method') or sale.payment_method if payment_method == 'account': payment_method = 'balance' + if payment_method not in {value for value, _ in Sale.PAYMENT_METHODS}: + raise ValueError('不支持的支付方式') sale.payment_method = payment_method balance_amount = Decimal('0.00') @@ -779,46 +758,50 @@ def sale_cancel(request, sale_id): return render(request, 'inventory/sale_cancel.html', {'sale': sale}) @login_required +@require_POST def sale_delete_item(request, sale_id, item_id): """删除销售单商品视图""" - sale = get_object_or_404(Sale, id=sale_id) - item = get_object_or_404(SaleItem, id=item_id, sale=sale) - - # 检查销售单状态 - if sale.status != 'DRAFT': - messages.error(request, '只有未完成的销售单可以修改商品') - return redirect('sale_detail', sale_id=sale.id) - - # 恢复库存 - inventory = Inventory.objects.get(product=item.product) - inventory.quantity += item.quantity - inventory.save() - - # 创建入库交易记录 - InventoryTransaction.objects.create( - product=item.product, - transaction_type='IN', - quantity=item.quantity, - operator=request.user, - notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' - ) - - # 记录操作日志 - OperationLog.objects.create( - operator=request.user, - operation_type='SALE', - details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', - related_object_id=sale.id, - related_content_type=ContentType.objects.get_for_model(Sale) - ) - - # 删除商品并更新销售单总额 - item.delete() - sale.update_total_amount() - sale.save() + try: + with transaction.atomic(): + sale = get_object_or_404(Sale.objects.select_for_update(), id=sale_id) + if sale.status != 'DRAFT': + messages.error(request, '只有未完成的销售单可以修改商品') + return redirect('sale_detail', sale_id=sale.id) + + item = get_object_or_404( + SaleItem.objects.select_for_update().select_related('product'), + id=item_id, + sale=sale, + ) + inventory = Inventory.objects.select_for_update().get(product=item.product) + inventory.quantity += item.quantity + inventory.save() + + InventoryTransaction.objects.create( + product=item.product, + transaction_type='IN', + quantity=item.quantity, + operator=request.user, + notes=f'从销售单 #{sale.id} 中删除商品，恢复库存' + ) + + OperationLog.objects.create( + operator=request.user, + operation_type='SALE', + details=f'从销售单 #{sale.id} 中删除商品 {item.product.name}', + related_object_id=sale.id, + related_content_type=ContentType.objects.get_for_model(Sale) + ) + + item.delete() + sale.update_total_amount() + sale.save() + except Inventory.DoesNotExist: + messages.error(request, '找不到商品库存记录，未删除销售明细') + return redirect('sale_item_create', sale_id=sale_id) messages.success(request, '商品已从销售单中删除') - return redirect('sale_item_create', sale_id=sale.id) + return redirect('sale_item_create', sale_id=sale_id) @login_required def member_purchases(request): diff --git a/inventory/views/system/backup.py b/inventory/views/system/backup.py index 39a2423..ca3d5a8 100644 --- a/inventory/views/system/backup.py +++ b/inventory/views/system/backup.py @@ -20,6 +20,7 @@ import logging import re import zipfile +import tempfile from datetime import datetime from inventory.permissions.decorators import permission_required @@ -44,6 +45,77 @@ def get_safe_backup_dir(backup_name): return backup_dir +def _remove_path(path): + if os.path.isdir(path) and not os.path.islink(path): + shutil.rmtree(path) + else: + os.remove(path) + + +def _stage_media_restore(media_dir): + """Copy backup media to a temp directory before touching live media.""" + os.makedirs(settings.TEMP_DIR, exist_ok=True) + stage_parent = tempfile.mkdtemp(prefix='restore_media_', dir=settings.TEMP_DIR) + staged_media_dir = os.path.join(stage_parent, 'media') + try: + shutil.copytree(media_dir, staged_media_dir) + except Exception: + shutil.rmtree(stage_parent, ignore_errors=True) + raise + return stage_parent, staged_media_dir + + +def _replace_media_root(staged_media_dir): + """Replace MEDIA_ROOT with staged media and restore the old media on failure.""" + media_root = settings.MEDIA_ROOT + os.makedirs(os.path.dirname(os.path.abspath(media_root)), exist_ok=True) + os.makedirs(settings.TEMP_DIR, exist_ok=True) + + current_parent = None + current_backup = None + if os.path.lexists(media_root): + current_parent = tempfile.mkdtemp(prefix='restore_media_current_', dir=settings.TEMP_DIR) + current_backup = os.path.join(current_parent, 'media_root') + shutil.move(media_root, current_backup) + + try: + shutil.move(staged_media_dir, media_root) + except Exception: + if os.path.lexists(media_root): + _remove_path(media_root) + if current_backup and os.path.lexists(current_backup): + shutil.move(current_backup, media_root) + if current_parent: + shutil.rmtree(current_parent, ignore_errors=True) + raise + + if current_parent: + shutil.rmtree(current_parent, ignore_errors=True) + + +def get_restore_backup_context(backup_name, backup_dir, backup_info): + created_at = None + if backup_info.get('created_at'): + try: + created_at = datetime.fromisoformat(backup_info['created_at']) + except (TypeError, ValueError): + created_at = None + + backup = { + 'name': backup_name, + 'created_at': created_at, + 'created_by': backup_info.get('created_by', '未知'), + 'size': get_dir_size_display(backup_dir), + 'description': backup_info.get('description', ''), + 'includes_media': backup_info.get('includes_media', False), + } + return { + 'backup': backup, + 'backup_name': backup_name, + 'backup_info': backup_info, + } + + def get_dir_size_display(dir_path): """获取目录大小的友好显示""" total_size = 0 @@ -209,55 +281,37 @@ def restore_backup(request, backup_name): if os.path.exists(backup_info_file): with open(backup_info_file, 'r', encoding='utf-8') as f: backup_info = json.load(f) + context = get_restore_backup_context(backup_name, backup_dir, backup_info) if request.method == 'POST': # 确认恢复 - confirmed = request.POST.get('confirm') == 'on' + confirmed = request.POST.get('confirm') == 'on' or request.POST.get('confirm_restore') == 'on' if not confirmed: messages.error(request, "请确认您要恢复备份") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + staged_media_parent = None try: # 恢复数据库 db_file = os.path.join(backup_dir, 'db.json') if not os.path.exists(db_file): messages.error(request, f"备份文件 {db_file} 不存在") return redirect('backup_list') + + restore_media = request.POST.get('restore_media') == 'on' + staged_media_dir = None + if restore_media and backup_info.get('includes_media', False): + media_dir = os.path.join(backup_dir, 'media') + if os.path.exists(media_dir): + staged_media_parent, staged_media_dir = _stage_media_restore(media_dir) # 先清空数据库再加载快照；loaddata 只会 upsert，不能删除备份后新增的数据。 with transaction.atomic(): management.call_command('flush', '--noinput', verbosity=0) management.call_command('loaddata', db_file, verbosity=0) - - # 恢复媒体文件 - restore_media = request.POST.get('restore_media') == 'on' - if restore_media and backup_info.get('includes_media', False): - media_dir = os.path.join(backup_dir, 'media') - if os.path.exists(media_dir): - # 清空现有媒体目录 - if os.path.exists(settings.MEDIA_ROOT): - for item in os.listdir(settings.MEDIA_ROOT): - item_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(item_path): - shutil.rmtree(item_path) - else: - os.remove(item_path) - - # 复制备份中的媒体文件 - for item in os.listdir(media_dir): - src_path = os.path.join(media_dir, item) - dst_path = os.path.join(settings.MEDIA_ROOT, item) - if os.path.isdir(src_path): - if os.path.exists(dst_path): - shutil.rmtree(dst_path) - shutil.copytree(src_path, dst_path) - else: - if os.path.exists(dst_path): - os.remove(dst_path) - shutil.copy2(src_path, dst_path) + + if staged_media_dir: + _replace_media_root(staged_media_dir) # 恢复快照后，执行恢复的用户可能已不存在于当前数据库。 restored_user = get_user_model().objects.filter(pk=request.user.pk).first() @@ -279,15 +333,12 @@ def restore_backup(request, backup_name): except Exception as e: messages.error(request, f"恢复备份失败: {str(e)}") logger.error(f"恢复备份失败: {str(e)}") - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) + finally: + if staged_media_parent and os.path.exists(staged_media_parent): + shutil.rmtree(staged_media_parent, ignore_errors=True) - return render(request, 'inventory/system/restore_backup.html', { - 'backup_name': backup_name, - 'backup_info': backup_info - }) + return render(request, 'inventory/system/restore_backup.html', context) @login_required @permission_required('inventory.can_manage_backup')