Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

236会員登録時に利用規約チェックボックス追加 #3308

Merged
merged 16 commits into from
Aug 15, 2018
Merged

236会員登録時に利用規約チェックボックス追加 #3308

merged 16 commits into from
Aug 15, 2018

Conversation

oywc410
Copy link
Contributor

@oywc410 oywc410 commented Jul 11, 2018

No description provided.

@ryo-endo ryo-endo added this to the 3.n.0 milestone Jul 12, 2018
@ryo-endo
Copy link
Contributor

@oywc410
未チェック時のエラー表示を、他のエラーと表示の見た目を合わせていただきたいです。
image

@okazy
Copy link
Contributor

okazy commented Jul 20, 2018

@oywc410
入力画面と確認画面のformの制御について、EntryTypeのイベントではなくtwigでtype:hiddenを指定して制御した方がスマートかと思いましたのでプルリクをお送りしました。
問題なければ取り込んでいただけますでしょうか？
oywc410#1

@oywc410
Merge pull request #1 from okazy/eccube4_236
b10b911 
EntryTypeのイベントからtwigでtype:hiddenを指定して制御するように修正
@oywc410
Copy link
Contributor Author

oywc410 commented Jul 20, 2018

ありがとうございます

okazy
okazy suggested changes Jul 26, 2018
View reviewed changes
src/Eccube/Resource/template/default/Entry/index.twig Outdated
@@ -235,8 +234,12 @@ file that was distributed with this source code.
{{ form_errors(form.user_policy_check) }}
</p>
</div>
<button class="ec-blockBtn--action" type="submit" name="mode" value="confirm">{{'common.label.goto_conf'|trans}}</button>
<a class="ec-blockBtn--cancel" href="{{ url('homepage') }}">{{'common.label.back_to_top'|trans}}</a>
<p><span></span>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

「利用規約 に同意してお進みください。」文言が2回表示されてしまっております。
こちらのpタグは不要かと思いますので削除をお願いできますでしょうか？

@ryo-endo ryo-endo changed the base branch from experimental/sf to 4.0 August 6, 2018 11:17
@ryo-endo
Copy link
Contributor

ryo-endo commented Aug 7, 2018

@oywc410 こちら取り込みたいのでコンフリクトの解消をお願いします。

@ryo-endo ryo-endo added this to Fix-me in 4.0 BugHunt Aug 7, 2018
@oywc410
Copy link
Contributor Author

oywc410 commented Aug 8, 2018

continuousところ

Failures
 - php (exited 404) - Error while running 'C:\ProgramData\chocolatey\lib\php\tools\chocolateyInstall.ps1'.
 See log for details.
Command exited with code 404

エラーになりました
ご確認お願いいただけますか？

@ryo-endo ryo-endo moved this from Fix-me (修正が必要) to In progress (一次確認中) in 4.0 BugHunt Aug 9, 2018
@ryo-endo
Copy link
Contributor

ryo-endo commented Aug 9, 2018

AppVeyorは機嫌が悪かっただけみたいです。再実行で通りました。
最終確認させていただきます。

@ryo-endo ryo-endo moved this from In progress (一次確認中) to To do in 4.0 BugHunt Aug 9, 2018
@ryo-endo ryo-endo moved this from To do to In review (開発チームのレビュー必要) in 4.0 BugHunt Aug 9, 2018
@k-yamamura k-yamamura mentioned this pull request Aug 14, 2018
Merged
@ryo-endo ryo-endo merged commit 474792f into EC-CUBE:4.0 Aug 15, 2018
4.0 BugHunt automation moved this from In review (開発チームのレビュー必要) to Done Aug 15, 2018
@ryo-endo
Copy link
Contributor

#3574 で引き継いで対応させていただきました。こちらCLOSEします。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@okazy okazy okazy approved these changes

Assignees

@k-yamamura k-yamamura

Labels
Status: fix-me Status: needs-review
Projects
No open projects
4.0 BugHunt
  
Done
Milestone
4.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@oywc410 @ryo-endo @okazy @k-yamamura