Merge pull request #76 from avored/dev

Dev

Author: indpurvesh

.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: iq6DvLKbtCBGIL6vstOeIGdCKwdezgKSc

.travis.yml

@@ -6,5 +6,6 @@ php:
   - '7.2'
 script:
 - vendor/bin/phpunit -c phpunit.xml
+- vendor/bin/phpunit --coverage-clover=coverage.xml
 
-install: composer install --no-interaction
+install: composer install --no-interaction

README.md

@@ -1,4 +1,4 @@
-# AvoRed E commerce Framework
+# AvoRed a modular Shopping cart framework for a laravel php framework
 AvoRed Framework contains the core features for the AvoRed E commerce for Laravel. It is the base behind the AvoRed an Laravel Ecommerce.
 
 #### Installation

composer.json

@@ -26,7 +26,7 @@
 		"laravel/framework" : "5.8.*"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "~8.1",
+		"phpunit/phpunit": "^7.5",
 		"orchestra/testbench" : "~3.7",
 		"mockery/mockery" : "1.2.*"
 	},

src/Cart/Manager.php

@@ -62,7 +62,6 @@ public function add(string $slug, $qty = 1)
             $this->cartCollection->put($slug, $cartProduct);
             $this->updateSessionCollection();
         }
-        return true;
     }
 
     /**
@@ -155,7 +154,7 @@ public function toArray()
 
     /**
      * Get the List of All the Current Session Cart Products.
-     * @return float $cartTotal
+     * @return mixed $cartTotal
      */
     public function total($format = true)
     {

src/Catalog/Controllers/ProductController.php

@@ -203,7 +203,7 @@ public function saveProductProperty($product, $request)
      * Upload Product Images
      * @param \AvoRed\Framework\Catalog\Requests\ProductImageRequest $request
      * @param \AvoRed\Framework\Database\Models\Product $product
-     * @return json
+     * @return \Illuminate\Http\JsonResponse
      */
     public function upload(ProductImageRequest $request, Product $product)
     {
@@ -218,13 +218,13 @@ public function upload(ProductImageRequest $request, Product $product)
         } else {
             $imageModel = $product->images()->create(['path' => $dbPath]);
         }
-        return ['image' => $imageModel];
+        return response()->json(['image' => $imageModel]);
     }
 
     /**
      * Destroy Product Images
      * @param \AvoRed\Framework\Database\Models\ProductImage $productImage
-     * @return json
+     * @return \Illuminate\Http\JsonResponse
      */
     public function destroyImage(ProductImage $productImage)
     {
@@ -233,7 +233,7 @@ public function destroyImage(ProductImage $productImage)
             File::delete($filePath);
         }
         $productImage->delete();
-        return ['success' => true];
+        return response()->json(['success' => true]);
     }
 
     /**

src/Cms/Controllers/MenuController.php

@@ -22,7 +22,8 @@ class MenuController
 
     /**
      * Construct for the AvoRed install command
-     * @param \AvoRed\Framework\Database\Repository\MenuRepository $menuRepository
+     * @param \AvoRed\Framework\Database\Contracts\MenuModelInterface $menuRepository
+     * @param \AvoRed\Framework\Database\Contracts\CategoryModelInterface $categoryRepository
      */
     public function __construct(
         MenuModelInterface $menuRepository,
@@ -39,7 +40,6 @@ public function __construct(
     public function index()
     {
         $categories = $this->categoryRepository->all();
-        //$categories = $this->setCategoriesUrl();
 
         return view('avored::cms.menu.create')
             ->with('categories', $categories);
@@ -78,9 +78,9 @@ public function store(MenuRequest $request)
      */
     public function setCategoriesUrl($categories)
     {
-        
+        //@todo
         foreach ($categories as $category) {
-            $url = route();
+            $url = route('admin.category');
             $category->url = $url;
         }
 

src/Cms/Requests/MenuRequest.php

@@ -23,11 +23,8 @@ public function authorize()
      */
     public function rules()
     {
-        $validationRule = [];
-        $validationRule['name'] = 'required|max:255';
-        if (null === $this->request->get('menu_group_id')) {
-            $validationRule['identifier'] = 'required|unique:menu_groups';
-        }
-        return $validationRule;
+        $rules = [];
+        
+        return $rules;
     }
 }

src/Database/Models/AdminUser.php

@@ -2,14 +2,11 @@
 
 namespace AvoRed\Framework\Database\Models;
 
-use Illuminate\Notifications\Notifiable;
 use AvoRed\Framework\User\Notifications\ResetPassword;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use Laravel\Passport\ClientRepository;
 
 class AdminUser extends Authenticatable
 {
-    use Notifiable;
     /**
      * The attributes that are mass assignable.
      *
@@ -82,23 +79,6 @@ public function setPasrdAttribute($val)
         $this->attributes['password'] = bcrypt($val);
     }
 
-    /**
-     * Get the Passport Client for User and If it doesnot exist then create a new one
-     * @return \Laravel\Passport\Client $client
-     */
-    public function getPassportClient()
-    {
-        $client = $this->clients->first();
-        if (null === $client) {
-            $clientRepository = app(ClientRepository::class);
-            
-            $redirectUri = route('home'); // Setup Env Variable for Graphql Admin
-            $client = $clientRepository->createPasswordGrantClient($this->id, $this->name, $redirectUri);
-        }
-        
-        return $client;
-    }
-
     /**
      * To check if user has permission to access the given route name
      * @return bool

src/Database/Models/ProductImage.php

@@ -19,7 +19,7 @@ class ProductImage extends Model
 
     /**
      * Belongs to Many Product
-     * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
      */
     public function product()
     {