Skip to content

Commit b4eef30

Browse files
committed
fix promocode
1 parent b1a0f53 commit b4eef30

File tree

6 files changed

+53
-53
lines changed

6 files changed

+53
-53
lines changed

app/Http/Controllers/Backend/PromoCode/PromoCodeController.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@ public function store(StorePromoCodeRequest $request)
5252
$users = []; // Replace with the user you want to notify
5353
switch ($request->user_type) {
5454
case 'all':
55-
$users = User::get();
55+
$users = User::whereNotNull('email_verified_at')->get();
5656
break;
5757
case 'partner':
58-
$users = User::role('partner')->get();
58+
$users = User::role('partner')->whereNotNull('email_verified_at')->get();
5959
break;
6060
case 'user':
61-
$users = User::role('user')->get();
61+
$users = User::role('user')->whereNotNull('email_verified_at')->get();
6262
break;
6363
case 'individual':
64-
$users = User::where('id', $request->user_id)->get();
64+
$users = User::where('id', $request->user_id)->whereNotNull('email_verified_at')->get();
6565
break;
6666

6767
default:

app/Notifications/PromoCodeNotification.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use Illuminate\Notifications\Messages\MailMessage;
99
use Illuminate\Notifications\Notification;
1010

11-
class PromoCodeNotification extends Notification
11+
class PromoCodeNotification extends Notification implements ShouldQueue
1212
{
1313
use Queueable;
1414
public string $url;

database/factories/UserFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function definition(): array
3232
'image_url' => "https://api.dicebear.com/6.x/initials/svg?seed=$seed&backgroundType=gradientLinear&backgroundRotation=0,360",
3333
'phone' => fake()->phoneNumber(),
3434
'email' => fake()->unique()->safeEmail(),
35-
'email_verified_at' => now(),
35+
'email_verified_at' => null,
3636
'password' => Hash::make('12345678'), // password
3737
'remember_token' => Str::random(10),
3838
'refer_link' => route('refer.link', $userName),
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
return new class extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*/
12+
public function up(): void
13+
{
14+
Schema::create('jobs', function (Blueprint $table) {
15+
$table->bigIncrements('id');
16+
$table->string('queue')->index();
17+
$table->longText('payload');
18+
$table->unsignedTinyInteger('attempts');
19+
$table->unsignedInteger('reserved_at')->nullable();
20+
$table->unsignedInteger('available_at');
21+
$table->unsignedInteger('created_at');
22+
});
23+
}
24+
25+
/**
26+
* Reverse the migrations.
27+
*/
28+
public function down(): void
29+
{
30+
Schema::dropIfExists('jobs');
31+
}
32+
};

database/seeders/RoleSeeder.php

+13-28
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
use App\Models\User;
66
use Illuminate\Database\Seeder;
7-
use Spatie\Permission\Models\Role;
87
use Spatie\Permission\Models\Permission;
9-
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
8+
use Spatie\Permission\Models\Role;
109

1110
class RoleSeeder extends Seeder
1211
{
@@ -21,16 +20,16 @@ public function run(): void
2120
'partner',
2221
'user',
2322
'employee',
24-
];
25-
$sudoPermissions = Permission::get();
23+
];
24+
$sudoPermissions = Permission::get();
2625
$adminPermissions = Permission::where([
27-
['name', 'NOT LIKE', '%user%'],
28-
['name', 'NOT LIKE', '%role%'],
29-
])->get();
26+
[ 'name', 'NOT LIKE', '%user%' ],
27+
[ 'name', 'NOT LIKE', '%role%' ],
28+
])->get();
3029
$partnerPermissions = Permission::where('name', 'LIKE', '%read%')->get();
3130

3231
foreach ($roles as $role) {
33-
$newRole = Role::create(['name' => $role]);
32+
$newRole = Role::create([ 'name' => $role ]);
3433
switch ($role) {
3534
case 'super admin':
3635
$newRole->syncPermissions($sudoPermissions);
@@ -49,28 +48,14 @@ public function run(): void
4948
}
5049
}
5150

52-
53-
//test user for promo code
54-
$users = User::factory(5)->create();
55-
foreach ($users as $user) {
56-
$user->assignRole('user');
57-
}
58-
$partners = User::factory(5)->create();
59-
foreach ($partners as $user) {
60-
$user->assignRole('partner');
61-
}
62-
$employees = User::factory(5)->create();
63-
foreach ($employees as $user) {
64-
$user->assignRole('employee');
65-
}
66-
6751
$admin = User::where('user_name', 'admin')->first();
6852
$admin->assignRole('super admin');
6953
$superAdmin = User::factory(1)->create([
70-
'email' => 'superadmin@gmail.com',
71-
'user_name' => 'super_admin',
72-
'refer_link' => route('refer.link', 'super_admin')
73-
]);
74-
$superAdmin[0]->assignRole('super admin');
54+
'email' => 'superadmin@gmail.com',
55+
'user_name' => 'super_admin',
56+
'refer_link' => route('refer.link', 'super_admin'),
57+
'email_verified_at' => now(),
58+
]);
59+
$superAdmin[ 0 ]->assignRole('super admin');
7560
}
7661
}

database/seeders/UserSeeder.php

+2-19
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,8 @@ public function run(): void
1616
$admin = User::factory(1)->create([
1717
'email' => 'admin@gmail.com',
1818
'user_name' => 'admin',
19-
'refer_link' => route('refer.link', 'admin')
20-
]);
21-
22-
23-
//test user for refer
24-
User::factory(1)->create([
25-
'email' => 'two@gamil.com',
26-
'user_name' => 'two',
27-
'refer_link' => route('refer.link', 'two')
28-
]);
29-
User::factory(1)->create([
30-
'email' => 'three@gmail.com',
31-
'user_name' => 'three',
32-
'refer_link' => route('refer.link', 'three')
33-
]);
34-
User::factory(1)->create([
35-
'email' => 'four@gmail.com',
36-
'user_name' => 'four',
37-
'refer_link' => route('refer.link', 'four')
19+
'refer_link' => route('refer.link', 'admin'),
20+
'email_verified_at'=> now()
3821
]);
3922
}
4023
}

0 commit comments

Comments
 (0)