From: newton-cn <insang@kakao.com>
Date: Tue, 2 Sep 2025 09:57:17 +0000 (+0900)
Subject: 할인일때 수기적립X 자동계산되도록
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=493e662b3635b5e7e65a6dada5739d0a92f54dc7;p=newton-cn_pos.git

할인일때 수기적립X 자동계산되도록
---

diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo
index 8157705..26c3297 100644
Binary files a/.vs/newton-cn/v16/.suo and b/.vs/newton-cn/v16/.suo differ
diff --git a/newton-cn/Form5.cs b/newton-cn/Form5.cs
index 3ce6649..2ae54df 100644
--- a/newton-cn/Form5.cs
+++ b/newton-cn/Form5.cs
@@ -167,11 +167,11 @@ namespace newton_cn
                 return;
             }
 
-            if (is_dc == 1)
-            {
-                MessageBox.Show(new Form { TopMost = true }, "상품이 할인결제된 항목입니다 수기로 적립해주세요.");
-                return;
-            }
+            //if (is_dc == 1)
+            //{
+                //MessageBox.Show(new Form { TopMost = true }, "상품이 할인결제된 항목입니다 수기로 적립해주세요.");
+                //return;
+            //}
 
             DBConnector dbc = new DBConnector();
             int result = dbc.updateDisposableIsEarn(ct_code, addPoint);
diff --git a/newton-cn/bin/Debug/newton-cn.exe b/newton-cn/bin/Debug/newton-cn.exe
index d197006..a7a5d37 100644
Binary files a/newton-cn/bin/Debug/newton-cn.exe and b/newton-cn/bin/Debug/newton-cn.exe differ
diff --git a/newton-cn/bin/Debug/newton-cn.pdb b/newton-cn/bin/Debug/newton-cn.pdb
index 9bbad1d..a21d8b6 100644
Binary files a/newton-cn/bin/Debug/newton-cn.pdb and b/newton-cn/bin/Debug/newton-cn.pdb differ
diff --git a/newton-cn/bin/Release/newton-cn.exe b/newton-cn/bin/Release/newton-cn.exe
index 101e842..e209fce 100644
Binary files a/newton-cn/bin/Release/newton-cn.exe and b/newton-cn/bin/Release/newton-cn.exe differ
diff --git a/newton-cn/bin/Release/newton-cn.pdb b/newton-cn/bin/Release/newton-cn.pdb
index ce970b0..325d599 100644
Binary files a/newton-cn/bin/Release/newton-cn.pdb and b/newton-cn/bin/Release/newton-cn.pdb differ
diff --git a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index b0b965b..6df20e1 100644
Binary files a/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/newton-cn/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/newton-cn/obj/Debug/newton-cn.exe b/newton-cn/obj/Debug/newton-cn.exe
index d197006..a7a5d37 100644
Binary files a/newton-cn/obj/Debug/newton-cn.exe and b/newton-cn/obj/Debug/newton-cn.exe differ
diff --git a/newton-cn/obj/Debug/newton-cn.pdb b/newton-cn/obj/Debug/newton-cn.pdb
index 9bbad1d..a21d8b6 100644
Binary files a/newton-cn/obj/Debug/newton-cn.pdb and b/newton-cn/obj/Debug/newton-cn.pdb differ
diff --git a/newton-cn/obj/Release/newton-cn.csproj.AssemblyReference.cache b/newton-cn/obj/Release/newton-cn.csproj.AssemblyReference.cache
deleted file mode 100644
index 654fe63..0000000
Binary files a/newton-cn/obj/Release/newton-cn.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newton-cn/obj/Release/newton-cn.csproj.FileListAbsolute.txt b/newton-cn/obj/Release/newton-cn.csproj.FileListAbsolute.txt
index 0041222..80e63aa 100644
--- a/newton-cn/obj/Release/newton-cn.csproj.FileListAbsolute.txt
+++ b/newton-cn/obj/Release/newton-cn.csproj.FileListAbsolute.txt
@@ -36,4 +36,3 @@ z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Release\newton_cn.
 z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Release\newton_cn.Form6.resources
 z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Release\newton_cn.Form7.resources
 z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Release\newton_cn.Form8.resources
-z:\바탕 화면\insang\workspace\newton-cn_pos\newton-cn\obj\Release\newton-cn.csproj.AssemblyReference.cache
diff --git a/newton-cn/obj/Release/newton-cn.exe b/newton-cn/obj/Release/newton-cn.exe
index 101e842..e209fce 100644
Binary files a/newton-cn/obj/Release/newton-cn.exe and b/newton-cn/obj/Release/newton-cn.exe differ
diff --git a/newton-cn/obj/Release/newton-cn.pdb b/newton-cn/obj/Release/newton-cn.pdb
index ce970b0..325d599 100644
Binary files a/newton-cn/obj/Release/newton-cn.pdb and b/newton-cn/obj/Release/newton-cn.pdb differ