Changeset 3469742

Timestamp:

02/25/2026 09:46:47 PM (5 weeks ago)

Author:

Elliotvs

Message:

7.5.0

Location:

woo-coupon-usage/trunk

Files:

• css/admin-affiliate-users-table.css (modified) (3 diffs)
• css/admin-style.css (modified) (9 diffs)
• css/admin-view-affiliate.css (modified) (5 diffs)
• css/style.css (modified) (1 diff)
• inc/admin/admin-activity.php (modified) (3 diffs)
• inc/admin/admin-dashboard.php (modified) (1 diff)
• inc/admin/admin-menu.php (modified) (1 diff)
• inc/admin/admin-orders-box.php (modified) (2 diffs)
• inc/admin/admin-orders-list.php (modified) (1 diff)
• inc/admin/admin-page.php (modified) (1 diff)
• inc/admin/admin-pro-details.php (modified) (4 diffs)
• inc/admin/admin-view-affiliate.php (modified) (22 diffs)
• inc/admin/class-activity-list-table.php (modified) (3 diffs)
• inc/admin/class-coupons-table.php (modified) (4 diffs)
• inc/admin/class-mla-users-table.php (added)
• inc/admin/settings/admin-options.php (modified) (2 diffs)
• inc/admin/settings/options-notifications.php (modified) (2 diffs)
• inc/admin/settings/options-payouts.php (modified) (1 diff)
• inc/admin/tools/quick-edit-coupon.php (modified) (1 diff)
• inc/dashboard/tab-latest-orders.php (modified) (3 diffs)
• inc/functions/functions-activity.php (modified) (5 diffs)
• inc/functions/functions-all-time.php (modified) (1 diff)
• inc/functions/functions-calculate-order.php (modified) (6 diffs)
• inc/functions/functions-coupon-orders.php (modified) (1 diff)
• inc/functions/functions-dashboard.php (modified) (1 diff)
• inc/functions/functions-general.php (modified) (2 diffs)
• inc/functions/functions-new-order.php (modified) (4 diffs)
• inc/functions/functions-refund.php (modified) (1 diff)
• inc/functions/functions-urls.php (modified) (1 diff)
• inc/functions/functions-user-coupons.php (modified) (1 diff)
• inc/registration/class-registrations-list-table.php (modified) (3 diffs)
• inc/registration/registration-admin.php (modified) (1 diff)
• inc/registration/registration-ajax.php (modified) (1 diff)
• inc/registration/registration-form.php (modified) (6 diffs)
• inc/widget/js/floating-widget-popup.js (modified) (2 diffs)
• inc/widget/widget-ajax.php (modified) (3 diffs)
• js/admin-coupons.js (modified) (1 diff)
• js/admin-view-affiliate.js (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• woo-coupon-usage.php (modified) (1 diff)

woo-coupon-usage/trunk/css/admin-affiliate-users-table.css

@@ -22 +22 @@
 }
 .wcusage-avatar { 
-    border-radius: 50%; 
-    width: 40px; 
-    height: 40px; 
-    object-fit: cover; 
-    display: inline-block; 
+    border-radius: 50% !important; 
+    width: 40px !important; 
+    height: 40px !important; 
+    object-fit: cover !important; 
+    display: inline-block !important;
+    vertical-align: middle;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12);
 }
 .wcusage-idcell { 
@@ -165 +167 @@
     vertical-align: middle;
 }
+.wp-list-table.mlausers tbody td,
+.wp-list-table.mlausers thead th {
+    vertical-align: middle !important;
+}
 /* On smaller screens, stack avatar above the ID */
 @media screen and (max-width: 1500px) {
@@ -175 +181 @@
     }
 }
+
+/* =========================================================
+   MLA Users Table column widths
+   ========================================================= */
+.wp-list-table .column-mla_sub_affiliates {
+    width: 120px;
+    text-align: center;
+}
+.wp-list-table .column-mla_payouts {
+    width: 160px;
+    text-align: center;
+}
+.wp-list-table .column-mla_tiers {
+    width: 110px;
+    text-align: center;
+}
+.wp-list-table .column-view_mla_affiliate {
+    width: 160px;
+    text-align: center;
+}
+th.column-mla_sub_affiliates,
+th.column-mla_payouts,
+th.column-mla_tiers,
+th.column-view_mla_affiliate {
+    text-align: center;
+}
+
+/* =========================================================
+   MLA Users Table — ID cell & checkbox overrides
+   (must win over admin-style.css padding: 22px 5px !important)
+   ========================================================= */
+.wp-list-table.mlausers .column-cb {
+    width: 40px !important;
+}
+.wp-list-table.mlausers .column-ID {
+    vertical-align: middle !important;
+}
+.wp-list-table.mlausers td.column-ID {
+    vertical-align: middle !important;
+}
+.wp-list-table.mlausers .wcusage-idcell {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+}
+.wp-list-table.mlausers .wcusage-avatar {
+    border-radius: 50% !important;
+    width: 40px !important;
+    height: 40px !important;
+    object-fit: cover !important;
+    display: inline-block !important;
+    vertical-align: middle !important;
+    flex-shrink: 0;
+}

woo-coupon-usage/trunk/css/admin-style.css

@@ -1634 +1634 @@
 .wp-list-table.referrals th,
 .wp-list-table.affiliateusers th,
+.wp-list-table.mlausers th,
 .wp-list-table.affiliatecoupons th {
     text-align: center;
@@ -1644 +1645 @@
 .wp-list-table.referrals th a,
 .wp-list-table.affiliateusers th a,
+.wp-list-table.mlausers th a,
 .wp-list-table.affiliatecoupons td a {
     display: inline-block;
@@ -1670 +1672 @@
 .wp-list-table.referrals tr:hover,
 .wp-list-table.affiliateusers tr:hover,
+.wp-list-table.mlausers tr:hover,
 .wp-list-table.affiliatecoupons tr:hover {
     background: #f4fcfc;
@@ -1681 +1684 @@
 .wp-list-table.referrals td,
 .wp-list-table.affiliateusers td, .wp-list-table.affiliateusers th,
+.wp-list-table.mlausers td, .wp-list-table.mlausers th,
 .wp-list-table.affiliatecoupons td {
     width: auto;
@@ -1691 +1695 @@
 .wp-list-table.referrals tr td,
 .wp-list-table.affiliateusers tr td, .wp-list-table.affiliateusers tr th,
+.wp-list-table.mlausers tr td, .wp-list-table.mlausers tr th,
 .wp-list-table.registration tr td {
     border-bottom: 1px solid #cfcfcf;
@@ -1696 +1701 @@
 }
 
+.wp-list-table.mlausers tr td.check-column,
+.wp-list-table.mlausers tr th.check-column {
+    width: 40px !important;
+    padding: 6px 0 6px 8px !important;
+    vertical-align: middle !important;
+}
+.wp-list-table.mlausers tr td.column-ID {
+    vertical-align: middle !important;
+}
+
 .wp-list-table.registration .action1.column-action1 {
     padding: 10px;
@@ -1702 +1717 @@
 .admin_page_wcusage_activity .column-id, .payout .column-id {
     width: 55px;
+}
+
+/* Activity Log Filters */
+.wcusage-activity-filters {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 6px;
+    padding: 6px 0;
+}
+.wcusage-activity-filters input[type="text"],
+.wcusage-activity-filters input[type="date"],
+.wcusage-activity-filters select {
+    height: 32px;
+    vertical-align: middle;
+}
+.wcusage-activity-date-label {
+    font-size: 13px;
+    line-height: 32px;
+    margin: 0 2px 0 4px;
+}
+.admin_page_wcusage_activity .column-event {
+    text-align: left !important;
+}
+@media screen and (min-width: 540px) {
+    .admin_page_wcusage_activity .column-user_id {
+        width: 250px;
+        max-width: 100%;
+    }
 }
 
@@ -1750 +1794 @@
         margin: 15px 0;
     }
+
+/* PRO Modules Search */
+.wcu-pro-modules-search-wrap {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    margin-bottom: 16px;
+    margin-top: 4px;
+}
+
+.wcu-pro-modules-search-icon {
+    position: absolute;
+    left: 9px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: #777;
+    font-size: 18px;
+    pointer-events: none;
+}
+
+#wcu-pro-modules-search {
+    padding: 7px 12px 7px 34px !important;
+    font-size: 14px !important;
+    border: 1px solid #c3c4c7 !important;
+    border-radius: 6px !important;
+    width: 280px !important;
+    max-width: 100% !important;
+    box-shadow: none !important;
+    outline: none !important;
+    background: #fff !important;
+    line-height: 1.4 !important;
+}
+
+#wcu-pro-modules-search:focus {
+    border-color: #2271b1 !important;
+    box-shadow: 0 0 0 1px #2271b1 !important;
+}
+
+#wcu-pro-modules-no-results {
+    color: #555;
+    font-style: italic;
+    margin-bottom: 12px;
+    margin-top: -8px;
+}
 
 .pro-details {
@@ -3067 +3155 @@
 
 .wcu-loading-loader {
+    margin: 25px auto 0 auto;
     width: 40px;
     height: 40px;
-    margin: 25px auto 0 auto;
+    border: 3px solid rgba(0, 0, 0, 0.08);
+    border-top-color: #3498db;
+    border-radius: 50%;
+    animation: wcu-spin 0.8s ease-in-out infinite;
+    box-sizing: border-box;
+}
+
+@keyframes wcu-spin {
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.wcu-loading-loader-text {
+    margin: 14px auto 0 auto;
+    font-weight: 600;
+    font-size: 14px;
+    text-align: center;
+    color: #7f8c8d;
+    letter-spacing: 0.3px;
+    width: auto;
+}
+
+.wcu-loading-loader-subtext {
+    margin: 6px auto 0 auto;
+    font-weight: 400;
+    font-size: 12.5px;
+    text-align: center;
+    color: #b0b0b0;
+    width: auto;
+    max-width: 400px;
+    line-height: 1.5;
+}
+
+.wcu-loading-loader-subtext a {
+    color: #b0b0b0;
+    text-decoration: underline;
+}
+
+.wcu-loading-image {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    padding: 30px 20px;
+}
+
+.wcu-loading-image.wcu-loading-stats {
+    align-items: flex-start;
+    padding: 30px 0;
+}
+
+.wcu-loading-image.wcu-loading-stats .wcu-loading-loader {
+    margin-left: 0;
+}
+
+.wcu-loading-image.wcu-loading-stats .wcu-loading-loader-text,
+.wcu-loading-image.wcu-loading-stats .wcu-loading-loader-subtext {
+    text-align: left;
+    margin-left: 0;
 }
 

woo-coupon-usage/trunk/css/admin-view-affiliate.css

@@ -611 +611 @@
 }
 
+/* Copy link button hover */
+.wcusage-tab-content .wcusage-copy-link-button {
+    cursor: pointer;
+    transition: background 0.15s ease, border-color 0.15s ease, color 0.15s ease, transform 0.1s ease;
+}
+.wcusage-tab-content .wcusage-copy-link-button:hover {
+    background: #007cba !important;
+    border-color: #007cba !important;
+    color: #fff;
+    transform: translateY(-1px);
+    box-shadow: 0 2px 6px rgba(0, 124, 186, 0.35);
+}
+.wcusage-tab-content .wcusage-copy-link-button:hover i {
+    color: #fff;
+}
+.wcusage-tab-content .wcusage-copy-link-button:active {
+    transform: translateY(0);
+    box-shadow: none;
+}
+
 /* Ensure all tables inside tab content fill container width on large screens */
 .wcusage-tab-content table.wp-list-table { width: 100%; }
@@ -1025 +1045 @@
     background: #005a87;
     border-color: #005a87;
+    color: #fff;
     transform: translateY(-1px);
     box-shadow: 0 2px 6px rgba(0,0,0,0.3);
@@ -1109 +1130 @@
 }
 
+/* Mobile header layout */
+@media (max-width: 782px) {
+    /* Stack the heading block so it takes full width */
+    .wp-heading-inline {
+        display: flex !important;
+        flex-direction: column;
+        align-items: center;
+        text-align: center;
+        width: 100%;
+        margin-bottom: 12px !important;
+    }
+
+    /* Center the avatar */
+    .wcusage-user-avatar {
+        margin: 0 0 8px 0 !important;
+    }
+
+    /* Dashboard buttons: wrap and center beneath avatar/name */
+    .wp-heading-inline .wcusage-preview-button {
+        margin: 6px 0 0 0 !important;
+        width: 100%;
+        text-align: center;
+        justify-content: center;
+        display: inline-flex;
+        box-sizing: border-box;
+    }
+
+    /* Right-side container: un-float and center below the heading */
+    .wcusage-view-affiliate-header-actions {
+        float: none !important;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 100%;
+        margin-bottom: 16px;
+    }
+
+    .wcusage-view-affiliate-header-actions .wcusage-back-button {
+        width: 100%;
+        justify-content: center;
+        text-align: center;
+        margin: 0 !important;
+    }
+
+    .wcusage-view-affiliate-header-actions .wcusage-delete-dropdown {
+        margin-top: 8px !important;
+        display: flex;
+        justify-content: center;
+        width: 100%;
+    }
+}
+
 /* User Avatar Styling */
 .wcusage-user-avatar {
@@ -1144 +1217 @@
 }
 
+/* Mobile tab dropdown */
+.wcusage-tab-select-wrapper {
+    display: none;
+}
+@media (max-width: 782px) {
+    .wcusage-tabs {
+        display: none !important;
+    }
+    .wcusage-tab-select-wrapper {
+        display: block;
+        width: 100%;
+        margin-bottom: 16px;
+    }
+    .wcusage-tab-select {
+        width: 100%;
+        box-sizing: border-box;
+        padding: 15px 16px;
+        text-align: center;
+        font-size: 20px !important;
+        font-weight: 500;
+        border: 2px solid #007cba;
+        border-radius: 6px;
+        background: #fff;
+        color: #23282d;
+        appearance: none;
+        -webkit-appearance: none;
+        background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='8' viewBox='0 0 12 8'%3E%3Cpath fill='%23007cba' d='M6 8L0 0h12z'/%3E%3C/svg%3E");
+        background-repeat: no-repeat;
+        background-position: right 12px center;
+        background-size: 10px;
+        cursor: pointer;
+    }
+    .wcusage-tab-select:focus {
+        outline: none;
+        box-shadow: 0 0 0 2px rgba(0,124,186,0.25);
+    }
+}
+
 /* --- Mobile overflow fixes: ensure tabs and tables can scroll horizontally --- */
 /* Tabs: always allow horizontal scroll if needed */
@@ -1239 +1350 @@
     border-radius: 3px;
 }
+

woo-coupon-usage/trunk/css/style.css

@@ -1635 +1635 @@
 
 .wcu-mla-network-button {
-    margin: 2px 0 7px 0 !important;
+    font-size: 12px !important;
+    margin: 4px 0 7px 0 !important;
     padding: 2px 5px 2px 5px !important;
     text-decoration: none !important;

woo-coupon-usage/trunk/inc/admin/admin-activity.php

@@ -13 +13 @@
 <link rel="stylesheet" href="<?php echo esc_url(WCUSAGE_UNIQUE_PLUGIN_URL) .'fonts/font-awesome/css/all.min.css'; ?>" crossorigin="anonymous">
 
-<style>@media screen and (min-width: 540px) { .column-user_id { width: 250px; max-width: 100%; } }</style>
-<style>@media screen and (min-width: 540px) { .column-event { text-align: left !important; } }</style>
-
 <!-- Output Page -->
 <div class="wrap plugin-settings">
@@ -22 +19 @@
 
     <h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
+
+    <br/><br/>
 
     <?php
@@ -49 +48 @@
 
     <div style="margin-top: -30px;">
-        <input type="hidden" name="page" value="<?php echo esc_html( $_GET['page'] ); ?>" />
-        <?php $ListTable->display() ?>
+        <form method="get" action="<?php echo esc_url( admin_url( 'admin.php' ) ); ?>">
+            <input type="hidden" name="page" value="<?php echo esc_attr( sanitize_text_field( wp_unslash( $_GET['page'] ) ) ); ?>" />
+            <?php $ListTable->display(); ?>
+        </form>
     </div>
 

woo-coupon-usage/trunk/inc/admin/admin-dashboard.php

@@ -374 +374 @@
     }
     $support_items = array(
+        array('label' => 'Support Forum', 'url' => 'https://wordpress.org/support/plugin/woo-coupon-usage/#new-topic-0', 'icon' => 'fa-solid fa-comments', 'external' => true),
         array('label' => 'Documentation', 'url' => 'https://couponaffiliates.com/docs?utm_campaign=plugin&utm_source=dashboard-header&utm_medium=button', 'icon' => 'fa-solid fa-book', 'external' => true),
         array('label' => 'Roadmap', 'url' => 'https://roadmap.couponaffiliates.com/roadmap', 'icon' => 'fa-solid fa-list', 'external' => true),
         array('label' => 'Updates', 'url' => '#', 'icon' => 'fa-solid fa-sync', 'external' => false, 'id' => 'show-changelog'),
-        array('label' => 'Email Us', 'url' => admin_url('admin.php?page=wcusage-contact'), 'icon' => 'fa-solid fa-circle-question', 'external' => !wcu_fs()->can_use_premium_code()),
-        array('label' => 'Support Forum', 'url' => 'https://wordpress.org/support/plugin/woo-coupon-usage/#new-topic-0', 'icon' => 'fa-solid fa-comments', 'external' => true),
     );
     ?>

woo-coupon-usage/trunk/inc/admin/admin-menu.php

@@ -252 +252 @@
 
 add_filter( 'submenu_file', 'wcusage_admin_submenu_filter' );
