Merge branch 'master' of https://github.com/MinePoS/backend

.gitignore

@@ -20,3 +20,9 @@ Homestead.json
 
 # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
 .rocketeer/
+
+# IDE specific
+*.iml
+*.iws
+*.ipr
+.idea/

README.md

@@ -1 +1 @@
-# Backend
+# Backend

app/Http/Controllers/Admin/Dashboard.php

@@ -28,7 +28,7 @@ public function showChangePassword(){
 
 
     public function doChangePassword(){
-        if (Hash::check(\Request('current_password'), \Auth::user()->password)) {
+        if (\Hash::check(\Request('current_password'), \Auth::user()->password)) {
                 $new1 = \Request('new_password');
                 $new2 = \Request('new_password_repeat');
                 if($new1 == $new2){

app/Http/Controllers/HomeController.php

@@ -5,7 +5,7 @@
 use Illuminate\Http\Request;
 use App\Category;
 use App\Order;
-use Log;
+use Illuminate\Support\Facades\Log;
 
 class HomeController extends Controller
 {

app/Http/Controllers/PayPalTestController.php

@@ -15,8 +15,9 @@
 use PayPal\Api\Transaction;
 use PayPal\Api\PaymentExecution;
 use Andrew\PaypalIPN\PaypalIPNListener;
-use Log;
 use App\Order;
+use Illuminate\Support\Facades\Log;
+
 class PayPalTestController extends Controller
 {
     public function index(){

app/Order.php

@@ -3,7 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use DB;
+use Illuminate\Support\Facades\DB;
 use \DiscordWebhooks\Client;
 use \DiscordWebhooks\Embed;
 

app/Server.php

@@ -3,7 +3,7 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
-use Log;
+use Illuminate\Support\Facades\Log;
 
 class Server extends Model
 {