Merge branch 'release/2.0.0-beta.5'

Author: Arrow768

.gitattributes

@@ -1,3 +1,4 @@
 * text=auto
 *.css linguist-vendored
 *.less linguist-vendored
+public/templates/adminlte205/* linguist-vendored

.gitignore

@@ -2,5 +2,5 @@
 /vendor
 /node_modules
 .env
-tests/logs/output.html
-tests/tests/logs/output.html
+/tests/logs
+/packages

composer.json

@@ -1,8 +1,14 @@
 {
-	"name": "SourceMod-Store/WebPanel-Core",
+	"name": "sourcemod-store/wp-core",
 	"description": "The Core for the New WebPanel",
-	"keywords": ["sourcemod", "store", "WebPanel", "laravel"],
-	"license": "AGPL",
+	"keywords": ["sourcemod", "store", "sourcemod-store-webpanel", "laravel"],
+	"license": "AGPL-3.0",
+    "authors": [
+      {
+        "name": "Werner Maisl",
+        "email": "dev@myhomenet.at"
+      }
+    ],
 	"type": "project",
 	"require": {
         "php": ">=5.5.9",

resources/views/templates/adminlte205/webpanel/app.blade.php

@@ -62,7 +62,7 @@
 
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 2.0.0-beta.4
+            <b>Version</b> 2.0.0-beta.5
         </div>
         Copyright &copy; 2013-2015  Store Plugin: <strong>Alon Gubkin</strong>, <strong>Keith Warren</strong> - WebPanel: <strong>Werner Maisl</strong>. All rights reserved.
     </footer>

resources/views/templates/adminlte205/webpanel/store/categories/_actions.blade.php

@@ -1,11 +1,11 @@
 <div>
     <div style="float: right">
-        {!! Form::open(['method' => 'DELETE', 'url' => route('webpanel.store.users.destroy',$category->id)]) !!}
+        {!! Form::open(['method' => 'DELETE', 'url' => route('webpanel.store.categories.destroy',$category->id)]) !!}
         {!! Form::submit('Remove ' . $category->id,['class' => 'btn btn-danger']) !!}
         {!! Form::close() !!}
     </div>
     <div style="float: right">
-        {!! Form::open(['method' => 'GET', 'url' => route('webpanel.store.users.edit',$category->id)]) !!}
+        {!! Form::open(['method' => 'GET', 'url' => route('webpanel.store.categories.edit',$category->id)]) !!}
         {!! Form::submit('Edit ' . $category->id,['class' => 'btn btn-danger']) !!}
         {!! Form::close() !!}
     </div>

tests/StoreCategoryTest.php

@@ -20,7 +20,7 @@ public function check_if_overview_can_be_accessed()
         $this->visit('/webpanel/store/categories')->see('All Categories');
     }
 
-    /** @test TODO: Fix the test to support the jquery datatables
+
     public function create_category_and_check_if_exists()
     {
         //Delete category if already exists
@@ -40,31 +40,29 @@ public function create_category_and_check_if_exists()
         $this->type('#3751d5', 'web_color');
         $this->press('Create Category');
 
-        $this->see("Int Test Cat"); //Check for the display name
-        $this->see('integration_test'); // Check for the Requrie-Plugin
-
         //Get the ID of the Category
         $category_id = $this->get_category_id();
 
-        //Visit the Edit page
-        $this->press('Edit ' . $category_id);
+        $this->visit('/webpanel/store/categories/'.$category_id.'/edit');
         $this->see("Int Test Cat"); //Check for the display name
-        $this->see('integration_test'); // Check for the Requrie-Plugin
+        $this->see('integration_test'); // Check for the Require-Plugin
         $this->see('Integration Test Category'); //Check for the description
 
         //Make a Edit and Save
         $this->type('integration_test_2', 'require_plugin');
         $this->press('Edit Category');
 
         //Confirm the edit
+        $this->visit('/webpanel/store/categories/'.$category_id.'/edit');
         $this->see('integration_test_2');
 
         //Delete the category
-        $this->press('Remove ' . $category_id);
+        //TODO: Add Remove and Remove + Refund button to the edit page so removing a category can be testet
+        //$this->press('Remove ' . $category_id);
 
         //Confirm that its deleted
-        $this->assertNull(StoreCategory::where('display_name', 'test')->first());
-    }*/
+        //$this->assertNull(StoreCategory::where('display_name', 'test')->first());
+    }
 
     private function get_category_id()
     {

tests/StoreItemTest.php

@@ -18,7 +18,7 @@ public function check_if_overview_can_be_accessed()
         $this->login_with_admin_user();
 
         //Check if overview can be accessed
-        $this->visit('/webpanel/store/categories')->see('All Categories');
+        $this->visit('/webpanel/store/items')->see('All Items');
     }
 
     /** @test */
@@ -43,35 +43,40 @@ public function create_item_and_check_if_exists()
         $this->type('integration_test', 'type');
         $this->type('integration_slot', 'loadout_slot');
         $this->type('7669035', 'price');
-        $this->type('test-cat', 'category_id');
+        $this->type($this->get_category_id(), 'category_id');
 
         $this->press('Create Item');
 
-        $this->see('test-itm'); //Check for the name
-        $this->see('integration_test'); // Check for the type
+
+        //TODO: Check if the item exists in the db
+
 
 
         //Get the ID of the Item
         $item_id = $this->get_item_id();
 
 
         //Visit the Edit page
-        $this->press('Edit ' . $item_id);
+        $this->visit('/webpanel/store/items/'.$item_id.'/edit')->see('Edit Item test-itm');
         $this->see("test-itm"); //Check for the name
         $this->see("integration_slot"); //Check for the loadout slot
 
         //Make a Edit and Save
         $this->type('integration_test_2', 'type'); //Change the type
-        $this->press('Edit Category');
+        $this->press('Edit Item');
+
+        $this->visit('/webpanel/store/items/'.$item_id.'/edit')->see('Edit Item test-itm');
 
         //Confirm the edit
         $this->see('integration_test_2'); //Verify the changed type
 
+
+        //TODO: Add a remove and a remove+refund button so the item can be deleted from the edit menu
         //Delete the category
-        $this->press('Remove ' . $item_id);
+        //$this->press('Remove ' . $item_id);
 
         //Confirm that its deleted
-        $this->assertNull(StoreItem::where('name', 'test-itm')->first());
+        //$this->assertNull(StoreItem::where('name', 'test-itm')->first());
     }
 
 
@@ -95,7 +100,7 @@ private function delete_item_if_exists()
 
     private function create_category()
     {
-        $category = StoreCategory::where('name', 'test-cat')->first();
+        $category = StoreCategory::where('display_name', 'test-cat')->first();
 
         if($category != null)
         {
@@ -113,6 +118,12 @@ private function create_category()
         $category->save();
     }
 
+    private function get_category_id()
+    {
+        $category = StoreCategory::where('display_name','test-cat')->first();
+        return $category->id;
+    }
+
     private function login_with_admin_user()
     {
         $admin = User::where('name', 'admin')->first();