Changeset 3488606

Timestamp:

03/23/2026 06:39:37 AM (5 days ago)

Author:

wprashed

Message:

2.1.0

• Added a full visual rule builder to the settings page
• Moved the plugin page under the WooCommerce admin menu
• Added customer type, product, and tag timeout rules
• Added excluded role and excluded tag support
• Expanded CSV import to support all new rule types
• Redesigned the admin settings interface with a more modern layout
• Improved import/export presentation and rule card usability

Location:

cartflush-autoclear-cart-for-inactive-users

Files:

• assets/Screenshot-1.png (added)
• assets/Screenshot-2.png (added)
• assets/Screenshot-3.png (added)
• assets/Screenshot-4.png (added)
• tags/2.1.0 (added)
• tags/2.1.0/assets (added)
• tags/2.1.0/assets/banner.png (added)
• tags/2.1.0/assets/css (added)
• tags/2.1.0/assets/css/admin.css (added)
• tags/2.1.0/assets/js (added)
• tags/2.1.0/assets/js/admin.js (added)
• tags/2.1.0/assets/logo.png (added)
• tags/2.1.0/blueprint.json (added)
• tags/2.1.0/cartflush-autoclear-cart-for-inactive-users.php (added)
• tags/2.1.0/docs (added)
• tags/2.1.0/docs/wordpress-org-assets.md (added)
• tags/2.1.0/includes (added)
• tags/2.1.0/includes/admin (added)
• tags/2.1.0/includes/admin/class-cartflush-admin.php (added)
• tags/2.1.0/includes/class-cartflush-plugin.php (added)
• tags/2.1.0/includes/class-cartflush-rules.php (added)
• tags/2.1.0/languages (added)
• tags/2.1.0/languages/cartflush.pot (added)
• tags/2.1.0/readme.txt (added)
• tags/2.1.0/uninstall.php (added)
• trunk/assets/banner.png (added)
• trunk/assets/css/admin.css (modified) (2 diffs)
• trunk/assets/js (added)
• trunk/assets/js/admin.js (added)
• trunk/assets/logo.png (added)
• trunk/cartflush-autoclear-cart-for-inactive-users.php (modified) (2 diffs)
• trunk/includes/admin/class-cartflush-admin.php (modified) (5 diffs)
• trunk/includes/class-cartflush-rules.php (modified) (7 diffs)
• trunk/readme.txt (modified) (4 diffs)

cartflush-autoclear-cart-for-inactive-users/trunk/assets/css/admin.css

