|
- {hasSplits ? (
-
- ) : (
-
- )}
+ {(() => {
+ const jInfo = journalMap[uniqueKey];
+ if (jInfo) {
+ // 복식부기 분개 완료
+ return (
+
+ );
+ } else if (hasSplits) {
+ // 구버전 splits만 존재
+ return (
+
+ );
+ } else {
+ // 분개 없음
+ return (
+
+ );
+ }
+ })()}
|
{log.useDateTime || '-'}
@@ -1133,8 +1460,11 @@ className="w-full px-2 py-1 text-sm border border-stone-200 rounded focus:outlin
);
})()}
- {hasSplits && (
- 분개됨 ({logSplits.length}건)
+ {journalMap[uniqueKey] && (
+ {journalMap[uniqueKey].entry_no}
+ )}
+ {!journalMap[uniqueKey] && hasSplits && (
+ 구버전({logSplits.length}건)
)}
|
@@ -1395,7 +1725,12 @@ className="px-3 py-1 bg-green-500 text-white text-xs rounded-lg hover:bg-green-6
const [accountCodes, setAccountCodes] = useState([]);
const [hasChanges, setHasChanges] = useState(false);
- // 분개 관련 상태
+ // 복식부기 분개 관련 상태
+ const [journalMap, setJournalMap] = useState({});
+ const [journalModalOpen, setJournalModalOpen] = useState(false);
+ const [journalModalLog, setJournalModalLog] = useState(null);
+
+ // 구버전 분개 관련 상태
const [splits, setSplits] = useState({});
const [splitModalOpen, setSplitModalOpen] = useState(false);
const [splitModalLog, setSplitModalLog] = useState(null);
@@ -1501,6 +1836,7 @@ className="px-3 py-1 bg-green-500 text-white text-xs rounded-lg hover:bg-green-6
// 분개 데이터 로드
loadSplits();
+ loadJournalStatuses();
};
// 분개 데이터 로드
@@ -1522,6 +1858,88 @@ className="px-3 py-1 bg-green-500 text-white text-xs rounded-lg hover:bg-green-6
}
};
+ // 복식부기 분개 상태 로드
+ const loadJournalStatuses = async () => {
+ try {
+ const params = new URLSearchParams({
+ startDate: dateFrom.replace(/-/g, ''),
+ endDate: dateTo.replace(/-/g, '')
+ });
+ const response = await fetch(`${API.journalStatuses}?${params}`);
+ const data = await response.json();
+ if (data.success) {
+ setJournalMap(data.data || {});
+ }
+ } catch (err) {
+ console.error('분개 상태 로드 오류:', err);
+ }
+ };
+
+ // 복식부기 분개 모달 열기
+ const handleOpenJournalModal = (log, uniqueKey, hasJournal) => {
+ const logWithJournalInfo = {
+ ...log,
+ uniqueKey,
+ _hasJournal: hasJournal,
+ _journalData: null,
+ };
+ setJournalModalLog(logWithJournalInfo);
+ setJournalModalOpen(true);
+ };
+
+ // 복식부기 분개 저장
+ const handleSaveJournal = async (payload) => {
+ try {
+ const response = await fetch(API.journalStore, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRF-TOKEN': CSRF_TOKEN,
+ 'Accept': 'application/json'
+ },
+ body: JSON.stringify(payload)
+ });
+
+ const data = await response.json();
+ if (data.success) {
+ notify(data.message, 'success');
+ setJournalModalOpen(false);
+ setJournalModalLog(null);
+ loadJournalStatuses();
+ loadSplits(); // splits 자동 삭제 반영
+ } else {
+ notify(data.message || '분개 저장 실패', 'error');
+ }
+ } catch (err) {
+ notify('분개 저장 오류: ' + err.message, 'error');
+ }
+ };
+
+ // 복식부기 분개 삭제
+ const handleDeleteJournal = async (journalId) => {
+ try {
+ const response = await fetch(`${API.journalDelete}${journalId}`, {
+ method: 'DELETE',
+ headers: {
+ 'X-CSRF-TOKEN': CSRF_TOKEN,
+ 'Accept': 'application/json'
+ }
+ });
+
+ const data = await response.json();
+ if (data.success) {
+ notify(data.message, 'success');
+ setJournalModalOpen(false);
+ setJournalModalLog(null);
+ loadJournalStatuses();
+ } else {
+ notify(data.message || '분개 삭제 실패', 'error');
+ }
+ } catch (err) {
+ notify('분개 삭제 오류: ' + err.message, 'error');
+ }
+ };
+
// 요약 재계산: 분개가 있는 거래는 원본 대신 분개별 통계로 대체
// 수정된 공급가액/세액이 있으면 해당 값으로 합계 반영
const recalculateSummary = (currentLogs, allSplits) => {
@@ -2245,6 +2663,8 @@ className={`flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium tra
hiddenLogs={hiddenLogs}
onRestore={handleRestore}
loadingHidden={loadingHidden}
+ journalMap={journalMap}
+ onOpenJournalModal={handleOpenJournalModal}
/>
)}
@@ -2259,6 +2679,16 @@ className={`flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium tra
splits={splitModalExisting}
/>
+ {/* Card Journal Modal (복식부기) */}
+ { setJournalModalOpen(false); setJournalModalLog(null); }}
+ onSave={handleSaveJournal}
+ onDelete={handleDeleteJournal}
+ log={journalModalLog}
+ accountCodes={accountCodes}
+ />
+
{/* Manual Entry Modal */}
name('hide');
Route::post('/restore', [\App\Http\Controllers\Barobill\EcardController::class, 'restoreTransaction'])->name('restore');
Route::get('/hidden', [\App\Http\Controllers\Barobill\EcardController::class, 'hiddenTransactions'])->name('hidden');
+ // 복식부기 분개 (journal_entries 통합)
+ Route::post('/journal', [\App\Http\Controllers\Barobill\EcardController::class, 'storeJournal'])->name('journal.store');
+ Route::get('/journal', [\App\Http\Controllers\Barobill\EcardController::class, 'getJournal'])->name('journal.show');
+ Route::delete('/journal/{id}', [\App\Http\Controllers\Barobill\EcardController::class, 'deleteJournal'])->name('journal.delete');
+ Route::get('/journal-statuses', [\App\Http\Controllers\Barobill\EcardController::class, 'getJournalStatuses'])->name('journal.statuses');
});
// 홈택스 매출/매입 (React 페이지)
|