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

Jump to bottom

Remove restriction to filter out deferred payments from In-Page #93

Merged
merged 7 commits into from
Mar 21, 2024
Merged

Remove restriction to filter out deferred payments from In-Page #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c61f99
Merge pull request #86 from alma/develop
joyet-simon Oct 13, 2023
0376365
chore(deps): bump actions/setup-node from 3 to 4
dependabot[bot] Oct 29, 2023
4167048
Add Aqua scanner on PR.
remic-alma Dec 18, 2023
7fbf420
Merge pull request #91 from alma/security/aqua_scanner_on_pr
joyet-simon Jan 11, 2024
e5f3e42
Merge pull request #90 from alma/dependabot/github_actions/actions/se…
joyet-simon Feb 5, 2024
14d287f
Remove restriction to filter out deferred payments from In-Page
Benjamin-Freoua-Alma Mar 20, 2024
3d0e10f
Merge branch 'develop' into feature/ecom-1464-sfcc-remove-restriction…
joyet-simon Mar 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Checkout current repo in CI
uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
Expand Down
13 changes: 6 additions & 7 deletions cartridges/int_alma/cartridge/scripts/helpers/almaCheckoutHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,10 @@ function getPropertiesForPlan(plan, currencyCode) {
/**
* Returns if the current payment option is pnx 2,3 or 4
* @param {int} installmentsCount installments count
* @param {int} deferredDays deferred days
* @returns {boolean} true means we can use inpage
*/
function isAvailableForInpage(installmentsCount, deferredDays) {
return installmentsCount <= 4 && deferredDays <= 0;
function isAvailableForInpage(installmentsCount) {
return installmentsCount <= 4;
}

/**
Expand Down Expand Up @@ -223,7 +222,7 @@ function formatPlanForCheckout(plan, currencyCode) {
var formatPlan = {};
if (plan.installments_count < 5 && planIsActivated(PaymentMgr.getPaymentMethod(ALMA_PNX_ID), plan)) {
formatPlan = {
in_page: isAvailableForInpage(plan.installments_count, plan.deferred_days) && almaConfigHelper.isInpageActivated(),
in_page: isAvailableForInpage(plan.installments_count) && almaConfigHelper.isInpageActivated(),
selector: getSelectorNameFromPlan(plan),
installments_count: plan.installments_count,
deferred_days: plan.deferred_days,
Expand All @@ -236,7 +235,7 @@ function formatPlanForCheckout(plan, currencyCode) {
}
if (plan.installments_count >= 5 && planIsActivated(PaymentMgr.getPaymentMethod(ALMA_CREDIT_ID), plan)) {
formatPlan = {
in_page: isAvailableForInpage(plan.installments_count, plan.deferred_days) && almaConfigHelper.isInpageActivated(),
in_page: isAvailableForInpage(plan.installments_count) && almaConfigHelper.isInpageActivated(),
selector: getSelectorNameFromPlan(plan),
installments_count: plan.installments_count,
deferred_days: plan.deferred_days,
Benjamin-Freoua-Alma marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -249,7 +248,7 @@ function formatPlanForCheckout(plan, currencyCode) {
}
if (plan.deferred_days > 0 && planIsActivated(PaymentMgr.getPaymentMethod(ALMA_DEFERRED_ID), plan)) {
formatPlan = {
in_page: isAvailableForInpage(plan.installments_count, plan.deferred_days) && almaConfigHelper.isInpageActivated(),
in_page: isAvailableForInpage(plan.installments_count) && almaConfigHelper.isInpageActivated(),
selector: getSelectorNameFromPlan(plan),
installments_count: plan.installments_count,
deferred_days: plan.deferred_days,
Expand All @@ -262,7 +261,7 @@ function formatPlanForCheckout(plan, currencyCode) {
}
if (plan.installments_count === 1 && plan.deferred_days === 0 && planIsActivated(PaymentMgr.getPaymentMethod(ALMA_PAY_NOW_ID), plan)) {
formatPlan = {
in_page: isAvailableForInpage(plan.installments_count, plan.deferred_days) && almaConfigHelper.isInpageActivated(),
in_page: isAvailableForInpage(plan.installments_count) && almaConfigHelper.isInpageActivated(),
selector: getSelectorNameFromPlan(plan),
installments_count: plan.installments_count,
deferred_days: plan.deferred_days,
Expand Down
2 changes: 1 addition & 1 deletion cartridges/int_alma/cartridge/scripts/helpers/almaPaymentHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ function buildPaymentData(installmentsCount, deferredDays, locale, isManualCaptu
var formatCustomerData = require('*/cartridge/scripts/helpers/almaHelpers').formatCustomerData;

var origin = 'online';
if (almaCheckoutHelper.isAvailableForInpage(installmentsCount, deferredDays) && almaConfigHelper.isInpageActivated()) {
if (almaCheckoutHelper.isAvailableForInpage(installmentsCount) && almaConfigHelper.isInpageActivated()) {
origin = 'online_in_page';
}

Expand Down
5 changes: 4 additions & 1 deletion cartridges/int_alma/cartridge/static/default/js/almaCheckout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,14 @@ window.addEventListener('DOMContentLoaded',
window.location = body.url;
}

async function inPageInitialize(inPageContainer, installments_count, captureMethod) {
async function inPageInitialize(inPageContainer, installments_count, deferred_days, captureMethod) {
return Alma.InPage.initialize(
{
merchantId: almaContext.merchantId,
amountInCents: purchase_amount,
installmentsCount: installments_count,
deferredDays: deferred_days,
deferredMonths: 0,
selector: "#" + inPageContainer,
locale: almaContext.locale.slice(0, 2),
environment: almaContext.almaMode,
Expand Down Expand Up @@ -186,6 +188,7 @@ window.addEventListener('DOMContentLoaded',
await inPageInitialize(
t.id + "-inpage",
installments_count,
deferred_days,
captureMethod
)
.then(function (inPage) {
Expand Down
2 changes: 1 addition & 1 deletion site_preference_builder/ref/system-objecttype-extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<externally-managed-flag>false</externally-managed-flag>
</attribute-definition>
<attribute-definition attribute-id="ALMA_Inpage_Payment">
<display-name xml:lang="x-default">Activate in-page checkout for P1X, P2X, P3X and P4X</display-name>
<display-name xml:lang="x-default">Activate in-page checkout for Pay Now, Installment, and Deferred payments.</display-name>
<type>boolean</type>
<mandatory-flag>false</mandatory-flag>
<externally-managed-flag>false</externally-managed-flag>
Expand Down
5 changes: 3 additions & 2 deletions test/unit/int_alma/scripts/helpers/almaPaymentHelperTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var paymentAuthorizationNotExpired = {

describe('almaPaymentHelper', function () {
describe('Build payment data', function () {
// TODO : Add test for payment deferred and pnx without inpage
it('payment data for pnx is well formed', function () {
setIsAvailableForInpage(true);
setCustomPreferenceValue(true);
Expand All @@ -43,9 +44,9 @@ describe('almaPaymentHelper', function () {
assert.deepEqual(payment, resolvedPaymentData(3, 0, 'fr_FR', 'online_in_page'));
});
it('payment data for deferred', function () {
setIsAvailableForInpage(false);
setIsAvailableForInpage(true);
var payment = almaPaymentHelper.buildPaymentData(1, 15, 'fr_FR', false);
assert.deepEqual(payment, resolvedPaymentData(1, 15, 'fr_FR', 'online'));
assert.deepEqual(payment, resolvedPaymentData(1, 15, 'fr_FR', 'online_in_page'));
});
it('payment data for credit has car property', function () {
setIsAvailableForInpage(false);
Expand Down