bing

Signed-off-by: rgrgogu <obsequio.rus@gmail.com>

src/modules/client/components/LessonUpsellModal.jsx

@@ -1,25 +1,19 @@
 // LessonUpsellModal — shown when a learner clicks a locked standalone Lesson.
 // Mirrors UnitUpsellModal.jsx: unlocks via any course reachable through its
 // attached Units (aggregated across all of them, since a Lesson can sit in
-// more than one), with an optional direct "Buy" listing if the lesson itself
-// has an active product, plus a generic "View Plans" fallback.
+// more than one), plus a generic "View Plans" fallback.
 // Shared by LessonsList and Dashboard.
 
 import { useNavigate } from "react-router-dom";
-import { LockIcon, ShoppingCart, GraduationCap, Check } from "lucide-react";
+import { LockIcon, Check } from "lucide-react";
 import ResponsiveModal from "@/components/generic/ResponsiveModal";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { useDateFormat } from "@/hooks/useDateFormat";
 import { resolveTierBadge, cheapestTierSlug } from "@/utils/tierBadge.util";
 
 export default function LessonUpsellModal({ open, onOpenChange, lesson, tierMap = {} }) {
   const navigate = useNavigate();
-  const { fmtCurrency } = useDateFormat();
   const courses = lesson?.courses ?? [];
-  const purchasable = lesson?.product?.is_active && !lesson?.has_purchased;
-  const awaitingStarterSet = purchasable && lesson?.purchase_eligible === false;
-  const canBuy = purchasable && !awaitingStarterSet;
 
   const slug = cheapestTierSlug([lesson?.subscription, ...courses.map((c) => c.subscription)], tierMap);
   const { rank, label, cls, panel } = resolveTierBadge(slug, tierMap);
@@ -33,27 +27,13 @@ export default function LessonUpsellModal({ open, onOpenChange, lesson, tierMap
       footer={
         <>
           <Button variant="outline" onClick={() => onOpenChange(false)}>Close</Button>
-          {canBuy && (
-            <Button onClick={() => { onOpenChange(false); navigate(`/lessons/${lesson.uuid}/checkout`); }}>
-              <ShoppingCart /> Buy {fmtCurrency(lesson.product.price ?? 0, lesson.product.currency ?? "USD")}
-            </Button>
-          )}
-          <Button variant={canBuy ? "outline" : "default"} onClick={() => { onOpenChange(false); navigate("/plans"); }}>
+          <Button onClick={() => { onOpenChange(false); navigate("/plans"); }}>
             <LockIcon /> View Plans
           </Button>
         </>
       }
     >
       <div className="space-y-6 py-2">
-        {awaitingStarterSet && (
-          <div className="flex items-center gap-2.5 p-4 rounded-xl border border-amber-300 bg-amber-50 dark:border-amber-700 dark:bg-amber-950/40">
-            <GraduationCap className="size-4 text-amber-700 dark:text-amber-400 shrink-0" />
-            <p className="text-sm text-amber-800 dark:text-amber-300">
-              Complete your plan's starter content to unlock individual purchases like this one.
-            </p>
-          </div>
-        )}
-
         {rank > 0 && (
           <div className={`p-5 rounded-2xl border ${panel.bg} ${panel.border}`}>
             <div className="flex items-center gap-3 mb-3">

src/modules/client/components/LockedContentPanel.jsx

@@ -4,25 +4,20 @@
 // renders in place of the page body itself. Shared by UnitDetails and
 // LessonDetails.
 //
-// `item` (optional) is the unit/lesson's own subscription/product info, from
-// the 403 body's `item` field — lets a deep-link show the same own-tier
-// badge + direct "Buy" option the browse-list upsell modals already do,
-// instead of only ever pointing at an attached course.
+// `item` (optional) is the unit/lesson's own subscription info, from the 403
+// body's `item` field — lets a deep-link show the same own-tier badge the
+// browse-list upsell modals already do, instead of only ever pointing at an
+// attached course.
 
 import { useNavigate } from "react-router-dom";
-import { LockIcon, Zap, ShoppingCart, GraduationCap } from "lucide-react";
+import { LockIcon, Zap } from "lucide-react";
 import { Button } from "@/components/ui/button";
-import { useDateFormat } from "@/hooks/useDateFormat";
 import { resolveTierBadge } from "@/utils/tierBadge.util";
 
-export default function LockedContentPanel({ course, item, tierMap = {}, checkoutPath }) {
+export default function LockedContentPanel({ course, item, tierMap = {} }) {
   const navigate = useNavigate();
-  const { fmtCurrency } = useDateFormat();
   const tier = course?.subscription ? tierMap[course.subscription] : null;
   const ownTier = item?.subscription ? resolveTierBadge(item.subscription, tierMap) : null;
-  const purchasable = item?.product?.is_active && !item?.has_purchased && checkoutPath;
-  const awaitingStarterSet = purchasable && item?.purchase_eligible === false;
-  const canBuy = purchasable && !awaitingStarterSet;
 
   return (
     <div className="flex flex-col items-center gap-6 py-32 text-center px-4">
@@ -33,27 +28,14 @@ export default function LockedContentPanel({ course, item, tierMap = {}, checkou
         <h2 className="text-xl font-semibold">Premium / Exclusive Content</h2>
         <p className="text-sm text-muted-foreground leading-relaxed">
           {ownTier
-            ? `This content requires the ${ownTier.label} plan${canBuy ? ", or you can purchase it individually" : ""}.`
+            ? `This content requires the ${ownTier.label} plan.`
             : course
             ? `This content is part of "${course.title}"${tier?.name ? ` (${tier.name} plan)` : ""}. Upgrade your plan or view the course to unlock it.`
             : "Upgrade your plan to access this content."}
         </p>
       </div>
-      {awaitingStarterSet && (
-        <div className="flex items-center gap-2.5 p-3 rounded-xl border border-amber-300 bg-amber-50 dark:border-amber-700 dark:bg-amber-950/40 max-w-sm">
-          <GraduationCap className="size-4 text-amber-700 dark:text-amber-400 shrink-0" />
-          <p className="text-sm text-amber-800 dark:text-amber-300 text-left">
-            Complete your plan's starter content to unlock individual purchases like this one.
-          </p>
-        </div>
-      )}
       <div className="flex flex-col items-center gap-2">
         <div className="flex items-center gap-2">
-          {canBuy && (
-            <Button variant="outline" onClick={() => navigate(checkoutPath)} className="gap-1.5">
-              <ShoppingCart className="size-4" /> Buy {fmtCurrency(item.product.price ?? 0, item.product.currency ?? "USD")}
-            </Button>
-          )}
           <Button onClick={() => navigate('/plans')} className="gap-1.5">
             <Zap className="size-4" /> View Available Plans
           </Button>

src/modules/client/components/UnitUpsellModal.jsx

@@ -1,25 +1,17 @@
 // UnitUpsellModal — shown when a learner clicks a locked standalone Unit.
-// Unlocks via any course it's attached to (links to view/buy the course), with
-// an optional direct "Buy" listing if the unit itself has an active product
-// (same PayPal flow as Courses).
+// Unlocks via any course it's attached to (links to view/buy the course).
 // Shared by UnitsList, UnitDetails, and Dashboard.
 
 import { useNavigate } from "react-router-dom";
-import { LockIcon, ShoppingCart, GraduationCap, Check } from "lucide-react";
+import { LockIcon, Check } from "lucide-react";
 import ResponsiveModal from "@/components/generic/ResponsiveModal";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import { useDateFormat } from "@/hooks/useDateFormat";
 import { resolveTierBadge, cheapestTierSlug } from "@/utils/tierBadge.util";
 
 export default function UnitUpsellModal({ open, onOpenChange, unit, tierMap = {} }) {
   const navigate = useNavigate();
-  const { fmtCurrency } = useDateFormat();
   const courses = unit?.courses ?? [];
-  const purchasable = unit?.product?.is_active && !unit?.has_purchased;
-  // purchase_eligible is undefined for callers that haven't fetched it yet — treat as eligible (no regression).
-  const awaitingStarterSet = purchasable && unit?.purchase_eligible === false;
-  const canBuy = purchasable && !awaitingStarterSet;
 
   const slug = cheapestTierSlug([unit?.subscription, ...courses.map((c) => c.subscription)], tierMap);
   const { rank, label, cls, panel } = resolveTierBadge(slug, tierMap);
@@ -33,27 +25,13 @@ export default function UnitUpsellModal({ open, onOpenChange, unit, tierMap = {}
       footer={
         <>
           <Button variant="outline" onClick={() => onOpenChange(false)}>Close</Button>
-          {canBuy && (
-            <Button onClick={() => { onOpenChange(false); navigate(`/units/${unit.uuid}/checkout`); }}>
-              <ShoppingCart /> Buy {fmtCurrency(unit.product.price ?? 0, unit.product.currency ?? "USD")}
-            </Button>
-          )}
-          <Button variant={canBuy ? "outline" : "default"} onClick={() => { onOpenChange(false); navigate("/plans"); }}>
+          <Button onClick={() => { onOpenChange(false); navigate("/plans"); }}>
             <LockIcon /> View Plans
           </Button>
         </>
       }
     >
       <div className="space-y-6 py-2">
-        {awaitingStarterSet && (
-          <div className="flex items-center gap-2.5 p-4 rounded-xl border border-amber-300 bg-amber-50 dark:border-amber-700 dark:bg-amber-950/40">
-            <GraduationCap className="size-4 text-amber-700 dark:text-amber-400 shrink-0" />
-            <p className="text-sm text-amber-800 dark:text-amber-300">
-              Complete your plan's starter content to unlock individual purchases like this one.
-            </p>
-          </div>
-        )}
-
         {rank > 0 && (
           <div className={`p-5 rounded-2xl border ${panel.bg} ${panel.border}`}>
             <div className="flex items-center gap-3 mb-3">