+ `;
+
+ this.addonsContainer.appendChild(addonElement);
+
+ // Add event listener for optional addons
+ if (!addon.is_mandatory) {
+ const checkbox = addonElement.querySelector('.addon-checkbox');
+ checkbox.addEventListener('change', () => {
+ this.updatePricing();
+ });
+ }
+ });
+
+ // Update addon prices
+ this.updateAddonPrices();
+ } // Update addon prices based on current configuration
+ updateAddonPrices() {
+ if (!this.addonsContainer) return;
+
+ const cpus = parseInt(this.cpuRange?.value || 2);
+ const memory = parseInt(this.memoryRange?.value || 4);
+ const storage = parseInt(this.storageRange?.value || 20);
+ const instances = parseInt(this.instancesRange?.value || 1);
+
+ // Find the current plan data to get variable_unit
+ const matchedPlan = this.getCurrentPlan();
+ const variableUnit = matchedPlan?.variable_unit || 'CPU';
+ const units = variableUnit === 'CPU' ? cpus : memory;
+ const totalUnits = units * instances;
+
+ const addonCheckboxes = this.addonsContainer.querySelectorAll('.addon-checkbox');
+ addonCheckboxes.forEach(checkbox => {
+ const addon = JSON.parse(checkbox.dataset.addon);
+ const priceElement = checkbox.parentElement.querySelector('.addon-price-value');
+
+ let calculatedPrice = 0;
+ if (addon.addon_type === 'BASE_FEE') {
+ calculatedPrice = parseFloat(addon.price || 0) * instances;
+ } else if (addon.addon_type === 'UNIT_RATE') {
+ calculatedPrice = parseFloat(addon.price_per_unit || 0) * totalUnits;
+ }
+
+ if (priceElement) {
+ priceElement.textContent = calculatedPrice.toFixed(2);
+ }
+
+ // Update the checkbox data for later calculation
+ checkbox.dataset.calculatedPrice = calculatedPrice.toString();
+ });
+ }
+
+ // Get current plan based on configuration
+ getCurrentPlan() {
+ const cpus = parseInt(this.cpuRange?.value || 2);
+ const memory = parseInt(this.memoryRange?.value || 4);
+ const serviceLevel = document.querySelector('input[name="serviceLevel"]:checked')?.value;
+
+ if (this.planSelect?.value) {
+ return JSON.parse(this.planSelect.value);
+ }
+
+ return this.findBestMatchingPlan(cpus, memory, serviceLevel);
+ }
+
// Find best matching plan based on requirements
findBestMatchingPlan(cpus, memory, serviceLevel) {
if (!this.pricingData) return null;
@@ -488,6 +654,9 @@ Please contact me with next steps for ordering this configuration.`;
const storage = parseInt(this.storageRange?.value || 20);
const instances = parseInt(this.instancesRange?.value || 1);
+ // Update addon prices first to ensure calculated prices are current
+ this.updateAddonPrices();
+
this.showPlanDetails(selectedPlan, storage, instances);
this.updateStatusMessage('Plan selected directly!', 'success');
}
@@ -496,6 +665,9 @@ Please contact me with next steps for ordering this configuration.`;
updatePricing() {
if (!this.pricingData || !this.cpuRange || !this.memoryRange || !this.storageRange || !this.instancesRange) return;
+ // Update addon prices first
+ this.updateAddonPrices();
+
// Reset plan selection if in auto-select mode
if (!this.planSelect?.value) {
const cpus = parseInt(this.cpuRange.value);
@@ -543,16 +715,57 @@ Please contact me with next steps for ordering this configuration.`;
if (this.planInstances) this.planInstances.textContent = instances;
if (this.planServiceLevel) this.planServiceLevel.textContent = serviceLevel;
- // Calculate pricing using storage price from the plan data
- const computePriceValue = parseFloat(plan.compute_plan_price);
- const servicePriceValue = parseFloat(plan.sla_price);
- const managedServicePricePerInstance = computePriceValue + servicePriceValue;
+ // Calculate pricing using final price from plan data (which already includes mandatory addons)
+ // plan.final_price = compute_plan_price + sla_price (where sla_price includes mandatory addons)
+ const managedServicePricePerInstance = parseFloat(plan.final_price);
+
+ // Collect mandatory addons for display (but don't add to price since they're already included)
+ let mandatoryAddonTotal = 0;
+ const mandatoryAddons = [];
+
+ if (this.addonsContainer) {
+ const addonCheckboxes = this.addonsContainer.querySelectorAll('.addon-checkbox');
+ addonCheckboxes.forEach(checkbox => {
+ const addon = JSON.parse(checkbox.dataset.addon);
+ const calculatedPrice = parseFloat(checkbox.dataset.calculatedPrice || 0);
+
+ if (addon.is_mandatory) {
+ // Don't add to mandatoryAddonTotal since it's already in plan.final_price
+ mandatoryAddons.push({
+ name: addon.name,
+ price: calculatedPrice.toFixed(2)
+ });
+ }
+ });
+ }
+
const managedServicePrice = managedServicePricePerInstance * instances;
// Use storage price from plan data or fallback to instance variable
const storageUnitPrice = plan.storage_price !== undefined ? parseFloat(plan.storage_price) : this.storagePrice;
const storagePriceValue = storage * storageUnitPrice * instances;
- const totalPriceValue = managedServicePrice + storagePriceValue;
+
+ // Calculate optional addon total
+ let optionalAddonTotal = 0;
+ const selectedOptionalAddons = [];
+
+ if (this.addonsContainer) {
+ const addonCheckboxes = this.addonsContainer.querySelectorAll('.addon-checkbox:checked');
+ addonCheckboxes.forEach(checkbox => {
+ const addon = JSON.parse(checkbox.dataset.addon);
+ const calculatedPrice = parseFloat(checkbox.dataset.calculatedPrice || 0);
+
+ if (!addon.is_mandatory) {
+ optionalAddonTotal += calculatedPrice;
+ selectedOptionalAddons.push({
+ name: addon.name,
+ price: calculatedPrice.toFixed(2)
+ });
+ }
+ });
+ }
+
+ const totalPriceValue = managedServicePrice + storagePriceValue + optionalAddonTotal;
// Update pricing display
if (this.managedServicePrice) this.managedServicePrice.textContent = managedServicePrice.toFixed(2);
@@ -560,6 +773,9 @@ Please contact me with next steps for ordering this configuration.`;
if (this.storageAmount) this.storageAmount.textContent = storage;
if (this.totalPrice) this.totalPrice.textContent = totalPriceValue.toFixed(2);
+ // Update addon pricing display
+ this.updateAddonPricingDisplay(mandatoryAddons, selectedOptionalAddons);
+
// Store current configuration for order button
this.selectedConfiguration = {
planName: plan.compute_plan,
@@ -569,10 +785,45 @@ Please contact me with next steps for ordering this configuration.`;
storage: storage,
instances: instances,
serviceLevel: serviceLevel,
- totalPrice: totalPriceValue.toFixed(2)
+ totalPrice: totalPriceValue.toFixed(2),
+ addons: [...mandatoryAddons, ...selectedOptionalAddons]
};
}
+ // Update addon pricing display in the results panel
+ updateAddonPricingDisplay(mandatoryAddons, selectedOptionalAddons) {
+ if (!this.addonPricingContainer) return;
+
+ // Clear existing addon pricing display
+ this.addonPricingContainer.innerHTML = '';
+
+ // Add mandatory addons to pricing breakdown
+ if (mandatoryAddons && mandatoryAddons.length > 0) {
+ mandatoryAddons.forEach(addon => {
+ const addonRow = document.createElement('div');
+ addonRow.className = 'd-flex justify-content-between mb-2';
+ addonRow.innerHTML = `
+