refactor

app/Enums/Accounting/AdjustmentCategory.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum AdjustmentCategory: string implements HasLabel
+{
+    case Tax = 'tax';
+    case Discount = 'discount';
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+}

app/Enums/Setting/DiscountComputation.php → app/Enums/Accounting/AdjustmentComputation.php

@@ -1,16 +1,14 @@
 <?php
 
-namespace App\Enums\Setting;
+namespace App\Enums\Accounting;
 
 use Filament\Support\Contracts\HasLabel;
 
-enum DiscountComputation: string implements HasLabel
+enum AdjustmentComputation: string implements HasLabel
 {
     case Percentage = 'percentage';
     case Fixed = 'fixed';
 
-    public const DEFAULT = self::Percentage->value;
-
     public function getLabel(): ?string
     {
         return translate($this->name);

app/Enums/Setting/TaxScope.php → app/Enums/Accounting/AdjustmentScope.php

@@ -1,10 +1,8 @@
 <?php
 
-namespace App\Enums\Setting;
+namespace App\Enums\Accounting;
 
-use Filament\Support\Contracts\HasLabel;
-
-enum TaxScope: string implements HasLabel
+enum AdjustmentScope: string
 {
     case Product = 'product';
     case Service = 'service';

app/Enums/Setting/TaxType.php → app/Enums/Accounting/AdjustmentType.php

@@ -1,18 +1,15 @@
 <?php
 
-namespace App\Enums\Setting;
+namespace App\Enums\Accounting;
 
 use Filament\Support\Contracts\HasColor;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
-enum TaxType: string implements HasColor, HasIcon, HasLabel
+enum AdjustmentType: string implements HasColor, HasIcon, HasLabel
 {
     case Sales = 'sales';
     case Purchase = 'purchase';
-    case None = 'none';
-
-    public const DEFAULT = self::Sales->value;
 
     public function getLabel(): ?string
     {
@@ -24,7 +21,6 @@ enum TaxType: string implements HasColor, HasIcon, HasLabel
         return match ($this) {
             self::Sales => 'success',
             self::Purchase => 'warning',
-            self::None => 'gray',
         };
     }
 
@@ -33,7 +29,6 @@ enum TaxType: string implements HasColor, HasIcon, HasLabel
         return match ($this) {
             self::Sales => 'heroicon-o-currency-dollar',
             self::Purchase => 'heroicon-o-shopping-bag',
-            self::None => 'heroicon-o-x-circle',
         };
     }
 }

app/Enums/Setting/DiscountScope.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Enums\Setting;
-
-use Filament\Support\Contracts\HasLabel;
-
-enum DiscountScope: string implements HasLabel
-{
-    case Product = 'product';
-    case Service = 'service';
-
-    public function getLabel(): ?string
-    {
-        return translate($this->name);
-    }
-}

app/Enums/Setting/DiscountType.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Enums\Setting;
-
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-use Filament\Support\Contracts\HasLabel;
-
-enum DiscountType: string implements HasColor, HasIcon, HasLabel
-{
-    case Sales = 'sales';
-    case Purchase = 'purchase';
-    case None = 'none';
-
-    public const DEFAULT = self::Sales->value;
-
-    public function getLabel(): ?string
-    {
-        return translate($this->name);
-    }
-
-    public function getColor(): string | array | null
-    {
-        return match ($this) {
-            self::Sales => 'success',
-            self::Purchase => 'warning',
-            self::None => 'gray',
-        };
-    }
-
-    public function getIcon(): ?string
-    {
-        return match ($this) {
-            self::Sales => 'heroicon-o-currency-dollar',
-            self::Purchase => 'heroicon-o-shopping-bag',
-            self::None => 'heroicon-o-x-circle',
-        };
-    }
-}

app/Enums/Setting/TaxComputation.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Enums\Setting;
-
-use Filament\Support\Contracts\HasLabel;
-
-enum TaxComputation: string implements HasLabel
-{
-    case Fixed = 'fixed';
-    case Percentage = 'percentage';
-    case Compound = 'compound';
-
-    public const DEFAULT = self::Percentage->value;
-
-    public function getLabel(): ?string
-    {
-        return translate($this->name);
-    }
-}

app/Filament/Company/Clusters/Settings/Pages/CompanyDefault.php

@@ -108,7 +108,7 @@ class CompanyDefault extends Page
         return $form
             ->schema([
                 $this->getGeneralSection(),
-                $this->getModifiersSection(),
+                // $this->getModifiersSection(),
             ])
             ->model($this->record)
             ->statePath('data')

app/Listeners/SyncAssociatedModels.php

@@ -40,10 +40,6 @@ class SyncAssociatedModels
 
         $keyToMethodMap = [
             'bank_account_id' => 'bankAccount',
-            'sales_tax_id' => 'salesTax',
-            'purchase_tax_id' => 'purchaseTax',
-            'sales_discount_id' => 'salesDiscount',
-            'purchase_discount_id' => 'purchaseDiscount',
         ];
 
         foreach ($diff as $key => $value) {

app/Listeners/SyncWithCompanyDefaults.php

@@ -2,8 +2,6 @@
 
 namespace App\Listeners;
 
-use App\Enums\Setting\DiscountType;
-use App\Enums\Setting\TaxType;
 use App\Events\CompanyDefaultEvent;
 use App\Models\Setting\CompanyDefault;
 use Illuminate\Support\Facades\DB;
@@ -48,15 +46,12 @@ class SyncWithCompanyDefaults
     private function updateCompanyDefaults($model, $companyId): void
     {
         $modelName = class_basename($model);
-        $type = $model->getAttribute('type');
 
         $default = CompanyDefault::firstOrNew([
             'company_id' => $companyId,
         ]);
 
         match ($modelName) {
-            'Discount' => $this->handleDiscount($default, $type, $model->getKey()),
-            'Tax' => $this->handleTax($default, $type, $model->getKey()),
             'Currency' => $default->currency_code = $model->getAttribute('code'),
             'BankAccount' => $default->bank_account_id = $model->getKey(),
             default => null,
@@ -64,28 +59,4 @@ class SyncWithCompanyDefaults
 
         $default->save();
     }
-
-    private function handleDiscount($default, $type, $key): void
-    {
-        if (! in_array($type, [DiscountType::Sales, DiscountType::Purchase], true)) {
-            return;
-        }
-
-        match (true) {
-            $type === DiscountType::Sales => $default->sales_discount_id = $key,
-            $type === DiscountType::Purchase => $default->purchase_discount_id = $key,
-        };
-    }
-
-    private function handleTax($default, $type, $key): void
-    {
-        if (! in_array($type, [TaxType::Sales, TaxType::Purchase], true)) {
-            return;
-        }
-
-        match (true) {
-            $type === TaxType::Sales => $default->sales_tax_id = $key,
-            $type === TaxType::Purchase => $default->purchase_tax_id = $key,
-        };
-    }
 }

app/Models/Accounting/Account.php

@@ -79,6 +79,11 @@ class Account extends Model
         return $this->hasOne(BankAccount::class, 'account_id');
     }
 
+    public function adjustment(): HasOne
+    {
+        return $this->hasOne(Adjustment::class, 'account_id');
+    }
+
     public function getLastTransactionDate(): ?string
     {
         $lastJournalEntryTransaction = $this->journalEntries()

app/Models/Accounting/Adjustment.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Models\Accounting;
+
+use App\Casts\RateCast;
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Concerns\HasDefault;
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentType;
+use Database\Factories\Accounting\AdjustmentFactory;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+
+class Adjustment extends Model
+{
+    use Blamable;
+    use CompanyOwned;
+    use HasDefault;
+    use HasFactory;
+
+    protected $table = 'adjustments';
+
+    protected $fillable = [
+        'company_id',
+        'account_id',
+        'category',
+        'type',
+        'rate',
+        'computation',
+        'scope',
+        'start_date',
+        'end_date',
+        'enabled',
+        'created_by',
+        'updated_by',
+    ];
+
+    protected $casts = [
+        'category' => AdjustmentCategory::class,
+        'type' => AdjustmentType::class,
+        'rate' => RateCast::class,
+        'computation' => AdjustmentComputation::class,
+        'scope' => AdjustmentScope::class,
+        'start_date' => 'datetime',
+        'end_date' => 'datetime',
+        'enabled' => 'boolean',
+    ];
+
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Account::class, 'account_id');
+    }
+
+    public function adjustmentables(): MorphTo
+    {
+        return $this->morphTo();
+    }
+
+    protected static function newFactory(): Factory
+    {
+        return AdjustmentFactory::new();
+    }
+}

app/Models/Document.php → app/Models/Accounting/Document.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Accounting;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Document extends Model
 {
-    /** @use HasFactory<\Database\Factories\DocumentFactory> */
+    /** @use HasFactory<\Database\Factories\Accounting\DocumentFactory> */
     use HasFactory;
 }

app/Models/DocumentLineItem.php → app/Models/Accounting/DocumentLineItem.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Accounting;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class DocumentLineItem extends Model
 {
-    /** @use HasFactory<\Database\Factories\DocumentLineItemFactory> */
+    /** @use HasFactory<\Database\Factories\Accounting\DocumentLineItemFactory> */
     use HasFactory;
 }

app/Models/Payment.php → app/Models/Banking/Payment.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Banking;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Payment extends Model
 {
-    /** @use HasFactory<\Database\Factories\PaymentFactory> */
+    /** @use HasFactory<\Database\Factories\Banking\PaymentFactory> */
     use HasFactory;
 }

app/Models/Client.php → app/Models/Common/Client.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Common;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Client extends Model
 {
-    /** @use HasFactory<\Database\Factories\ClientFactory> */
+    /** @use HasFactory<\Database\Factories\Common\ClientFactory> */
     use HasFactory;
 }

app/Models/Offering.php → app/Models/Common/Offering.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Common;
 
 use App\Concerns\CompanyOwned;
 use App\Models\Accounting\Account;

app/Models/Vendor.php → app/Models/Common/Vendor.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models;
+namespace App\Models\Common;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Vendor extends Model
 {
-    /** @use HasFactory<\Database\Factories\VendorFactory> */
+    /** @use HasFactory<\Database\Factories\Common\VendorFactory> */
     use HasFactory;
 }

app/Models/Company.php

@@ -12,10 +12,8 @@ use App\Models\Setting\Appearance;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\CompanyProfile;
 use App\Models\Setting\Currency;
-use App\Models\Setting\Discount;
 use App\Models\Setting\DocumentDefault;
 use App\Models\Setting\Localization;
-use App\Models\Setting\Tax;
 use Filament\Models\Contracts\HasAvatar;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -74,6 +72,11 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasMany(Accounting\Account::class, 'company_id');
     }
 
