Merge branch 'dev' into inventory

Author: lanhlungboiz045

frontend/src/pages/Pos/TransactionHistory.jsx

@@ -390,9 +390,23 @@ function TransactionHistory() {
     items.forEach((item, i) => { refundAmount += (refundQtys[i] || 0) * (item.price || 0); });
 
     const oldTotal = parseInt((refundModal.total || '').toString().replace(/[^0-9]/g, '')) || 0;
+    const pointsDiscount = Number(refundModal.pointsDiscount || 0);
+    const noCashCollectedByPoints = oldTotal === 0 && pointsDiscount > 0;
+    if (noCashCollectedByPoints) {
+      refundAmount = 0;
+    }
+
     const newTotal = Math.max(0, oldTotal - refundAmount);
     const totalRefundedAmount = Number(refundModal.refundedAmount || 0) + refundAmount;
 
+    const refundNoteMessage = noCashCollectedByPoints
+      ? `Hoàn trả 0đ (đơn đã dùng điểm về 0đ) lúc ${new Date().toLocaleString('vi-VN', { hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' })}`
+      : `Hoàn trả ${refundAmount.toLocaleString()}đ lúc ${new Date().toLocaleString('vi-VN', { hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' })}`;
+
+    const refundSuccessMessage = noCashCollectedByPoints
+      ? 'Đã hoàn trả hàng thành công (đơn 0đ do dùng điểm nên không hoàn tiền)!'
+      : 'Đã hoàn trả thành công!';
+
     const updatedTransaction = {
       ...refundModal,
       cart: newItems,
@@ -401,15 +415,15 @@ function TransactionHistory() {
       quantity: `${newItems.reduce((s, it) => s + (it.qty || it.quantity || 1), 0)} món`,
       status: newItems.length === 0 ? 'Đã hoàn trả' : 'Hoàn thành',
       refundedAmount: totalRefundedAmount,
-      refundNote: `Hoàn trả ${refundAmount.toLocaleString()}đ lúc ${new Date().toLocaleString('vi-VN', { hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' })}`,
+      refundNote: refundNoteMessage,
     };
 
     const updatedTransactions = transactions.map(t => t.id === refundModal.id ? updatedTransaction : t);
     setTransactions(updatedTransactions);
     localStorage.setItem('transactions', JSON.stringify(updatedTransactions));
     setSelectedTransaction(prev => (prev?.id === updatedTransaction.id ? updatedTransaction : prev));
     setRefundModal(null);
-    showNotificationModal('Đã hoàn trả thành công!');
+    showNotificationModal(refundSuccessMessage);
   };
 
   const saveCustomerInfo = () => {
@@ -653,6 +667,7 @@ function TransactionHistory() {
           >
             <option value="all">Tất cả trạng thái</option>
             <option value="Hoàn thành">Hoàn thành</option>
+            <option value="Đã hoàn trả">Đã hoàn trả</option>
             <option value="Chờ thanh toán">Chờ thanh toán (Đơn treo)</option>
           </select>