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

diff --git a/.vs/newton-cn/v16/.suo b/.vs/newton-cn/v16/.suo
index 815770571ebffc1bdaf545b6025b4a3e25f5e9a0..26c3297e3449b50327dca1c1e6a060cdb1107681 100644 (file)
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 3ce6649604ec8583ff0e7676533644c769e7a424..2ae54dfcb1608593518d71d6d1fd2acf255a15a4 100644 (file)
--- 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 d197006b3b7a2fce9ad52407ad5c696439039347..a7a5d37823beb0bf317ac5a83108cd434acfc027 100644 (file)
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 9bbad1dbe634695d46d16f281e445f6751170349..a21d8b641e489775d7378aea029a76b244b106e7 100644 (file)
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 101e842fc5e73ff9646955ab26c4a152305c4a1e..e209fcebd8f81a1234bb9298d211f86f634fde71 100644 (file)
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 ce970b04f3ae989cac1ce3ceb596509521a730d6..325d59991ff3248b31f8f7da515e1808f0485fe1 100644 (file)
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 b0b965bebc2e0097c2a199a2854a3f7b6fd24973..6df20e1a0a2b63ec78695d73347a04badc5d36e0 100644 (file)
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 d197006b3b7a2fce9ad52407ad5c696439039347..a7a5d37823beb0bf317ac5a83108cd434acfc027 100644 (file)
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 9bbad1dbe634695d46d16f281e445f6751170349..a21d8b641e489775d7378aea029a76b244b106e7 100644 (file)
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 (file)
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 004122203a8217e06f6066fdaad4c49c2aceaee8..80e63aa0ad8d69244af378add2970058512b70c1 100644 (file)
--- 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 101e842fc5e73ff9646955ab26c4a152305c4a1e..e209fcebd8f81a1234bb9298d211f86f634fde71 100644 (file)
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 ce970b04f3ae989cac1ce3ceb596509521a730d6..325d59991ff3248b31f8f7da515e1808f0485fe1 100644 (file)
Binary files a/newton-cn/obj/Release/newton-cn.pdb and b/newton-cn/obj/Release/newton-cn.pdb differ