PR

ヤマダポイント付与キャンペーン反映 #106

wada opened this at 2020-08-06T12:07:35; closed

Description

opened by wada at 2020-08-06T12:07:35; updated 2023-02-22T11:53:30

issue #84

Comment

#6142 by wada at 2020-08-06T12:10:51; updated 2020-08-06T12:10:51

反映手順

#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
wada merge at 2020-08-06T14:04:49: ヤマダポイント付与キャンペーン反映
wada close at 2020-08-06T14:04:49: Close
wada delete_label at 2020-08-06T14:04:55: レビュー待ち
wada delete_branch at 2020-08-06T14:06:45: add_yamada_pt_84

Commit range

base3bbac8e8e69dfdf8b354e8860ea9940c56f8c8cf
headb39a76835cbc64609866cd05360bf75090e09af8
base branchjolly/jr-web:master
head branchjolly/jr-web:add_yamada_pt_84

View commits

Commit details are loaded from Git when a dynamic archive server is running, or can be embedded with --include-commits.
Files changed18 filesView patch
statusfile
modifieddatabase/yamada_campaign.sql
modifiedlib/SubFunc.inc
modifiedlib/ajax/main_default.inc
addedlib/ajax/main_yamadaVerified.inc
modifiedlib/class/platform/yamada/YamadaAPI.class.php
modifiedlib/class/platform/yamada/YamadaPlatformService.class.php
modifiedlib/models/Yamada_athletic.php
addedlib/models/Yamada_campaign.php
addedlib/models/Yamada_point.php
modifiedpublic_html/ajax.php
addedpublic_html/img/pf/yamada/icon_add_point_1_1.png
addedpublic_html/img/pf/yamada/icon_add_point_1_2.png
addedpublic_html/img/pf/yamada/icon_add_point_1_3.png
addedpublic_html/img/pf/yamada/icon_add_point_1_4.png
modifiedpublic_html/js/JOLLYROGER.js
modifiedpublic_html/js/jr_main.js
modifiedpublic_html/template/Main.tpl
modifiedpublic_html/template/header_sp.tpl
Patch body is stored as a separate file to keep this page lightweight.