MuhammadIqbalAfandi
/
parkirin
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

fix: master and authorization

Muhammad Iqbal Afandi 3 years ago
parent
92f5266818
commit
d6f4f51934
22 changed files with 100 additions and 76 deletions
Split View Show Diff Stats
  1. 2
    2
      app/Http/Controllers/MutationController.php
  2. 1
    1
      app/Http/Controllers/ParkingFeeController.php
  3. 30
    0
      app/Models/EntryTransaction.php
  4. 2
    2
      app/Models/Mutation.php
  5. 28
    0
      app/Models/OutTransaction.php
  6. 0
    16
      app/Models/TransactionIn.php
  7. 0
    20
      app/Models/TransactionOut.php
  8. 5
    2
      app/Models/TypeVehicle.php
  9. 2
    1
      app/Providers/AuthServiceProvider.php
  10. 1
    1
      app/Services/TypeVehicleService.php
  11. 3
    3
      database/migrations/2022_04_23_122416_create_entry_transactions_table.php
  12. 3
    4
      database/migrations/2022_04_23_122428_create_out_transactions_table.php
  13. 1
    1
      database/migrations/2022_04_23_130215_create_vehicles_table.php
  14. 1
    1
      database/migrations/2022_04_23_130216_create_mutations_table.php
  15. 13
    14
      designs/diagrams/database.puml
  16. BIN
      designs/diagrams/database/Database.png
  17. 2
    2
      public/js/resources_js_pages_mutation_Report_vue.js
  18. 1
    1
      public/js/resources_js_pages_parkingfee_Create_vue.js
  19. 1
    1
      public/js/vue.js
  20. 2
    2
      resources/js/pages/mutation/Report.vue
  21. 1
    1
      resources/js/pages/parkingfee/Create.vue
  22. 1
    1
      webpack.mix.js

+ 2
- 2
app/Http/Controllers/MutationController.php View File 

@@ -35,9 +35,9 @@ class MutationController extends Controller
35 35 
                             'createdAt' => $mutation->created_at,
36 36 
                             'amount' => $mutation->amount,
37 37 
                             'type' => $mutation->type,
38 
-                            'transactionOutId' => $mutation->transaction_out,
38 
+                            'outTransactionId' => $mutation->out_transaction_id,
39 39 
                             'expenseId' => $mutation->expense_id,
40 
-                            'topupId' => $mutation->top_up_id,
40 
+                            'topUpId' => $mutation->top_up_id,
41 41 
                         ]),
42 42 
                 ]
43 43 
             ),

+ 1
- 1
app/Http/Controllers/ParkingFeeController.php View File 

@@ -49,7 +49,7 @@ class ParkingFeeController extends Controller
49 49 
         foreach ($request->id as $key => $id) {
50 50 
             ParkingFee::upsert([
51 51 
                 'id' => $id,
52 
-                'time_period' => $request->timePeriod[$key],
52 
+                'time_period' => $request->time_period[$key],
53 53 
                 'price' => $request->price[$key],
54 54 
             ], ['id']);
55 55 
         }

+ 30
- 0
app/Models/EntryTransaction.php View File 

@@ -0,0 +1,30 @@
1 
+<?php
2 
+
3 
+namespace App\Models;
4 
+
5 
+use Carbon\Carbon;
6 
+use Illuminate\Database\Eloquent\Casts\Attribute;
7 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
8 
+use Illuminate\Database\Eloquent\Model;
9 
+
10 
+class EntryTransaction extends Model
11 
+{
12 
+    use HasFactory;
13 
+
14 
+    protected $fillable = [
15 
+        'capture_vehicle',
16 
+        'transaction_number',
17 
+    ];
18 
+
19 
+    protected function createdAt(): Attribute
20 
+    {
21 
+        return Attribute::make(
22 
+            get:fn($value) => Carbon::parse($value)->translatedFormat('l d/m/Y')
23 
+        );
24 
+    }
25 
+
26 
+    public function outTransaction()
27 
+    {
28 
+        return $this->hasOne(OutTransaction::class, 'entry_transaction_id', 'transaction_number');
29 
+    }
30 
+}