-// JavaScript solution to highlight parent menu on view affiliate page
+// JavaScript solution to highlight parent menu on view affiliate page and MLA pages
 function wcusage_admin_menu_highlight_script() {
-    if ( isset( $_GET['page'] ) && $_GET['page'] === 'wcusage_view_affiliate' ) {
+    if ( isset( $_GET['page'] ) && in_array( $_GET['page'], array('wcusage_view_affiliate'), true ) ) {
         ?>
     <script type="text/javascript">

woo-coupon-usage/trunk/inc/admin/admin-orders-box.php

@@ -238 +238 @@
         delete_post_meta( $order_id, 'wcusage_stats' );
         delete_post_meta( $order_id, 'wcusage_total_commission' );
+        delete_post_meta( $order_id, 'wcusage_fixed_order_commission' );
+        delete_post_meta( $order_id, 'wcu_mla_commission' );
         $url = remove_query_arg( 'refresh_stats' );
         wp_safe_redirect( $url );
@@ -286 +288 @@
     echo "<a href='" . esc_url( $getinfo['uniqueurl'] ) . "' target='_blank' style='color: #07bbe3;' title='" . esc_html__( 'View the affiliate dashboard for this affiliate coupon.', 'woo-coupon-usage' ) . "'>" . esc_html__( 'View Dashboard', 'woo-coupon-usage' ) . "</a>";
     echo "</p>";
-    $wcusage_field_mla_enable = wcusage_get_setting_value( 'wcusage_field_mla_enable', '0' );
-    if ( $wcusage_field_mla_enable && wcu_fs()->can_use_premium_code() && !wcusage_coupon_disable_commission( $coupon_id ) ) {
-        $get_parents = get_user_meta( $getinfo['theuserid'], 'wcu_ml_affiliate_parents', true );
-        if ( !empty( $get_parents ) && is_array( $get_parents ) ) {
-            echo "<p><strong>MLA Commission:</strong>";
-            foreach ( $get_parents as $key => $parent_id ) {
-                $parent_user_info = get_user_by( 'ID', $parent_id );
-                $parent_user_name = $parent_user_info->user_login;
-                $parent_user_id = $parent_user_info->ID;
-                $coupon_info = wcusage_get_coupon_info( $coupon_code );
-                $coupon_id = $coupon_info[2];
-                $parent_commission = wcusage_mla_get_commission_from_tier(
-                    $getinfo['thecommissionnum'],
-                    $key,
-                    1,
-                    $order_id,
-                    $coupon_code
-                );
-                echo "<br/>(" . esc_html( $key ) . ") <a href='" . esc_url( admin_url( "admin.php?page=wcusage_view_affiliate&user_id=" . $parent_user_id ) ) . "' target='_blank' style='color: #07bbe3;'>" . esc_html( $parent_user_name ) . "</a>: " . wp_kses_post( wcusage_format_price( esc_html( $parent_commission ) ) );
-            }
-            echo "</p>";
+    if ( wcu_fs()->can_use_premium_code() ) {
+        $wcusage_field_mla_enable = wcusage_get_setting_value( 'wcusage_field_mla_enable', '0' );
+        if ( $wcusage_field_mla_enable && !wcusage_coupon_disable_commission( $coupon_id ) ) {
+            $get_parents = get_user_meta( $getinfo['theuserid'], 'wcu_ml_affiliate_parents', true );
+            if ( !empty( $get_parents ) && is_array( $get_parents ) ) {
+                // Try to read stored MLA commission from order meta (persisted at order time)
+                $order_obj = wc_get_order( $order_id );
+                $stored_mla_raw = ( $order_obj ? $order_obj->get_meta( 'wcu_mla_commission', true ) : '' );
+                $stored_mla = ( is_string( $stored_mla_raw ) ? json_decode( $stored_mla_raw, true ) : $stored_mla_raw );
+                $needs_mla_meta_save = false;
+                echo "<p><strong>MLA Commission:</strong>";
+                foreach ( $get_parents as $key => $parent_id ) {
+                    $parent_user_info = get_user_by( 'ID', $parent_id );
+                    $parent_user_name = ( $parent_user_info ? $parent_user_info->user_login : '#' . $parent_id );
+                    $parent_user_id = ( $parent_user_info ? $parent_user_info->ID : $parent_id );
+                    // Use stored commission if available, otherwise recalculate and flag for saving
+                    if ( is_array( $stored_mla ) && isset( $stored_mla[$key]['commission'] ) ) {
+                        $parent_commission = (float) $stored_mla[$key]['commission'];
+                    } else {
+                        $coupon_info = wcusage_get_coupon_info( $coupon_code );
+                        $coupon_id = $coupon_info[2];
+                        $parent_commission = wcusage_mla_get_commission_from_tier(
+                            $getinfo['thecommissionnum'],
+                            $key,
+                            1,
+                            $order_id,
+                            $coupon_code,
+                            0,
+                            $parent_user_id
+                        );
+                        // Collect recalculated data so we can persist it
+                        $tier_rates = ( function_exists( 'wcusage_mla_get_tier_rates' ) ? wcusage_mla_get_tier_rates( $key, $parent_user_id ) : array() );
+                        if ( !is_array( $stored_mla ) ) {
+                            $stored_mla = array();
+                        }
+                        $stored_mla[$key] = array(
+                            'parent_id'  => (int) $parent_user_id,
+                            'commission' => round( (float) $parent_commission, 2 ),
+                            'rates'      => $tier_rates,
+                        );
+                        $needs_mla_meta_save = true;
+                    }
+                    echo "<br/>(" . esc_html( $key ) . ") <a href='" . esc_url( admin_url( "admin.php?page=wcusage_view_affiliate&user_id=" . $parent_user_id ) ) . "' target='_blank' style='color: #07bbe3;'>" . esc_html( $parent_user_name ) . "</a>: " . wp_kses_post( wcusage_format_price( esc_html( $parent_commission ) ) );
+                }
+                echo "</p>";
+                // Persist recalculated MLA data for old orders so it won't recalculate again
+                if ( $needs_mla_meta_save && $order_obj && !empty( $stored_mla ) ) {
+                    $order_obj->update_meta_data( 'wcu_mla_commission', json_encode( $stored_mla ) );
+                    $order_obj->save_meta_data();
+                }
+            }
         }
     }

woo-coupon-usage/trunk/inc/admin/admin-orders-list.php

@@ -181 +181 @@
         $coupon_id = wcusage_get_coupon_id( $coupon_code );
         // Commission
+        // Prefer the saved stats meta (which stores the full combined commission including
+        // fixed-order and fixed-product amounts), falling back to a full recalculation.
+        $wcusage_stats = wcusage_order_meta( $order_id, 'wcusage_stats', true );
         $wcusage_total_commission = wcusage_order_meta( $order_id, 'wcusage_total_commission' );
-        if ( !$wcusage_total_commission || $update ) {
+        if ( !$update && is_array( $wcusage_stats ) && !empty( $wcusage_stats['commission'] ) ) {
+            // wcusage_stats['commission'] = full all_commission (percent + fixed_order + fixed_product)
+            $commission = (float) $wcusage_stats['commission'];
+        } elseif ( !$wcusage_total_commission || $update ) {
             if ( $update ) {
                 $order_data = wcusage_calculate_order_data(

woo-coupon-usage/trunk/inc/admin/admin-page.php

@@ -668 +668 @@
 }
 
+/**
+ * MLA Users Admin Page
+ */
+function wcusage_mla_users_page_html() {
+    require_once plugin_dir_path(__FILE__) . 'class-mla-users-table.php';
+    wcusage_mla_users_page();
+}
+
+
+

woo-coupon-usage/trunk/inc/admin/admin-pro-details.php

@@ -28 +28 @@
   });
   </script>
-
-<div id="pro-details" class="pro-details">
 
   <?php if(!$ispro) { ?>
@@ -89 +87 @@
   <?php } ?>
 
-<h1 style="margin-bottom: 0px;">PRO <?php echo esc_html__( 'Modules & Features', 'woo-coupon-usage' ); ?>:</h1>
+<h1 style="margin-bottom: 0px; width: 100%;">PRO <?php echo esc_html__( 'Modules & Features', 'woo-coupon-usage' ); ?>:</h1>
+
+<div style="clear: both;"></div>
 
 <br/>
 
 <p><?php echo esc_html__( 'The below section includes a list of most of the modules and features included in the Pro plan. However other smaller features and customisations can be found throughout the settings page.', 'woo-coupon-usage' ); ?></p>
+
+<br/>
+
+<div class="wcu-pro-modules-search-wrap">
+  <input type="text" id="wcu-pro-modules-search" placeholder="<?php echo esc_attr__( 'Search modules...', 'woo-coupon-usage' ); ?>" autocomplete="off" />
+</div>
+<p id="wcu-pro-modules-no-results" style="display:none;"><?php echo esc_html__( 'No modules found matching your search.', 'woo-coupon-usage' ); ?></p>
+
+<div id="pro-details" class="pro-details">
 
 <div style="flex-basis: 100%; height: 0;"></div>
@@ -671 +680 @@
 </script>
 
+<!-- Module Search Filter -->
+<script>
+jQuery(document).ready(function($) {
+  var $search = $('#wcu-pro-modules-search');
+  if (!$search.length) return;
+  $search.on('input', function() {
+    var term = $.trim($(this).val()).toLowerCase();
+    var $boxes = $('.pro-details .wcu-addons-box');
+    var visible = 0;
+    $boxes.each(function() {
+      var title = $(this).data('module-title') || '';
+      var desc  = $(this).data('module-desc')  || '';
+      if (!term || title.indexOf(term) !== -1 || desc.indexOf(term) !== -1) {
+        $(this).show();
+        visible++;
+      } else {
+        $(this).hide();
+      }
+    });
+    if (visible === 0 && term) {
+      $('#wcu-pro-modules-no-results').show();
+    } else {
+      $('#wcu-pro-modules-no-results').hide();
+    }
+  });
+});
+</script>
+
 <!-- Break the flexbox -->
 <div style="flex-basis: 100%; height: 0;"></div>
@@ -722 +759 @@
   </script>
 <?php } ?>
-  <div class="wcu-addons-box wcu-addons-box-<?php echo esc_attr($id); ?>">
+  <div class="wcu-addons-box wcu-addons-box-<?php echo esc_attr($id); ?>" data-module-title="<?php echo esc_attr(strtolower($title)); ?>" data-module-desc="<?php echo esc_attr(strtolower(wp_strip_all_tags($text))); ?>">
 
     <span><i class="<?php echo esc_html($icon); ?>"

woo-coupon-usage/trunk/inc/admin/admin-view-affiliate.php

@@ -1 @@
-<?php
-
+<?php 
 if ( !defined( 'ABSPATH' ) ) {
     exit;
@@ -152 +151 @@
     }
 }
+// Handle MLA per-user commission rates save
+$wcusage_field_mla_per_user_group_rates = wcusage_get_setting_value( 'wcusage_field_mla_per_user_group_rates', '0' );
+if ( $wcusage_field_mla_per_user_group_rates && isset( $_POST['wcusage_mla_user_rates_save'] ) && isset( $_POST['_wpnonce'] ) ) {
+    if ( wp_verify_nonce( $_POST['_wpnonce'], 'wcusage_save_mla_user_rates_' . $user_id ) ) {
+        // Save the enable toggle
+        $custom_enabled = ( isset( $_POST['wcu_mla_custom_rates_enabled'] ) ? '1' : '0' );
+        update_user_meta( $user_id, 'wcu_mla_custom_rates_enabled', $custom_enabled );
+        // Only save tier fields when enabled
+        $mla_tiersnumber = wcusage_get_setting_value( 'wcusage_field_mla_number_tiers', '5' );
+        for ($i = 1; $i <= $mla_tiersnumber; $i++) {
+            $tier_key = 'T' . $i;
+            $tier_fields = array('wcu_mla_tier_percent_' . $tier_key, 'wcu_mla_tier_order_percent_' . $tier_key, 'wcu_mla_tier_fixed_' . $tier_key);
+            foreach ( $tier_fields as $field ) {
+                if ( isset( $_POST[$field] ) ) {
+                    $value = sanitize_text_field( $_POST[$field] );
+                    if ( $value === '' || $value === null ) {
+                        delete_user_meta( $user_id, $field );
+                    } else {
+                        update_user_meta( $user_id, $field, $value );
+                    }
+                }
+            }
+        }
+        echo '<div class="notice notice-success"><p>' . esc_html__( 'MLA commission rates updated successfully.', 'woo-coupon-usage' ) . '</p></div>';
+    }
+}
 // Handle individual delete actions (same options as Coupon Affiliate Users page)
 if ( isset( $_POST['wcusage_delete_action'] ) && isset( $_POST['wcusage_user_id'] ) ) {
@@ -213 +238 @@
 ?>
 
-    <!--- Font Awesome -->
-    <link rel="stylesheet" href="<?php 
+<!--- Font Awesome -->
+<link rel="stylesheet" href="<?php 
 echo esc_url( WCUSAGE_UNIQUE_PLUGIN_URL ) . 'fonts/font-awesome/css/all.min.css';
 ?>" crossorigin="anonymous">
@@ -267 +292 @@
 );
 wp_localize_script( 'wcusage-admin-view-affiliate', 'WCUAdminAffiliateView', array(
-    'ajax_url'        => admin_url( 'admin-ajax.php' ),
-    'user_id'         => $user_id,
-    'per_page'        => 20,
-    'coupon_nonce'    => wp_create_nonce( 'wcusage_coupon_nonce' ),
-    'currency_symbol' => get_woocommerce_currency_symbol(),
-    'nonce_referrals' => wp_create_nonce( 'wcusage_affiliate_referrals' ),
-    'nonce_visits'    => wp_create_nonce( 'wcusage_affiliate_visits' ),
-    'nonce_payouts'   => wp_create_nonce( 'wcusage_affiliate_payouts' ),
-    'nonce_activity'  => wp_create_nonce( 'wcusage_affiliate_activity' ),
+    'ajax_url'                   => admin_url( 'admin-ajax.php' ),
+    'user_id'                    => $user_id,
+    'per_page'                   => 20,
+    'coupon_nonce'               => wp_create_nonce( 'wcusage_coupon_nonce' ),
+    'currency_symbol'            => get_woocommerce_currency_symbol(),
+    'nonce_referrals'            => wp_create_nonce( 'wcusage_affiliate_referrals' ),
+    'nonce_visits'               => wp_create_nonce( 'wcusage_affiliate_visits' ),
+    'nonce_payouts'              => wp_create_nonce( 'wcusage_affiliate_payouts' ),
+    'nonce_activity'             => wp_create_nonce( 'wcusage_affiliate_activity' ),
+    'nonce_add_sub_affiliate'    => wp_create_nonce( 'wcusage_add_sub_affiliate_nonce' ),
+    'nonce_remove_sub_affiliate' => wp_create_nonce( 'wcusage_remove_sub_affiliate_nonce' ),
 ) );
 ?>
@@ -328 +355 @@
             style="margin-left: 15px; font-size: 12px; padding: 5px 10px;" target="_blank">
                 <?php 
-echo esc_html__( 'View affiliate dashboard as user', 'woo-coupon-usage' );
-?>
-                <i class="fas fa-external-link-alt" style="margin-left: 5px; font-size: 12px;"></i>
+echo esc_html__( 'View affiliate dashboard', 'woo-coupon-usage' );
+?>
+                <i class="fas fa-external-link-alt" style="margin-left: 5px; font-size: 12px; height: 12px; margin-top: 5px;"></i>
             </a>
+            <?php 
+$wcusage_tracking_enable = wcusage_get_setting_value( 'wcusage_field_tracking_enable', '0' );
+?>
+            <?php 
+?>
         </h1>
-
-    <a href="<?php 
-echo esc_url( admin_url( 'admin.php?page=wcusage_affiliates' ) );
-?>" class="page-title-action wcusage-back-button"
-    style="float: right;">
-            <i class="fas fa-arrow-left" style="margin-right: 5px;"></i>
-            <?php 
-echo esc_html__( 'Back to Affiliates', 'woo-coupon-usage' );
-?>
-        </a>
 
         <?php 
@@ -348 +370 @@
 $delete_nonce = wp_create_nonce( 'wcusage_delete_user_' . $user_id );
 ?>
-        <div class="wcusage-delete-dropdown" style="">
-            <button type="button" class="wcusage-delete-btn" data-user-id="<?php 
+        <div class="wcusage-view-affiliate-header-actions" style="float: right; display: flex; flex-direction: column; align-items: flex-end; gap: 6px;">
+            <a href="<?php 
+echo esc_url( admin_url( 'admin.php?page=wcusage_affiliates' ) );
+?>" class="page-title-action wcusage-back-button">
+                <i class="fas fa-arrow-left" style="margin-right: 5px;"></i>
+                <?php 
+echo esc_html__( 'Back to Affiliates', 'woo-coupon-usage' );
+?>
+            </a>
+            <div class="wcusage-delete-dropdown" style="margin-top: 5px;">
+                <button type="button" class="wcusage-delete-btn" data-user-id="<?php 
 echo esc_attr( $user_id );
 ?>" title="<?php 
 echo esc_attr__( 'Delete Options', 'woo-coupon-usage' );
 ?>">
-                <span class="dashicons dashicons-trash"></span>
-            </button>
-            <div class="wcusage-delete-menu" style="display: none;">
-                <a href="#" class="wcusage-delete-option" data-action="delete_user" data-user-id="<?php 
+                    <span class="dashicons dashicons-trash"></span>
+                </button>
+                <div class="wcusage-delete-menu" style="display: none;">
+                    <a href="#" class="wcusage-delete-option" data-action="delete_user" data-user-id="<?php 
 echo esc_attr( $user_id );
 ?>" data-nonce="<?php 
@@ -364 +395 @@
 echo esc_html__( 'Delete User', 'woo-coupon-usage' );
 ?></a>
-                <a href="#" class="wcusage-delete-option" data-action="delete_user_coupons" data-user-id="<?php 
+                    <a href="#" class="wcusage-delete-option" data-action="delete_user_coupons" data-user-id="<?php 
 echo esc_attr( $user_id );
 ?>" data-nonce="<?php 
@@ -371 +402 @@
 echo esc_html__( 'Delete User & Coupons', 'woo-coupon-usage' );
 ?></a>
-                <a href="#" class="wcusage-delete-option" data-action="unassign_coupons" data-user-id="<?php 
+                    <a href="#" class="wcusage-delete-option" data-action="unassign_coupons" data-user-id="<?php 
 echo esc_attr( $user_id );
 ?>" data-nonce="<?php 
@@ -378 +409 @@
 echo esc_html__( 'Unassign Coupons', 'woo-coupon-usage' );
 ?></a>
-                <a href="#" class="wcusage-delete-option" data-action="delete_coupons" data-user-id="<?php 
+                    <a href="#" class="wcusage-delete-option" data-action="delete_coupons" data-user-id="<?php 
 echo esc_attr( $user_id );
 ?>" data-nonce="<?php 
@@ -385 +416 @@
 echo esc_html__( 'Delete Coupons', 'woo-coupon-usage' );
 ?></a>
+                </div>
             </div>
         </div>
@@ -407 +439 @@
                         <i class="fas fa-shopping-cart" style="margin-right: 8px;"></i>
                         <?php 
-echo esc_html__( 'Referrals', 'woo-coupon-usage' );
+echo esc_html__( 'Referred Orders', 'woo-coupon-usage' );
 ?>
                     </a>
@@ -477 +509 @@
                             <i class="fas fa-shopping-cart" style="color: #007cba; margin-right: 10px;"></i>
                             <?php 
-echo esc_html__( 'Latest Referrals', 'woo-coupon-usage' );
+echo esc_html__( 'Referred Orders', 'woo-coupon-usage' );
 ?>
                         </h3>
@@ -551 +583 @@
 
                     <!-- Payouts Tab -->
+                    <?php 
+if ( $wcusage_tracking_enable ) {
+    ?>
                     <div id="tab-payouts" class="tab-content <?php 
-echo ( $current_tab === 'payouts' ? 'active' : '' );
-?>">
+    echo ( $current_tab === 'payouts' ? 'active' : '' );
+    ?>">
                         <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
                             <i class="fas fa-dollar-sign" style="color: #007cba; margin-right: 10px;"></i>
                             <?php 
-echo esc_html__( 'Payout History', 'woo-coupon-usage' );
-?>
+    echo esc_html__( 'Payout History', 'woo-coupon-usage' );
+    ?>
                         </h3>
                         <div class="wcusage-filters" id="wcusage-payouts-filters" style="margin: 0 0 15px; display:flex; gap:8px; align-items: center;">
                             <label>
                                 <?php 
-echo esc_html__( 'From', 'woo-coupon-usage' );
-?>
+    echo esc_html__( 'From', 'woo-coupon-usage' );
+    ?>
                                 <input type="date" id="payouts-start-date" />
                             </label>
                             <label>
                                 <?php 
-echo esc_html__( 'To', 'woo-coupon-usage' );
-?>
+    echo esc_html__( 'To', 'woo-coupon-usage' );
+    ?>
                                 <input type="date" id="payouts-end-date" />
                             </label>
                             <button class="button" id="payouts-apply-filters"><?php 
-echo esc_html__( 'Filter', 'woo-coupon-usage' );
-?></button>
+    echo esc_html__( 'Filter', 'woo-coupon-usage' );
+    ?></button>
                         </div>
                         <div id="wcusage-payouts-table-container">
                             <?php 
-wcusage_display_affiliate_payouts(
-    $user_id,
-    1,
-    20,
-    '',
-    ''
-);
-?>
+    wcusage_display_affiliate_payouts(
+        $user_id,
+        1,
+        20,
+        '',
+        ''
+    );
+    ?>
                         </div>
                     </div>
+                    <?php 
+}
+?>
 
                     <!-- Activity Tab -->
@@ -633 +671 @@
 
                     <?php 
-if ( $wcusage_field_mla_enable && $wcusage_premium_active && function_exists( 'wcusage_get_ml_sub_affiliates' ) && function_exists( 'wcusage_get_network_chart_item' ) ) {
+if ( wcu_fs()->can_use_premium_code__premium_only() && $wcusage_field_mla_enable && function_exists( 'wcusage_get_ml_sub_affiliates' ) && function_exists( 'wcusage_get_network_chart_item' ) ) {
     ?>
                     <!-- MLA Tab -->
@@ -639 +677 @@
     echo ( $current_tab === 'mla' ? 'active' : '' );
     ?>">
-                        <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
-                            <i class="fa-solid fa-network-wired" style="color: #007cba; margin-right: 10px;"></i>
+
+                        <?php 
+    // Get MLA data
+    $mla_sub_affiliates = wcusage_get_ml_sub_affiliates( $user_id );
+    $mla_total_commission = 0;
+    if ( function_exists( 'wcusage_mla_total_earnings' ) ) {
+        $mla_total_commission = wcusage_mla_total_earnings( $user_id );
+    }
+    $mla_unpaid = (float) get_user_meta( $user_id, 'wcu_ml_unpaid_commission', true );
+    // Get parent affiliates
+    $mla_get_parents = get_user_meta( $user_id, 'wcu_ml_affiliate_parents', true );
+    if ( !is_array( $mla_get_parents ) ) {
+        $mla_get_parents = array();
+    }
+    // Determine active MLA sub-tab
+    $mla_subtab = ( isset( $_GET['mla_subtab'] ) ? sanitize_text_field( $_GET['mla_subtab'] ) : 'mla-overview' );
+    ?>
+
+                        <!-- MLA Sub-tabs -->
+                        <h3 class="nav-tab-wrapper wcusage-mla-subtabs">
+                            <a href="#mla-subtab-overview" class="nav-tab <?php 
+    echo ( $mla_subtab === 'mla-overview' ? 'nav-tab-active' : '' );
+    ?>" data-mla-subtab="mla-overview">
+                                <i class="fas fa-chart-line" style="margin-right: 6px;"></i>
+                                <?php 
+    echo esc_html__( 'Overview', 'woo-coupon-usage' );
+    ?>
+                            </a>
+                            <a href="#mla-subtab-network" class="nav-tab <?php 
+    echo ( $mla_subtab === 'mla-network' ? 'nav-tab-active' : '' );
+    ?>" data-mla-subtab="mla-network">
+                                <i class="fa-solid fa-network-wired" style="margin-right: 6px;"></i>
+                                <?php 
+    echo esc_html__( 'Network Tree', 'woo-coupon-usage' );
+    ?>
+                            </a>
+                            <a href="#mla-subtab-tiers" class="nav-tab <?php 
+    echo ( $mla_subtab === 'mla-tiers' ? 'nav-tab-active' : '' );
+    ?>" data-mla-subtab="mla-tiers">
+                                <i class="fas fa-layer-group" style="margin-right: 6px;"></i>
+                                <?php 
+    echo esc_html__( 'Tiers', 'woo-coupon-usage' );
+    ?>
+                            </a>
                             <?php 
-    echo esc_html__( 'MLA Network', 'woo-coupon-usage' );
+    $wcusage_field_mla_per_user_group_rates_tab = wcusage_get_setting_value( 'wcusage_field_mla_per_user_group_rates', '0' );
+    if ( $wcusage_field_mla_per_user_group_rates_tab ) {
+        ?>
+                            <a href="#mla-subtab-rates" class="nav-tab <?php 
+        echo ( $mla_subtab === 'mla-rates' ? 'nav-tab-active' : '' );
+        ?>" data-mla-subtab="mla-rates">
+                                <i class="fas fa-sliders-h" style="margin-right: 6px;"></i>
+                                <?php 
+        echo esc_html__( 'Commission Rates', 'woo-coupon-usage' );
+        ?>
+                            </a>
+                            <?php 
+    }
     ?>
                         </h3>
-                        <?php 
-    // Build network for this affiliate similar to MLA dashboard
-    $sub_affiliates = wcusage_get_ml_sub_affiliates( $user_id );
-    if ( empty( $sub_affiliates ) ) {
-        echo '<p>' . esc_html__( "This affiliate doesn't currently have any sub-affiliates.", 'woo-coupon-usage' ) . '</p>';
+
+                        <!-- MLA Sub-tab Content -->
+                        <div class="wcusage-mla-subtab-content">
+
+                            <!-- MLA Overview Sub-tab -->
+                            <div id="mla-subtab-overview" class="mla-subtab-panel <?php 
+    echo ( $mla_subtab === 'mla-overview' ? 'active' : '' );
+    ?>">
+                                <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
+                                    <i class="fas fa-chart-line" style="color: #007cba; margin-right: 10px;"></i>
+                                    <?php 
+    echo esc_html__( 'MLA Statistics Overview', 'woo-coupon-usage' );
+    ?>
+                                </h3>
+
+                                <div class="wcusage-stats-grid">
+                                    <div class="wcusage-stat-box">
+                                        <div class="stat-value"><?php 
+    echo esc_html( count( $mla_sub_affiliates ) );
+    ?></div>
+                                        <div class="stat-label"><?php 
+    echo esc_html__( 'Sub-Affiliates', 'woo-coupon-usage' );
+    ?></div>
+                                    </div>
+                                    <div class="wcusage-stat-box">
+                                        <div class="stat-value"><?php 
+    echo wcusage_format_price( $mla_total_commission );
+    ?></div>
+                                        <div class="stat-label"><?php 
+    echo esc_html__( 'Total MLA Commission', 'woo-coupon-usage' );
+    ?></div>
+                                    </div>
+                                    <div class="wcusage-stat-box">
+                                        <div class="stat-value"><?php 
+    echo wcusage_format_price( $mla_unpaid );
+    ?></div>
+                                        <div class="stat-label"><?php 
+    echo esc_html__( 'Unpaid MLA Commission', 'woo-coupon-usage' );
+    ?></div>
+                                    </div>
+                                </div>
+
+                                <!-- Sub-Affiliates List -->
+                                <div class="wcusage-mla-section-header">
+                                    <h3><?php 
+    echo esc_html__( 'Sub-Affiliates', 'woo-coupon-usage' );
+    ?></h3>
+                                    <button type="button" id="wcusage-add-sub-affiliate-toggle" class="button">
+                                        <span class="dashicons dashicons-plus-alt2" style="vertical-align: middle; margin-right: 4px;"></span>
+                                        <?php 
+    echo esc_html__( 'Add New Sub-Affiliate', 'woo-coupon-usage' );
+    ?>
+                                    </button>
+                                </div>
+
+                                <!-- Add Sub-Affiliate Form (hidden by default) -->
+                                <div id="wcusage-add-sub-affiliate-form" class="wcusage-add-sub-affiliate-form" style="display:none;">
+                                    <p class="wcusage-add-sub-affiliate-desc">
+                                        <?php 
+    echo esc_html__( 'Search for an existing user who does not already have a parent affiliate. Select them and click Add.', 'woo-coupon-usage' );
+    ?>
+                                    </p>
+                                    <div class="wcusage-add-sub-affiliate-row">
+                                        <input
+                                            type="text"
+                                            id="wcusage-sub-affiliate-search"
+                                            class="regular-text"
+                                            placeholder="<?php 
+    echo esc_attr__( 'Search by username or email…', 'woo-coupon-usage' );
+    ?>"
+                                            autocomplete="off"
+                                        />
+                                        <input type="hidden" id="wcusage-sub-affiliate-id" value="" />
+                                        <button type="button" id="wcusage-add-sub-affiliate-submit" class="button button-primary" disabled>
+                                            <?php 
+    echo esc_html__( 'Add Sub-Affiliate', 'woo-coupon-usage' );
+    ?>
+                                        </button>
+                                        <span class="spinner wcusage-add-sub-spinner"></span>
+                                    </div>
+                                    <p id="wcusage-add-sub-affiliate-msg" class="wcusage-add-sub-msg" style="display:none;"></p>
+                                    <input type="hidden" id="wcusage-parent-affiliate-id" value="<?php 
+    echo esc_attr( $user_id );
+    ?>" />
+                                </div>
+
+                                <?php 
+    // Build a lookup: user_id => WP_User object + pre-fetched meta
+    $mla_sub_map = array();
+    // id => ['user' => obj, 'parents' => array, 'tier_num' => int]
+    foreach ( $mla_sub_affiliates as $sub_user ) {
+        $sub_parents = get_user_meta( $sub_user->ID, 'wcu_ml_affiliate_parents', true );
+        if ( !is_array( $sub_parents ) ) {
+            $sub_parents = array();
+        }
+        // tier_num relative to the viewed affiliate
+        $t_key = array_search( (string) $user_id, array_map( 'strval', $sub_parents ) );
+        $t_num = ( $t_key !== false ? (int) str_replace( 'T', '', $t_key ) : 0 );
+        $mla_sub_map[$sub_user->ID] = array(
+            'user'          => $sub_user,
+            'parents'       => $sub_parents,
+            'tier_num'      => $t_num,
+            'direct_parent' => ( isset( $sub_parents['T1'] ) ? (int) $sub_parents['T1'] : 0 ),
+        );
+    }
+    // Build children map: parent_id => [child_id, ...]
+    $mla_children_map = array();
+    foreach ( $mla_sub_map as $sid => $sdata ) {
+        $pid = $sdata['direct_parent'];
+        $mla_children_map[$pid][] = $sid;
+    }
+    // Recursive row renderer
+    function wcusage_render_mla_sub_rows(
+        $parent_id,
+        $mla_sub_map,
+        $mla_children_map,
+        $root_user_id,
+        $depth = 0
+    ) {
+        if ( empty( $mla_children_map[$parent_id] ) ) {
+            return;
+        }
+        foreach ( $mla_children_map[$parent_id] as $sid ) {
+            $sdata = $mla_sub_map[$sid];
+            $sub_user = $sdata['user'];
+            $sub_user_info = get_userdata( $sid );
+            $sub_parents = $sdata['parents'];
+            $t_num = $sdata['tier_num'];
+            // tier key relative to root_user_id
+            $sub_tier_key = array_search( (string) $root_user_id, array_map( 'strval', $sub_parents ) );
+            // Coupons & commission
+            $sub_coupons = wcusage_get_users_coupons_ids( $sid );
+            $sub_coupon_names = array();
+            $sub_commission = 0;
+            foreach ( $sub_coupons as $sub_coupon_id ) {
+                $sub_coupon_names[] = get_the_title( $sub_coupon_id );
+                if ( function_exists( 'wcusage_mla_get_total_commission_earned_tier' ) && $sub_tier_key !== false ) {
+                    $sub_commission += wcusage_mla_get_total_commission_earned_tier( $sub_coupon_id, $sub_tier_key );
+                }
+            }
+            $tier_colors = array(
+                1 => '#2271b1',
+                2 => '#6f42c1',
+                3 => '#0f7a6b',
+                4 => '#d63638',
+                5 => '#e87c0c',
+            );
+            $badge_color = ( isset( $tier_colors[$t_num] ) ? $tier_colors[$t_num] : '#50575e' );
+            $indent_px = $depth * 28;
+            ?>
+                                        <tr class="wcusage-mla-tree-row">
+                                            <td>
+                                                <div class="wcusage-mla-user-cell" style="padding-left:<?php 
+            echo esc_attr( $indent_px );
+            ?>px;">
+                                                    <?php 
+            if ( $depth > 0 ) {
+                ?>
+                                                        <span class="wcusage-mla-indent-connector"></span>
+                                                    <?php 
+            }
+            ?>
+                                                    <?php 
+            echo get_avatar(
+                $sid,
+                28,
+                'identicon',
+                '',
+                array(
+                    'style' => 'border-radius:50%;vertical-align:middle;margin-right:10px;flex-shrink:0;',
+                )
+            );
+            ?>
+                                                    <span class="wcusage-mla-user-info">
+                                                        <strong><?php 
+            echo esc_html( $sub_user_info->user_login );
+            ?></strong>
+                                                        <small><?php 
+            echo esc_html( $sub_user_info->user_email );
+            ?></small>
+                                                    </span>
+                                                </div>
+                                            </td>
+                                            <td style="text-align:center;">
+                                                <span class="wcusage-mla-tier-pill" style="background:<?php 
+            echo esc_attr( $badge_color );
+            ?>;"><?php 
+            echo esc_html( sprintf( __( 'T%s', 'woo-coupon-usage' ), $t_num ) );
+            ?></span>
+                                            </td>
+                                            <td><?php 
+            echo esc_html( implode( ', ', $sub_coupon_names ) );
+            ?></td>
+                                            <td><?php 
+            echo wcusage_format_price( $sub_commission );
+            ?></td>
+                                            <td>
+                                                <a href="<?php 
+            echo esc_url( admin_url( 'admin.php?page=wcusage_view_affiliate&user_id=' . $sid . '&tab=mla' ) );
+            ?>" class="button button-small"><?php 
+            echo esc_html__( 'View User', 'woo-coupon-usage' );
+            ?></a>
+                                                <?php 
+            if ( $sub_tier_key === 'T1' ) {
+                ?>
+                                                <button type="button"
+                                                    class="button button-small wcusage-remove-sub-affiliate"
+                                                    data-sub-id="<?php 
+                echo esc_attr( $sid );
+                ?>"
+                                                    data-sub-name="<?php 
+                echo esc_attr( $sub_user_info->user_login );
+                ?>"
+                                                    data-parent-id="<?php 
+                echo esc_attr( $root_user_id );
+                ?>"
+                                                ><?php 
+                echo esc_html__( 'Remove', 'woo-coupon-usage' );
+                ?></button>
+                                                <?php 
+            }
+            ?>
+                                            </td>
+                                        </tr>
+                                        <?php 
+            // Recurse into this sub's children
+            wcusage_render_mla_sub_rows(
+                $sid,
+                $mla_sub_map,
+                $mla_children_map,
+                $root_user_id,
+                $depth + 1
+            );
+        }
+    }
+
+    ?>
+                                <?php 
+    if ( empty( $mla_sub_affiliates ) ) {
+        ?>
+                                    <p><?php 
+        echo esc_html__( "This affiliate doesn't currently have any sub-affiliates.", 'woo-coupon-usage' );
+        ?></p>
+                                <?php 
     } else {
+        ?>
+                                    <table class="wp-list-table widefat fixed wcusage-mla-tiered-table">
+                                        <thead>
+                                            <tr>
+                                                <th><?php 
+        echo esc_html__( 'User', 'woo-coupon-usage' );
+        ?></th>
+                                                <th style="width:60px;text-align:center;"><?php 
+        echo esc_html__( 'Tier', 'woo-coupon-usage' );
+        ?></th>
+                                                <th style="width:120px;"><?php 
+        echo esc_html__( 'Coupons', 'woo-coupon-usage' );
+        ?></th>
+                                                <th style="width:160px;"><?php 
+        echo esc_html__( 'Earned', 'woo-coupon-usage' );
+        ?></th>
+                                                <th style="width:220px;"><?php 
+        echo esc_html__( 'Actions', 'woo-coupon-usage' );
+        ?></th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <?php 
+        wcusage_render_mla_sub_rows(
+            $user_id,
+            $mla_sub_map,
+            $mla_children_map,
+            $user_id,
+            0
+        );
+        ?>
+                                        </tbody>
+                                    </table>
+                                <?php 
+    }
+    ?>
+                            </div>
+
+                            <!-- MLA Network Tree Sub-tab -->
+                            <div id="mla-subtab-network" class="mla-subtab-panel <?php 
+    echo ( $mla_subtab === 'mla-network' ? 'active' : '' );
+    ?>">
+                                <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
+                                    <i class="fa-solid fa-network-wired" style="color: #007cba; margin-right: 10px;"></i>
+                                    <?php 
+    echo esc_html__( 'MLA Network Tree', 'woo-coupon-usage' );
+    ?>
+                                </h3>
+                                <?php 
+    if ( empty( $mla_sub_affiliates ) ) {
+        echo '<p>' . esc_html__( "This affiliate doesn't currently have any sub-affiliates in their MLA network.", 'woo-coupon-usage' ) . '</p>';
+    } elseif ( function_exists( 'wcusage_get_network_chart_item' ) ) {
         $network_array = '';
         // Root node (self)
         $network_array .= wcusage_get_network_chart_item( $user_id, $user_id, $user_id );
         $coupon_ids = array();
-        foreach ( $sub_affiliates as $user ) {
-            $this_user_id = $user->ID;
-            $get_parents = get_user_meta( $this_user_id, 'wcu_ml_affiliate_parents', true );
-            if ( !$get_parents ) {
-                $get_parents = array();
+        foreach ( $mla_sub_affiliates as $mla_user ) {
+            $this_user_id = $mla_user->ID;
+            $mla_parents = get_user_meta( $this_user_id, 'wcu_ml_affiliate_parents', true );
+            if ( !$mla_parents ) {
+                $mla_parents = array();
             }
             $this_users_coupons = wcusage_get_users_coupons_ids( $this_user_id );
@@ -665 +1048 @@
                 $coupon_ids[] = $this_users_coupon_id;
             }
-            $super_affiliate = ( empty( $get_parents ) ? 1 : 0 );
-            if ( !empty( $this_users_coupons ) && is_array( $get_parents ) ) {
-                $get_parents = array_reverse( $get_parents );
-                $x = end( $get_parents );
+            $super_affiliate = ( empty( $mla_parents ) ? 1 : 0 );
+            if ( !empty( $this_users_coupons ) && is_array( $mla_parents ) ) {
+                $mla_parents = array_reverse( $mla_parents );
+                $x = end( $mla_parents );
                 // Link to top-most parent
                 if ( !$super_affiliate ) {
@@ -677 +1060 @@
         $network_array = rtrim( $network_array, ',' );
         $wcusage_color_tab = wcusage_get_setting_value( 'wcusage_field_color_tab', '#333' );
+        // Merge network data into existing WCUAdminAffiliateView object without overwriting other keys
+        wp_add_inline_script( 'wcusage-admin-view-affiliate', 'if(window.WCUAdminAffiliateView){WCUAdminAffiliateView.mla_network_array=' . wp_json_encode( $network_array ) . ';}', 'after' );
         $mla_network_text = wcusage_get_setting_value( 'wcusage_field_mla_network_text', '' );
         if ( $mla_network_text ) {
@@ -682 +1067 @@
         }
         ?>
-                            <style>
-                                #mla_chart_div .google-visualization-orgchart-linebottom { border-bottom: 2px solid <?php 
-        echo esc_attr( $wcusage_color_tab );
-        ?> !important; }
-                                #mla_chart_div .google-visualization-orgchart-lineleft { border-left: 2px solid <?php 
-        echo esc_attr( $wcusage_color_tab );
-        ?> !important; }
-                                #mla_chart_div .google-visualization-orgchart-lineright { border-right: 2px solid <?php 
-        echo esc_attr( $wcusage_color_tab );
-        ?> !important; }
-                                #mla_chart_div .google-visualization-orgchart-linetop { border-top: 2px solid <?php 
-        echo esc_attr( $wcusage_color_tab );
-        ?> !important; }
-                                /* Remove blue faded background on org chart nodes */
-                                #mla_chart_div .google-visualization-orgchart-node,
-                                #mla_chart_div .google-visualization-orgchart-node > div {
-                                    background: transparent !important;
-                                    box-shadow: none !important;
-                                    -webkit-box-shadow: none !important;
-                                }
-                                #mla_chart_div .google-visualization-orgchart-node { border: 1px solid #dddddd !important; }
-                                #mla_chart_div { overflow: auto; white-space: nowrap; padding-bottom: 8px; }
-                            </style>
-                            <div id="mla_chart_div"></div>
-                            <script type="text/javascript">
-                                (function(){
-                                    var drawn = false;
-                                    window.WCU_MLA_draw = function(){
-                                        if (drawn) return; // draw only once per load
-                                        function _draw(){
-                                            try{
-                                                var data = new google.visualization.DataTable();
-                                                data.addColumn('string', 'Name');
-                                                data.addColumn('string', 'Manager');
-                                                data.addColumn('string', 'ToolTip');
-                                                data.addRows([ <?php 
-        echo $network_array;
-        ?> ]);
-                                                var chart = new google.visualization.OrgChart(document.getElementById('mla_chart_div'));
-                                                chart.draw(data, {allowHtml:true});
-                                                drawn = true;
-                                            }catch(e){ /* ignore until ready */ }
-                                        }
-                                        if (window.google && window.google.charts) {
-                                            if (google.visualization && google.visualization.OrgChart) {
-                                                _draw();
-                                            } else {
-                                                google.charts.load('current', {packages:["orgchart"]});
-                                                google.charts.setOnLoadCallback(_draw);
-                                            }
-                                        }
-                                    };
-                                })();
-
-                                // Enable click-drag horizontal scroll on the chart area
-                                jQuery(function(){
-                                    var slider = document.querySelector('#mla_chart_div');
-                                    if (!slider) return;
-                                    var mouseDown = false, startX = 0, scrollLeft = 0;
-                                    function startDragging(e){ mouseDown = true; startX = e.pageX - slider.offsetLeft; scrollLeft = slider.scrollLeft; }
-                                    function stopDragging(){ mouseDown = false; }
-                                    slider.addEventListener('mousemove', function(e){ if(!mouseDown) return; e.preventDefault(); var x = e.pageX - slider.offsetLeft; var scroll = x - startX; slider.scrollLeft = scrollLeft - scroll; });
-                                    slider.addEventListener('mousedown', startDragging, false);
-                                    slider.addEventListener('mouseup', stopDragging, false);
-                                    slider.addEventListener('mouseleave', stopDragging, false);
-                                });
-                            </script>
+                                    <div id="mla_chart_div"></div>
+                                    <?php 
+    } else {
+        echo '<p>' . esc_html__( 'MLA network chart functions are not available.', 'woo-coupon-usage' ) . '</p>';
+    }
+    ?>
+                            </div>
+
+                            <!-- MLA Tiers Sub-tab -->
+                            <div id="mla-subtab-tiers" class="mla-subtab-panel <?php 
+    echo ( $mla_subtab === 'mla-tiers' ? 'active' : '' );
+    ?>">
+                                <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
+                                    <i class="fas fa-layer-group" style="color: #007cba; margin-right: 10px;"></i>
+                                    <?php 
+    echo esc_html__( 'Commission Per Tier', 'woo-coupon-usage' );
+    ?>
+                                </h3>
+
+                                <?php 
+    $tiersnumber = wcusage_get_setting_value( 'wcusage_field_mla_number_tiers', '5' );
+    ?>
+                                <table class="wp-list-table widefat fixed striped">
+                                    <thead>
+                                        <tr>
+                                            <th><?php 
+    echo esc_html__( 'Tier', 'woo-coupon-usage' );
+    ?></th>
+                                            <th><?php 
+    echo esc_html__( 'Sub-Affiliates', 'woo-coupon-usage' );
+    ?></th>
+                                            <th><?php 
+    echo esc_html__( 'Earned', 'woo-coupon-usage' );
+    ?></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <?php 
+    for ($i = 1; $i <= $tiersnumber; $i++) {
+        $tier_key = 'T' . $i;
+        // Count sub-affiliates in this tier
+        $tier_count = 0;
+        $tier_commission = 0;
+        foreach ( $mla_sub_affiliates as $sub ) {
+            $sub_parents = get_user_meta( $sub->ID, 'wcu_ml_affiliate_parents', true );
+            if ( is_array( $sub_parents ) ) {
+                $sub_tier = array_search( $user_id, $sub_parents );
+                if ( $sub_tier === $tier_key ) {
+                    $tier_count++;
+                    // Calculate commission from this sub-affiliate's coupons for this tier
+                    $sub_coupons = wcusage_get_users_coupons_ids( $sub->ID );
+                    foreach ( $sub_coupons as $sub_coupon_id ) {
+                        if ( function_exists( 'wcusage_mla_get_total_commission_earned_tier' ) ) {
+                            $tier_commission += wcusage_mla_get_total_commission_earned_tier( $sub_coupon_id, $tier_key );
+                        }
+                    }
+                }
+            }
+        }
+        ?>
+                                            <tr>
+                                                <td><strong><?php 
+        echo esc_html( sprintf( __( 'Tier %d', 'woo-coupon-usage' ), $i ) );
+        ?></strong></td>
+                                                <td><?php 
+        echo esc_html( $tier_count );
+        ?></td>
+                                                <td><?php 
+        echo wcusage_format_price( $tier_commission );
+        ?></td>
+                                            </tr>
+                                        <?php 
+    }
+    ?>
+                                    </tbody>
+                                </table>
+                            </div>
+
+                            <!-- MLA Commission Rates Sub-tab -->
                             <?php 
-    }
-    ?>
+    if ( wcusage_get_setting_value( 'wcusage_field_mla_per_user_group_rates', '0' ) ) {
+        ?>
+                            <div id="mla-subtab-rates" class="mla-subtab-panel <?php 
+        echo ( $mla_subtab === 'mla-rates' ? 'active' : '' );
+        ?>">
+                                <h3 style="color: #23282d; font-size: 22px; font-weight: 600; margin-bottom: 25px; border-bottom: 2px solid #007cba; padding-bottom: 10px;">
+                                    <i class="fas fa-sliders-h" style="color: #007cba; margin-right: 10px;"></i>
+                                    <?php 
+        echo esc_html__( 'Per-User MLA Commission Rates', 'woo-coupon-usage' );
+        ?>
+                                </h3>
+
+                                <p style="background: #f0f6fc; border-left: 4px solid #72aee6; padding: 10px 14px; margin: 0 0 20px 0;">
+                                    <strong><?php 
+        echo esc_html__( 'Rate Override Priority:', 'woo-coupon-usage' );
+        ?></strong>
+                                    <?php 
+        echo esc_html__( 'Per User > Per Group > Global. Leave fields empty to use group or global rates.', 'woo-coupon-usage' );
+        ?>
+                                </p>
+
+                                <?php 
+        // Check if user has group rates
+        $user_data = get_userdata( $user_id );
+        $user_group_name = '';
+        if ( $user_data && !empty( $user_data->roles ) ) {
+            foreach ( $user_data->roles as $role ) {
+                if ( $role === 'coupon_affiliate' || strpos( $role, 'coupon_affiliate_' ) === 0 ) {
+                    global $wp_roles;
+                    $user_group_name = ( isset( $wp_roles->roles[$role]['name'] ) ? $wp_roles->roles[$role]['name'] : $role );
+                    break;
+                }
+            }
+        }
+        if ( $user_group_name ) {
+            echo '<p style="margin-bottom: 15px;"><span class="dashicons dashicons-groups" style="color: #646970;"></span> ';
+            echo sprintf( esc_html__( 'This user belongs to the group: %s', 'woo-coupon-usage' ), '<strong>' . esc_html( $user_group_name ) . '</strong>' );
+            echo '</p>';
+        }
+        $mla_tiersnumber = wcusage_get_setting_value( 'wcusage_field_mla_number_tiers', '5' );
+        $options_check = get_option( 'wcusage_options' );
+        ?>
+
+                                <form method="post" action="">
+                                    <?php 
+        wp_nonce_field( 'wcusage_save_mla_user_rates_' . $user_id );
+        ?>
+                                    <input type="hidden" name="wcusage_mla_user_rates_save" value="1" />
+
+                                    <?php 
+        $user_custom_rates_enabled = get_user_meta( $user_id, 'wcu_mla_custom_rates_enabled', true );
+        ?>
+                                    <label style="display: flex; align-items: center; gap: 8px; margin-bottom: 18px; font-weight: 600; font-size: 14px; cursor: pointer;">
+                                        <input type="checkbox" name="wcu_mla_custom_rates_enabled" id="wcu_mla_custom_rates_enabled_user" value="1" <?php 
+        checked( $user_custom_rates_enabled, '1' );
+        ?> style="width: 16px; height: 16px;" />
+                                        <?php 
+        echo esc_html__( 'Enable Custom MLA Commission Rates', 'woo-coupon-usage' );
+        ?>
+                                    </label>
+                                    <div id="wcu-mla-user-rates-table">
+                                    <table class="wp-list-table widefat fixed striped" style="max-width: 800px;">
+                                        <thead>
+                                            <tr>
+                                                <th style="width: 80px;"><?php 
+        echo esc_html__( 'Tier', 'woo-coupon-usage' );
+        ?></th>
+                                                <th><?php 
+        echo esc_html__( '% of Affiliate Earnings', 'woo-coupon-usage' );
+        ?></th>
+                                                <th><?php 
+        echo esc_html__( '% of Order Total', 'woo-coupon-usage' );
+        ?></th>
+                                                <th><?php 
+        echo sprintf( esc_html__( '%s Fixed Amount', 'woo-coupon-usage' ), ( function_exists( 'wcusage_get_currency_symbol' ) ? wcusage_get_currency_symbol() : '$' ) );
+        ?></th>
+                                                <th style="width: 120px;"><?php 
+        echo esc_html__( 'Source', 'woo-coupon-usage' );
+        ?></th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                        <?php 
+        for ($i = 1; $i <= $mla_tiersnumber; $i++) {
+            $tier_key = 'T' . $i;
+            $user_tier_percent = get_user_meta( $user_id, 'wcu_mla_tier_percent_' . $tier_key, true );
+            $user_tier_order_percent = get_user_meta( $user_id, 'wcu_mla_tier_order_percent_' . $tier_key, true );
+            $user_tier_fixed = get_user_meta( $user_id, 'wcu_mla_tier_fixed_' . $tier_key, true );
+            // Determine which source is active
+            $effective_rates = ( function_exists( 'wcusage_mla_get_tier_rates' ) ? wcusage_mla_get_tier_rates( $tier_key, $user_id ) : array(
+                'percent'       => 0,
+                'order_percent' => 0,
+                'fixed'         => 0,
+            ) );
+            // Determine Source label — must mirror wcusage_mla_get_tier_rates() priority logic
+            $source_label = '<span style="color: #646970;">' . esc_html__( 'Global', 'woo-coupon-usage' ) . '</span>';
+            // Check if group rates are active (priority 2)
+            if ( $user_data && !empty( $user_data->roles ) ) {
+                foreach ( $user_data->roles as $role ) {
+                    if ( $role === 'coupon_affiliate' || strpos( $role, 'coupon_affiliate_' ) === 0 ) {
+                        $gp = ( isset( $options_check['wcusage_field_mla_tier_percent_' . $tier_key . '_' . $role] ) ? $options_check['wcusage_field_mla_tier_percent_' . $tier_key . '_' . $role] : '' );
+                        $gop = ( isset( $options_check['wcusage_field_mla_tier_order_percent_' . $tier_key . '_' . $role] ) ? $options_check['wcusage_field_mla_tier_order_percent_' . $tier_key . '_' . $role] : '' );
+                        $gf = ( isset( $options_check['wcusage_field_mla_tier_fixed_' . $tier_key . '_' . $role] ) ? $options_check['wcusage_field_mla_tier_fixed_' . $tier_key . '_' . $role] : '' );
+                        $has_group_rates = $gp !== '' || $gop !== '' || $gf !== '';
+                        $group_flag_exists = isset( $options_check['wcusage_field_mla_custom_rates_enabled_' . $role] );
+                        $group_flag_enabled = $group_flag_exists && ($options_check['wcusage_field_mla_custom_rates_enabled_' . $role] === '1' || $options_check['wcusage_field_mla_custom_rates_enabled_' . $role] === 1);
+                        if ( $has_group_rates && (!$group_flag_exists || $group_flag_enabled) ) {
+                            $source_label = '<span style="color: #6f42c1; font-weight: 600;">' . esc_html__( 'Group', 'woo-coupon-usage' ) . '</span>';
+                            break;
+                        }
+                    }
+                }
+            }
+            // Check if user rates are active (priority 1 — overrides group)
+            $has_user_rate = $user_tier_percent !== '' || $user_tier_order_percent !== '' || $user_tier_fixed !== '';
+            if ( $has_user_rate ) {
+                $user_flag_exists = metadata_exists( 'user', $user_id, 'wcu_mla_custom_rates_enabled' );
+                $user_flag_val = get_user_meta( $user_id, 'wcu_mla_custom_rates_enabled', true );
+                $user_flag_enabled = $user_flag_val === '1' || $user_flag_val === 1 || $user_flag_val === true;
+                if ( !$user_flag_exists || $user_flag_enabled ) {
+                    $source_label = '<span style="color: #2271b1; font-weight: 600;">' . esc_html__( 'User', 'woo-coupon-usage' ) . '</span>';
+                }
+            }
+            ?>
+                                            <tr>
+                                                <td><strong><?php 
+            echo sprintf( esc_html__( 'Tier %d', 'woo-coupon-usage' ), $i );
+            ?></strong></td>
+                                                <td>
+                                                    <input type="number" step="0.1" name="wcu_mla_tier_percent_<?php 
+            echo esc_attr( $tier_key );
+            ?>" value="<?php 
+            echo esc_attr( $user_tier_percent );
+            ?>" class="small-text" placeholder="<?php 
+            echo esc_attr( $effective_rates['percent'] );
+            ?>" style="width: 80px;" />
+                                                </td>
+                                                <td>
+                                                    <input type="number" step="0.1" name="wcu_mla_tier_order_percent_<?php 
+            echo esc_attr( $tier_key );
+            ?>" value="<?php 
+            echo esc_attr( $user_tier_order_percent );
+            ?>" class="small-text" placeholder="<?php 
+            echo esc_attr( $effective_rates['order_percent'] );
+            ?>" style="width: 80px;" />
+                                                </td>
+                                                <td>
+                                                    <input type="number" step="0.01" name="wcu_mla_tier_fixed_<?php 
+            echo esc_attr( $tier_key );
+            ?>" value="<?php 
+            echo esc_attr( $user_tier_fixed );
+            ?>" class="small-text" placeholder="<?php 
+            echo esc_attr( $effective_rates['fixed'] );
+            ?>" style="width: 80px;" />
+                                                </td>
+                                                <td><?php 
+            echo wp_kses_post( $source_label );
+            ?></td>
+                                            </tr>
+                                        <?php 
+        }
+        ?>
+                                        </tbody>
+                                    </table>
+
+                                    <p style="margin-top: 10px; color: #646970; font-size: 12px;">
+                                        <span class="dashicons dashicons-info" style="font-size: 14px; width: 14px; height: 14px;"></span>
+                                        <?php 
+        echo esc_html__( 'Placeholder values show the currently active rate from either group or global settings. Clear a field to revert to the inherited rate.', 'woo-coupon-usage' );
+        ?>
+                                    </p>
+                                    </div><!-- #wcu-mla-user-rates-table -->
+                                    <script>
+                                    (function(){
+                                        var cb = document.getElementById('wcu_mla_custom_rates_enabled_user');
+                                        var tbl = document.getElementById('wcu-mla-user-rates-table');
+                                        function toggle(){ tbl.style.display = cb.checked ? '' : 'none'; }
+                                        cb.addEventListener('change', toggle);
+                                        toggle();
+                                    })();
+                                    </script>
+
+                                    <p class="submit" style="margin-top: 15px;">
+                                        <input type="submit" class="button button-primary" value="<?php 
+        echo esc_attr__( 'Save Commission Rates', 'woo-coupon-usage' );
+        ?>" />
+                                    </p>
+                                </form>
+                            </div>
+                            <?php 
+    }
+    // end per-user/per-group rates check
+    ?>
+
+                        </div><!-- .wcusage-mla-subtab-content -->
+
                     </div>
                     <?php 
@@ -1184 +1775 @@
     <?php 
         $wcusage_field_payout_pending_enable = wcusage_get_setting_value( 'wcusage_field_payout_pending_enable', '1' );
+        $wcusage_tracking_enable = wcusage_get_setting_value( 'wcusage_field_tracking_enable', '0' );
         ?>
     <h3><?php 
@@ -1642 +2234 @@
         ?></td>
                     <td><?php 
-        echo esc_html( wc_get_order_status_name( $order->get_status() ) );
-        ?></td>
+        $order_status = $order->get_status();
+        $order_status_class = '';
+        switch ( $order_status ) {
+            case 'completed':
+                $order_status_class = 'status-completed';
+                break;
+            case 'processing':
+                $order_status_class = 'status-processing';
+                break;
+            case 'on-hold':
+                $order_status_class = 'status-on-hold';
+                break;
+            case 'cancelled':
+            case 'refunded':
+            case 'failed':
+                $order_status_class = 'status-cancelled';
+                break;
+            default:
+                $order_status_class = 'status-processing';
+                break;
+        }
+        ?><span class="order-status <?php 
+        echo esc_attr( $order_status_class );
+        ?>"><?php 
+        echo esc_html( wc_get_order_status_name( $order_status ) );
+        ?></span></td>
                 </tr>
             <?php 
@@ -2037 +2653 @@
         // Get coupon title
         $coupon_title = '';
-        if ( $payout->couponid ) {
+        $is_mla_payout = empty( $payout->couponid ) || intval( $payout->couponid ) === 0;
+        if ( !$is_mla_payout ) {
             $coupon_title = get_the_title( $payout->couponid );
         }
@@ -2061 +2678 @@
         echo esc_html( $payout->id );
         ?></td>
-                    <td><?php 
-        echo esc_html( $coupon_title );
-        ?></td>
+                    <td>
+                        <?php 
+        if ( $is_mla_payout ) {
+            ?>
+                            <span class="order-status" style="background:#e8d5f5;color:#5b2c8d;"><?php 
+            echo esc_html__( 'MLA', 'woo-coupon-usage' );
+            ?></span>
+                        <?php 
+        } else {
+            ?>
+                            <?php 
+            echo esc_html( $coupon_title );
+            ?>
+                        <?php 
+        }
+        ?>
+                    </td>
                     <td><?php 
         echo wcusage_format_price( $payout->amount );

woo-coupon-usage/trunk/inc/admin/class-activity-list-table.php

@@ -40 +40 @@
             $user = get_userdata( $item[$column_name] );
             if($user) {
-                return '<a href="'. esc_url( admin_url('admin.php?page=wcusage_view_affiliate&user_id=' . $item[$column_name]) ) .'" title="'.$user->user_login.'" target="_blank">'.$user->first_name.' '.$user->last_name.'</a>';
+                return '<a href="'. esc_url( admin_url('admin.php?page=wcusage_view_affiliate&user_id=' . absint( $item[$column_name] )) ) .'" title="'. esc_attr( $user->user_login ) .'" target="_blank">'. esc_html( $user->first_name ) .' '. esc_html( $user->last_name ) .'</a>';
             } else {
                 return 'Guest';
@@ -92 +92 @@
     }
 
+    /**
+     * Get the list of available event types for the filter dropdown.
+     */
+    public static function get_event_types() {
+        return array(
+            'referral'                                  => __( 'Referral', 'woo-coupon-usage' ),
+            'registration'                              => __( 'Registration', 'woo-coupon-usage' ),
+            'registration_accept'                       => __( 'Registration Accepted', 'woo-coupon-usage' ),
+            'mla_invite'                                => __( 'MLA Invite', 'woo-coupon-usage' ),
+            'direct_link_domain'                        => __( 'Direct Link Domain', 'woo-coupon-usage' ),
+            'payout_request'                            => __( 'Payout Request', 'woo-coupon-usage' ),
+            'payout_paid'                               => __( 'Payout Paid', 'woo-coupon-usage' ),
+            'payout_reversed'                           => __( 'Payout Reversed', 'woo-coupon-usage' ),
+            'new_campaign'                              => __( 'New Campaign', 'woo-coupon-usage' ),
+            'commission_added'                          => __( 'Commission Added', 'woo-coupon-usage' ),
+            'commission_removed'                        => __( 'Commission Removed', 'woo-coupon-usage' ),
+            'mla_commission_added'                      => __( 'MLA Commission Added', 'woo-coupon-usage' ),
+            'mla_commission_removed'                    => __( 'MLA Commission Removed', 'woo-coupon-usage' ),
+            'manual_unpaid_commission_edit'              => __( 'Manual Unpaid Commission Edit', 'woo-coupon-usage' ),
+            'manual_pending_commission_edit'             => __( 'Manual Pending Commission Edit', 'woo-coupon-usage' ),
+            'manual_processing_commission_edit'          => __( 'Manual Processing Commission Edit', 'woo-coupon-usage' ),
+            'manual_coupon_commission_edit'              => __( 'Manual Coupon Commission Edit', 'woo-coupon-usage' ),
+            'manual_coupon_commission_fixed_order_edit'  => __( 'Manual Fixed Order Commission Edit', 'woo-coupon-usage' ),
+            'manual_coupon_commission_fixed_product_edit'=> __( 'Manual Fixed Product Commission Edit', 'woo-coupon-usage' ),
+            'reward_earned'                             => __( 'Reward Earned', 'woo-coupon-usage' ),
+            'reward_earned_bonus_amount'                => __( 'Reward Bonus Amount', 'woo-coupon-usage' ),
+            'reward_earned_commission_increase'         => __( 'Reward Commission Increase', 'woo-coupon-usage' ),
+            'reward_earned_email_sent'                  => __( 'Reward Email Sent', 'woo-coupon-usage' ),
+            'reward_earned_role_assigned'               => __( 'Reward Role Assigned', 'woo-coupon-usage' ),
+        );
+    }
+
+    /**
+     * Display the filters above the table.
+     */
+    function extra_tablenav( $which ) {
+        if ( $which !== 'top' ) {
+            return;
+        }
+
+        $event_type  = isset( $_GET['event_type'] )  ? sanitize_text_field( wp_unslash( $_GET['event_type'] ) )  : '';
+        $search_user = isset( $_GET['search_user'] )  ? sanitize_text_field( wp_unslash( $_GET['search_user'] ) )  : '';
+        $date_from   = isset( $_GET['date_from'] )    ? sanitize_text_field( wp_unslash( $_GET['date_from'] ) )    : '';
+        $date_to     = isset( $_GET['date_to'] )      ? sanitize_text_field( wp_unslash( $_GET['date_to'] ) )      : '';
+        $search_term = isset( $_GET['s'] )             ? sanitize_text_field( wp_unslash( $_GET['s'] ) )             : '';
+
+        $event_types = self::get_event_types();
+        ?>
+        <div class="wcusage-activity-filters alignleft actions">
+
+            <input type="text" name="s" placeholder="<?php esc_attr_e( 'Search events...', 'woo-coupon-usage' ); ?>" value="<?php echo esc_attr( $search_term ); ?>" style="width:160px;" />
+
+            <select name="event_type">
+                <option value=""><?php esc_html_e( 'All Event Types', 'woo-coupon-usage' ); ?></option>
+                <?php foreach ( $event_types as $key => $label ) : ?>
+                    <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $event_type, $key ); ?>><?php echo esc_html( $label ); ?></option>
+                <?php endforeach; ?>
+            </select>
+
+            <input type="text" name="search_user" placeholder="<?php esc_attr_e( 'Search user...', 'woo-coupon-usage' ); ?>" value="<?php echo esc_attr( $search_user ); ?>" style="width:140px;" />
+
+            <label class="wcusage-activity-date-label"><?php esc_html_e( 'From:', 'woo-coupon-usage' ); ?></label>
+            <input type="date" name="date_from" value="<?php echo esc_attr( $date_from ); ?>" style="width:145px;" />
+
+            <label class="wcusage-activity-date-label"><?php esc_html_e( 'To:', 'woo-coupon-usage' ); ?></label>
+            <input type="date" name="date_to" value="<?php echo esc_attr( $date_to ); ?>" style="width:145px;" />
+
+            <?php submit_button( __( 'Filter', 'woo-coupon-usage' ), 'action', 'filter_action', false ); ?>
+
+            <?php
+            // Show reset link when any filter is active
+            if ( $event_type || $search_user || $date_from || $date_to || $search_term ) :
+            ?>
+                <a href="<?php echo esc_url( admin_url( 'admin.php?page=wcusage_activity' ) ); ?>" class="button" style="margin-left:4px;"><?php esc_html_e( 'Reset', 'woo-coupon-usage' ); ?></a>
+            <?php endif; ?>
+
+        </div>
+        <?php
+    }
+
     function prepare_items() {
 
-        global $wpdb; //This is used only if making any database queries
+        global $wpdb;
 
         $per_page = 100;
@@ -108 +188 @@
         $table_name = $wpdb->prefix . 'wcusage_activity';
 
-        if (isset($_GET['status'])) {
-            $sql = $wpdb->prepare("SELECT * FROM $table_name WHERE status = %s ORDER BY id DESC", sanitize_text_field($_GET['status'])); // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
+        // Build WHERE clauses from filters
+        $where = array();
+        $values = array();
+
+        // Event type filter (validated against known event types)
+        if ( ! empty( $_GET['event_type'] ) ) {
+            $event_type = sanitize_text_field( wp_unslash( $_GET['event_type'] ) );
+            $allowed_event_types = array_keys( self::get_event_types() );
+            if ( in_array( $event_type, $allowed_event_types, true ) ) {
+                $where[] = 'a.event = %s';
+                $values[] = $event_type;
+            }
+        }
+
+        // User search filter (search by name, username, or email)
+        if ( ! empty( $_GET['search_user'] ) ) {
+            $search_user = sanitize_text_field( wp_unslash( $_GET['search_user'] ) );
+            // Look up matching user IDs from the users table
+            $users_table = $wpdb->users;
+            $usermeta_table = $wpdb->usermeta;
+            $like = '%' . $wpdb->esc_like( $search_user ) . '%';
+            $user_ids = $wpdb->get_col( $wpdb->prepare(
+                "SELECT DISTINCT u.ID FROM $users_table u
+                 LEFT JOIN $usermeta_table um_fn ON (u.ID = um_fn.user_id AND um_fn.meta_key = 'first_name')
+                 LEFT JOIN $usermeta_table um_ln ON (u.ID = um_ln.user_id AND um_ln.meta_key = 'last_name')
+                 WHERE u.user_login LIKE %s
+                 OR u.user_email LIKE %s
+                 OR u.display_name LIKE %s
+                 OR um_fn.meta_value LIKE %s
+                 OR um_ln.meta_value LIKE %s", // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
+                $like, $like, $like, $like, $like
+            ) );
+            if ( ! empty( $user_ids ) ) {
+                $placeholders = implode( ',', array_fill( 0, count( $user_ids ), '%d' ) );
+                $where[] = "a.user_id IN ($placeholders)";
+                $values = array_merge( $values, $user_ids );
+            } else {
+                // No users matched – force empty result
+                $where[] = '1 = 0';
+            }
+        }
+
+        // Date from filter (validated as YYYY-MM-DD)
+        if ( ! empty( $_GET['date_from'] ) ) {
+            $date_from = sanitize_text_field( wp_unslash( $_GET['date_from'] ) );
+            if ( preg_match( '/^\d{4}-\d{2}-\d{2}$/', $date_from ) ) {
+                $where[] = 'a.date >= %s';
+                $values[] = $date_from . ' 00:00:00';
+            }
+        }
+
+        // Date to filter (validated as YYYY-MM-DD)
+        if ( ! empty( $_GET['date_to'] ) ) {
+            $date_to = sanitize_text_field( wp_unslash( $_GET['date_to'] ) );
+            if ( preg_match( '/^\d{4}-\d{2}-\d{2}$/', $date_to ) ) {
+                $where[] = 'a.date <= %s';
+                $values[] = $date_to . ' 23:59:59';
+            }
+        }
+
+        // Search term filter (searches event info text)
+        if ( ! empty( $_GET['s'] ) ) {
+            $search_term = sanitize_text_field( wp_unslash( $_GET['s'] ) );
+            $like = '%' . $wpdb->esc_like( $search_term ) . '%';
+            $where[] = '(a.info LIKE %s OR a.event LIKE %s)';
+            $values[] = $like;
+            $values[] = $like;
+        }
+
+        // Build the SQL
+        $where_sql = '';
+        if ( ! empty( $where ) ) {
+            $where_sql = 'WHERE ' . implode( ' AND ', $where );
+        }
+
+        // Sorting
+        $orderby = 'a.id';
+        $order = 'DESC';
+        if ( ! empty( $_GET['orderby'] ) ) {
+            $allowed_orderby = array( 'date', 'id' );
+            $request_orderby = sanitize_text_field( wp_unslash( $_GET['orderby'] ) );
+            if ( in_array( $request_orderby, $allowed_orderby, true ) ) {
+                $orderby = 'a.' . $request_orderby;
+            }
+        }
+        if ( ! empty( $_GET['order'] ) ) {
+            $request_order = strtoupper( sanitize_text_field( wp_unslash( $_GET['order'] ) ) );
+            if ( in_array( $request_order, array( 'ASC', 'DESC' ), true ) ) {
+                $order = $request_order;
+            }
+        }
+
+        // Count query
+        $count_sql = "SELECT COUNT(*) FROM $table_name a $where_sql"; // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
+        if ( ! empty( $values ) ) {
+            $total_items = (int) $wpdb->get_var( $wpdb->prepare( $count_sql, $values ) ); // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
         } else {
-            $sql = "SELECT * FROM $table_name ORDER BY id DESC"; // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
-        }
-        $data = $wpdb->get_results($sql, ARRAY_A); // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter        
-
+            $total_items = (int) $wpdb->get_var( $count_sql ); // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
+        }
+
+        // Data query with pagination
         $current_page = $this->get_pagenum();
-
-        $total_items = count($data);
-
-        $data = array_slice($data,(($current_page-1)*$per_page),$per_page);
+        $offset = ( $current_page - 1 ) * $per_page;
+
+        $data_sql = "SELECT a.* FROM $table_name a $where_sql ORDER BY $orderby $order LIMIT %d OFFSET %d"; // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
+        $data_values = array_merge( $values, array( $per_page, $offset ) );
+        $data = $wpdb->get_results( $wpdb->prepare( $data_sql, $data_values ), ARRAY_A ); // phpcs:ignore PluginCheck.Security.DirectDB.UnescapedDBParameter
 
         $this->items = $data;
 
         $this->set_pagination_args( array(
-            'total_items' => $total_items,                  //WE have to calculate the total number of items
-            'per_page'    => $per_page,                     //WE have to determine how many items to show on a page
-            'total_pages' => ceil($total_items/$per_page)   //WE have to calculate the total number of pages
+            'total_items' => $total_items,
+            'per_page'    => $per_page,
+            'total_pages' => ceil( $total_items / $per_page ),
         ) );
 

woo-coupon-usage/trunk/inc/admin/class-coupons-table.php

@@ -784 +784 @@
 function wcusage_save_coupon_data() {
     check_ajax_referer( 'wcusage_coupon_nonce', 'nonce' );
+
+    if ( ! current_user_can( 'manage_woocommerce' ) ) {
+        wp_send_json_error( array( 'message' => 'Permission denied.' ) );
+        return;
+    }
     
     $coupon_id = intval( $_POST['coupon_id'] );
@@ -822 +827 @@
         'wcu_text_unpaid_commission'            => floatval( wp_unslash( $_POST['wcu_text_unpaid_commission'] ) ),
         'wcu_text_pending_payment_commission'   => floatval( wp_unslash( $_POST['wcu_text_pending_payment_commission'] ) ),
+        'wcu_text_pending_order_commission'     => floatval( wp_unslash( $_POST['wcu_text_pending_order_commission'] ) ),
     );
 
@@ -838 +844 @@
     if(!isset($_POST['wcu_text_pending_payment_commission']) || $_POST['wcu_text_pending_payment_commission'] == '') {
         $meta['wcu_text_pending_payment_commission'] = "0";
+    }
+    if(!isset($_POST['wcu_text_pending_order_commission']) || $_POST['wcu_text_pending_order_commission'] == '') {
+        $meta['wcu_text_pending_order_commission'] = "0";
     }
 
@@ -846 +855 @@
         unset( $meta['wcu_text_unpaid_commission'] );
         unset( $meta['wcu_text_pending_payment_commission'] );
+        unset( $meta['wcu_text_pending_order_commission'] );
     }
     

woo-coupon-usage/trunk/inc/admin/settings/admin-options.php

@@ -1660 +1660 @@
         }
         // Affiliate users table styles and scripts
-        if ( isset( $_GET['page'] ) && $_GET['page'] == 'wcusage_affiliates' ) {
+        if ( isset( $_GET['page'] ) && in_array( $_GET['page'], array('wcusage_affiliates', 'wcusage_mla_users'), true ) ) {
             $css_path = WCUSAGE_UNIQUE_PLUGIN_PATH . 'css/admin-affiliate-users-table.css';
             $css_ver = ( file_exists( $css_path ) ? filemtime( $css_path ) : '1.0.0' );
@@ -1668 +1668 @@
                 array(),
                 $css_ver
+            );
+            $users_css_path = WCUSAGE_UNIQUE_PLUGIN_PATH . 'css/admin-affiliate-users.css';
+            $users_css_ver = ( file_exists( $users_css_path ) ? filemtime( $users_css_path ) : '1.0.0' );
+            wp_enqueue_style(
+                'wcusage-admin-affiliate-users',
+                WCUSAGE_UNIQUE_PLUGIN_URL . 'css/admin-affiliate-users.css',
+                array('wcusage-admin-affiliate-users-table'),
+                $users_css_ver
             );
             $js_path = WCUSAGE_UNIQUE_PLUGIN_PATH . 'js/admin-affiliate-users-table.js';

woo-coupon-usage/trunk/inc/admin/settings/options-notifications.php

@@ -479 +479 @@
 
             <?php echo wcusage_email_merge_tags(array("name", "sub-affiliate-user", "sub-affiliate-tier", "sub-affiliate-commission", "sub-affiliate-commission-fixed")); ?>
+
+          </div>
+
+        </div>
+
+        <div class="wcu-setting-email-notification-box">
+
+          <!--
+          ********************
+          ** [Parent Email] New Sub-Affiliate Registration
+          ********************
+          -->
+          <?php wcusage_setting_toggle_option('wcusage_field_email_mla_sub_reg_notify_enable', 1, esc_html__( 'New Sub-Affiliate Registration', 'woo-coupon-usage' ), '0px'); ?>
+
+          <i><?php echo esc_html__( 'Send an email to the MLA parent affiliate when a new sub-affiliate registers via their invite link, including the application details and a link to approve or decline from their MLA dashboard.', 'woo-coupon-usage' ); ?></i>
+
+          <br/><br/><p><span class="fa-solid fa-circle-user"></span> <strong><?php echo esc_html__( 'Recipient', 'woo-coupon-usage' ); ?>:</strong> <?php echo esc_html__( 'Parent Affiliate User', 'woo-coupon-usage' ); ?></p>
+
+          <br/><p><span class="fa-solid fa-envelope-open-text"></span> <strong><?php echo esc_html__( 'Email Customizer', 'woo-coupon-usage' ); ?>:</strong> <button type="button" class="wcu-showhide-button" id="wcu_show_email_mla_sub_reg_notify_customise">Show <span class="fa-solid fa-arrow-down"></span></button></p>
+
+          <?php echo wcu_admin_settings_showhide_toggle("wcu_show_email_mla_sub_reg_notify_customise", "wcu_email_mla_sub_reg_notify_customise", "Show", "Hide"); ?>
+          <div id="wcu_email_mla_sub_reg_notify_customise" style="display: none;">
+
+            <br/>
+
+            <!-- Email Notification Subject -->
+            <?php wcusage_setting_text_option('wcusage_field_email_mla_sub_reg_notify_subject', esc_html__( "New Sub-Affiliate Registration: {sub-affiliate-user}", "woo-coupon-usage" ), esc_html__( 'Email Notification Subject', 'woo-coupon-usage' ), '0px'); ?>
+
+            <br/>
+
+            <!-- Email Notification Message -->
+            <?php
+            $email_mla_sub_reg_notify_message = "Hello {name},"
+            . "<br/><br/>A new affiliate has registered via your invite link and is pending your approval:"
+            . "<br/><br/><strong>Username:</strong> {username}"
+            . "<br/><strong>Name:</strong> {sub-affiliate-name}"
+            . "<br/><strong>Email:</strong> {sub-affiliate-email}"
+            . "<br/><strong>Coupon:</strong> {coupon}"
+            . "<br/><strong>Website:</strong> {website}"
+            . "<br/><strong>Referrer:</strong> {referrer}"
+            . "<br/><strong>Promote:</strong> {promote}"
+            . "<br/>{custom-fields}"
+            . "<br/><br/>Review and approve or decline this registration from your MLA dashboard:"
+            . "<br/><br/>{dashboardurl}";
+            wcusage_setting_tinymce_option('wcusage_field_email_mla_sub_reg_notify_message', $email_mla_sub_reg_notify_message, esc_html__( 'Email Notification Message', 'woo-coupon-usage' ), '0px');
+            ?>
+
+            <br/>
+
+            <?php echo wcusage_email_merge_tags(array("name", "username", "sub-affiliate-name", "sub-affiliate-email", "coupon", "website", "referrer", "promote", "custom-fields", "dashboardurl")); ?>
 
           </div>
@@ -920 +970 @@
               break;
           case "sub-affiliate-user":
-              echo "<p>- <strong>{sub-affiliate-user}</strong> ".esc_html__( 'to the sub-affiliate username.', 'woo-coupon-usage' )."</p>";
+              echo "<p>- <strong>{sub-affiliate-user}</strong> ".esc_html__( 'to show the sub-affiliate username.', 'woo-coupon-usage' )."</p>";
+              break;
+          case "sub-affiliate-email":
+              echo "<p>- <strong>{sub-affiliate-email}</strong> ".esc_html__( 'to show the sub-affiliate email address.', 'woo-coupon-usage' )."</p>";
+              break;
+          case "sub-affiliate-name":
+              echo "<p>- <strong>{sub-affiliate-name}</strong> ".esc_html__( 'to show the sub-affiliate display name.', 'woo-coupon-usage' )."</p>";
               break;
           case "custom-fields":

woo-coupon-usage/trunk/inc/admin/settings/options-payouts.php

@@ -283 +283 @@
        <br/><br/><hr/>
 
-       <h3 id="wcu-setting-header-payouts-scheduled"><span class="dashicons dashicons-admin-generic" style="margin-top: 2px;"></span> <?php echo esc_html__( 'Pending Commission', 'woo-coupon-usage' ); ?>:</h3>
-
-       <p><?php echo esc_html__( 'Pending Commission allows affiliates to track commission from orders that are not yet completed, but displayed on the dashboard.', 'woo-coupon-usage' ); ?></p>
+       <h3 id="wcu-setting-header-payouts-scheduled"><span class="dashicons dashicons-admin-generic" style="margin-top: 2px;"></span> <?php echo esc_html__( 'Processing Commission', 'woo-coupon-usage' ); ?>:</h3>
+
+       <p><?php echo esc_html__( 'Processing Commission allows affiliates to track commission from orders that are not yet completed, but displayed on the dashboard.', 'woo-coupon-usage' ); ?></p>
        
        <p><?php echo esc_html__( 'This is useful for showing withheld commission, which would convert it to "unpaid commission" once the order is completed, which they can then request payouts for.', 'woo-coupon-usage' ); ?></p>
 
-       <p><?php echo esc_html__( 'The "Pending Commission" will be displayed in the "Payouts" tab as a small notice just above the "Unpaid Commission" amount.', 'woo-coupon-usage' ); ?></p>
+       <p><?php echo esc_html__( 'The "Processing Commission" will be displayed in the "Payouts" tab as a small notice just above the "Unpaid Commission" amount.', 'woo-coupon-usage' ); ?></p>
 
        <br/>
 
-        <?php wcusage_setting_toggle_option('wcusage_field_payout_pending_enable', 1, esc_html__( 'Enable "Pending Commission" tracking.', 'woo-coupon-usage' ), '0px'); ?>
-        <i><?php echo esc_html__( 'When enabled, "Pending Commission" will be tracked and shown on the payouts tab for statuses that are set to show on the dashboard but not completed yet (not granted unpaid commission).', 'woo-coupon-usage' ); ?></i><br/>
+        <?php wcusage_setting_toggle_option('wcusage_field_payout_pending_enable', 1, esc_html__( 'Enable "Processing Commission" tracking.', 'woo-coupon-usage' ), '0px'); ?>
+        <i><?php echo esc_html__( 'When enabled, "Processing Commission" will be tracked and shown on the payouts tab for statuses that are set to show on the dashboard but not completed yet (not granted unpaid commission).', 'woo-coupon-usage' ); ?></i><br/>
         
        <br/><hr/>

woo-coupon-usage/trunk/inc/admin/tools/quick-edit-coupon.php

@@ -135 +135 @@
                                 </div>
                             </div>
+                            <?php $wcu_processing_commission = (float) get_post_meta( $coupon_id, 'wcu_text_pending_order_commission', true ); ?>
+                            <?php if ( $wcu_processing_commission > 0 ) : ?>
+                            <div class="form-row">
+                                <div class="form-field" <?php if ( ! wcu_fs()->can_use_premium_code() ) { ?>style="opacity: 0.5; pointer-events: none;"<?php } ?>>
+                                    <label for="wcu_text_pending_order_commission_<?php echo esc_attr( $coupon_id ); ?>"><?php esc_html_e( 'Processing Commission', 'woo-coupon-usage' ); ?><?php if ( ! wcu_fs()->can_use_premium_code() ) { ?> (PRO)<?php } ?></label>
+                                    <input type="number" id="wcu_text_pending_order_commission_<?php echo esc_attr( $coupon_id ); ?>" step="0.01" value="<?php echo esc_attr( $wcu_processing_commission ); ?>">
+                                </div>
+                            </div>
+                            <?php endif; ?>
                         </div>
                     </div>

woo-coupon-usage/trunk/inc/dashboard/tab-latest-orders.php

@@ -188 +188 @@
             $wcusage_show_commission = 0;
         }
+        // Always show commission column on MLA dashboard (it shows what the parent earned)
+        if ( $type == "mla" ) {
+            $wcusage_show_commission = 1;
+        }
         $wcusage_show_orders_table_status_totals = wcusage_get_setting_value( 'wcusage_field_show_orders_table_status_totals', '1' );
         $option_coupon_orders = wcusage_get_setting_value( 'wcusage_field_orders', '15' );
@@ -439 +443 @@
         }
         ?>
-
-      }
 
     }
@@ -755 +757 @@
                         $totalordersexcl = $calculateorder['totalordersexcl'];
                         $totalcommission = $calculateorder['totalcommission'];
-                        if ( $type == "mla" ) {
-                            $totalcommission = wcusage_mla_get_commission_from_tier(
-                                $totalcommission,
-                                $tier,
-                                '1',
-                                $orderid,
-                                $coupon_code
-                            );
+                        $wcusage_field_mla_enable = wcusage_get_setting_value( 'wcusage_field_mla_enable', '0' );
+                        if ( $wcusage_field_mla_enable && $type == "mla" ) {
+                            // Try stored MLA commission from order meta (persisted at order time)
+                            $stored_mla = wcusage_order_meta( $orderid, 'wcu_mla_commission', true );
+                            if ( is_array( $stored_mla ) && isset( $stored_mla[$tier]['commission'] ) ) {
+                                $totalcommission = (float) $stored_mla[$tier]['commission'];
+                            } else {
+                                // Fallback: recalculate (for orders before this feature was added)
+                                $totalcommission = wcusage_mla_get_commission_from_tier(
+                                    $totalcommission,
+                                    $tier,
+                                    '1',
+                                    $orderid,
+                                    $coupon_code,
+                                    0,
+                                    $user_id
+                                );
+                                // Persist the recalculated value so it won't recalculate again next time
+                                $tier_rates = ( function_exists( 'wcusage_mla_get_tier_rates' ) ? wcusage_mla_get_tier_rates( $tier, $user_id ) : array() );
+                                if ( !is_array( $stored_mla ) ) {
+                                    $stored_mla = array();
+                                }
+                                $stored_mla[$tier] = array(
+                                    'parent_id'  => (int) $user_id,
+                                    'commission' => round( (float) $totalcommission, 2 ),
+                                    'rates'      => $tier_rates,
+                                );
+                                $mla_order_obj = wc_get_order( $orderid );
+                                if ( $mla_order_obj ) {
+                                    $mla_order_obj->update_meta_data( 'wcu_mla_commission', json_encode( $stored_mla ) );
+                                    $mla_order_obj->save_meta_data();
+                                }
+                            }
                         }
                         $combined_totalcommission += (float) $totalcommission;

woo-coupon-usage/trunk/inc/functions/functions-activity.php

@@ -202 +202 @@
       $event_message = "Unpaid commission removed from '".esc_html($coupon_name)."':" . " " . wp_kses_post($info);
       break;
+    case 'mla_commission_added':
+      $coupon_info = wcusage_get_coupon_info_by_id($event_id);
+      $coupon_name = $coupon_info[3];
+      $info = html_entity_decode($info, ENT_QUOTES, 'UTF-8');
+      if (preg_match('/#(\d+)/', $info, $matches)) {
+        $order_id = $matches[1];
+        $order_link = '<a href="'.esc_url(get_edit_post_link($order_id)).'" target="_blank">#'.$order_id.'</a>';
+        $info = str_replace('#'.$order_id, $order_link, $info);
+      }
+      $event_message = "MLA unpaid commission added to '" . esc_html($coupon_name) . "':" . " " . wp_kses_post($info);
+      break;
+    case 'mla_commission_removed':
+      $coupon_info = wcusage_get_coupon_info_by_id($event_id);
+      $coupon_name = $coupon_info[3];
+      $info = html_entity_decode($info, ENT_QUOTES, 'UTF-8');
+      if (preg_match('/#(\d+)/', $info, $matches)) {
+        $order_id = $matches[1];
+        $order_link = '<a href="'.esc_url(get_edit_post_link($order_id)).'" target="_blank">#'.$order_id.'</a>';
+        $info = str_replace('#'.$order_id, $order_link, $info);
+      }
+      $event_message = "MLA unpaid commission removed from '" . esc_html($coupon_name) . "':" . " " . wp_kses_post($info);
+      break;
     case 'manual_unpaid_commission_edit':
       $coupon_info = wcusage_get_coupon_info_by_id($event_id);
@@ -211 +233 @@
       $coupon_name = $coupon_info[3];
       $event_message = "Pending commission edited for coupon '".esc_html($coupon_name)."':" . " " . wp_kses_post($info);
+      break;
+    case 'manual_processing_commission_edit':
+      $coupon_info = wcusage_get_coupon_info_by_id($event_id);
+      $coupon_name = $coupon_info[3];
+      $event_message = "Processing commission edited for coupon '".esc_html($coupon_name)."':" . " " . wp_kses_post($info);
       break;
     case 'manual_coupon_commission_edit':
@@ -279 +306 @@
       'wcu_text_unpaid_commission' => 'manual_unpaid_commission_edit',
       'wcu_text_pending_commission' => 'manual_pending_commission_edit',
+      'wcu_text_pending_order_commission' => 'manual_processing_commission_edit',
       'wcu_text_coupon_commission' => 'manual_coupon_commission_edit',
       'wcu_text_coupon_commission_fixed_order' => 'manual_coupon_commission_fixed_order_edit',
@@ -298 +326 @@
       'wcu_text_unpaid_commission' => 'manual_unpaid_commission_edit',
       'wcu_text_pending_commission' => 'manual_pending_commission_edit',
+      'wcu_text_pending_order_commission' => 'manual_processing_commission_edit',
       'wcu_text_coupon_commission' => 'manual_coupon_commission_edit',
       'wcu_text_coupon_commission_fixed_order' => 'manual_coupon_commission_fixed_order_edit',
@@ -317 +346 @@
               if($meta_key == 'wcu_text_unpaid_commission'
               || $meta_key == 'wcu_text_pending_commission'
+              || $meta_key == 'wcu_text_pending_order_commission'
               || $meta_key == 'wcu_text_coupon_commission_fixed_order'
               || $meta_key == 'wcu_text_coupon_commission_fixed_product')

woo-coupon-usage/trunk/inc/functions/functions-all-time.php

@@ -546 +546 @@
 
   <p class="wcu-loading-loader-subtext" style="text-align:center; margin-top: 8px;"><?php 
-    echo esc_html__( "The page will relaod automatically when it is complete.", "woo-coupon-usage" );
+    echo esc_html__( "The page will reload automatically when it is complete.", "woo-coupon-usage" );
     ?></p>
         

woo-coupon-usage/trunk/inc/functions/functions-calculate-order.php

@@ -80 +80 @@
         $never_update_commission_meta = wcusage_get_setting_value( 'wcusage_field_enable_never_update_commission_meta', '0' );
         if ( $never_update_commission_meta ) {
-            if ( $item == "wcusage_commission_summary" || $item == "wcusage_total_commission" || $item == "wcusage_product_commission" || $item == "wcusage_currency_conversion" ) {
+            if ( $item == "wcusage_commission_summary" || $item == "wcusage_total_commission" || $item == "wcusage_product_commission" || $item == "wcusage_currency_conversion" || $item == "wcu_mla_commission" ) {
                 if ( wcusage_order_meta( $order_id, $item ) ) {
                     return;
@@ -105 +105 @@
             $never_update_commission_meta = wcusage_get_setting_value( 'wcusage_field_enable_never_update_commission_meta', '0' );
             if ( $never_update_commission_meta ) {
-                if ( $key == "wcusage_commission_summary" || $key == "wcusage_total_commission" || $key == "wcusage_product_commission" || $key == "wcusage_currency_conversion" ) {
+                if ( $key == "wcusage_commission_summary" || $key == "wcusage_total_commission" || $key == "wcusage_product_commission" || $key == "wcusage_currency_conversion" || $key == "wcu_mla_commission" ) {
                     if ( wcusage_order_meta( $order_id, $key ) ) {
                         continue;
@@ -352 +352 @@
                 wcusage_delete_order_meta( $orderid, 'wcusage_commission_summary' );
                 wcusage_delete_order_meta( $orderid, 'wcusage_stats' );
+                wcusage_delete_order_meta( $orderid, 'wcu_mla_commission' );
             }
             $get_affstats = wcusage_order_meta( $orderid, 'wcusage_stats', true );
@@ -1232 +1233 @@
                             }
                         }
+                        // Store fixed_order_commission separately so it is available when reading from meta-cache
+                        $meta_fixed_order_commission = wcusage_order_meta( $orderid, 'wcusage_fixed_order_commission', true );
+                        if ( $fixed_order_commission || $meta_fixed_order_commission !== '' ) {
+                            if ( $meta_fixed_order_commission === '' || !$never_update_commission_meta ) {
+                                if ( $save_order_commission_meta ) {
+                                    $meta_data['wcusage_fixed_order_commission'] = $fixed_order_commission;
+                                }
+                            }
+                        }
                         if ( $save_order_commission_meta ) {
                             $meta_data['wcusage_commission_summary'] = $commission_summary;
@@ -1247 +1257 @@
                         wcusage_delete_order_meta( $orderid, 'wcusage_product_commission' );
                     }
+                    if ( !$never_update_commission_meta ) {
+                        wcusage_delete_order_meta( $orderid, 'wcusage_fixed_order_commission' );
+                    }
                 }
             } else {
                 $totalcommission = wcusage_order_meta( $orderid, 'wcusage_total_commission', true );
                 $fixed_product_commission_total = wcusage_order_meta( $orderid, 'wcusage_product_commission', true );
+                $fixed_order_commission = wcusage_order_meta( $orderid, 'wcusage_fixed_order_commission', true );
+                if ( $fixed_order_commission === '' ) {
+                    $fixed_order_commission = 0;
+                }
                 $commission_summary = wcusage_order_meta( $orderid, 'wcusage_commission_summary', true );
             }
@@ -1278 +1295 @@
             if ( $current_fixed_product_commission_total ) {
                 $fixed_product_commission_total = wcusage_order_meta( $orderid, 'wcusage_product_commission', true );
+            }
+            $current_fixed_order_commission = wcusage_order_meta( $orderid, 'wcusage_fixed_order_commission', true );
+            if ( $current_fixed_order_commission !== '' ) {
+                $fixed_order_commission = (float) $current_fixed_order_commission;
             }
             if ( $current_commission_summary ) {

woo-coupon-usage/trunk/inc/functions/functions-coupon-orders.php

@@ -187 +187 @@
             delete_post_meta($order_id, 'wcusage_pending_commission');
 
+            // Clear MLA commission so it gets recalculated fresh (unless "Never update saved commission" is enabled)
+            $never_update_commission_meta = wcusage_get_setting_value('wcusage_field_enable_never_update_commission_meta', '0');
+            if ( ! $never_update_commission_meta ) {
+                wcusage_delete_order_meta( $order_id, 'wcu_mla_commission' );
+            }
+
             // Check and add if pending (this handles the logic)
             if( function_exists('wcusage_check_and_add_pending_commission') ) {

woo-coupon-usage/trunk/inc/functions/functions-dashboard.php

@@ -334 +334 @@
         ?></option>
   <?php 
+        $wcusage_show_months_table = ( isset( $wcusage_show_months_table ) ? $wcusage_show_months_table : wcusage_get_setting_value( 'wcusage_field_show_months_table', '1' ) );
+        $wcusage_field_show_order_tab = ( isset( $wcusage_field_show_order_tab ) ? $wcusage_field_show_order_tab : wcusage_get_setting_value( 'wcusage_field_show_order_tab', '1' ) );
+        $wcusage_field_urls_enable = ( isset( $wcusage_field_urls_enable ) ? $wcusage_field_urls_enable : wcusage_get_setting_value( 'wcusage_field_urls_enable', '1' ) );
+        $wcusage_field_urls_tab_enable = ( isset( $wcusage_field_urls_tab_enable ) ? $wcusage_field_urls_tab_enable : wcusage_get_setting_value( 'wcusage_field_urls_tab_enable', '1' ) );
+        $wcusage_field_creatives_enable = ( isset( $wcusage_field_creatives_enable ) ? $wcusage_field_creatives_enable : wcusage_get_setting_value( 'wcusage_field_creatives_enable', '1' ) );
+        $wcusage_field_payouts_enable = ( isset( $wcusage_field_payouts_enable ) ? $wcusage_field_payouts_enable : wcusage_get_setting_value( 'wcusage_field_payouts_enable', '1' ) );
+        $wcusage_field_rates_enable = ( isset( $wcusage_field_rates_enable ) ? $wcusage_field_rates_enable : wcusage_get_setting_value( 'wcusage_field_rates_enable', '0' ) );
+        $wcusage_field_bonuses_enable = ( isset( $wcusage_field_bonuses_enable ) ? $wcusage_field_bonuses_enable : wcusage_get_setting_value( 'wcusage_field_bonuses_enable', '0' ) );
+        $wcusage_field_bonuses_tab_enable = ( isset( $wcusage_field_bonuses_tab_enable ) ? $wcusage_field_bonuses_tab_enable : wcusage_get_setting_value( 'wcusage_field_bonuses_tab_enable', '1' ) );
+        $wcusage_field_show_settings_tab_show = ( isset( $wcusage_field_show_settings_tab_show ) ? $wcusage_field_show_settings_tab_show : wcusage_get_setting_value( 'wcusage_field_show_settings_tab_show', '1' ) );
+        $option_coupon_orders = ( isset( $option_coupon_orders ) ? $option_coupon_orders : wcusage_get_setting_value( 'wcusage_field_orders', '10' ) );
         if ( $wcusage_show_months_table == '1' ) {
             ?>

woo-coupon-usage/trunk/inc/functions/functions-general.php

@@ -62 +62 @@
       || $post_id == $mla_dashboard_page
       || is_account_page()
+      || get_query_var( 'affiliate_portal' )
       || ( !is_admin() && isset($_SERVER['REQUEST_URI']) && strpos( $_SERVER['REQUEST_URI'], $wcusage_portal_slug ) !== false ) ) {
 
@@ -84 +85 @@
           });
         }
-        // WP Compress
-        if ( is_plugin_active( 'wp-compress-image-optimizer/wp-compress.php' ) ) {
-          // Disable JavaScript optimization
-          add_filter('wpc_js_exclude', function($exclude_list) {
-            if (!is_array($exclude_list)) {
-              $exclude_list = array();
-            }
-            $exclude_list[] = 'woo-coupon-usage';
-            $exclude_list[] = 'wcusage';
-            $exclude_list[] = 'jquery.cookie';
-            $exclude_list[] = 'portal.js';
-            $exclude_list[] = 'tab-settings';
-            $exclude_list[] = 'dark-mode';
-            return $exclude_list;
-          });
-          // Disable CSS optimization
-          add_filter('wpc_css_exclude', function($exclude_list) {
-            if (!is_array($exclude_list)) {
-              $exclude_list = array();
-            }
-            $exclude_list[] = 'woo-coupon-usage';
-            $exclude_list[] = 'wcusage';
-            return $exclude_list;
-          });
-          // Disable page caching
-          add_filter('wpc_disable_caching', '__return_true');
-          // Disable minification
-          add_filter('wpc_disable_minify', '__return_true');
-          // Disable lazy load
-          add_filter('wpc_disable_lazyload', '__return_true');
-        }
 
       }
     }
+  }
+}
+
+/**
+ * Fix WP Compress conflicts on affiliate dashboard and portal pages.
+ * Hooked on template_redirect (earlier than wp_head) so WP Compress
+ * filters are registered before it processes the page.
+ */
+add_action( 'template_redirect', 'wcusage_fix_wp_compress', 1 );
+if( !function_exists( 'wcusage_fix_wp_compress' ) ) {
+  function wcusage_fix_wp_compress() {
+    if ( ! is_plugin_active( 'wp-compress-image-optimizer/wp-compress.php' ) ) {
+      return;
+    }
+    if ( is_admin() ) {
+      return;
+    }
+
+    $post_id = get_the_ID();
+    $dashboard_page = wcusage_get_setting_value('wcusage_dashboard_page', '');
+    $mla_dashboard_page = wcusage_get_setting_value('wcusage_mla_dashboard_page', '');
+    $wcusage_portal_slug = wcusage_get_setting_value('wcusage_portal_slug', 'affiliate-portal');
+
+    $is_affiliate_page = (
+      get_query_var( 'affiliate_portal' )
+      || $post_id == $dashboard_page
+      || $post_id == $mla_dashboard_page
+      || is_account_page()
+      || ( isset($_SERVER['REQUEST_URI']) && strpos( $_SERVER['REQUEST_URI'], $wcusage_portal_slug ) !== false )
+    );
+
+    if ( ! $is_affiliate_page ) {
+      return;
+    }
+
+    // Disable JavaScript optimization
+    add_filter('wpc_js_exclude', function($exclude_list) {
+      if (!is_array($exclude_list)) {
+        $exclude_list = array();
+      }
+      $exclude_list[] = 'woo-coupon-usage';
+      $exclude_list[] = 'wcusage';
+      $exclude_list[] = 'jquery.cookie';
+      $exclude_list[] = 'portal.js';
+      $exclude_list[] = 'tab-settings';
+      $exclude_list[] = 'dark-mode';
+      return $exclude_list;
+    });
+    // Disable CSS optimization
+    add_filter('wpc_css_exclude', function($exclude_list) {
+      if (!is_array($exclude_list)) {
+        $exclude_list = array();
+      }
+      $exclude_list[] = 'woo-coupon-usage';
+      $exclude_list[] = 'wcusage';
+      return $exclude_list;
+    });
+    // Disable page caching
+    add_filter('wpc_disable_caching', '__return_true');
+    // Disable minification
+    add_filter('wpc_disable_minify', '__return_true');
+    // Disable lazy load
+    add_filter('wpc_disable_lazyload', '__return_true');
   }
 }

woo-coupon-usage/trunk/inc/functions/functions-new-order.php

@@ -101 +101 @@
                     $coupon_info = wcusage_get_coupon_info( $lifetimeaffiliate );
                     $coupon_user_id = $coupon_info[1];
-                    $meta_data = wcusage_update_ml_affiliate_parents( $meta_data, $coupon_user_id, $order );
+                    $paidcommission = ( isset( $calculateorder['totalcommission'] ) ? $calculateorder['totalcommission'] : 0 );
+                    $meta_data = wcusage_update_ml_affiliate_parents(
+                        $meta_data,
+                        $coupon_user_id,
+                        $order,
+                        $lifetimeaffiliate,
+                        $paidcommission
+                    );
                 } elseif ( $affiliatereferrer ) {
                     $calculateorder = wcusage_calculate_order_data(
@@ -137 +144 @@
                     $coupon_info = wcusage_get_coupon_info( $affiliatereferrer );
                     $coupon_user_id = $coupon_info[1];
+                    $paidcommission = ( isset( $calculateorder['totalcommission'] ) ? $calculateorder['totalcommission'] : 0 );
                     $user_parents = get_user_meta( $coupon_user_id, 'wcu_ml_affiliate_parents', true );
-                    $meta_data = wcusage_update_ml_affiliate_parents( $meta_data, $coupon_user_id, $order );
+                    $meta_data = wcusage_update_ml_affiliate_parents(
+                        $meta_data,
+                        $coupon_user_id,
+                        $order,
+                        $affiliatereferrer,
+                        $paidcommission
+                    );
                 } else {
                     // Coupons
@@ -182 +196 @@
                             $coupon_info = wcusage_get_coupon_info( $coupon_code );
                             $coupon_user_id = $coupon_info[1];
-                            $meta_data = wcusage_update_ml_affiliate_parents( $meta_data, $coupon_user_id, $order );
+                            $paidcommission = ( isset( $calculateorder['totalcommission'] ) ? $calculateorder['totalcommission'] : 0 );
+                            $meta_data = wcusage_update_ml_affiliate_parents(
+                                $meta_data,
+                                $coupon_user_id,
+                                $order,
+                                $coupon_code,
+                                $paidcommission
+                            );
                         }
                     }
@@ -218 +239 @@
     3
 );
