Commit Review Workspace ?

- /** Download the sample Excel template for product import. */
- public function sampleExcel(): \Symfony\Component\HttpFoundation\BinaryFileResponse
- {
-         $path = storage_path('app/samples/product-sample.xlsx');
- abort_unless(file_exists($path), 404);
- 
-         return response()->download($path, 'Product Sample.xlsx');
- }
- 
- public function import(Request $request): \Illuminate\Http\JsonResponse
- $types      = ProductType::pluck('id', 'name');
- $variants   = Variant::pluck('id', 'name');
- 
- foreach ($rows as $row) {
- $rowNum = (int) $row['r'];
- if ($rowNum === 1) continue; // skip header
- continue;
- }

+ /** Download the sample Excel template for product import. */
+ public function sampleExcel(): \Symfony\Component\HttpFoundation\BinaryFileResponse
+ {
+         $path = storage_path('app/samples/Product_Sample_1.xlsx');
+ abort_unless(file_exists($path), 404);
+ 
+         // no-cache headers so a browser/proxy never serves an old cached copy.
+         return response()->download($path, 'Product_Sample_1.xlsx', [
+             'Cache-Control' => 'no-store, no-cache, must-revalidate, max-age=0',
+             'Pragma'        => 'no-cache',
+             'Expires'       => '0',
+         ]);
+ }
+ 
+ public function import(Request $request): \Illuminate\Http\JsonResponse
+ $types      = ProductType::pluck('id', 'name');
+ $variants   = Variant::pluck('id', 'name');
+ 

