Skip to content

Commit

Permalink
[JA] Release 2105-v2.1 (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jluisalias-e2y
jluisalias-e2y authored May 26, 2023
1 parent 20426fc commit 64fa75a
Show file tree
Hide file tree
Showing 45 changed files with 512 additions and 255 deletions.
Binary file renamed CHECKOUTCO-SAPCommerceConnector2105v2.0.pdf → CHECKOUTCO-SAPCommerceConnector2105v2.1.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion hybris/bin/modules/checkoutcom/checkoutaddon/project.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri, 14 Apr 2023 12:23:09 +0000
#Thu, 25 May 2023 15:03:33 +0000
# Specifies the location of the spring context file added automatically to the global platform application context.
checkoutaddon.application-context=checkoutaddon-spring.xml

Expand Down
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutaddon/resources/checkoutaddon.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:05 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutaddon
description=checkoutaddon
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
4 changes: 4 additions & 0 deletions ...modules/checkoutcom/checkoutbackoffice/resources/checkoutbackoffice-backoffice-config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,10 @@
<editorArea:attribute qualifier="checkoutComPaymentReference"/>
<editorArea:attribute qualifier="achConsent"/>
</editorArea:section>
<editorArea:section name="sec.abstractorder.checkoutcom.api.payload.section">
<editorArea:attribute qualifier="requestsPayload" readonly="true"/>
<editorArea:attribute qualifier="responsesPayload" readonly="true"/>
</editorArea:section>
</editorArea:tab>
</editorArea:editorArea>
</context>
Expand Down
1 change: 1 addition & 0 deletions ...om/checkoutbackoffice/resources/checkoutbackoffice-backoffice-labels/labels_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ sec.configuration.checkoutcom.payment.section=Payment redirect Url Configuration
sec.configuration.checkoutcom.details=Configuration Details
sec.configuration.checkoutcom.billingdescriptor=Billing Descriptor
sec.abstractorder.checkoutcom.details=Details
sec.abstractorder.checkoutcom.api.payload.section=Api Request/Response Payloads
sec.checkoutcom.payment.event.details=Payment Event Details
tab.configuration.checkoutcom.apm=APM Properties
sec.configuration.checkoutcom.apm=Configuration Details
Expand Down
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutbackoffice/resources/checkoutbackoffice.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:05 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutbackoffice
description=checkoutbackoffice
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutevents/resources/checkoutevents.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:06 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutevents
description=checkoutevents
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutfacades/resources/checkoutfacades.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:05 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutfacades
description=checkoutfacades
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
9 changes: 9 additions & 0 deletions ...eckout/hybris/facades/accelerator/impl/DefaultCheckoutComCheckoutFlowFacadeDecorator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.checkout.hybris.facades.beans.AuthorizeResponseData;
import com.checkout.hybris.facades.beans.CheckoutComPaymentInfoData;
import com.checkout.hybris.facades.constants.CheckoutFacadesConstants;
import com.checkout.GsonSerializer;
import com.checkout.payments.PaymentProcessed;
import com.checkout.payments.PaymentRequest;
import com.checkout.payments.PaymentResponse;
Expand Down Expand Up @@ -44,6 +45,7 @@ public class DefaultCheckoutComCheckoutFlowFacadeDecorator extends CheckoutComAb
protected final CheckoutComPaymentService paymentService;
protected final Converter<AuthorizeResponse, AuthorizeResponseData> authorizeResponseConverter;


public DefaultCheckoutComCheckoutFlowFacadeDecorator(final CheckoutFlowFacade checkoutFlowFacade,
final CheckoutComAddressService addressService,
final CheckoutComRequestFactory checkoutComRequestFactory,
Expand Down Expand Up @@ -97,6 +99,13 @@ public AuthorizeResponseData authorizePayment() {
try {
final PaymentRequest<RequestSource> request = checkoutComRequestFactory.createPaymentRequest(cart);
paymentResponse = checkoutComPaymentIntegrationService.authorizePayment(request);
final GsonSerializer gsonSerializer = new GsonSerializer();
final String requestJson = gsonSerializer.toJson(request);
final String responseJson = gsonSerializer.toJson(paymentResponse);
//Parse response and request
paymentInfoService.saveRequestAndResponseInOrder(cart, requestJson, responseJson);
paymentInfoService.logInfoOut(requestJson);
paymentInfoService.logInfoOut(responseJson);
} catch (final CheckoutComPaymentIntegrationException | IllegalArgumentException e) {
LOG.error("Exception during authorization", e);
authorizeResponseData.setIsSuccess(false);
Expand Down
8 changes: 4 additions & 4 deletions ...es/checkoutcom/checkoutfulfilmentprocess/resources/checkoutfulfilmentprocess.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:06 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutfulfilmentprocess
description=checkoutfulfilmentprocess
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutocc/resources/checkoutocc.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:06 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutocc
description=checkoutocc
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
1 change: 1 addition & 0 deletions hybris/bin/modules/checkoutcom/checkoutocctests/project.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ checkoutocctests.checkout.p24.sandbox = https://r3.girogate.de/ti/simp24
checkoutocctests.checkout.ideal.sandbox = https://sandbox.ideal-acquiring.ing.nl/ideal/
checkoutocctests.checkout.eps.sandbox = https://ftg-customer-integration.giropay.de
checkoutocctests.checkout.oxxo.sandbox = https://sandbox.dlocal.com/collect/pay
checkoutocctests.checkout.sofort.nas.sandbox = https://sbapi.ckotech.co/apms/sofort/redirect-to-sofort/
8 changes: 4 additions & 4 deletions hybris/bin/modules/checkoutcom/checkoutocctests/resources/checkoutocctests.build.number
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#Ant properties
#Fri Apr 14 12:27:04 UTC 2023
#Thu May 25 15:07:06 UTC 2023
version.api=2105
vendor=hybris
group.id=de.hybris.platform
name=checkoutocctests
description=checkoutocctests
builddate=20230414 1227
releasedate=20220405 2233
version=2105.10
builddate=20230525 1507
releasedate=20230405 0033
version=2105.22
module.name=platform-module
42 changes: 21 additions & 21 deletions ...outcom/checkoutocctests/resources/checkoutocctests/import/sampledata/essential-data.impex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,31 @@ INSERT_UPDATE AchAccountType; code[unique = true]
; Corporate
; CorpSavings

INSERT_UPDATE CheckoutComAPMConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode) ; restrictedCurrencies(isocode); enabledInNAS[default = false]
; SOFORT ; Sofort ; AT,BE,DE,ES,IT,NL ; EUR ; true
; PAYPAL ; PayPal ; ; ;
; POLI ; POLi ; AU,NZ ; AUD,NZD ;
; IDEAL ; iDeal ; NL ; EUR ; true
; KLARNA ; Klarna ; AT,DK,FI,DE,NL,NO,SE,GB,IM,JE,GG ; EUR,GBP ;
; ALIPAY ; Alipay ; US,CN ; USD ;
; BENEFITPAY ; Benefit Pay ; BH ; BHD ;
; BANCONTACT ; Bancontact ; BE ; EUR ; true
; GIROPAY ; Giropay ; DE ; EUR ; true
; EPS ; Eps ; AT ; EUR ; true
; KNET ; Knet ; KW ; KWD ;
; QPAY ; QPay ; QA ; QAR ;
; MULTIBANCO ; Multibanco ; PT ; EUR ; true
; SEPA ; Sepa ; AT,BE,CY,DE,EE,ES,FI,FR,GR,IE,IT,LT,LU,LV,MT,NL,PT,SI,SK,AD,BG,CH,CZ,DK,GB,IM,JE,GG,HR,HU,IS,LI,MC,NO,PL,RO,SM,SE,VA ; EUR ;
; P24 ; Przelewy24 ; PL ; EUR,PLN ; true
INSERT_UPDATE CheckoutComAPMConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode) ; restrictedCurrencies(isocode)
; SOFORT ; Sofort ; AT,BE,DE,ES,IT,NL ; EUR
; PAYPAL ; PayPal ; ;
; POLI ; POLi ; AU,NZ ; AUD,NZD
; IDEAL ; iDeal ; NL ; EUR
; KLARNA ; Klarna ; AT,DK,FI,DE,NL,NO,SE,GB,IM,JE,GG ; EUR,GBP
; ALIPAY ; Alipay ; US,CN ; USD
; BENEFITPAY ; Benefit Pay ; BH ; BHD
; BANCONTACT ; Bancontact ; BE ; EUR
; GIROPAY ; Giropay ; DE ; EUR
; EPS ; Eps ; AT ; EUR
; KNET ; Knet ; KW ; KWD
; QPAY ; QPay ; QA ; QAR
; MULTIBANCO ; Multibanco ; PT ; EUR
; SEPA ; Sepa ; AT,BE,CY,DE,EE,ES,FI,FR,GR,IE,IT,LT,LU,LV,MT,NL,PT,SI,SK,AD,BG,CH,CZ,DK,GB,IM,JE,GG,HR,HU,IS,LI,MC,NO,PL,RO,SM,SE,VA ; EUR
; P24 ; Przelewy24 ; PL ; EUR,PLN

INSERT_UPDATE CheckoutComFawryConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode); restrictedCurrencies(isocode); productId ; productDescription[lang = en]; enabledInNAS
; FAWRY ; Fawry ; EG ; EGP ; Fawry product id ; Fawry product description ; true
INSERT_UPDATE CheckoutComFawryConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode); restrictedCurrencies(isocode); productId ; productDescription[lang = en]
; FAWRY ; Fawry ; EG ; EGP ; Fawry product id ; Fawry product description

