Merge branch 'release/2025.07.10' into feature/bugfix/CASH-1036

This commit is contained in:
AdamCaouetteSafelite 2025-06-27 10:49:31 -04:00
commit 72514f3941
5 changed files with 17 additions and 6 deletions

View file

@ -67,7 +67,7 @@ export function getAmountDueWithDonation(lineItemsObject, donationLineItem) {
// this is amount due with Donation added // this is amount due with Donation added
const lineItemsCloneWithDonation = deepClone(lineItemsObject); const lineItemsCloneWithDonation = deepClone(lineItemsObject);
lineItemsCloneWithDonation.supportingItems.push(donationLineItem); lineItemsCloneWithDonation.supportingItems.push(donationLineItem);
return getAmountDue(lineItemsCloneWithDonation, false); return getAmountDue(lineItemsCloneWithDonation);
} }
export async function getPricingByDayPartWithPrice(pageNameToLog) { export async function getPricingByDayPartWithPrice(pageNameToLog) {

View file

@ -82,6 +82,8 @@
<span>Amount Due</span> <span>Amount Due</span>
</div> </div>
</div> </div>
<p>6 or 12 monthly payment plans available</p>
</div> </div>
</div> </div>
</div> </div>
@ -208,6 +210,12 @@ export default {
overflow: hidden; overflow: hidden;
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
> p {
padding-top: 1rem;
font-size: $font-size-12;
margin: 0;
}
} }
} }
.payment-section { .payment-section {

View file

@ -132,7 +132,6 @@ export default {
async logDigitalConsumer() { async logDigitalConsumer() {
const currentPageName = getPageNameFromRouter(); const currentPageName = getPageNameFromRouter();
const universes = store.getters.applicationUser.experiments; const universes = store.getters.applicationUser.experiments;
console.log(JSON.stringify(universes));
let hasDynamoLogging = experimentMixin.methods.hasSettingEqualTo( let hasDynamoLogging = experimentMixin.methods.hasSettingEqualTo(
experimentSettings.DYNAMO_LOGGING, experimentSettings.DYNAMO_LOGGING,
@ -150,15 +149,15 @@ export default {
const conceptVariation = variationNames.length > 0 ? variationNames[0] : ""; const conceptVariation = variationNames.length > 0 ? variationNames[0] : "";
const isConceptExposed = universes.find(
(item) => item.universeName === experimentUniverses.CONCEPT_FUNNEL
)?.isExposed;
const submittedOrder = baseMixin.methods.getSubmittedOrder(); const submittedOrder = baseMixin.methods.getSubmittedOrder();
const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder(); const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
const hasSubmittedOrderAtConfirmationPage = const hasSubmittedOrderAtConfirmationPage =
hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name; hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
const refSequenceNum = hasSubmittedOrderAtConfirmationPage
? submittedOrder.referralSequenceNumber
: store.getters.order.referralSequenceNumber;
var payload = { var payload = {
actionName: `Browser page:${currentPageName}`, actionName: `Browser page:${currentPageName}`,
referralSequenceNumber: hasSubmittedOrderAtConfirmationPage referralSequenceNumber: hasSubmittedOrderAtConfirmationPage
@ -174,6 +173,7 @@ export default {
? submittedOrder.workOrderNumber ? submittedOrder.workOrderNumber
: store.getters.order.workOrderNumber, : store.getters.order.workOrderNumber,
conceptVariation: conceptVariation, conceptVariation: conceptVariation,
isConceptExposed: isConceptExposed,
}; };
await baseMixin.methods.dispatchStoreAction( await baseMixin.methods.dispatchStoreAction(

View file

@ -1570,6 +1570,7 @@ export const actions = {
workOrderId, workOrderId,
workOrderNumber, workOrderNumber,
conceptVariation, conceptVariation,
isConceptExposed,
} }
) { ) {
var payload = { var payload = {
@ -1582,6 +1583,7 @@ export const actions = {
workOrderId: workOrderId ?? "", workOrderId: workOrderId ?? "",
workOrderNumber: workOrderNumber ?? "", workOrderNumber: workOrderNumber ?? "",
conceptVariation: conceptVariation, conceptVariation: conceptVariation,
isConceptExposed: isConceptExposed,
}; };
return globalMethods.callHttpClient({ return globalMethods.callHttpClient({

View file

@ -130,6 +130,7 @@ $font-family-base: $font-family-sans-serif;
$font-family-code: $font-family-monospace; $font-family-code: $font-family-monospace;
$font-size-base: 1rem; // Assumes the browser default, typically `16px` $font-size-base: 1rem; // Assumes the browser default, typically `16px`
$font-size-12: $font-size-base * 0.75; // 12px
$font-size-20: $font-size-base * 1.25; // 20px $font-size-20: $font-size-base * 1.25; // 20px
//Custom Font size (extra small) //Custom Font size (extra small)