-/*
- * On order completed delete wcusage_all_updated
- *
- * @param int $order_id
- *
- */
-function wcusage_on_new_order_delete_all_updated_meta(  $order_id  ) {
-    wcusage_delete_order_meta( $order_id, 'wcusage_all_updated' );
-}
-
-add_action(
-    'woocommerce_order_status_completed',
-    'wcusage_on_new_order_delete_all_updated_meta',
-    10,
-    1
-);
+// NOTE: The wcusage_all_updated flag is intentionally NOT deleted on order completion.
+// Deleting it on 'woocommerce_order_status_completed' caused double-counting because
+// woocommerce_order_status_changed fires after that hook, sees no flag, and re-adds
+// the order to the all-time stats a second time. The flag is only cleared by the
+// $remove_order path when an order moves from a counted status to a non-counted one.
 /* Update MLA Parents When New Order Placed */
-function wcusage_update_ml_affiliate_parents(  $meta_data, $coupon_user_id, $order  ) {
+function wcusage_update_ml_affiliate_parents(
+    $meta_data,
+    $coupon_user_id,
+    $order,
+    $coupon_code = '',
+    $paidcommission = 0
+) {
 }
 

woo-coupon-usage/trunk/inc/functions/functions-refund.php

@@ -70 +70 @@
   wcusage_delete_order_meta($order_id, 'wcusage_commission_summary');
   wcusage_delete_order_meta($order_id, 'wcusage_total_commission');
+  wcusage_delete_order_meta($order_id, 'wcu_mla_commission');
 
 }