+    public function adjustments(): HasMany
+    {
+        return $this->hasMany(Accounting\Adjustment::class, 'company_id');
+    }
+
     public function bankAccounts(): HasMany
     {
         return $this->hasMany(BankAccount::class, 'company_id');
@@ -122,11 +125,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasMany(Department::class, 'company_id');
     }
 
-    public function discounts(): HasMany
-    {
-        return $this->hasMany(Discount::class, 'company_id');
-    }
-
     public function locale(): HasOne
     {
         return $this->hasOne(Localization::class, 'company_id');
@@ -137,11 +135,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasOne(CompanyProfile::class, 'company_id');
     }
 
-    public function taxes(): HasMany
-    {
-        return $this->hasMany(Tax::class, 'company_id');
-    }
-
     public function transactions(): HasMany
     {
         return $this->hasMany(Accounting\Transaction::class, 'company_id');

app/Models/Setting/CompanyDefault.php

@@ -4,8 +4,6 @@ namespace App\Models\Setting;
 
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
-use App\Enums\Setting\DiscountType;
-use App\Enums\Setting\TaxType;
 use App\Models\Banking\BankAccount;
 use Database\Factories\Setting\CompanyDefaultFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -25,10 +23,6 @@ class CompanyDefault extends Model
         'company_id',
         'bank_account_id',
         'currency_code',
-        'sales_tax_id',
-        'purchase_tax_id',
-        'sales_discount_id',
-        'purchase_discount_id',
         'created_by',
         'updated_by',
     ];