INSERT_UPDATE CheckoutComOxxoConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode); restrictedCurrencies(isocode); description[lang = en] ; integrationType(code); enabledInNAS
; OXXO ; Oxxo ; MX ; MXN ; redirect OXXO Demo Payment ; redirect ; false
INSERT_UPDATE CheckoutComOxxoConfiguration; code[unique = true]; name[lang = en]; restrictedCountries(isocode); restrictedCurrencies(isocode); description[lang = en] ; integrationType(code)
; OXXO ; Oxxo ; MX ; MXN ; redirect OXXO Demo Payment ; redirect

INSERT_UPDATE CheckoutComGlobalAPMConfiguration; abcAPMs(code) ; nasAPMs(code);
; SOFORT,PAYPAL,POLI,IDEAL,KLARNA,ALIPAY,BENEFITPAY,BANCONTACT,GIROPAY,EPS,KNET,QPAY,MULTIBANCO,SEPA,P24,FAWRY,OXXO ; SOFORT,IDEAL,BANCONTACT,GIROPAY,EPS,MULTIBANCO,P24,FAWRY
; SOFORT,PAYPAL,POLI,IDEAL,KLARNA,ALIPAY,BENEFITPAY,BANCONTACT,EPS,KNET,QPAY,MULTIBANCO,SEPA,P24,FAWRY,OXXO ; SOFORT,IDEAL,BANCONTACT,GIROPAY,EPS,MULTIBANCO,P24,FAWRY

INSERT_UPDATE ZoneDeliveryModeValue; deliveryMode(code)[unique = true]; value ; minimum[unique = true]; currency(isocode)[unique = true]; zone(code)[default = 'brazil'][unique = true]
; premium-gross ; 10.99 ; 0.00 ; USD ;
Expand Down
1 change: 1 addition & 0 deletions ...eckout/hybris/occtests/test/groovy/v2/spock/apmConfiguration/CheckoutComKlarnaTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class CheckoutComKlarnaTest extends AbstractCheckoutComPaymentsTest {
addProductToCartOnline(restClient, customer, cart.code, PRODUCT_POWER_SHOT_A480)
setDeliveryModeForCart(restClient, customer, cart.code, DELIVERY_STANDARD, JSON)
createBillingAddress(customer.id, cart.code)
useABC()

when: "API call to get klarna token data is made"
def response = restClient.get(
Expand Down
Loading

0 comments on commit 64fa75a

Please sign in to comment.