woo-coupon-usage/trunk/inc/functions/functions-urls.php

@@ -40 +40 @@
 
     if ( headers_sent() && ! $httponly && ! wp_doing_ajax() ) {
-        $script = "var date = new Date(" . ($expire * 1000) . ");
-        var expires = '; expires=' + date.toUTCString();
-        document.cookie = '" . $name . "=" . $value . "' + expires + '; path=" . $path . "; domain=" . $domain . "; samesite=Lax" . ($secure ? "; secure" : "") . "';";
-        wp_add_inline_script( 'jquery-core', $script );
+        // Headers already sent - use JavaScript fallback to set cookies.
+        // Outputting script directly in footer instead of using wp_add_inline_script which won't work at this timing.
+        // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+        // phpcs:ignore WordPress.Security.EscapeOutput.UnsafePrintingFunction
+        add_action(
+            'wp_footer',
+            function() use ( $name, $value, $expire, $path, $domain, $secure ) {
+                ?>
+                <script type="text/javascript">
+                (function() {
+                    var date = new Date(<?php echo absint( $expire * 1000 ); ?>);
+                    var expires = '; expires=' + date.toUTCString();
+                    document.cookie = '<?php echo esc_js( $name ); ?>=<?php echo esc_js( $value ); ?>' + expires + '; path=<?php echo esc_js( $path ); ?>; domain=<?php echo esc_js( $domain ); ?>; samesite=Lax<?php echo $secure ? '; secure' : ''; ?>';
+                })();
+                </script>
+                <?php
+            },
+            999
+        );
     } elseif ( PHP_VERSION_ID < 70300 ) {
         setcookie( $name, $value, $expire, $path, $domain, $secure, $httponly );

woo-coupon-usage/trunk/inc/functions/functions-user-coupons.php

@@ -339 +339 @@
                     if ( $wcu_text_unpaid_commission_confirm ) {
                         if ( isset( $_POST['wcu_text_unpaid_commission'] ) ) {
-                            $wcu_text_unpaid_commission = sanitize_text_field( $_POST['wcu_text_unpaid_commission'] );
+                            $wcu_text_unpaid_commission = floatval( wp_unslash( $_POST['wcu_text_unpaid_commission'] ) );
                             update_post_meta( $post_id, 'wcu_text_unpaid_commission', $wcu_text_unpaid_commission );
                         }
                         if ( isset( $_POST['wcu_text_pending_payment_commission'] ) ) {
-                            $wcu_text_pending_payment_commission = sanitize_text_field( $_POST['wcu_text_pending_payment_commission'] );
+                            $wcu_text_pending_payment_commission = floatval( wp_unslash( $_POST['wcu_text_pending_payment_commission'] ) );
                             update_post_meta( $post_id, 'wcu_text_pending_payment_commission', $wcu_text_pending_payment_commission );
+                        }
+                        if ( isset( $_POST['wcu_text_pending_order_commission'] ) ) {
+                            $wcu_text_pending_order_commission = floatval( wp_unslash( $_POST['wcu_text_pending_order_commission'] ) );
+                            update_post_meta( $post_id, 'wcu_text_pending_order_commission', $wcu_text_pending_order_commission );
                         }
                         update_post_meta( $post_id, 'wcu_text_unpaid_commission_confirm', 0 );

woo-coupon-usage/trunk/inc/registration/class-registrations-list-table.php

@@ -162 +162 @@
                     return '<span class="dashicons dashicons-warning" style="color: orange;"></span> ' . esc_html__( 'Pending', 'woo-coupon-usage' );
                 }
+          if($status == "parent_approved") {
+            $parent_approver_id = get_user_meta( absint($item['userid']), 'wcu_mla_parent_approver_id', true );
+            $parent_approver_name = '';
+            if ( $parent_approver_id ) {
+              $parent_approver = get_userdata( absint($parent_approver_id) );
+              $parent_approver_name = $parent_approver ? ' (' . esc_html( $parent_approver->user_login ) . ')' : '';
+            }
+            return '<span class="dashicons dashicons-thumbs-up" style="color: #2271b1;"></span> ' . esc_html__( 'MLA Parent Approved', 'woo-coupon-usage' ) . esc_html( $parent_approver_name );
+          }
           if($status == "declined") {
                     return '<span class="dashicons dashicons-dismiss" style="color: red;"></span> ' . esc_html__( 'Declined', 'woo-coupon-usage' );
@@ -176 +185 @@
                     ?>
 
-          <?php if($status == "pending") { ?>
+          <?php if($status == "pending" || $status == "parent_approved") { ?>
 
                     <form method="post" id="submitregister">
@@ -183 +192 @@
 
             <?php wp_nonce_field( 'admin_affiliate_register_form' ); ?>
+
+            <?php if ( $status === 'parent_approved' ) : ?>
+              <p style="color: #2271b1; font-size: 12px; margin: 0 0 4px 0;"><span class="dashicons dashicons-thumbs-up" style="font-size:14px;vertical-align:middle;"></span> <?php echo esc_html__( 'MLA parent has approved this application.', 'woo-coupon-usage' ); ?></p>
+            <?php endif; ?>
 
                     <button type="submit" name="submitregisteraccept" class="payout-action payout-action-accepted" title="<?php echo esc_html__( 'Accept Application', 'woo-coupon-usage' ); ?>">

woo-coupon-usage/trunk/inc/registration/registration-admin.php

@@ -451 +451 @@
     ?>"><?php 
     echo esc_html__( 'Pending', 'woo-coupon-usage' );
+    ?></a>
+    &#xb7;
+    <a href="<?php 
+    echo esc_url( admin_url( 'admin.php?page=wcusage_registrations&status=parent_approved' ) );
+    ?>" style="<?php 
+    if ( $statussearch == 'parent_approved' ) {
+        ?>font-weight: bold;<?php 
+    }
+    ?>"><?php 
+    echo esc_html__( 'MLA Parent Approved', 'woo-coupon-usage' );
     ?></a>
     &#xb7;

woo-coupon-usage/trunk/inc/registration/registration-ajax.php

@@ -134 +134 @@
         ) );
         error_log( 'CA: Failed to store registration data for user ID: ' . $userid );
+    }
+    // MLA: Set parent affiliate relationship if the user registered via an MLA invite link.
+    $wcusage_field_mla_enable = wcusage_get_setting_value( 'wcusage_field_mla_enable', '0' );
+    if ( $wcusage_field_mla_enable ) {
+        $mla_cookie = wcusage_get_cookie_value( 'wcusage_referral_mla' );
+        $mla_cookie = str_replace( '%20', ' ', $mla_cookie );
+        $mla_referral = ( function_exists( 'wcusage_get_mla_referral_value' ) ? wcusage_get_mla_referral_value() : '' );
+        $mla_username = ( $mla_referral ? $mla_referral : $mla_cookie );
+        if ( $mla_username ) {
+            $mla_user = get_user_by( 'login', $mla_username );
+            $this_user = get_user_by( 'id', $userid );
+            if ( $mla_user && $this_user ) {
+                if ( function_exists( 'wcusage_mla_add_parent_to_user' ) ) {
+                    wcusage_mla_add_parent_to_user( $mla_user->ID, $this_user->ID );
+                }
+                if ( function_exists( 'wcusage_install_mlainvite_data' ) ) {
+                    wcusage_install_mlainvite_data(
+                        $mla_user->ID,
+                        $this_user->user_email,
+                        'pending',
+                        1
+                    );
+                }
+                // Notify MLA parent about the new sub-affiliate registration.
+                do_action(
+                    'wcusage_hook_mla_sub_registration_new',
+                    $mla_user->ID,
+                    $this_user->ID,
+                    $couponcode
+                );
+            }
+        }
     }
     // Determine whether this submission should be auto-accepted.

woo-coupon-usage/trunk/inc/registration/registration-form.php

@@ -472 +472 @@
                         if ( $enable_captcha == "1" && !empty( $wcusage_registration_recaptcha_key ) && $wcusage_registration_recaptcha_key != "" ) {
                             ?>
-            <p>
             <div class="captcha_wrapper">
                 <div class="g-recaptcha" data-sitekey="<?php 
@@ -478 +477 @@
                             ?>"></div>
             </div>
-            </p>
             <?php 
                         }
@@ -487 +485 @@
                         if ( $enable_captcha == "2" && !empty( $wcusage_registration_turnstile_key ) && $wcusage_registration_turnstile_key != "" ) {
                             ?>
-            <p>
             <div class="captcha_wrapper">
                 <div class="cf-turnstile" data-sitekey="<?php 
@@ -493 +490 @@
                             ?>"></div>
             </div>
-            </p>
             <?php 
                         }
@@ -836 +832 @@
                     $thiscoupon = false;
                 }