@@ -43,30 +37,6 @@ class CompanyDefault extends Model
         return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public function salesTax(): BelongsTo
-    {
-        return $this->belongsTo(Tax::class, 'sales_tax_id', 'id')
-            ->where('type', TaxType::Sales);
-    }
-
-    public function purchaseTax(): BelongsTo
-    {
-        return $this->belongsTo(Tax::class, 'purchase_tax_id', 'id')
-            ->where('type', TaxType::Purchase);
-    }
-
-    public function salesDiscount(): BelongsTo
-    {
-        return $this->belongsTo(Discount::class, 'sales_discount_id', 'id')
-            ->where('type', DiscountType::Sales);
-    }
-
-    public function purchaseDiscount(): BelongsTo
-    {
-        return $this->belongsTo(Discount::class, 'purchase_discount_id', 'id')
-            ->where('type', DiscountType::Purchase);
-    }
-
     protected static function newFactory(): Factory
     {
         return CompanyDefaultFactory::new();

app/Models/Setting/Discount.php

@@ -10,10 +10,12 @@ use App\Concerns\SyncsWithCompanyDefaults;
 use App\Enums\Setting\DiscountComputation;
 use App\Enums\Setting\DiscountScope;
 use App\Enums\Setting\DiscountType;
+use App\Models\Accounting\Account;
 use Database\Factories\Setting\DiscountFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
@@ -29,8 +31,7 @@ class Discount extends Model
 
     protected $fillable = [
         'company_id',
-        'name',
-        'description',
+        'account_id',
         'rate',
         'computation',
         'type',
@@ -54,6 +55,11 @@ class Discount extends Model
 
     protected ?string $evaluatedDefault = 'type';
 
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Account::class, 'account_id');
+    }
+
     public function defaultSalesDiscount(): HasOne
     {
         return $this->hasOne(CompanyDefault::class, 'sales_discount_id');

app/Models/Setting/Tax.php

@@ -10,10 +10,12 @@ use App\Concerns\SyncsWithCompanyDefaults;
 use App\Enums\Setting\TaxComputation;
 use App\Enums\Setting\TaxScope;
 use App\Enums\Setting\TaxType;
+use App\Models\Accounting\Account;
 use Database\Factories\Setting\TaxFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
@@ -29,8 +31,7 @@ class Tax extends Model
 
     protected $fillable = [
         'company_id',
-        'name',
-        'description',
+        'account_id',
         'rate',
         'computation',
         'type',
@@ -50,6 +51,11 @@ class Tax extends Model
 
     protected ?string $evaluatedDefault = 'type';
 
+    public function account(): BelongsTo
+    {
+        return $this->belongsTo(Account::class, 'account_id');
+    }
+
     public function defaultSalesTax(): HasOne
     {
         return $this->hasOne(CompanyDefault::class, 'sales_tax_id');

app/Services/ChartOfAccountsService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Enums\Accounting\AccountType;
 use App\Enums\Banking\BankAccountType;
 use App\Models\Accounting\AccountSubtype;
+use App\Models\Accounting\Adjustment;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
 use App\Utilities\Currency\CurrencyAccessor;
@@ -77,6 +78,14 @@ class ChartOfAccountsService
                     $bankAccount->account()->associate($account);
                     $bankAccount->saveQuietly();
                 }
+
+                if (isset($subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type'])) {
+                    $adjustment = $this->createAdjustmentForAccount($company, $subtypeConfig['adjustment_category'], $subtypeConfig['adjustment_type']);
+
+                    // Associate the Adjustment with the Account
+                    $adjustment->account()->associate($account);
+                    $adjustment->saveQuietly();
+                }
             }
         }
     }
@@ -92,4 +101,30 @@ class ChartOfAccountsService
             'updated_by' => $company->owner->id,
         ]);
     }