+ 2
- 2
app/Models/Mutation.php View File 

@@ -15,9 +15,9 @@ class Mutation extends Model
15 15 
     protected $fillable = [
16 16 
         'type',
17 17 
         'amount',
18 
-        'transaction_out_id',
18 
+        'out_transaction_id',
19 19 
         'expense_id',
20 
-        'topup_id',
20 
+        'top_up_id',
21 21 
     ];
22 22
23 23 
     protected function createdAt(): Attribute

+ 28
- 0
app/Models/OutTransaction.php View File 

@@ -0,0 +1,28 @@
1 
+<?php
2 
+
3 
+namespace App\Models;
4 
+
5 
+use Carbon\Carbon;
6 
+use Illuminate\Database\Eloquent\Casts\Attribute;
7 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
8 
+use Illuminate\Database\Eloquent\Model;
9 
+
10 
+class OutTransaction extends Model
11 
+{
12 
+    use HasFactory;
13 
+
14 
+    protected $fillable = [
15 
+        'plat_number',
16 
+        'price',
17 
+        'entry_transaction_id',
18 
+        'type_vehicle_id',
19 
+        'user_id',
20 
+    ];
21 
+
22 
+    protected function createdAt(): Attribute
23 
+    {
24 
+        return Attribute::make(
25 
+            get:fn($value) => Carbon::parse($value)->translatedFormat('l d/m/Y')
26 
+        );
27 
+    }
28 
+}

+ 0
- 16
app/Models/TransactionIn.php View File 

@@ -1,16 +0,0 @@
1 
-<?php
2 
-
3 
-namespace App\Models;
4 
-
5 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
6 
-use Illuminate\Database\Eloquent\Model;
7 
-
8 
-class TransactionIn extends Model
9 
-{
10 
-    use HasFactory;
11 
-
12 
-    protected $fillable = [
13 
-        'capture_vehicle',
14 
-        'transaction_number',
15 
-    ];
16 
-}

+ 0
- 20
app/Models/TransactionOut.php View File 

@@ -1,20 +0,0 @@
1 
-<?php
2 
-
3 
-namespace App\Models;
4 
-
5 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
6 
-use Illuminate\Database\Eloquent\Model;
7 
-
8 
-class TransactionOut extends Model
9 
-{
10 
-    use HasFactory;
11 
-
12 
-    protected $fillable = [
13 
-        'plat_number',
14 
-        'price',
15 
-        'transaction_in_id',
16 
-        'parking_fee_id',
17 
-        'type_vehicle_id',
18 
-        'user_id',
19 
-    ];
20 
-}

+ 5
- 2
app/Models/TypeVehicle.php View File 

@@ -2,6 +2,9 @@
2 2
3 3 
 namespace App\Models;
4 4
5 
+use App\Models\MaxVehicle;
6 
+use App\Models\OutTransaction;
7 
+use App\Models\Vehicle;
5 8 
 use Carbon\Carbon;
6 9 
 use Illuminate\Database\Eloquent\Casts\Attribute;
7 10 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
@@ -39,8 +42,8 @@ class TypeVehicle extends Model
39 42 
         return $this->hasMany(MaxVehicle::class);
40 43 
     }
41 44
42 
-    public function parkingFee()
45 
+    public function outTransaction()
43 46 
     {
44 
-        return $this->hasOne(ParkingFee::class);
47 
+        return $this->hasOne(OutTransaction::class);
45 48 
     }
46 49 
 }

+ 2
- 1
app/Providers/AuthServiceProvider.php View File 

@@ -16,6 +16,7 @@ use App\Policies\MutationPolicy;
16 16 
 use App\Policies\ParkingFeePolicy;
17 17 
 use App\Policies\TopUpPolicy;
18 18 
 use App\Policies\TypeMemberPolicy;
19 
+use App\Policies\TypeVehiclePolicy;
19 20 
 use App\Policies\UserPolicy;
20 21 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
21 22 
 
