Skip to content

C
check
Commit af1e056c by Hayato Kamimura
Options

【規約同意】名称修正

parent 34b214d4
Showing with 30 additions and 27 deletions
abweb/common/json/lang/lang-en.json
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
"sitePolicy": "Site Policy", "sitePolicy": "Site Policy",
"agreementToTermsTitle": "Terms of Service", "agreementToTermsTitle": "Terms of Service",
"TermAgree": "Agree", "agreeTerm": "Agree",
"TermDisagree": "Disagree", "disagreeTerm": "Disagree",
"msgDisagreeTerm": "Log out and then go to the login screen. Are you okay?" "msgDisagreeTerm": "Log out and then go to the login screen. Are you okay?"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ja.json
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
"sitePolicy": "サイトポリシー", "sitePolicy": "サイトポリシー",
"agreementToTermsTitle": "利用規約", "agreementToTermsTitle": "利用規約",
"TermAgree": "同意する", "agreeTerm": "同意する",
"TermDisagree": "同意しない", "disagreeTerm": "同意しない",
"msgDisagreeTerm": "ログアウトされ、ログイン画面に遷移します。よろしいでしょうか？" "msgDisagreeTerm": "ログアウトされ、ログイン画面に遷移します。よろしいでしょうか？"
} }
\ No newline at end of file
abweb/common/json/lang/lang-ko.json
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
"sitePolicy": "사이트 정책", "sitePolicy": "사이트 정책",
"agreementToTermsTitle": "이용규약", "agreementToTermsTitle": "이용규약",
"TermAgree": "동의", "agreeTerm": "동의",
"TermDisagree": "동의 안함", "disagreeTerm": "동의 안함",
"msgDisagreeTerm": "로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?" "msgDisagreeTerm": "로그 아웃되어 로그인 화면으로 이동합니다. 실행 하시겠습니까?"
} }
\ No newline at end of file
abweb/html/agreementToTerms.html
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
agreementToTerms.initagreement(); agreementToTerms.initAgreement();
}) })
</script> </script>
</head> </head>
...@@ -46,14 +46,14 @@ ...@@ -46,14 +46,14 @@
<div id="loader"></div> <div id="loader"></div>
<div class="tos-wrapper"> <div class="tos-wrapper">
<div class="title"> <div class="title">
<h2 id="termsTitle">利用規約</h2> <h2 id="agreementToTermsTitle">利用規約</h2>
<p class="tos-version" id="termsVersion"></p> <p class="tos-version" id="termsVersion"></p>
</div> </div>
<div class="tos-text"> <div class="tos-text">
<p id="agreement"></p> <p id="terms"></p>
</div> </div>
<div class="btn-wrapper"> <div class="btn-wrapper">
<button class="btn btn-agree" id="agreeTerm" onclick="agreementToTerms.sendAgreeTerms()">同意する</a> <button class="btn btn-agree" id="agreeTerm" onclick="agreementToTerms.agreeTerm()">同意する</a>
<button class="btn btn-disagree" id="disagreeTerm" onclick="agreementToTerms.disagreeTerm()">同意しない</a> <button class="btn btn-disagree" id="disagreeTerm" onclick="agreementToTerms.disagreeTerm()">同意しない</a>
</div> </div>
......
abweb/js/agreementToTerms/agreementToTerms.js
...@@ -2,21 +2,21 @@ ...@@ -2,21 +2,21 @@
var agreementToTerms = {}; var agreementToTerms = {};
//言語、規約情報読み込み //言語、規約情報読み込み
agreementToTerms.initagreement = function(){ agreementToTerms.initAgreement = function(){
var data = agreementToTerms.requireTerms(); var data = agreementToTerms.getTerms();
$("#termsTitle").text(I18N.i18nText("agreementToTermsTitle")); $("#agreementToTermsTitle").text(I18N.i18nText("agreementToTermsTitle"));
$("#agreeTerm").text(I18N.i18nText("TermAgree")); $("#agreeTerm").text(I18N.i18nText("agreeTerm"));
$("#disagreeTerm").text(I18N.i18nText("TermDisagree")); $("#disagreeTerm").text(I18N.i18nText("disagreeTerm"));
$("#termsVersion").text(data.termsVersion); $("#termsVersion").text(data.termsVersion);
$("#agreement").text(data.agreement); $("#terms").text(data.terms);
} };
//遷移先の決定 //遷移先の決定
agreementToTerms.destinationHtml = function(){ agreementToTerms.destinationHtml = function(){
var data = agreementToTerms.requireTerms(); var data = agreementToTerms.getTerms();
if(data.httpStatus == CONSTANT.HTTP_STATUS.OK){ if(data.httpStatus == CONSTANT.HTTP_STATUS.OK){
//公開中バージョンに未同意の場合 //公開中バージョンに未同意の場合
if(data.termsVersion || data.agreement){ if(data.termsVersion || data.terms){
//利用規約画面に遷移 //利用規約画面に遷移
COMMON.avwScreenMove("agreementToTerms.html"); COMMON.avwScreenMove("agreementToTerms.html");
}else{ }else{
...@@ -28,16 +28,16 @@ agreementToTerms.destinationHtml = function(){ ...@@ -28,16 +28,16 @@ agreementToTerms.destinationHtml = function(){
COMMON.closeLoading(); COMMON.closeLoading();
COMMON.showAlert('errorOccurred'); COMMON.showAlert('errorOccurred');
} }
} };
//利用規約情報の取得 //利用規約情報の取得
agreementToTerms.requireTerms = function(){ agreementToTerms.getTerms = function(){
var apiData = {}; var apiData = {};
var params = { var params = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
}; };
const url = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath()) + "/requireTerms/"; const url = COMMON.format(ClientData.conf_apiUrl(), ClientData.userInfo_accountPath()) + "/getTerms/";
COMMON.cmsAjax( COMMON.cmsAjax(
url, url,
params, params,
...@@ -57,8 +57,8 @@ agreementToTerms.requireTerms = function(){ ...@@ -57,8 +57,8 @@ agreementToTerms.requireTerms = function(){
}; };
//利用規約情報同意の送信 //利用規約情報同意の送信
agreementToTerms.sendAgreeTerms = function(){ agreementToTerms.agreeTerm = function(){
var apiData = agreementToTerms.requireTerms(); var apiData = agreementToTerms.getTerms();
params = { params = {
sid: COMMON.getSid(), sid: COMMON.getSid(),
termsVersion: apiData.termsVersion, termsVersion: apiData.termsVersion,
...@@ -80,7 +80,7 @@ agreementToTerms.sendAgreeTerms = function(){ ...@@ -80,7 +80,7 @@ agreementToTerms.sendAgreeTerms = function(){
} }
} }
) )
} };
//利用規約に同意しない //利用規約に同意しない
agreementToTerms.disagreeTerm = function(){ agreementToTerms.disagreeTerm = function(){
...@@ -88,4 +88,4 @@ agreementToTerms.disagreeTerm = function(){ ...@@ -88,4 +88,4 @@ agreementToTerms.disagreeTerm = function(){
//ログアウトし、ログイン画面に遷移する //ログアウトし、ログイン画面に遷移する
HEADER.processLogout(); HEADER.processLogout();
} }
} };
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment