Skip to content
This repository was archived by the owner on Jan 5, 2019. It is now read-only.

Commit c98c219

Browse files
author
Mario Basic
committed
Reverted occurrencecontroller back to previous way. Changed occurs_at from timestamp to datetime.
1 parent 7a5b8cf commit c98c219

File tree

2 files changed

+56
-6
lines changed

2 files changed

+56
-6
lines changed

app/Http/Controllers/Api/OccurrenceController.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,40 @@
99

1010
class OccurrenceController extends Controller
1111
{
12-
public function toggleOffer($id, Request $request)
12+
public function toggleOffer(Occurrence $occurrence, Request $request)
1313
{
1414
$this->validate($request, [
1515
'state' => 'required|boolean'
1616
]);
1717

18-
$occurrence = Occurrence::findOrFail($id);
1918
$occurrence->offer_sent = $request->get('state');
2019
$occurrence->save();
2120

2221
return $occurrence->offer_sent;
2322
}
2423

25-
public function togglePayment($id, Request $request)
24+
public function togglePayment(Occurrence $occurrence, Request $request)
2625
{
2726
$this->validate($request, [
2827
'state' => 'required|boolean'
2928
]);
3029

31-
$occurrence = Occurrence::findOrFail($id);
30+
var_dump($occurrence->occurs_at);
31+
3232
$occurrence->payment_received = $request->get('state');
3333
$occurrence->save();
3434

35+
var_dump($occurrence->occurs_at);
36+
3537
return $occurrence->payment_received;
3638
}
3739

38-
public function toggleReceipt($id, Request $request)
40+
public function toggleReceipt(Occurrence $occurrence, Request $request)
3941
{
4042
$this->validate($request, [
4143
'state' => 'required|boolean'
4244
]);
4345

44-
$occurrence = Occurrence::findOrFail($id);
4546
$occurrence->receipt_sent = $request->get('state');
4647
$occurrence->save();
4748

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
3+
use Illuminate\Database\Schema\Blueprint;
4+
use Illuminate\Database\Migrations\Migration;
5+
6+
class FixOccurrencesOccursAtColumnByDroppingTable extends Migration
7+
{
8+
/**
9+
* Run the migrations.
10+
*
11+
* @return void
12+
*/
13+
public function up()
14+
{
15+
Schema::drop('occurrences');
16+
17+
Schema::create('occurrences', function (Blueprint $table) {
18+
$table->dateTime('occurs_at');
19+
$table->boolean('offer_sent')->nullable();
20+
$table->boolean('payment_received')->nullable();
21+
$table->boolean('receipt_sent')->nullable();
22+
$table->integer('service_id')->unsigned();
23+
$table->foreign('service_id')->references('id')->on('services')->onDelete('cascade');
24+
$table->increments('id');
25+
$table->timestamps();
26+
});
27+
}
28+
29+
/**
30+
* Reverse the migrations.
31+
*
32+
* @return void
33+
*/
34+
public function down()
35+
{
36+
Schema::drop('occurrences');
37+
38+
Schema::create('occurrences', function (Blueprint $table) {
39+
$table->timestamp('occurs_at');
40+
$table->boolean('offer_sent')->nullable();
41+
$table->boolean('payment_received')->nullable();
42+
$table->boolean('receipt_sent')->nullable();
43+
$table->integer('service_id')->unsigned();
44+
$table->foreign('service_id')->references('id')->on('services')->onDelete('cascade');
45+
$table->increments('id');
46+
$table->timestamps();
47+
});
48+
}
49+
}

0 commit comments

Comments
 (0)