Merge pull request #95 from avored/dev

dev to master

.gitignore

@@ -0,0 +1,2 @@
+/vendor
+composer.lock

.styleci.yml

@@ -0,0 +1 @@
+preset: laravel

README.md

@@ -1,3 +1,15 @@
+<p align="center">
+    <a href="https://www.avored.com/" target="_blank"><img src="logo.svg" height="86" alt="AvoRed"></a>
+</p>
+
+<p align="center">
+    <a href="https://circleci.com/gh/avored/framework/tree/master"><img src="https://circleci.com/gh/avored/framework/tree/master.svg?style=shield" alt="CircleCI"></a>
+    <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/downloads" alt="Total Downloads"></a>
+    <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/v/stable" alt="Latest Stable Version"></a>
+    <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/license" alt="License"></a>
+</p>
+
+
 # Core package for avored shopping cart
 AvoRed Framework contains the core features for the AvoRed E commerce for Laravel. It is the base behind the AvoRed an Laravel Ecommerce.
 

composer.json

@@ -57,9 +57,11 @@
 				"Cart" : "AvoRed\\Framework\\Support\\Facades\\Cart",
 				"Menu" : "AvoRed\\Framework\\Support\\Facades\\Menu",
 				"Module" : "AvoRed\\Framework\\Support\\Facades\\Module",
-				"Permission" : "AvoRed\\Framework\\Support\\Facades\\Permission",
 				"Payment" : "AvoRed\\Framework\\Support\\Facades\\Payment",
-				"Shipping" : "AvoRed\\Framework\\Support\\Facades\\Shipping"
+				"Permission" : "AvoRed\\Framework\\Support\\Facades\\Permission",
+				"Shipping" : "AvoRed\\Framework\\Support\\Facades\\Shipping",
+				"Tab" : "AvoRed\\Framework\\Support\\Facades\\Tab",
+				"Widget" : "AvoRed\\Framework\\Support\\Facades\\Widget"
 			}
 		}
 	},

config/avored.php

@@ -9,9 +9,9 @@
     'symlink_storage_folder' => 'storage',
     'cart' => ['session_key' => 'cart_products'],
     'model' => [
-        'user' => App\User::class
+        'user' => App\User::class,
     ],
-   
+
     'filesystems' => [
         'disks' => [
             'avored' => [
@@ -33,22 +33,22 @@
             'admin' => [
                 'driver' => 'session',
                 'provider' => 'admin-users',
-            ]
+            ],
         ],
-       
+
         'providers' => [
             'admin-users' => [
                 'driver' => 'eloquent',
                 'model' => AvoRed\Framework\Database\Models\AdminUser::class,
             ],
         ],
-    
+
         'passwords' => [
             'adminusers' => [
                 'provider' => 'admin-users',
                 'table' => 'admin_password_resets',
                 'expire' => 60,
             ],
         ],
-    ]
+    ],
 ];

database/factories/AdminUserFactory.php

@@ -5,15 +5,15 @@
 use AvoRed\Framework\Database\Models\AdminUser;
 
 $factory->define(AdminUser::class, function (Faker $faker) {
-
     $role = factory(Role::class)->create();
+
     return [
         'first_name' => $faker->firstName,
         'last_name' => $faker->lastName,
         'email' => $faker->email,
         'password' => 'secret',
         'role_id' => $role->id,
         'is_super_admin' => rand(0, 1),
-        'image_path' => null
+        'image_path' => null,
     ];
 });

database/factories/AttributeFactory.php

@@ -1,11 +1,12 @@
 <?php