@@ -1 +1 @@
 .cartflush-admin {
-    max-width: 1120px;
+    --cf-bg: #f1f5f9;
+    --cf-surface: #ffffff;
+    --cf-surface-soft: #f8fafc;
+    --cf-border: #e2e8f0;
+    --cf-border-strong: #cbd5e1;
+    --cf-text: #1e293b;
+    --cf-text-soft: #64748b;
+    --cf-title: #0f172a;
+    --cf-primary: #3b82f6;
+    --cf-primary-deep: #2563eb;
+    --cf-primary-soft: #eff6ff;
+    --cf-success: #0f766e;
+    --cf-danger: #dc2626;
+    --cf-shadow: 0 12px 30px rgba(15, 23, 42, 0.06);
+    max-width: 1340px;
+    padding-bottom: 32px;
+}
+
+.cartflush-admin::before {
+    content: "";
+    position: fixed;
+    inset: 0;
+    z-index: -1;
+    background: linear-gradient(180deg, #f8fafc 0%, #f1f5f9 100%);
+    pointer-events: none;
+}
+
+.cartflush-shell {
+    display: grid;
+    gap: 22px;
+}
+
+.cartflush-hero,
+.cartflush-panel,
+.cartflush-sidecard,
+.cartflush-summary-panel {
+    border: 1px solid var(--cf-border);
+    border-radius: 20px;
+    background: var(--cf-surface);
+    box-shadow: var(--cf-shadow);
 }
 
 .cartflush-hero {
+    display: grid;
+    grid-template-columns: minmax(0, 1.8fr) minmax(280px, 0.8fr);
+    gap: 24px;
+    padding: 28px 30px;
+}
+
+.cartflush-eyebrow,
+.cartflush-chip {
+    display: inline-flex;
+    align-items: center;
+    padding: 6px 12px;
+    border-radius: 999px;
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+}
+
+.cartflush-eyebrow {
+    background: var(--cf-primary-soft);
+    color: var(--cf-primary-deep);
+}
+
+.cartflush-chip {
+    background: #f1f5f9;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-chip--blue {
+    background: var(--cf-primary-soft);
+    color: var(--cf-primary-deep);
+}
+
+.cartflush-hero h1 {
+    margin: 14px 0 10px;
+    font-size: 34px;
+    line-height: 1.08;
+    letter-spacing: -0.03em;
+    color: var(--cf-title);
+}
+
+.cartflush-hero p,
+.cartflush-rule-card p,
+.cartflush-panel__intro p,
+.cartflush-sidecard p,
+.cartflush-savebar p,
+.cartflush-summary p {
+    margin-top: 0;
+    color: var(--cf-text-soft);
+    line-height: 1.7;
+}
+
+.cartflush-hero__stats {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 14px;
+    margin-top: 24px;
+}
+
+.cartflush-stat {
+    padding: 16px 18px;
+    border: 1px solid var(--cf-border);
+    border-radius: 16px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-stat__label,
+.cartflush-stat__meta {
+    display: block;
+    font-size: 12px;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-stat strong {
+    display: block;
+    margin: 8px 0 6px;
+    font-size: 28px;
+    line-height: 1;
+    letter-spacing: -0.04em;
+    color: var(--cf-title);
+}
+
+.cartflush-hero__rail {
+    display: grid;
+    align-content: start;
+}
+
+.cartflush-rail-card {
+    padding: 20px;
+    border: 1px solid var(--cf-border);
+    border-radius: 16px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-rail-card h3 {
+    margin: 14px 0 8px;
+    font-size: 20px;
+    line-height: 1.25;
+    color: var(--cf-title);
+}
+
+.cartflush-rail-card p {
+    margin: 0;
+}
+
+.cartflush-bullet-list {
+    margin: 14px 0 0;
+    padding-left: 18px;
+    color: var(--cf-text-soft);
+    line-height: 1.8;
+}
+
+.cartflush-layout {
+    display: grid;
+    grid-template-columns: minmax(0, 1.9fr) minmax(300px, 0.9fr);
+    gap: 22px;
+    align-items: start;
+}
+
+.cartflush-main,
+.cartflush-sidebar {
+    display: grid;
+    gap: 18px;
+}
+
+.cartflush-sidepanel {
+    display: grid;
+    gap: 16px;
+}
+
+.cartflush-sidepanel__intro {
+    padding: 8px 4px 0;
+}
+
+.cartflush-sidepanel__intro h2 {
+    margin: 10px 0 8px;
+    font-size: 24px;
+    line-height: 1.15;
+    letter-spacing: -0.02em;
+    color: var(--cf-title);
+}
+
+.cartflush-sidepanel__intro p {
+    margin: 0;
+    color: var(--cf-text-soft);
+    line-height: 1.7;
+}
+
+.cartflush-panel,
+.cartflush-summary-panel {
+    padding: 28px;
+}
+
+.cartflush-panel__intro {
+    margin-bottom: 22px;
+}
+
+.cartflush-panel h2,
+.cartflush-summary-panel h2 {
+    margin: 10px 0 8px;
+    font-size: 24px;
+    line-height: 1.15;
+    letter-spacing: -0.02em;
+    color: var(--cf-title);
+}
+
+.cartflush-settings-form {
+    display: grid;
+    gap: 20px;
+}
+
+.cartflush-settings-form .form-table {
+    margin: 0;
+}
+
+.cartflush-settings-form .form-table th {
+    padding-left: 0;
+    color: var(--cf-title);
+    font-size: 14px;
+    font-weight: 600;
+}
+
+.cartflush-settings-form .form-table td {
+    padding-right: 0;
+}
+
+.cartflush-field {
+    display: inline-flex;
+    align-items: center;
+    gap: 12px;
+    padding: 12px 14px;
+    border: 1px solid var(--cf-border);
+    border-radius: 14px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-field input[type="number"] {
+    border: 0;
+    box-shadow: none;
+    background: transparent;
+    font-size: 20px;
+    font-weight: 700;
+    color: var(--cf-title);
+}
+
+.cartflush-field span {
+    font-size: 12px;
+    font-weight: 700;
+    color: var(--cf-text-soft);
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+}
+
+.cartflush-rule-grid,
+.cartflush-summary {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 18px;
+}
+
+.cartflush-rule-card {
+    padding: 20px;
+    border: 1px solid var(--cf-border);
+    border-radius: 20px;
+    background: linear-gradient(180deg, #ffffff 0%, #fbfdff 100%);
+}
+
+.cartflush-rule-card__header {
     display: flex;
     justify-content: space-between;
     align-items: flex-start;
-    gap: 24px;
-    margin: 24px 0;
-    padding: 28px 32px;
-    border-radius: 20px;
-    background: linear-gradient(135deg, #0f172a, #1d4ed8);
-    color: #fff;
-    box-shadow: 0 18px 40px rgba(15, 23, 42, 0.16);
-}
-
-.cartflush-hero h1 {
-    margin: 0 0 10px;
-    font-size: 30px;
-    line-height: 1.15;
-    color: #fff;
-}
-
-.cartflush-hero p {
-    margin: 0;
-    max-width: 720px;
-    font-size: 14px;
-    line-height: 1.7;
-    color: rgba(255, 255, 255, 0.88);
-}
-
-.cartflush-hero__meta {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px;
-}
-
-.cartflush-hero__meta span {
-    display: inline-flex;
-    align-items: center;
-    padding: 8px 12px;
-    border: 1px solid rgba(255, 255, 255, 0.2);
-    border-radius: 999px;
-    background: rgba(255, 255, 255, 0.12);
-    font-size: 12px;
-    font-weight: 600;
-    letter-spacing: 0.02em;
-}
-
-.cartflush-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
-    gap: 20px;
-    margin-bottom: 20px;
-}
-
-.cartflush-card {
-    padding: 24px;
-    border: 1px solid #d0d7de;
-    border-radius: 18px;
-    background: #fff;
-    box-shadow: 0 8px 24px rgba(15, 23, 42, 0.06);
-}
-
-.cartflush-card--primary {
-    grid-column: span 2;
-}
-
-.cartflush-card--wide {
-    margin-top: 8px;
-}
-
-.cartflush-card h2 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    font-size: 20px;
-}
-
-.cartflush-card h3 {
-    margin-top: 0;
-    margin-bottom: 8px;
-    font-size: 15px;
-}
-
-.cartflush-card p {
-    line-height: 1.65;
-}
-
-.cartflush-card form {
-    margin-top: 14px;
-}
-
-.cartflush-card input[type="file"] {
-    width: 100%;
-    padding: 10px;
-    border: 1px dashed #94a3b8;
-    border-radius: 12px;
-    background: #f8fafc;
-}
-
-.cartflush-card .button {
-    margin-top: 14px;
-}
-
-.cartflush-field {
+    gap: 14px;
+    margin-bottom: 18px;
+}
+
+.cartflush-rule-card__title {
+    display: grid;
+    gap: 8px;
+}
+
+.cartflush-rule-card__meta {
     display: inline-flex;
     align-items: center;
     gap: 8px;
-}
-
-.cartflush-summary {
-    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));
+    width: fit-content;
+    padding: 6px 10px;
+    border: 1px solid var(--cf-border);
+    border-radius: 999px;
+    background: #fff;
+}
+
+.cartflush-rule-card__count {
+    font-size: 13px;
+    font-weight: 700;
+    color: var(--cf-title);
+}
+
+.cartflush-rule-card__label {
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-rule-card h3,
+.cartflush-sidecard h3,
+.cartflush-summary h3 {
+    margin: 0 0 6px;
+    font-size: 18px;
+    line-height: 1.3;
+    color: var(--cf-title);
+}
+
+.cartflush-table-wrap {
+    overflow-x: auto;
+    padding: 2px 0;
+}
+
+.cartflush-rule-table {
+    width: 100%;
+    border: 0;
+    box-shadow: none;
+    background: transparent;
+    border-collapse: separate;
+    border-spacing: 0 10px;
+}
+
+.cartflush-rule-table thead th {
+    padding: 0 8px 2px 8px;
+    border: 0;
+    background: transparent;
+    font-size: 11px;
+    font-weight: 700;
+    text-transform: uppercase;
+    letter-spacing: 0.08em;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-rule-table tbody tr,
+.cartflush-rule-table.striped > tbody > :nth-child(odd),
+.cartflush-rule-table.striped > tbody > :nth-child(even) {
+    background: transparent;
+}
+
+.cartflush-rule-table tbody td {
+    padding: 10px;
+    border-top: 1px solid var(--cf-border);
+    border-bottom: 1px solid var(--cf-border);
+    background: #fff;
+    vertical-align: middle;
+}
+
+.cartflush-rule-table tbody td:first-child {
+    border-left: 1px solid var(--cf-border);
+    border-radius: 14px 0 0 14px;
+}
+
+.cartflush-rule-table tbody td:last-child {
+    border-right: 1px solid var(--cf-border);
+    border-radius: 0 14px 14px 0;
+}
+
+.cartflush-rule-table select,
+.cartflush-rule-table input[type="number"],
+.cartflush-sidecard input[type="file"] {
+    width: 100%;
+    max-width: 100%;
+    min-height: 42px;
+    padding: 0 14px;
+    border: 1px solid var(--cf-border-strong);
+    border-radius: 12px;
+    background: #fff;
+    color: var(--cf-text);
+}
+
+.cartflush-sidecard input[type="file"] {
+    padding: 11px 14px;
+    background: #fff;
+}
+
+.cartflush-rule-table select:focus,
+.cartflush-rule-table input[type="number"]:focus,
+.cartflush-sidecard input[type="file"]:focus,
+.cartflush-action:focus,
+.cartflush-savebar__button:focus {
+    border-color: var(--cf-primary);
+    box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.14);
+    outline: 0;
+}
+
+.cartflush-rule-table__action,
+.cartflush-row-action {
+    width: 96px;
+    text-align: right;
+}
+
+.cartflush-remove-row {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 34px;
+    padding: 0 10px;
+    border: 1px solid rgba(220, 38, 38, 0.18);
+    border-radius: 999px;
+    background: #fff;
+    color: var(--cf-danger);
+    font-weight: 600;
+    text-decoration: none;
+}
+
+.cartflush-remove-row:hover,
+.cartflush-remove-row:focus {
+    border-color: rgba(220, 38, 38, 0.34);
+    background: #fef2f2;
+    color: #b91c1c;
+}
+
+.cartflush-rule-card__hint {
+    margin: 14px 0 0;
+    font-size: 13px;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-action,
+.cartflush-sidecard .button,
+.cartflush-savebar__button {
+    border-radius: 12px;
+    box-shadow: none;
+}
+
+.cartflush-action {
+    margin-top: 0;
+    border-color: var(--cf-border);
+    background: var(--cf-surface);
+    color: var(--cf-title);
+}
+
+.cartflush-action:hover,
+.cartflush-action:focus {
+    border-color: var(--cf-primary);
+    background: var(--cf-primary-soft);
+    color: var(--cf-primary-deep);
+}
+
+.cartflush-savebar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     gap: 16px;
+    padding: 18px 20px;
+    border: 1px solid var(--cf-border);
+    border-radius: 18px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-savebar strong {
+    display: block;
+    margin-bottom: 4px;
+    font-size: 18px;
+    color: var(--cf-title);
+}
+
+.cartflush-savebar__button {
+    margin: 0;
+    padding: 0 22px;
+    border-color: var(--cf-primary);
+    background: var(--cf-primary);
+}
+
+.cartflush-savebar__button:hover,
+.cartflush-savebar__button:focus {
+    border-color: var(--cf-primary-deep);
+    background: var(--cf-primary-deep);
+}
+
+.cartflush-sidecard {
+    padding: 22px;
+    border-radius: 18px;
+}
+
+.cartflush-sidecard__header {
+    display: grid;
+    gap: 10px;
+    margin-bottom: 10px;
+}
+
+.cartflush-sidecard__header strong {
+    font-size: 20px;
+    line-height: 1.25;
+    color: var(--cf-title);
+}
+
+.cartflush-sidecard form {
+    display: grid;
+    gap: 12px;
+    margin-top: 14px;
+}
+
+.cartflush-sidebar form + form {
+    margin-top: 12px;
+}
+
+.cartflush-upload-field {
+    display: grid;
+    gap: 8px;
+    padding: 16px;
+    border: 1px dashed var(--cf-border-strong);
+    border-radius: 16px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-upload-field > span {
+    font-size: 12px;
+    font-weight: 700;
+    letter-spacing: 0.08em;
+    text-transform: uppercase;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-sidecard .button {
+    margin-top: 0;
+    justify-self: start;
+}
+
+.cartflush-sidecard .button-secondary {
+    border-color: var(--cf-primary);
+    background: #fff;
+    color: var(--cf-primary-deep);
+}
+
+.cartflush-sidecard .button-secondary:hover,
+.cartflush-sidecard .button-secondary:focus {
+    border-color: var(--cf-primary-deep);
+    background: var(--cf-primary-soft);
+    color: var(--cf-primary-deep);
+}
+
+.cartflush-code-list {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    margin-top: 14px;
+}
+
+.cartflush-code-list code {
+    display: inline-flex;
+    padding: 7px 10px;
+    border: 1px solid var(--cf-border);
+    border-radius: 999px;
+    background: var(--cf-surface-soft);
+    font-size: 12px;
+    color: var(--cf-text-soft);
+}
+
+.cartflush-summary-panel {
+    padding: 24px;
 }
 
 .cartflush-summary > div {
     padding: 18px;
-    border-radius: 14px;
-    background: #f8fafc;
-    border: 1px solid #e2e8f0;
+    border: 1px solid var(--cf-border);
+    border-radius: 16px;
+    background: var(--cf-surface-soft);
+}
+
+.cartflush-summary h3 {
+    font-size: 16px;
 }
 
@@ -127 +577 @@
 }
 
+@media (max-width: 1180px) {
+    .cartflush-layout {
+        grid-template-columns: 1fr;
+    }
+
+    .cartflush-hero__stats {
+        grid-template-columns: repeat(2, minmax(0, 1fr));
+    }
+}
+
 @media (max-width: 900px) {
-    .cartflush-hero {
+    .cartflush-hero,
+    .cartflush-rule-grid,
+    .cartflush-summary {
+        grid-template-columns: 1fr;
+    }
+
+    .cartflush-rule-card__header,
+    .cartflush-savebar {
         flex-direction: column;
     }
 
-    .cartflush-card--primary {
-        grid-column: span 1;
+    .cartflush-action,
+    .cartflush-savebar__button,
+    .cartflush-sidecard .button {
+        width: 100%;
+        justify-content: center;
     }
-}
+
+    .cartflush-rule-table__action,
+    .cartflush-row-action {
+        width: 100%;
+        text-align: left;
+    }
+}

cartflush-autoclear-cart-for-inactive-users/trunk/cartflush-autoclear-cart-for-inactive-users.php

@@ -4 +4 @@
  * Plugin URI: https://wordpress.org/plugins/cartflush-autoclear-cart-for-inactive-users/
  * Description: Automatically clears WooCommerce carts after inactivity with configurable default timeouts, import/export tools, and rule-based exclusions.
- * Version: 2.0.0
+ * Version: 2.1.0
  * Requires at least: 5.8
  * Requires PHP: 7.4
@@ -21 +21 @@
 }
 
-define( 'CARTFLUSH_VERSION', '1.2.1' );
+define( 'CARTFLUSH_VERSION', '2.1.0' );
 define( 'CARTFLUSH_FILE', __FILE__ );
 define( 'CARTFLUSH_PATH', plugin_dir_path( __FILE__ ) );

cartflush-autoclear-cart-for-inactive-users/trunk/includes/admin/class-cartflush-admin.php

@@ -19 +19 @@
     private $rules;
 
-    /**
-     * Constructor.
-     *
-     * @param CartFlush_Rules $rules Rules manager.
-     */
     public function __construct( CartFlush_Rules $rules ) {
         $this->rules = $rules;
-
         add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
         add_action( 'admin_init', [ $this, 'register_settings' ] );
@@ -34 +28 @@
         add_action( 'admin_post_cartflush_import_csv', [ $this, 'handle_csv_import' ] );
         add_action( 'admin_post_cartflush_export_json', [ $this, 'handle_json_export' ] );
-    }
-
-    /**
-     * Add settings page under Settings.
-     *
-     * @return void
-     */
+        add_filter( 'option_page_capability_cartflush_settings_group', [ $this, 'settings_capability' ] );
+    }
+
     public function add_settings_page() {
-        add_options_page(
-            __( 'CartFlush Settings', 'cartflush' ),
-            __( 'CartFlush', 'cartflush' ),
-            'manage_options',
-            'cartflush-settings',
-            [ $this, 'settings_page_html' ]
-        );
-    }
-
-    /**
-     * Register plugin settings.
-     *
-     * @return void
-     */
+        add_submenu_page( 'woocommerce', __( 'CartFlush Settings', 'cartflush' ), __( 'CartFlush', 'cartflush' ), $this->get_required_capability(), 'cartflush-settings', [ $this, 'settings_page_html' ] );
+    }
+
     public function register_settings() {
-        register_setting(
-            'cartflush_settings_group',
-            'cartflush_expiration_time',
-            [
-                'type'              => 'integer',
-                'sanitize_callback' => 'absint',
-                'default'           => 30,
-            ]
-        );
-
-        register_setting(
-            'cartflush_settings_group',
-            CartFlush_Rules::OPTION_NAME,
-            [
-                'type'              => 'array',
-                'sanitize_callback' => [ $this, 'sanitize_rules_option' ],
-                'default'           => $this->rules->get_default_rules(),
-            ]
-        );
-
-        add_settings_section(
-            'cartflush_main',
-            __( 'Timeout Settings', 'cartflush' ),
-            [ $this, 'render_main_section' ],
-            'cartflush-settings'
-        );
-
-        add_settings_field(
-            'cartflush_expiration_time',
-            __( 'Default cart expiration', 'cartflush' ),
-            [ $this, 'render_expiration_field' ],
-            'cartflush-settings',
-            'cartflush_main'
-        );
-    }
-
-    /**
-     * Sanitize imported rules.
-     *
-     * @param mixed $value Rules payload.
-     * @return array<string, mixed>
-     */
+        register_setting( 'cartflush_settings_group', 'cartflush_expiration_time', [ 'type' => 'integer', 'sanitize_callback' => 'absint', 'default' => 30 ] );
+        register_setting( 'cartflush_settings_group', CartFlush_Rules::OPTION_NAME, [ 'type' => 'array', 'sanitize_callback' => [ $this, 'sanitize_rules_option' ], 'default' => $this->rules->get_default_rules() ] );
+        add_settings_section( 'cartflush_main', __( 'Timeout Settings', 'cartflush' ), [ $this, 'render_main_section' ], 'cartflush-settings' );
+        add_settings_field( 'cartflush_expiration_time', __( 'Default cart expiration', 'cartflush' ), [ $this, 'render_expiration_field' ], 'cartflush-settings', 'cartflush_main' );
+    }
+
     public function sanitize_rules_option( $value ) {
-        return $this->rules->normalize_rules_data( $value );
-    }
-
-    /**
-     * Enqueue admin assets on the plugin settings page.
-     *
-     * @param string $hook Current admin hook suffix.
-     * @return void
-     */
+        return $this->rules->normalize_rules_data( is_array( $value ) ? $this->prepare_rules_for_storage( $value ) : $value );
+    }
+
+    public function settings_capability() {
+        return $this->get_required_capability();
+    }
+
     public function enqueue_assets( $hook ) {
-        if ( 'settings_page_cartflush-settings' !== $hook ) {
+        if ( 'woocommerce_page_cartflush-settings' !== $hook ) {
             return;
         }
 
-        wp_enqueue_style(
-            'cartflush-admin',
-            CARTFLUSH_URL . 'assets/css/admin.css',
-            [],
-            CARTFLUSH_VERSION
-        );
-    }
-
-    /**
-     * Render settings section intro.
-     *
-     * @return void
-     */
+        wp_enqueue_style( 'cartflush-admin', CARTFLUSH_URL . 'assets/css/admin.css', [], CARTFLUSH_VERSION );
+        wp_enqueue_script( 'cartflush-admin', CARTFLUSH_URL . 'assets/js/admin.js', [], CARTFLUSH_VERSION, true );
+    }
+
     public function render_main_section() {
-        echo '<p>' . esc_html__( 'Set a default inactivity window. Imported role and category rules can override it for specific carts.', 'cartflush' ) . '</p>';
-    }
-
-    /**
-     * Render expiration input.
-     *
-     * @return void
-     */
+        echo '<p>' . esc_html__( 'Set the fallback timeout first, then add rule-based overrides and exclusions below.', 'cartflush' ) . '</p>';
+    }
+
     public function render_expiration_field() {
         $value = (int) get_option( 'cartflush_expiration_time', 30 );
-        echo '<label class="cartflush-field">';
-        echo '<input type="number" min="1" step="1" class="small-text" name="cartflush_expiration_time" value="' . esc_attr( $value ) . '"> ';
-        echo '<span>' . esc_html__( 'minutes', 'cartflush' ) . '</span>';
-        echo '</label>';
-        echo '<p class="description">' . esc_html__( 'This fallback timeout is used when no imported rule matches the current customer or cart contents.', 'cartflush' ) . '</p>';
-    }
-
-    /**
-     * Output admin notices.
-     *
-     * @return void
-     */
+        echo '<label class="cartflush-field"><input type="number" min="1" step="1" class="small-text" name="cartflush_expiration_time" value="' . esc_attr( $value ) . '"> <span>' . esc_html__( 'minutes', 'cartflush' ) . '</span></label>';
+        echo '<p class="description">' . esc_html__( 'Fallback timeout when no custom timeout rule matches.', 'cartflush' ) . '</p>';
+    }
+
     public function render_admin_notices() {
         if ( ! isset( $_GET['page'] ) || 'cartflush-settings' !== sanitize_key( wp_unslash( $_GET['page'] ) ) ) {
             return;
         }
-
+        if ( ! empty( $_GET['settings-updated'] ) ) {
+            echo '<div class="notice notice-success is-dismissible"><p>' . esc_html__( 'Settings saved.', 'cartflush' ) . '</p></div>';
+        }
         if ( ! empty( $_GET['cartflush_notice'] ) ) {
             echo '<div class="notice notice-success is-dismissible"><p>' . esc_html( wp_unslash( $_GET['cartflush_notice'] ) ) . '</p></div>';
         }
-
         if ( ! empty( $_GET['cartflush_error'] ) ) {
             echo '<div class="notice notice-error"><p>' . esc_html( wp_unslash( $_GET['cartflush_error'] ) ) . '</p></div>';
@@ -164 +84 @@
     }
 
-    /**
-     * Import a full JSON settings file.
-     *
-     * @return void
-     */
     public function handle_json_import() {
         $this->assert_admin_permissions();
         check_admin_referer( 'cartflush_import_json' );
-
         if ( empty( $_FILES['cartflush_json_file']['tmp_name'] ) ) {
             $this->redirect_with_message( '', __( 'Please choose a JSON file to import.', 'cartflush' ) );
         }
-
-        $raw = file_get_contents( $_FILES['cartflush_json_file']['tmp_name'] ); // phpcs:ignore WordPressVIPMinimum.Performance.FetchingRemoteData.FileGetContentsUnknown
+        $raw  = file_get_contents( $_FILES['cartflush_json_file']['tmp_name'] ); // phpcs:ignore
         $data = json_decode( $raw, true );
-
         if ( JSON_ERROR_NONE !== json_last_error() || ! is_array( $data ) ) {
             $this->redirect_with_message( '', __( 'The uploaded JSON file is invalid.', 'cartflush' ) );
         }
-
         $default_timeout = isset( $data['cartflush_expiration_time'] ) ? absint( $data['cartflush_expiration_time'] ) : get_option( 'cartflush_expiration_time', 30 );
         $rules           = isset( $data['import_rules'] ) ? $data['import_rules'] : $data;
-        $normalized      = $this->rules->normalize_rules_data( $rules );
-
         update_option( 'cartflush_expiration_time', max( 1, $default_timeout ) );
-        update_option( CartFlush_Rules::OPTION_NAME, $normalized );
-
+        update_option( CartFlush_Rules::OPTION_NAME, $this->rules->normalize_rules_data( $rules ) );
         $this->redirect_with_message( __( 'JSON settings imported successfully.', 'cartflush' ) );
     }
 
-    /**
-     * Import timeout and exclusion rules from CSV.
-     *
-     * @return void
-     */
     public function handle_csv_import() {
         $this->assert_admin_permissions();
         check_admin_referer( 'cartflush_import_csv' );
-
         if ( empty( $_FILES['cartflush_csv_file']['tmp_name'] ) ) {
             $this->redirect_with_message( '', __( 'Please choose a CSV file to import.', 'cartflush' ) );
         }
-
-        $handle = fopen( $_FILES['cartflush_csv_file']['tmp_name'], 'r' ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fopen,WordPressVIPMinimum.Performance.FetchingRemoteData.FileGetContentsUnknown
-
+        $handle = fopen( $_FILES['cartflush_csv_file']['tmp_name'], 'r' ); // phpcs:ignore
         if ( ! $handle ) {
             $this->redirect_with_message( '', __( 'The uploaded CSV file could not be read.', 'cartflush' ) );
         }
-
         $header = fgetcsv( $handle );
-
         if ( ! is_array( $header ) ) {
-            fclose( $handle ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose
+            fclose( $handle ); // phpcs:ignore
             $this->redirect_with_message( '', __( 'The CSV file is empty.', 'cartflush' ) );
         }
-
         $header = array_map( 'sanitize_key', $header );
         $rules  = $this->rules->get_rules_option();
-
         while ( false !== ( $row = fgetcsv( $handle ) ) ) {
-            $row = array_pad( $row, count( $header ), '' );
-            $row = array_combine( $header, $row );
-
+            $row = array_combine( $header, array_pad( $row, count( $header ), '' ) );
             if ( ! is_array( $row ) ) {
                 continue;
             }
-
             $type    = isset( $row['type'] ) ? sanitize_key( $row['type'] ) : '';
-            $key     = isset( $row['key'] ) ? $row['key'] : '';
+            $key     = isset( $row['key'] ) ? trim( (string) $row['key'] ) : '';
             $timeout = isset( $row['timeout_minutes'] ) ? absint( $row['timeout_minutes'] ) : 0;
-
-            if ( ! $type || '' === trim( $key ) ) {
+            if ( ! $type || '' === $key ) {
                 continue;
             }
-
             switch ( $type ) {
+                case 'customer_type':
+                    if ( in_array( sanitize_key( $key ), [ 'guest', 'logged_in' ], true ) && $timeout > 0 ) {
+                        $rules['customer_type_rules'][ sanitize_key( $key ) ] = $timeout;
+                    }
+                    break;
                 case 'role':
                     if ( $timeout > 0 ) {
@@ -245 +141 @@
                     }
                     break;
-
+                case 'product_rule':
+                    if ( absint( $key ) > 0 && $timeout > 0 ) {
+                        $rules['product_rules'][ absint( $key ) ] = $timeout;
+                    }
+                    break;
                 case 'category':
                     if ( $timeout > 0 ) {
@@ -251 +151 @@
                     }
                     break;
-
+                case 'tag':
+                    if ( $timeout > 0 ) {
+                        $rules['tag_rules'][ sanitize_title( $key ) ] = $timeout;
+                    }
+                    break;
+                case 'excluded_role':
+                    $rules['excluded_roles'][] = sanitize_key( $key );
+                    break;
                 case 'excluded_product':
                 case 'product':
-                    $product_id = absint( $key );
-                    if ( $product_id > 0 ) {
-                        $rules['excluded_products'][] = $product_id;
+                    if ( absint( $key ) > 0 ) {
+                        $rules['excluded_products'][] = absint( $key );
                     }
                     break;
-
                 case 'excluded_category':
                     $rules['excluded_categories'][] = sanitize_title( $key );
                     break;
+                case 'excluded_tag':
+                    $rules['excluded_tags'][] = sanitize_title( $key );
+                    break;
             }
         }
-
-        fclose( $handle ); // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_fclose
-
+        fclose( $handle ); // phpcs:ignore
         update_option( CartFlush_Rules::OPTION_NAME, $this->rules->normalize_rules_data( $rules ) );
-
         $this->redirect_with_message( __( 'CSV rules imported successfully.', 'cartflush' ) );
     }
 
-    /**
-     * Export JSON settings.
-     *
-     * @return void
-     */
     public function handle_json_export() {
         $this->assert_admin_permissions();
         check_admin_referer( 'cartflush_export_json' );
-
-        $payload = [
-            'plugin'                    => 'CartFlush',
-            'version'                   => CARTFLUSH_VERSION,
-            'exported_at'               => gmdate( 'c' ),
-            'cartflush_expiration_time' => (int) get_option( 'cartflush_expiration_time', 30 ),
-            'import_rules'              => $this->rules->get_rules_option(),
-        ];
-
+        $payload = [ 'plugin' => 'CartFlush', 'version' => CARTFLUSH_VERSION, 'exported_at' => gmdate( 'c' ), 'cartflush_expiration_time' => (int) get_option( 'cartflush_expiration_time', 30 ), 'import_rules' => $this->rules->get_rules_option() ];
         nocache_headers();
         header( 'Content-Type: application/json; charset=utf-8' );
         header( 'Content-Disposition: attachment; filename=cartflush-settings-' . gmdate( 'Y-m-d' ) . '.json' );
-
         echo wp_json_encode( $payload, JSON_PRETTY_PRINT );
         exit;
     }
 
-    /**
-     * Render the admin page.
-     *
-     * @return void
-     */
     public function settings_page_html() {
-        $rules = $this->rules->get_rules_option();
+        $rules          = $this->rules->get_rules_option();
+        $roles          = $this->get_role_options();
+        $customer_types = [ 'guest' => __( 'Guest', 'cartflush' ), 'logged_in' => __( 'Logged-in', 'cartflush' ) ];
+        $categories     = $this->get_taxonomy_options( 'product_cat' );
+        $tags           = $this->get_taxonomy_options( 'product_tag' );
         ?>
         <div class="wrap cartflush-admin">
-            <div class="cartflush-hero">
-                <div>
-                    <h1><?php esc_html_e( 'CartFlush Settings', 'cartflush' ); ?></h1>
-                    <p><?php esc_html_e( 'Protect your WooCommerce experience with rule-based cart cleanup, import/export tools, and product-aware exclusions.', 'cartflush' ); ?></p>
+            <div class="cartflush-shell">
+                <section class="cartflush-hero">
+                    <div class="cartflush-hero__content">
+                        <span class="cartflush-eyebrow"><?php esc_html_e( 'WooCommerce Settings', 'cartflush' ); ?></span>
+                        <h1><?php esc_html_e( 'CartFlush', 'cartflush' ); ?></h1>
+                        <p><?php esc_html_e( 'Configure automatic cart clearing with layered timeout rules, product conditions, and exclusions from one settings page.', 'cartflush' ); ?></p>
+                        <div class="cartflush-hero__stats">
+                            <?php foreach ( $this->get_stats( $rules ) as $stat ) : ?>
+                                <div class="cartflush-stat">
+                                    <span class="cartflush-stat__label"><?php echo esc_html( $stat['label'] ); ?></span>
+                                    <strong><?php echo esc_html( $stat['value'] ); ?></strong>
+                                    <span class="cartflush-stat__meta"><?php echo esc_html( $stat['meta'] ); ?></span>
+                                </div>
+                            <?php endforeach; ?>
+                        </div>
+                    </div>
+                    <div class="cartflush-hero__rail">
+                        <div class="cartflush-rail-card">
+                            <span class="cartflush-chip cartflush-chip--blue"><?php esc_html_e( 'How It Works', 'cartflush' ); ?></span>
+                            <h3><?php esc_html_e( 'Build rules directly from this screen', 'cartflush' ); ?></h3>
+                            <p><?php esc_html_e( 'Use a default timeout, layer rule-based overrides, then add exclusions for carts that should never be cleared automatically.', 'cartflush' ); ?></p>
+                            <ul class="cartflush-bullet-list">
+                                <li><?php esc_html_e( 'Customer type and role timeouts', 'cartflush' ); ?></li>
+                                <li><?php esc_html_e( 'Product, category, and tag rules', 'cartflush' ); ?></li>
+                                <li><?php esc_html_e( 'Role, product, category, and tag exclusions', 'cartflush' ); ?></li>
+                            </ul>
+                        </div>
+                    </div>
+                </section>
+
+                <div class="cartflush-layout">
+                    <main class="cartflush-main">
+                        <form method="post" action="options.php" class="cartflush-settings-form">
+                            <section class="cartflush-panel">
+                                <div class="cartflush-panel__intro">
+                                    <div>
+                                        <span class="cartflush-chip"><?php esc_html_e( 'General', 'cartflush' ); ?></span>
+                                        <h2><?php esc_html_e( 'General Settings', 'cartflush' ); ?></h2>
+                                        <p><?php esc_html_e( 'Choose the fallback timeout used when no more specific rule applies.', 'cartflush' ); ?></p>
+                                    </div>
+                                </div>
+                                <?php settings_fields( 'cartflush_settings_group' ); do_settings_sections( 'cartflush-settings' ); ?>
+                            </section>
+
+                            <section class="cartflush-panel">
+                                <div class="cartflush-panel__intro">
+                                    <div>
+                                        <span class="cartflush-chip"><?php esc_html_e( 'Timeout Rules', 'cartflush' ); ?></span>
+                                        <h2><?php esc_html_e( 'Rule-Based Timeouts', 'cartflush' ); ?></h2>
+                                        <p><?php esc_html_e( 'Apply shorter or longer cart expiration windows based on the customer or the products in the cart.', 'cartflush' ); ?></p>
+                                    </div>
+                                </div>
+                                <div class="cartflush-rule-grid">
+                                    <?php
+                                    $this->render_rule_card( __( 'Customer Type Rules', 'cartflush' ), __( 'Set separate timeouts for guest and logged-in customers.', 'cartflush' ), 'customer-type', __( 'Add Rule', 'cartflush' ), [ __( 'Customer Type', 'cartflush' ), __( 'Timeout', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['customer_type_rules'] ), __( 'Use this when guest carts and account carts should expire differently.', 'cartflush' ), function() use ( $rules, $customer_types ) { $this->render_customer_type_rows( $rules['customer_type_rules'], $customer_types ); } );
+                                    $this->render_rule_card( __( 'Role Rules', 'cartflush' ), __( 'Override the default timeout for specific user roles.', 'cartflush' ), 'role-rule', __( 'Add Rule', 'cartflush' ), [ __( 'Role', 'cartflush' ), __( 'Timeout', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['role_rules'] ), __( 'Perfect for wholesale, shop manager, or VIP-specific behavior.', 'cartflush' ), function() use ( $rules, $roles ) { $this->render_map_timeout_rows( 'role_rules', 'role', $rules['role_rules'], $roles, __( 'Select a role', 'cartflush' ) ); } );
+                                    $this->render_rule_card( __( 'Product Rules', 'cartflush' ), __( 'Set a timeout for a single WooCommerce product ID.', 'cartflush' ), 'product-rule', __( 'Add Rule', 'cartflush' ), [ __( 'Product ID', 'cartflush' ), __( 'Timeout', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['product_rules'] ), __( 'Use product-level rules when one item needs a special cart lifetime.', 'cartflush' ), function() use ( $rules ) { $this->render_product_timeout_rows( 'product_rules', $rules['product_rules'] ); } );
+                                    $this->render_rule_card( __( 'Category Rules', 'cartflush' ), __( 'Apply timeouts using WooCommerce product categories.', 'cartflush' ), 'category-rule', __( 'Add Rule', 'cartflush' ), [ __( 'Category', 'cartflush' ), __( 'Timeout', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['category_rules'] ), __( 'Great for grouping timeouts across collections instead of product by product.', 'cartflush' ), function() use ( $rules, $categories ) { $this->render_map_timeout_rows( 'category_rules', 'slug', $rules['category_rules'], $categories, __( 'Select a category', 'cartflush' ) ); } );
+                                    $this->render_rule_card( __( 'Tag Rules', 'cartflush' ), __( 'Apply timeouts using WooCommerce product tags.', 'cartflush' ), 'tag-rule', __( 'Add Rule', 'cartflush' ), [ __( 'Tag', 'cartflush' ), __( 'Timeout', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['tag_rules'] ), __( 'Helpful for campaign, seasonal, or merchandising tag-based rules.', 'cartflush' ), function() use ( $rules, $tags ) { $this->render_map_timeout_rows( 'tag_rules', 'slug', $rules['tag_rules'], $tags, __( 'Select a tag', 'cartflush' ) ); } );
+                                    ?>
+                                </div>
+                            </section>
+
+                            <section class="cartflush-panel">
+                                <div class="cartflush-panel__intro">
+                                    <div>
+                                        <span class="cartflush-chip"><?php esc_html_e( 'Exclusions', 'cartflush' ); ?></span>
+                                        <h2><?php esc_html_e( 'Exclusion Rules', 'cartflush' ); ?></h2>
+                                        <p><?php esc_html_e( 'Skip the auto-clear behavior completely when a cart matches one of the following conditions.', 'cartflush' ); ?></p>
+                                    </div>
+                                </div>
+                                <div class="cartflush-rule-grid">
+                                    <?php
+                                    $this->render_rule_card( __( 'Excluded Roles', 'cartflush' ), __( 'Exclude selected user roles from cart clearing.', 'cartflush' ), 'excluded-role', __( 'Add Exclusion', 'cartflush' ), [ __( 'Role', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['excluded_roles'] ), __( 'These roles will always bypass CartFlush regardless of timeout rules.', 'cartflush' ), function() use ( $rules, $roles ) { $this->render_simple_select_rows( 'excluded_roles', 'role', $rules['excluded_roles'], $roles, __( 'Select a role', 'cartflush' ) ); } );
+                                    $this->render_rule_card( __( 'Excluded Products', 'cartflush' ), __( 'Exclude carts that contain any of these products.', 'cartflush' ), 'excluded-product', __( 'Add Exclusion', 'cartflush' ), [ __( 'Product ID', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['excluded_products'] ), __( 'Useful for subscriptions, booking items, or products needing longer retention.', 'cartflush' ), function() use ( $rules ) { $this->render_simple_number_rows( 'excluded_products', 'product_id', $rules['excluded_products'] ); } );
+                                    $this->render_rule_card( __( 'Excluded Categories', 'cartflush' ), __( 'Exclude carts that contain products in these categories.', 'cartflush' ), 'excluded-category', __( 'Add Exclusion', 'cartflush' ), [ __( 'Category', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['excluded_categories'] ), __( 'Protect full product collections from the auto-clear workflow.', 'cartflush' ), function() use ( $rules, $categories ) { $this->render_simple_select_rows( 'excluded_categories', 'slug', $rules['excluded_categories'], $categories, __( 'Select a category', 'cartflush' ) ); } );
+                                    $this->render_rule_card( __( 'Excluded Tags', 'cartflush' ), __( 'Exclude carts that contain products with these tags.', 'cartflush' ), 'excluded-tag', __( 'Add Exclusion', 'cartflush' ), [ __( 'Tag', 'cartflush' ), __( 'Remove', 'cartflush' ) ], count( $rules['excluded_tags'] ), __( 'Best for campaigns or fulfillment groups that should never be auto-cleared.', 'cartflush' ), function() use ( $rules, $tags ) { $this->render_simple_select_rows( 'excluded_tags', 'slug', $rules['excluded_tags'], $tags, __( 'Select a tag', 'cartflush' ) ); } );
+                                    ?>
+                                </div>
+                            </section>
+
+                            <div class="cartflush-savebar">
+                                <div>
+                                    <strong><?php esc_html_e( 'Save changes', 'cartflush' ); ?></strong>
+                                    <p><?php esc_html_e( 'Your new rules will be used immediately for future inactivity checks.', 'cartflush' ); ?></p>
+                                </div>
+                                <?php submit_button( __( 'Save Settings', 'cartflush' ), 'primary cartflush-savebar__button', 'submit', false ); ?>
+                            </div>
+                        </form>
+                    </main>
+
+                    <aside class="cartflush-sidebar">
+                        <div class="cartflush-sidepanel">
+                            <div class="cartflush-sidepanel__intro">
+                                <span class="cartflush-chip"><?php esc_html_e( 'Tools', 'cartflush' ); ?></span>
+                                <h2><?php esc_html_e( 'Import & Export', 'cartflush' ); ?></h2>
+                                <p><?php esc_html_e( 'Bring settings in from another store or create a backup before making large rule changes.', 'cartflush' ); ?></p>
+                            </div>
+
+                            <div class="cartflush-sidecard">
+                                <div class="cartflush-sidecard__header">
+                                    <span class="cartflush-chip"><?php esc_html_e( 'CSV Import', 'cartflush' ); ?></span>
+                                    <strong><?php esc_html_e( 'Bulk Rules', 'cartflush' ); ?></strong>
+                                </div>
+                                <p><?php esc_html_e( 'Upload a CSV using the headers type, key, timeout_minutes. Exclusion rows can keep timeout_minutes empty.', 'cartflush' ); ?></p>
+                                <div class="cartflush-code-list">
+                                    <code>customer_type</code>
+                                    <code>role</code>
+                                    <code>product_rule</code>
+                                    <code>category</code>
+                                    <code>tag</code>
+                                </div>
+                                <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" enctype="multipart/form-data">
+                                    <?php wp_nonce_field( 'cartflush_import_csv' ); ?>
+                                    <input type="hidden" name="action" value="cartflush_import_csv">
+                                    <label class="cartflush-upload-field">
+                                        <span><?php esc_html_e( 'Choose CSV file', 'cartflush' ); ?></span>
+                                        <input type="file" name="cartflush_csv_file" accept=".csv,text/csv" required>
+                                    </label>
+                                    <?php submit_button( __( 'Import CSV', 'cartflush' ), 'secondary', 'submit', false ); ?>
+                                </form>
+                            </div>
+
+                            <div class="cartflush-sidecard">
+                                <div class="cartflush-sidecard__header">
+                                    <span class="cartflush-chip"><?php esc_html_e( 'JSON Import', 'cartflush' ); ?></span>
+                                    <strong><?php esc_html_e( 'Move Settings', 'cartflush' ); ?></strong>
+                                </div>
+                                <p><?php esc_html_e( 'Import a full CartFlush configuration from another WooCommerce store.', 'cartflush' ); ?></p>
+                                <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" enctype="multipart/form-data">
+                                    <?php wp_nonce_field( 'cartflush_import_json' ); ?>
+                                    <input type="hidden" name="action" value="cartflush_import_json">
+                                    <label class="cartflush-upload-field">
+                                        <span><?php esc_html_e( 'Choose JSON file', 'cartflush' ); ?></span>
+                                        <input type="file" name="cartflush_json_file" accept=".json,application/json" required>
+                                    </label>
+                                    <?php submit_button( __( 'Import JSON', 'cartflush' ), 'secondary', 'submit', false ); ?>
+                                </form>
+                            </div>
+
+                            <div class="cartflush-sidecard">
+                                <div class="cartflush-sidecard__header">
+                                    <span class="cartflush-chip"><?php esc_html_e( 'JSON Export', 'cartflush' ); ?></span>
+                                    <strong><?php esc_html_e( 'Backup', 'cartflush' ); ?></strong>
+                                </div>
+                                <p><?php esc_html_e( 'Download the current timeout and every saved rule group as a portable JSON backup.', 'cartflush' ); ?></p>
+                                <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
+                                    <?php wp_nonce_field( 'cartflush_export_json' ); ?>
+                                    <input type="hidden" name="action" value="cartflush_export_json">
+                                    <?php submit_button( __( 'Export JSON', 'cartflush' ), 'secondary', 'submit', false ); ?>
+                                </form>
+                            </div>
+                        </div>
+                    </aside>
                 </div>
-                <div class="cartflush-hero__meta">
-                    <span><?php esc_html_e( 'Version', 'cartflush' ); ?> <?php echo esc_html( CARTFLUSH_VERSION ); ?></span>
-                    <span><?php esc_html_e( 'Settings', 'cartflush' ); ?></span>
-                </div>
+
+                <section class="cartflush-summary-panel">
+                    <div class="cartflush-panel__intro">
+                        <div>
+                            <span class="cartflush-chip"><?php esc_html_e( 'Overview', 'cartflush' ); ?></span>
+                            <h2><?php esc_html_e( 'Saved Configuration', 'cartflush' ); ?></h2>
+                        </div>
+                    </div>
+                    <div class="cartflush-summary">
+                        <?php foreach ( $this->get_summary_items( $rules ) as $summary ) : ?>
+                            <div><h3><?php echo esc_html( $summary['label'] ); ?></h3><p><?php echo esc_html( $summary['value'] ); ?></p></div>
+                        <?php endforeach; ?>
+                    </div>
+                </section>
             </div>
 
-            <div class="cartflush-grid">
-                <div class="cartflush-card cartflush-card--primary">
-                    <h2><?php esc_html_e( 'Default Timeout', 'cartflush' ); ?></h2>
-                    <form method="post" action="options.php">
-                        <?php
-                        settings_fields( 'cartflush_settings_group' );
-                        do_settings_sections( 'cartflush-settings' );
-                        submit_button( __( 'Save Settings', 'cartflush' ) );
-                        ?>
-                    </form>
-                </div>
-
-                <div class="cartflush-card">
-                    <h2><?php esc_html_e( 'Import Full Settings', 'cartflush' ); ?></h2>
-                    <p><?php esc_html_e( 'Upload a JSON export to move CartFlush settings between sites.', 'cartflush' ); ?></p>
-                    <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" enctype="multipart/form-data">
-                        <?php wp_nonce_field( 'cartflush_import_json' ); ?>
-                        <input type="hidden" name="action" value="cartflush_import_json">
-                        <input type="file" name="cartflush_json_file" accept=".json,application/json" required>
-                        <?php submit_button( __( 'Import JSON', 'cartflush' ), 'secondary', 'submit', false ); ?>
-                    </form>
-                </div>
-
-                <div class="cartflush-card">
-                    <h2><?php esc_html_e( 'Import Rules from CSV', 'cartflush' ); ?></h2>
-                    <p><?php esc_html_e( 'Use type, key, and timeout_minutes columns to import role rules, category rules, or exclusions.', 'cartflush' ); ?></p>
-                    <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>" enctype="multipart/form-data">
-                        <?php wp_nonce_field( 'cartflush_import_csv' ); ?>
-                        <input type="hidden" name="action" value="cartflush_import_csv">
-                        <input type="file" name="cartflush_csv_file" accept=".csv,text/csv" required>
-                        <?php submit_button( __( 'Import CSV', 'cartflush' ), 'secondary', 'submit', false ); ?>
-                    </form>
-                    <p class="description"><code>role,customer,30</code> <code>category,subscription-box,10</code> <code>excluded_product,123,</code></p>
-                </div>
-
-                <div class="cartflush-card">
-                    <h2><?php esc_html_e( 'Export Settings', 'cartflush' ); ?></h2>
-                    <p><?php esc_html_e( 'Download the current timeout, imported rules, and exclusions as a JSON snapshot.', 'cartflush' ); ?></p>
-                    <form method="post" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
-                        <?php wp_nonce_field( 'cartflush_export_json' ); ?>
-                        <input type="hidden" name="action" value="cartflush_export_json">
-                        <?php submit_button( __( 'Export JSON', 'cartflush' ), 'secondary', 'submit', false ); ?>
-                    </form>
-                </div>
-            </div>
-
-            <div class="cartflush-card cartflush-card--wide">
-                <h2><?php esc_html_e( 'Imported Configuration Summary', 'cartflush' ); ?></h2>
-                <div class="cartflush-summary">
-                    <div>
-                        <h3><?php esc_html_e( 'Role Rules', 'cartflush' ); ?></h3>
-                        <p><?php echo esc_html( $this->format_assoc_list( $rules['role_rules'] ) ); ?></p>
-                    </div>
-                    <div>
-                        <h3><?php esc_html_e( 'Category Rules', 'cartflush' ); ?></h3>
-                        <p><?php echo esc_html( $this->format_assoc_list( $rules['category_rules'] ) ); ?></p>
-                    </div>
-                    <div>
-                        <h3><?php esc_html_e( 'Excluded Product IDs', 'cartflush' ); ?></h3>
-                        <p><?php echo esc_html( $this->format_simple_list( $rules['excluded_products'] ) ); ?></p>
-                    </div>
-                    <div>
-                        <h3><?php esc_html_e( 'Excluded Category Slugs', 'cartflush' ); ?></h3>
-                        <p><?php echo esc_html( $this->format_simple_list( $rules['excluded_categories'] ) ); ?></p>
-                    </div>
-                </div>
-            </div>
+            <?php $this->render_templates( $roles, $customer_types, $categories, $tags ); ?>
         </div>
         <?php
     }
 
-    /**
-     * Format key-value lists for display.
-     *
-     * @param array<string, int> $items Display items.
-     * @return string
-     */
+    private function render_rule_card( $title, $description, $type, $button_label, $headers, $count, $hint, $renderer ) {
+        ?>
+        <div class="cartflush-rule-card">
+            <div class="cartflush-rule-card__header">
+                <div class="cartflush-rule-card__title">
+                    <div class="cartflush-rule-card__meta">
+                        <span class="cartflush-rule-card__count"><?php echo esc_html( absint( $count ) ); ?></span>
+                        <span class="cartflush-rule-card__label"><?php esc_html_e( 'saved', 'cartflush' ); ?></span>
+                    </div>
+                    <h3><?php echo esc_html( $title ); ?></h3>
+                    <p><?php echo esc_html( $description ); ?></p>
+                </div>
+                <button type="button" class="button cartflush-action" data-cartflush-add-row="<?php echo esc_attr( $type ); ?>"><?php echo esc_html( $button_label ); ?></button>
+            </div>
+            <div class="cartflush-table-wrap">
+                <table class="widefat striped cartflush-rule-table">
+                    <thead><tr><?php foreach ( $headers as $index => $header ) : ?><th class="<?php echo esc_attr( $index === count( $headers ) - 1 ? 'cartflush-rule-table__action' : '' ); ?>"><?php echo esc_html( $header ); ?></th><?php endforeach; ?></tr></thead>
+                    <tbody data-cartflush-rows="<?php echo esc_attr( $type ); ?>"><?php call_user_func( $renderer ); ?></tbody>
+                </table>
+            </div>
+            <p class="cartflush-rule-card__hint"><?php echo esc_html( $hint ); ?></p>
+        </div>
+        <?php
+    }
+
+    private function render_templates( $roles, $customer_types, $categories, $tags ) {
+        ?>
+        <script type="text/html" id="tmpl-cartflush-customer-type"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[customer_type_rules][{{index}}][type]', '', $customer_types, __( 'Select customer type', 'cartflush' ) ); ?></td><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[customer_type_rules][{{index}}][timeout]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-role-rule"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[role_rules][{{index}}][role]', '', $roles, __( 'Select a role', 'cartflush' ) ); ?></td><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[role_rules][{{index}}][timeout]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-product-rule"><tr><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[product_rules][{{index}}][product_id]" value=""></td><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[product_rules][{{index}}][timeout]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-category-rule"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[category_rules][{{index}}][slug]', '', $categories, __( 'Select a category', 'cartflush' ) ); ?></td><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[category_rules][{{index}}][timeout]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-tag-rule"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[tag_rules][{{index}}][slug]', '', $tags, __( 'Select a tag', 'cartflush' ) ); ?></td><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[tag_rules][{{index}}][timeout]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-excluded-role"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[excluded_roles][{{index}}][role]', '', $roles, __( 'Select a role', 'cartflush' ) ); ?></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-excluded-product"><tr><td><input type="number" min="1" step="1" class="small-text" name="cartflush_import_rules[excluded_products][{{index}}][product_id]" value=""></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-excluded-category"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[excluded_categories][{{index}}][slug]', '', $categories, __( 'Select a category', 'cartflush' ) ); ?></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <script type="text/html" id="tmpl-cartflush-excluded-tag"><tr><td><?php $this->render_select_field( 'cartflush_import_rules[excluded_tags][{{index}}][slug]', '', $tags, __( 'Select a tag', 'cartflush' ) ); ?></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr></script>
+        <?php
+    }
+
+    private function render_customer_type_rows( $items, $options ) {
+        if ( empty( $items ) ) { echo $this->get_select_timeout_row( 'customer_type_rules', 0, 'type', '', '', $options, __( 'Select customer type', 'cartflush' ) ); return; } // phpcs:ignore
+        $index = 0; foreach ( $items as $key => $timeout ) { echo $this->get_select_timeout_row( 'customer_type_rules', $index, 'type', $key, $timeout, $options, __( 'Select customer type', 'cartflush' ) ); ++$index; } // phpcs:ignore
+    }
+
+    private function render_map_timeout_rows( $group, $field, $items, $options, $placeholder ) {
+        if ( empty( $items ) ) { echo $this->get_select_timeout_row( $group, 0, $field, '', '', $options, $placeholder ); return; } // phpcs:ignore
+        $index = 0; foreach ( $items as $key => $timeout ) { echo $this->get_select_timeout_row( $group, $index, $field, $key, $timeout, $options, $placeholder ); ++$index; } // phpcs:ignore
+    }
+
+    private function render_product_timeout_rows( $group, $items ) {
+        if ( empty( $items ) ) { echo $this->get_number_timeout_row( $group, 0, '', '' ); return; } // phpcs:ignore
+        $index = 0; foreach ( $items as $key => $timeout ) { echo $this->get_number_timeout_row( $group, $index, $key, $timeout ); ++$index; } // phpcs:ignore
+    }
+
+    private function render_simple_select_rows( $group, $field, $items, $options, $placeholder ) {
+        if ( empty( $items ) ) { echo $this->get_simple_select_row( $group, 0, $field, '', $options, $placeholder ); return; } // phpcs:ignore
+        foreach ( array_values( $items ) as $index => $item ) { echo $this->get_simple_select_row( $group, $index, $field, $item, $options, $placeholder ); } // phpcs:ignore
+    }
+
+    private function render_simple_number_rows( $group, $field, $items ) {
+        if ( empty( $items ) ) { echo $this->get_simple_number_row( $group, 0, $field, '' ); return; } // phpcs:ignore
+        foreach ( array_values( $items ) as $index => $item ) { echo $this->get_simple_number_row( $group, $index, $field, $item ); } // phpcs:ignore
+    }
+
+    private function get_select_timeout_row( $group, $index, $field, $value, $timeout, $options, $placeholder ) {
+        ob_start(); ?><tr><td><?php $this->render_select_field( 'cartflush_import_rules[' . $group . '][' . $index . '][' . $field . ']', (string) $value, $options, $placeholder ); ?></td><td><input type="number" min="1" step="1" class="small-text" name="<?php echo esc_attr( 'cartflush_import_rules[' . $group . '][' . $index . '][timeout]' ); ?>" value="<?php echo esc_attr( $timeout ); ?>"></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr><?php return (string) ob_get_clean();
+    }
+
+    private function get_number_timeout_row( $group, $index, $value, $timeout ) {
+        ob_start(); ?><tr><td><input type="number" min="1" step="1" class="small-text" name="<?php echo esc_attr( 'cartflush_import_rules[' . $group . '][' . $index . '][product_id]' ); ?>" value="<?php echo esc_attr( $value ); ?>"></td><td><input type="number" min="1" step="1" class="small-text" name="<?php echo esc_attr( 'cartflush_import_rules[' . $group . '][' . $index . '][timeout]' ); ?>" value="<?php echo esc_attr( $timeout ); ?>"></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr><?php return (string) ob_get_clean();
+    }
+
+    private function get_simple_select_row( $group, $index, $field, $value, $options, $placeholder ) {
+        ob_start(); ?><tr><td><?php $this->render_select_field( 'cartflush_import_rules[' . $group . '][' . $index . '][' . $field . ']', (string) $value, $options, $placeholder ); ?></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr><?php return (string) ob_get_clean();
+    }
+
+    private function get_simple_number_row( $group, $index, $field, $value ) {
+        ob_start(); ?><tr><td><input type="number" min="1" step="1" class="small-text" name="<?php echo esc_attr( 'cartflush_import_rules[' . $group . '][' . $index . '][' . $field . ']' ); ?>" value="<?php echo esc_attr( $value ); ?>"></td><td class="cartflush-row-action"><?php $this->render_remove_button(); ?></td></tr><?php return (string) ob_get_clean();
+    }
+
+    private function render_select_field( $name, $selected, $options, $placeholder ) {
+        $options = is_array( $options ) ? $options : [];
+        if ( $selected && ! isset( $options[ $selected ] ) ) { $options = [ $selected => $selected ] + $options; }
+        ?><select class="regular-text" name="<?php echo esc_attr( $name ); ?>"><option value=""><?php echo esc_html( $placeholder ); ?></option><?php foreach ( $options as $value => $label ) : ?><option value="<?php echo esc_attr( $value ); ?>" <?php selected( $selected, (string) $value ); ?>><?php echo esc_html( $label ); ?></option><?php endforeach; ?></select><?php
+    }
+
+    private function render_remove_button() {
+        echo '<button type="button" class="button-link-delete cartflush-remove-row">' . esc_html__( 'Remove', 'cartflush' ) . '</button>';
+    }
+
+    private function prepare_rules_for_storage( $value ) {
+        return [
+            'customer_type_rules' => $this->prepare_timeout_rows( isset( $value['customer_type_rules'] ) ? $value['customer_type_rules'] : [], 'type', 'sanitize_key' ),
+            'role_rules'          => $this->prepare_timeout_rows( isset( $value['role_rules'] ) ? $value['role_rules'] : [], 'role', 'sanitize_key' ),
+            'product_rules'       => $this->prepare_integer_timeout_rows( isset( $value['product_rules'] ) ? $value['product_rules'] : [], 'product_id' ),
+            'category_rules'      => $this->prepare_timeout_rows( isset( $value['category_rules'] ) ? $value['category_rules'] : [], 'slug', 'sanitize_title' ),
+            'tag_rules'           => $this->prepare_timeout_rows( isset( $value['tag_rules'] ) ? $value['tag_rules'] : [], 'slug', 'sanitize_title' ),
+            'excluded_roles'      => $this->prepare_string_list_rows( isset( $value['excluded_roles'] ) ? $value['excluded_roles'] : [], 'role', 'sanitize_key' ),
+            'excluded_products'   => $this->prepare_integer_list_rows( isset( $value['excluded_products'] ) ? $value['excluded_products'] : [], 'product_id' ),
+            'excluded_categories' => $this->prepare_string_list_rows( isset( $value['excluded_categories'] ) ? $value['excluded_categories'] : [], 'slug', 'sanitize_title' ),
+            'excluded_tags'       => $this->prepare_string_list_rows( isset( $value['excluded_tags'] ) ? $value['excluded_tags'] : [], 'slug', 'sanitize_title' ),
+        ];
+    }
+
+    private function prepare_timeout_rows( $rows, $field, $sanitizer ) {
+        $prepared = []; if ( ! is_array( $rows ) ) { return $prepared; } foreach ( $rows as $row ) { if ( ! is_array( $row ) ) { continue; } $key = isset( $row[ $field ] ) ? call_user_func( $sanitizer, $row[ $field ] ) : ''; $timeout = isset( $row['timeout'] ) ? absint( $row['timeout'] ) : 0; if ( $key && $timeout > 0 ) { $prepared[ $key ] = $timeout; } } return $prepared;
+    }
+
+    private function prepare_integer_timeout_rows( $rows, $field ) {
+        $prepared = []; if ( ! is_array( $rows ) ) { return $prepared; } foreach ( $rows as $row ) { if ( ! is_array( $row ) ) { continue; } $key = isset( $row[ $field ] ) ? absint( $row[ $field ] ) : 0; $timeout = isset( $row['timeout'] ) ? absint( $row['timeout'] ) : 0; if ( $key > 0 && $timeout > 0 ) { $prepared[ $key ] = $timeout; } } return $prepared;
+    }
+
+    private function prepare_string_list_rows( $rows, $field, $sanitizer ) {
+        $prepared = []; if ( ! is_array( $rows ) ) { return $prepared; } foreach ( $rows as $row ) { $item = is_array( $row ) && isset( $row[ $field ] ) ? call_user_func( $sanitizer, $row[ $field ] ) : ''; if ( $item ) { $prepared[] = $item; } } return array_values( array_unique( $prepared ) );
+    }
+
+    private function prepare_integer_list_rows( $rows, $field ) {
+        $prepared = []; if ( ! is_array( $rows ) ) { return $prepared; } foreach ( $rows as $row ) { $item = is_array( $row ) && isset( $row[ $field ] ) ? absint( $row[ $field ] ) : 0; if ( $item > 0 ) { $prepared[] = $item; } } return array_values( array_unique( $prepared ) );
+    }
+
+    private function get_stats( $rules ) {
+        return [
+            [ 'label' => __( 'Default Timeout', 'cartflush' ), 'value' => (int) get_option( 'cartflush_expiration_time', 30 ), 'meta' => __( 'minutes', 'cartflush' ) ],
+            [ 'label' => __( 'Timeout Rules', 'cartflush' ), 'value' => count( $rules['customer_type_rules'] ) + count( $rules['role_rules'] ) + count( $rules['product_rules'] ) + count( $rules['category_rules'] ) + count( $rules['tag_rules'] ), 'meta' => __( 'active', 'cartflush' ) ],
+            [ 'label' => __( 'Exclusions', 'cartflush' ), 'value' => count( $rules['excluded_roles'] ) + count( $rules['excluded_products'] ) + count( $rules['excluded_categories'] ) + count( $rules['excluded_tags'] ), 'meta' => __( 'guards', 'cartflush' ) ],
+            [ 'label' => __( 'Import Modes', 'cartflush' ), 'value' => 'CSV + JSON', 'meta' => __( 'ready', 'cartflush' ) ],
+        ];
+    }
+
+    private function get_summary_items( $rules ) {
+        return [
+            [ 'label' => __( 'Customer Type Rules', 'cartflush' ), 'value' => $this->format_assoc_list( $rules['customer_type_rules'] ) ],
+            [ 'label' => __( 'Role Rules', 'cartflush' ), 'value' => $this->format_assoc_list( $rules['role_rules'] ) ],
+            [ 'label' => __( 'Product Rules', 'cartflush' ), 'value' => $this->format_assoc_list( $rules['product_rules'] ) ],
+            [ 'label' => __( 'Category Rules', 'cartflush' ), 'value' => $this->format_assoc_list( $rules['category_rules'] ) ],
+            [ 'label' => __( 'Tag Rules', 'cartflush' ), 'value' => $this->format_assoc_list( $rules['tag_rules'] ) ],
+            [ 'label' => __( 'Excluded Roles', 'cartflush' ), 'value' => $this->format_simple_list( $rules['excluded_roles'] ) ],
+            [ 'label' => __( 'Excluded Products', 'cartflush' ), 'value' => $this->format_simple_list( $rules['excluded_products'] ) ],
+            [ 'label' => __( 'Excluded Categories', 'cartflush' ), 'value' => $this->format_simple_list( $rules['excluded_categories'] ) ],
+            [ 'label' => __( 'Excluded Tags', 'cartflush' ), 'value' => $this->format_simple_list( $rules['excluded_tags'] ) ],
+        ];
+    }
+
+    private function get_role_options() {
+        if ( ! function_exists( 'wp_roles' ) ) { return []; }
+        $options = []; foreach ( wp_roles()->roles as $key => $data ) { $options[ sanitize_key( $key ) ] = isset( $data['name'] ) ? $data['name'] : $key; } return $options;
+    }
+
+    private function get_taxonomy_options( $taxonomy ) {
+        $options = []; $terms = get_terms( [ 'taxonomy' => $taxonomy, 'hide_empty' => false ] ); if ( is_wp_error( $terms ) || ! is_array( $terms ) ) { return $options; } foreach ( $terms as $term ) { if ( isset( $term->slug, $term->name ) ) { $options[ $term->slug ] = $term->name . ' (' . $term->slug . ')'; } } return $options;
+    }
+
     private function format_assoc_list( $items ) {
-        if ( empty( $items ) ) {
-            return __( 'None imported yet.', 'cartflush' );
-        }
-
-        $formatted = [];
-
-        foreach ( $items as $key => $value ) {
-            $formatted[] = sprintf(
-                /* translators: 1: rule key, 2: timeout in minutes. */
-                __( '%1$s: %2$d min', 'cartflush' ),
-                $key,
-                absint( $value )
-            );
-        }
-
-        return implode( ', ', $formatted );
-    }
-
-    /**
-     * Format flat lists for display.
-     *
-     * @param array<int|string> $items Display items.
-     * @return string
-     */
+        if ( empty( $items ) ) { return __( 'None saved yet.', 'cartflush' ); }
+        $formatted = []; foreach ( $items as $key => $value ) { $formatted[] = sprintf( __( '%1$s: %2$d min', 'cartflush' ), (string) $key, absint( $value ) ); } return implode( ', ', $formatted );
+    }
+
     private function format_simple_list( $items ) {
-        if ( empty( $items ) ) {
-            return __( 'None imported yet.', 'cartflush' );
-        }
-
-        return implode( ', ', array_map( 'strval', $items ) );
-    }
-
-    /**
-     * Ensure the current user can manage the plugin.
-     *
-     * @return void
-     */
+        return empty( $items ) ? __( 'None saved yet.', 'cartflush' ) : implode( ', ', array_map( 'strval', $items ) );
+    }
+
     private function assert_admin_permissions() {
-        if ( ! current_user_can( 'manage_options' ) ) {
-            wp_die( esc_html__( 'You do not have permission to access this page.', 'cartflush' ) );
-        }
-    }
-
-    /**
-     * Redirect back to the settings page with a status message.
-     *
-     * @param string $notice Success message.
-     * @param string $error  Error message.
-     * @return void
-     */
+        if ( ! current_user_can( $this->get_required_capability() ) ) { wp_die( esc_html__( 'You do not have permission to access this page.', 'cartflush' ) ); }
+    }
+
+    private function get_required_capability() {
+        return 'manage_woocommerce';
+    }
+
     private function redirect_with_message( $notice = '', $error = '' ) {
-        $url = add_query_arg(
-            array_filter(
-                [
-                    'page'             => 'cartflush-settings',
-                    'cartflush_notice' => $notice,
-                    'cartflush_error'  => $error,
-                ]
-            ),
-            admin_url( 'options-general.php' )
-        );
-
+        $url = add_query_arg( array_filter( [ 'page' => 'cartflush-settings', 'cartflush_notice' => $notice, 'cartflush_error' => $error ] ), admin_url( 'admin.php' ) );
         wp_safe_redirect( $url );
         exit;

cartflush-autoclear-cart-for-inactive-users/trunk/includes/class-cartflush-rules.php

@@ -34 +34 @@
         $rules    = wp_parse_args( $value, $defaults );
 
-        $normalized_role_rules = [];
-        if ( is_array( $rules['role_rules'] ) ) {
-            foreach ( $rules['role_rules'] as $role => $timeout ) {
-                $role    = sanitize_key( $role );
-                $timeout = absint( $timeout );
-
-                if ( $role && $timeout > 0 ) {
-                    $normalized_role_rules[ $role ] = $timeout;
-                }
-            }
-        }
-
-        $normalized_category_rules = [];
-        if ( is_array( $rules['category_rules'] ) ) {
-            foreach ( $rules['category_rules'] as $slug => $timeout ) {
-                $slug    = sanitize_title( $slug );
-                $timeout = absint( $timeout );
-
-                if ( $slug && $timeout > 0 ) {
-                    $normalized_category_rules[ $slug ] = $timeout;
-                }
-            }
-        }
-
-        $excluded_products = [];
-        if ( is_array( $rules['excluded_products'] ) ) {
-            foreach ( $rules['excluded_products'] as $product_id ) {
-                $product_id = absint( $product_id );
-
-                if ( $product_id > 0 ) {
-                    $excluded_products[] = $product_id;
-                }
-            }
-        }
-
-        $excluded_categories = [];
-        if ( is_array( $rules['excluded_categories'] ) ) {
-            foreach ( $rules['excluded_categories'] as $slug ) {
-                $slug = sanitize_title( $slug );
-
-                if ( $slug ) {
-                    $excluded_categories[] = $slug;
-                }
-            }
-        }
-
         return [
-            'role_rules'          => $normalized_role_rules,
-            'category_rules'      => $normalized_category_rules,
-            'excluded_products'   => array_values( array_unique( $excluded_products ) ),
-            'excluded_categories' => array_values( array_unique( $excluded_categories ) ),
+            'customer_type_rules' => $this->normalize_customer_type_rules( $rules['customer_type_rules'] ),
+            'role_rules'          => $this->normalize_timeout_map( $rules['role_rules'], 'sanitize_key' ),
+            'category_rules'      => $this->normalize_timeout_map( $rules['category_rules'], 'sanitize_title' ),
+            'tag_rules'           => $this->normalize_timeout_map( $rules['tag_rules'], 'sanitize_title' ),
+            'product_rules'       => $this->normalize_product_timeout_rules( $rules['product_rules'] ),
+            'excluded_roles'      => $this->normalize_string_list( $rules['excluded_roles'], 'sanitize_key' ),
+            'excluded_products'   => $this->normalize_integer_list( $rules['excluded_products'] ),
+            'excluded_categories' => $this->normalize_string_list( $rules['excluded_categories'], 'sanitize_title' ),
+            'excluded_tags'       => $this->normalize_string_list( $rules['excluded_tags'], 'sanitize_title' ),
         ];
     }
@@ -102 +61 @@
         $user       = wp_get_current_user();
         $cart_items = WC()->cart->get_cart();
+        $is_guest   = ! ( $user instanceof WP_User ) || 0 === (int) $user->ID;
+
+        if ( $is_guest && isset( $rules['customer_type_rules']['guest'] ) ) {
+            $timeouts[] = (int) $rules['customer_type_rules']['guest'];
+        }
+
+        if ( ! $is_guest && isset( $rules['customer_type_rules']['logged_in'] ) ) {
+            $timeouts[] = (int) $rules['customer_type_rules']['logged_in'];
+        }
 
         if ( $user instanceof WP_User && ! empty( $user->roles ) ) {
@@ -114 +82 @@
 
         foreach ( $cart_items as $cart_item ) {
-            $product_id   = isset( $cart_item['product_id'] ) ? absint( $cart_item['product_id'] ) : 0;
-            $category_ids = $product_id ? wc_get_product_term_ids( $product_id, 'product_cat' ) : [];
-
-            foreach ( $category_ids as $category_id ) {
-                $term = get_term( $category_id, 'product_cat' );
-
-                if ( $term && ! is_wp_error( $term ) && isset( $rules['category_rules'][ $term->slug ] ) ) {
-                    $timeouts[] = (int) $rules['category_rules'][ $term->slug ];
+            $product_id = isset( $cart_item['product_id'] ) ? absint( $cart_item['product_id'] ) : 0;
+
+            if ( ! $product_id ) {
+                continue;
+            }
+
+            if ( isset( $rules['product_rules'][ $product_id ] ) ) {
+                $timeouts[] = (int) $rules['product_rules'][ $product_id ];
+            }
+
+            foreach ( $this->get_product_term_slugs( $product_id, 'product_cat' ) as $slug ) {
+                if ( isset( $rules['category_rules'][ $slug ] ) ) {
+                    $timeouts[] = (int) $rules['category_rules'][ $slug ];
+                }
+            }
+
+            foreach ( $this->get_product_term_slugs( $product_id, 'product_tag' ) as $slug ) {
+                if ( isset( $rules['tag_rules'][ $slug ] ) ) {
+                    $timeouts[] = (int) $rules['tag_rules'][ $slug ];
                 }
             }
@@ -137 +116 @@
 
     /**
-     * Determine whether the current cart contains excluded products or categories.
+     * Determine whether the current cart contains excluded items.
      *
      * @return bool
@@ -147 +126 @@
 
         $rules = $this->get_rules_option();
+        $user  = wp_get_current_user();
+
+        if ( $user instanceof WP_User && ! empty( $user->roles ) ) {
+            foreach ( $user->roles as $role ) {
+                if ( in_array( sanitize_key( $role ), $rules['excluded_roles'], true ) ) {
+                    return true;
+                }
+            }
+        }
 
         foreach ( WC()->cart->get_cart() as $cart_item ) {
@@ -155 +143 @@
             }
 
-            $category_ids = $product_id ? wc_get_product_term_ids( $product_id, 'product_cat' ) : [];
-
-            foreach ( $category_ids as $category_id ) {
-                $term = get_term( $category_id, 'product_cat' );
-
-                if ( $term && ! is_wp_error( $term ) && in_array( $term->slug, $rules['excluded_categories'], true ) ) {
+            foreach ( $this->get_product_term_slugs( $product_id, 'product_cat' ) as $slug ) {
+                if ( in_array( $slug, $rules['excluded_categories'], true ) ) {
+                    return true;
+                }
+            }
+
+            foreach ( $this->get_product_term_slugs( $product_id, 'product_tag' ) as $slug ) {
+                if ( in_array( $slug, $rules['excluded_tags'], true ) ) {
                     return true;
                 }
@@ -176 +166 @@
     public function get_default_rules() {
         return [
+            'customer_type_rules' => [],
             'role_rules'          => [],
             'category_rules'      => [],
+            'tag_rules'           => [],
+            'product_rules'       => [],
+            'excluded_roles'      => [],
             'excluded_products'   => [],
             'excluded_categories' => [],
+            'excluded_tags'       => [],
         ];
     }
+
+    /**
+     * Normalize customer type rules.
+     *
+     * @param mixed $rules Customer type rules.
+     * @return array<string, int>
+     */
+    private function normalize_customer_type_rules( $rules ) {
+        $allowed    = [ 'guest', 'logged_in' ];
+        $normalized = [];
+
+        if ( ! is_array( $rules ) ) {
+            return $normalized;
+        }
+
+        foreach ( $rules as $type => $timeout ) {
+            $type    = sanitize_key( $type );
+            $timeout = absint( $timeout );
+
+            if ( in_array( $type, $allowed, true ) && $timeout > 0 ) {
+                $normalized[ $type ] = $timeout;
+            }
+        }
+
+        return $normalized;
+    }
+
+    /**
+     * Normalize a generic timeout map.
+     *
+     * @param mixed    $rules Timeout rules.
+     * @param callable $sanitizer Key sanitizer.
+     * @return array<string, int>
+     */
+    private function normalize_timeout_map( $rules, $sanitizer ) {
+        $normalized = [];
+
+        if ( ! is_array( $rules ) ) {
+            return $normalized;
+        }
+
+        foreach ( $rules as $key => $timeout ) {
+            $key     = call_user_func( $sanitizer, $key );
+            $timeout = absint( $timeout );
+
+            if ( $key && $timeout > 0 ) {
+                $normalized[ $key ] = $timeout;
+            }
+        }
+
+        return $normalized;
+    }
+
+    /**
+     * Normalize product-specific timeout rules.
+     *
+     * @param mixed $rules Product rules.
+     * @return array<int, int>
+     */
+    private function normalize_product_timeout_rules( $rules ) {
+        $normalized = [];
+
+        if ( ! is_array( $rules ) ) {
+            return $normalized;
+        }
+
+        foreach ( $rules as $product_id => $timeout ) {
+            $product_id = absint( $product_id );
+            $timeout    = absint( $timeout );
+
+            if ( $product_id > 0 && $timeout > 0 ) {
+                $normalized[ $product_id ] = $timeout;
+            }
+        }
+
+        return $normalized;
+    }
+
+    /**
+     * Normalize a list of integer IDs.
+     *
+     * @param mixed $items List value.
+     * @return array<int>
+     */
+    private function normalize_integer_list( $items ) {
+        $normalized = [];
+
+        if ( ! is_array( $items ) ) {
+            return $normalized;
+        }
+
+        foreach ( $items as $item ) {
+            $item = absint( $item );
+
+            if ( $item > 0 ) {
+                $normalized[] = $item;
+            }
+        }
+
+        return array_values( array_unique( $normalized ) );
+    }
+
+    /**
+     * Normalize a list of strings.
+     *
+     * @param mixed    $items List value.
+     * @param callable $sanitizer Item sanitizer.
+     * @return array<int, string>
+     */
+    private function normalize_string_list( $items, $sanitizer ) {
+        $normalized = [];
+
+        if ( ! is_array( $items ) ) {
+            return $normalized;
+        }
+
+        foreach ( $items as $item ) {
+            $item = call_user_func( $sanitizer, $item );
+
+            if ( $item ) {
+                $normalized[] = $item;
+            }
+        }
+
+        return array_values( array_unique( $normalized ) );
+    }
+
+    /**
+     * Get sanitized term slugs for a product and taxonomy.
+     *
+     * @param int    $product_id Product ID.
+     * @param string $taxonomy Taxonomy name.
+     * @return array<int, string>
+     */
+    private function get_product_term_slugs( $product_id, $taxonomy ) {
+        $product_id = absint( $product_id );
+
+        if ( $product_id <= 0 ) {
+            return [];
+        }
+
+        $terms = get_the_terms( $product_id, $taxonomy );
+
+        if ( is_wp_error( $terms ) || ! is_array( $terms ) ) {
+            return [];
+        }
+
+        $slugs = [];
+
+        foreach ( $terms as $term ) {
+            if ( isset( $term->slug ) ) {
+                $slugs[] = sanitize_title( $term->slug );
+            }
+        }
+
+        return array_values( array_unique( array_filter( $slugs ) ) );
+    }
 }

cartflush-autoclear-cart-for-inactive-users/trunk/readme.txt

@@ -1 @@
-## === CartFlush – Auto Clear WooCommerce Cart for Inactive Users ===
+=== CartFlush - Auto Clear WooCommerce Cart for Inactive Users ===
 
 Contributors: wprashed
@@ -6 +6 @@
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 2.0.0
+Stable tag: 2.1.0
 License: GPLv2 or later
-License URI: [https://www.gnu.org/licenses/gpl-2.0.html](https://www.gnu.org/licenses/gpl-2.0.html)
+License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
 Automatically clear inactive WooCommerce carts with advanced timeout rules, exclusions, and import/export tools.
 
----
-
-## == Description ==
+== Description ==
 
 CartFlush helps you automatically clear inactive WooCommerce carts, keeping your store clean, fast, and optimized.
 
-Instead of relying on a basic timeout, CartFlush gives you full control over how cart expiration works. You can define different timeout rules based on user roles, product categories, and exclusions—making it flexible enough for real-world eCommerce scenarios.
+Instead of relying on a single timeout, CartFlush gives you full control over cart expiration from one settings screen under WooCommerce. You can define different timeout rules based on customer type, user roles, products, categories, and tags, then add exclusions for carts that should never be cleared automatically.
 
 Whether you want faster cart turnover, better session management, or cleaner abandoned cart handling, CartFlush gives you the tools to do it properly.
@@ -24 +22 @@
 == Live Demo ==
 
-🚀 [Try Live Demo (No Setup Required)](https://playground.wordpress.net/?blueprint-url=https%3A%2F%2Fraw.githubusercontent.com%2Fwprashed%2Fcartflush-autoclear-cart-for-inactive-users%2F185b7faf5918e286fe9ca1fb1563d70455d4e095%2Fblueprint.json)
-
----
-
-## 🚀 Why Use CartFlush?
+[Try Live Demo (No Setup Required)](https://playground.wordpress.net/?blueprint-url=https%3A%2F%2Fraw.githubusercontent.com%2Fwprashed%2Fcartflush-autoclear-cart-for-inactive-users%2F185b7faf5918e286fe9ca1fb1563d70455d4e095%2Fblueprint.json)
+
+== Why Use CartFlush? ==
 
 * Prevent stale and abandoned carts from piling up
 * Improve WooCommerce session performance
-* Apply smarter rules based on users and products
-* Save time with import/export configuration tools
-* Maintain clean and optimized cart behavior
-
----
-
-## == Key Features ==
-
-### ⏱ Default Cart Timeout
-
-Set a global inactivity timeout (in minutes). If no other rules apply, this value determines when a cart is cleared.
-
----
-
-### 👤 Role-Based Timeout Rules
-
-Define custom cart expiration times based on user roles.
+* Apply smarter rules based on customers and products
+* Manage rules visually from the WooCommerce settings page
+* Import or export rules for fast setup and migration
+
+== Key Features ==
+
+=== Default Cart Timeout ===
+
+Set a global inactivity timeout in minutes. If no other rules apply, this value determines when a cart is cleared.
+
+=== Visual Rule Builder ===
+
+Create and edit cart timeout rules directly from the CartFlush settings page under WooCommerce. No CSV import is required for day-to-day management.
+
+=== Customer Type Rules ===
+
+Define separate timeouts for:
+
+* Guest customers
+* Logged-in customers
+
+=== Role-Based Timeout Rules ===
+
+Define custom cart expiration times for specific user roles.
 
 Examples:
 
-* Customers → 30 minutes
-* Subscribers → 60 minutes
-* Wholesale users → 120 minutes
-
-Perfect for stores with different user types and behaviors.
-
----
-
-### 🛍 Category-Based Timeout Rules
-
-Set cart timeout rules based on product categories.
-
-Use cases:
-
-* Flash sale items → shorter timeout
-* Subscription products → shorter timeout
-* High-value products → longer timeout
-
-CartFlush checks all items in the cart and applies the most relevant rule.
-
----
-
-### ⚡ Smart Timeout Logic
-
-When multiple rules apply, CartFlush automatically selects the **shortest timeout**.
-
-This ensures:
-
-* Predictable behavior
-* Better control over urgency
-* No rule conflicts
-
----
-
-### 🚫 Product Exclusions
-
-Exclude specific products from cart clearing.
-
-If a cart contains an excluded product:
-→ The cart will NOT be cleared.
-
----
-
-### 📂 Category Exclusions
-
-Exclude entire categories from auto-clear.
-
-If any product in the cart belongs to an excluded category:
-→ Cart clearing is skipped.
-
----
-
-### 📥 CSV Import for Rules
-
-Bulk import rules using CSV.
-
-Supported types:
-
+* Customers - 30 minutes
+* Subscribers - 60 minutes
+* Wholesale users - 120 minutes
+
+=== Product, Category, and Tag Rules ===
+
+Apply specific timeout values based on:
+
+* Product ID
+* Product category
+* Product tag
+
+This makes it easy to create shorter or longer expiration windows for special items, campaigns, or collections.
+
+=== Smart Timeout Logic ===
+
+When multiple timeout rules apply, CartFlush automatically uses the shortest valid timeout.
+
+=== Exclusion Rules ===
+
+Prevent cart clearing entirely for matching carts using:
+
+* Excluded roles
+* Excluded products
+* Excluded categories
+* Excluded tags
+
+=== CSV Import for Bulk Rules ===
+
+Bulk import rule data with CSV when that is faster than manual entry.
+
+Supported CSV types:
+
+* customer_type
 * role
+* product_rule
 * category
+* tag
+* excluded_role
 * excluded_product
 * excluded_category
-
-Quickly configure large stores without manual setup.
-
----
-
-### 📤 JSON Export (Full Backup)
-
-Export all settings into a JSON file.
-
-Includes:
-
-* Default timeout
-* Role rules
-* Category rules
-* Exclusions
-
-Perfect for backups and migrations.
-
----
-
-### 🔁 JSON Import (Quick Setup)
-
-Import settings instantly on another site.
-
-Ideal for:
-
-* Agencies
-* Multi-store setups
-* Staging → production deployment
-
----
-
-### 👥 Works for Guests & Logged-in Users
-
-CartFlush uses WooCommerce sessions, so it works for:
-
-* Guest users
-* Logged-in customers
-
-No additional configuration required.
-
----
-
-### 🎯 Lightweight & Efficient
-
-No unnecessary overhead. The plugin focuses only on:
-
-* Tracking inactivity
-* Applying rules
-* Clearing carts
-
----
-
-### 🌍 Translation Ready
-
-Includes text domain and POT file for easy localization.
-
----
-
-### 🧹 Clean Uninstall
-
-When the plugin is deleted:
-
-* All data and settings are removed automatically
-
----
-
-## == How It Works ==
-
-1. Customer adds items to cart
-2. Inactivity timer starts
-3. Plugin checks:
-
-   * Default timeout
-   * User role rules
-   * Product category rules
-4. Shortest valid timeout is applied
-5. If excluded items exist → skip clearing
-6. Cart is cleared after timeout
-
----
-
-## == Supported Import Formats ==
+* excluded_tag
+
+=== JSON Import and Export ===
+
+Export the full CartFlush configuration as JSON for backup or migration, then import it on another store when needed.
+
+=== WooCommerce Menu Integration ===
+
+The CartFlush settings page is available directly under the WooCommerce admin menu for quicker access.
+
+=== Lightweight and Efficient ===
+
+CartFlush focuses only on inactivity tracking, rule evaluation, and cart clearing without adding unnecessary overhead.
+
+=== Translation Ready ===
+
+Includes the `cartflush` text domain for localization.
+
+=== Clean Uninstall ===
+
+When the plugin is deleted, CartFlush removes its stored settings automatically.
+
+== How It Works ==
+
+1. A customer adds items to the cart.
+2. The inactivity timer begins.
+3. CartFlush checks the default timeout and any matching timeout rules.
+4. The shortest valid timeout is selected.
+5. If an exclusion rule matches, cart clearing is skipped.
+6. The cart is cleared after the final timeout is reached.
+
+== Supported Import Formats ==
 
 CSV headers:
@@ -202 +133 @@
 `type,key,timeout_minutes`
 
-### Supported types:
-
+Supported types:
+
+* customer_type
 * role
+* product_rule
 * category
+* tag
+* excluded_role
 * excluded_product
 * excluded_category
-
-### Example:
-
+* excluded_tag
+
+Example rows:
+
+`customer_type,guest,20`
 `role,customer,30`
-`category,subscription-box,10`
+`product_rule,321,10`
+`category,flash-sale,15`
+`tag,seasonal,25`
+`excluded_role,wholesale_customer,`
 `excluded_product,123,`
 `excluded_category,high-ticket,`
-
----
-
-## == Frequently Asked Questions ==
-
-### Does this work for guest users and logged-in users?
+`excluded_tag,fragile,`
+
+== Frequently Asked Questions ==
+
+=== Does this work for guest users and logged-in users? ===
 
 Yes. CartFlush uses WooCommerce sessions, so both are supported.
 
----
-
-### How is the timeout calculated?
-
-The plugin starts with the default timeout, then checks role and category rules. The shortest valid timeout is applied.
-
----
-
-### What if a cart contains excluded items?
-
-CartFlush will skip clearing the cart entirely.
-
----
-
-### Can I migrate settings between sites?
+=== How is the timeout calculated? ===
+
+The plugin starts with the default timeout, then checks matching customer type, role, product, category, and tag rules. The shortest valid timeout is applied.
+
+=== What if a cart contains excluded items? ===
+
+CartFlush skips clearing the cart entirely.
+
+=== Can I manage rules without importing CSV? ===
+
+Yes. Rules can be added and edited directly from the CartFlush settings page.
+
+=== Can I migrate settings between sites? ===
 
 Yes. Export settings as JSON and import them on another site.
 
----
-
-### Does uninstall remove all data?
+=== Does uninstall remove all data? ===
 
 Yes. All plugin options are deleted during uninstall.
 
----
-
-## == Screenshots ==
-
-1. Clean and modern CartFlush settings panel
-2. CSV import interface for rules
-3. JSON export/import tools
-4. Active rules and exclusions overview
-
----
-
-## == Changelog ==
+== Screenshots ==
+
+1. Modern CartFlush settings page under WooCommerce
+2. Manual rule builder for timeout rules, CSV and JSON import/export tools 
+3. Exclusion Rules
+4. Saved configuration overview
+
+== Changelog ==
+
+= 2.1.0 =
+
+* Added a full visual rule builder to the settings page
+* Moved the plugin page under the WooCommerce admin menu
+* Added customer type, product, and tag timeout rules
+* Added excluded role and excluded tag support
+* Expanded CSV import to support all new rule types
+* Redesigned the admin settings interface with a more modern layout
+* Improved import/export presentation and rule card usability
 
 = 2.0.0 =