-                if ( $count <= 0 && !$thiscoupon->is_valid() ) {
+                if ( $count <= 0 && (!$thiscoupon || !$thiscoupon->is_valid()) ) {
                     if ( !isset( $_SESSION['wcu_registration_token'] ) || is_admin() ) {
                         // Add User If Admin Post
@@ -903 +899 @@
                                 );
                             }
+                            // Notify MLA parent about the new sub-affiliate registration.
+                            do_action(
+                                'wcusage_hook_mla_sub_registration_new',
+                                $mla_user->ID,
+                                $this_user->ID,
+                                $couponcode
+                            );
                         }
                         $alreadyexists = 0;

woo-coupon-usage/trunk/inc/widget/js/floating-widget-popup.js

@@ -35 +35 @@
             }
         }
+    }
+    
+    // Load captcha script dynamically for registration form in the widget
+    function loadCaptchaScript(captchaData) {
+        if (!captchaData || !captchaData.type) {
+            return;
+        }
+        
+        if (captchaData.type === 'recaptcha') {
+            // Check if reCAPTCHA script is already loaded
+            if (typeof grecaptcha !== 'undefined') {
+                // Script already loaded, just render the widget
+                renderRecaptcha();
+                return;
+            }
+            var script = document.createElement('script');
+            script.src = 'https://www.google.com/recaptcha/api.js?onload=wcusageRecaptchaCallback&render=explicit';
+            script.async = true;
+            script.defer = true;
+            window.wcusageRecaptchaCallback = function() {
+                renderRecaptcha();
+            };
+            document.head.appendChild(script);
+        } else if (captchaData.type === 'turnstile') {
+            // Check if Turnstile script is already loaded
+            if (typeof turnstile !== 'undefined') {
+                // Script already loaded, just render the widget
+                renderTurnstile(captchaData.site_key);
+                return;
+            }
+            var script = document.createElement('script');
+            script.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js?onload=wcusageTurnstileCallback&render=explicit';
+            script.async = true;
+            script.defer = true;
+            window.wcusageTurnstileCallback = function() {
+                renderTurnstile(captchaData.site_key);
+            };
+            document.head.appendChild(script);
+        }
+    }
+    
+    // Render reCAPTCHA widgets in the popup
+    function renderRecaptcha() {
+        if (typeof grecaptcha === 'undefined') {
+            return;
+        }
+        $('.wcusage-floating-popup .g-recaptcha').each(function() {
+            var el = this;
+            // Only render if not already rendered
+            if ($(el).children().length === 0) {
+                grecaptcha.render(el, {
+                    'sitekey': $(el).data('sitekey')
+                });
+            }
+        });
+    }
+    
+    // Render Turnstile widgets in the popup
+    function renderTurnstile(siteKey) {
+        if (typeof turnstile === 'undefined') {
+            return;
+        }
+        $('.wcusage-floating-popup .cf-turnstile').each(function() {
+            var el = this;
+            // Only render if not already rendered
+            if ($(el).children().length === 0) {
+                turnstile.render(el, {
+                    sitekey: siteKey || $(el).data('sitekey')
+                });
+            }
+        });
     }
     
