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.

Sign up for GitHub

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

[PAYSHIP-2612]Added CardFields component PS1.6 #1185

Merged
merged 5 commits into from
Feb 19, 2024
Merged

[PAYSHIP-2612]Added CardFields component PS1.6 #1185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
feba306
Added card-fields component
L3RAZ Jan 23, 2024
c06d93b
Changed input padding
L3RAZ Jan 23, 2024
83afbf6
changed isCardFields API call property back to isHostedFields
L3RAZ Feb 1, 2024
1e96865
Merge branch 'release/v6.3.6.0' into feat/PAYSHIP-2612-1.6
L3RAZ Feb 1, 2024
b18a872
Merge branch 'release/v6.3.6.0' into feat/PAYSHIP-2612-1.6
Matt75 Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions _dev/js/front/src/components/common/card-fields.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ export class CardFieldsComponent extends BaseComponent {
cvv: false
};
this.data.HTMLElement = this.props.HTMLElement;
this.data.HTMLElementCardForm =
this.querySelectorService.getCardFieldsFormContainer();
this.data.HTMLElementBaseButton =
this.querySelectorService.getBasePaymentConfirmation();
this.data.HTMLElementCardForm = this.querySelectorService.getCardFieldsFormContainer();
this.data.HTMLElementBaseButton = this.getBaseButton();
this.data.HTMLElementButton = null;
this.data.HTMLElementButtonWrapper = this.getButtonWrapper();

Expand All @@ -95,6 +93,11 @@ export class CardFieldsComponent extends BaseComponent {
this.querySelectorService.getCardFieldsCvvError();
}

getBaseButton() {
const buttonSelector = `#payment-confirmation button`;
return document.querySelector(buttonSelector);
}

getButtonWrapper() {
const buttonWrapper = `.ps_checkout-button[data-funding-source=${this.data.name}]`;
return document.querySelector(buttonWrapper);
Expand Down Expand Up @@ -222,7 +225,6 @@ export class CardFieldsComponent extends BaseComponent {
return this.psCheckoutApi
.postCreateOrder({
...data,
fundingSource: this.data.name,
isHostedFields: true
// vault: storeCardInVault
})
Expand Down
2 changes: 1 addition & 1 deletion _dev/js/front/src/components/common/payment-option.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class PaymentOptionComponent extends BaseComponent {
this.data.HTMLElementLabel = this.getLabel();
this.data.HTMLElementMark = this.props.HTMLElementMark || null;

this.data.HTMLElementCardFields =this.querySelectorService.getCardFieldsFormContainer();
this.data.HTMLElementCardFields = this.querySelectorService.getCardFieldsFormContainer();
this.data.HTMLElementSmartButton = this.getSmartButton();
this.data.HTMLElementPaymentFields = this.getPaymentFields();
}
Expand Down
20 changes: 10 additions & 10 deletions .../js/front/src/service/query-selector.service/default-selectors/default-selectors-ps1_6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ export const DefaultSelectors1_6 = {

CARD_FIELDS: {
FORM: '#ps_checkout-card-fields-form',
NAME: '#ps_checkout-card-fields-card-name',
NUMBER: '#ps_checkout-card-fields-card-number',
EXPIRY: '#ps_checkout-card-fields-card-expiry',
CVV: '#ps_checkout-card-fields-card-cvv',
NAME_ERROR: '#ps_checkout-card-fields-card-name-error',
NUMBER_ERROR: '#ps_checkout-card-fields-card-number-error',
VENDOR_ERROR: '#ps_checkout-card-fields-card-vendor-error',
EXPIRY_ERROR: '#ps_checkout-card-fields-card-expiry-error',
CVV_ERROR: '#ps_checkout-card-fields-card-cvv-error',
},
NAME: '#ps_checkout-card-fields-name',
NUMBER: '#ps_checkout-card-fields-number',
EXPIRY: '#ps_checkout-card-fields-expiry',
CVV: '#ps_checkout-card-fields-cvv',
NAME_ERROR: '#ps_checkout-card-fields-name-error',
NUMBER_ERROR: '#ps_checkout-card-fields-number-error',
VENDOR_ERROR: '#ps_checkout-card-fields-vendor-error',
EXPIRY_ERROR: '#ps_checkout-card-fields-expiry-error',
CVV_ERROR: '#ps_checkout-card-fields-cvv-error',
}

PAYMENT_METHOD_LOGO_PRODUCT_CONTAINER: 'body.product .box-cart-bottom .buttons_bottom_block',
PAYMENT_METHOD_LOGO_CART_CONTAINER: 'body.order .cart_navigation_extra'
Expand Down
1 change: 1 addition & 0 deletions _dev/js/front/src/service/query-selector.service/query-selector-ps1_7.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export class QuerySelectorPs1_7Service {
SELECTORS.CARD_FIELDS.FORM
);
}

static getCardFieldsNameInputContainer() {
return this.querySelector(
SELECTORS.CARD_FIELDS.NAME
Expand Down
17 changes: 17 additions & 0 deletions views/css/payments16.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,3 +473,20 @@
#ps_checkout-canceled img, #ps_checkout-error img{
margin-right: 10px;
}

#ps_checkout-card-fields-form.loading > *:not(#ps_checkout-card-fields-form-loader),
#ps_checkout-card-fields-form:not(.loading) > #ps_checkout-card-fields-form-loader {
display: none;
}

#ps_checkout-card-fields-name-error.hidden,
#ps_checkout-card-fields-number-error.hidden,
#ps_checkout-card-fields-vendor-error.hidden,
#ps_checkout-card-fields-expiry-error.hidden,
#ps_checkout-card-fields-cvv-error.hidden {
display: none;
}

