Added lead prefix & deal prefix

venturedrake · Aug 24, 2024 · 7703234 · 7703234
1 parent 6790b0c
commit 7703234
Show file tree

Hide file tree

Showing 15 changed files with 192 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Kanban boards
 - Custom Fields
 - Disabled double click on form submits
+- Lead prefix
+- Deal prefix
 ### Changed
 - Improved logo sizing on pdfs
 - Vertical navigation for settings

diff --git a/database/migrations/add_prefix_to_laravel_crm_deals_table.php.stub b/database/migrations/add_prefix_to_laravel_crm_deals_table.php.stub
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'deals', function (Blueprint $table) {
+            $table->string('deal_id')->after('description')->nullable();
+            $table->string('prefix')->after('deal_id')->nullable();
+            $table->integer('number')->nullable()->after('prefix');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'deals', function (Blueprint $table) {
+            $table->dropColumn([
+                'lead_id',
+                'prefix',
+                'number',
+            ]);
+        });
+    }
+};
diff --git a/database/migrations/add_prefix_to_laravel_crm_leads_table.php.stub b/database/migrations/add_prefix_to_laravel_crm_leads_table.php.stub
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'leads', function (Blueprint $table) {
+            $table->string('lead_id')->after('description')->nullable();
+            $table->string('prefix')->after('lead_id')->nullable();
+            $table->integer('number')->nullable()->after('prefix');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table(config('laravel-crm.db_table_prefix').'leads', function (Blueprint $table) {
+            $table->dropColumn([
+                'lead_id',
+                'prefix',
+                'number',
+            ]);
+        });
+    }
+};
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
@@ -509,4 +509,6 @@
     'create_pipeline_stage' => 'create pipeline stage',
     'back_to_pipeline_stages' => 'back to pipeline stages',
     'edit_pipeline_stage' => 'edit pipeline stage',
+    'lead_prefix' => 'lead prefix',
+    'deal_prefix' => 'deal prefix',
 ];
diff --git a/resources/views/livewire/kanban-board/record.blade.php b/resources/views/livewire/kanban-board/record.blade.php
@@ -6,7 +6,7 @@
             'limit' => 3
         ])
         <div class="mt-2">
-            <a href="{{ url(route('laravel-crm.'.\Illuminate\Support\Str::plural($model).'.show', $record['id'])) }}">LD-{{ $record['id'] }}</a> 
+            <a href="{{ url(route('laravel-crm.'.\Illuminate\Support\Str::plural($model).'.show', $record['id'])) }}">{{ $record['number'] }}</a> 
             <div class="mb-0 d-inline-block float-right"><i class="fa fa-user-circle" aria-hidden="true"></i></div>
         </div>
     </div>

diff --git a/resources/views/settings/partials/fields.blade.php b/resources/views/settings/partials/fields.blade.php
@@ -77,6 +77,20 @@
             'value' => old('tax_rate', $taxRateSetting->value ?? null),
             'append' => '%'
        ])
+        @hasleadsenabled
+        @include('laravel-crm::partials.form.text',[
+         'name' => 'lead_prefix',
+         'label' => ucfirst(trans('laravel-crm::lang.lead_prefix')),
+         'value' => old('lead_prefix', $leadPrefix->value ?? null)
+        ])
+        @endhasleadsenabled
+        @hasdealsenabled
+        @include('laravel-crm::partials.form.text',[
+         'name' => 'deal_prefix',
+         'label' => ucfirst(trans('laravel-crm::lang.deal_prefix')),
+         'value' => old('deal_prefix', $dealPrefix->value ?? null)
+        ])
+        @endhasdealsenabled
         @hasquotesenabled
         @include('laravel-crm::partials.form.text',[
          'name' => 'quote_prefix',

diff --git a/src/Console/LaravelCrmUpdate.php b/src/Console/LaravelCrmUpdate.php
@@ -4,9 +4,11 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Composer;
+use VentureDrake\LaravelCrm\Models\Deal;
 use VentureDrake\LaravelCrm\Models\Delivery;
 use VentureDrake\LaravelCrm\Models\Invoice;
 use VentureDrake\LaravelCrm\Models\InvoiceLine;
+use VentureDrake\LaravelCrm\Models\Lead;
 use VentureDrake\LaravelCrm\Models\Order;
 use VentureDrake\LaravelCrm\Models\OrderProduct;
 use VentureDrake\LaravelCrm\Models\Person;
@@ -260,6 +262,26 @@ public function handle()
                 '--class' => 'VentureDrake\LaravelCrm\Database\Seeders\LaravelCrmPipelineTablesSeeder',
             ]);
 