+
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Attribute;
-use Illuminate\Support\Str;
 
 $factory->define(Attribute::class, function (Faker $faker) {
     $name = $faker->sentence;
-  
+
     return [
         'name' => $name,
         'slug' => Str::slug($name),

database/factories/CategoryFactory.php

@@ -1,9 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Category;
 
 $factory->define(Category::class, function (Faker $faker) {
     $name = $faker->word;
+
     return [
         'name' => $name,
         'slug' => Str::slug($name),

database/factories/CountryFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Country;
 

database/factories/CurrencyFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Currency;
 
@@ -8,6 +9,6 @@
         'code' => $faker->currencyCode,
         'symbol' => '$',
         'conversation_rate' => $faker->randomFloat,
-        'status' => 'ENABLED'
+        'status' => 'ENABLED',
     ];
 });

database/factories/LanguageFactory.php

@@ -1,10 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Language;
 
 $factory->define(Language::class, function (Faker $faker) {
     return [
         'name' => $faker->word,
-        'code' => $faker->languageCode
+        'code' => $faker->languageCode,
     ];
 });

database/factories/OrderStatusFactory.php

@@ -1,10 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\OrderStatus;
 
 $factory->define(OrderStatus::class, function (Faker $faker) {
     return [
         'name' => $faker->sentence,
-        'is_default' => rand(0, 1)
+        'is_default' => rand(0, 1),
     ];
 });

database/factories/PageFactory.php

@@ -1,14 +1,16 @@
 <?php
+
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Page;
-use Illuminate\Support\Str;
 
 $factory->define(Page::class, function (Faker $faker) {
     $name = $faker->word;
     $slug = Str::slug($name);
+
     return [
         'name' => $name,
         'slug' => $slug,
-        'content' => $faker->text(rand(50, 60))
+        'content' => $faker->text(rand(50, 60)),
     ];
 });

database/factories/PermissionFactory.php

@@ -1,9 +1,10 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Permission;
 
 $factory->define(Permission::class, function (Faker $faker) {
     return [
-        'name' => $faker->word
+        'name' => $faker->word,
     ];
 });

database/factories/PropertyFactory.php

@@ -1,11 +1,12 @@
 <?php
+
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Property;
-use Illuminate\Support\Str;
 
 $factory->define(Property::class, function (Faker $faker) {
     $name = $faker->sentence;
-  
+
     return [
         'name' => $name,
         'slug' => Str::slug($name),

database/factories/RoleFactory.php

@@ -1,10 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\Role;
 
 $factory->define(Role::class, function (Faker $faker) {
     return [
         'name' => $faker->word,
-        'description' => $faker->text(rand(50, 60))
+        'description' => $faker->text(rand(50, 60)),
     ];
 });

database/factories/StateFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\State;
 

database/factories/TaxGroupFactory.php

@@ -1,10 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\TaxGroup;
 
 $factory->define(TaxGroup::class, function (Faker $faker) {
     return [
         'name' => $faker->word,
-        'description' => $faker->sentence
+        'description' => $faker->sentence,
     ];
 });

database/factories/TaxRateFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\TaxRate;
 
@@ -8,6 +9,6 @@
         'description' => $faker->sentence,
         'postcode' => $faker->postcode,
         'rate' => $faker->randomFloat(2, 0, 2),
-        'rate_type' => 'PERCENTAGE'
+        'rate_type' => 'PERCENTAGE',
     ];
 });

database/factories/UserGroupFactory.php

@@ -1,10 +1,11 @@
 <?php
+
 use Faker\Generator as Faker;
 use AvoRed\Framework\Database\Models\UserGroup;
 
 $factory->define(UserGroup::class, function (Faker $faker) {
     return [
         'name' => $faker->word,
-        'is_default' => rand(0, 1)
+        'is_default' => rand(0, 1),
     ];
 });

database/migrations/2017_03_29_000000_avored_framework_schema.php

@@ -2,8 +2,8 @@
 
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
 use AvoRed\Framework\Database\Models\Country;
+use Illuminate\Database\Migrations\Migration;
 
 class AvoredFrameworkSchema extends Migration
 {
@@ -86,7 +86,7 @@ public function up()
             $table->bigInteger('permission_id')->unsigned();
             $table->bigInteger('role_id')->unsigned();
             $table->timestamps();
-            
+
             $table->foreign('permission_id')->references('id')->on('permissions')->onDelete('cascade');
             $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade');
         });
@@ -229,7 +229,7 @@ public function up()
             $table->enum('rate_type', ['PERCENTAGE', 'FIXED'])->default('PERCENTAGE');
             $table->timestamps();
         });
-        
+
         Schema::create('menu_groups', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('name')->nullable()->default(null);
@@ -292,7 +292,7 @@ public function up()
             $table->foreign('product_id')
                 ->references('id')->on('products')->onDelete('cascade');
         });
-        
+
         Schema::create('product_property_varchar_values', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('property_id');
@@ -387,7 +387,7 @@ public function up()
             //$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->foreign('country_id')->references('id')->on('countries')->onDelete('cascade');
         });
-    
+
         Schema::create('orders', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('shipping_option');
@@ -399,13 +399,13 @@ public function up()
             $table->unsignedBigInteger('billing_address_id')->nullable();
             $table->string('track_code')->nullable()->default(null);
             $table->timestamps();
-    
+
             $table->foreign('currency_id')->references('id')->on('currencies');
             $table->foreign('shipping_address_id')->references('id')->on('addresses');
             $table->foreign('billing_address_id')->references('id')->on('addresses');
             $table->foreign('order_status_id')->references('id')->on('order_statuses');
         });
-    
+
         Schema::create('order_products', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('product_id');
@@ -464,7 +464,7 @@ public function up()
             $table->timestamps();
         });
 
-        $path = __DIR__ . '/../../assets/countries.json';
+        $path = __DIR__.'/../../assets/countries.json';
         $json = json_decode(file_get_contents($path), true);
         foreach ($json as $country) {
             Country::create([
@@ -487,7 +487,6 @@ public function down()
     {
         Schema::disableForeignKeyConstraints();
 
-
         Schema::dropIfExists('attribute_product');
         Schema::dropIfExists('attribute_product_values');
         Schema::dropIfExists('product_variations');
@@ -526,14 +525,14 @@ public function down()
 
         Schema::dropIfExists('category_translations');
         Schema::dropIfExists('categories');
-        
+
         Schema::dropIfExists('admin_users');
         Schema::dropIfExists('admin_password_resets');
 
         Schema::dropIfExists('roles');
 
         Schema::dropIfExists('languages');
-        
+
         Schema::enableForeignKeyConstraints();
     }
 }