+
+    private function createAdjustmentForAccount(Company $company, string $category, string $type): Adjustment
+    {
+        $noDefaultAdjustmentType = $company->adjustments()->where('category', $category)
+            ->where('type', $type)
+            ->where('enabled', true)
+            ->doesntExist();
+
+        $defaultRate = match ([$category, $type]) {
+            ['tax', 'sales'] => 8,          // Default 8% for Sales Tax
+            ['tax', 'purchase'] => 8,       // Default 8% for Purchase Tax
+            ['discount', 'sales'] => 5,     // Default 5% for Sales Discount
+            ['discount', 'purchase'] => 5,  // Default 5% for Purchase Discount
+            default => 0,                   // Default to 0 if unspecified
+        };
+
+        return $company->adjustments()->createQuietly([
+            'category' => $category,
+            'type' => $type,
+            'rate' => $defaultRate,
+            'computation' => 'percentage',
+            'enabled' => $noDefaultAdjustmentType,
+            'created_by' => $company->owner->id,
+            'updated_by' => $company->owner->id,
+        ]);
+    }
 }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.326.0",
+            "version": "3.327.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "5420284de9aad84e375fa8012cefd834bebfd623"
+                "reference": "ba4a7ac2544de61b33f693c461f8b09c0353298f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/5420284de9aad84e375fa8012cefd834bebfd623",
-                "reference": "5420284de9aad84e375fa8012cefd834bebfd623",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ba4a7ac2544de61b33f693c461f8b09c0353298f",
+                "reference": "ba4a7ac2544de61b33f693c461f8b09c0353298f",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.326.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.327.0"
             },
-            "time": "2024-11-13T19:07:44+00:00"
+            "time": "2024-11-14T19:06:19+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",

config/chart-of-accounts.php

@@ -118,9 +118,17 @@ return [
                 'multi_currency' => false,
                 'base_code' => '2100',
                 'inverse_cash_flow' => false,
+            ],
+            'Sales Taxes' => [
+                'description' => 'The amount of money owed to the government for sales tax collected from customers.',
+                'multi_currency' => false,
+                'base_code' => '2150',
+                'inverse_cash_flow' => false,
+                'adjustment_category' => 'tax',
+                'adjustment_type' => 'sales',
                 'accounts' => [
-                    'Sales Tax Payable' => [
-                        'description' => 'The amount of money owed to the government for sales tax collected from customers.',
+                    'Sales Tax' => [
+                        'description' => null,
                     ],
                 ],
             ],
@@ -271,8 +279,18 @@ return [
                     'Sales Returns and Allowances' => [
                         'description' => 'The amount of money returned to customers or deducted from sales due to returned goods or allowances granted.',
                     ],
-                    'Sales Discounts' => [
-                        'description' => 'The amount of money deducted from sales due to discounts offered to customers for early payment or other reasons.',
+                ],
+            ],
+            'Sales Discounts' => [
+                'description' => 'The amount of money deducted from sales due to discounts offered to customers for early payment or other reasons.',
+                'multi_currency' => false,
+                'base_code' => '4925',
+                'inverse_cash_flow' => false,
+                'adjustment_category' => 'discount',
+                'adjustment_type' => 'sales',
+                'accounts' => [
+                    'Sales Discount' => [
+                        'description' => null,
                     ],
                 ],
             ],
@@ -412,6 +430,19 @@ return [
                 'base_code' => '5600',
                 'inverse_cash_flow' => true,
             ],
+            'Purchase Taxes' => [
+                'description' => 'Taxes paid on purchases of goods or services, such as value-added tax (VAT), goods and services tax (GST), or customs duties.',
+                'multi_currency' => false,
+                'base_code' => '5650',
+                'inverse_cash_flow' => true,
+                'adjustment_category' => 'tax',
+                'adjustment_type' => 'purchase',
+                'accounts' => [
+                    'Purchase Tax' => [
+                        'description' => null,
+                    ],
+                ],
+            ],
             'Other Non-Operating Expense' => [
                 'description' => 'Expenses not related to primary business activities, like losses from asset disposals, legal settlements, restructuring costs, or foreign exchange losses.',
                 'multi_currency' => false,
@@ -434,8 +465,18 @@ return [
                     'Purchase Returns and Allowances' => [
                         'description' => 'The amount of money returned to suppliers or deducted from purchases due to returned goods or allowances granted.',
                     ],
-                    'Purchase Discounts' => [
-                        'description' => 'The amount of money deducted from purchases due to discounts offered by suppliers for early payment or other reasons.',
+                ],
+            ],
+            'Purchase Discounts' => [
+                'description' => 'The amount of money deducted from purchases due to discounts offered by suppliers for early payment or other reasons.',
+                'multi_currency' => false,
+                'base_code' => '5925',
+                'inverse_cash_flow' => true,
+                'adjustment_category' => 'discount',
+                'adjustment_type' => 'purchase',
+                'accounts' => [
+                    'Purchase Discount' => [
+                        'description' => null,
                     ],
                 ],
             ],

database/factories/Accounting/AccountFactory.php

@@ -6,6 +6,7 @@ use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\Currency;
+use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -74,4 +75,60 @@ class AccountFactory extends Factory
             ]);
         });
     }
