Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added project01/bin/main/order/res/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added project01/bin/main/order/res/logo2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added project01/bin/main/order/res/logo3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion project01/src/main/manager/Get_order_list.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public String order_list() {

ResultSet rs = pstmt.executeQuery();
while (rs.next()) {
result += (String.format("[%s] - �ֹ���¥ : %s, �ֹ� �Ѿ�: %d\n%s\n\n", rs.getString("user_name"), rs.getString("order_date"), rs.getInt("payment"), rs.getString("user_order")));
result += (String.format("[%s]\n�ֹ���¥ : %s\n�ֹ��Ѿ�: %d\n[�ֹ�����]\n%s\n\n", rs.getString("user_name"), rs.getString("order_date"), rs.getInt("payment"), rs.getString("user_order")));
}

rs.close();
Expand Down
5 changes: 5 additions & 0 deletions project01/src/main/manager/Modify_point_frame.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import javax.swing.SwingConstants;

import javax.swing.border.LineBorder;

import main.LookupPoint;

import javax.swing.JTextField;


Expand Down Expand Up @@ -165,6 +168,8 @@ public void mouseClicked(MouseEvent e) {
}
else if (overlap == null) {
JOptionPane.showMessageDialog(null, "�������� �ʴ� ������Դϴ�.");
} else if (new LookupPoint().point(id.getText()) < Integer.parseInt(point.getText())) {
JOptionPane.showMessageDialog(null, "������ ����Ʈ�� ���� ����Ʈ���� �����ϴ�. �ٽ� �Է����ּ���.");
} else if (point.getText().equals("") || Integer.parseInt(point.getText()) <= 0) {
JOptionPane.showMessageDialog(null, "����Ʈ�� ��Ȯ�� �Է����ּ���.");
}else {
Expand Down
3 changes: 2 additions & 1 deletion project01/src/main/order/OrderFrame.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.awt.Color;
import java.awt.Cursor;
import java.awt.EventQueue;
import java.awt.Font;
import java.awt.Image;
import java.awt.event.MouseAdapter;
Expand All @@ -25,7 +26,7 @@ public class OrderFrame extends JFrame {
int usedPoint = 0;
private Image img_logo = new ImageIcon(OrderFrame.class.getResource("res/logo3.png")).getImage().getScaledInstance(100, 100, Image.SCALE_SMOOTH);
private JPanel contentPane;

public OrderFrame(String id) {
int point = new LookupPoint().point(id);
setUndecorated(true);
Expand Down
Binary file added project01/src/main/order/res/logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added project01/src/main/order/res/logo2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added project01/src/main/order/res/logo3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.