diff --git a/resources/views/barobill/ecard/index.blade.php b/resources/views/barobill/ecard/index.blade.php index d339d9dc..e6827f8a 100644 --- a/resources/views/barobill/ecard/index.blade.php +++ b/resources/views/barobill/ecard/index.blade.php @@ -298,7 +298,9 @@ className={`px-3 py-1.5 text-xs cursor-pointer ${ if (!isOpen || !log) return null; - const originalAmount = log.approvalAmount || 0; + const effectiveSupply = log.effectiveSupplyAmount ?? ((log.approvalAmount || 0) - (log.tax || 0)); + const effectiveTaxVal = log.effectiveTax ?? (log.tax || 0); + const originalAmount = effectiveSupply + effectiveTaxVal; // 합계금액 = sum(공급가액 + 세액) const splitTotal = splits.reduce((sum, s) => sum + (parseFloat(s.supplyAmount) || 0) + (parseFloat(s.tax) || 0), 0); const isValid = Math.abs(originalAmount - splitTotal) < 0.01; @@ -2382,7 +2384,7 @@ className="px-3 py-1 bg-green-500 text-white text-xs rounded-lg hover:bg-green-6 useDt: log.useDt, useDate: log.useDate, approvalNum: log.approvalNum, - originalAmount: log.approvalAmount, + originalAmount: (log.effectiveSupplyAmount ?? ((log.approvalAmount || 0) - (log.tax || 0))) + (log.effectiveTax ?? (log.tax || 0)), merchantName: log.merchantName }, splits: splitData