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

Merge payment methods #501

Merged
merged 16 commits into from
Nov 12, 2018
Merged

Merge payment methods #501

merged 16 commits into from
Nov 12, 2018

Conversation

cbellone
Copy link
Member

@cbellone cbellone commented Sep 6, 2018

No description provided.

@cbellone cbellone requested a review from syjer September 6, 2018 19:05
@@ -338,7 +338,7 @@ protected void configure(HttpSecurity http) throws Exception {
.antMatchers(HttpMethod.GET, ownershipRequired).hasAnyRole(ADMIN, OWNER)
.antMatchers(HttpMethod.GET, ADMIN_API + "/**").hasAnyRole(ADMIN, OWNER, SUPERVISOR)
.antMatchers(HttpMethod.POST, ADMIN_API + "/reservation/event/*/new", ADMIN_API + "/reservation/event/*/*").hasAnyRole(ADMIN, OWNER, SUPERVISOR)
.antMatchers(HttpMethod.PUT, ADMIN_API + "/reservation/event/*/*/notify", ADMIN_API + "/reservation/event/*/*/confirm").hasAnyRole(ADMIN, OWNER, SUPERVISOR)
.antMatchers(HttpMethod.PUT, ADMIN_API + "/reservation/event/*/*/notify", ADMIN_API + "/reservation/event/*/*/performPayment").hasAnyRole(ADMIN, OWNER, SUPERVISOR)
Copy link
Member

Choose a reason for hiding this comment

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

performPayment -> perform-payment ?

I think it's better to have the url lowercase.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.3%) to 51.591% when pulling 54efab1 on merge-payment-methods into 56a6972 on master.

@coveralls
Copy link

coveralls commented Sep 6, 2018

Coverage Status

Coverage increased (+0.2%) to 53.331% when pulling 3b68104 on merge-payment-methods into 84a4373 on master.

# Conflicts:
#	src/main/java/alfio/manager/TicketReservationManager.java
#	src/test/java/alfio/manager/TicketReservationManagerTest.java
@@ -89,6 +89,7 @@
private final TicketFieldRepository ticketFieldRepository;
private final PaymentManager paymentManager;
private final EuVatChecker vatChecker;
private final StripeCreditCardManager stripeCreditCardManager;
Copy link
Member

Choose a reason for hiding this comment

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

I guess that ideally you don't want the concrete implementation injected right?

# Conflicts:
#	src/main/java/alfio/manager/FileDownloadManager.java
# Conflicts:
#	src/main/java/alfio/manager/ExtensionManager.java
#	src/main/java/alfio/manager/TicketReservationManager.java
#	src/test/java/alfio/manager/TicketReservationManagerTest.java
@syjer syjer merged commit ab265b8 into master Nov 12, 2018
@syjer syjer deleted the merge-payment-methods branch January 10, 2019 14:02
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.

4 participants