Description
issue #84
issue #84
反映手順
#db
cd ./jrye-db
git checkout master
git pull
git merge origin/develop
git push
ssh jr-adm
deploy db
#sql実行
CREATE TABLE `log_yamada_point` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`user_no` int(11) NOT NULL,
`campaign_id` tinyint(4) unsigned NOT NULL,
`type_id` int(11) unsigned NOT NULL,
`send_api` tinyint(4) unsigned NOT NULL DEFAULT '0',
`request_no` varchar(50) NOT NULL DEFAULT '',
`reg_date` datetime NOT NULL,
PRIMARY KEY (`id`),
KEY `user_mission` (`user_no`,`campaign_id`,`type_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
#キャンペーンの開催期間確認
#web
#Merge pull request
ssh jr-adm
update web
deploy web| base | 3bbac8e8e69dfdf8b354e8860ea9940c56f8c8cf |
|---|---|
| head | b39a76835cbc64609866cd05360bf75090e09af8 |
| base branch | jolly/jr-web:master |
| head branch | jolly/jr-web:add_yamada_pt_84 |
| status | file |
|---|---|
| modified | database/yamada_campaign.sql |
| modified | lib/SubFunc.inc |
| modified | lib/ajax/main_default.inc |
| added | lib/ajax/main_yamadaVerified.inc |
| modified | lib/class/platform/yamada/YamadaAPI.class.php |
| modified | lib/class/platform/yamada/YamadaPlatformService.class.php |
| modified | lib/models/Yamada_athletic.php |
| added | lib/models/Yamada_campaign.php |
| added | lib/models/Yamada_point.php |
| modified | public_html/ajax.php |
| added | public_html/img/pf/yamada/icon_add_point_1_1.png |
| added | public_html/img/pf/yamada/icon_add_point_1_2.png |
| added | public_html/img/pf/yamada/icon_add_point_1_3.png |
| added | public_html/img/pf/yamada/icon_add_point_1_4.png |
| modified | public_html/js/JOLLYROGER.js |
| modified | public_html/js/jr_main.js |
| modified | public_html/template/Main.tpl |
| modified | public_html/template/header_sp.tpl |