From 4be2995c988dd47ec573d48a8421e3bd65d65312 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 11:29:08 +0900 Subject: [PATCH 1/5] =?UTF-8?q?okname=20key=20=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/okname/key/.htaccess | 1 + 1 file changed, 1 insertion(+) create mode 100644 plugin/okname/key/.htaccess diff --git a/plugin/okname/key/.htaccess b/plugin/okname/key/.htaccess new file mode 100644 index 000000000..05196c0b3 --- /dev/null +++ b/plugin/okname/key/.htaccess @@ -0,0 +1 @@ +# .htaccess From d5e3dbc115d38900a77d4d494873dc72cf1c79b1 Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 4 Oct 2013 13:28:28 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20textarea=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=ED=8F=B0=ED=8A=B8=20=EC=82=AC=EC=9D=B4=EC=A6=88,?= =?UTF-8?q?=20=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80=EB=85=B8=EB=9D=BC?= =?UTF-8?q?=EB=8B=98=20=EA=B1=B4=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- css/default.css | 2 +- css/mobile.css | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/admin.css b/css/admin.css index 5f82f9522..e54b162a4 100644 --- a/css/admin.css +++ b/css/admin.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, aside ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} -select {font-size:1em} +textarea, select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} button {border-radius:0;font-size:1em;-webkit-appearance:none} diff --git a/css/default.css b/css/default.css index 254dd2fce..7acffd2e7 100644 --- a/css/default.css +++ b/css/default.css @@ -9,7 +9,7 @@ h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:dotum} article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block} header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} label, input, select, img {vertical-align:middle} - +textarea, select {font-size:1em} input {margin:0;padding:0;border-radius:0;font-family:dotum} input[type=text], input[type=password], input[type=submit], input[type=image] {-webkit-appearance:none} diff --git a/css/mobile.css b/css/mobile.css index 8f0d99279..6a75f9b90 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -11,8 +11,8 @@ header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} input,button {margin:0;padding:0} -input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} /* 모바일에서만 사용 */ -select, textarea {font-size:1em} +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} +textarea, select {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} hr {display:none} From f2d073c8bae117b78f82ad088c52c2cac4dd0577 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 15:17:01 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20GD=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/index.php | 3 ++- install/library.check.php | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 install/library.check.php diff --git a/install/index.php b/install/index.php index 65b5549d4..b6c140f2d 100644 --- a/install/index.php +++ b/install/index.php @@ -1,6 +1,7 @@ @@ -17,7 +18,7 @@ if ($exists_data_dir && $write_data_dir) {
- +
diff --git a/install/library.check.php b/install/library.check.php new file mode 100644 index 000000000..08889cc50 --- /dev/null +++ b/install/library.check.php @@ -0,0 +1,14 @@ +

'.$msg.'

'); +} + +if(!extension_loaded('gd') || !function_exists('gd_info')) + die('GD 라이브러리를 설치하신 후 '.G5_VERSION.' 설치를 진행해 주십시오.'); +?> \ No newline at end of file From c685c9febbb99a83458647d0f6b4d167242fd4f4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 16:17:26 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EA=B3=BC=EC=84=B8=20=EA=B8=88?= =?UTF-8?q?=EC=95=A1=20=EA=B3=84=EC=82=B0=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderreceiptupdate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderreceiptupdate.php b/adm/shop_admin/orderreceiptupdate.php index aa66ab65a..d6a0ce4fa 100644 --- a/adm/shop_admin/orderreceiptupdate.php +++ b/adm/shop_admin/orderreceiptupdate.php @@ -34,8 +34,8 @@ if($od['od_tax_flag']) { $tot_tax_mny = ( $tax_mny + $od_send_cost + $od_send_cost2 ) - ( $od['od_coupon'] + $od['od_send_coupon'] + $od_receipt_point ); if($tot_tax_mny < 0) { - $tot_tax_mny = 0; $free_mny += $tot_tax_mny; + $tot_tax_mny = 0; } } else { $tot_tax_mny = ( $tax_mny + $free_mny + $od_send_cost + $od_send_cost2 ) From 1046841c380063274b8134b6cb44330384093dda Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 4 Oct 2013 16:55:48 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EA=B8=88=EC=95=A1?= =?UTF-8?q?=EC=97=90=20=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EC=9D=98=20=EC=B4=9D=EC=95=A1=EC=9D=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/ordercartupdate.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adm/shop_admin/ordercartupdate.php b/adm/shop_admin/ordercartupdate.php index 824b513f3..a01ca8c71 100644 --- a/adm/shop_admin/ordercartupdate.php +++ b/adm/shop_admin/ordercartupdate.php @@ -253,8 +253,10 @@ $od_misu = ( $cart_price + $send_cost + $od['od_send_cost2'] ) - ( $od['od_receipt_price'] + $od['od_receipt_point'] - $od['od_refund_price'] ); // 주문정보 반영 +$od_cart_price = $cart_price + $cancel_price; + $sql = " update {$g5['g5_shop_order_table']} - set od_cart_price = '$cart_price', + set od_cart_price = '$od_cart_price', od_cart_coupon = '$cart_coupon', od_coupon = '$tot_od_cp_price', od_send_coupon = '$tot_sc_cp_price',