+            foreach (Lead::whereNull('number')->get() as $lead) {
+                $this->info('Updating Laravel CRM lead #'.$lead->id);
+
+                $lead->update([
+                    'lead_id' => $this->settingService->get('lead_prefix')->value.(1000 + $lead->id),
+                    'prefix' => $this->settingService->get('lead_prefix')->value,
+                    'number' => 1000 + $lead->id,
+                ]);
+            }
+
+            foreach (Deal::whereNull('number')->get() as $deal) {
+                $this->info('Updating Laravel CRM deal #'.$deal->id);
+
+                $deal->update([
+                    'deal_id' => $this->settingService->get('deal_prefix')->value.(1000 + $deal->id),
+                    'prefix' => $this->settingService->get('deal_prefix')->value,
+                    'number' => 1000 + $deal->id,
+                ]);
+            }
+
             $this->settingService->set('db_update_1200', 1);
             $this->info('Updating Laravel CRM pipeline tables complete.');
         }

diff --git a/src/Http/Controllers/SettingController.php b/src/Http/Controllers/SettingController.php
@@ -36,6 +36,8 @@ public function edit()
         $currency = $this->settingService->get('currency');
         $timezoneSetting = $this->settingService->get('timezone');
         $logoFile = $this->settingService->get('logo_file');
+        $leadPrefix = $this->settingService->get('lead_prefix');
+        $dealPrefix = $this->settingService->get('deal_prefix');
         $quotePrefix = $this->settingService->get('quote_prefix');
         $orderPrefix = $this->settingService->get('order_prefix');
         $invoicePrefix = $this->settingService->get('invoice_prefix');
@@ -62,6 +64,8 @@ public function edit()
             'currency' => $currency,
             'timezoneSetting' => $timezoneSetting,
             'logoFile' => $logoFile,
+            'leadPrefix' => $leadPrefix,
+            'dealPrefix' => $dealPrefix,
             'quotePrefix' => $quotePrefix,
             'orderPrefix' => $orderPrefix,
             'invoicePrefix' => $invoicePrefix,
@@ -112,6 +116,14 @@ public function update(UpdateSettingRequest $request)
             $this->settingService->set('tax_rate', $request->tax_rate);
         }
 
+        if($request->lead_prefix) {
+            $this->settingService->set('lead_prefix', $request->lead_prefix);
+        }
+
+        if($request->deal_prefix) {
+            $this->settingService->set('deal_prefix', $request->deal_prefix);
+        }
+
         if($request->quote_prefix) {
             $this->settingService->set('quote_prefix', $request->quote_prefix);
         }

diff --git a/src/Http/Livewire/LiveDealBoard.php b/src/Http/Livewire/LiveDealBoard.php
@@ -37,6 +37,7 @@ public function records(): Collection
                     'title' => $deal->title,
                     'labels' => $deal->labels,
                     'stage' => $deal->pipelineStage->id ?? $this->firstStageId(),
+                    'number' => $deal->deal_id
                 ];
             });
     }

diff --git a/src/Http/Livewire/LiveLeadBoard.php b/src/Http/Livewire/LiveLeadBoard.php
@@ -36,6 +36,7 @@ public function records(): Collection
                     'title' => $lead->title,
                     'labels' => $lead->labels,
                     'stage' => $lead->pipelineStage->id ?? $this->firstStageId(),
+                    'number' => $lead->lead_id
                 ];
             });
     }

diff --git a/src/Http/Livewire/LiveQuoteBoard.php b/src/Http/Livewire/LiveQuoteBoard.php
@@ -37,6 +37,7 @@ public function records(): Collection
                     'title' => $quote->title,
                     'labels' => $quote->labels,
                     'stage' => $quote->pipelineStage->id ?? $this->firstStageId(),
+                    'number' => $quote->quote_id
                 ];
             });
     }

diff --git a/src/Http/Middleware/Settings.php b/src/Http/Middleware/Settings.php
@@ -114,6 +114,18 @@ public function handle($request, Closure $next)
                 'value' => config('laravel-crm.tax_rate') ?? 0,
             ]);
 
