Ofoghe talaei

database/migrations/2025_05_03_111731_add_issue_and_expiry_date_to_files_table.php

@@ -0,0 +1,29 @@
+<?php
+
+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::table('activity_files', function (Blueprint $table) {
+            $table->date('issue_date')->nullable();
+            $table->date('expiry_date')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('activity_files', function (Blueprint $table) {
+            $table->dropColumn(['issue_date', 'expiry_date']);
+        });
+    }
+};

database/migrations/2025_05_26_170158_add_partners_and_local_agent_to_persons_table.php

@@ -0,0 +1,31 @@
+<?php
+
+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::table('persons', function (Blueprint $table) {
+            $table->string('partner_2')->nullable()->after('name');  // or appropriate type
+            $table->string('partner_3')->nullable()->after('partner_2');
+            $table->string('local_agent')->nullable()->after('partner_3');
+            sponsor
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('persons', function (Blueprint $table) {
+            $table->dropColumn(['partner_2', 'partner_3', 'local_agent']);
+        });
+    }
+};

packages/Webkul/Activity/src/Models/File.php

@@ -31,6 +31,8 @@ class File extends Model implements FileContract
         'name',
         'path',
         'activity_id',
+        'issue_date',
+        'expiry_date',
     ];
 
     /**

packages/Webkul/Activity/src/Repositories/ActivityRepository.php

@@ -14,8 +14,9 @@ class ActivityRepository extends Repository
      */
     public function __construct(
         protected FileRepository $fileRepository,
-        Container $container
-    ) {
+        Container                $container
+    )
+    {
         parent::__construct($container);
     }
 
@@ -40,13 +41,15 @@ public function create(array $data)
 
         if (isset($data['file'])) {
             $this->fileRepository->create([
-                'name'        => $data['name'] ?? $data['file']->getClientOriginalName(),
-                'path'        => $data['file']->store('activities/'.$activity->id),
+                'issue_date' => $data['issue_date'] ?? null,
+                'expiry_date' => $data['expiry_date'] ?? null,
+                'name' => $data['name'] ?? $data['file']->getClientOriginalName(),
+                'path' => $data['file']->store('activities/' . $activity->id),
                 'activity_id' => $activity->id,
             ]);
         }
 
-        if (! isset($data['participants'])) {
+        if (!isset($data['participants'])) {
             return $activity;
         }
 
@@ -68,8 +71,8 @@ public function create(array $data)
     /**
      * Update pipeline.
      *
-     * @param  int  $id
-     * @param  string  $attribute
+     * @param int $id
+     * @param string $attribute
      * @return \Webkul\Activity\Contracts\Activity
      */
     public function update(array $data, $id, $attribute = 'id')
@@ -114,7 +117,7 @@ public function update(array $data, $id, $attribute = 'id')
     }
 
     /**
-     * @param  string  $dateRange
+     * @param string $dateRange
      * @return mixed
      */
     public function getActivities($dateRange)
@@ -143,10 +146,10 @@ public function getActivities($dateRange)
     }
 
     /**
-     * @param  string  $startFrom
-     * @param  string  $endFrom
-     * @param  array  $participants
-     * @param  int  $id
+     * @param string $startFrom
+     * @param string $endFrom
+     * @param array $participants
+     * @param int $id
      * @return bool
      */
     public function isDurationOverlapping($startFrom, $endFrom, $participants, $id)
@@ -176,7 +179,7 @@ public function isDurationOverlapping($startFrom, $endFrom, $participants, $id)
             })
             ->groupBy('activities.id');
 
-        if (! is_null($id)) {
+        if (!is_null($id)) {
             $queryBuilder->where('activities.id', '!=', $id);
         }
 

packages/Webkul/Admin/src/DataGrids/Settings/AttributeDataGrid.php

@@ -28,6 +28,7 @@ public function prepareQueryBuilder(): Builder
         $this->addFilter('id', 'attributes.id');
         $this->addFilter('type', 'attributes.type');
         $this->addFilter('attribute_type', 'attributes.is_user_defined');
+        $queryBuilder->orderBy('attributes.sort_order', 'asc');
 
         return $queryBuilder;
     }

packages/Webkul/Admin/src/Http/Controllers/Activity/ActivityController.php

@@ -202,6 +202,12 @@ public function download(int $id): StreamedResponse
     {
         try {
             $file = $this->fileRepository->findOrFail($id);
+            $extension = pathinfo($file->path, PATHINFO_EXTENSION);
+
+            if (!empty($file->name)) {
+                $customName = $file->name . '_' . $file->activity->title . '.' . $extension;
+                return Storage::download($file->path, $customName);
+            }
 
             return Storage::download($file->path);
         } catch (\Exception $exception) {

packages/Webkul/Admin/src/Http/Resources/ActivityFileResource.php

@@ -15,12 +15,14 @@ class ActivityFileResource extends JsonResource
     public function toArray($request)
     {
         return [
-            'id'         => $this->id,
-            'name'       => $this->name,
-            'path'       => $this->path,
-            'url'        => $this->url,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'id'          => $this->id,
+            'name'        => $this->name,
+            'path'        => $this->path,
+            'url'         => $this->url,
+            'issue_date'  => $this->issue_date,
+            'expiry_date' => $this->expiry_date,
+            'created_at'  => $this->created_at,
+            'updated_at'  => $this->updated_at,
         ];
     }
 }