firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' into shopskin

Browse Source 
Conflicts:
	lib/shop.lib.php
This commit is contained in:
gnuboard
2013-07-25 11:16:30 +09:00
parent f135203631 d4821f0724
commit a7f3702567
29 changed files with 293 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
install/shop.sql
View File

@ -250,7 +250,6 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
`de_card_pg` varchar(255) NOT NULL DEFAULT '',
`de_card_max_amount` int(11) NOT NULL DEFAULT '0',
`de_point_settle` int(11) NOT NULL DEFAULT '0',
`de_mileage_use` tinyint(4) NOT NULL DEFAULT '0',
`de_level_sell` int(11) NOT NULL DEFAULT '0',
`de_send_cost_case` varchar(255) NOT NULL DEFAULT '',
`de_send_cost_limit` varchar(255) NOT NULL DEFAULT '',
@ -642,25 +641,6 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
-- --------------------------------------------------------
--
-- Table structure for table `shop_mileage`
--
DROP TABLE IF EXISTS `shop_mileage`;
CREATE TABLE IF NOT EXISTS `shop_mileage` (
`ml_id` INT(11) NOT NULL AUTO_INCREMENT,
`mb_id` VARCHAR(255) NOT NULL DEFAULT '',
`od_id` BIGINT(20) unsigned NOT NULL,
`ct_id` INT(11) NOT NULL DEFAULT '0',
`ml_content` VARCHAR(255) NOT NULL DEFAULT '',
`ml_point` INT(11) NOT NULL DEFAULT '0',
`ml_datetime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`ml_id`),
KEY `mb_id` (`mb_id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------
--
-- Table structure for table `shop_request`
--