Skip to content

Commit

Permalink
fix #1336 - handle update of additional item policy
Browse files Browse the repository at this point in the history
  • Loading branch information
cbellone committed Feb 23, 2024
1 parent bfe43b4 commit b59144c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/main/java/alfio/manager/AdditionalServiceManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public int update(int additionalServiceId,
additionalService.getExpiration().toZonedDateTime(event.getZoneId()),
additionalService.getVat(),
additionalService.getVatType(),
Optional.ofNullable(additionalService.getPrice()).map(p -> MonetaryUtil.unitToCents(p, event.getCurrency())).orElse(0));
Optional.ofNullable(additionalService.getPrice()).map(p -> MonetaryUtil.unitToCents(p, event.getCurrency())).orElse(0),
additionalService.getSupplementPolicy().name());
preGenerateItems(additionalServiceId, event, additionalService);
return result;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ AffectedRowCountAndKey<Integer> insert(@Bind("eventId") int eventId, @Bind("srcP
@Bind("supplementPolicy") AdditionalService.SupplementPolicy supplementPolicy);

@Query("update additional_service set fix_price = :fixPrice, ordinal = :ordinal, available_qty = :availableQty, max_qty_per_order = :maxQtyPerOrder," +
" inception_ts = :inceptionTs, expiration_ts = :expirationTs, vat = :vat, vat_type = :vatType, src_price_cts = :srcPriceCts where id = :id")
" inception_ts = :inceptionTs, expiration_ts = :expirationTs, vat = :vat, vat_type = :vatType, src_price_cts = :srcPriceCts, supplement_policy = :policy where id = :id")
int update(@Bind("id") int id, @Bind("fixPrice") boolean fixPrice,
@Bind("ordinal") int ordinal, @Bind("availableQty") int availableQuantity, @Bind("maxQtyPerOrder") int maxQtyPerOrder,
@Bind("inceptionTs") ZonedDateTime inception, @Bind("expirationTs") ZonedDateTime expiration, @Bind("vat") BigDecimal vat,
@Bind("vatType") AdditionalService.VatType vatType, @Bind("srcPriceCts") int srcPriceCts);
@Bind("vatType") AdditionalService.VatType vatType, @Bind("srcPriceCts") int srcPriceCts, @Bind("policy") String policy);

@Query("select * from additional_service_with_currency where event_id_fk = :eventId and supplement_policy = :supplementPolicy order by ordinal")
List<AdditionalService> findAllInEventWithPolicy(@Bind("eventId") int eventId, @Bind("supplementPolicy") AdditionalService.SupplementPolicy policy);
Expand Down

0 comments on commit b59144c

Please sign in to comment.