@@ -75 +146 @@
                     // Initialize premium features if available
                     initializePremiumFeatures();
+                    
+                    // Load captcha scripts if registration form is displayed
+                    if (response.data.captcha) {
+                        loadCaptchaScript(response.data.captcha);
+                    }
                 } else {
                     var errorMsg = response && response.data ? response.data : wcusage_floating_widget.error_text;

woo-coupon-usage/trunk/inc/widget/widget-ajax.php

@@ -9 +9 @@
  */
 
+/**
+ * Get captcha configuration data for the floating widget.
+ * Returns the captcha type and site key so the popup JS can load the appropriate script dynamically.
+ */
+function wcusage_get_widget_captcha_data() {
+    $enable_captcha = wcusage_get_setting_value('wcusage_registration_enable_captcha', '');
+    if ($enable_captcha == '1') {
+        $site_key = wcusage_get_setting_value('wcusage_registration_recaptcha_key', '');
+        if (!empty($site_key)) {
+            return array(
+                'type' => 'recaptcha',
+                'site_key' => $site_key
+            );
+        }
+    } elseif ($enable_captcha == '2') {
+        $site_key = wcusage_get_setting_value('wcusage_registration_turnstile_key', '');
+        if (!empty($site_key)) {
+            return array(
+                'type' => 'turnstile',
+                'site_key' => $site_key
+            );
+        }
+    }
+    return null;
+}
+
 // AJAX handler for popup content (updated to include settings)
 add_action('wp_ajax_wcusage_floating_widget_content', 'wcusage_floating_widget_ajax_content');
@@ -32 +58 @@
             // Show registration form for non-logged in users
             $content = wcusage_widget_registration_form($settings);
-            wp_send_json_success(array(
+            $response_data = array(
                 'content' => $content,
                 'settings' => $settings
-            ));
+            );
+            // Include captcha data so the popup JS can load scripts dynamically
+            $captcha_data = wcusage_get_widget_captcha_data();
+            if ($captcha_data) {
+                $response_data['captcha'] = $captcha_data;
+            }
+            wp_send_json_success($response_data);
             return;
         }