+
+    public function forSalesTax(?string $name = null, ?string $description = null): static
+    {
+        $accountSubtype = AccountSubtype::where('name', 'Sales Taxes')->first();
+
+        return $this->state([
+            'name' => $name,
+            'description' => $description,
+            'category' => $accountSubtype->category,
+            'type' => $accountSubtype->type,
+            'subtype_id' => $accountSubtype->id,
+            'code' => AccountCode::generate($accountSubtype),
+        ]);
+    }
+
+    public function forPurchaseTax(?string $name = null, ?string $description = null): static
+    {
+        $accountSubtype = AccountSubtype::where('name', 'Purchase Taxes')->first();
+
+        return $this->state([
+            'name' => $name,
+            'description' => $description,
+            'category' => $accountSubtype->category,
+            'type' => $accountSubtype->type,
+            'subtype_id' => $accountSubtype->id,
+            'code' => AccountCode::generate($accountSubtype),
+        ]);
+    }
+
+    public function forSalesDiscount(?string $name = null, ?string $description = null): static
+    {
+        $accountSubtype = AccountSubtype::where('name', 'Sales Discounts')->first();
+
+        return $this->state([
+            'name' => $name,
+            'description' => $description,
+            'category' => $accountSubtype->category,
+            'type' => $accountSubtype->type,
+            'subtype_id' => $accountSubtype->id,
+            'code' => AccountCode::generate($accountSubtype),
+        ]);
+    }
+
+    public function forPurchaseDiscount(?string $name = null, ?string $description = null): static
+    {
+        $accountSubtype = AccountSubtype::where('name', 'Purchase Discounts')->first();
+
+        return $this->state([
+            'name' => $name,
+            'description' => $description,
+            'category' => $accountSubtype->category,
+            'type' => $accountSubtype->type,
+            'subtype_id' => $accountSubtype->id,
+            'code' => AccountCode::generate($accountSubtype),
+        ]);
+    }
 }

database/factories/Accounting/AdjustmentFactory.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace Database\Factories\Accounting;
+
+use App\Enums\Accounting\AdjustmentCategory;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\AdjustmentScope;
+use App\Enums\Accounting\AdjustmentType;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\Adjustment;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
+
+/**
+ * @extends Factory<Adjustment>
+ */
+class AdjustmentFactory extends Factory
+{
+    /**
+     * The name of the factory's corresponding model.
+     */
+    protected $model = Adjustment::class;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        $startDate = $this->faker->dateTimeBetween('now', '+1 year');
+        $endDate = $this->faker->dateTimeBetween($startDate, Carbon::parse($startDate)->addYear());
+        $computation = $this->faker->randomElement(AdjustmentComputation::class);
+
+        $rate = $computation === AdjustmentComputation::Fixed
+            ? $this->faker->numberBetween(5, 100) * 100 // $5 - $100 for fixed amounts
+            : $this->faker->numberBetween(3, 25) * 10000; // 3% - 25% for percentages
+
+        return [
+            'rate' => $rate,
+            'computation' => $computation,
+            'category' => $this->faker->randomElement(AdjustmentCategory::class),
+            'type' => $this->faker->randomElement(AdjustmentType::class),
+            'scope' => $this->faker->randomElement(AdjustmentScope::class),
+            'start_date' => $startDate,
+            'end_date' => $endDate,
+            'enabled' => false,
+        ];
+    }
+
+    public function configure(): static
+    {
+        return $this->afterCreating(function (Adjustment $adjustment) {
+            if ($adjustment->account_id === null) {
+                $account = Account::factory()->create();
+                $adjustment->account()->associate($account);
+            }
+        });
+    }
+
+    /**
+     * Define a sales tax adjustment.
+     */
+    public function salesTax(?string $name = null, ?string $description = null): self
+    {
+        $name = $name ?? 'Sales Tax';
+        $account = Account::factory()->forSalesTax($name, $description)->create();
+
+        return $this->state([
+            'category' => AdjustmentCategory::Tax,
+            'type' => AdjustmentType::Sales,
+            'account_id' => $account->id,
+        ]);
+    }
+
+    /**
+     * Define a purchase tax adjustment.
+     */
+    public function purchaseTax(?string $name = null, ?string $description = null): self
+    {
+        $name = $name ?? 'Purchase Tax';
+        $account = Account::factory()->forPurchaseTax($name, $description)->create();
+
+        return $this->state([
+            'category' => AdjustmentCategory::Tax,
+            'type' => AdjustmentType::Purchase,
+            'account_id' => $account->id,
+        ]);
+    }
+
+    /**
+     * Define a sales discount adjustment.
+     */
+    public function salesDiscount(?string $name = null, ?string $description = null): self
+    {
+        $name = $name ?? 'Sales Discount';
+        $account = Account::factory()->forSalesDiscount($name, $description)->create();
+
+        return $this->state([
+            'category' => AdjustmentCategory::Discount,
+            'type' => AdjustmentType::Sales,
+            'account_id' => $account->id,
+        ]);
+    }
+
+    /**
+     * Define a purchase discount adjustment.
+     */
+    public function purchaseDiscount(?string $name = null, ?string $description = null): self
+    {
+        $name = $name ?? 'Purchase Discount';
+        $account = Account::factory()->forPurchaseDiscount($name, $description)->create();
+
+        return $this->state([
+            'category' => AdjustmentCategory::Discount,
+            'type' => AdjustmentType::Purchase,
+            'account_id' => $account->id,
+        ]);
+    }
+}

