Merge branch 'g4s'

Conflicts:
	css/admin.css
This commit is contained in:
chicpro
2013-05-03 18:01:15 +09:00
25 changed files with 339 additions and 227 deletions

View File

@ -411,9 +411,10 @@ CREATE TABLE IF NOT EXISTS `g4s_member` (
`mb_jumin` varchar(255) NOT NULL default '',
`mb_sex` char(1) NOT NULL default '',
`mb_birth` varchar(255) NOT NULL default '',
`mb_adult` enum('N','Y') NOT NULL default 'N',
`mb_tel` varchar(255) NOT NULL default '',
`mb_hp` varchar(255) NOT NULL default '',
`mb_hp_certify` tinyint(4) NOT NULL default '0',
`mb_adult` tinyint(4) NOT NULL default '0',
`mb_zip1` char(3) NOT NULL default '',
`mb_zip2` char(3) NOT NULL default '',
`mb_addr1` varchar(255) NOT NULL default '',
@ -430,7 +431,6 @@ CREATE TABLE IF NOT EXISTS `g4s_member` (
`mb_email_certify` datetime NOT NULL default '0000-00-00 00:00:00',
`mb_memo` text NOT NULL,
`mb_lost_certify` varchar(255) NOT NULL,
`mb_hp_certify` datetime NOT NULL default '0000-00-00 00:00:00',
`mb_mailling` tinyint(4) NOT NULL default '0',
`mb_sms` tinyint(4) NOT NULL default '0',
`mb_open` tinyint(4) NOT NULL default '0',