changes

shaxzodbek-uzb · Mar 30, 2024 · 1823530 · 1823530
1 parent 60d9f32
commit 1823530
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -2,10 +2,10 @@
     "name": "goodoneuz/pay-uz",
     "description": "Payment: Click, Payme, Uzcard, Visa",
     "keywords": [
-        "goodoneuz",
+        "blaze",
         "pay-uz"
     ],
-    "homepage": "https://github.com/goodoneuz/pay-uz",
+    "homepage": "https://github.com/shaxzodbek-uzb/pay-uz",
     "license": "MIT",
     "type": "library",
     "authors": [

diff --git a/src/Http/Controllers/ProjectController.php → .../Controllers/PaymentProjectController.php b/src/Http/Controllers/ProjectController.php → .../Controllers/PaymentProjectController.php
@@ -3,10 +3,10 @@
 namespace Goodoneuz\PayUz\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Goodoneuz\PayUz\Models\Project;
+use Goodoneuz\PayUz\Models\PaymentProject;
 use App\Http\Controllers\Controller;
 
-class ProjectController extends Controller
+class PaymentProjectController extends Controller
 {
 
     /**
@@ -16,7 +16,7 @@ class ProjectController extends Controller
      */
     public function index()
     {
-        $projects = Project::latest()->get();
+        $projects = PaymentProject::latest()->get();
         return view('pay-uz::projects.index',compact('projects'));
     }
 

diff --git a/src/Models/Project.php → src/Models/PaymentProject.php b/src/Models/Project.php → src/Models/PaymentProject.php
@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Project extends Model
+class PaymentProject extends Model
 {
     use SoftDeletes;
 

diff --git a/...20_03_17_105343_create_projects_table.php → ..._105343_create_payment_projects_table.php b/...20_03_17_105343_create_projects_table.php → ..._105343_create_payment_projects_table.php
@@ -4,7 +4,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateProjectsTable extends Migration
+class CreatePaymentProjectsTable extends Migration
 {
     /**
      * Run the migrations.
@@ -13,7 +13,7 @@ class CreateProjectsTable extends Migration
      */
     public function up()
     {
-        Schema::create('projects', function (Blueprint $table) {
+        Schema::create('payment_projects', function (Blueprint $table) {
             $table->increments('id');
             $table->string('name');
             $table->integer('status');
@@ -30,6 +30,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists('projects');
+        Schema::dropIfExists('payment_projects');
     }
 }
diff --git a/src/resources/views/components/main_nav.blade.php b/src/resources/views/components/main_nav.blade.php
@@ -10,21 +10,14 @@
                 <a class="nav-link" href="{{ route('payment.dashboard') }}">
                     <i class="fa fa-fw fa-dashboard"></i>
                     <span class="nav-link-text">
-                Asosiy bo'lim</span>
-                </a>
-            </li>
-            <li class="nav-item @if($current_route == 'payment.projects.index') active @endif" data-toggle="tooltip" data-placement="right" title="Payment Systems">
-                <a class="nav-link" href="{{ route('payment.projects.index') }}">
-                    <i class="fa fa-fw fa-list"></i>
-                    <span class="nav-link-text">
-                Loyihalar</span>
+                Dashboard</span>
                 </a>
             </li>
             <li class="nav-item @if($current_route == 'payment.payment_systems.index') active @endif" data-toggle="tooltip" data-placement="right" title="Payment Systems">
                 <a class="nav-link" href="{{ route('payment.payment_systems.index') }}">
                     <i class="fa fa-fw fa-list"></i>
                     <span class="nav-link-text">
-                To'lov tizimlari</span>
+                Payment systems</span>
                 </a>
             </li>
             <li class="nav-item @if($current_route == 'payment.transactions.index') active @endif" data-toggle="tooltip" data-placement="right" title="Transactions">
@@ -34,14 +27,6 @@
                 Transactions</span>
                 </a>
             </li>
-            <li class="nav-item @if($current_route == 'payment.settings.index') active @endif" data-toggle="tooltip" data-placement="right" title="Settings">
-                <a class="nav-link" href="{{ route('payment.settings') }}">
-                    <i class="fa fa-fw fa-cog"></i>
-                    <span class="nav-link-text">
-                 Settings
-                </span>
-                </a>
-            </li>
             <li class="nav-item @if($current_route == 'payment.editors.index') active @endif" data-toggle="tooltip" data-placement="right" title="Editors">
                 <a class="nav-link" href="{{ route('payment.editors') }}">
                     <i class="fa fa-fw fa-edit"></i>

diff --git a/src/resources/views/projects/index.blade.php b/src/resources/views/projects/index.blade.php
@@ -55,7 +55,7 @@
                             <td class="text-center">
                                 <a href="#" data-project-id="{{ $project->id }}" class="deleteBtn"><span class="fa fa-trash" data-toggle="tooltip" data-placement="top" title="O'chirish"></span></a> &nbsp;
                                 <a href="{{ route('payment.projects.edit',['project'  => $project->id]) }}"><span class="fa fa-cog" data-toggle="tooltip" data-placement="top" title="Sozlash"></span></a> &nbsp;
-                                <a href="{{ route('payment.projects.edit_status',['project'  => $project->id]) }}"><span class="fa @if($project->status == \Goodoneuz\PayUz\Models\Project::NOT_ACTIVE) fa-lock @else fa-unlock-alt @endif " data-toggle="tooltip" data-placement="top" title="Bloklash"></span></a>
+                                <a href="{{ route('payment.projects.edit_status',['project'  => $project->id]) }}"><span class="fa @if($project->status == \Goodoneuz\PayUz\Models\PaymentProject::NOT_ACTIVE) fa-lock @else fa-unlock-alt @endif " data-toggle="tooltip" data-placement="top" title="Bloklash"></span></a>
                             </td>
                         </tr>
                     @endforeach

diff --git a/src/routes/web.php b/src/routes/web.php
@@ -37,7 +37,7 @@
     // end --editable functions
 
     Route::resource('transactions', 'TransactionController');
-    Route::resource('projects', 'ProjectController');
+    Route::resource('payment-projects', 'PaymentProjectController');
     Route::resource('payment_systems', 'PaymentSystemController');
     Route::resource('transactions', 'TransactionController');
 });