@@ -35,7 +36,7 @@ class AuthServiceProvider extends ServiceProvider
35 36 
         ParkingFee::class => ParkingFeePolicy::class,
36 37 
         TopUp::class => TopUpPolicy::class,
37 38 
         TypeMember::class => TypeMemberPolicy::class,
38 
-        TypeVehicle::class => TypeVehicle::class,
39 
+        TypeVehicle::class => TypeVehiclePolicy::class,
39 40 
     ];
40 41
41 42 
     /**

+ 1
- 1
app/Services/TypeVehicleService.php View File 

@@ -8,6 +8,6 @@ class TypeVehicleService
8 8 
 {
9 9 
     public function isUsed(TypeVehicle $typeVehicle)
10 10 
     {
11 
-        return $typeVehicle->vehicles()->exists() || $typeVehicle->maxVehicles()->exists() || $typeVehicle->parkingFee()->exists();
11 
+        return $typeVehicle->vehicles()->exists() || $typeVehicle->maxVehicles()->exists() || $typeVehicle->outTransaction()->exists();
12 12 
     }
13 13 
 }

database/migrations/2022_04_23_122416_create_transaction_ins_table.php → database/migrations/2022_04_23_122416_create_entry_transactions_table.php View File 

@@ -13,10 +13,10 @@ return new class extends Migration
13 13 
      */
14 14 
     public function up()