@@ -50 +82 @@
             // Show registration form for logged-in users without coupons
             $content = wcusage_widget_registration_form($settings);
-            wp_send_json_success(array(
+            $response_data = array(
                 'content' => $content,
                 'settings' => $settings
-            ));
+            );
+            // Include captcha data so the popup JS can load scripts dynamically
+            $captcha_data = wcusage_get_widget_captcha_data();
+            if ($captcha_data) {
+                $response_data['captcha'] = $captcha_data;
+            }
+            wp_send_json_success($response_data);
             return;
         }

woo-coupon-usage/trunk/js/admin-coupons.js

@@ -139 +139 @@
             wcu_text_coupon_commission_fixed_product: $row.find('#wcu_text_coupon_commission_fixed_product_' + couponId).val(),
             wcu_text_unpaid_commission: $row.find('#wcu_text_unpaid_commission_' + couponId).val(),
-            wcu_text_pending_payment_commission: $row.find('#wcu_text_pending_payment_commission_' + couponId).val()
+            wcu_text_pending_payment_commission: $row.find('#wcu_text_pending_payment_commission_' + couponId).val(),
+            wcu_text_pending_order_commission: $row.find('#wcu_text_pending_order_commission_' + couponId).val() || '0'
         };
 

woo-coupon-usage/trunk/js/admin-view-affiliate.js

