jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing conflicts

Browse source
This commit is contained in:
Sneha 2024-05-21 10:33:58 +05:30
parent 26cfd3f404
commit 3424f7e514
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/constants/cart-item-categories.js
View file

@ -3,6 +3,7 @@ const cartItemCategories = {
GLASS_PARTS: "glassParts", GLASS_PARTS: "glassParts",
SUPPORTING_ITEMS: "supportingItems", SUPPORTING_ITEMS: "supportingItems",
PROMOS: "promos", PROMOS: "promos",
SERVICE_PACKAGE_DISCOUNT: "servicePackageDiscount",
}; };
export { cartItemCategories }; export { cartItemCategories };

4
src/fmg-components/cart/cart.vue
View file

@ -272,7 +272,7 @@ export default {
getLineItemAmount(amount, useVerifyingText, category) { getLineItemAmount(amount, useVerifyingText, category) {
if (useVerifyingText) return this.verifyingCoverageText; if (useVerifyingText) return this.verifyingCoverageText;
return category == "promos" return category == ("promos" && "servicePackageDiscount")
? "(" + this.currencyFormatter.format(amount * -1) + ")" ? "(" + this.currencyFormatter.format(amount * -1) + ")"
: this.currencyFormatter.format(amount); : this.currencyFormatter.format(amount);
}, },
@ -799,7 +799,7 @@ export default {
Math.abs( Math.abs(
baseMixin.methods.getTotalLineItemPrice(servicePackageDiscountLineItem) baseMixin.methods.getTotalLineItemPrice(servicePackageDiscountLineItem)
), ),
category: cartItemCategories.SUPPORTING_ITEMS, category: cartItemCategories.SERVICE_PACKAGE_DISCOUNT,
cartItemType: cartItemTypes.SERVICE_PACKAGE_DISCOUNT, cartItemType: cartItemTypes.SERVICE_PACKAGE_DISCOUNT,
isDisplayed: true, isDisplayed: true,
isRemovable: false, isRemovable: false,

1
src/layouts/quote/quote.spec.js
View file

@ -8,7 +8,6 @@ import * as navigateToHeritage from "@/helpers/heritage-integration/navigation-h
import { nextTick } from "vue"; import { nextTick } from "vue";
import { experimentSettings } from "@/constants/experiments"; import { experimentSettings } from "@/constants/experiments";
import baseMixin from "@/mixins/base-mixin.js"; import baseMixin from "@/mixins/base-mixin.js";
import { support } from "jquery";
jest.mock("@/store", () => ({ jest.mock("@/store", () => ({
commit: jest.fn(), commit: jest.fn(),

2
src/layouts/quote/service-package-question/service-package-question.vue
View file

@ -73,7 +73,7 @@ export default {
this.getServicePackageDiscountPartForSelectedPackage(newValue); this.getServicePackageDiscountPartForSelectedPackage(newValue);
let supportingItems = this.supportingLineItems; let supportingItems = this.supportingLineItems;
if (servicePackageDiscountPartInSelectedPackage?.length > 0) { if (servicePackageDiscountPartInSelectedPackage?.length > 0) {
supportingItems.push(servicePackageDiscountPartInSelectedPackage[0]); supportingItems?.push(servicePackageDiscountPartInSelectedPackage[0]);
} else { } else {
if ( if (
supportingItems?.length > 0 && supportingItems?.length > 0 &&