Merge pull request #52 from avored/dev

merge dev to master
avored · Oct 15, 2018 · 5094a42 · 5094a42
2 parents 1ae2f7d + a043405
commit 5094a42
Show file tree

Hide file tree

Showing 145 changed files with 643 additions and 832 deletions.
diff --git a/composer.json b/composer.json
@@ -23,16 +23,17 @@
 	"require" : {
 		"php" : ">=7.1.3",
 		"symfony/yaml" : "^4.0",
-		"laravel/framework" : "5.6.*",
+		"laravel/framework" : "5.7.*",
 		"barryvdh/laravel-dompdf": "0.8.*",
-		"laravel/passport": "5.0.*",
+		"laravel/passport": "7.0.*",
 		"stripe/stripe-php": "^6.3",
 		"beyondcode/laravel-self-diagnosis": "^1.0"
 
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "~7.0",
-		"orchestra/testbench" : "~3.6"
+		"orchestra/testbench" : "~3.7",
+		"mockery/mockery" : "1.2.*"
 	},
 	"autoload" : {
 		"psr-4" : {

diff --git a/database/migrations/2017_03_29_000000_avored_framework_schema.php b/database/migrations/2017_03_29_000000_avored_framework_schema.php
@@ -391,6 +391,7 @@ public function up()
             $table->string('language')->nullable()->default('en');
             $table->string('image_path')->nullable()->default(null);
             $table->rememberToken();
+            $table->timestamp('email_verified_at')->nullable();
             $table->timestamps();
 
             $table->foreign('role_id')->references('id')->on('roles')->onDelete('cascade');
@@ -406,8 +407,8 @@ public function up()
             $table->string('company_name')->nullable();
             $table->string('phone')->nullable();
             $table->enum('status', ['GUEST', 'LIVE'])->default('LIVE');
-            $table->string('activation_token')->nullable()->default(null);
             $table->string('tax_no')->nullable()->default(null);
+            $table->timestamp('email_verified_at')->nullable();
             $table->rememberToken();
             $table->timestamps();
         });

diff --git a/resources/views/forms/file.blade.php b/resources/views/forms/file.blade.php
@@ -7,8 +7,6 @@
     $value = $model->$name;
 }
 
