diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index 87a69189..79a78496 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -137,7 +137,7 @@ class EventAttendeesController extends MyBaseController $attendee_last_name = $request->get('last_name'); $attendee_email = $request->get('email'); $email_attendee = $request->get('email_ticket'); - + DB::beginTransaction(); try { diff --git a/app/Models/OrderStatus.php b/app/Models/OrderStatus.php index 2bac16ec..cf067088 100644 --- a/app/Models/OrderStatus.php +++ b/app/Models/OrderStatus.php @@ -13,5 +13,5 @@ namespace App\Models; */ class OrderStatus extends \Illuminate\Database\Eloquent\Model { - //put your code here + public $timestamps = false; } diff --git a/app/Models/TicketStatus.php b/app/Models/TicketStatus.php index b53acaee..b0d5bab1 100644 --- a/app/Models/TicketStatus.php +++ b/app/Models/TicketStatus.php @@ -13,5 +13,5 @@ namespace App\Models; */ class TicketStatus extends \Illuminate\Database\Eloquent\Model { - //put your code here + public $timestamps = false; } diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index 3a22ed38..00232e44 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -210,6 +210,7 @@ $factory->define(App\Models\Order::class, function (Faker\Generator $faker) { $factory->define(App\Models\Ticket::class, function (Faker\Generator $faker) { return [ + 'user_id' => factory(App\Models\User::class)->create()->id, 'edited_by_user_id' => factory(App\Models\User::class)->create()->id, 'account_id' => factory(App\Models\Account::class)->create()->id, 'order_id' => factory(App\Models\OrderStatus::class)->create()->id, @@ -224,7 +225,7 @@ $factory->define(App\Models\Ticket::class, function (Faker\Generator $faker) { 'start_sale_date' => Carbon::now(), 'end_sale_date' => Carbon::now()->addDays(20), 'sales_volume' => 0, - 'organizer_fees_volume' => 0, + 'organiser_fees_volume' => 0, 'is_paused' => 0 ]; }); @@ -260,13 +261,12 @@ $factory->define(App\Models\Attendee::class, function (Faker\Generator $faker) { 'first_name' => $faker->firstName, 'last_name' => $faker->lastName, 'email' => $faker->email, - 'reference' => $faker->text(20), + 'reference_index' => $faker->numberBetween(), 'private_reference_number' => 1, 'is_cancelled' => false, 'has_arrived' => false, 'arrival_time' => Carbon::now(), 'account_id' => factory(App\Models\Account::class)->create()->id, - ]; }); @@ -275,7 +275,6 @@ $factory->define(App\Models\Message::class, function (Faker\Generator $faker) { 'message' => $faker->text, 'subject' => $faker->text, 'recipients' => 0, - ]; }); diff --git a/tests/EventAttendeesTest.php b/tests/EventAttendeesTest.php new file mode 100644 index 00000000..93ade5a4 --- /dev/null +++ b/tests/EventAttendeesTest.php @@ -0,0 +1,34 @@ +create([ + 'account_id' => 1 + ]); + + $event = factory(App\Models\Event::class)->create([ + 'account_id' => $organiser->account_id, + ]); + + $attendee = factory(App\Models\Attendee::class)->create([ + 'account_id' => $organiser->account_id, + 'event_id' => $event->id, + 'first_name' => 'Test First Name', + 'last_name' => 'Test Last Name', + ]); + + $this->actingAs($this->test_user) + ->visit(route('showEventAttendees', ['event_id' => $attendee->event->id])) + ->see('Attendees') + ->see('Test First Name') + ->see('Test Last Name'); + } +}