diff --git a/composer.json b/composer.json
index 0a67e16e8..1332b5454 100644
--- 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
index abb442e0c..3a254b5f6 100644
--- 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
index f8a437ae0..7584a313b 100644
--- 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
index 822833ab7..978019c9a 100644
--- a/resources/views/product-attribute/select.blade.php
+++ b/resources/views/product-attribute/select.blade.php
@@ -1,9 +1,7 @@
-
@endsection
diff --git a/src/AdminConfiguration/Provider.php b/src/AdminConfiguration/Provider.php
index 474eff6ed..aa8b35041 100644
--- 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
index d0304033a..42e5965a0 100644
--- 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
index 12e428abb..c7c3b0507 100644
--- a/src/Api/Controllers/CategoryController.php
+++ b/src/Api/Controllers/CategoryController.php
@@ -5,7 +5,6 @@
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;
@@ -13,7 +12,7 @@ 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
index f38b2fcd6..9be8b4cc3 100644
--- a/src/Api/Controllers/OrderController.php
+++ b/src/Api/Controllers/OrderController.php
@@ -2,9 +2,7 @@
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;
@@ -12,7 +10,7 @@ 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
index 56879ff93..553a7ba47 100644
--- 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,11 +34,11 @@ 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);
@@ -47,7 +46,7 @@ public function show(Page $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
index cc5ff2b06..153457eff 100644
--- a/src/Api/Controllers/ProductController.php
+++ b/src/Api/Controllers/ProductController.php
@@ -5,7 +5,6 @@
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;
@@ -13,7 +12,7 @@ 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)
diff --git a/src/Api/Controllers/PropertyController.php b/src/Api/Controllers/PropertyController.php
index d6ff5fbe5..ae4b88113 100644
--- a/src/Api/Controllers/PropertyController.php
+++ b/src/Api/Controllers/PropertyController.php
@@ -4,7 +4,6 @@
use Illuminate\Http\JsonResponse;
use AvoRed\Framework\Models\Database\Property;
-use AvoRed\Framework\Api\Controllers\Controller;
use AvoRed\Framework\Api\Resources\Property\PropertyResource;
use AvoRed\Framework\Api\Resources\Property\PropertyCollectionResource;
use AvoRed\Framework\Product\Requests\PropertyRequest;
@@ -13,7 +12,7 @@ class PropertyController 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(PropertyRequest $request)
@@ -35,10 +34,9 @@ public function store(PropertyRequest $request)
return (new PropertyResource($property));
}
-
/**
* Find a Record and Returns a Json Resrouce for that Record
- *
+ *
* @return \Illuminate\Http\Resources\Json\JsonResource
*/
public function show(Property $property)
@@ -48,7 +46,7 @@ public function show(Property $property)
/**
* Update and Returns a Json Resrouce for that Record
- *
+ *
* @return \Illuminate\Http\Resources\Json\JsonResource
*/
public function update(PropertyRequest $request, Property $property)
@@ -59,7 +57,7 @@ public function update(PropertyRequest $request, Property $property)
/**
* Destroy an Record and Return Null Json Response
- *
+ *
* @return \Illuminate\Http\Resources\Json\JsonResource
*/
public function destroy(Property $property)
diff --git a/src/Api/Controllers/UserController.php b/src/Api/Controllers/UserController.php
index 77e943fb1..5fb7cf407 100644
--- a/src/Api/Controllers/UserController.php
+++ b/src/Api/Controllers/UserController.php
@@ -2,8 +2,6 @@
namespace AvoRed\Framework\Api\Controllers;
-use Illuminate\Http\JsonResponse;
-use AvoRed\Framework\Api\Controllers\Controller;
use AvoRed\Framework\Models\Database\User;
use AvoRed\Framework\Api\Resources\User\UserCollectionResource;
use AvoRed\Framework\Api\Resources\User\UserResource;
@@ -12,7 +10,7 @@ class UserController extends Controller
{
/**
* Return upto 10 Record for an Resource in Json Formate
- *
+ *
* @return \Illuminate\Http\Resources\CollectsResources
*/
public function index()
@@ -24,7 +22,7 @@ public function index()
/**
* Find a Record and Returns a Json Resrouce for that Record
- *
+ *
* @return \Illuminate\Http\Resources\Json\JsonResource
*/
public function show(User $user)
diff --git a/src/Api/Middleware/AdminApiAuth.php b/src/Api/Middleware/AdminApiAuth.php
index 26ea333e7..0db17cd4e 100644
--- a/src/Api/Middleware/AdminApiAuth.php
+++ b/src/Api/Middleware/AdminApiAuth.php
@@ -25,7 +25,7 @@ public function handle($request, Closure $next, $guard = 'api')
}
$user = Auth::user();
- if (isset($user->language) && ! empty($user->language)) {
+ if (isset($user->language) && !empty($user->language)) {
App::setLocale($user->language);
}
diff --git a/src/Api/Resources/Attribute/AttributeCollectionResource.php b/src/Api/Resources/Attribute/AttributeCollectionResource.php
index a1a64cabc..a92e53f3c 100644
--- a/src/Api/Resources/Attribute/AttributeCollectionResource.php
+++ b/src/Api/Resources/Attribute/AttributeCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Attribute/AttributeDropdownOptionCollectionResource.php b/src/Api/Resources/Attribute/AttributeDropdownOptionCollectionResource.php
index 70957978a..4bdbbf848 100644
--- a/src/Api/Resources/Attribute/AttributeDropdownOptionCollectionResource.php
+++ b/src/Api/Resources/Attribute/AttributeDropdownOptionCollectionResource.php
@@ -1,4 +1,5 @@
$this->collection,
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Attribute/AttributeResource.php b/src/Api/Resources/Attribute/AttributeResource.php
index 118187d14..95e07cdfb 100644
--- a/src/Api/Resources/Attribute/AttributeResource.php
+++ b/src/Api/Resources/Attribute/AttributeResource.php
@@ -30,10 +30,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Category/CategoryCollectionResource.php b/src/Api/Resources/Category/CategoryCollectionResource.php
index 8a19c6d9c..be3de7354 100644
--- a/src/Api/Resources/Category/CategoryCollectionResource.php
+++ b/src/Api/Resources/Category/CategoryCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Category/CategoryResource.php b/src/Api/Resources/Category/CategoryResource.php
index fd7f92fbb..3eb89e284 100644
--- a/src/Api/Resources/Category/CategoryResource.php
+++ b/src/Api/Resources/Category/CategoryResource.php
@@ -32,10 +32,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Order/OrderCollectionResource.php b/src/Api/Resources/Order/OrderCollectionResource.php
index abefee3c7..6cc8fd68b 100644
--- a/src/Api/Resources/Order/OrderCollectionResource.php
+++ b/src/Api/Resources/Order/OrderCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Order/OrderProductCollectionResource.php b/src/Api/Resources/Order/OrderProductCollectionResource.php
index 13dbc4c1d..6ff98ad77 100644
--- a/src/Api/Resources/Order/OrderProductCollectionResource.php
+++ b/src/Api/Resources/Order/OrderProductCollectionResource.php
@@ -6,7 +6,7 @@
class OrderProductCollectionResource extends ResourceCollection
{
- /**
+ /**
* Transform the resource collection into an array.
*
* @param \Illuminate\Http\Request
@@ -25,10 +25,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Order/OrderResource.php b/src/Api/Resources/Order/OrderResource.php
index da27ee21c..3d76df2f2 100644
--- a/src/Api/Resources/Order/OrderResource.php
+++ b/src/Api/Resources/Order/OrderResource.php
@@ -5,7 +5,6 @@
use Illuminate\Http\Resources\Json\JsonResource;
use AvoRed\Framework\Api\Resources\User\UserResource;
use AvoRed\Framework\Api\Resources\User\UserAddressResource;
-use AvoRed\Framework\Api\Resources\Order\OrderProductCollectionResource;
use Illuminate\Database\Eloquent\Collection;
class OrderResource extends JsonResource
@@ -20,15 +19,14 @@ public function toArray($request)
{
$products = Collection::make([]);
foreach ($this->products as $product) {
-
$products->push([
- 'id'=> $product->id,
- 'qty'=> $product->getRelationValue('pivot')->qty,
- 'price'=> $product->getRelationValue('pivot')->price,
- 'tax_amount'=> $product->getRelationValue('pivot')->tax_amount,
+ 'id' => $product->id,
+ 'qty' => $product->getRelationValue('pivot')->qty,
+ 'price' => $product->getRelationValue('pivot')->price,
+ 'tax_amount' => $product->getRelationValue('pivot')->tax_amount,
]);
}
-
+
return [
'id' => $this->id,
'shipping_option' => $this->shipping_option,
@@ -48,10 +46,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Page/PageCollectionResource.php b/src/Api/Resources/Page/PageCollectionResource.php
index 1fe8b601b..0301295aa 100644
--- a/src/Api/Resources/Page/PageCollectionResource.php
+++ b/src/Api/Resources/Page/PageCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Page/PageResource.php b/src/Api/Resources/Page/PageResource.php
index b73396c47..b8318fb86 100644
--- a/src/Api/Resources/Page/PageResource.php
+++ b/src/Api/Resources/Page/PageResource.php
@@ -16,7 +16,7 @@ public function toArray($request)
{
return [
'id' => $this->id,
-
+
'name' => $this->name,
'slug' => $this->slug,
'content' => $this->content,
@@ -33,10 +33,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Product/ProductCollectionResource.php b/src/Api/Resources/Product/ProductCollectionResource.php
index 4de25411f..f669b7133 100644
--- a/src/Api/Resources/Product/ProductCollectionResource.php
+++ b/src/Api/Resources/Product/ProductCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Product/ProductResource.php b/src/Api/Resources/Product/ProductResource.php
index c10e3e319..5818f068d 100644
--- a/src/Api/Resources/Product/ProductResource.php
+++ b/src/Api/Resources/Product/ProductResource.php
@@ -4,7 +4,6 @@
use Illuminate\Http\Resources\Json\JsonResource;
use AvoRed\Framework\Api\Resources\Property\PropertyCollectionResource;
-use AvoRed\Framework\Api\Resources\Attribute\AttributeCollectionResource;
class ProductResource extends JsonResource
{
@@ -47,10 +46,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Property/PropertyCollectionResource.php b/src/Api/Resources/Property/PropertyCollectionResource.php
index fa6f5d2bc..b12450b34 100644
--- a/src/Api/Resources/Property/PropertyCollectionResource.php
+++ b/src/Api/Resources/Property/PropertyCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Property/PropertyDropdownOptionCollectionResource.php b/src/Api/Resources/Property/PropertyDropdownOptionCollectionResource.php
index deb6f4722..223eee7fa 100644
--- a/src/Api/Resources/Property/PropertyDropdownOptionCollectionResource.php
+++ b/src/Api/Resources/Property/PropertyDropdownOptionCollectionResource.php
@@ -1,4 +1,5 @@
$this->collection,
];
}
-
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/Property/PropertyResource.php b/src/Api/Resources/Property/PropertyResource.php
index b3a144d2e..deef07171 100644
--- a/src/Api/Resources/Property/PropertyResource.php
+++ b/src/Api/Resources/Property/PropertyResource.php
@@ -2,7 +2,6 @@
namespace AvoRed\Framework\Api\Resources\Property;
-use AvoRed\Framework\Api\Resources\Property\PropertyDropdownOptionCollectionResource;
use Illuminate\Http\Resources\Json\JsonResource;
class PropertyResource extends JsonResource
@@ -22,7 +21,7 @@ public function toArray($request)
'data_type' => $this->data_type,
'field_type' => $this->field_type,
'sort_order' => $this->sort_order,
- 'dropdown_options' => $this->when($this->field_type == "SELECT", new PropertyDropdownOptionCollectionResource($this->propertyDropdownOptions)),
+ 'dropdown_options' => $this->when($this->field_type == 'SELECT', new PropertyDropdownOptionCollectionResource($this->propertyDropdownOptions)),
'use_for_all_products' => $this->use_for_all_products,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
@@ -35,10 +34,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/User/UserAddressResource.php b/src/Api/Resources/User/UserAddressResource.php
index ce8c91a8d..8e0a8c6b2 100644
--- a/src/Api/Resources/User/UserAddressResource.php
+++ b/src/Api/Resources/User/UserAddressResource.php
@@ -15,17 +15,17 @@ class UserAddressResource extends JsonResource
public function toArray($request)
{
return [
- 'id' => $this->id,
- 'user_id' => $this->user_id,
- 'first_name' => $this->first_name,
- 'last_name' => $this->last_name,
- 'address1' => $this->address1,
- 'address2' => $this->address2,
- 'postcode' => $this->postcode,
- 'city' => $this->city,
- 'state' => $this->state,
- 'country_name' => $this->country->name,
- 'phone' => $this->phone,
+ 'id' => $this->id,
+ 'user_id' => $this->user_id,
+ 'first_name' => $this->first_name,
+ 'last_name' => $this->last_name,
+ 'address1' => $this->address1,
+ 'address2' => $this->address2,
+ 'postcode' => $this->postcode,
+ 'city' => $this->city,
+ 'state' => $this->state,
+ 'country_name' => $this->country->name,
+ 'phone' => $this->phone,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
];
@@ -37,10 +37,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/User/UserCollectionResource.php b/src/Api/Resources/User/UserCollectionResource.php
index 75fefdc6c..132511f69 100644
--- a/src/Api/Resources/User/UserCollectionResource.php
+++ b/src/Api/Resources/User/UserCollectionResource.php
@@ -28,10 +28,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Api/Resources/User/UserResource.php b/src/Api/Resources/User/UserResource.php
index e7dadadc5..0ab3ccebe 100644
--- a/src/Api/Resources/User/UserResource.php
+++ b/src/Api/Resources/User/UserResource.php
@@ -15,7 +15,7 @@ class UserResource extends JsonResource
public function toArray($request)
{
return [
- 'id' => $this->id,
+ 'id' => $this->id,
'first_name' => $this->first_name,
'last_name' => $this->last_name,
'email' => $this->email,
@@ -36,10 +36,10 @@ public function toArray($request)
* @param \Illuminate\Http\Request
* @return array
*/
- public function with($request){
-
+ public function with($request)
+ {
return [
- 'status'=>'success'
+ 'status' => 'success'
];
}
-}
\ No newline at end of file
+}
diff --git a/src/Breadcrumb/BreadcrumbProvider.php b/src/Breadcrumb/BreadcrumbProvider.php
index d5534873e..db60011ec 100644
--- a/src/Breadcrumb/BreadcrumbProvider.php
+++ b/src/Breadcrumb/BreadcrumbProvider.php
@@ -52,11 +52,11 @@ public function provides()
return ['breadcrumb', 'AvoRed\Framework\Breadcrumb\Builder'];
}
- /**
- * Register the Menus.
- *
- * @return void
- */
+ /**
+ * Register the Menus.
+ *
+ * @return void
+ */
protected function registerBreadcrumb()
{
BreadcrumbFacade::make('admin.dashboard', function (Breadcrumb $breadcrumb) {
@@ -136,7 +136,7 @@ protected function registerBreadcrumb()
$breadcrumb->label('Order')
->parent('admin.dashboard');
});
-
+
BreadcrumbFacade::make('admin.order.view', function (Breadcrumb $breadcrumb) {
$breadcrumb->label('View')
->parent('admin.dashboard')
@@ -184,7 +184,7 @@ protected function registerBreadcrumb()
$breadcrumb->label('Show')
->parent('admin.dashboard')
->parent('admin.attribute.index');
- });
+ });
BreadcrumbFacade::make('admin.property.index', function (Breadcrumb $breadcrumb) {
$breadcrumb->label('Property')
->parent('admin.dashboard');
@@ -199,7 +199,7 @@ protected function registerBreadcrumb()
$breadcrumb->label('Edit')
->parent('admin.dashboard')
->parent('admin.property.index');
- });
+ });
BreadcrumbFacade::make('admin.property.show', function (Breadcrumb $breadcrumb) {
$breadcrumb->label('Create')
->parent('admin.dashboard')
@@ -246,7 +246,7 @@ protected function registerBreadcrumb()
$breadcrumb->label('Show')
->parent('admin.dashboard')
->parent('admin.user-group.index');
- });
+ });
BreadcrumbFacade::make('admin.admin-user.index', function (Breadcrumb $breadcrumb) {
$breadcrumb->label('Admin User')
->parent('admin.dashboard');
@@ -292,7 +292,6 @@ protected function registerBreadcrumb()
->parent('admin.role.index');
});
-
BreadcrumbFacade::make('admin.configuration', function (Breadcrumb $breadcrumb) {
$breadcrumb->label('Configuration')
->parent('admin.dashboard');
@@ -383,34 +382,5 @@ protected function registerBreadcrumb()
->parent('admin.dashboard')
->parent('admin.theme.index');
});
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
}
diff --git a/src/Cart/Manager.php b/src/Cart/Manager.php
index 916945b60..9c4d7d55f 100644
--- a/src/Cart/Manager.php
+++ b/src/Cart/Manager.php
@@ -9,7 +9,7 @@
use Illuminate\Session\SessionManager;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Session;
-
+
class Manager
{
/**
@@ -140,8 +140,8 @@ public function update($slug, $qty): Manager
*/
public function updateProductTax($slug, $taxAmount): Manager
{
- $cartProducts = $this->getSession();
- $cartProduct = $cartProducts->get($slug);
+ $cartProducts = $this->getSession();
+ $cartProduct = $cartProducts->get($slug);
if (null === $cartProduct) {
throw new \Exception("Cart Product doesn't Exist");
@@ -171,8 +171,8 @@ public function clear()
*/
public function destroy($slug):Manager
{
- $cartProducts = $this->getSession();
- $cartProduct = $cartProducts->pull($slug);
+ $cartProducts = $this->getSession();
+ $cartProduct = $cartProducts->pull($slug);
return $this;
}
diff --git a/src/Cart/Product.php b/src/Cart/Product.php
index 84e56faa9..748ae2d75 100644
--- a/src/Cart/Product.php
+++ b/src/Cart/Product.php
@@ -55,7 +55,6 @@ class Product implements CartContracts
*/
protected $image;
-
/**
* Cart Product Line Total.
*
diff --git a/src/Cms/Controllers/MenuController.php b/src/Cms/Controllers/MenuController.php
index 4e9dfd235..c370a5807 100644
--- a/src/Cms/Controllers/MenuController.php
+++ b/src/Cms/Controllers/MenuController.php
@@ -2,8 +2,6 @@
namespace AvoRed\Framework\Cms\Controllers;
-use AvoRed\Framework\Models\Database\Menu;
-use AvoRed\Framework\Models\Database\Category;
use Illuminate\Http\Request;
use AvoRed\Framework\Models\Contracts\MenuInterface;
use AvoRed\Framework\System\Controllers\Controller;
diff --git a/src/Cms/DataGrid/PageDataGrid.php b/src/Cms/DataGrid/PageDataGrid.php
index 23d4eab45..7d3794aed 100644
--- a/src/Cms/DataGrid/PageDataGrid.php
+++ b/src/Cms/DataGrid/PageDataGrid.php
@@ -16,11 +16,11 @@ public function __construct($model)
->column('id', ['sortable' => true])
->column('name', ['sortable' => true])
->column('slug')
- ->column('meta_title',['label' => 'Meta Title'])
+ ->column('meta_title', ['label' => 'Meta Title'])
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/Cms/Requests/PageRequest.php b/src/Cms/Requests/PageRequest.php
index b016ff0df..148e0fb93 100644
--- a/src/Cms/Requests/PageRequest.php
+++ b/src/Cms/Requests/PageRequest.php
@@ -31,7 +31,7 @@ public function rules()
if ($this->getMethod() == 'POST') {
$validationRule['slug'] .= '|unique:pages';
}
-
+
return $validationRule;
}
}
diff --git a/src/Cms/ViewComposers/MenuComposer.php b/src/Cms/ViewComposers/MenuComposer.php
index 80732f47c..f1f732210 100644
--- a/src/Cms/ViewComposers/MenuComposer.php
+++ b/src/Cms/ViewComposers/MenuComposer.php
@@ -20,10 +20,10 @@ class MenuComposer
*/
protected $categoryRepository;
- public function __construct(MenuInterface $menuRepository,
+ public function __construct(
+ MenuInterface $menuRepository,
CategoryInterface $categoryRepository
- )
- {
+ ) {
$this->menuRepository = $menuRepository;
$this->categoryRepository = $categoryRepository;
}
@@ -39,7 +39,7 @@ public function compose(View $view)
$frontMenus = MenuFacade::all();
$categories = $this->categoryRepository->all();
$menus = $this->menuRepository->parentsAll();
-
+
$view->with('categories', $categories)
->with('frontMenus', $frontMenus)
->with('menus', $menus);
diff --git a/src/Cms/ViewComposers/PageFieldsComposer.php b/src/Cms/ViewComposers/PageFieldsComposer.php
index d166390ff..5bedcc5f4 100644
--- a/src/Cms/ViewComposers/PageFieldsComposer.php
+++ b/src/Cms/ViewComposers/PageFieldsComposer.php
@@ -7,7 +7,6 @@
class PageFieldsComposer
{
-
/**
* Bind data to the view.
*
diff --git a/src/DataGrid/Columns/AbstractColumn.php b/src/DataGrid/Columns/AbstractColumn.php
index 104dfc01b..418df40b0 100644
--- a/src/DataGrid/Columns/AbstractColumn.php
+++ b/src/DataGrid/Columns/AbstractColumn.php
@@ -16,7 +16,7 @@ abstract class AbstractColumn implements ColumnContract
* Column Class.
* @var null|string
*/
- protected $class = "col";
+ protected $class = 'col';
/**
* Column Label.
diff --git a/src/DataGrid/Manager.php b/src/DataGrid/Manager.php
index 0499c4c5b..0ce703fd3 100644
--- a/src/DataGrid/Manager.php
+++ b/src/DataGrid/Manager.php
@@ -3,7 +3,6 @@
namespace AvoRed\Framework\DataGrid;
use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
use AvoRed\Framework\DataGrid\Columns\LinkColumn;
use AvoRed\Framework\DataGrid\Columns\TextColumn;
@@ -92,7 +91,7 @@ public function render($dataGrid)
$dataGrid->model->where($key, 'like', '%' . $val . '%');
}
}
-
+
$options = ['path' => asset(request()->path())];
if (!$dataGrid->model instanceof Collection) {
$dataGrid->data = $dataGrid->model->paginate($this->pageItem, ['*'], $dataGrid->pageName());
@@ -103,7 +102,6 @@ public function render($dataGrid)
if (null !== $this->request->get('desc', 'id')) {
$dataGrid->model->orderBy($this->request->get('desc', 'id'), 'desc');
}
-
} else {
$dataGrid->data = $this->paginate($dataGrid->model, $this->pageItem, null, $options);
}
@@ -159,7 +157,7 @@ public function column($identifier, $options = [])
/**
* I feel this method is moved to DataGrid file
- *
+ *
*/
public function linkColumn($identifier, $options = [], $callback)
{
diff --git a/src/Events/ProductBeforeSave.php b/src/Events/ProductBeforeSave.php
index b7cca73f8..c3f49ce4e 100644
--- a/src/Events/ProductBeforeSave.php
+++ b/src/Events/ProductBeforeSave.php
@@ -10,7 +10,6 @@ class ProductBeforeSave
{
use Dispatchable, InteractsWithSockets, SerializesModels;
-
/**
* Product Before Save Post Data from Form
*
diff --git a/src/Image/LocalFile.php b/src/Image/LocalFile.php
index 1cfab658d..8bbf850d0 100644
--- a/src/Image/LocalFile.php
+++ b/src/Image/LocalFile.php
@@ -35,8 +35,8 @@ class LocalFile
public function __construct($dbPath = null)
{
$this->dbPath = $dbPath;
- $this->relativePath = str_replace("storage/" , "" , $dbPath);
- $this->url = asset('storage/' .$dbPath);
+ $this->relativePath = str_replace('storage/', '', $dbPath);
+ $this->url = asset('storage/' . $dbPath);
$sizes = config('avored-framework.image.sizes');
@@ -46,7 +46,7 @@ public function __construct($dbPath = null)
$baseName = basename($dbPath);
$sizeNamePath = str_replace($baseName, $sizeName . '-' . $baseName, $dbPath);
- $this->$objectVarName = asset("storage/" . $sizeNamePath);
+ $this->$objectVarName = asset('storage/' . $sizeNamePath);
}
}
@@ -87,7 +87,6 @@ public function name()
public function relativePath($path = null)
{
if (null === $path) {
-
return str_replace(asset('/'), '', $this->relativePath);
}
diff --git a/src/Menu/Contracts/Menu.php b/src/Menu/Contracts/Menu.php
index 061c143c3..c2a6558b7 100644
--- a/src/Menu/Contracts/Menu.php
+++ b/src/Menu/Contracts/Menu.php
@@ -33,7 +33,7 @@ public function icon($icon = null);
* @param array $attributes
* @return $attributes|self
*/
- public function attributes($attributes= []);
+ public function attributes($attributes = []);
/**
* Get/Set Menu Route Name.
diff --git a/src/Menu/Menu.php b/src/Menu/Menu.php
index 38b7540e4..b0269a865 100644
--- a/src/Menu/Menu.php
+++ b/src/Menu/Menu.php
@@ -26,7 +26,6 @@ class Menu implements MenuContracts
*/
protected $key;
-
/**
* @var string $params
*/
@@ -48,7 +47,6 @@ public function __construct($callable)
$callable($this);
}
-
/**
* Get/Set Admin Menu Label.
*
@@ -62,7 +60,6 @@ public function label($label = null)
return $this;
}
-
return $this->label;
}
@@ -130,7 +127,6 @@ public function icon($icon = null)
return $this->icon;
}
-
/**
* Get/Set Admin Menu Icon.
*
@@ -146,6 +142,4 @@ public function attributes($attributes = null)
return $this->attributes;
}
-
-
}
diff --git a/src/Models/Contracts/AdminUserInterface.php b/src/Models/Contracts/AdminUserInterface.php
index 3102df791..fe8ec9a2c 100644
--- a/src/Models/Contracts/AdminUserInterface.php
+++ b/src/Models/Contracts/AdminUserInterface.php
@@ -1,47 +1,43 @@
getValueByKey('user_default_country');
-
+ $defaultCountry = $configRepository->getValueByKey('user_default_country');
+
if (isset($defaultCountry)) {
return $defaultCountry;
}
diff --git a/src/Models/Database/AdminUser.php b/src/Models/Database/AdminUser.php
index b4346b622..c46c3a9c4 100644
--- a/src/Models/Database/AdminUser.php
+++ b/src/Models/Database/AdminUser.php
@@ -41,7 +41,7 @@ public function sendPasswordResetNotification($token)
public function getFullNameAttribute()
{
- return $this->attributes['first_name'].' '.$this->attributes['last_name'];
+ return $this->attributes['first_name'] . ' ' . $this->attributes['last_name'];
}
public function role()
diff --git a/src/Models/Database/Attribute.php b/src/Models/Database/Attribute.php
index d5d89d71d..b2719e3cc 100644
--- a/src/Models/Database/Attribute.php
+++ b/src/Models/Database/Attribute.php
@@ -4,11 +4,11 @@
class Attribute extends BaseModel
{
- /**
- * The attributes that are mass assignable.
- *
- * @var array
- */
+ /**
+ * The attributes that are mass assignable.
+ *
+ * @var array
+ */
protected $fillable = ['name', 'identifier'];
/**
@@ -20,7 +20,7 @@ public function attributeDropdownOptions()
{
return $this->hasMany(AttributeDropdownOption::class);
}
-
+
/**
* The attributes has Many Products.
*
diff --git a/src/Models/Database/AttributeDropdownOption.php b/src/Models/Database/AttributeDropdownOption.php
index 50a6b6541..92b1ed373 100644
--- a/src/Models/Database/AttributeDropdownOption.php
+++ b/src/Models/Database/AttributeDropdownOption.php
@@ -4,11 +4,11 @@
class AttributeDropdownOption extends BaseModel
{
- /**
- * The attributes that are mass assignable.
- *
- * @var array
- */
+ /**
+ * The attributes that are mass assignable.
+ *
+ * @var array
+ */
protected $fillable = ['attribute_id', 'display_text'];
/**
diff --git a/src/Models/Database/BaseModel.php b/src/Models/Database/BaseModel.php
index b961f9142..6a73a27e4 100644
--- a/src/Models/Database/BaseModel.php
+++ b/src/Models/Database/BaseModel.php
@@ -6,5 +6,4 @@
class BaseModel extends Model
{
-
}
diff --git a/src/Models/Database/CategoryFilter.php b/src/Models/Database/CategoryFilter.php
index 66d340d53..2d89d950a 100644
--- a/src/Models/Database/CategoryFilter.php
+++ b/src/Models/Database/CategoryFilter.php
@@ -6,19 +6,18 @@ class CategoryFilter extends BaseModel
{
protected $fillable = ['category_id', 'type', 'filter_id'];
-
- public function category() {
+ public function category()
+ {
return $this->hasMany(Category::class);
}
- public function getModelAttribute() {
-
- if($this->attributes['type'] == "ATTRIBUTE") {
+ public function getModelAttribute()
+ {
+ if ($this->attributes['type'] == 'ATTRIBUTE') {
return Attribute::find($this->attributes['filter_id']);
}
- if($this->attributes['type'] == "PROPERTY") {
+ if ($this->attributes['type'] == 'PROPERTY') {
return Property::find($this->attributes['filter_id']);
}
-
}
}
diff --git a/src/Models/Database/Configuration.php b/src/Models/Database/Configuration.php
index 969603d2f..ad6013891 100644
--- a/src/Models/Database/Configuration.php
+++ b/src/Models/Database/Configuration.php
@@ -21,7 +21,7 @@ public static function getConfiguration($key)
return $model->getValue($key);
}
- public static function setConfiguration($key, $value)
+ public static function setConfiguration($key, $value)
{
$model = new static;
$row = $model->where('configuration_key', '=', $key)->first();
diff --git a/src/Models/Database/Country.php b/src/Models/Database/Country.php
index 2b999f438..7722b8c98 100644
--- a/src/Models/Database/Country.php
+++ b/src/Models/Database/Country.php
@@ -2,8 +2,6 @@
namespace AvoRed\Framework\Models\Database;
-use Illuminate\Database\Eloquent\Collection;
-
class Country extends BaseModel
{
protected $fillable = [
@@ -20,12 +18,12 @@ public function states()
return $this->hasMany(State::class);
}
- public static function options($empty = true) {
-
+ public static function options($empty = true)
+ {
$model = new static();
$options = $model->all()->pluck('name', 'id');
- if(true === $empty) {
+ if (true === $empty) {
$options->prepend('Please Select', null);
}
return $options;
diff --git a/src/Models/Database/Menu.php b/src/Models/Database/Menu.php
index ee3d51884..68d31797f 100644
--- a/src/Models/Database/Menu.php
+++ b/src/Models/Database/Menu.php
@@ -4,7 +4,7 @@
class Menu extends BaseModel
{
- protected $fillable = ['name','route', 'params' ,'parent_id'];
+ protected $fillable = ['name', 'route', 'params', 'parent_id'];
public function children()
{
diff --git a/src/Models/Database/OrderStates.php b/src/Models/Database/OrderStates.php
index 6f044bb8d..0c0fd6552 100644
--- a/src/Models/Database/OrderStates.php
+++ b/src/Models/Database/OrderStates.php
@@ -2,8 +2,6 @@
namespace AvoRed\Framework\Models\Database;
-use Illuminate\Database\Eloquent\Collection;
-
class OrderStates extends BaseModel
{
protected $fillable = [
@@ -19,12 +17,12 @@ public function states()
return $this->hasMany(State::class);
}
- public static function options($empty = true) {
-
+ public static function options($empty = true)
+ {
$model = new static();
$options = $model->all()->pluck('name', 'id');
- if(true === $empty) {
+ if (true === $empty) {
$options->prepend('Please Select', null);
}
return $options;
diff --git a/src/Models/Database/Page.php b/src/Models/Database/Page.php
index 92ae42d5c..4fd65119a 100644
--- a/src/Models/Database/Page.php
+++ b/src/Models/Database/Page.php
@@ -15,7 +15,7 @@ public function getContentAttribute($content)
$pattern = sprintf('/(@)?%s\s*(.+?)\s*%s(\r?\n)?/s', $this->contentTags[0], $this->contentTags[1]);
$callback = function ($matches) {
- $whitespace = empty($matches[3]) ? '' : $matches[3].$matches[3];
+ $whitespace = empty($matches[3]) ? '' : $matches[3] . $matches[3];
$widget = Widget::get($matches[2]);
if (method_exists($widget, 'render')) {
@@ -31,12 +31,12 @@ public function getContentAttribute($content)
return preg_replace_callback($pattern, $callback, $content);
}
- public static function options($empty = true) {
-
+ public static function options($empty = true)
+ {
$model = new static();
$options = $model->all()->pluck('name', 'id');
- if(true === $empty) {
+ if (true === $empty) {
$options->prepend('Please Select', null);
}
return $options;
diff --git a/src/Models/Database/Product.php b/src/Models/Database/Product.php
index 44cdda0a9..a805071fd 100644
--- a/src/Models/Database/Product.php
+++ b/src/Models/Database/Product.php
@@ -220,8 +220,6 @@ protected function saveProductProperties($data)
foreach ($properties as $key => $property) {
foreach ($property as $propertyId => $propertyValue) {
$propertyModel = Property::findorfail($propertyId);
-
- //dd($propertyModel->attachProduct($this));
$propertyModel->attachProduct($this)
->fill(['value' => $propertyValue])
->save();
diff --git a/src/Models/Database/ProductDownloadableUrl.php b/src/Models/Database/ProductDownloadableUrl.php
index dcb51f25a..1d52d5af0 100644
--- a/src/Models/Database/ProductDownloadableUrl.php
+++ b/src/Models/Database/ProductDownloadableUrl.php
@@ -2,15 +2,12 @@
namespace AvoRed\Framework\Models\Database;
-use AvoRed\Framework\Image\LocalFile;
-
class ProductDownloadableUrl extends BaseModel
{
- protected $fillable = ['product_id', 'demo_path', 'main_path','token'];
+ protected $fillable = ['product_id', 'demo_path', 'main_path', 'token'];
public function products()
{
return $this->belongsTo(Product::class);
}
-
}
diff --git a/src/Models/Database/ProductImage.php b/src/Models/Database/ProductImage.php
index 6988b8f60..d5a52d949 100644
--- a/src/Models/Database/ProductImage.php
+++ b/src/Models/Database/ProductImage.php
@@ -12,11 +12,11 @@ class ProductImage extends BaseModel
*/
protected $fillable = ['product_id', 'path', 'is_main_image'];
- /**
- * Every image belogns to one product
- *
- * @return \Illuminate\Database\Eloquent\Relations\BelongsTo $product
- */
+ /**
+ * Every image belogns to one product
+ *
+ * @return \Illuminate\Database\Eloquent\Relations\BelongsTo $product
+ */
public function products()
{
return $this->belongsTo(Product::class);
@@ -24,7 +24,7 @@ public function products()
/**
* Get Path Attribute for the Image
- *
+ *
* @param string $path
* @return \AvoRed\Framework\Image\LocalFile $localImage
*/
@@ -33,10 +33,10 @@ public function getPathAttribute($path)
if (null === $this->attributes['path'] || empty($this->attributes['path'])) {
return;
}
-
- $symlink = config('avored-framework.symlink_storage_folder');
- $relativePath = $this->attributes['path'];
- $localImage = new LocalFile($relativePath);
+
+ $symlink = config('avored-framework.symlink_storage_folder');
+ $relativePath = $this->attributes['path'];
+ $localImage = new LocalFile($relativePath);
return $localImage;
}
diff --git a/src/Models/Database/Property.php b/src/Models/Database/Property.php
index 820ea7b4c..13e97bde3 100644
--- a/src/Models/Database/Property.php
+++ b/src/Models/Database/Property.php
@@ -118,17 +118,16 @@ public function getProductValueModel($productId)
$valueClass = __NAMESPACE__ . '\\' . ucfirst($method);
$valueModel = new $valueClass([
- 'property_id' => $this->id,
- 'product_id' => $productId
- ]);
+ 'property_id' => $this->id,
+ 'product_id' => $productId
+ ]);
} else {
$valueModel = $this->$method()->whereProductId($productId)->first();
}
-
+
return $valueModel;
}
-
/**
* Property belongs to many Products.
*
@@ -138,5 +137,4 @@ public function products()
{
return $this->belongsToMany(Product::class);
}
-
}
diff --git a/src/Models/Database/Role.php b/src/Models/Database/Role.php
index 412b76e8d..b0806a9fe 100644
--- a/src/Models/Database/Role.php
+++ b/src/Models/Database/Role.php
@@ -6,17 +6,17 @@ class Role extends BaseModel
{
protected $fillable = ['name', 'description'];
-
- public static function options($empty = true) {
-
+ public static function options($empty = true)
+ {
$model = new static();
$options = $model->all()->pluck('name', 'id');
- if(true === $empty) {
+ if (true === $empty) {
$options->prepend('Please Select', null);
}
return $options;
}
+
/**
* Role can be assigned to many users.
*/
diff --git a/src/Models/Database/SiteCurrency.php b/src/Models/Database/SiteCurrency.php
index af7553fc8..8cd50690c 100644
--- a/src/Models/Database/SiteCurrency.php
+++ b/src/Models/Database/SiteCurrency.php
@@ -2,10 +2,7 @@
namespace AvoRed\Framework\Models\Database;
-use AvoRed\Framework\Models\Database\Configuration;
-
class SiteCurrency extends BaseModel
{
- protected $fillable = ['code','name','conversion_rate', 'status', 'symbol'];
-
+ protected $fillable = ['code', 'name', 'conversion_rate', 'status', 'symbol'];
}
diff --git a/src/Models/Database/User.php b/src/Models/Database/User.php
index a8701eb71..c78b6dcf3 100644
--- a/src/Models/Database/User.php
+++ b/src/Models/Database/User.php
@@ -16,7 +16,9 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'first_name', 'last_name', 'email', 'password', 'phone', 'company_name', 'image_path', 'status', 'language', 'activation_token', 'tax_no'
+ 'first_name', 'last_name', 'email', 'password', 'phone',
+ 'company_name', 'image_path', 'status',
+ 'language', 'activation_token', 'tax_no'
];
/**
@@ -40,7 +42,7 @@ public function getImagePathAttribute()
/**
* One User has Many Address attached with it.
- *
+ *
* @return \Illuminate\Database\Eloquent\Relations\HasMAny
*/
public function addresses()
@@ -50,7 +52,7 @@ public function addresses()
/**
* One User has Many User Group attached with it.
- *
+ *
* @return \Illuminate\Database\Eloquent\Relations\HasMAny
*/
public function userGroups()
diff --git a/src/Models/Database/UserGroup.php b/src/Models/Database/UserGroup.php
index f42d7e7f4..628913419 100644
--- a/src/Models/Database/UserGroup.php
+++ b/src/Models/Database/UserGroup.php
@@ -1,6 +1,6 @@
hasMany(User::class);
}
}
diff --git a/src/Models/Repository/AdminUserRepository.php b/src/Models/Repository/AdminUserRepository.php
index 91f42cb25..8dd272da9 100644
--- a/src/Models/Repository/AdminUserRepository.php
+++ b/src/Models/Repository/AdminUserRepository.php
@@ -1,60 +1,60 @@
first();
-
+
if (null === $model) {
return null;
}
diff --git a/src/Models/Repository/CountryRepository.php b/src/Models/Repository/CountryRepository.php
index 34bb305c0..f89ed36f8 100644
--- a/src/Models/Repository/CountryRepository.php
+++ b/src/Models/Repository/CountryRepository.php
@@ -59,20 +59,18 @@ public function create($data)
return Country::create($data);
}
-
/**
* Get All Country Options for Dropdown Field
*
* @return \Illuminate\Database\Eloquent\Collection
*/
- public function options()
+ public function options()
{
$countries = $this->all();
$options = Collection::make();
- foreach($countries as $country) {
- $options->push(['name' => $country->name,'id' => $country->id]);
-
- }
+ foreach ($countries as $country) {
+ $options->push(['name' => $country->name, 'id' => $country->id]);
+ }
return $options;
}
}
diff --git a/src/Models/Repository/MenuRepository.php b/src/Models/Repository/MenuRepository.php
index 876e921a0..7185ffddf 100644
--- a/src/Models/Repository/MenuRepository.php
+++ b/src/Models/Repository/MenuRepository.php
@@ -25,10 +25,10 @@ public function find($id)
*/
public function parentsAll()
{
- return Menu::whereParentId(null)->orWhere('parent_id','=',0)->get();
+ return Menu::whereParentId(null)->orWhere('parent_id', '=', 0)->get();
}
- /**
+ /**
* Get all Menu
*
* @return \Illuminate\Database\Eloquent\Collection
@@ -69,32 +69,29 @@ public function create($data)
}
/**
- *
+ *
* @param array $menus
* @return \AvoRed\Framework\Models\Repository\MenuRepository
*/
- public function truncateAndCreateMenus($menus)
- {
-
+ public function truncateAndCreateMenus($menus)
+ {
Menu::truncate();
foreach ($menus as $menu) {
$this->_saveMenu($menu);
}
-
- }
-
- private function _saveMenu($menus, $parentId = null) {
+ }
+ private function _saveMenu($menus, $parentId = null)
+ {
foreach ($menus as $menu) {
$menuModel = $this->create(['name' => $menu->name,
- 'route' => $menu->route,
- 'params' => $menu->params,
- 'parent_id' => $parentId]);
+ 'route' => $menu->route,
+ 'params' => $menu->params,
+ 'parent_id' => $parentId]);
- if(isset($menu->children) && count($menu->children[0]) >0) {
+ if (isset($menu->children) && count($menu->children[0]) > 0) {
$this->_saveMenu($menu->children[0], $menuModel->id);
}
-
}
-}
+ }
}
diff --git a/src/Models/Repository/OrderStatusRepository.php b/src/Models/Repository/OrderStatusRepository.php
index 3fbedb764..69a297952 100644
--- a/src/Models/Repository/OrderStatusRepository.php
+++ b/src/Models/Repository/OrderStatusRepository.php
@@ -4,7 +4,6 @@
use AvoRed\Framework\Models\Contracts\OrderStatusInterface;
use AvoRed\Framework\Models\Database\OrderStatus;
-use Illuminate\Support\Collection;
class OrderStatusRepository implements OrderStatusInterface
{
@@ -58,5 +57,4 @@ public function create($data)
{
return OrderStatus::create($data);
}
-
}
diff --git a/src/Models/Repository/PropertyRepository.php b/src/Models/Repository/PropertyRepository.php
index 1dd6a0492..4fb34e682 100644
--- a/src/Models/Repository/PropertyRepository.php
+++ b/src/Models/Repository/PropertyRepository.php
@@ -41,7 +41,7 @@ public function query()
/**
* Create an Property an Return an Property Instance
- *
+ *
* @param array $data
* @return \AvoRed\Framework\Models\Database\Property
*/
diff --git a/src/Models/Repository/UserRepository.php b/src/Models/Repository/UserRepository.php
index 2f474bb5c..b4ce0f14e 100644
--- a/src/Models/Repository/UserRepository.php
+++ b/src/Models/Repository/UserRepository.php
@@ -1,60 +1,60 @@
$methodName($vendor, $name, $controllerName);
$this->createRequiredDirectories($path);
- $buildMethodName = 'build'.ucfirst($stubFile).'File';
+ $buildMethodName = 'build' . ucfirst($stubFile) . 'File';
$this->files->put($path, $this->$buildMethodName());
}
- $this->info($this->type.' created successfully.');
+ $this->info($this->type . ' created successfully.');
}
/**
@@ -86,14 +86,14 @@ public function handle()
*/
protected function createRequiredDirectories($path)
{
- if (! $this->files->isDirectory(dirname($path))) {
+ if (!$this->files->isDirectory(dirname($path))) {
$this->files->makeDirectory(dirname($path), 0755, true);
}
}
protected function getControllerPath($vendor, $name, $controllerName)
{
- return base_path('modules/'.$vendor.'/'.$name.'/'.'src/Http/Controllers/'.$controllerName.'.php');
+ return base_path('modules/' . $vendor . '/' . $name . '/' . 'src/Http/Controllers/' . $controllerName . '.php');
}
/**
@@ -118,7 +118,7 @@ protected function buildControllerFile()
*/
protected function getStub($stubName)
{
- return __DIR__."/stubs/{$stubName}.stub";
+ return __DIR__ . "/stubs/{$stubName}.stub";
}
/**
@@ -136,7 +136,7 @@ protected function replaceNamespace(&$stub)
$baseNamespace = $module['namespace'];
- $namespace = $baseNamespace."Http\Controllers";
+ $namespace = $baseNamespace . "Http\Controllers";
$stub = str_replace(
['DummyClass', 'DummyRootNamespace', 'DummyNamespace'],
diff --git a/src/Modules/Console/ModuleMakeCommand.php b/src/Modules/Console/ModuleMakeCommand.php
index e4f49f54d..703817888 100644
--- a/src/Modules/Console/ModuleMakeCommand.php
+++ b/src/Modules/Console/ModuleMakeCommand.php
@@ -62,16 +62,16 @@ public function handle()
$stubFiles = ['register', 'module'];
foreach ($stubFiles as $stubFile) {
- $methodName = 'get'.ucfirst($stubFile).'Path';
+ $methodName = 'get' . ucfirst($stubFile) . 'Path';
$path = $this->$methodName($vendor, $name);
$this->createRequiredDirectories($path);
- $buildMethodName = 'build'.ucfirst($stubFile).'File';
+ $buildMethodName = 'build' . ucfirst($stubFile) . 'File';
$this->files->put($path, $this->$buildMethodName());
}
- $this->info($this->type.' created successfully.');
+ $this->info($this->type . ' created successfully.');
}
/**
@@ -81,19 +81,19 @@ public function handle()
*/
protected function createRequiredDirectories($path)
{
- if (! $this->files->isDirectory(dirname($path))) {
+ if (!$this->files->isDirectory(dirname($path))) {
$this->files->makeDirectory(dirname($path), 0755, true);
}
}
protected function getRegisterPath($vendor, $name)
{
- return base_path('modules/'.$vendor.'/'.$name.'/'.'register.yaml');
+ return base_path('modules/' . $vendor . '/' . $name . '/' . 'register.yaml');
}
protected function getModulePath($vendor, $name)
{
- return base_path('modules/'.$vendor.'/'.$name.'/src/'.'Module.php');
+ return base_path('modules/' . $vendor . '/' . $name . '/src/' . 'Module.php');
}
/**
@@ -135,7 +135,7 @@ protected function buildModuleFile()
*/
protected function getStub($stubName)
{
- return __DIR__."/stubs/{$stubName}.stub";
+ return __DIR__ . "/stubs/{$stubName}.stub";
}
/**
diff --git a/src/Modules/Console/Provider.php b/src/Modules/Console/Provider.php
index ce3f183ab..447681118 100644
--- a/src/Modules/Console/Provider.php
+++ b/src/Modules/Console/Provider.php
@@ -61,6 +61,7 @@ protected function registerAvoredModuleMake()
return new ModuleMakeCommand($app['files']);
});
}
+
/**
* Register the Avored Admin Make .
*
diff --git a/src/Modules/Manager.php b/src/Modules/Manager.php
index 3473b7a13..8dd33c1fa 100644
--- a/src/Modules/Manager.php
+++ b/src/Modules/Manager.php
@@ -79,7 +79,6 @@ protected function loadModules()
$iterator->next();
}
- //dd(app());
$this->moduleLoaded = true;
}
diff --git a/src/Modules/Module.php b/src/Modules/Module.php
index 2c4a1533f..c54316b87 100644
--- a/src/Modules/Module.php
+++ b/src/Modules/Module.php
@@ -147,13 +147,13 @@ public function publishedTags($publishedTags = [])
/**
* To check If method Exist then it will execute other wise do nothing
- *
+ *
* @param string $name
- * @return mixed
+ * @return mixed
*/
public function __get($name)
{
- if(method_exists($this,$name)) {
+ if (method_exists($this, $name)) {
return $this->$name();
}
}
diff --git a/src/Order/Controllers/OrderController.php b/src/Order/Controllers/OrderController.php
index 50ec32b1b..1981dfdc6 100644
--- a/src/Order/Controllers/OrderController.php
+++ b/src/Order/Controllers/OrderController.php
@@ -56,7 +56,7 @@ public function view(Model $order)
/**
* Send an Order Invioced PDF to User
- *
+ *
* @param \AvoRed\Framework\Models\Database\Order $order
* @return \Illuminate\Http\RedirectResponse
*/
@@ -79,14 +79,14 @@ public function sendEmailInvoice(Model $order)
/**
* Edit the Order Status View
- *
+ *
* @param \AvoRed\Framework\Models\Database\Order $order
* @return \Illuminate\Http\Response
*/
public function editStatus(Model $order)
{
$orderStatus = OrderStatus::all()->pluck('name', 'id');
-
+
$view = view('avored-framework::order.view')
->with('order', $order)
->with('orderStatus', $orderStatus)
@@ -97,7 +97,7 @@ public function editStatus(Model $order)
/**
* Change the Order Status
- *
+ *
* @param \AvoRed\Framework\Models\Database\Order $order
* @return \Illuminate\Http\RedirectResponse
*/
@@ -116,17 +116,17 @@ public function updateStatus(Model $order, UpdateOrderStatusRequest $request)
return redirect()->route('admin.order.index');
}
+
/**
* Change the Order Status
- *
+ *
* @param \AvoRed\Framework\Models\Database\Order $order
* @param \AvoRed\Framework\Order\Request\UpdateTrackCodeRequest $request
- *
+ *
* @return \Illuminate\Http\RedirectResponse
*/
public function updateTrackCode(Model $order, UpdateTrackCodeRequest $request)
{
-
$order->update(['track_code' => $request->track_code]);
//Mail::to($userEmail)->send(new UpdateOrderStatusMail($orderStatusTitle));
diff --git a/src/Order/DataGrid/OrderDataGrid.php b/src/Order/DataGrid/OrderDataGrid.php
index 3167eaff4..f74a580c8 100644
--- a/src/Order/DataGrid/OrderDataGrid.php
+++ b/src/Order/DataGrid/OrderDataGrid.php
@@ -22,7 +22,7 @@ public function __construct($model)
->column('created_at', ['label' => 'Date created'])
->column('updated_at', ['label' => 'Recent updated'])
->linkColumn('view', [], function ($model) {
- return "id)."' >View";
+ return "id) . "' >View";
});
$this->dataGrid = $dataGrid;
diff --git a/src/Order/Widget/RecentOrderWidget.php b/src/Order/Widget/RecentOrderWidget.php
index f05500664..a4d2ab78c 100644
--- a/src/Order/Widget/RecentOrderWidget.php
+++ b/src/Order/Widget/RecentOrderWidget.php
@@ -78,17 +78,16 @@ public function with()
$order = app(OrderInterface::class);
- $latestOrder = $order->query()->orderBy('id','desc')->first();
- if($latestOrder !== null) {
- $totalAmount = "";
- foreach($latestOrder->products as $product) {
- $totalAmount = $product->getRelationValue('pivot')->qty * $product->getRelationValue('pivot')->price;
+ $latestOrder = $order->query()->orderBy('id', 'desc')->first();
+ if ($latestOrder !== null) {
+ $totalAmount = '';
+ foreach ($latestOrder->products as $product) {
+ $totalAmount = $product->getRelationValue('pivot')->qty * $product->getRelationValue('pivot')->price;
}
- $recentOrder['user'] = $latestOrder->user->fullName;
- $recentOrder['product_count'] = $latestOrder->products->count();
- $recentOrder['total_amount'] = $totalAmount;
-
+ $recentOrder['user'] = $latestOrder->user->fullName;
+ $recentOrder['product_count'] = $latestOrder->products->count();
+ $recentOrder['total_amount'] = $totalAmount;
}
return ['recentOrderData' => $recentOrder];
diff --git a/src/Payment/Provider.php b/src/Payment/Provider.php
index 705748eb3..67272e08d 100644
--- a/src/Payment/Provider.php
+++ b/src/Payment/Provider.php
@@ -59,7 +59,6 @@ public function provides()
return ['payment', 'AvoRed\Framework\Payment\Manager'];
}
-
/**
* Registering Payment Option for the App.
*
diff --git a/src/Permission/Manager.php b/src/Permission/Manager.php
index 071cdc57d..bea18be54 100644
--- a/src/Permission/Manager.php
+++ b/src/Permission/Manager.php
@@ -37,14 +37,11 @@ public function all()
*/
public function add($key, $callable = null)
{
-
- if(null !== $callable) {
-
+ if (null !== $callable) {
$group = new PermissionGroup($callable);
$group->key($key);
-
+
$this->permissions->put($key, $group);
-
} else {
$group = new PermissionGroup();
diff --git a/src/Permission/Permission.php b/src/Permission/Permission.php
index 0ecb18a36..3d6b76735 100644
--- a/src/Permission/Permission.php
+++ b/src/Permission/Permission.php
@@ -21,8 +21,6 @@ class Permission implements PermissionContracts
*/
protected $key;
-
-
/**
* Construct for a permission group
* @param callable $callable
@@ -30,12 +28,11 @@ class Permission implements PermissionContracts
*/
public function __construct($callable = null)
{
- if(null !== $callable) {
+ if (null !== $callable) {
$callable($this);
}
}
-
public function label($label = null)
{
if (null !== $label) {
diff --git a/src/Permission/PermissionGroup.php b/src/Permission/PermissionGroup.php
index 2891bfc50..f72acb2c0 100644
--- a/src/Permission/PermissionGroup.php
+++ b/src/Permission/PermissionGroup.php
@@ -30,14 +30,14 @@ class PermissionGroup implements PermissionContracts
public function __construct($callable = null)
{
$this->permissionList = Collection::make([]);
- if(null !== $callable) {
+ if (null !== $callable) {
$callable($this);
}
}
/**
* Specify a label for permission group
- *
+ *
* @param string $label
* @return mixed $this|$label
*/
@@ -54,8 +54,8 @@ public function label($label = null)
/**
* Add an Unique key to a group of permission
- *
- * @param string $key
+ *
+ * @param string $key
* @return mixed $key|$this
*/
public function key($key = null)
@@ -69,24 +69,21 @@ public function key($key = null)
return $this->key;
}
-
/**
* Add Permission to a group
- *
+ *
* @param string $key
* @param callable $callable
* @return \AvoRed\Framework\Permission\Permission $permission
- *
+ *
*/
public function addPermission($key, $callable = null)
{
- if(null !== $callable) {
-
+ if (null !== $callable) {
$permission = new Permission($callable);
$permission->key($key);
-
+
$this->permissionList->put($key, $permission);
-
} else {
$permission = new Permission();
diff --git a/src/Permission/PermissionProvider.php b/src/Permission/PermissionProvider.php
index 55fdd3f10..ee19fe92f 100644
--- a/src/Permission/PermissionProvider.php
+++ b/src/Permission/PermissionProvider.php
@@ -18,7 +18,6 @@ class PermissionProvider extends ServiceProvider
public function boot()
{
-
$this->registerPermissions();
}
@@ -55,7 +54,6 @@ public function provides()
return ['permission', 'AvoRed\Framework\Permission\Manager'];
}
-
/**
* Register the permissions.
*
@@ -63,398 +61,393 @@ public function provides()
*/
protected function registerPermissions()
{
- $group = PermissionFacade::add('page', function(PermissionGroup $group){
+ $group = PermissionFacade::add('page', function (PermissionGroup $group) {
$group->label('Page Permissions');
});
- $group->addPermission('admin-page-list', function(Permission $permission){
+ $group->addPermission('admin-page-list', function (Permission $permission) {
$permission->label('Page List')
->routes('admin.page.index');
- });
- $group->addPermission('admin-page-create', function(Permission $permission){
+ });
+ $group->addPermission('admin-page-create', function (Permission $permission) {
$permission->label('Create Page')
->routes('admin.page.create,admin.page.store');
});
- $group->addPermission('admin-page-update', function(Permission $permission){
+ $group->addPermission('admin-page-update', function (Permission $permission) {
$permission->label('Update Page')
->routes('admin.page.edit,admin.page.update');
});
- $group->addPermission('admin-page-destroy', function(Permission $permission){
+ $group->addPermission('admin-page-destroy', function (Permission $permission) {
$permission->label('Destroy Page')
->routes('admin.page.destroy');
});
- $group->addPermission('admin-page-show', function(Permission $permission){
+ $group->addPermission('admin-page-show', function (Permission $permission) {
$permission->label('Show Page')
->routes('admin.page.show');
});
-
- $group = PermissionFacade::add('menu', function(PermissionGroup $group){
+ $group = PermissionFacade::add('menu', function (PermissionGroup $group) {
$group->label('Menu Permissions');
});
- $group->addPermission('admin-menu-list', function(Permission $permission){
+ $group->addPermission('admin-menu-list', function (Permission $permission) {
$permission->label('Front Menu Index')
->routes('admin.menu.index');
});
-
- $group->addPermission('admin-menu-store', function(Permission $permission) {
+ $group->addPermission('admin-menu-store', function (Permission $permission) {
$permission->label('Save Front Menu')
->routes('admin.menu.store');
});
- $group = PermissionFacade::add('category', function(PermissionGroup $group){
+ $group = PermissionFacade::add('category', function (PermissionGroup $group) {
$group->label('Category Permissions');
- });
- $group->addPermission('admin-category-list', function(Permission $permission) {
+ });
+ $group->addPermission('admin-category-list', function (Permission $permission) {
$permission->label('Category List')
->routes('admin.category.index');
});
- $group->addPermission('admin-category-create', function(Permission $permission){
+ $group->addPermission('admin-category-create', function (Permission $permission) {
$permission->label('Create Category')
->routes('admin.category.create,admin.category.store');
});
- $group->addPermission('admin-category-update', function(Permission $permission) {
+ $group->addPermission('admin-category-update', function (Permission $permission) {
$permission->label('Update Category')
->routes('admin.category.edit,admin.category.update');
});
- $group->addPermission('admin-category-destroy', function(Permission $permission) {
+ $group->addPermission('admin-category-destroy', function (Permission $permission) {
$permission->label('Destroy Category')
->routes('admin.category.destroy');
});
- $group->addPermission('admin-category-show', function(Permission $permission) {
+ $group->addPermission('admin-category-show', function (Permission $permission) {
$permission->label('Show Category')
->routes('admin.category.show');
- });
+ });
- $group = PermissionFacade::add('product', function(PermissionGroup $group){
+ $group = PermissionFacade::add('product', function (PermissionGroup $group) {
$group->label('Product Permissions');
});
- $group->addPermission('admin-product-list', function(Permission $permission) {
+ $group->addPermission('admin-product-list', function (Permission $permission) {
$permission->label('Product List')
->routes('admin.product.index');
- });
- $group->addPermission('admin-product-create', function(Permission $permission) {
+ });
+ $group->addPermission('admin-product-create', function (Permission $permission) {
$permission->label('Create Product')
->routes('admin.product.create,admin.product.store');
});
- $group->addPermission('admin-product-update', function(Permission $permission) {
+ $group->addPermission('admin-product-update', function (Permission $permission) {
$permission->label('Update Product')
->routes('admin.product.edit,admin.product.update');
});
- $group->addPermission('admin-product-destroy', function(Permission $permission){
+ $group->addPermission('admin-product-destroy', function (Permission $permission) {
$permission->label('Destroy Product')
->routes('admin.product.destroy');
});
- $group->addPermission('admin-product-show', function(Permission $permission){
+ $group->addPermission('admin-product-show', function (Permission $permission) {
$permission->label('Show Product')
->routes('admin.product.show');
- });
+ });
- $group = PermissionFacade::add('order', function(PermissionGroup $group){
+ $group = PermissionFacade::add('order', function (PermissionGroup $group) {
$group->label('Order Permissions');
});
-
- $group->addPermission('admin-order-list',function(Permission $permission){
+
+ $group->addPermission('admin-order-list', function (Permission $permission) {
$permission->label('Order List')
->routes('admin.order.index');
});
-
- $group->addPermission('admin-order-view', function(Permission $permission) {
+
+ $group->addPermission('admin-order-view', function (Permission $permission) {
$permission->label('Order View')
->routes('admin.order.view');
});
- $group->addPermission('admin-order-send-invoice-email', function(Permission $permission) {
+ $group->addPermission('admin-order-send-invoice-email', function (Permission $permission) {
$permission->label('Order Sent Invoice By Email')
->routes('admin.order.send-email-invoice');
- });$group->addPermission('admin-order-change-status', function(Permission $permission) {
+ });
+ $group->addPermission('admin-order-change-status', function (Permission $permission) {
$permission->label('Order Change Status')
->routes('admin.order.change-status,admin.order.update-status');
});
-
- $group = PermissionFacade::add('order-status', function(PermissionGroup $group){
+ $group = PermissionFacade::add('order-status', function (PermissionGroup $group) {
$group->label('Order Status Permissions');
});
- $group->addPermission('admin-order-status-list', function(Permission $permission){
+ $group->addPermission('admin-order-status-list', function (Permission $permission) {
$permission->label('Order Status List')
->routes('admin.order-status.index');
});
- $group->addPermission('admin-order-status-create', function(Permission $permission) {
+ $group->addPermission('admin-order-status-create', function (Permission $permission) {
$permission->label('Create Order Status')
->routes('admin.order-status.create,admin.order-status.store');
- });
- $group->addPermission('admin-order-status-update', function(Permission $permission) {
+ });
+ $group->addPermission('admin-order-status-update', function (Permission $permission) {
$permission->label('Update Order Status')
->routes('admin.order-status.edit,admin.order-status.update');
});
- $group->addPermission('admin-order-status-destroy', function(Permission $permission) {
+ $group->addPermission('admin-order-status-destroy', function (Permission $permission) {
$permission->label('Destroy Order Status')
->routes('admin.order-status.destroy');
});
- $group->addPermission('admin-order-status-show', function(Permission $permission) {
+ $group->addPermission('admin-order-status-show', function (Permission $permission) {
$permission->label('Show Order Status')
->routes('admin.order-status.show');
});
- $group = PermissionFacade::add('attribute', function(PermissionGroup $group){
+ $group = PermissionFacade::add('attribute', function (PermissionGroup $group) {
$group->label('Attribute Permissions');
});
- $group->addPermission('admin-attribute-list', function(Permission $permission) {
+ $group->addPermission('admin-attribute-list', function (Permission $permission) {
$permission->label('Attribute List')
->routes('admin.attribute.index');
});
- $group->addPermission('admin-attribute-create',function(Permission $permission) {
+ $group->addPermission('admin-attribute-create', function (Permission $permission) {
$permission->label('Create Attribute')
->routes('admin.attribute.create,admin.attribute.store');
});
- $group->addPermission('admin-attribute-update', function(Permission $permission){
+ $group->addPermission('admin-attribute-update', function (Permission $permission) {
$permission->label('Edit Attribute')
->routes('admin.attribute.edit,admin.attribute.update');
});
- $group->addPermission('admin-attribute-destroy',function(Permission $permission) {
+ $group->addPermission('admin-attribute-destroy', function (Permission $permission) {
$permission->label('Destroy Attribute')
->routes('admin.attribute.destroy');
});
- $group->addPermission('admin-attribute-show',function(Permission $permission) {
+ $group->addPermission('admin-attribute-show', function (Permission $permission) {
$permission->label('Show Attribute')
->routes('admin.attribute.show');
});
-
- $group = PermissionFacade::add('property', function(PermissionGroup $group){
+ $group = PermissionFacade::add('property', function (PermissionGroup $group) {
$group->label('Property Permissions');
});
- $group->addPermission('admin-property-list', function(Permission $permission) {
+ $group->addPermission('admin-property-list', function (Permission $permission) {
$permission->label('Property List')
->routes('admin.property.index');
});
- $group->addPermission('admin-property-create', function(Permission $permission){
+ $group->addPermission('admin-property-create', function (Permission $permission) {
$permission->label('Property Create')
->routes('admin.property.create,admin.property.store');
});
- $group->addPermission('admin-attribute-update', function(Permission $permission){
+ $group->addPermission('admin-attribute-update', function (Permission $permission) {
$permission->label('Property Update')
->routes('admin.property.edit,admin.property.update');
});
- $group->addPermission('admin-property-destroy', function(Permission $permission) {
+ $group->addPermission('admin-property-destroy', function (Permission $permission) {
$permission->label('Property Destroy')
->routes('admin.property.destroy');
});
- $group->addPermission('admin-property-show', function(Permission $permission) {
+ $group->addPermission('admin-property-show', function (Permission $permission) {
$permission->label('Property Show')
->routes('admin.property.show');
});
- $group = PermissionFacade::add('user', function(PermissionGroup $group){
+ $group = PermissionFacade::add('user', function (PermissionGroup $group) {
$group->label('User Permissions');
});
- $group->addPermission('admin-user-list', function(Permission $permission) {
+ $group->addPermission('admin-user-list', function (Permission $permission) {
$permission->label('User List')
->routes('admin.user.index');
});
- $group->addPermission('admin-user-create', function(Permission $permission) {
+ $group->addPermission('admin-user-create', function (Permission $permission) {
$permission->label('User Create')
->routes('admin.user.create,admin.user.store');
});
- $group->addPermission('admin-user-update', function(Permission $permission) {
+ $group->addPermission('admin-user-update', function (Permission $permission) {
$permission->label('User Update')
->routes('admin.user.edit,admin.user.update');
});
- $group->addPermission('admin-user-destroy', function(Permission $permission) {
+ $group->addPermission('admin-user-destroy', function (Permission $permission) {
$permission->label('User Destroy')
->routes('admin.user.destroy');
});
- $group->addPermission('admin-user-show', function(Permission $permission) {
+ $group->addPermission('admin-user-show', function (Permission $permission) {
$permission->label('User Show')
->routes('admin.user.show');
});
- $group = PermissionFacade::add('user-group', function(PermissionGroup $group){
+ $group = PermissionFacade::add('user-group', function (PermissionGroup $group) {
$group->label('User Group Permissions');
});
- $group->addPermission('admin-user-group-list', function(Permission $permission) {
+ $group->addPermission('admin-user-group-list', function (Permission $permission) {
$permission->label('User Group List')
->routes('admin.user-group.index');
});
- $group->addPermission('admin-user-group-create', function(Permission $permission) {
+ $group->addPermission('admin-user-group-create', function (Permission $permission) {
$permission->label('User Group Create')
->routes('admin.user-group.create,admin.user-group.store');
});
- $group->addPermission('admin-user-group.update', function(Permission $permission) {
+ $group->addPermission('admin-user-group.update', function (Permission $permission) {
$permission->label('User Group Update')
->routes('admin.user-group.edit,admin.user-group.update');
});
- $group->addPermission('admin-user-group-destroy', function(Permission $permission) {
+ $group->addPermission('admin-user-group-destroy', function (Permission $permission) {
$permission->label('User Group Destroy')
->routes('admin.user-group.destroy');
});
- $group->addPermission('admin-user-group-show', function(Permission $permission) {
+ $group->addPermission('admin-user-group-show', function (Permission $permission) {
$permission->label('User Group Show')
->routes('admin.user-group.show');
});
- $group = PermissionFacade::add('admin-user', function(PermissionGroup $group){
+ $group = PermissionFacade::add('admin-user', function (PermissionGroup $group) {
$group->label('Admin User Permissions');
});
- $group->addPermission('admin-admin-user-list', function(Permission $permission) {
+ $group->addPermission('admin-admin-user-list', function (Permission $permission) {
$permission->label('Admin User List')
->routes('admin.admin-user.index');
});
- $group->addPermission('admin-admin-user-create', function(Permission $permission) {
+ $group->addPermission('admin-admin-user-create', function (Permission $permission) {
$permission->label('Admin User Create')
->routes('admin.admin-user.create,admin.admin-user.store');
});
- $group->addPermission('admin-admin-user-update', function(Permission $permission) {
+ $group->addPermission('admin-admin-user-update', function (Permission $permission) {
$permission->label('Admin User Update')
->routes('admin.admin-user.edit,admin.admin-user.update');
});
- $group->addPermission('admin-admin-user-destroy', function(Permission $permission) {
+ $group->addPermission('admin-admin-user-destroy', function (Permission $permission) {
$permission->label('Admin User Destroy')
->routes('admin.admin-user.destroy');
});
- $group->addPermission('admin-admin-user-show', function(Permission $permission) {
+ $group->addPermission('admin-admin-user-show', function (Permission $permission) {
$permission->label('Admin User Show')
->routes('admin.admin-user.show');
});
- $group = PermissionFacade::add('role', function(PermissionGroup $group){
+ $group = PermissionFacade::add('role', function (PermissionGroup $group) {
$group->label('Role Permissions');
});
- $group->addPermission('admin-role-list', function(Permission $permission) {
+ $group->addPermission('admin-role-list', function (Permission $permission) {
$permission->label('Role List')
->routes('admin.role.index');
});
- $group->addPermission('admin-role-create', function(Permission $permission) {
+ $group->addPermission('admin-role-create', function (Permission $permission) {
$permission->label('Role Create')
->routes('admin.role.create,admin.role.store');
});
- $group->addPermission('admin-role-update', function(Permission $permission) {
+ $group->addPermission('admin-role-update', function (Permission $permission) {
$permission->label('Role Update')
->routes('admin.role.edit,admin.role.update');
});
- $group->addPermission('admin-role-destroy', function(Permission $permission) {
+ $group->addPermission('admin-role-destroy', function (Permission $permission) {
$permission->label('Role Destroy')
->routes('admin.role.destroy');
});
- $group->addPermission('admin-role-show', function(Permission $permission) {
+ $group->addPermission('admin-role-show', function (Permission $permission) {
$permission->label('Role Show')
->routes('admin.role.show');
});
- $group = PermissionFacade::add('configuration', function(PermissionGroup $group){
+ $group = PermissionFacade::add('configuration', function (PermissionGroup $group) {
$group->label('Configuration Permissions');
});
- $group->addPermission('admin-configuration', function(Permission $permission) {
+ $group->addPermission('admin-configuration', function (Permission $permission) {
$permission->label('Configuration')
->routes('admin.configuration');
});
- $group->addPermission('admin-configuration-store', function(Permission $permission) {
+ $group->addPermission('admin-configuration-store', function (Permission $permission) {
$permission->label('Configuration Store')
->routes('admin.configuration.store');
});
-
- $group = PermissionFacade::add('site-currency', function(PermissionGroup $group){
+ $group = PermissionFacade::add('site-currency', function (PermissionGroup $group) {
$group->label('Site Currency Permissions');
});
- $group->addPermission('admin-site-currency-list', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-list', function (Permission $permission) {
$permission->label('Site Currency List')
->routes('admin.site-currency.index');
});
- $group->addPermission('admin-site-currency-create', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-create', function (Permission $permission) {
$permission->label('Site Currency Create')
->routes('admin.site-currency.create,admin.site-currency.store');
});
- $group->addPermission('admin-site-currency-update', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-update', function (Permission $permission) {
$permission->label('Site Currency Update')
->routes('admin.site-currency.edit,admin.site-currency.update');
});
- $group->addPermission('admin-site-currency-destroy', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-destroy', function (Permission $permission) {
$permission->label('Site Currency Destroy')
->routes('admin.site-currency.destroy');
});
- $group->addPermission('admin-site-currency-show', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-show', function (Permission $permission) {
$permission->label('Site Currency Show')
->routes('admin.site-currency.show');
});
-
- $group = PermissionFacade::add('country', function(PermissionGroup $group){
+
+ $group = PermissionFacade::add('country', function (PermissionGroup $group) {
$group->label('Country Permissions');
});
- $group->addPermission('admin-country-list', function(Permission $permission) {
+ $group->addPermission('admin-country-list', function (Permission $permission) {
$permission->label('Country List')
->routes('admin.country.index');
});
- $group->addPermission('admin-country-create', function(Permission $permission) {
+ $group->addPermission('admin-country-create', function (Permission $permission) {
$permission->label('Country Create')
->routes('admin.country.create,admin.country.store');
});
- $group->addPermission('admin-country-update', function(Permission $permission) {
+ $group->addPermission('admin-country-update', function (Permission $permission) {
$permission->label('Country Update')
->routes('admin.country.edit,admin.country.update');
});
- $group->addPermission('admin-country-destroy', function(Permission $permission) {
+ $group->addPermission('admin-country-destroy', function (Permission $permission) {
$permission->label('Country Destroy')
->routes('admin.country.destroy');
});
- $group->addPermission('admin-country-show', function(Permission $permission) {
+ $group->addPermission('admin-country-show', function (Permission $permission) {
$permission->label('Country Show')
->routes('admin.country.show');
});
-
- $group = PermissionFacade::add('state', function(PermissionGroup $group){
+
+ $group = PermissionFacade::add('state', function (PermissionGroup $group) {
$group->label('State Permissions');
});
- $group->addPermission('admin-state-list', function(Permission $permission) {
+ $group->addPermission('admin-state-list', function (Permission $permission) {
$permission->label('State List')
->routes('admin.state.index');
});
- $group->addPermission('admin-state-create', function(Permission $permission) {
+ $group->addPermission('admin-state-create', function (Permission $permission) {
$permission->label('State Create')
->routes('admin.state.create,admin.state.store');
});
- $group->addPermission('admin-state-update', function(Permission $permission) {
+ $group->addPermission('admin-state-update', function (Permission $permission) {
$permission->label('State Update')
->routes('admin.state.edit,admin.state.update');
});
- $group->addPermission('admin-site-currency-destroy', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-destroy', function (Permission $permission) {
$permission->label('State Destroy')
->routes('admin.state.destroy');
});
- $group->addPermission('admin-site-currency-show', function(Permission $permission) {
+ $group->addPermission('admin-site-currency-show', function (Permission $permission) {
$permission->label('State Show')
->routes('admin.state.show');
});
-
- $group = PermissionFacade::add('theme', function(PermissionGroup $group){
+ $group = PermissionFacade::add('theme', function (PermissionGroup $group) {
$group->label('Theme Permissions');
});
- $group->addPermission('admin-theme-list', function(Permission $permission) {
+ $group->addPermission('admin-theme-list', function (Permission $permission) {
$permission->label('Theme List')
->routes('admin.theme.index');
});
- $group->addPermission('admin-theme-create', function(Permission $permission) {
+ $group->addPermission('admin-theme-create', function (Permission $permission) {
$permission->label('Theme Upload/Create')
->routes('admin.create.index', 'admin.theme.store');
});
- $group->addPermission('admin-theme-activated', function(Permission $permission) {
+ $group->addPermission('admin-theme-activated', function (Permission $permission) {
$permission->label('Theme Activated')
->routes('admin.activated.index');
});
- $group->addPermission('admin-theme-deactivated', function(Permission $permission) {
+ $group->addPermission('admin-theme-deactivated', function (Permission $permission) {
$permission->label('Theme Deactivated')
->routes('admin.deactivated.index');
});
@@ -463,15 +456,15 @@ protected function registerPermissions()
// ->routes('admin.destroy.index');
//});
- $group = PermissionFacade::add('module', function(PermissionGroup $group){
+ $group = PermissionFacade::add('module', function (PermissionGroup $group) {
$group->label('Module Permissions');
});
- $group->addPermission('admin-module-list', function(Permission $permission) {
+ $group->addPermission('admin-module-list', function (Permission $permission) {
$permission->label('Module List')
->routes('admin.module.index');
});
- $group->addPermission('admin-module-create', function(Permission $permission) {
+ $group->addPermission('admin-module-create', function (Permission $permission) {
$permission->label('Module Upload')
->routes('admin.create.index', 'admin.module.store');
});
diff --git a/src/Product/Controllers/AttributeController.php b/src/Product/Controllers/AttributeController.php
index db9462b44..91cdbbecf 100644
--- a/src/Product/Controllers/AttributeController.php
+++ b/src/Product/Controllers/AttributeController.php
@@ -150,7 +150,7 @@ private function saveDropdownOptions($attribute, $request)
/**
* Find a Record and Returns a Json Resrouce for that Record
- *
+ *
* @param \AvoRed\Framework\Models\Database\Attribute $attribute
* @return \Illuminate\Http\Resources\Json\JsonResource
*/
diff --git a/src/Product/Controllers/CategoryController.php b/src/Product/Controllers/CategoryController.php
index cdff7ff98..6af5fd590 100644
--- a/src/Product/Controllers/CategoryController.php
+++ b/src/Product/Controllers/CategoryController.php
@@ -1,4 +1,5 @@
repository = $repository;
$this->isDefaultOptins = Collection::make([
- ['id' => 0,'name' => 'No'],
- ['id' => 1,'name' => 'Yes'],
+ ['id' => 0, 'name' => 'No'],
+ ['id' => 1, 'name' => 'Yes'],
]);
}
@@ -62,7 +62,7 @@ public function store(OrderStatusRequest $request)
if ($request->is_default == 1) {
$this->_setIsDefault();
}
-
+
$this->repository->create($request->all());
return redirect()->route('admin.order-status.index');
@@ -78,9 +78,7 @@ public function edit(OrderStatus $orderStatus)
{
return view('avored-framework::product.order-status.edit')
->with('model', $orderStatus)
- ->with('isDefaultOptions', $this->isDefaultOptins)
-
- ;
+ ->with('isDefaultOptions', $this->isDefaultOptins);
}
/**
@@ -97,7 +95,6 @@ public function update(OrderStatusRequest $request, OrderStatus $orderStatus)
}
$orderStatus->update($request->all());
-
return redirect()->route('admin.order-status.index');
}
@@ -116,19 +113,19 @@ public function destroy(OrderStatus $orderStatus)
/**
* Find a Record and Returns a Html Resrouce for that Record
- *
+ *
* @return \Illuminate\Http\Response
*/
public function show(OrderStatus $orderStatus)
{
return view('avored-framework::product.order-status.show')->with('orderStatus', $orderStatus);
}
-
+
private function _setIsDefault()
{
$model = $this->repository->query()->whereIsDefault(1)->first();
- if(null !== $model) {
+ if (null !== $model) {
$model->update(['is_default' => 0]);
}
}
diff --git a/src/Product/Controllers/ProductController.php b/src/Product/Controllers/ProductController.php
index 3a226409b..576fa23ca 100644
--- a/src/Product/Controllers/ProductController.php
+++ b/src/Product/Controllers/ProductController.php
@@ -172,7 +172,7 @@ public function uploadImage(Request $request)
* @return \Illuminate\Http\JsonResponse
*/
public function deleteImage(Request $request)
- {
+ {
$path = $request->get('path');
$fileName = pathinfo($path, PATHINFO_BASENAME);
@@ -181,16 +181,16 @@ public function deleteImage(Request $request)
$sizes = config('avored-framework.image.sizes');
foreach ($sizes as $sizeName => $widthHeight) {
$imagePath = $relativeDir . DIRECTORY_SEPARATOR . $sizeName . '-' . $fileName;
-
- if (File::exists(storage_path('app/public/' .$imagePath))) {
+
+ if (File::exists(storage_path('app/public/' . $imagePath))) {
File::delete(storage_path('app/public/' . $imagePath));
}
}
-
- if (File::exists(storage_path('app/public/' .$path))) {
+
+ if (File::exists(storage_path('app/public/' . $path))) {
File::delete(storage_path('app/public/' . $path));
}
-
+
return JsonResponse::create(['success' => true]);
}
diff --git a/src/Product/Controllers/PropertyController.php b/src/Product/Controllers/PropertyController.php
index 6b9311a85..0a33e68f4 100644
--- a/src/Product/Controllers/PropertyController.php
+++ b/src/Product/Controllers/PropertyController.php
@@ -148,10 +148,9 @@ private function _saveDropdownOptions($property, $request)
}
}
-
/**
* Find a Record and Returns a Html Resrouce for that Record
- *
+ *
* @return \Illuminate\Http\Response
*/
public function show(Property $property)
diff --git a/src/Product/DataGrid/AttributeDataGrid.php b/src/Product/DataGrid/AttributeDataGrid.php
index 04dd9d222..8ff399c99 100644
--- a/src/Product/DataGrid/AttributeDataGrid.php
+++ b/src/Product/DataGrid/AttributeDataGrid.php
@@ -3,7 +3,6 @@
namespace AvoRed\Framework\Product\DataGrid;
use AvoRed\Framework\DataGrid\Facade as DataGrid;
-use AvoRed\Framework\Models\Database\Attribute;
class AttributeDataGrid
{
@@ -17,14 +16,11 @@ public function __construct($model)
->column('name', ['label' => 'Name', 'sortable' => true])
->column('identifier', ['sortable' => true])
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
}
-
-
-
}
diff --git a/src/Product/DataGrid/OrderStatusDataGrid.php b/src/Product/DataGrid/OrderStatusDataGrid.php
index abb9fd2e4..9dae217d0 100644
--- a/src/Product/DataGrid/OrderStatusDataGrid.php
+++ b/src/Product/DataGrid/OrderStatusDataGrid.php
@@ -17,11 +17,10 @@ public function __construct($model)
->column('name', function (TextColumn $column) {
$column->identifier('name')
->label('Name')
- ->sortable(true)
- ;
+ ->sortable(true);
})
- ->linkColumn('is_default',['label' => 'Is Default'],function($model) {
- return ($model->is_default == 1) ? "Yes" : "No";
+ ->linkColumn('is_default', ['label' => 'Is Default'], function ($model) {
+ return ($model->is_default == 1) ? 'Yes' : 'No';
})
->linkColumn('edit', [], function ($model) {
return "id) . "' >Edit";
diff --git a/src/Product/DataGrid/ProductDataGrid.php b/src/Product/DataGrid/ProductDataGrid.php
index 8770f0181..01b5b825f 100644
--- a/src/Product/DataGrid/ProductDataGrid.php
+++ b/src/Product/DataGrid/ProductDataGrid.php
@@ -15,12 +15,12 @@ public function __construct($model)
$dataGrid->model($model)
->column('id', ['sortable' => true])
->linkColumn('image', [], function ($model) {
- return "![](".$model->image->smallUrl.")
";
+ return "![](" . $model->image->smallUrl . ")
";
})->column('name')
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/Product/DataGrid/PropertyDataGrid.php b/src/Product/DataGrid/PropertyDataGrid.php
index 798e3a711..82e32b989 100644
--- a/src/Product/DataGrid/PropertyDataGrid.php
+++ b/src/Product/DataGrid/PropertyDataGrid.php
@@ -17,9 +17,9 @@ public function __construct($model)
->column('name')
->column('identifier')
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/Product/Requests/AttributeRequest.php b/src/Product/Requests/AttributeRequest.php
index 938927ef9..ea134ae63 100644
--- a/src/Product/Requests/AttributeRequest.php
+++ b/src/Product/Requests/AttributeRequest.php
@@ -31,7 +31,7 @@ public function rules()
if ($key == '__RANDOM_STRING__') {
continue;
}
- $validationRule['dropdown-options.'.$key.'.display_text'] = 'required';
+ $validationRule['dropdown-options.' . $key . '.display_text'] = 'required';
}
}
diff --git a/src/Product/Requests/OrderStatusRequest.php b/src/Product/Requests/OrderStatusRequest.php
index 2d2312ce4..0a6c1444d 100644
--- a/src/Product/Requests/OrderStatusRequest.php
+++ b/src/Product/Requests/OrderStatusRequest.php
@@ -26,7 +26,6 @@ public function rules()
$validationRule = [];
$validationRule['name'] = 'required|max:255';
$validationRule['is_default'] = 'max:255';
-
return $validationRule;
}
diff --git a/src/Product/Requests/ProductRequest.php b/src/Product/Requests/ProductRequest.php
index ee1e6942f..5b9a4fabe 100644
--- a/src/Product/Requests/ProductRequest.php
+++ b/src/Product/Requests/ProductRequest.php
@@ -30,12 +30,12 @@ public function rules()
if (isset($product) && $product->type == 'VARIABLE_PRODUCT') {
$rule['name'] = 'required|max:255';
- $rule ['price'] = 'required|max:14|regex:/^-?\\d*(\\.\\d+)?$/';
+ $rule['price'] = 'required|max:14|regex:/^-?\\d*(\\.\\d+)?$/';
$rule['sku'] = 'required|max:255';
$rule['qty'] = 'required';
} else {
$rule['name'] = 'required|max:255';
- $rule ['price'] = 'required|max:14|regex:/^-?\\d*(\\.\\d+)?$/';
+ $rule['price'] = 'required|max:14|regex:/^-?\\d*(\\.\\d+)?$/';
$rule['sku'] = 'required|max:255';
//$rule['page_title'] = "max:255";
//$rule['page_description'] = "max:255";
@@ -47,7 +47,6 @@ public function rules()
//@todo category validation
if (strtolower($this->method()) == 'put' || strtolower($this->method()) == 'patch') {
-
//$product = Product::find($this->route('product'));
//$rule['slug'] = "required|max:255|alpha_dash|unique:products,slug," . $product->id;
}
diff --git a/src/Product/ViewComposers/ProductFieldsComposer.php b/src/Product/ViewComposers/ProductFieldsComposer.php
index 77aed4df7..a34b66458 100644
--- a/src/Product/ViewComposers/ProductFieldsComposer.php
+++ b/src/Product/ViewComposers/ProductFieldsComposer.php
@@ -7,8 +7,6 @@
class ProductFieldsComposer
{
-
-
/**
* Bind data to the view.
*
diff --git a/src/Product/Widget/MonthlyRevenueWidget.php b/src/Product/Widget/MonthlyRevenueWidget.php
index f150823a6..74141db6e 100644
--- a/src/Product/Widget/MonthlyRevenueWidget.php
+++ b/src/Product/Widget/MonthlyRevenueWidget.php
@@ -2,7 +2,6 @@
namespace AvoRed\Framework\Product\Widget;
-use AvoRed\Framework\Models\Database\User;
use AvoRed\Framework\Widget\Contracts\Widget as WidgetContract;
use AvoRed\Framework\Models\Contracts\OrderInterface;
use Carbon\Carbon;
@@ -37,8 +36,6 @@ class MonthlyRevenueWidget implements WidgetContract
*/
protected $identifier = 'monthly-revenue';
-
-
public function view()
{
return $this->view;
@@ -78,23 +75,23 @@ public function type()
*/
public function with()
{
- $monthlyRevenue = 0;
+ $monthlyRevenue = 0;
$orderRepository = app(OrderInterface::class);
$lastMonth = Carbon::now()->subMonths(1);
-
+
$orders = $orderRepository->query()
->where('created_at', '>=', $lastMonth)
- ->get();
+ ->get();
- foreach($orders as $order) {
- foreach($order->products as $product) {
+ foreach ($orders as $order) {
+ foreach ($order->products as $product) {
$monthlyRevenue += $product->price - $product->cost_price;
}
}
- $currencySymbol = "$";
+ $currencySymbol = '$';
//$monthlyRevenue = rand(100, 200);
- return ['monthlyRevenue' => number_format($monthlyRevenue,2), 'currencySymbol' => $currencySymbol];
+ return ['monthlyRevenue' => number_format($monthlyRevenue, 2), 'currencySymbol' => $currencySymbol];
}
/**
diff --git a/src/Provider.php b/src/Provider.php
index edfc0caa5..f6b050f60 100644
--- a/src/Provider.php
+++ b/src/Provider.php
@@ -4,7 +4,6 @@
use Illuminate\Support\Facades\App;
use Illuminate\Support\ServiceProvider;
-use AvoRed\Framework\Models\Database\Product;
use AvoRed\Framework\Api\Middleware\AdminApiAuth;
use AvoRed\Framework\User\Middleware\AdminAuth;
use AvoRed\Framework\User\Middleware\RedirectIfAdminAuth;
@@ -155,8 +154,8 @@ public function registerViewComposerData()
View::composer('avored-framework::cms.page._fields', PageFieldsComposer::class);
View::composer('avored-framework::cms.menu.index', MenuComposer::class);
View::composer(['avored-framework::product.create',
- 'avored-framework::product.edit',
- ], ProductFieldsComposer::class);
+ 'avored-framework::product.edit',
+ ], ProductFieldsComposer::class);
}
/*
@@ -170,9 +169,9 @@ public function registerPassportResources()
Passport::routes();
Passport::tokensExpireIn(Carbon::now()->addDays(15));
$this->commands([
- InstallCommand::class,
- ClientCommand::class,
- KeysCommand::class,
- ]);
+ InstallCommand::class,
+ ClientCommand::class,
+ KeysCommand::class,
+ ]);
}
}
diff --git a/src/Shipping/Provider.php b/src/Shipping/Provider.php
index a9089d0e1..cbe5a8e0d 100644
--- a/src/Shipping/Provider.php
+++ b/src/Shipping/Provider.php
@@ -21,7 +21,7 @@ class Provider extends ServiceProvider
*/
public function boot()
{
- $this->registerShippingOption();
+ $this->registerShippingOption();
}
/**
@@ -58,7 +58,6 @@ public function provides()
return ['shipping', 'AvoRed\Framework\Shipping\Manager'];
}
-
/**
* Register Shippiong Option for App.
*
diff --git a/src/Support/Console/AdminMakeCommand.php b/src/Support/Console/AdminMakeCommand.php
index 5b461dc31..600fa8336 100644
--- a/src/Support/Console/AdminMakeCommand.php
+++ b/src/Support/Console/AdminMakeCommand.php
@@ -51,10 +51,10 @@ public function __construct(Filesystem $files)
public function handle()
{
//CREATE AN ADMIN USER
- $firstName = $this->ask('What is your First Name:');
- $lastName = $this->ask('What is your Last Name:');
- $email = $this->ask('What is your Email:');
- $password = $this->secret('What is your password:');
+ $firstName = $this->ask('What is your First Name:');
+ $lastName = $this->ask('What is your Last Name:');
+ $email = $this->ask('What is your Email:');
+ $password = $this->secret('What is your password:');
$role = Role::create(['name' => 'administrator', 'description' => 'Administrator Role has all access']);
@@ -67,8 +67,8 @@ public function handle()
'role_id' => $role->id,
]);
- $request = $this->laravel->make('request');
- $clientRepository = new ClientRepository;
+ $request = $this->laravel->make('request');
+ $clientRepository = new ClientRepository;
$clientRepository->createPasswordGrantClient($adminUser->id, $adminUser->full_name, $request->getUriForPath('/'));
$this->info('AvoRed Ecommerce Administrator Account Created Successfully!');
diff --git a/src/Support/Console/InstallCommand.php b/src/Support/Console/InstallCommand.php
index 96762f775..e6f5b8555 100644
--- a/src/Support/Console/InstallCommand.php
+++ b/src/Support/Console/InstallCommand.php
@@ -48,10 +48,10 @@ public function __construct(Filesystem $files)
* @return void
*/
public function handle()
- {
- if($this->call('self-diagnosis') === 1) {
+ {
+ if ($this->call('self-diagnosis') === 1) {
$this->error('Please Fixed all Required Check');
- } else {
+ } else {
$this->dropAllTables();
$answer = $this->ask('Do you want to Install Dummy Data? (y/n)', 'yes');
@@ -76,7 +76,7 @@ public function handle()
Theme::publishItem($fromPath, $toPath);
$this->call('passport:install', ['--force' => true]);
$this->call('passport:keys');
-
+
Configuration::create([
'configuration_key' => 'active_theme_identifier',
'configuration_value' => 'avored-default'
diff --git a/src/System/Controllers/Controller.php b/src/System/Controllers/Controller.php
index bedb8a285..40164ffa3 100644
--- a/src/System/Controllers/Controller.php
+++ b/src/System/Controllers/Controller.php
@@ -2,8 +2,6 @@
namespace AvoRed\Framework\System\Controllers;
-use Illuminate\Support\Facades\View;
-use Illuminate\Support\Facades\Schema;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -14,6 +12,4 @@ class Controller extends BaseController
use AuthorizesRequests,
DispatchesJobs,
ValidatesRequests;
-
-
}
diff --git a/src/System/Controllers/CountryController.php b/src/System/Controllers/CountryController.php
index c38e0033c..700da647a 100644
--- a/src/System/Controllers/CountryController.php
+++ b/src/System/Controllers/CountryController.php
@@ -3,20 +3,15 @@
namespace AvoRed\Framework\System\Controllers;
use AvoRed\Framework\System\DataGrid\CountryDataGrid;
-use AvoRed\Framework\Image\Facade as Image;
-use AvoRed\Framework\User\Requests\AdminUserRequest;
use AvoRed\Framework\Models\Database\Country;
-use AvoRed\Framework\Models\Database\AdminUser;
use AvoRed\Framework\System\Requests\CountryRequest;
use AvoRed\Framework\Models\Contracts\CountryInterface;
use Illuminate\Support\Collection;
class CountryController extends Controller
{
-
-
/**
- *
+ *
* @param \Illuminate\Support\Collection $isActiveOptions
*/
protected $isActiveOptions;
@@ -29,7 +24,7 @@ class CountryController extends Controller
public function __construct(CountryInterface $repository)
{
$this->repository = $repository;
- $this->isActiveOptions = Collection::make([['id' => 0,'name' => 'No'],['id' => 1,'name' => 'Yes']]);
+ $this->isActiveOptions = Collection::make([['id' => 0, 'name' => 'No'], ['id' => 1, 'name' => 'Yes']]);
}
/**
@@ -39,8 +34,7 @@ public function __construct(CountryInterface $repository)
*/
public function index()
{
-
- $dataGrid = new CountryDataGrid($this->repository->query()->orderBy('id','desc'));
+ $dataGrid = new CountryDataGrid($this->repository->query()->orderBy('id', 'desc'));
return view('avored-framework::system.country.index')->with('dataGrid', $dataGrid->dataGrid);
}
@@ -109,7 +103,6 @@ public function destroy(Country $country)
return redirect()->route('admin.country.index');
}
-
/**
* Display a listing of the resource.
*
diff --git a/src/System/Controllers/DashboardController.php b/src/System/Controllers/DashboardController.php
index 394df88a9..7b888c558 100644
--- a/src/System/Controllers/DashboardController.php
+++ b/src/System/Controllers/DashboardController.php
@@ -25,7 +25,6 @@ public function __construct(OrderInterface $repository)
*/
public function index()
{
-
$totalRegisteredUser = app(UserInterface::class)->all();
$totalOrder = $this->repository->all()->count();
diff --git a/src/System/Controllers/RoleController.php b/src/System/Controllers/RoleController.php
index 4d6ad4d6d..9d158a09c 100644
--- a/src/System/Controllers/RoleController.php
+++ b/src/System/Controllers/RoleController.php
@@ -6,7 +6,6 @@
use AvoRed\Framework\Models\Database\Role as Model;
use AvoRed\Framework\User\Requests\RoleRequst;
use AvoRed\Framework\Models\Database\Permission;
-use AvoRed\Framework\DataGrid\Facade as DataGrid;
use AvoRed\Framework\Models\Contracts\RoleInterface;
use AvoRed\Framework\Models\Database\Role;
@@ -140,7 +139,6 @@ private function _saveRolePermissions($request, $role)
$role->permissions()->sync($ids);
}
-
/**
* Display a listing of the resource.
*
diff --git a/src/System/Controllers/SiteCurrencyController.php b/src/System/Controllers/SiteCurrencyController.php
index cecde1b5d..ed6dc8f4d 100644
--- a/src/System/Controllers/SiteCurrencyController.php
+++ b/src/System/Controllers/SiteCurrencyController.php
@@ -101,7 +101,6 @@ public function destroy($id)
return redirect()->route('admin.site-currency.index');
}
-
/**
* Display a listing of the resource.
*
diff --git a/src/System/Controllers/StateController.php b/src/System/Controllers/StateController.php
index 19483a501..d6d4e1571 100644
--- a/src/System/Controllers/StateController.php
+++ b/src/System/Controllers/StateController.php
@@ -10,7 +10,6 @@
class StateController extends Controller
{
-
/**
*
* @var \AvoRed\Framework\Models\Repository\StateRepository
@@ -20,7 +19,6 @@ class StateController extends Controller
public function __construct(StateInterface $repository)
{
$this->repository = $repository;
-
}
/**
@@ -30,8 +28,7 @@ public function __construct(StateInterface $repository)
*/
public function index()
{
-
- $dataGrid = new StateDataGrid($this->repository->query()->orderBy('id','desc'));
+ $dataGrid = new StateDataGrid($this->repository->query()->orderBy('id', 'desc'));
return view('avored-framework::system.state.index')->with('dataGrid', $dataGrid->dataGrid);
}
@@ -43,7 +40,7 @@ public function index()
*/
public function create()
{
- $countryOptions = $this->_getCountryOptions();
+ $countryOptions = $this->_getCountryOptions();
return view('avored-framework::system.state.create')
->with('countryOptions', $countryOptions);
@@ -74,7 +71,8 @@ public function edit(State $state)
$countryOptions = $this->_getCountryOptions();
return view('avored-framework::system.state.edit')
->with('model', $state)
- ->with('countryOptions', $countryOptions);;
+ ->with('countryOptions', $countryOptions);
+ ;
}
/**
@@ -103,7 +101,6 @@ public function destroy(State $state)
return redirect()->route('admin.state.index');
}
-
/**
* Display a listing of the resource.
*
@@ -119,7 +116,8 @@ public function show(State $state)
* Get the Country Options for the Country Id Fields
* @return \Illuminate\Support\Collection
*/
- private function _getCountryOptions() {
+ private function _getCountryOptions()
+ {
$countryRepository = app(CountryInterface::class);
return $countryRepository->options();
}
diff --git a/src/System/Controllers/ThemeController.php b/src/System/Controllers/ThemeController.php
index 3527d6dc5..795e35081 100644
--- a/src/System/Controllers/ThemeController.php
+++ b/src/System/Controllers/ThemeController.php
@@ -40,7 +40,7 @@ public function index()
$themes = Theme::all();
$activeTheme = $this->configurationRepository->getValueByKey('active_theme_identifier');
-
+
$siteCurrencyGrid = new ThemeDataGrid($themes, $activeTheme);
return view('avored-framework::system.theme.index')
@@ -71,13 +71,11 @@ public function store(Request $request)
$zip = new ZipArchive();
-
- if ($zip->open(storage_path('app/public/'. $filePath)) === true) {
+ if ($zip->open(storage_path('app/public/' . $filePath)) === true) {
$extractPath = base_path('themes');
$zip->extractTo($extractPath);
$zip->close();
} else {
- dd($filePath);
throwException('Error in Zip Extract error.');
}
diff --git a/src/System/DataGrid/AdminUserDataGrid.php b/src/System/DataGrid/AdminUserDataGrid.php
index c61a10eeb..41b14fa7c 100644
--- a/src/System/DataGrid/AdminUserDataGrid.php
+++ b/src/System/DataGrid/AdminUserDataGrid.php
@@ -17,13 +17,12 @@ public function __construct($model)
->column('first_name', ['label' => 'First Name'])
->column('last_name', ['label' => 'Last Name'])
->linkColumn('show_api', ['label' => 'Show API'], function ($model) {
- return "Show API";
+ return "Show API";
})
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
-
- return "id)."' >Show";
+ return "id) . "' >Show";
/*
if($model->is_super_admin === 1) {
diff --git a/src/System/DataGrid/CountryDataGrid.php b/src/System/DataGrid/CountryDataGrid.php
index 448b38c8e..27f985a4b 100644
--- a/src/System/DataGrid/CountryDataGrid.php
+++ b/src/System/DataGrid/CountryDataGrid.php
@@ -15,11 +15,11 @@ public function __construct($model)
$dataGrid->model($model)
->column('id', ['sortable' => true])
->column('name', ['label' => 'Name'])
-
+
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/System/DataGrid/ModuleDataGrid.php b/src/System/DataGrid/ModuleDataGrid.php
index dd0cbacb7..97a29154a 100644
--- a/src/System/DataGrid/ModuleDataGrid.php
+++ b/src/System/DataGrid/ModuleDataGrid.php
@@ -9,13 +9,13 @@ class ModuleDataGrid
public $dataGrid;
public function __construct($model)
- {
+ {
$dataGrid = DataGrid::make('admin_theme_controller');
-
+
$dataGrid->model($model)
->column('name', ['label' => 'Name'])
->column('identifier', ['label' => 'Identifier'])
- ->column('status', ['label' => 'Status']);
+ ->column('status', ['label' => 'Status']);
$this->dataGrid = $dataGrid;
}
diff --git a/src/System/DataGrid/RoleDataGrid.php b/src/System/DataGrid/RoleDataGrid.php
index 0f5a538b3..7c9ecce64 100644
--- a/src/System/DataGrid/RoleDataGrid.php
+++ b/src/System/DataGrid/RoleDataGrid.php
@@ -16,9 +16,9 @@ public function __construct($model)
->column('id', ['sortable' => true])
->column('name')
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/System/DataGrid/SiteCurrencyDataGrid.php b/src/System/DataGrid/SiteCurrencyDataGrid.php
index aa492b26f..74bf8482c 100644
--- a/src/System/DataGrid/SiteCurrencyDataGrid.php
+++ b/src/System/DataGrid/SiteCurrencyDataGrid.php
@@ -18,9 +18,9 @@ public function __construct($model)
->column('name', ['label' => 'Name'])
->column('conversion_rate', ['label' => 'Convertion Rate'])
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/System/DataGrid/StateDataGrid.php b/src/System/DataGrid/StateDataGrid.php
index 219be973c..d78e0be2b 100644
--- a/src/System/DataGrid/StateDataGrid.php
+++ b/src/System/DataGrid/StateDataGrid.php
@@ -16,9 +16,9 @@ public function __construct($model)
->column('id', ['sortable' => true])
->column('name', ['label' => 'Name'])
->linkColumn('edit', [], function ($model) {
- return "id)."' >Edit";
+ return "id) . "' >Edit";
})->linkColumn('show', [], function ($model) {
- return "id)."' >Show";
+ return "id) . "' >Show";
});
$this->dataGrid = $dataGrid;
diff --git a/src/System/DataGrid/ThemeDataGrid.php b/src/System/DataGrid/ThemeDataGrid.php
index 502402218..f7058ec27 100644
--- a/src/System/DataGrid/ThemeDataGrid.php
+++ b/src/System/DataGrid/ThemeDataGrid.php
@@ -6,50 +6,47 @@
class ThemeDataGrid
{
-
/**
* Theme DataGrid Manager
- *
+ *
* @var \AvoRed\Framework\DataGrid\Manager $dataGrid
*/
public $dataGrid;
/**
* Theme controller which accepts Collection of themes and Currently Active Theme.
- *
+ *
* @param \ Illuminate\Database\Eloquent\Collection $themeCollection
* @param string $activeTheme
*/
public function __construct($model, $activeTheme)
- {
+ {
$dataGrid = DataGrid::make('admin_theme_controller');
$dataGrid->model($model)
->column('name', ['label' => 'Name'])
->column('identifier', ['label' => 'Identifier'])
- ->linkColumn('is_active', ['label' => 'Is Active'],function($model) use ($activeTheme) {
- if($model['identifier'] == $activeTheme) {
- return "Yes";
+ ->linkColumn('is_active', ['label' => 'Is Active'], function ($model) use ($activeTheme) {
+ if ($model['identifier'] == $activeTheme) {
+ return 'Yes';
}
- return "No";
+ return 'No';
})
- ->linkColumn('activate_route', ['label' => 'Action'], function($model) use ($activeTheme) {
-
+ ->linkColumn('activate_route', ['label' => 'Action'], function ($model) use ($activeTheme) {
if ($model['identifier'] != $activeTheme) {
- return '
';
} else {
-
return '';
}
});
-
+
$this->dataGrid = $dataGrid;
}
}
diff --git a/src/System/Middleware/SiteCurrencyMiddleware.php b/src/System/Middleware/SiteCurrencyMiddleware.php
index 33e3a3578..936bdf897 100644
--- a/src/System/Middleware/SiteCurrencyMiddleware.php
+++ b/src/System/Middleware/SiteCurrencyMiddleware.php
@@ -11,39 +11,38 @@
class SiteCurrencyMiddleware
{
-
/**
- *
+ *
* @var \AvoRed\Framework\Models\Repository\ConfigurationRepository
*/
protected $repository;
/**
- *
+ *
* @var \AvoRed\Framework\Models\Repository\SiteCurrencyRepository $curRep
*/
protected $curRep;
/**
- *
+ *
* @var \AvoRed\Framework\Models\Repository\ProductRepository $productRepository
*/
protected $productRepository;
/**
- * Construct to setup Repository
- *
+ * Construct to setup Repository
+ *
*/
public function __construct(
- ConfigurationInterface $rep,
+ ConfigurationInterface $rep,
SiteCurrencyInterface $curRep,
- ProductInterface $productRepository)
- {
- $this->repository = $rep;
- $this->curRep = $curRep;
- $this->productRepository = $productRepository;
-
+ ProductInterface $productRepository
+ ) {
+ $this->repository = $rep;
+ $this->curRep = $curRep;
+ $this->productRepository = $productRepository;
}
+
/**
* Handle an incoming request.
*
@@ -55,38 +54,36 @@ public function __construct(
*/
public function handle($request, Closure $next)
{
- if(null === $request->get('currency_code') && null !== Session::get('currency_code')) {
+ if (null === $request->get('currency_code') && null !== Session::get('currency_code')) {
return $next($request);
}
$currencyCode = $request->get('currency_code');
-
- if(null === $currencyCode) {
+
+ if (null === $currencyCode) {
$configCurrency = $this->repository->getValueByKey('general_site_currency');
$siteCurrencyModel = $this->curRep->find($configCurrency);
-
+
$currencyCode = $siteCurrencyModel->code;
$currencySymbol = $siteCurrencyModel->symbol;
}
$sessionCode = Session::get('currency_code', $currencyCode);
-
-
+
// If cart has any product then re calculate the price and save it into db
- if(null !== $sessionCode && $sessionCode !== $currencyCode) {
+ if (null !== $sessionCode && $sessionCode !== $currencyCode) {
$model = $this->curRep->findByCode($currencyCode);
-
-
+
$products = Cart::all();
- if($products->count() > 0) {
- foreach($products as $product) {
+ if ($products->count() > 0) {
+ foreach ($products as $product) {
// Re calculate and set the price
- $productModel = $this->productRepository->findBySlug($product->slug());
+ $productModel = $this->productRepository->findBySlug($product->slug());
$productAttributes = $productModel->getAttributes();
$qty = $product->qty();
-
+
$newPrice = $productAttributes['price'] * $model->conversion_rate;
$product->price($newPrice);
@@ -104,15 +101,13 @@ public function handle($request, Closure $next)
// Re calculate and set the line total
$newPLineTotla = $newPrice * $qty * $model->conversion_rate;
$product->lineTotal($newPLineTotla);
-
}
}
-
}
-
+
Session::put('currency_code', $currencyCode);
Session::put('currency_symbol', $currencySymbol);
-
+
return $next($request);
}
}
diff --git a/src/System/Requests/SiteCurrencyRequest.php b/src/System/Requests/SiteCurrencyRequest.php
index 0c5497abf..9a535f537 100644
--- a/src/System/Requests/SiteCurrencyRequest.php
+++ b/src/System/Requests/SiteCurrencyRequest.php
@@ -26,8 +26,6 @@ public function rules()
$validation['name'] = 'required|max:255';
$validation['code'] = 'required|max:255';
-
-
return $validation;
}
}
diff --git a/src/System/ViewComposers/SiteCurrencyFieldsComposer.php b/src/System/ViewComposers/SiteCurrencyFieldsComposer.php
index 611a1c33f..38917a00f 100644
--- a/src/System/ViewComposers/SiteCurrencyFieldsComposer.php
+++ b/src/System/ViewComposers/SiteCurrencyFieldsComposer.php
@@ -2,15 +2,12 @@
namespace AvoRed\Framework\User\ViewComposers;
-use AvoRed\Framework\Models\Database\Role;
use Illuminate\View\View;
-use AvoRed\Framework\Models\Database\SiteCurrency;
use AvoRed\Framework\Models\Database\Country;
use Illuminate\Support\Collection;
class SiteCurrencyFieldsComposer
{
-
/**
* Bind data to the view.
*
@@ -23,23 +20,23 @@ public function compose(View $view)
$options = Collection::make();
$symbolOption = Collection::make();
foreach ($countries as $country) {
- $options->put($country->currency_code,[
- 'id' => $country->currency_code,
- 'name' => $country->currency_code
- ]);
+ $options->put($country->currency_code, [
+ 'id' => $country->currency_code,
+ 'name' => $country->currency_code
+ ]);
- if(!empty($country->currency_symbol)) {
- $symbolOption->put($country->currency_symbol,[
+ if (!empty($country->currency_symbol)) {
+ $symbolOption->put($country->currency_symbol, [
'id' => $country->currency_symbol,
'name' => $country->currency_symbol
]);
}
}
- $statusOptions = Collection::make([['id' => 'ENABLED','name' => 'Enabled'],['id' => 'DISABLED','name' => 'Disabled']]);
-
+ $statusOptions = Collection::make([['id' => 'ENABLED', 'name' => 'Enabled'], ['id' => 'DISABLED', 'name' => 'Disabled']]);
+
$view
->with('codeOptions', $options)
->with('symbolOptions', $symbolOption)
- ->with('statusOptions',$statusOptions);
+ ->with('statusOptions', $statusOptions);
}
}
diff --git a/src/Tabs/Tab.php b/src/Tabs/Tab.php
index ec02fa3b9..b6ee87d72 100644
--- a/src/Tabs/Tab.php
+++ b/src/Tabs/Tab.php
@@ -32,7 +32,7 @@ class Tab
*/
public function type($type = null)
{
- if(null === $type) {
+ if (null === $type) {
return $this->type;
}
@@ -47,7 +47,7 @@ public function type($type = null)
*/
public function label($label = null)
{
- if(null === $label) {
+ if (null === $label) {
return $this->label;
}
$this->label = $label;
@@ -62,7 +62,7 @@ public function label($label = null)
*/
public function view($view = null)
{
- if(null === $view) {
+ if (null === $view) {
return $this->view;
}
diff --git a/src/Theme/Console/ThemeMakeCommand.php b/src/Theme/Console/ThemeMakeCommand.php
index 199206508..c28068843 100644
--- a/src/Theme/Console/ThemeMakeCommand.php
+++ b/src/Theme/Console/ThemeMakeCommand.php
@@ -62,16 +62,16 @@ public function handle()
$stubFiles = ['register', 'layout', 'home'];
foreach ($stubFiles as $stubFile) {
- $methodName = 'get'.ucfirst($stubFile).'Path';
+ $methodName = 'get' . ucfirst($stubFile) . 'Path';
$path = $this->$methodName($vendor, $name);
$this->createRequiredDirectories($path);
- $buildMethodName = 'build'.ucfirst($stubFile).'File';
+ $buildMethodName = 'build' . ucfirst($stubFile) . 'File';
$this->files->put($path, $this->$buildMethodName());
}
- $this->info($this->type.' created successfully.');
+ $this->info($this->type . ' created successfully.');
}
/**
@@ -81,24 +81,24 @@ public function handle()
*/
protected function createRequiredDirectories($path)
{
- if (! $this->files->isDirectory(dirname($path))) {
+ if (!$this->files->isDirectory(dirname($path))) {
$this->files->makeDirectory(dirname($path), 0755, true);
}
}
protected function getRegisterPath($vendor, $name)
{
- return base_path('themes/'.$vendor.'/'.$name.'/'.'register.yaml');
+ return base_path('themes/' . $vendor . '/' . $name . '/' . 'register.yaml');
}
protected function getLayoutPath($vendor, $name)
{
- return base_path('themes/'.$vendor.'/'.$name.'/views/layouts/'.'app.blade.php');
+ return base_path('themes/' . $vendor . '/' . $name . '/views/layouts/' . 'app.blade.php');
}
protected function getHomePath($vendor, $name)
{
- return base_path('themes/'.$vendor.'/'.$name.'/views/home/'.'index.blade.php');
+ return base_path('themes/' . $vendor . '/' . $name . '/views/home/' . 'index.blade.php');
}
/**
@@ -155,7 +155,7 @@ protected function buildHomeFile()
*/
protected function getStub($stubName)
{
- return __DIR__."/stubs/{$stubName}.stub";
+ return __DIR__ . "/stubs/{$stubName}.stub";
}
/**
diff --git a/src/Theme/Manager.php b/src/Theme/Manager.php
index 7235aa400..5b00a02f6 100644
--- a/src/Theme/Manager.php
+++ b/src/Theme/Manager.php
@@ -57,9 +57,9 @@ protected function loadThemes()
$assetFolderName = isset($data['asset_folder_name']) ? $data['asset_folder_name'] : 'assets';
$langFolderName = isset($data['lang_folder_name']) ? $data['lang_folder_name'] : 'lang';
- $data['view_path'] = $iterator->getPath().DIRECTORY_SEPARATOR.'views';
- $data['asset_path'] = $iterator->getPath().DIRECTORY_SEPARATOR.$assetFolderName;
- $data['lang_path'] = $iterator->getPath().DIRECTORY_SEPARATOR.$langFolderName;
+ $data['view_path'] = $iterator->getPath() . DIRECTORY_SEPARATOR . 'views';
+ $data['asset_path'] = $iterator->getPath() . DIRECTORY_SEPARATOR . $assetFolderName;
+ $data['lang_path'] = $iterator->getPath() . DIRECTORY_SEPARATOR . $langFolderName;
$this->themeList->put($data['identifier'], $data);
}
@@ -95,7 +95,7 @@ public function getService()
public function getByPath($path)
{
- foreach ($this->themeList as $theme => $themeInfo) {
+ foreach ($this->themeList as $theme => $themeInfo) {
$path1 = $this->pathSlashFix($path);
$path2 = $this->pathSlashFix($themeInfo['path']);
@@ -143,8 +143,8 @@ protected function publishDirectory($from, $to)
protected function moveManagedFiles($manager)
{
foreach ($manager->listContents('from://', true) as $file) {
- if ($file['type'] === 'file' && (! $manager->has('to://'.$file['path']))) {
- $manager->put('to://'.$file['path'], $manager->read('from://'.$file['path']));
+ if ($file['type'] === 'file' && (!$manager->has('to://' . $file['path']))) {
+ $manager->put('to://' . $file['path'], $manager->read('from://' . $file['path']));
}
}
}
diff --git a/src/User/Controllers/UserController.php b/src/User/Controllers/UserController.php
index 0ce372c9b..0bebdb046 100644
--- a/src/User/Controllers/UserController.php
+++ b/src/User/Controllers/UserController.php
@@ -13,7 +13,6 @@
use Illuminate\Support\Facades\Mail;
use AvoRed\Framework\User\Mail\ChangePasswordMail;
-
class UserController extends Controller
{
/**
@@ -114,7 +113,6 @@ public function show(User $user)
$orderRepository = app(OrderInterface::class);
$userOrders = $orderRepository->query()->whereUserId($user->id);
- // dd($userOrders);
$dataGrid = new UserOrderDataGrid($userOrders);
return view('avored-framework::user.user.show')
->with('user', $user)
@@ -146,18 +144,18 @@ public function changePasswordUpdate(ChangePasswordRequest $request, User $user)
$password = $request->get('password');
$user->update(['password' => bcrypt($password)]);
Mail::to($user->email)->send(new ChangePasswordMail($user, $password));
-
+
return redirect()->route('admin.user.index');
}
/**
* User Group Sync with User Model
- *
+ *
* @param \AvoRed\Framework\Models\Database\User $user
* @param array $userGroupIds
* @return void
*/
- private function _syncUserGroups($user, $userGroupIds)
+ private function _syncUserGroups($user, $userGroupIds)
{
$user->userGroups()->sync($userGroupIds);
}
diff --git a/src/User/Controllers/UserGroupController.php b/src/User/Controllers/UserGroupController.php
index a3b3b2ad4..c10873b5e 100644
--- a/src/User/Controllers/UserGroupController.php
+++ b/src/User/Controllers/UserGroupController.php
@@ -2,7 +2,6 @@
namespace AvoRed\Framework\User\Controllers;
-use AvoRed\Framework\Models\Database\AdminUser as Model;
use AvoRed\Framework\Models\Database\UserGroup;
use AvoRed\Framework\Models\Contracts\UserGroupInterface;
use AvoRed\Framework\System\Controllers\Controller;
diff --git a/src/User/DataGrid/UserOrderDataGrid.php b/src/User/DataGrid/UserOrderDataGrid.php
index fea8c2b31..44a94fd00 100644
--- a/src/User/DataGrid/UserOrderDataGrid.php
+++ b/src/User/DataGrid/UserOrderDataGrid.php
@@ -16,10 +16,9 @@ public function __construct($model)
->column('id', ['sortable' => true])
->column('payment_option', ['label' => 'Payment Options'])
->column('shipping_option', ['label' => 'Shipping Options'])
- ->linkColumn('show',[] ,function($model) {
+ ->linkColumn('show', [], function ($model) {
return "id) . "' >Show Details";
- })
- ;
+ });
$this->dataGrid = $dataGrid;
}
diff --git a/src/User/Mail/ChangePasswordMail.php b/src/User/Mail/ChangePasswordMail.php
index 88e8d07f5..964b53cca 100644
--- a/src/User/Mail/ChangePasswordMail.php
+++ b/src/User/Mail/ChangePasswordMail.php
@@ -5,7 +5,6 @@
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;
-use AvoRed\Framework\Models\Database\Order;
class ChangePasswordMail extends Mailable
{
@@ -28,7 +27,7 @@ class ChangePasswordMail extends Mailable
public function __construct($user, $password)
{
$this->user = $user;
- $this->password = $password;
+ $this->password = $password;
}
/**
diff --git a/src/User/Middleware/AdminAuth.php b/src/User/Middleware/AdminAuth.php
index 2bb345a62..500a3c9af 100644
--- a/src/User/Middleware/AdminAuth.php
+++ b/src/User/Middleware/AdminAuth.php
@@ -28,7 +28,7 @@ public function handle($request, Closure $next, $guard = 'admin')
}
$user = Auth::user();
- if (isset($user->language) && ! empty($user->language)) {
+ if (isset($user->language) && !empty($user->language)) {
App::setLocale($user->language);
}
diff --git a/src/User/Middleware/Permission.php b/src/User/Middleware/Permission.php
index 221ce758c..223f9e910 100644
--- a/src/User/Middleware/Permission.php
+++ b/src/User/Middleware/Permission.php
@@ -18,15 +18,14 @@ class Permission
*/
public function handle($request, Closure $next, $guard = 'admin')
{
-
config(['auth.defaults.guard' => 'admin']);
$permissionName = $request->route()->getName();
if (in_array($permissionName, ['admin.login', 'admin.login.post',
- 'admin.password.reset.token', 'admin.password.email.post',
- 'admin.password.reset.token', 'admin.password.reset',
- ])) {
+ 'admin.password.reset.token', 'admin.password.email.post',
+ 'admin.password.reset.token', 'admin.password.reset',
+ ])) {
return $next($request);
}
@@ -36,7 +35,7 @@ public function handle($request, Closure $next, $guard = 'admin')
$user = Auth::guard('admin')->user();
- if (! $user->hasPermission($permissionName)) {
+ if (!$user->hasPermission($permissionName)) {
throw new \Exception('User Don\'t have permissions', 401);
}
diff --git a/src/User/Requests/AdminUserRequest.php b/src/User/Requests/AdminUserRequest.php
index 35fe04f68..fffea7693 100644
--- a/src/User/Requests/AdminUserRequest.php
+++ b/src/User/Requests/AdminUserRequest.php
@@ -15,6 +15,7 @@ public function authorize()
{
return true;
}
+
/**
* Get the validation rules that apply to the request.
*
diff --git a/src/User/Requests/ChangePasswordRequest.php b/src/User/Requests/ChangePasswordRequest.php
index 5d88f8aa0..813691172 100644
--- a/src/User/Requests/ChangePasswordRequest.php
+++ b/src/User/Requests/ChangePasswordRequest.php
@@ -1,4 +1,5 @@
all()->pluck('name','id');
+ $userGroupOptions = $userGroupRepository->all()->pluck('name', 'id');
$view->with('userGroupOptions', $userGroupOptions);
}
}
diff --git a/src/Widget/WidgetProvider.php b/src/Widget/WidgetProvider.php
index df1844250..24da41d0e 100644
--- a/src/Widget/WidgetProvider.php
+++ b/src/Widget/WidgetProvider.php
@@ -56,7 +56,6 @@ public function provides()
return ['widget', 'AvoRed\Framework\Widget\Manager'];
}
-
/**
* Register the Widget.
*
diff --git a/tests/Repository/AttributeRepositoryTest.php b/tests/Repository/AttributeRepositoryTest.php
index bf48a8e50..cde39997e 100644
--- a/tests/Repository/AttributeRepositoryTest.php
+++ b/tests/Repository/AttributeRepositoryTest.php
@@ -13,10 +13,6 @@ class AttributeRepositoryTest extends BaseTestCase
*/
public function test_attribute_respository()
{
- //$repository = new AttributeRepository();
-
- //$attribute = $repository->find(1);
- //dd($repository);
$this->assertTrue(true);