- /** Download the sample Excel template for service-detail import. */
- public function sampleExcel(): \Symfony\Component\HttpFoundation\BinaryFileResponse
- {
-         $path = storage_path('app/samples/service-detail-sample.xlsx');
- abort_unless(File::exists($path), 404);
- 
-         return response()->download($path, 'Service Detail Sample.xlsx');
- }
- 
- /**
- $skipped  = 0;
- $errors   = [];
- 
- foreach ($rows as $row) {
- $rowNum = (int) $row['r'];
- if ($rowNum === 1) continue;
- $cells[$col] = $t === 's' ? ($strings[(int) $v] ?? '') : $v;
- }

+ /** Download the sample Excel template for service-detail import. */
+ public function sampleExcel(): \Symfony\Component\HttpFoundation\BinaryFileResponse
+ {
+         $path = storage_path('app/samples/Avriti_Services_sample_1.xlsx');
+ abort_unless(File::exists($path), 404);
+ 
+         return response()->download($path, 'Avriti_Services_sample_1.xlsx');
+ }
+ 
+ /**
+ $skipped  = 0;
+ $errors   = [];
+ 
+         // --- Pass 1: group rows into services -------------------------------
+         // A row with a non-empty `name` starts a new service (its full content
+         // is used). Tiers may be given two ways (both supported):
+         //   1. Comma-separated in a single row:
+         //        tier_name        = "Up to 2 BHK,Up to 4 BHK,Full Commercial"

- }
- return [
- ...$item,
-                     'title'         => $sd?->name ?? ($item['title'] ?? 'Service'),
- 'thumbnail'     => $image,
- 'product_image' => $image,
- 'is_service'    => true,

+ }
+ return [
+ ...$item,
+                     // Prefer the checkout title — it carries the tier name
+                     // (e.g. "Avriti Vastu — Up to 4 BHK"); fall back to the
+                     // plain service name only if that's missing.
+                     'title'         => ! empty($item['title']) ? $item['title'] : ($sd?->name ?? 'Service'),
+ 'thumbnail'     => $image,
+ 'product_image' => $image,
+ 'is_service'    => true,

- 
- return [
- ...$item,
-                     'title' => $serviceDetail?->name ?? ($item['title'] ?? 'Service'),
- 'thumbnail' => $image,
- 'product_image' => $image,
- 'is_service' => true,

+ 
+ return [
+ ...$item,
+                     // Prefer the checkout title — it carries the tier name
+                     // (e.g. "Avriti Vastu — Up to 4 BHK"); fall back to the
+                     // plain service name only if that's missing.
+                     'title' => ! empty($item['title']) ? $item['title'] : ($serviceDetail?->name ?? 'Service'),
+ 'thumbnail' => $image,
+ 'product_image' => $image,
+ 'is_service' => true,

- {{-- Items --}}
- @php
- $hasOnlyComboItems = $order->items->isNotEmpty() && $order->items->every(fn ($i) => $i->combo_product_id);
-       $itemsColumnCount = $hasOnlyComboItems ? 5 : 6;
- @endphp
- <div class="rounded-2xl border border-gray-200 overflow-hidden">
- <h3 class="px-4 py-3 text-sm font-semibold text-[#0b3dba] border-b border-gray-200">Items</h3>
- <thead class="bg-gray-50 text-xs uppercase tracking-[0.1em] text-gray-500">
- <tr>
- <th class="px-4 py-3">Product</th>
-               @unless ($hasOnlyComboItems)
- <th class="px-4 py-3">Variant</th>
-               @endunless
- <th class="px-4 py-3">SKU</th>
- <th class="px-4 py-3">Price</th>
- <th class="px-4 py-3">Qty</th>
- <span class="ml-2 inline-flex rounded-full bg-[#eef4ff] px-2 py-0.5 text-[10px] font-semibold text-[#0b3dba]">Combo</span>
- @endif

+ {{-- Items --}}
+ @php
+ $hasOnlyComboItems = $order->items->isNotEmpty() && $order->items->every(fn ($i) => $i->combo_product_id);
+       // Show the Variant column only if at least one item actually has a variant.
+       // Service-only orders (and combos) have none → hide the whole column.
+       $hasAnyVariant = $order->items->contains(
+           fn ($i) => ! $i->combo_product_id && (filled($i->attribute_value) || filled($i->variant_name))
+       );
+       $showVariantColumn = ! $hasOnlyComboItems && $hasAnyVariant;
+       $itemsColumnCount = $showVariantColumn ? 6 : 5;
+ @endphp
+ <div class="rounded-2xl border border-gray-200 overflow-hidden">
+ <h3 class="px-4 py-3 text-sm font-semibold text-[#0b3dba] border-b border-gray-200">Items</h3>
+ <thead class="bg-gray-50 text-xs uppercase tracking-[0.1em] text-gray-500">
+ <tr>
+ <th class="px-4 py-3">Product</th>
+               @if ($showVariantColumn)
+ <th class="px-4 py-3">Variant</th>

- form.append('_token', '{{ csrf_token() }}');
- if (dryRun) form.append('dry_run', '1');
- 
-       fetch('{{ route("products.import") }}', { method: 'POST', body: form })
-         .then(res => res.json())
-         .then(data => {
- renderResult(data);
- 
- if (dryRun) {
- doImport.classList.add('flex');
- doImport.disabled = false;
- doImport.innerHTML = '<i class="fa-solid fa-upload"></i> Import Now';
- }
- } else if (data.success && data.imported > 0) {
- setTimeout(() => { window.location.reload(); }, 2000);
- }
- })
- .catch(() => {

+ form.append('_token', '{{ csrf_token() }}');
+ if (dryRun) form.append('dry_run', '1');
+ 
+       fetch('{{ route("products.import") }}', {
+         method: 'POST',
+         body: form,
+         headers: { 'Accept': 'application/json', 'X-Requested-With': 'XMLHttpRequest' },
+       })
+         .then(async res => {
+           // Read as text first — the server may return an HTML error page
+           // (413/419/500/504) instead of JSON, which would crash res.json().
+           const raw = await res.text();
+           let data;
+           try {
+             data = JSON.parse(raw);
+           } catch (e) {
+             const hint = res.status === 413 ? 'File too large — increase upload limit (post_max_size / client_max_body_size).'
+               : res.status === 419 ? 'Session expired — refresh the page and try again.'

- ];
- 
- // ── Init all Quill editors (common pattern) ──
- function initQuill(editorEl) {
- const textarea    = editorEl.nextElementSibling;
- if (!textarea || !textarea.matches('[data-quill-input]')) return;
- const wordCountEl = editorEl.closest('div')?.querySelector('[data-quill-word-count]');
- const maxWords    = parseInt(editorEl.dataset.maxWords, 10) || null;
- 
- const q = new Quill(editorEl, { theme: 'snow', modules: { toolbar: toolbarOptions } });
-     if (textarea.value.trim()) q.root.innerHTML = textarea.value;
- 
- function updateWordCount() {
- const text  = q.getText().trim();
- wordCountEl.textContent = count;
- wordCountEl.closest('.word-count')?.classList.toggle('warn', maxWords && count > maxWords);
- }
-       const html = q.root.innerHTML;

+ ];
+ 
+ // ── Init all Quill editors (common pattern) ──
+   // If the user typed raw tags (Quill escaped them to <p> etc.),
+   // turn those back into real HTML so both toolbar-formatting AND
+   // hand-typed HTML render on the frontend.
+   function unescapeTypedHtml(html) {
+     // does the content contain escaped tags like <p> / <h1> ?
+     if (!/<\s*\/?\s*(p|h[1-6]|ul|ol|li|strong|b|em|i|u|br|span|div|a|blockquote)\b/i.test(html)) {
+       return html;
+     }
+     // unwrap Quill's auto <p> around the escaped markup, then unescape
+     const txt = document.createElement('div');
+     txt.innerHTML = html;                 // real DOM: escaped entities become text
+     let raw = txt.textContent || '';      // e.g. "<p>Online Vastu...</p>"
+     return raw;
+   }
+ 

- form.append('_token', '{{ csrf_token() }}');
- if (dryRun) form.append('dry_run', '1');
- 
-       fetch('{{ route("service-details.import") }}', { method: 'POST', body: form })
-         .then(res => res.json())
-         .then(data => {
- renderResult(data);
- if (dryRun) {
- validateBtn.classList.add('hidden');
- doImport.classList.add('flex');
- doImport.disabled = false;
- doImport.innerHTML = '<i class="fa-solid fa-upload"></i> Import Now';
- }
- } else if (data.success && data.imported > 0) {
- setTimeout(() => { window.location.reload(); }, 2000);
- }
- })
- .catch(() => {

+ form.append('_token', '{{ csrf_token() }}');
+ if (dryRun) form.append('dry_run', '1');
+ 
+       fetch('{{ route("service-details.import") }}', {
+         method: 'POST',
+         body: form,
+         headers: { 'Accept': 'application/json', 'X-Requested-With': 'XMLHttpRequest' },
+       })
+         .then(async res => {
+           // Read as text first — the server may return an HTML error page
+           // (413/419/500/504) instead of JSON, which would crash res.json().
+           const raw = await res.text();
+           let data;
+           try {
+             data = JSON.parse(raw);
+           } catch (e) {
+             // Not JSON → surface the real HTTP status so server issues are visible.
+             const hint = res.status === 413 ? 'File too large — increase upload limit (post_max_size / client_max_body_size).'

- <div style="font-size:11px; color:#666; line-height:1.8;">
- {{ $shipping_addr['email'] ?? $orderData['shipping_email'] ?? '-' }}<br>
- {{ $shipping_addr['phone'] ?? $billing['phone'] ?? '-' }}<br>
-                       {{ $shipping_addr['address_line1'] ?? $billing['address_line1'] ?? '-' }}@if(!empty($shipping_addr['address_line2'] ?? $billing['address_line2'])), {{ $shipping_addr['address_line2'] ?? $billing['address_line2'] }}@endif<br>
- {{ $shipping_addr['city'] ?? $billing['city'] ?? '-' }}, {{ $shipping_addr['state'] ?? $billing['state'] ?? '-' }}<br>
- {{ $shipping_addr['pincode'] ?? $billing['pincode'] ?? '-' }}
- </div>
- <div style="font-size:11px; color:#666; line-height:1.8;">
- {{ $billing['email'] ?? $orderData['billing_email'] ?? '-' }}<br>
- {{ $billing['phone'] ?? '-' }}<br>
-                       {{ $billing['address_line1'] ?? '-' }}@if(!empty($billing['address_line2'])), {{ $billing['address_line2'] }}@endif<br>
- {{ $billing['city'] ?? '-' }}, {{ $billing['state'] ?? '-' }}<br>
- {{ $billing['pincode'] ?? '-' }}
- </div>

+ <div style="font-size:11px; color:#666; line-height:1.8;">
+ {{ $shipping_addr['email'] ?? $orderData['shipping_email'] ?? '-' }}<br>
+ {{ $shipping_addr['phone'] ?? $billing['phone'] ?? '-' }}<br>
+                       {{ $shipping_addr['address_line1'] ?? $billing['address_line1'] ?? '-' }}@php($line2 = ($shipping_addr['address_line2'] ?? null) ?: ($billing['address_line2'] ?? null))@if(!empty($line2)), {{ $line2 }}@endif<br>
+ {{ $shipping_addr['city'] ?? $billing['city'] ?? '-' }}, {{ $shipping_addr['state'] ?? $billing['state'] ?? '-' }}<br>
+ {{ $shipping_addr['pincode'] ?? $billing['pincode'] ?? '-' }}
+ </div>
+ <div style="font-size:11px; color:#666; line-height:1.8;">
+ {{ $billing['email'] ?? $orderData['billing_email'] ?? '-' }}<br>
+ {{ $billing['phone'] ?? '-' }}<br>
+                       {{ $billing['address_line1'] ?? '-' }}@if(!empty($billing['address_line2'] ?? null)), {{ $billing['address_line2'] }}@endif<br>
+ {{ $billing['city'] ?? '-' }}, {{ $billing['state'] ?? '-' }}<br>
+ {{ $billing['pincode'] ?? '-' }}
+ </div>