Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
em
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ichikawa
em
Commits
ca355c61
Commit
ca355c61
authored
Mar 24, 2023
by
Kazuki Nakamura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
カード郵送申請の画面遷移バグ修正、文言修正、表示修正
parent
d961479a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
src/main/java/jp/agentec/sinaburocast/action/user/PointUseAction.java
+1
-1
src/main/java/jp/agentec/sinaburocast/service/MemberCardReceiptService.java
+1
-1
src/main/webapp/WEB-INF/view/user/pointUse/pointUseEnd.html
+6
-2
src/main/webapp/WEB-INF/view/user/top/howto.html
+2
-2
No files found.
src/main/java/jp/agentec/sinaburocast/action/user/PointUseAction.java
View file @
ca355c61
...
...
@@ -194,7 +194,7 @@ public class PointUseAction extends AbstractAction {
public
String
memberRegistPage
()
throws
ParseException
{
// 当月を取得
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
YYYY
/MM"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
yyyy
/MM"
);
String
[]
currentYearMonth
=
sdf
.
format
(
SinaburoUtil
.
getTimestamp
()).
split
(
"/"
);
// 申請済みか判定
if
(
memberCardReceiptService
.
findByMemberIdAndMonth
(
getMember
().
memberId
,
currentYearMonth
[
0
],
currentYearMonth
[
1
])){
...
...
src/main/java/jp/agentec/sinaburocast/service/MemberCardReceiptService.java
View file @
ca355c61
...
...
@@ -87,7 +87,7 @@ public class MemberCardReceiptService extends AbstractService<MemberCardReceipt>
return
false
;
}
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
YYYY
/MM"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"
yyyy
/MM"
);
for
(
MemberCardReceipt
memberCardReceipt
:
resultList
)
{
String
[]
applyYearMonth
=
sdf
.
format
(
memberCardReceipt
.
applyDate
).
split
(
"/"
);
if
(
year
.
equals
(
applyYearMonth
[
0
])
&&
month
.
equals
(
applyYearMonth
[
1
]))
{
...
...
src/main/webapp/WEB-INF/view/user/pointUse/pointUseEnd.html
View file @
ca355c61
...
...
@@ -35,8 +35,12 @@
<tr><td><b>
ポイント交換の申し込みが完了しました。
</b></td></tr>
#if($!pointUseForm.giftType == 1)
<tr><td><br>
「エコボ満点カード」はご登録の住所へお送りいたします。
</td></tr>
<tr><td>
◆Agentec
</td></tr>
<tr><td>
http://ainq.agentec.jp
</td></tr>
<tr><td>
※毎月15日まで受付し、月末の発送になります。
</td></tr>
<tr><td>
※7月1日~8月20日の間は、10日毎に受付を集計して発送いたします。
</td></tr>
<tr><td>
※エコボカードの詳細はこちら(パソコンのみ)↓
</td></tr>
<tr><td><a
href=
"https://www.city.ichikawa.lg.jp/pla06/1111000001.html"
>
https://www.city.ichikawa.lg.jp/pla06/1111000001.html
</a></td></tr>
<tr><td><br>
◆市川市eモニ事務局
</td></tr>
<tr><td><a
href=
"http://www.e-moni.city.ichikawa.chiba.jp"
>
http://www.e-moni.city.ichikawa.chiba.jp
</a></td></tr>
#else
<tr><td><br>
毎月15日までに受付し、月末の付与になります。
</td></tr>
<tr><td><font
color=
"red"
>
7月1日~8月20日までは、10日毎に受付を集計し、2週間程度で付与いたします。
</font></td></tr>
...
...
src/main/webapp/WEB-INF/view/user/top/howto.html
View file @
ca355c61
...
...
@@ -385,12 +385,12 @@ em@e-moni.city.ichikawa.chiba.jpに空メールを送信ください。QRコー
<a
href=
"https://www.city.ichikawa.lg.jp/pla06/1111000001.html"
target=
"_blank"
>
エコボカードの詳細はこちら
</a>
</td>
</tr>
<!--
<tr>
<td>☆</td>
<td><a href="http://ichikawa.genki365.net/gnki02/pub/sheet.php?id=54640" target="_blank">「満点エコボカード」と交換可能なメニューはこちら</a></td>
</tr>
<tr>
<tr>
-->
<td
colspan=
"2"
>
<p
align=
"left"
><a
target=
"_blank"
href=
"https://www.city.ichikawa.lg.jp/pla06/1111000001.html"
><img
src=
"/em/images/mecovocard.jpg"
></a></p>
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment