Merge branch 'master' into itemuse

Conflicts:
	adm/shop_admin/index.php

install/install_db.php

@@ -494,6 +494,7 @@ if($shop_install) {
     fwrite($f, "\$g4['shop_wish_table'] = SHOP_TABLE_PREFIX.'wish'; // 보관함(위시리스트) 테이블\n");
     fwrite($f, "\$g4['shop_mileage_table'] = SHOP_TABLE_PREFIX.'mileage'; // 마일리지 테이블\n");
     fwrite($f, "\$g4['shop_coupon_table'] = SHOP_TABLE_PREFIX.'coupon'; // 쿠폰정보 테이블\n");
+    fwrite($f, "\$g4['shop_sendcost_table'] = SHOP_TABLE_PREFIX.'sendcost'; // 추가배송비 테이블\n");
     fwrite($f, "?>");
 }
 

install/shop.sql

@@ -652,6 +652,26 @@ CREATE TABLE IF NOT EXISTS `shop_mileage` (
   KEY `mb_id` (`mb_id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `shop_sendcost`
+--
+
+DROP TABLE IF EXISTS `shop_sendcost`;
+CREATE TABLE IF NOT EXISTS `shop_sendcost` (
+  `sc_id` INT(11) NOT NULL AUTO_INCREMENT,
+  `sc_name` VARCHAR(255) NOT NULL DEFAULT '',
+  `sc_zip1` VARCHAR(10) NOT NULL DEFAULT '',
+  `sc_zip2` VARCHAR(10) NOT NULL DEFAULT '',
+  `sc_amount` INT(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`sc_id`),
+  KEY `sc_zip1` (`sc_zip1`),
+  KEY `sc_zip2` (`sc_zip2`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `shop_wish`
 --