@@ -4 +4 @@
 
 jQuery(document).ready(function($) {
+    // Mobile tab dropdown — inject <select> before the tab bar
+    (function() {
+        var $tabs = $('.wcusage-tabs');
+        if (!$tabs.length) { return; }
+
+        // Build the select element from the existing nav-tab links
+        var $select = $('<select class="wcusage-tab-select" aria-label="Navigate tabs"></select>');
+        $tabs.find('.nav-tab').each(function() {
+            var $tab  = $(this);
+            var href  = $tab.attr('href');
+            var label = $tab.text().trim();
+            var $opt  = $('<option></option>').val(href).text(label);
+            if ($tab.hasClass('nav-tab-active')) { $opt.prop('selected', true); }
+            if ($tab.hasClass('wcusage-tab-disabled')) { $opt.prop('disabled', true); }
+            $select.append($opt);
+        });
+
+        var $wrapper = $('<div class="wcusage-tab-select-wrapper"></div>').append($select);
+        $tabs.before($wrapper);
+
+        $select.on('change', function() {
+            var href  = $(this).val();
+            var $link = $tabs.find('.nav-tab[href="' + href + '"]');
+            if ($link.length) { $link.trigger('click'); }
+        });
+    })();
+
     // Tab switching functionality
     $('.wcusage-tabs .nav-tab').on('click', function(e) {
@@ -25 +52 @@
             try { window.WCU_MLA_draw(); } catch(e) {}
         }
+
+        // Sync mobile dropdown
+        $('.wcusage-tab-select').val('#' + tabId);
 
         // Update URL without page reload
@@ -43 +73 @@
         $('.wcusage-tab-content > div').removeClass('active');
         $('#tab-' + tab).addClass('active');
+
+        // Sync mobile dropdown
+        $('.wcusage-tab-select').val('#tab-' + tab);
 
         // If MLA tab is now active, ensure chart draws
@@ -276 +309 @@
     });
 });
+

woo-coupon-usage/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 7.0
 Tested up to: 6.9
-Stable tag: 7.4.0
+Stable tag: 7.5.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -276 +276 @@
 == Changelog ==
 
+= Version 7.5.0 - 25th February 2026 =
+- New: (PRO) Added a new option to set per-group and per-user MLA commission rates, which will override the default MLA commission rates for that user.
+- New: (PRO) Added a new option to display a "Rates" tab on the MLA affiliate dashboard, which will show the commission rates for each tier of their MLA network, and also show any custom rates that have been set for that user.
+- New: (PRO) Added a new "MLA Users" admin page listing all users that are part of the multi-level affiliate system, with their affiliate details and stats.
+- New: (PRO) On the "View Affiliate" page, in the "MLA" tab, added lots more details and statistics about the affiliates sub-affiliates, including their total stats, recent orders, and more. Also added a way to easily remove sub-affiliates or add new sub-affiliates to the affiliate from this tab.
+- New: (PRO) If QR codes are enabled, it will now also show the QR code generator for the MLA invite referral links on the MLA dashboard.
+- New: (PRO) Added an option to show a "Sub-Affiliate Registrations" section on the MLA dashboard, that allows the parent affiliate to view and manage the affiliate applications from their sub-affiliates. They will also receive email notifications when they get new sub-affiliate applications, and can approve/reject them from the MLA dashboard.
+- New: (PRO) On the affiliate page, if the payout information totals (processing, unpaid, pending, paid) do not match the "total commission", added a "unaccounted commission" row with a message explaining why that may be the case.
+- Improvement: (PRO) Added extra columns to the Affiliate Groups admin page, showing each group's commission rates, assigned template coupon, and enabled payout methods.
+- Improvement: (PRO) Added a field when editing coupons to modify the "processing commission" amount.
+- Improvement: Added filters to the admin activity log page.
+- Improvement: (PRO) On the MLA affiliate dashboard, added pagination to the "Your latest invites" section.
+- Improvement: (PRO) Renamed "Pending Commission" to "Processing Commission" across the plugin for less confusion with the "Pending" status for payouts.
+- Tweak: (PRO) On the "View Affiliate" page, the "Payouts" tab and the "Unpaid" column in the coupons table are now only shown when the payout tracking setting is enabled.
+- Tweak: MLA unpaid commission changes are now added to the activity log.
+- Tweak: Updated the JS method for setting cookies when headers have already been sent, to be more reliable in some cases.
+- Tweak: reCAPTCHA and Turnstile now load on the floating widget registration form if enabled.
+- Tweak: Made some design improvements on mobile to the view affiliate page.
+- Tweak: Added a search field to the "PRO Modules" settings tab.
+- Fix: Fixed an issue where the affiliate registration form would incorrectly show a "coupon already exists" error when submitting with a new coupon code, due to a compatibility issue with newer versions of WooCommerce.
+- Fix: Fixed some issues with per-group fixed commission not showing visually in some cases.
+- Fix: Fixed Turnstile rendering twice in some cases.
+- Fix: Fixed PHP warnings for undefined variables in the mobile dropdown menu section of the affiliate dashboard.
+- Fix: Fixed a bug where referred orders could be counted twice in the coupon all-time statistics.
+- Fix: (PRO) Fixed payout request button not working in some cases when invoice uploads are not enabled, due to a missing JavaScript validation function.
+- Fix: (PRO) Fixed processing commission being added twice for some orders due to an HPOS compatibility issue.
+- Fix: Potential fix for issues with the WP Compress plugin.
+- Fix: (PRO) Fixed a bug where affiliate bonuses with a "Once Per Month" (or other period) trigger could become permanently locked if the reward date meta was missing, preventing the bonus from ever being awarded again.
+- Fix: (PRO) Fixed a bug where removing all affiliate group restrictions from a bonus would not clear the saved restriction, causing affiliates to be silently excluded from earning the bonus.
+
 = Version 7.4.0 - 14th February 2026 =
 - New: Added new "referral welcome popups" functionality.

woo-coupon-usage/trunk/woo-coupon-usage.php

@@ -5 +5 @@
 * Plugin URI: https://couponaffiliates.com
 * Description: The most powerful affiliate plugin for WooCommerce. Track commission, generate referral URLs, assign affiliate coupons, and display detailed stats.
-* Version: 7.4.0
+* Version: 7.5.0
 * Author: Elliot Sowersby, RelyWP
 * Author URI: https://couponaffiliates.com/