Pārlūkot izejas kodu

fix: member or not

Muhammad Iqbal Afandi 3 gadus atpakaļ
vecāks
revīzija
acd6e5722a

+ 17
- 5
app/Http/Controllers/TestTransactionController.php Parādīt failu

5
 use App\Http\Controllers\Controller;
5
 use App\Http\Controllers\Controller;
6
 use App\Http\Requests\TestTransaction\StoreTestTransactionRequest;
6
 use App\Http\Requests\TestTransaction\StoreTestTransactionRequest;
7
 use App\Models\EntryTransaction;
7
 use App\Models\EntryTransaction;
8
+use App\Models\Member;
8
 use App\Models\OutTransaction;
9
 use App\Models\OutTransaction;
9
 use App\Models\ParkingFee;
10
 use App\Models\ParkingFee;
10
 use App\Models\TypeVehicle;
11
 use App\Models\TypeVehicle;
12
+use App\Models\Vehicle;
11
 use Carbon\Carbon;
13
 use Carbon\Carbon;
12
 use Illuminate\Http\Request;
14
 use Illuminate\Http\Request;
13
 use Illuminate\Support\Str;
15
 use Illuminate\Support\Str;
77
     public function store(StoreTestTransactionRequest $request)
79
     public function store(StoreTestTransactionRequest $request)
78
     {
80
     {
79
         if ($request->id === 2) {
81
         if ($request->id === 2) {
80
-            $entryTransactions = EntryTransaction::where('transaction_number', $request->entry_transaction_id)->first();
81
-            $vehicleEntryTime = $entryTransactions->getRawOriginal('created_at');
82
-            $longParkingPerHours = Carbon::parse($vehicleEntryTime)->floatDiffInRealHours(now());
82
+            // Check member or not
83
+            $memberId = Vehicle::where('plat_number', $request->plat_number)->first('member_id');
83
 
84
 
84
-            $parkingFee = ParkingFee::get();
85
+            if ($memberId) {
86
+                // Check expired member or not
87
+                $expDate = $memberId->member->getRawOriginal('exp_date');
85
 
88
 
86
-            return;
89
+                $exp = Carbon::parse($expDate)->greaterThanOrEqualTo(now());
90
+            } else {
91
+                $entryTransactions = EntryTransaction::where('transaction_number', $request->entry_transaction_id)->first();
92
+
93
+                $vehicleEntryTime = $entryTransactions->getRawOriginal('created_at');
94
+
95
+                $longParkingPerHours = Carbon::parse($vehicleEntryTime)->floatDiffInRealHours(now());
96
+
97
+                $parkingFee = ParkingFee::get();
98
+            }
87
         } else {
99
         } else {
88
             EntryTransaction::create([
100
             EntryTransaction::create([
89
                 'transaction_number' => Str::uuid(),
101
                 'transaction_number' => Str::uuid(),

+ 5
- 0
app/Models/Vehicle.php Parādīt failu

28
     {
28
     {
29
         return $this->belongsTo(TypeVehicle::class);
29
         return $this->belongsTo(TypeVehicle::class);
30
     }
30
     }
31
+
32
+    public function member()
33
+    {
34
+        return $this->belongsTo(Member::class);
35
+    }
31
 }
36
 }

+ 1
- 1
webpack.mix.js Parādīt failu

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