Skip to content

Commit

Permalink
Compare article which is neither original or generikum zdavatz#69
Browse files Browse the repository at this point in the history
  • Loading branch information
b123400 committed Apr 24, 2020
1 parent 2bd92fa commit a6149a7
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions app/models/ShoppingRose.java
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ public List<RoseArticle> updateShoppingCart() {
if (!alter_ean_code.equals(ean_code)) {
if (a.isOriginal()
|| article.isGenerikum()
|| (!a.isOriginal() && !a.isGenerikum()) // Case which it is neither original / generikum #69
|| a.isReplacementArticle()
|| (article.isGenerikum() && article.getShippingStatus() > 1 && a.isOriginal() && a.getShippingStatus() == 1)) {

Expand Down

0 comments on commit a6149a7

Please sign in to comment.