-//dd($value);
-
 if(isset($attributes)) {
     $attributes['name'] = $name;
     $attributes['type'] = "file";

diff --git a/resources/views/product-attribute/select.blade.php b/resources/views/product-attribute/select.blade.php
@@ -1,9 +1,7 @@
 <div class="form-group">
     <label for="{{ $field->name() }}">{{ $field->label() }}</label>
     <select class="form-control" name="{{ $field->name() }}" id="{{ $field->name() }}">
-        <?php
-        //dd($field->option());
-        ?>
+
         @foreach($field->option() as $optionValue => $optionLabel)
             <option value="{{ $optionValue }}">{{ $optionLabel }}</option>
         @endforeach

diff --git a/resources/views/product/card/downloadable.blade.php b/resources/views/product/card/downloadable.blade.php
@@ -1,10 +1,6 @@
 
 @include('avored-framework::forms.file',['name' => 'downloadable[demo_product]','label' => 'Demo Product (If any)'])
 
-<?php 
-
-//dd($model->downloadable);
-?>
 @if(isset($model) && isset($model->downloadable) && $model->downloadable->demo_path != "")
 
 <a href="{{ route('admin.product.download.demo.media', $model->downloadable->token) }}"

diff --git a/resources/views/product/card/property.blade.php b/resources/views/product/card/property.blade.php
@@ -40,7 +40,6 @@ class="btn btn-warning modal-use-selected">
                     @php
                     if(!$productVarcharPropertyValue instanceof \AvoRed\Framework\Models\Database\Property) {
                         $property = $productVarcharPropertyValue->property;
-                        //dd($productVarcharPropertyValue);
                     } else {
                         $property = $productVarcharPropertyValue;
                     }

diff --git a/resources/views/product/edit.blade.php b/resources/views/product/edit.blade.php
@@ -133,10 +133,6 @@ class="btn btn-primary"
                 </button>
             </div>
 
-        <?php 
-        
-        //dd($model);
-        ?>
         </form>
 </div>
 @endsection

diff --git a/src/AdminConfiguration/Provider.php b/src/AdminConfiguration/Provider.php
@@ -20,7 +20,6 @@ class Provider extends ServiceProvider
     public function boot()
     {
         $this->registerAdminConfiguration();
-
     }
 
     /**
@@ -56,7 +55,6 @@ public function provides()
         return ['adminconfiguration', 'AvoRed\Framework\AdminConfiguration\Manager'];
     }
 
-
     /**
      * Register the Menus.
      *
@@ -188,5 +186,4 @@ protected function registerAdminConfiguration()
                 return $options;
             });
     }
-
 }
diff --git a/src/Api/Controllers/AttributeController.php b/src/Api/Controllers/AttributeController.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\JsonResponse;
 use AvoRed\Framework\Models\Database\Attribute;
-use AvoRed\Framework\Api\Controllers\Controller;
 use AvoRed\Framework\Api\Resources\Attribute\AttributeResource;
 use AvoRed\Framework\Api\Resources\Attribute\AttributeCollectionResource;
 use AvoRed\Framework\Product\Requests\AttributeRequest;
@@ -13,7 +12,7 @@ class AttributeController extends Controller
 {
     /**
      * Return upto 10 Record for an Resource in Json Formate
-     * 
+     *
      * @return \Illuminate\Http\Resources\CollectsResources
      */
     public function index()
@@ -25,7 +24,7 @@ public function index()
 
     /**
      * Create an Resource and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function store(AttributeRequest $request)
@@ -37,7 +36,7 @@ public function store(AttributeRequest $request)
 
     /**
      * Find a Record and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function show(Attribute $attribute)
@@ -47,7 +46,7 @@ public function show(Attribute $attribute)
 
     /**
      * Update and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function update(AttributeRequest $request, Attribute $attribute)
@@ -58,10 +57,10 @@ public function update(AttributeRequest $request, Attribute $attribute)
 
     /**
      * Destroy an Record and Return Null Json Response
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
-        public function destroy(Attribute $attribute)
+    public function destroy(Attribute $attribute)
     {
         $attribute->delete();
         return JsonResponse::create(null, 204);

diff --git a/src/Api/Controllers/CategoryController.php b/src/Api/Controllers/CategoryController.php
@@ -5,15 +5,14 @@
 use Illuminate\Http\JsonResponse;
 use AvoRed\Framework\Models\Database\Category;
 use AvoRed\Framework\Product\Requests\CategoryRequest;
-use AvoRed\Framework\Api\Controllers\Controller;
 use AvoRed\Framework\Api\Resources\Category\CategoryResource;
 use AvoRed\Framework\Api\Resources\Category\CategoryCollectionResource;
 
 class CategoryController extends Controller
 {
     /**
      * Return upto 10 Record for an Resource in Json Formate
-     * 
+     *
      * @return \Illuminate\Http\Resources\CollectsResources
      */
     public function index()
@@ -25,7 +24,7 @@ public function index()
 
     /**
      * Create an Resource and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function store(CategoryRequest $request)
@@ -37,16 +36,17 @@ public function store(CategoryRequest $request)
 
     /**
      * Find a Record and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function show(Category $category)
     {
         return new CategoryResource($category);
     }
+
     /**
      * Update and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function update(CategoryRequest $request, Category $category)
@@ -57,7 +57,7 @@ public function update(CategoryRequest $request, Category $category)
 
     /**
      * Destroy an Record and Return Null Json Response
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function destroy(Category $category)

diff --git a/src/Api/Controllers/OrderController.php b/src/Api/Controllers/OrderController.php
@@ -2,17 +2,15 @@
 
 namespace AvoRed\Framework\Api\Controllers;
 
-use Illuminate\Http\JsonResponse;
 use AvoRed\Framework\Models\Database\Order;
-use AvoRed\Framework\Api\Controllers\Controller;
 use AvoRed\Framework\Api\Resources\Order\OrderCollectionResource;
 use AvoRed\Framework\Api\Resources\Order\OrderResource;
 
 class OrderController extends Controller
 {
     /**
      * Return upto 10 Record for an Resource in Json Formate
-     * 
+     *
      * @return \Illuminate\Http\Resources\CollectsResources
      */
     public function index()
@@ -21,15 +19,14 @@ public function index()
 
         return new OrderCollectionResource($orders);
     }
