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

Commit 32e7ef6

Browse files
author
Mario Basic
committed
Managed assets. Fixed bug in service update method not storing client id.
1 parent dfc2af4 commit 32e7ef6

29 files changed

+45238
-14
lines changed

app/Http/Controllers/ServiceController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ public function update(Request $request, $id)
132132

133133
$client = Client::find($request->get('client_id'));
134134
$service->client()->associate($client);
135+
$service->save();
135136

136137
event(new ServiceWasUpdated($service));
137138

gulpfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,10 @@ var elixir = require('laravel-elixir');
1212
*/
1313

1414
elixir(function(mix) {
15-
mix.sass('app.scss');
15+
mix
16+
.copy('node_modules/bootstrap-less/fonts', 'public/build/fonts')
17+
.copy('node_modules/font-awesome/fonts', 'public/build/fonts')
18+
.less('app.less')
19+
.browserify('app.js')
20+
.version(['css/app.css', 'js/app.js']);
1621
});

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"devDependencies": {
88
"gulp": "^3.9.1",
99
"laravel-elixir": "^5.0.0",
10-
"bootstrap-sass": "^3.3.0"
10+
"bootbox": "^4.4.0",
11+
"bootstrap": "^3.3.6",
12+
"bootstrap-less": "^3.3.8",
13+
"font-awesome": "^4.6.3",
14+
"jquery": "^3.1.0"
1115
}
1216
}

0 commit comments

Comments
 (0)