Skip to content

Codecrew / Moya

Go to a project
Commit 5bfca6b4 by Tuomas Riihimäki
Options

Create new stamp for eqch payment query. Checkout fill fail the query for multip… 

…le requests with same stamp
1 parent 6262d1a9
Pipeline #176 failed
in 0 seconds
Inline Side-by-side
Showing with 3 additions and 3 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/checkout/CheckoutCreateQueryBuilder.java
...@@ -38,7 +38,7 @@ public class CheckoutCreateQueryBuilder extends CheckoutQueryBuilder { ...@@ -38,7 +38,7 @@ public class CheckoutCreateQueryBuilder extends CheckoutQueryBuilder {
CheckoutV2CallbackUrlPojo callbackUrls = new CheckoutV2CallbackUrlPojo(returnUrl + "v2success.jsf", returnUrl + "v2cancel.jsf"); CheckoutV2CallbackUrlPojo callbackUrls = new CheckoutV2CallbackUrlPojo(returnUrl + "v2success.jsf", returnUrl + "v2cancel.jsf");
createQuery.setRedirectUrls(callbackUrls); createQuery.setRedirectUrls(callbackUrls);
createQuery.setCallbackUrls(callbackUrls); createQuery.setCallbackUrls(callbackUrls);
createQuery.setCustomer(creatCustomer(bill)); createQuery.setCustomer(creatCustomer(bill));
//queryBuilder.addParam(CheckoutFiPaymentParam.MERCHANT, queryBuilder.getMerchantId()); //queryBuilder.addParam(CheckoutFiPaymentParam.MERCHANT, queryBuilder.getMerchantId());
...@@ -91,7 +91,7 @@ public class CheckoutCreateQueryBuilder extends CheckoutQueryBuilder { ...@@ -91,7 +91,7 @@ public class CheckoutCreateQueryBuilder extends CheckoutQueryBuilder {
final StringBuilder stamp = new StringBuilder(); final StringBuilder stamp = new StringBuilder();
stamp.append(bill.getId()); stamp.append(bill.getId());
stamp.append(STAMP_SPLITCHAR); stamp.append(STAMP_SPLITCHAR);
stamp.append(bill.getSentDate().getTime() / 1000); stamp.append(System.currentTimeMillis() / 1000);
return stamp.toString(); return stamp.toString();
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/BillEditView.java
...@@ -88,7 +88,7 @@ public class BillEditView extends GenericCDIView { ...@@ -88,7 +88,7 @@ public class BillEditView extends GenericCDIView {
public boolean getCheckoutFiV2Available() { public boolean getCheckoutFiV2Available() {
boolean v2Enabled = eventbean.getPropertyBoolean(LanEventPropertyKey.KEYCHECKOUT_V2_ENABLED); boolean v2Enabled = eventbean.getPropertyBoolean(LanEventPropertyKey.KEYCHECKOUT_V2_ENABLED);
return v2Enabled && bill != null && !bill.isPaid() && checkoutbean.isPaymentEnabled(); return v2Enabled && bill != null && !bill.isPaid() && checkoutV2Bean.isPaymentEnabled();
} }
public boolean isCheckoutFiAvailable() public boolean isCheckoutFiAvailable()
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!