-    
+
     /**
      * Find a Record and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function show(Order $order)
     {
         return new OrderResource($order);
     }
-
 }
diff --git a/src/Api/Controllers/PageController.php b/src/Api/Controllers/PageController.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\JsonResponse;
 use AvoRed\Framework\Models\Database\Page;
-use AvoRed\Framework\Api\Controllers\Controller;
 use AvoRed\Framework\Api\Resources\Page\PageResource;
 use AvoRed\Framework\Api\Resources\Page\PageCollectionResource;
 use AvoRed\Framework\Cms\Requests\PageRequest;
@@ -13,7 +12,7 @@ class PageController extends Controller
 {
     /**
      * Return upto 10 Record for an Resource in Json Formate
-     * 
+     *
      * @return \Illuminate\Http\Resources\CollectsResources
      */
     public function index()
@@ -25,7 +24,7 @@ public function index()
 
     /**
      * Create an Resource and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function store(PageRequest $request)
@@ -35,19 +34,19 @@ public function store(PageRequest $request)
         return (new PageResource($page));
     }
 
-   /**
-     * Find a Record and Returns a Json Resrouce for that Record
-     * 
-     * @return \Illuminate\Http\Resources\Json\JsonResource
-     */
+    /**
+      * Find a Record and Returns a Json Resrouce for that Record
+      *
+      * @return \Illuminate\Http\Resources\Json\JsonResource
+      */
     public function show(Page $page)
     {
         return new PageResource($page);
     }
 
     /**
      * Update and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function update(PageRequest $request, Page $page)
@@ -58,7 +57,7 @@ public function update(PageRequest $request, Page $page)
 
     /**
      * Destroy an Record and Return Null Json Response
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function destroy(Page $page)

diff --git a/src/Api/Controllers/ProductController.php b/src/Api/Controllers/ProductController.php
@@ -5,15 +5,14 @@
 use Illuminate\Http\JsonResponse;
 use AvoRed\Framework\Models\Database\Product;
 use AvoRed\Framework\Product\Requests\ProductRequest;
-use AvoRed\Framework\Api\Controllers\Controller;
 use AvoRed\Framework\Api\Resources\Product\ProductResource;
 use AvoRed\Framework\Api\Resources\Product\ProductCollectionResource;
 
 class ProductController extends Controller
 {
     /**
      * Return upto 10 Record for an Resource in Json Formate
-     * 
+     *
      * @return \Illuminate\Http\Resources\CollectsResources
      */
     public function index()
@@ -25,7 +24,7 @@ public function index()
 
     /**
      * Create an Resource and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function store(ProductRequest $request)
@@ -37,7 +36,7 @@ public function store(ProductRequest $request)
 
     /**
      * Find a Record and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function show($id)
@@ -48,7 +47,7 @@ public function show($id)
 
     /**
      * Update and Returns a Json Resrouce for that Record
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function update(ProductRequest $request, $id)
@@ -57,10 +56,10 @@ public function update(ProductRequest $request, $id)
         $product->update($request->all());
         return new ProductResource($product);
     }
- 
+
     /**
      * Destroy an Record and Return Null Json Response
-     * 
+     *
      * @return \Illuminate\Http\Resources\Json\JsonResource
      */
     public function destroy($id)
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,10 +133,6 @@ class="btn btn-primary" @@
                     </button>
                 </div>
-            <?php
-            //dd($model);
-            ?>
             </form>
     </div>
     @endsection
@@ Expand Down @@