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.

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

別のお届け先が追加できなくなっていたのを修正 #1131

Merged
merged 3 commits into from
Jan 16, 2025

Conversation

nanasess
Copy link
Contributor

@nanasess nanasess commented Jan 9, 2025

#1077 のデグレ

fixed #1138

Copy link

codecov bot commented Jan 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.93%. Comparing base (35e42bf) to head (190eb71).
Report is 4 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #1131   +/-   ##
=======================================
  Coverage   49.93%   49.93%           
=======================================
  Files          82       82           
  Lines       10482    10483    +1     
=======================================
+ Hits         5234     5235    +1     
  Misses       5248     5248           
Flag Coverage Δ
tests 49.93% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@seasoftjapan
Copy link
Contributor

seasoftjapan commented Jan 15, 2025

追加できることを確認しました。

ただ、delivErrorCheck() は現状のシンプルな処理を維持して、registAddress() 側を insert() update() 直前で実行する方が良い気がします。

あと、本来は isset($arrParam['other_deliv_id']) でチェックしたらマズいパターンな気がします。
is_null($arrParam['customer_id']) も、Warning 出得るパターンでしょうか。

getAddress() や getList() にも適用しているのも違和感あります。そのために、ロジックが複雑になっている訳で。ただ、何かの役に立つこともあるかもしれないので、外しにくいですね...

上述の辺りを踏まえて、別の PR を出そうかと思います。
こちらの PR も、デグレ対応として、追加できない現状よりずっと良いという認識です。

@nanasess
Copy link
Contributor Author

@seasoftjapan
ご確認ありがとうございます!

is_null($arrParam['customer_id']) も、Warning 出得るパターンでしょうか。

はい、これでも Warning になりますね😢

@nanasess nanasess enabled auto-merge January 16, 2025 06:23
@nanasess nanasess merged commit a05ccf0 into EC-CUBE:master Jan 16, 2025
108 checks passed
@nanasess nanasess deleted the fix-adddeliv branch January 16, 2025 07:47
@nanasess nanasess mentioned this pull request Jan 17, 2025
25 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

/mypage/delivery_addr.php 追加できない
3 participants