15 15 
     {
16 
-        Schema::create('transaction_ins', function (Blueprint $table) {
16 
+        Schema::create('entry_transactions', function (Blueprint $table) {
17 17 
             $table->id();
18 
-            $table->string('capture_vehicle');
19 18 
             $table->string('transaction_number');
19 
+            $table->string('capture_vehicle')->nullable()->default(null);
20 20 
             $table->timestamps();
21 21 
         });
22 22 
     }
 
@@ -28,6 +28,6 @@ return new class extends Migration
28 28 
      */
29 29 
     public function down()
30 30 
     {
31 
-        Schema::dropIfExists('transaction_ins');
31 
+        Schema::dropIfExists('entry_transactions');
32 32 
     }
33 33 
 };

database/migrations/2022_04_23_122428_create_transaction_outs_table.php → database/migrations/2022_04_23_122428_create_out_transactions_table.php View File 

@@ -13,13 +13,12 @@ return new class extends Migration
13 13 
      */
14 14 
     public function up()
15 15 
     {
16 
-        Schema::create('transaction_outs', function (Blueprint $table) {
16 
+        Schema::create('out_transactions', function (Blueprint $table) {
17 17 
             $table->id();
18 18 
             $table->string('plat_number');
19 19 
             $table->unsignedInteger('price');
20 
-            $table->foreignId('transaction_in_id')->constrained();
20 
+            $table->foreignId('entry_transaction_id')->constrained();
21 21 
             $table->foreignId('type_vehicle_id')->constrained();
22 
-            $table->foreignId('parking_fee_id')->constrained();
23 22 
             $table->foreignId('user_id')->constrained();
24 23 
             $table->timestamps();
25 24 
         });
 
@@ -32,6 +31,6 @@ return new class extends Migration
32 31 
      */
33 32 
     public function down()
34 33 
     {
35 
-        Schema::dropIfExists('transaction_outs');
34 
+        Schema::dropIfExists('out_transactions');
36 35 
     }
37 36 
 };

+ 1
- 1
database/migrations/2022_04_23_130215_create_vehicles_table.php View File 

@@ -17,7 +17,7 @@ return new class extends Migration
17 17 
             $table->id();
18 18 
             $table->string('plat_number');
19 19 
             $table->foreignId('member_id')->constrained();
20 
-            $table->foreignId('transaction_out_id')->nullable()->default(null)->constrained();
20 
+            $table->foreignId('out_transaction_id')->nullable()->default(null)->constrained();
21 21 
             $table->foreignId('type_vehicle_id')->nullable()->default(null)->constrained();
22 22 
             $table->timestamps();
23 23 
         });

+ 1
- 1
database/migrations/2022_04_23_130216_create_mutations_table.php View File 

@@ -17,7 +17,7 @@ return new class extends Migration
17 17 
             $table->id();
18 18 
             $table->enum('type', [1, 2]); // 1(income) 2(expense)
19 19 
             $table->unsignedInteger('amount');
20 
-            $table->foreignId('transaction_out_id')->nullable()->default(null)->constrained();
20 
+            $table->foreignId('out_transaction_id')->nullable()->default(null)->constrained();
21 21 
             $table->foreignId('expense_id')->nullable()->default(null)->constrained();
22 22 
             $table->foreignId('top_up_id')->nullable()->default(null)->constrained();
23 23 
             $table->timestamps();

+ 13
- 14
designs/diagrams/database.puml View File 

@@ -1,19 +1,18 @@
1 1 
 @startuml Database
2 2
3 
-entity TransactionIn {
3 
+entity EntryTransaction {
4 4 
   * id
5 5 
   __
6 
-  * capture_vehicle
7 6 
   * transaction_number
7 
+  capture_vehicle
8 8 
 }
9 9
10 
-entity TransactionOut {
10 
+entity OutTransaction {
11 11 
   * id
12 12 
   __
13 13 
   * plat_number
14 14 
   price
15 
-  * transaction_in_id
16 
-  * parking_fee_id
15 
+  * entry_transaction_id
17 16 
   * type_vehicle_id
18 17 
   * user_id
19 18 
 }
 
@@ -62,7 +61,7 @@ entity Vehicle {
62 61 
   __
63 62 
   * plat_number
64 63 
   * member_id
65 
-  * transaction_out_id
64 
+  * out_transaction_id
66 65 
   * type_vehicle_id
67 66 
 }
68 67 
 
@@ -104,17 +103,17 @@ entity Mutation {
104 103 
   __
105 104 
   * type
106 105 
   * amount
107 
-  transaction_out_id
106 
+  out_transaction_id
108 107 
   expense_id
109 
-  topup_id
108 
+  top_up_id
110 109 
 }
111 110
112 
-TransactionIn ||--|| TransactionOut
113 
-TransactionOut ||--|| Mutation
114 
-TransactionOut ||--|{ Vehicle
115 
-TransactionOut ||--|{ ParkingFee
116 
-TransactionOut ||--|{ User
117 
-TransactionOut ||--|{ TypeVehicle
111 
+EntryTransaction ||--|| OutTransaction
112 
+OutTransaction ||--|| Mutation
113 
+OutTransaction ||--|{ Vehicle
114 
+OutTransaction ||--|{ ParkingFee
115 
+OutTransaction ||--|{ User
116 
+OutTransaction ||--|{ TypeVehicle
118 117 
 TypeVehicle }|--|| Vehicle
119 118 
 TypeVehicle }|--|| MaxVehicle
120 119 
 User ||--|{ Role

BIN
designs/diagrams/database/Database.png View File


+ 2
- 2
public/js/resources_js_pages_mutation_Report_vue.js View File 

@@ -502,11 +502,11 @@ __webpack_require__.r(__webpack_exports__);
502 502
503 503 
     var linkReference = function linkReference(data) {
504 504 
       if (data.topupId) {
505 
-        return route('top-ups.show', data.topupId);
505 
+        return route('top-ups.show', data.topUpId);
506 506 
       } else if (data.expenseId) {
507 507 
         return route('expenses.show', data.expenseId);
508 508 
       } else {
509 
-        console.info('under construction'); // return route('expenses.show', data.expenseId)
509 
+        console.info('under construction'); //  return route('out-transactions.show', data.outTransactionId)
510 510 
       }
511 511 
     };
512 512

+ 1
- 1
public/js/resources_js_pages_parkingfee_Create_vue.js View File 

@@ -525,7 +525,7 @@ __webpack_require__.r(__webpack_exports__);
525 525 
       form.transform(function (data) {
526 526 
         return {
527 527 
           id: [data.id1, data.id2, data.id3, data.id4, data.idNext],
528 
-          timePeriod: [data.timePeriod1, data.timePeriod2, data.timePeriod3, data.timePeriod4, data.timePeriodNext],
528 
+          time_period: [data.timePeriod1, data.timePeriod2, data.timePeriod3, data.timePeriod4, data.timePeriodNext],
529 529 
           price: [data.price1, data.price2, data.price3, data.price4, data.priceNext]
530 530 
         };
531 531 
       }).post(route('parking-fees.store'), {

+ 1
- 1
public/js/vue.js View File 

@@ -58396,7 +58396,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
58396 58396 
 /******/ 		// This function allow to reference async chunks
58397 58397 
 /******/ 		__webpack_require__.u = (chunkId) => {
58398 58398 
 /******/ 			// return url for filenames based on template
58399 
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"5b9f0529bda25a9b","resources_js_pages_auth_Login_vue":"61b9c9ae1ae9da32","resources_js_pages_auth_ResetPassword_vue":"b091193a1e114ce8","resources_js_pages_auth_VerifyEmail_vue":"d9853eae0a0235f2","resources_js_pages_expense_Create_vue":"24ce2fe5d7bc72c8","resources_js_pages_expense_Index_vue":"798dbf6d69320567","resources_js_pages_expense_Show_vue":"d5681c75fde77308","resources_js_pages_expense_TableHeader_js":"eed3f0613f167cfd","resources_js_pages_home_Index_vue":"b922dc090509ea08","resources_js_pages_member_Create_vue":"fc1cd382141d2c70","resources_js_pages_member_Edit_vue":"33eee7f2667de50d","resources_js_pages_member_Index_vue":"cf14eae2779192d8","resources_js_pages_member_TableHeader_js":"51dbf053f7ddd45c","resources_js_pages_mutation_Report_vue":"6569326149c7e8b3","resources_js_pages_mutation_TableHeader_js":"7822e888aa3c52fc","resources_js_pages_parkingfee_Create_vue":"2d28f6b526f6f602","resources_js_pages_topup_Create_vue":"d4b2fe633c0691f2","resources_js_pages_topup_Index_vue":"b2565eb99363b9ba","resources_js_pages_topup_Show_vue":"cd5e15ada76e9fbe","resources_js_pages_topup_TableHeader_js":"601b7c0a855ce64e","resources_js_pages_typemember_Create_vue":"06b9f61209ca7651","resources_js_pages_typemember_Edit_vue":"4d8a32f046a9a08b","resources_js_pages_typemember_Index_vue":"73b3a8ec31100c62","resources_js_pages_typemember_TableHeader_js":"ac1d31a59f8d464e","resources_js_pages_typevehicle_Create_vue":"75389ee20755d74a","resources_js_pages_typevehicle_Edit_vue":"09a18fe1169d4335","resources_js_pages_typevehicle_Index_vue":"d15b150b4fdee4ad","resources_js_pages_typevehicle_TableHeader_js":"a40378918fbe74e1","resources_js_pages_user_Create_vue":"9b13f9080e20bf2d","resources_js_pages_user_Edit_vue":"4edf8db4d7073eac","resources_js_pages_user_Index_vue":"9c791e4ceac6a483","resources_js_pages_user_Show_vue":"2431556dd033ddb2","resources_js_pages_user_TableHeader_js":"0d87fd422fe40491"}[chunkId] + "";
58399 
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"5b9f0529bda25a9b","resources_js_pages_auth_Login_vue":"61b9c9ae1ae9da32","resources_js_pages_auth_ResetPassword_vue":"b091193a1e114ce8","resources_js_pages_auth_VerifyEmail_vue":"d9853eae0a0235f2","resources_js_pages_expense_Create_vue":"24ce2fe5d7bc72c8","resources_js_pages_expense_Index_vue":"798dbf6d69320567","resources_js_pages_expense_Show_vue":"d5681c75fde77308","resources_js_pages_expense_TableHeader_js":"eed3f0613f167cfd","resources_js_pages_home_Index_vue":"b922dc090509ea08","resources_js_pages_member_Create_vue":"fc1cd382141d2c70","resources_js_pages_member_Edit_vue":"33eee7f2667de50d","resources_js_pages_member_Index_vue":"cf14eae2779192d8","resources_js_pages_member_TableHeader_js":"51dbf053f7ddd45c","resources_js_pages_mutation_Report_vue":"0c0abe807726ddb5","resources_js_pages_mutation_TableHeader_js":"7822e888aa3c52fc","resources_js_pages_parkingfee_Create_vue":"4d1d60defdf2c684","resources_js_pages_topup_Create_vue":"d4b2fe633c0691f2","resources_js_pages_topup_Index_vue":"b2565eb99363b9ba","resources_js_pages_topup_Show_vue":"cd5e15ada76e9fbe","resources_js_pages_topup_TableHeader_js":"601b7c0a855ce64e","resources_js_pages_typemember_Create_vue":"06b9f61209ca7651","resources_js_pages_typemember_Edit_vue":"4d8a32f046a9a08b","resources_js_pages_typemember_Index_vue":"73b3a8ec31100c62","resources_js_pages_typemember_TableHeader_js":"ac1d31a59f8d464e","resources_js_pages_typevehicle_Create_vue":"75389ee20755d74a","resources_js_pages_typevehicle_Edit_vue":"09a18fe1169d4335","resources_js_pages_typevehicle_Index_vue":"d15b150b4fdee4ad","resources_js_pages_typevehicle_TableHeader_js":"a40378918fbe74e1","resources_js_pages_user_Create_vue":"9b13f9080e20bf2d","resources_js_pages_user_Edit_vue":"4edf8db4d7073eac","resources_js_pages_user_Index_vue":"9c791e4ceac6a483","resources_js_pages_user_Show_vue":"2431556dd033ddb2","resources_js_pages_user_TableHeader_js":"0d87fd422fe40491"}[chunkId] + "";
58400 58400 
 /******/ 		};
58401 58401 
 /******/ 	})();
58402 58402 
 /******/

+ 2
- 2
resources/js/pages/mutation/Report.vue View File 

@@ -72,12 +72,12 @@ const filterReset = () => {
72 72
73 73 
 const linkReference = (data) => {
74 74 
   if (data.topupId) {
75 
-    return route('top-ups.show', data.topupId)
75 
+    return route('top-ups.show', data.topUpId)
76 76 
   } else if (data.expenseId) {
77 77 
     return route('expenses.show', data.expenseId)
78 78 
   } else {
79 79 
     console.info('under construction')
80 
-    // return route('expenses.show', data.expenseId)
80 
+    //  return route('out-transactions.show', data.outTransactionId)
81 81 
   }
82 82 
 }
83 83

+ 1
- 1
resources/js/pages/parkingfee/Create.vue View File 

@@ -42,7 +42,7 @@ const submit = () => {
42 42 
   form
43 43 
     .transform((data) => ({
44 44 
       id: [data.id1, data.id2, data.id3, data.id4, data.idNext],
45 
-      timePeriod: [data.timePeriod1, data.timePeriod2, data.timePeriod3, data.timePeriod4, data.timePeriodNext],
45 
+      time_period: [data.timePeriod1, data.timePeriod2, data.timePeriod3, data.timePeriod4, data.timePeriodNext],
46 46 
       price: [data.price1, data.price2, data.price3, data.price4, data.priceNext],
47 47 
     }))
48 48 
     .post(route('parking-fees.store'), { onSuccess: () => (disabled.value = true) })

+ 1
- 1
webpack.mix.js View File 

@@ -15,7 +15,7 @@ mix
15 15 
   .js('resources/js/vue.js', 'public/js')
16 16 
   .webpackConfig(require('./webpack.config'))
17 17 
   .vue()
18 
-  .browserSync('http://parkirin.test/')
18 
+  .browserSync('http://127.0.0.1:8000')
19 19 
   .disableNotifications()
20 20
21 21 
 if (mix.inProduction()) {