Kokowawa

app/Modules/Accounting/Services/AccountingIntegrationService.php

@@ -64,30 +64,49 @@ final class AccountingIntegrationService
         };
 
         // Determine credit account (revenue type)
+        // Uses granular sub-accounts (4110+) with fallback to legacy accounts (4101+)
         $creditAccountCode = match ($type) {
+            'form_fee'            => '4110', // Form Fee Revenue
+            'membership_fee'      => '4111', // Membership Value Revenue
+            'addition_fee'        => '4112', // Dependent Addition Revenue
+            'separation_fee'      => '4120', // Separation Fee Revenue
+            'divorce_fee'         => '4121', // Divorce Fee Revenue
+            'death_fee'           => '4122', // Death Transfer Fee Revenue
+            'waiver_fee'          => '4123', // Waiver Fee Revenue
+            'sports_conversion'   => '4124', // Sports Conversion Revenue
+            'seasonal_fee'        => '4130', // Seasonal Membership Revenue
+            'carnet_replacement'  => '4131', // Carnet Replacement Revenue
+            'annual_subscription' => '4140', // Annual Subscription Revenue
+            'development_fee'     => '4141', // Development Fee Revenue
+            'activity_subscription' => '4150', // Activity Subscription Revenue
+            'down_payment'        => '1103', // Accounts Receivable (reducing AR)
+            'installment'         => '1103', // Accounts Receivable (reducing AR)
+            'fine'                => '4104', // Fine Revenue
+            'inventory_sale'      => '4103', // Sales Revenue
+            default               => '4105', // Service Revenue (catch-all)
+        };
+
+        // Fallback: if the granular account doesn't exist yet, use legacy grouping
+        $creditAccount = self::getAccountByCode($creditAccountCode);
+        if (!$creditAccount) {
+            $fallbackCode = match ($type) {
                 'form_fee', 'membership_fee', 'addition_fee', 'separation_fee',
                 'divorce_fee', 'death_fee', 'waiver_fee', 'sports_conversion',
                 'carnet_replacement', 'seasonal_fee'
-                => '4101', // Membership Revenue
-
+                    => '4101', // Membership Revenue (legacy)
                 'annual_subscription', 'development_fee'
-                => '4102', // Subscription Revenue
-
-            'down_payment', 'installment'
-                => '1103', // Accounts Receivable (reducing AR)
-
-            'fine'
-                => '4104', // Fine Revenue
-
-            'inventory_sale'
-                => '4103', // Sales Revenue
-
-            default
-                => '4105', // Service Revenue
+                    => '4102', // Subscription Revenue (legacy)
+                'activity_subscription'
+                    => '4105', // Service Revenue (legacy)
+                default => null,
             };
+            if ($fallbackCode) {
+                $creditAccountCode = $fallbackCode;
+                $creditAccount = self::getAccountByCode($creditAccountCode);
+            }
+        }
 
         $debitAccount = self::getAccountByCode($debitAccountCode);
-        $creditAccount = self::getAccountByCode($creditAccountCode);
 
         if (!$debitAccount || !$creditAccount) {
             Logger::error("Accounting auto-post failed: account not found", [
@@ -1214,6 +1233,7 @@ final class AccountingIntegrationService
             'seasonal_fee'          => 'رسوم عضوية موسمية',
             'sports_conversion'     => 'رسوم تحويل رياضي',
             'inventory_sale'        => 'مبيعات مخزون',
+            'activity_subscription' => 'اشتراك نشاط',
             default                 => $type,
         };
     }