+            Setting::firstOrCreate([
+                'name' => 'lead_prefix',
+            ], [
+                'value' => 'LD-',
+            ]);
+
+            Setting::firstOrCreate([
+                'name' => 'deal_prefix',
+            ], [
+                'value' => 'DL-',
+            ]);
+
             Setting::firstOrCreate([
                 'name' => 'quote_prefix',
             ], [

diff --git a/src/LaravelCrmServiceProvider.php b/src/LaravelCrmServiceProvider.php
@@ -467,6 +467,8 @@ function ($perPage = 30, $page = null, $options = []) {
                 __DIR__ . '/../database/migrations/create_laravel_crm_pipeline_stages_table.php.stub' => $this->getMigrationFileName($filesystem, 'create_laravel_crm_pipeline_stages_table.php', 100),
                 __DIR__ . '/../database/migrations/add_pipeline_to_laravel_crm_models_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_pipeline_to_laravel_crm_models_table.php', 101),
                 __DIR__ . '/../database/migrations/add_user_to_laravel_crm_settings_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_user_to_laravel_crm_settings_table.php', 102),
+                __DIR__ . '/../database/migrations/add_prefix_to_laravel_crm_leads_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_prefix_to_laravel_crm_leads_table.php', 103),
+                __DIR__ . '/../database/migrations/add_prefix_to_laravel_crm_deals_table.php.stub' => $this->getMigrationFileName($filesystem, 'add_prefix_to_laravel_crm_deals_table.php', 104),
             ], 'migrations');
 
             // Publishing the seeders

diff --git a/src/Observers/DealObserver.php b/src/Observers/DealObserver.php
@@ -2,10 +2,22 @@
 
 namespace VentureDrake\LaravelCrm\Observers;
 
+use Ramsey\Uuid\Uuid;
 use VentureDrake\LaravelCrm\Models\Deal;
+use VentureDrake\LaravelCrm\Services\SettingService;
 
 class DealObserver
 {
+    /**
+     * @var SettingService
+     */
+    private $settingService;
+
+    public function __construct(SettingService $settingService)
+    {
+        $this->settingService = $settingService;
+    }
+
     /**
      * Handle the deal "creating" event.
      *
@@ -14,9 +26,20 @@ class DealObserver
      */
     public function creating(Deal $deal)
     {
+        $deal->external_id = Uuid::uuid4()->toString();
+
         if (! app()->runningInConsole()) {
             $deal->user_created_id = auth()->user()->id ?? null;
         }
+
+        if($lastDeal = Deal::withTrashed()->orderBy('number', 'DESC')->first()) {
+            $deal->number = $lastDeal->number + 1;
+        } else {
+            $deal->number = 1000;
+        }
+
+        $deal->prefix = $this->settingService->get('deal_prefix')->value;
+        $deal->deal_id = $deal->prefix.$deal->number;
     }
 
     /**

diff --git a/src/Observers/LeadObserver.php b/src/Observers/LeadObserver.php
@@ -2,10 +2,22 @@
 
 namespace VentureDrake\LaravelCrm\Observers;
 
+use Ramsey\Uuid\Uuid;
 use VentureDrake\LaravelCrm\Models\Lead;
+use VentureDrake\LaravelCrm\Services\SettingService;
 
 class LeadObserver
 {
+    /**
+     * @var SettingService
+     */
+    private $settingService;
+
+    public function __construct(SettingService $settingService)
+    {
+        $this->settingService = $settingService;
+    }
+
     /**
      * Handle the lead "creating" event.
      *
@@ -14,9 +26,20 @@ class LeadObserver
      */
     public function creating(Lead $lead)
     {
+        $lead->external_id = Uuid::uuid4()->toString();
+
         if (! app()->runningInConsole()) {
             $lead->user_created_id = auth()->user()->id ?? null;
         }
+
+        if($lastLead = Lead::withTrashed()->orderBy('number', 'DESC')->first()) {
+            $lead->number = $lastLead->number + 1;
+        } else {
+            $lead->number = 1000;
+        }
+
+        $lead->prefix = $this->settingService->get('lead_prefix')->value;
+        $lead->lead_id = $lead->prefix.$lead->number;
     }
 
     /**