#ps_checkout-card-fields-form-loader {
text-align: center;
}
39 changes: 21 additions & 18 deletions views/templates/hook/displayPayment.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,29 @@
<div class="payment_module closed">
<a href="javascript:void(0);">
{if $fundingSource == 'card' && $isHostedFieldsAvailable}
<form id="ps_checkout-hosted-fields-form" class="form-horizontal">
<div class="form-group">
<label class="form-control-label" for="ps_checkout-hosted-fields-card-name">{l s='Cardholder Name (optional)' mod='ps_checkout'}</label>
<div id="ps_checkout-hosted-fields-card-name" class="form-control">
</div>
<form id="ps_checkout-card-fields-form" class="form-horizontal loading">
<div id="ps_checkout-card-fields-form-loader">
<img src="{$modulePath}views/img/tail-spin.svg" alt="">
</div>
<div class="form-group">
<label class="form-control-label" for="ps_checkout-hosted-fields-card-number">{l s='Card number' mod='ps_checkout'}</label>
<div id="ps_checkout-hosted-fields-card-number" class="form-control">
<div id="card-image">
<img class="default-credit-card" src="{$modulePath}views/img/credit_card.png" alt="">
</div>
</div>
<div>
<label class="form-control-label" for="ps_checkout-card-fields-name">{l s='Card holder name' mod='ps_checkout'}</label>
<div id="ps_checkout-card-fields-name"></div>
<div id="ps_checkout-card-fields-name-error" class="alert alert-danger hidden">{l s='Card holder name is invalid' mod='ps_checkout'}</div>
</div>
<div>
<label class="form-control-label" for="ps_checkout-card-fields-number">{l s='Card number' mod='ps_checkout'}</label>
<div id="ps_checkout-card-fields-number"></div>
<div id="ps_checkout-card-fields-number-error" class="alert alert-danger hidden">{l s='Card number is invalid' mod='ps_checkout'}</div>
<div id="ps_checkout-card-fields-vendor-error" class="alert alert-danger hidden">{l s='Card vendor is invalid' mod='ps_checkout'}</div>
</div>
<div class="row">
<div class="form-group col-xs-6">
<label class="form-control-label" for="ps_checkout-hosted-fields-card-expiration-date">{l s='Expiry date' mod='ps_checkout'}</label>
<div id="ps_checkout-hosted-fields-card-expiration-date" class="form-control"></div>
<div class="col-xs-6">
<label class="form-control-label" for="ps_checkout-card-fields-expiry">{l s='Expiry date' mod='ps_checkout'}</label>
<div id="ps_checkout-card-fields-expiry"></div>
<div id="ps_checkout-card-fields-expiry-error" class="alert alert-danger hidden">{l s='Card expiration date is invalid' mod='ps_checkout'}</div>
</div>
<div class="form-group col-xs-6">
<label class="form-control-label" for="ps_checkout-hosted-fields-card-cvv">{l s='CVC' mod='ps_checkout'}</label>
<div class="col-xs-6">
<label class="form-control-label" for="ps_checkout-card-fields-cvv">{l s='CVC' mod='ps_checkout'}</label>
<div class="ps_checkout-info-wrapper">
<div class="ps_checkout-info-button" onmouseenter="cvvEnter()" onmouseleave="cvvLeave()">i
<div class="popup-content" id="cvv-popup">
Expand All @@ -78,7 +80,8 @@
</div>
</div>
</div>
<div id="ps_checkout-hosted-fields-card-cvv" class="form-control"></div>
<div id="ps_checkout-card-fields-cvv"></div>
<div id="ps_checkout-card-fields-cvv-error" class="alert alert-danger hidden">{l s='CVV code is invalid' mod='ps_checkout'}</div>
</div>
</div>

Expand Down
Loading