diff --git a/addons/dine360_theme_chennora/views/checkout_address.xml b/addons/dine360_theme_chennora/views/checkout_address.xml index a8116f0..5c5e82e 100644 --- a/addons/dine360_theme_chennora/views/checkout_address.xml +++ b/addons/dine360_theme_chennora/views/checkout_address.xml @@ -288,12 +288,24 @@ if (data.result && data.result.success) { msgDiv.className = 'alert alert-success my-3 animated fadeIn'; msgDiv.style.display = ''; - msgDiv.innerHTML = `✓ Delivery Available!Uber Delivery Fee: $${data.result.fee} (Distance Based)`; + msgDiv.innerHTML = `
+ +
+ ✓ Delivery Available!
+ Uber Delivery Fee: $${data.result.fee} (Distance Based) +
+
`; if (submitBtn) submitBtn.disabled = false; } else { msgDiv.className = 'alert alert-danger my-3 animated fadeIn'; msgDiv.style.display = ''; - msgDiv.innerHTML = `✕ Delivery Unavailable${data.result?.error || "Distance too far for Uber Direct."}`; + msgDiv.innerHTML = `
+ +
+ ✕ Uber Direct: Invalid Operation
+ ${data.result?.error || "This specific address is outside the Uber delivery radius."} +
+
`; if (submitBtn) submitBtn.disabled = true; } }).catch(err => { @@ -334,28 +346,14 @@ } }); - // 2. Find and remove the Shipping section AND its address cards + // 2. Find and remove the Shipping section const allHeaders = [...document.querySelectorAll('h2, h3, h4, h5')]; const shippingHeader = allHeaders.find(h => h.textContent.trim().toLowerCase() === 'shipping'); - if (shippingHeader) { - // Find the container for shipping addresses (usually follows the header or is in a sibling div) shippingHeader.style.display = 'none'; - shippingHeader.classList.add('d-none'); - - // Often Odoo 17 puts addresses in a 'row' following the header - let nextEl = shippingHeader.nextElementSibling; - if (nextEl) { - nextEl.style.display = 'none'; - nextEl.classList.add('d-none'); - } - - // If they are side-by-side in columns, hide the shipping column + if (shippingHeader.nextElementSibling) shippingHeader.nextElementSibling.style.display = 'none'; const shippingCol = shippingHeader.closest('.col-lg-6'); - if (shippingCol) { - shippingCol.style.display = 'none'; - shippingCol.classList.add('d-none'); - } + if (shippingCol) shippingCol.style.display = 'none'; } // 3. Force Billing section to be full width @@ -370,17 +368,56 @@ } } - // 4. Hide secondary 'Shipping' add address buttons - document.querySelectorAll('a[href*="/shop/address"]').forEach(btn => { - if (btn.textContent.toLowerCase().includes('shipping')) { - const card = btn.closest('.col-lg-6') || btn.closest('.card') || btn.parentElement; - card.style.display = 'none'; + // 4. CHECK UBER FOR SELECTED CARD + const billingGrid = document.querySelector('#address_selection'); + if (billingGrid) { + let msgBox = document.getElementById('uber_checkout_msg'); + if (!msgBox) { + msgBox = document.createElement('div'); + msgBox.id = 'uber_checkout_msg'; + billingGrid.parentNode.insertBefore(msgBox, billingGrid); } - }); + + function verifySelectedAddress() { + // Find selected address card info + const selectedCard = document.querySelector('input[name="partner_id"]:checked')?.closest('.card'); + if (!selectedCard) return; + + const addressText = selectedCard.querySelector('address')?.innerText || ""; + const parts = addressText.split('\n').map(p => p.trim()); + // Crude parsing + const street = parts[1] || ""; + const cityZip = parts[2] || ""; + + msgBox.className = 'alert alert-info my-3'; + msgBox.innerHTML = "Verifying Uber coverage for this address..."; + + fetch('/shop/uber/quote', { + method: 'POST', headers: {'Content-Type': 'application/json'}, + body: JSON.stringify({ params: { address_data: { + street: street, + zip: cityZip.split(' ').pop(), + city: cityZip.split(' ')[0], + } } }) + }).then(r => r.json()).then(data => { + if (data.result && data.result.success) { + msgBox.className = 'alert alert-success my-3'; + msgBox.innerHTML = `✓ Uber Delivery Available! Fee: $${data.result.fee}`; + document.querySelector('button[type="submit"]')?.removeAttribute('disabled'); + } else { + msgBox.className = 'alert alert-danger my-3'; + msgBox.innerHTML = `✕ Uber Direct: Invalid Operation
${data.result?.error || "Outside delivery radius."}`; + document.querySelector('button[type="submit"]')?.setAttribute('disabled', 'disabled'); + } + }); + } + + document.querySelectorAll('input[name="partner_id"]').forEach(i => i.addEventListener('change', verifySelectedAddress)); + verifySelectedAddress(); + } } if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', applyCheckoutFixes); else applyCheckoutFixes(); - // Handle dynamic Odoo updates document.addEventListener('website_sale_ready', applyCheckoutFixes); })(); diff --git a/addons/dine360_uber/models/uber_config.py b/addons/dine360_uber/models/uber_config.py index dc53077..7bad6bb 100644 --- a/addons/dine360_uber/models/uber_config.py +++ b/addons/dine360_uber/models/uber_config.py @@ -174,10 +174,24 @@ class UberConfig(models.Model): if response.status_code != 200: # Log detailed error for debugging _logger.error("Uber Quote Error: %s - %s", response.status_code, response.text) + data = {} + try: + data = response.json() + except: + pass + + # Construct descriptive error message + msg = data.get('message', 'Uber API Error') + if data.get('errors'): + details = " ".join([e.get('message', '') for e in data['errors']]) + if details: + msg = f"{msg} {details}" + return { 'success': False, - 'error': response.json().get('message', 'Uber API Error'), - 'code': response.json().get('code', 'unknown') + 'error': msg, + 'code': data.get('code', 'unknown'), + 'raw_error': data } data = response.json()