From f2a7bde108a5406a003334a2bf0cab8b75b0ef63 Mon Sep 17 00:00:00 2001
From: Bhushan Dhage <86051527+Kibo-Bhushan@users.noreply.github.com>
Date: Fri, 12 Apr 2024 18:22:58 +0530
Subject: [PATCH 1/3] COM-8341: Avoid calling getb2b user api.
We are not using this get b2b account API.
So removed this.
We are calling getUsers API in getB2Baccount api success which is causing weired issue of sending getB2Baccount reponse as getUsers api request
We need to find different solution to fix such issues.
eg: by reInitilizing model
But in this case we do not need getB2B api so removing this will fix the issue..
---
scripts/modules/b2b-account/edit-quote.js | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/scripts/modules/b2b-account/edit-quote.js b/scripts/modules/b2b-account/edit-quote.js
index bde39eafe..ea88ad2a3 100644
--- a/scripts/modules/b2b-account/edit-quote.js
+++ b/scripts/modules/b2b-account/edit-quote.js
@@ -457,14 +457,10 @@ define([
var customerAccountId = self.model.get('customerAccountId');
if (!self.model.get('b2bUsers')) {
var b2bAccount = new B2BAccountModels.b2bAccount({ id: customerAccountId });
- b2bAccount.apiGet().then(function (account) {
- return b2bAccount.apiGetUsers().then(function (users) {
- self.model.isLoading(false);
- self.model.set("b2bUsers", users.data.items);
- self.render();
- }, function (error) {
- self.showMessageBar(error);
- });
+ b2bAccount.apiGetUsers().then(function (users) {
+ self.model.isLoading(false);
+ self.model.set("b2bUsers", users.data.items);
+ self.render();
}, function (error) {
self.showMessageBar(error);
});
From 23a6705623997af36ef8e5dbd0e48d937332a71d Mon Sep 17 00:00:00 2001
From: Bhushan Dhage <86051527+Kibo-Bhushan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 16:59:41 +0530
Subject: [PATCH 2/3] Temp fix.
---
templates/modules/cart/cart-table.hypr.live | 2 +-
templates/modules/checkout/payment-selector.hypr.live | 2 +-
.../modules/multi-ship-checkout/payment-selector.hypr.live | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/modules/cart/cart-table.hypr.live b/templates/modules/cart/cart-table.hypr.live
index a5f626230..8e3243e92 100644
--- a/templates/modules/cart/cart-table.hypr.live
+++ b/templates/modules/cart/cart-table.hypr.live
@@ -84,7 +84,7 @@
{% if externalPayment.name == "VisaCheckout" %}
{%endif%}
- {% if externalPayment.name == "PayPalExpress2" %}
+ {% if externalPayment.name.includes("paypal")"" %}
{%endif%}
{% if externalPayment.name == "APPLEPAY" %}
diff --git a/templates/modules/checkout/payment-selector.hypr.live b/templates/modules/checkout/payment-selector.hypr.live
index 8abe6df76..162e5e333 100644
--- a/templates/modules/checkout/payment-selector.hypr.live
+++ b/templates/modules/checkout/payment-selector.hypr.live
@@ -113,7 +113,7 @@
src="{{pageContext.visaCheckoutButtonUrl}}?size=154&color=neutral"/>
{% endif %}
- {% if name == "paypalexpress2" %}
+ {% if name.includes("paypal")%}
{%endif%}
{% if name == "paywithamazon" %}
diff --git a/templates/modules/multi-ship-checkout/payment-selector.hypr.live b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
index 8cd68f060..ea110793d 100644
--- a/templates/modules/multi-ship-checkout/payment-selector.hypr.live
+++ b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
@@ -108,7 +108,7 @@
src="{{pageContext.visaCheckoutButtonUrl}}?size=154&color=neutral"/>
{% endif %}
- {% if name == "paypalexpress2" %}
+ {% if includes("paypal") %}
{%endif%}
{% if name == "paywithamazon" %}
From e8b02b01324659ef6655462fded532a9e31c4357 Mon Sep 17 00:00:00 2001
From: Bhushan Dhage <86051527+Kibo-Bhushan@users.noreply.github.com>
Date: Mon, 10 Jun 2024 17:13:05 +0530
Subject: [PATCH 3/3] Fix typo.
---
.../modules/multi-ship-checkout/payment-selector.hypr.live | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/modules/multi-ship-checkout/payment-selector.hypr.live b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
index ea110793d..867b62fe0 100644
--- a/templates/modules/multi-ship-checkout/payment-selector.hypr.live
+++ b/templates/modules/multi-ship-checkout/payment-selector.hypr.live
@@ -108,7 +108,7 @@
src="{{pageContext.visaCheckoutButtonUrl}}?size=154&color=neutral"/>
{% endif %}
- {% if includes("paypal") %}
+ {% if name.includes("paypal") %}
{%endif%}
{% if name == "paywithamazon" %}