database/factories/DocumentFactory.php → database/factories/Accounting/DocumentFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Accounting;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Document>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\Document>
  */
 class DocumentFactory extends Factory
 {

database/factories/DocumentLineItemFactory.php → database/factories/Accounting/DocumentLineItemFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Accounting;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\DocumentLineItem>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Accounting\DocumentLineItem>
  */
 class DocumentLineItemFactory extends Factory
 {

database/factories/Accounting/TransactionFactory.php

@@ -5,6 +5,7 @@ namespace Database\Factories\Accounting;
 use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\AccountSubtype;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
@@ -69,8 +70,13 @@ class TransactionFactory extends Factory
 
             $accountIdForBankAccount = $bankAccount->account->id;
 
+            $excludedSubtypes = AccountSubtype::where('company_id', $company->id)
+                ->whereIn('name', ['Sales Taxes', 'Purchase Taxes', 'Sales Discounts', 'Purchase Discounts'])
+                ->pluck('id');
+
             $account = Account::whereIn('type', $associatedAccountTypes)
                 ->where('company_id', $company->id)
+                ->whereNotIn('subtype_id', $excludedSubtypes)
                 ->whereKeyNot($accountIdForBankAccount)
                 ->inRandomOrder()
                 ->first();

database/factories/PaymentFactory.php → database/factories/Banking/PaymentFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Banking;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Payment>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Banking\Payment>
  */
 class PaymentFactory extends Factory
 {

database/factories/ClientFactory.php → database/factories/Common/ClientFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Common;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Client>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Common\Client>
  */
 class ClientFactory extends Factory
 {

database/factories/OfferingFactory.php → database/factories/Common/OfferingFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Common;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Offering>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Common\Offering>
  */
 class OfferingFactory extends Factory
 {

database/factories/VendorFactory.php → database/factories/Common/VendorFactory.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Database\Factories;
+namespace Database\Factories\Common;
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Vendor>
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Common\Vendor>
  */
 class VendorFactory extends Factory
 {

database/factories/Setting/CompanyDefaultFactory.php

@@ -7,10 +7,8 @@ use App\Models\Company;
 use App\Models\Setting\Appearance;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\Currency;
-use App\Models\Setting\Discount;
 use App\Models\Setting\DocumentDefault;
 use App\Models\Setting\Localization;
-use App\Models\Setting\Tax;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -46,10 +44,6 @@ class CompanyDefaultFactory extends Factory
         }
 
         $currency = $this->createCurrency($company, $user, $currencyCode);
-        $salesTax = $this->createSalesTax($company, $user);
-        $purchaseTax = $this->createPurchaseTax($company, $user);
-        $salesDiscount = $this->createSalesDiscount($company, $user);
-        $purchaseDiscount = $this->createPurchaseDiscount($company, $user);
         $this->createAppearance($company, $user);
         $this->createDocumentDefaults($company, $user);
         $this->createLocalization($company, $user, $countryCode, $language);
@@ -57,10 +51,6 @@ class CompanyDefaultFactory extends Factory
         $companyDefaults = [
             'company_id' => $company->id,
             'currency_code' => $currency->code,
-            'sales_tax_id' => $salesTax->id,
-            'purchase_tax_id' => $purchaseTax->id,
-            'sales_discount_id' => $salesDiscount->id,
-            'purchase_discount_id' => $purchaseDiscount->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ];
@@ -78,46 +68,6 @@ class CompanyDefaultFactory extends Factory
         ]);
     }
 
-    private function createSalesTax(Company $company, User $user): Tax
-    {
-        return Tax::factory()->salesTax()->createQuietly([
-            'company_id' => $company->id,
-            'enabled' => true,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createPurchaseTax(Company $company, User $user): Tax
-    {
-        return Tax::factory()->purchaseTax()->createQuietly([
-            'company_id' => $company->id,
-            'enabled' => true,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createSalesDiscount(Company $company, User $user): Discount
-    {
-        return Discount::factory()->salesDiscount()->createQuietly([
-            'company_id' => $company->id,
-            'enabled' => true,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
-    private function createPurchaseDiscount(Company $company, User $user): Discount
-    {
-        return Discount::factory()->purchaseDiscount()->createQuietly([
-            'company_id' => $company->id,
-            'enabled' => true,
-            'created_by' => $user->id,
-            'updated_by' => $user->id,
-        ]);
-    }
-
     private function createAppearance(Company $company, User $user): void
     {
         Appearance::factory()->createQuietly([

database/factories/Setting/DiscountFactory.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace Database\Factories\Setting;
-
-use App\Enums\Setting\DiscountComputation;
-use App\Enums\Setting\DiscountScope;
-use App\Enums\Setting\DiscountType;
-use App\Models\Setting\Discount;
-use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Carbon;
-
-/**
- * @extends Factory<Discount>
- */
-class DiscountFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     */
-    protected $model = Discount::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        $startDate = $this->faker->dateTimeBetween('now', '+1 year');
-        $endDate = $this->faker->dateTimeBetween($startDate, Carbon::parse($startDate)->addYear());
-
-        $computation = $this->faker->randomElement(DiscountComputation::class);
-
-        if ($computation === DiscountComputation::Fixed) {
-            $rate = $this->faker->numberBetween(5, 100) * 100; // $5 - $100
-        } else {
-            $rate = $this->faker->numberBetween(3, 50) * 10000; // 3% - 50%
-        }
-
-        return [
-            'name' => $this->faker->unique()->word,
-            'description' => $this->faker->sentence,
-            'rate' => $rate,
-            'computation' => $computation,
-            'type' => $this->faker->randomElement(DiscountType::class),
-            'scope' => $this->faker->randomElement(DiscountScope::class),
-            'start_date' => $startDate,
-            'end_date' => $endDate,
-            'enabled' => false,
-        ];
-    }
-
-    public function salesDiscount(): self
-    {
-        return $this->state([
-            'name' => 'Summer Sale',
-            'type' => DiscountType::Sales,
-        ]);
-    }
-
-    public function purchaseDiscount(): self
-    {
-        return $this->state([
-            'name' => 'Bulk Purchase',
-            'type' => DiscountType::Purchase,
-        ]);
-    }
-}

database/factories/Setting/TaxFactory.php

@@ -1,62 +0,0 @@
-<?php
-
-namespace Database\Factories\Setting;
-
-use App\Enums\Setting\TaxComputation;
-use App\Enums\Setting\TaxScope;
-use App\Enums\Setting\TaxType;
-use App\Models\Setting\Tax;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Tax>
- */
-class TaxFactory extends Factory
-{
-    /**
-     * The name of the factory's corresponding model.
-     */
-    protected $model = Tax::class;
-
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        $computation = $this->faker->randomElement(TaxComputation::class);
-
-        if ($computation === TaxComputation::Fixed) {
-            $rate = $this->faker->biasedNumberBetween(1, 10) * 100; // $1 - $10
-        } else {
-            $rate = $this->faker->biasedNumberBetween(3, 25) * 10000; // 3% - 25%
-        }
-
-        return [
-            'name' => $this->faker->unique()->word,
-            'description' => $this->faker->sentence,
-            'rate' => $rate,
-            'computation' => $computation,
-            'type' => $this->faker->randomElement(TaxType::class),
-            'scope' => $this->faker->randomElement(TaxScope::class),
-            'enabled' => false,
-        ];
-    }
-
-    public function salesTax(): self
-    {
-        return $this->state([
-            'name' => 'State Sales Tax',
-            'type' => TaxType::Sales,
-        ]);
-    }
-
-    public function purchaseTax(): self
-    {
-        return $this->state([
-            'name' => 'State Purchase Tax',
-            'type' => TaxType::Purchase,
-        ]);
-    }
-}

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -1,6 +1,5 @@
 <?php
 
-use App\Enums\Banking\BankAccountType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -61,12 +60,14 @@ return new class extends Migration
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->foreignId('account_id')->nullable()->constrained('accounts')->nullOnDelete();
             $table->foreignId('institution_id')->nullable()->constrained('institutions')->nullOnDelete();
-            $table->string('type')->default(BankAccountType::DEFAULT);
+            $table->string('type')->default('depository');
             $table->string('number', 20)->nullable();
             $table->boolean('enabled')->default(true);
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
+
+            $table->unique(['company_id', 'account_id']);
         });
 
         Schema::create('connected_bank_accounts', function (Blueprint $table) {
@@ -82,7 +83,7 @@ return new class extends Migration
             $table->double('current_balance')->default(0);
             $table->string('name');
             $table->string('mask');
-            $table->string('type')->default(BankAccountType::DEFAULT);
+            $table->string('type')->default('depository');
             $table->string('subtype')->nullable();
             $table->boolean('import_transactions')->default(false);
             $table->timestamp('last_imported_at')->nullable();

database/migrations/2023_09_08_011045_create_taxes_table.php

@@ -1,41 +0,0 @@
-<?php
-
-use App\Enums\Setting\TaxComputation;
-use App\Enums\Setting\TaxType;
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('taxes', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->string('name')->index();
-            $table->string('description')->nullable();
-            $table->integer('rate')->default(0);
-            $table->string('computation')->default(TaxComputation::DEFAULT);
-            $table->string('type')->default(TaxType::DEFAULT);
-            $table->string('scope')->nullable();
-            $table->boolean('enabled')->default(true);
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-
-            $table->unique(['company_id', 'name', 'type']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('taxes');
-    }
-};

database/migrations/2023_09_08_040159_create_company_defaults_table.php

@@ -16,10 +16,6 @@ return new class extends Migration
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->foreignId('bank_account_id')->nullable()->constrained('bank_accounts')->nullOnDelete();
             $table->string('currency_code')->nullable();
-            $table->foreignId('sales_tax_id')->nullable()->constrained('taxes')->nullOnDelete();
-            $table->foreignId('purchase_tax_id')->nullable()->constrained('taxes')->nullOnDelete();
-            $table->foreignId('sales_discount_id')->nullable()->constrained('discounts')->nullOnDelete();
-            $table->foreignId('purchase_discount_id')->nullable()->constrained('discounts')->nullOnDelete();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();

database/migrations/2023_09_12_014413_create_appearances_table.php

@@ -1,9 +1,5 @@
 <?php
 
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PrimaryColor;
-use App\Enums\Setting\RecordsPerPage;
-use App\Enums\Setting\TableSortDirection;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -18,10 +14,10 @@ return new class extends Migration
         Schema::create('appearances', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->onDelete('cascade');
-            $table->string('primary_color')->default(PrimaryColor::DEFAULT);
-            $table->string('font')->default(Font::DEFAULT);
-            $table->string('table_sort_direction')->default(TableSortDirection::DEFAULT);
-            $table->unsignedTinyInteger('records_per_page')->default(RecordsPerPage::DEFAULT);
+            $table->string('primary_color')->default('indigo');
+            $table->string('font')->default('inter');
+            $table->string('table_sort_direction')->default('asc');
+            $table->unsignedTinyInteger('records_per_page')->default(10);
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();

database/migrations/2023_09_12_032057_create_document_defaults_table.php

@@ -1,8 +1,5 @@
 <?php
 
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PaymentTerms;
-use App\Enums\Setting\Template;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -23,14 +20,14 @@ return new class extends Migration
             $table->string('number_prefix')->nullable();
             $table->unsignedTinyInteger('number_digits')->default(5);
             $table->unsignedBigInteger('number_next')->default(1);
-            $table->string('payment_terms')->default(PaymentTerms::DEFAULT);
+            $table->string('payment_terms')->default('due_upon_receipt');
             $table->string('header')->nullable();
             $table->string('subheader')->nullable();
             $table->text('terms')->nullable();
             $table->text('footer')->nullable();
             $table->string('accent_color')->default('#4F46E5');
-            $table->string('font')->default(Font::DEFAULT);
-            $table->string('template')->default(Template::DEFAULT);
+            $table->string('font')->default('inter');
+            $table->string('template')->default('default');
             $table->json('item_name')->nullable();
             $table->json('unit_name')->nullable();
             $table->json('price_name')->nullable();

database/migrations/2023_10_11_210415_create_localizations_table.php

@@ -1,9 +1,5 @@
 <?php
 
-use App\Enums\Setting\DateFormat;
-use App\Enums\Setting\NumberFormat;
-use App\Enums\Setting\TimeFormat;
-use App\Enums\Setting\WeekStart;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -20,12 +16,12 @@ return new class extends Migration
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->string('language')->default('en');
             $table->string('timezone')->nullable();
-            $table->string('date_format')->default(DateFormat::DEFAULT);
-            $table->string('time_format')->default(TimeFormat::DEFAULT);
+            $table->string('date_format')->default('M j, Y');
+            $table->string('time_format')->default('g:i A');
             $table->unsignedTinyInteger('fiscal_year_end_month')->default(12);
             $table->unsignedTinyInteger('fiscal_year_end_day')->default(31);
-            $table->unsignedTinyInteger('week_start')->default(WeekStart::DEFAULT);
-            $table->string('number_format')->default(NumberFormat::DEFAULT);
+            $table->unsignedTinyInteger('week_start')->default(1);
+            $table->string('number_format')->default('comma_dot');
             $table->boolean('percent_first')->default(false);
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();

database/migrations/2023_09_08_024259_create_discounts_table.php → database/migrations/2024_11_14_230753_create_adjustments_table.php

@@ -1,7 +1,5 @@
 <?php
 
-use App\Enums\Setting\DiscountComputation;
-use App\Enums\Setting\DiscountType;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -13,14 +11,14 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::create('discounts', function (Blueprint $table) {
+        Schema::create('adjustments', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->string('name')->index();
-            $table->string('description')->nullable();
+            $table->foreignId('account_id')->nullable()->constrained('accounts')->nullOnDelete();
+            $table->string('category')->default('tax');
+            $table->string('type')->default('sales');
             $table->integer('rate')->default(0);
-            $table->string('computation')->default(DiscountComputation::DEFAULT);
-            $table->string('type')->default(DiscountType::DEFAULT);
+            $table->string('computation')->default('percentage');
             $table->string('scope')->nullable();
             $table->dateTime('start_date')->nullable();
             $table->dateTime('end_date')->nullable();
@@ -29,7 +27,7 @@ return new class extends Migration
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
 
-            $table->unique(['company_id', 'name', 'type']);
+            $table->unique(['company_id', 'account_id']);
         });
     }
 
@@ -38,6 +36,6 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('discounts');
+        Schema::dropIfExists('adjustments');
     }
 };

package-lock.json

@@ -1187,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.57",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.57.tgz",
-            "integrity": "sha512-xS65H/tqgOwUBa5UmOuNSLuslDo7zho0y/lgQw35pnrqiZh7UOWHCeL/Bt6noJATbA6tpQJGCifsFsIRZj1Fqg==",
+            "version": "1.5.59",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.59.tgz",
+            "integrity": "sha512-faAXB6+gEbC8FsiRdpOXgOe4snP49YwjiXynEB8Mp7sUx80W5eN+BnnBHJ/F7eIeLzs+QBfDD40bJMm97oEFcw==",
             "dev": true,
             "license": "ISC"
         },
@@ -2447,34 +2447,34 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.14",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
-            "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
+            "version": "3.4.15",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.15.tgz",
+            "integrity": "sha512-r4MeXnfBmSOuKUWmXe6h2CcyfzJCEk4F0pptO5jlnYSIViUkVmsawj80N5h2lO3gwcmSb4n3PuN+e+GC1Guylw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
-                "chokidar": "^3.5.3",
+                "chokidar": "^3.6.0",
                 "didyoumean": "^1.2.2",
                 "dlv": "^1.1.3",
-                "fast-glob": "^3.3.0",
+                "fast-glob": "^3.3.2",
                 "glob-parent": "^6.0.2",
                 "is-glob": "^4.0.3",
-                "jiti": "^1.21.0",
+                "jiti": "^1.21.6",
                 "lilconfig": "^2.1.0",
-                "micromatch": "^4.0.5",
+                "micromatch": "^4.0.8",
                 "normalize-path": "^3.0.0",
                 "object-hash": "^3.0.0",
-                "picocolors": "^1.0.0",
-                "postcss": "^8.4.23",
+                "picocolors": "^1.1.1",
+                "postcss": "^8.4.47",
                 "postcss-import": "^15.1.0",
                 "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.1",
-                "postcss-nested": "^6.0.1",
-                "postcss-selector-parser": "^6.0.11",
-                "resolve": "^1.22.2",
-                "sucrase": "^3.32.0"
+                "postcss-load-config": "^4.0.2",
+                "postcss-nested": "^6.2.0",
+                "postcss-selector-parser": "^6.1.2",
+                "resolve": "^1.22.8",
+                "sucrase": "^3.35.0"
             },
             "bin": {
                 "tailwind": "lib/cli.js",