From aae659346929e35555c3b90fa858f5ceacdeecc1 Mon Sep 17 00:00:00 2001 From: jitendra Date: Tue, 15 Jan 2019 17:24:41 +0530 Subject: [PATCH] Coding standard updated --- .../Customer/AddressController.php | 14 +- .../Controllers/Customer/AuthController.php | 4 +- .../Customer/CustomerController.php | 14 +- .../Customer/WishlistController.php | 12 +- .../Controllers/Product/ReviewController.php | 2 +- .../Http/Controllers/Shop/CartController.php | 12 +- .../Admin/src/DataGrids/AttributeDataGrid.php | 8 +- .../Admin/src/DataGrids/CategoryDataGrid.php | 2 +- .../src/DataGrids/CustomerReviewDataGrid.php | 4 +- .../DataGrids/InventorySourcesDataGrid.php | 2 +- .../src/DataGrids/NewsLetterDataGrid.php | 2 +- .../Admin/src/DataGrids/OrderDataGrid.php | 14 +- .../Admin/src/DataGrids/ProductDataGrid.php | 2 +- .../Admin/src/DataGrids/UserDataGrid.php | 2 +- .../Webkul/Admin/src/Exceptions/Handler.php | 2 +- .../Controllers/ConfigurationController.php | 8 +- .../Customer/CustomerGroupController.php | 2 +- .../Http/Controllers/DashboardController.php | 4 +- .../Controllers/Sales/InvoiceController.php | 6 +- .../Controllers/Sales/OrderController.php | 2 +- .../Controllers/Sales/ShipmentController.php | 6 +- .../Webkul/Admin/src/Listeners/Product.php | 30 +-- .../src/Providers/AdminServiceProvider.php | 8 +- .../views/catalog/attributes/create.blade.php | 10 +- .../views/catalog/attributes/edit.blade.php | 14 +- .../views/catalog/categories/create.blade.php | 2 +- .../views/catalog/categories/edit.blade.php | 4 +- .../views/catalog/families/create.blade.php | 6 +- .../views/catalog/families/edit.blade.php | 8 +- .../products/accordians/categories.blade.php | 2 +- .../products/accordians/inventories.blade.php | 2 +- .../products/accordians/variations.blade.php | 10 +- .../views/catalog/products/create.blade.php | 12 +- .../views/catalog/products/edit.blade.php | 22 +-- .../field-types/multiselect.blade.php | 2 +- .../products/field-types/select.blade.php | 6 +- .../views/configuration/field-type.blade.php | 18 +- .../views/configuration/index.blade.php | 4 +- .../views/customers/country-state.blade.php | 2 +- .../Resources/views/customers/edit.blade.php | 8 +- .../customers/subscribers/edit.blade.php | 4 +- .../Resources/views/dashboard/index.blade.php | 8 +- .../views/layouts/anonymous-master.blade.php | 6 +- .../Resources/views/layouts/master.blade.php | 10 +- .../views/layouts/nav-aside.blade.php | 4 +- .../views/layouts/nav-left.blade.php | 2 +- .../Resources/views/layouts/tabs.blade.php | 2 +- .../views/sales/invoices/create.blade.php | 2 +- .../views/sales/invoices/view.blade.php | 2 +- .../views/sales/orders/view.blade.php | 14 +- .../views/sales/shipments/create.blade.php | 6 +- .../views/sales/shipments/view.blade.php | 2 +- .../views/settings/channels/create.blade.php | 14 +- .../views/settings/channels/edit.blade.php | 14 +- .../settings/exchange_rates/create.blade.php | 4 +- .../settings/exchange_rates/edit.blade.php | 2 +- .../views/settings/sliders/create.blade.php | 4 +- .../views/settings/sliders/edit.blade.php | 4 +- .../views/tax/tax-categories/create.blade.php | 4 +- .../views/tax/tax-categories/edit.blade.php | 6 +- .../views/users/roles/create.blade.php | 2 +- .../views/users/roles/edit.blade.php | 2 +- .../views/users/users/create.blade.php | 2 +- .../views/users/users/edit.blade.php | 4 +- .../Http/Controllers/AttributeController.php | 6 +- .../Controllers/AttributeFamilyController.php | 2 +- .../AttributeFamilyRepository.php | 14 +- .../src/Repositories/AttributeRepository.php | 16 +- .../Http/Controllers/CategoryController.php | 8 +- packages/Webkul/Checkout/src/Cart.php | 186 +++++++++--------- .../src/Http/Requests/CustomerAddressForm.php | 2 +- packages/Webkul/Core/src/Core.php | 62 +++--- .../Core/src/Eloquent/TranslatableModel.php | 8 +- .../Http/Controllers/ChannelController.php | 2 +- .../Controllers/CountryStateController.php | 12 +- .../Http/Controllers/CurrencyController.php | 8 +- .../Controllers/ExchangeRateController.php | 2 +- .../src/Http/Controllers/LocaleController.php | 2 +- .../Controllers/SubscriptionController.php | 4 +- packages/Webkul/Core/src/Http/helpers.php | 6 +- packages/Webkul/Core/src/Models/Channel.php | 4 +- .../src/Repositories/ChannelRepository.php | 8 +- .../src/Repositories/CoreConfigRepository.php | 8 +- .../src/Repositories/CurrencyRepository.php | 4 +- .../src/Repositories/SliderRepository.php | 16 +- packages/Webkul/Core/src/Tree.php | 2 +- .../Http/Controllers/AddressController.php | 8 +- .../Http/Controllers/CustomerController.php | 14 +- .../Controllers/ForgotPasswordController.php | 2 +- .../Controllers/RegistrationController.php | 6 +- .../Controllers/ResetPasswordController.php | 2 +- .../Http/Controllers/SessionController.php | 6 +- .../Http/Controllers/WishlistController.php | 22 +-- .../Controllers/InventorySourceController.php | 2 +- packages/Webkul/Payment/src/Payment.php | 2 +- .../Webkul/Payment/src/Payment/Payment.php | 6 +- packages/Webkul/Paypal/src/Helpers/Ipn.php | 12 +- .../Criteria/ActiveProductCriteria.php | 2 +- .../Criteria/FilterByAttributesCriteria.php | 6 +- .../src/Contracts/Criteria/SortCriteria.php | 4 +- .../Product/src/Helpers/AbstractProduct.php | 6 +- .../src/Helpers/ConfigurableOption.php | 4 +- packages/Webkul/Product/src/Helpers/Price.php | 10 +- .../Product/src/Helpers/ProductImage.php | 10 +- .../Webkul/Product/src/Helpers/Review.php | 4 +- .../Webkul/Product/src/Helpers/Toolbar.php | 10 +- packages/Webkul/Product/src/Helpers/View.php | 4 +- .../Http/Controllers/ProductController.php | 10 +- .../src/Http/Controllers/ReviewController.php | 14 +- .../Webkul/Product/src/Models/Product.php | 18 +- .../ProductAttributeValueRepository.php | 4 +- .../Repositories/ProductGridRepository.php | 15 +- .../Repositories/ProductImageRepository.php | 12 +- .../ProductInventoryRepository.php | 8 +- .../src/Repositories/ProductRepository.php | 42 ++-- .../Webkul/Sales/src/Models/InvoiceItem.php | 4 +- packages/Webkul/Sales/src/Models/Order.php | 8 +- .../Webkul/Sales/src/Models/OrderItem.php | 4 +- .../Webkul/Sales/src/Models/ShipmentItem.php | 4 +- .../src/Repositories/InvoiceRepository.php | 12 +- .../OrderItemInventoryRepository.php | 10 +- .../src/Repositories/OrderItemRepository.php | 14 +- .../src/Repositories/OrderRepository.php | 34 ++-- .../Webkul/Shipping/src/Carriers/FlatRate.php | 2 +- .../Webkul/Shipping/src/Carriers/Free.php | 2 +- packages/Webkul/Shipping/src/Shipping.php | 18 +- .../src/Http/Controllers/CartController.php | 6 +- .../Http/Controllers/OnepageController.php | 22 +-- .../src/Http/Controllers/ReviewController.php | 4 +- .../src/Http/Controllers/SearchController.php | 2 +- .../src/Http/Controllers/SliderController.php | 18 +- .../Controllers/SubscriptionController.php | 12 +- .../Shop/src/Http/Middleware/Currency.php | 6 +- .../Shop/src/Http/Middleware/Locale.php | 6 +- .../Webkul/Shop/src/Http/Middleware/Theme.php | 4 +- .../Http/ViewComposers/CategoryComposer.php | 2 +- .../src/Providers/ShopServiceProvider.php | 4 +- .../views/checkout/cart/index.blade.php | 12 +- .../views/checkout/cart/mini-cart.blade.php | 12 +- .../views/checkout/onepage.blade.php | 32 +-- .../views/checkout/onepage/review.blade.php | 2 +- .../account/address/country-state.blade.php | 2 +- .../customers/account/address/index.blade.php | 12 +- .../customers/account/orders/index.blade.php | 22 +-- .../account/partials/sidemenu.blade.php | 6 +- .../customers/account/profile/edit.blade.php | 8 +- .../customers/account/profile/index.blade.php | 2 +- .../customers/account/reviews/index.blade.php | 6 +- .../account/reviews/reviews.blade.php | 4 +- .../account/wishlist/wishlist.blade.php | 6 +- .../views/customers/session/index.blade.php | 4 +- .../views/home/featured-products.blade.php | 2 +- .../views/home/new-products.blade.php | 2 +- .../Shop/src/Resources/views/index.blade.php | 2 +- .../views/layouts/footer/footer.blade.php | 4 +- .../views/layouts/header/index.blade.php | 6 +- .../Resources/views/layouts/master.blade.php | 8 +- .../views/partials/pagination.blade.php | 2 +- .../Resources/views/products/index.blade.php | 6 +- .../views/products/list/card.blade.php | 6 +- .../list/layered-navigation.blade.php | 10 +- .../Resources/views/products/view.blade.php | 10 +- .../view/configurable-options.blade.php | 18 +- .../Resources/views/search/search.blade.php | 8 +- .../Controllers/TaxCategoryController.php | 2 +- .../Http/Controllers/TaxRateController.php | 4 +- packages/Webkul/Theme/src/Http/helpers.php | 4 +- packages/Webkul/Theme/src/Theme.php | 2 +- packages/Webkul/Theme/src/ThemeViewFinder.php | 2 +- packages/Webkul/Theme/src/Themes.php | 4 +- packages/Webkul/Ui/src/DataGrid/DataGrid.php | 26 +-- .../src/DataGrid/Helpers/AbstractFillable.php | 33 ++-- .../Webkul/Ui/src/DataGrid/Helpers/Column.php | 4 +- .../Resources/views/datagrid/body.blade.php | 16 +- .../Resources/views/datagrid/head.blade.php | 2 +- .../Resources/views/datagrid/table.blade.php | 108 +++++----- .../views/partials/pagination.blade.php | 2 +- packages/Webkul/User/src/Bouncer.php | 6 +- .../Http/Controllers/AccountController.php | 4 +- .../Controllers/ForgetPasswordController.php | 2 +- .../Controllers/ResetPasswordController.php | 2 +- .../src/Http/Controllers/RoleController.php | 2 +- .../Http/Controllers/SessionController.php | 2 +- .../src/Http/Controllers/UserController.php | 10 +- .../User/src/Http/Middleware/Bouncer.php | 4 +- 185 files changed, 862 insertions(+), 856 deletions(-) diff --git a/packages/Webkul/API/Http/Controllers/Customer/AddressController.php b/packages/Webkul/API/Http/Controllers/Customer/AddressController.php index 633ce6dec..8bfabb0f9 100755 --- a/packages/Webkul/API/Http/Controllers/Customer/AddressController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/AddressController.php @@ -28,7 +28,7 @@ class AddressController extends Controller $this->customerAddress = $customerAddress; - if(auth()->guard('customer')->check()) { + if (auth()->guard('customer')->check()) { $this->customer = auth()->guard('customer')->user(); } else { $this->customer['message'] = 'unauthorized'; @@ -46,7 +46,7 @@ class AddressController extends Controller * @return response JSON */ public function get() { - if($this->customer == false) { + if ($this->customer == false) { return response()->json($this->customer, 401); } else { $addresses = $this->customer->addresses; @@ -56,7 +56,7 @@ class AddressController extends Controller } public function getDefault() { - if($this->customer == false) { + if ($this->customer == false) { return response()->json($this->customer, 401); } else { $defaultAddress = $this->customer->default_address; @@ -89,13 +89,13 @@ class AddressController extends Controller $cust_id['customer_id'] = $this->customer->id; $data = array_merge($cust_id, $data); - if($this->customer->addresses->count() == 0) { + if ($this->customer->addresses->count() == 0) { $data['default_address'] = 1; } $result = $this->customerAddress->create($data); - if($result) { + if ($result) { return response()->json(true, 200); } else { return response()->json(false, 200); @@ -111,11 +111,11 @@ class AddressController extends Controller public function makeDefault($id) { $defaultAddress = $this->customer->default_address; - if($defaultAddress != null && $defaultAddress->count() > 0) { + if ($defaultAddress != null && $defaultAddress->count() > 0) { $defaultAddress->update(['default_address' => 0]); } - if($this->customerAddress->find($id)->default_address == 1) { + if ($this->customerAddress->find($id)->default_address == 1) { return response()->json(false, 200); } diff --git a/packages/Webkul/API/Http/Controllers/Customer/AuthController.php b/packages/Webkul/API/Http/Controllers/Customer/AuthController.php index d0b1976b0..5cdd21aeb 100755 --- a/packages/Webkul/API/Http/Controllers/Customer/AuthController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/AuthController.php @@ -26,8 +26,8 @@ class AuthController extends Controller public function create() { $data = request()->except('_token'); - if(!auth()->guard('customer')->check()) { - if(!auth()->guard('customer')->attempt($data)) { + if (! auth()->guard('customer')->check()) { + if (! auth()->guard('customer')->attempt($data)) { return response()->json(['message' => 'unauthenticated', 'details' => 'invalid creds'], 401); } else { return response()->json(['message' => 'authenticated', 'user' => auth()->guard('customer')->user()], 200); diff --git a/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php index b2bf1203b..3888fb25f 100755 --- a/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/CustomerController.php @@ -23,7 +23,7 @@ class CustomerController extends Controller public function __construct() { - if(auth()->guard('customer')->check()) { + if (auth()->guard('customer')->check()) { $this->customer = auth()->guard('customer')->user(); } else { $this->customer['message'] = 'unauthorized'; @@ -63,10 +63,10 @@ class CustomerController extends Controller $data = collect(request()->all())->toArray(); - if($data['oldpassword'] == null) { + if ($data['oldpassword'] == null) { $data = collect(request()->input())->except([ 'oldpassword', 'password', 'password_confirmation'])->toArray(); } else { - if(Hash::check($data['oldpassword'], auth()->guard('customer')->user()->password)) { + if (Hash::check($data['oldpassword'], auth()->guard('customer')->user()->password)) { $data = collect(request()->input())->toArray(); $data['password'] = bcrypt($data['password']); @@ -77,7 +77,7 @@ class CustomerController extends Controller $result = $this->customer->update($data); - if($result) { + if ($result) { return response()->json(true, 200); } else { return response()->json(false, 200); @@ -92,7 +92,7 @@ class CustomerController extends Controller public function getAllCart() { $carts = $this->customer->carts; - if($cart->count() > 0) { + if ($cart->count() > 0) { return response()->json(['message' => 'successful','items' => $cart], 200); } else { return response()->json(['message' => 'empty', 'items' => null], 200); @@ -102,11 +102,11 @@ class CustomerController extends Controller public function getActiveCart() { $cart = Cart::getCart(); - if($cart == null) { + if ($cart == null) { return response()->json(['message' => 'empty', 'items' => 'null']); } - if($cart->count() > 0 ) { + if ($cart->count() > 0 ) { return response()->json(['message' => 'success', 'items' => $cart]); } else { return response()->json(['message' => 'empty', 'items' => 'null']); diff --git a/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php b/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php index d2fbd9446..3f10f1545 100755 --- a/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php +++ b/packages/Webkul/API/Http/Controllers/Customer/WishlistController.php @@ -24,7 +24,7 @@ class WishlistController extends Controller public function __construct(Product $product, Wishlist $wishlist) { - if(auth()->guard('customer')->check()) { + if (auth()->guard('customer')->check()) { $this->product = $product; $this->wishlist = $wishlist; $this->customer = auth()->guard('customer')->user(); @@ -43,7 +43,7 @@ class WishlistController extends Controller { $wishlist = $this->customer->wishlist_items; - if($wishlist->count() > 0) { + if ($wishlist->count() > 0) { return response()->json($wishlist, 200); } else { return response()->json(['message' => 'Wishlist Empty', 'Items' => null], 200); @@ -67,14 +67,14 @@ class WishlistController extends Controller ]; //accidental case if some one adds id of the product in the anchor tag amd gives id of a variant. - if($product->parent_id != null) { + if ($product->parent_id != null) { $data['product_id'] = $productId = $product->parent_id; } $checked = $this->wishlist->findWhere(['channel_id' => core()->getCurrentChannel()->id, 'product_id' => $productId, 'customer_id' => auth()->guard('customer')->user()->id]); - if($checked->isEmpty()) { - if($wishlistItem = $this->wishlist->create($data)) { + if ($checked->isEmpty()) { + if ($wishlistItem = $this->wishlist->create($data)) { return response()->json(['message' => 'Successfully Added Item To Wishlist', 'items' => $wishlistItem], 200); } else { return response()->json(['message' => 'Error! Cannot Add Item To Wishlist', 'items' => null], 401); @@ -93,7 +93,7 @@ class WishlistController extends Controller { $result = $this->wishlist->deleteWhere(['customer_id' => auth()->guard('customer')->user()->id, 'channel_id' => core()->getCurrentChannel()->id, 'id' => $itemId]); - if($result) { + if ($result) { return response()->json(['message' => 'Item Successfully Removed From Wishlist', 'status' => $result]); } else { return response()->json(['message' => 'Error! While Removing Item From Wishlist', 'status' => $result]); diff --git a/packages/Webkul/API/Http/Controllers/Product/ReviewController.php b/packages/Webkul/API/Http/Controllers/Product/ReviewController.php index 0f7140e9f..dcbce5f01 100755 --- a/packages/Webkul/API/Http/Controllers/Product/ReviewController.php +++ b/packages/Webkul/API/Http/Controllers/Product/ReviewController.php @@ -89,7 +89,7 @@ class ReviewController extends Controller $result = $this->productReview->create($data); - if($result) { + if ($result) { return response()->json(['message' => 'success', 'status' => $result]); } else { return response()->json(['message' => 'failed', 'status' => $result]); diff --git a/packages/Webkul/API/Http/Controllers/Shop/CartController.php b/packages/Webkul/API/Http/Controllers/Shop/CartController.php index 836aec630..eef1404f6 100755 --- a/packages/Webkul/API/Http/Controllers/Shop/CartController.php +++ b/packages/Webkul/API/Http/Controllers/Shop/CartController.php @@ -39,7 +39,7 @@ class CartController extends Controller public function get() { $cart = Cart::getCart(); - if($cart == null || $cart == 'null') { + if ($cart == null || $cart == 'null') { return response()->json(['message' => 'empty', 'items' => null]); } @@ -54,7 +54,7 @@ class CartController extends Controller public function add($id) { $result = Cart::add($id, request()->all()); - if($result) { + if ($result) { Cart::collectTotals(); return response()->json(['message' => 'successful', 'items' => Cart::getCart()->items]); @@ -84,7 +84,7 @@ class CartController extends Controller public function onePage() { $cart = Cart::getCart(); - if($cart == null || $cart == 'null') { + if ($cart == null || $cart == 'null') { return response()->json(['message' => 'empty', 'items' => null]); } @@ -102,13 +102,13 @@ class CartController extends Controller public function updateOnePage() { $request = request()->except('_token'); - foreach($request['qty'] as $id => $quantity) { - if($quantity <= 0) { + foreach ($request['qty'] as $id => $quantity) { + if ($quantity <= 0) { return response()->json(['message' => 'Illegal Quantity', 'status' => 'error']); } } - foreach($request['qty'] as $key => $value) { + foreach ($request['qty'] as $key => $value) { $item = $this->cartItem->findOneByField('id', $key); $data['quantity'] = $value; diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 029bf80b4..8fa4f484c 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -71,7 +71,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) + if ($value == 1) return 'True'; else return 'False'; @@ -86,7 +86,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) + if ($value == 1) return 'True'; else return 'False'; @@ -101,7 +101,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) + if ($value == 1) return 'True'; else return 'False'; @@ -116,7 +116,7 @@ class AttributeDataGrid extends DataGrid 'searchable' => false, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) + if ($value == 1) return 'True'; else return 'False'; diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index a46398285..a540d7196 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -59,7 +59,7 @@ class CategoryDataGrid extends DataGrid 'searchable' => true, 'width' => '100px', 'wrapper' => function($value){ - if($value == 1) + if ($value == 1) return 'Active'; else return 'Inactive'; diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php index ad4a43e04..c95c42c6f 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php @@ -69,9 +69,9 @@ class CustomerReviewDataGrid extends DataGrid 'width' => '100px', 'closure' => true, 'wrapper' => function ($value) { - if($value == 'approved') + if ($value == 'approved') return 'Approved'; - else if($value == "pending") + else if ($value == "pending") return 'Pending'; }, ]); diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 0d899faa4..fc5ed7b9d 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -68,7 +68,7 @@ class InventorySourcesDataGrid extends DataGrid 'sortable' => true, 'width' => '100px', 'wrapper' => function($value){ - if($value == 1) + if ($value == 1) return 'Active'; else return 'Inactive'; diff --git a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php index d733fa510..45ea82341 100755 --- a/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/NewsLetterDataGrid.php @@ -41,7 +41,7 @@ class NewsLetterDataGrid extends DataGrid 'sortable' => true, 'width' => '100px', 'wrapper' => function($value){ - if($value == 1) + if ($value == 1) return 'True'; else return 'False'; diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php index 205fac3ac..ca73d218f 100755 --- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php @@ -84,19 +84,19 @@ class OrderDataGrid extends DataGrid 'width' => '100px', 'closure' => true, 'wrapper' => function ($value) { - if($value == 'processing') + if ($value == 'processing') return 'Processing'; - else if($value == 'completed') + else if ($value == 'completed') return 'Completed'; - else if($value == "canceled") + else if ($value == "canceled") return 'Canceled'; - else if($value == "closed") + else if ($value == "closed") return 'Closed'; - else if($value == "pending") + else if ($value == "pending") return 'Pending'; - else if($value == "pending_payment") + else if ($value == "pending_payment") return 'Pending Payment'; - else if($value == "fraud") + else if ($value == "fraud") return 'Fraud'; } ]); diff --git a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php index bf939e6a0..60ce8d32e 100644 --- a/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/ProductDataGrid.php @@ -68,7 +68,7 @@ class ProductDataGrid extends DataGrid 'searchable' => false, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) + if ($value == 1) return 'Active'; else return 'Inactive'; diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 673f5937f..263d263d4 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -50,7 +50,7 @@ class UserDataGrid extends DataGrid 'sortable' => true, 'width' => '100px', 'wrapper' => function($value) { - if($value == 1) { + if ($value == 1) { return 'Active'; } else { return 'Inactive'; diff --git a/packages/Webkul/Admin/src/Exceptions/Handler.php b/packages/Webkul/Admin/src/Exceptions/Handler.php index 109c25392..701a4952a 100755 --- a/packages/Webkul/Admin/src/Exceptions/Handler.php +++ b/packages/Webkul/Admin/src/Exceptions/Handler.php @@ -35,7 +35,7 @@ class Handler extends ExceptionHandler } // else if ($exception instanceof ErrorException) { - // if(strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ + // if (strpos($_SERVER['REQUEST_URI'], 'admin') !== false){ // return response()->view('admin::errors.500', [], 500); // }else { // return response()->view('shop::errors.500', [], 500); diff --git a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php index 3f889fe02..873a94bc9 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php @@ -65,7 +65,7 @@ class ConfigurationController extends Controller { $tree = Tree::create(); - foreach(config('core') as $item) { + foreach (config('core') as $item) { $tree->add($item); } @@ -83,7 +83,7 @@ class ConfigurationController extends Controller { $slugs = $this->getDefaultConfigSlugs(); - if(count($slugs)) { + if (count($slugs)) { return redirect()->route('admin.configuration.index', $slugs); } @@ -99,7 +99,7 @@ class ConfigurationController extends Controller { $slugs = []; - if(!request()->route('slug')) { + if (! request()->route('slug')) { $firstItem = current($this->configTree->items); $secondItem = current($firstItem['children']); @@ -110,7 +110,7 @@ class ConfigurationController extends Controller 'slug2' => end($temp) ]; } else { - if(!request()->route('slug2')) { + if (! request()->route('slug2')) { $secondItem = current($this->configTree->items[request()->route('slug')]['children']); $temp = explode('.', $secondItem['key']); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php index 35a1b8692..9c4b1224e 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php @@ -129,7 +129,7 @@ class CustomerGroupController extends Controller { $group = $this->customerGroup->findOneByField('id', $id); - if($group->is_user_defined == 0) { + if ($group->is_user_defined == 0) { session()->flash('warning', trans('admin::app.customers.customers.group-default')); } else { session()->flash('success', trans('admin::app.customers.customers.group-deleted')); diff --git a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php index 6b10629b8..216ad02c4 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/DashboardController.php @@ -114,7 +114,7 @@ class DashboardController extends Controller public function getPercentageChange($previous, $current) { - if(!$previous) + if (! $previous) return $current ? 100 : 0; return ($current - $previous) / $previous * 100; @@ -291,7 +291,7 @@ class DashboardController extends Controller ? Carbon::createFromTimeString(request()->get('end') . " 23:59:59") : Carbon::now(); - if($this->endDate > Carbon::now()) + if ($this->endDate > Carbon::now()) $this->endDate = Carbon::now(); $this->lastStartDate = clone $this->startDate; diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 2b659d31e..f33aec45f 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -91,7 +91,7 @@ class InvoiceController extends Controller { $order = $this->order->find($orderId); - if(!$order->canInvoice()) { + if (! $order->canInvoice()) { session()->flash('error', 'Order invoice creation is not allowed.'); return redirect()->back(); @@ -105,13 +105,13 @@ class InvoiceController extends Controller $haveProductToInvoice = false; foreach ($data['invoice']['items'] as $itemId => $qty) { - if($qty) { + if ($qty) { $haveProductToInvoice = true; break; } } - if(!$haveProductToInvoice) { + if (! $haveProductToInvoice) { session()->flash('error', 'Invoice can not be created without products.'); return redirect()->back(); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php index 27f1a29ab..542930b6f 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/OrderController.php @@ -78,7 +78,7 @@ class OrderController extends Controller { $result = $this->order->cancel($id); - if($result) { + if ($result) { session()->flash('success', trans('Order canceled successfully.')); } else { session()->flash('error', trans('Order can not be canceled.')); diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php index 16458d749..640f47d6e 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/ShipmentController.php @@ -91,7 +91,7 @@ class ShipmentController extends Controller { $order = $this->order->find($orderId); - if(!$order->channel || !$order->canShip()) { + if (! $order->channel || !$order->canShip()) { session()->flash('error', 'Shipment can not be created for this order.'); return redirect()->back(); @@ -111,7 +111,7 @@ class ShipmentController extends Controller { $order = $this->order->find($orderId); - if(!$order->canShip()) { + if (! $order->canShip()) { session()->flash('error', 'Order shipment creation is not allowed.'); return redirect()->back(); @@ -126,7 +126,7 @@ class ShipmentController extends Controller $data = request()->all(); - if(!$this->isInventoryValidate($data)) { + if (! $this->isInventoryValidate($data)) { session()->flash('error', 'Requested quantity is invalid or not available.'); return redirect()->back(); diff --git a/packages/Webkul/Admin/src/Listeners/Product.php b/packages/Webkul/Admin/src/Listeners/Product.php index d28b0eef8..d2428ade5 100755 --- a/packages/Webkul/Admin/src/Listeners/Product.php +++ b/packages/Webkul/Admin/src/Listeners/Product.php @@ -47,7 +47,7 @@ class Product { public function afterProductCreated($product) { $result = $this->productCreated($product); - if($result) { + if ($result) { return true; } else { return false; @@ -76,13 +76,13 @@ class Product { $found = $this->productGrid->findOneByField('product_id', $product->id); //extra measure to stop duplicate entries - if($found == null) { + if ($found == null) { $this->productGrid->create($gridObject); - if($product->type == 'configurable') { + if ($product->type == 'configurable') { $variants = $product->variants()->get(); - foreach($variants as $variant) { + foreach ($variants as $variant) { $variantObj = [ 'product_id' => $variant->id, 'sku' => $variant->sku, @@ -130,7 +130,7 @@ class Product { public function productUpdated($product) { $productGridObject = $this->productGrid->findOneByField('product_id', $product->id); - if(!$productGridObject) { + if (! $productGridObject) { return false; } @@ -143,13 +143,13 @@ class Product { 'status' => $product->status, ]; - if($product->type == 'configurable') { + if ($product->type == 'configurable') { $gridObject['quantity'] = 0; $gridObject['price'] = 0; } else { $qty = 0; //inventories and inventory sources relation for the variants return empty or null collection objects only - foreach($product->inventories()->get() as $inventory_source) { + foreach ($product->inventories()->get() as $inventory_source) { $qty = $qty + $inventory_source->qty; } @@ -162,7 +162,7 @@ class Product { if ($product->type == 'configurable') { $variants = $product->variants()->get(); - foreach($variants as $variant) { + foreach ($variants as $variant) { $variantObj = [ 'product_id' => $variant->id, 'sku' => $variant->sku, @@ -176,7 +176,7 @@ class Product { $qty = 0; //inventories and inventory sources relation for the variants return empty or null collection objects only - foreach($variant->inventories()->get() as $inventory_source) { + foreach ($variant->inventories()->get() as $inventory_source) { $qty = $qty + $inventory_source->qty; } @@ -186,7 +186,7 @@ class Product { $productGridVariant = $this->productGrid->findOneByField('product_id', $variant->id); - if(isset($productGridVariant)) { + if (isset($productGridVariant)) { $this->productGrid->update($variantObj, $productGridVariant->id); } else { $variantObj = [ @@ -202,7 +202,7 @@ class Product { $qty = 0; //inventories and inventory sources relation for the variants return empty or null collection objects only - foreach($variant->inventories()->get() as $inventory_source) { + foreach ($variant->inventories()->get() as $inventory_source) { $qty = $qty + $inventory_source->qty; } @@ -224,7 +224,7 @@ class Product { public function sync() { $gridObject = []; - foreach($this->product->all() as $product) { + foreach ($this->product->all() as $product) { $gridObject = [ 'product_id' => $product->id, 'sku' => $product->sku, @@ -235,12 +235,12 @@ class Product { 'status' => $product->status ]; - if($product->type == 'configurable') { + if ($product->type == 'configurable') { $gridObject['quantity'] = 0; } else { $qty = 0; - foreach($product->toArray()['inventories'] as $inventorySource) { + foreach ($product->toArray()['inventories'] as $inventorySource) { $qty = $qty + $inventorySource['qty']; } @@ -251,7 +251,7 @@ class Product { $oldGridObject = $this->productGrid->findOneByField('product_id', $product->id); - if($oldGridObject) { + if ($oldGridObject) { $oldGridObject->update($gridObject); } else { $this->productGrid->create($gridObject); diff --git a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php index 8bfd68f32..c8d58685d 100755 --- a/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/AdminServiceProvider.php @@ -65,7 +65,7 @@ class AdminServiceProvider extends ServiceProvider view()->composer(['admin::catalog.products.create', 'admin::catalog.products.edit'], function ($view) { $accordian = Tree::create(); - foreach(config('product_form_accordians') as $item) { + foreach (config('product_form_accordians') as $item) { $accordian->add($item); } @@ -77,7 +77,7 @@ class AdminServiceProvider extends ServiceProvider view()->composer(['admin::layouts.nav-left', 'admin::layouts.nav-aside', 'admin::layouts.tabs'], function ($view) { $tree = Tree::create(); - foreach(config('menu.admin') as $item) { + foreach (config('menu.admin') as $item) { if (bouncer()->hasPermission($item['key'])) { $tree->add($item, 'menu'); } @@ -114,12 +114,12 @@ class AdminServiceProvider extends ServiceProvider { static $tree; - if($tree) + if ($tree) return $tree; $tree = Tree::create(); - foreach(config('acl') as $item) { + foreach (config('acl') as $item) { $tree->add($item, 'acl'); } diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index eacdb4017..387e0bfb9 100755 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -57,7 +57,7 @@ @{{ errors.first('admin_name') }} - @foreach(Webkul\Core\Models\Locale::all() as $locale) + @foreach (Webkul\Core\Models\Locale::all() as $locale)
@@ -173,7 +173,7 @@ {{ __('admin::app.catalog.attributes.admin_name') }} - @foreach(Webkul\Core\Models\Locale::all() as $locale) + @foreach (Webkul\Core\Models\Locale::all() as $locale) {{ $locale->name . ' (' . $locale->code . ')' }} @@ -194,7 +194,7 @@
- @foreach(Webkul\Core\Models\Locale::all() as $locale) + @foreach (Webkul\Core\Models\Locale::all() as $locale)
@@ -227,7 +227,7 @@ diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php index c904e9108..ac4e0a179 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/cart/mini-cart.blade.php @@ -2,7 +2,7 @@ getCart(); ?> -@if($cart) +@if ($cart) items; ?>
@@ -27,12 +27,12 @@
- @foreach($items as $item) - {{-- @if($item->type == "configurable") --}} + @foreach ($items as $item) + {{-- @if ($item->type == "configurable") --}}
type == "configurable") + if ($item->type == "configurable") $images = $productImageHelper->getProductBaseImage($item->child->product); else $images = $productImageHelper->getProductBaseImage($item->product); @@ -41,13 +41,13 @@
- {{-- @if($item->type == "configurable") + {{-- @if ($item->type == "configurable")
{{ $item->child->name }}
@else --}}
{{ $item->name }}
{{-- @endif --}} - @if($item->type == "configurable") + @if ($item->type == "configurable")
{{ trim(Cart::getProductAttributeOptionDetails($item->child->product)['html']) }}
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php index d363d5feb..cf1198d82 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -119,7 +119,7 @@ var summaryHtml = Vue.compile(` $cart])->render(); ?>`); var customerAddress = null; @auth('customer') - @if(auth('customer')->user()->default_address) + @if (auth('customer')->user()->default_address) customerAddress = @json(auth('customer')->user()->default_address); @else customerAddress = {}; @@ -158,7 +158,7 @@ }), created() { - if(customerAddress) { + if (customerAddress) { this.address.billing = customerAddress; this.address.use_for_shipping = true; } @@ -166,14 +166,14 @@ methods: { navigateToStep (step) { - if(step <= this.completedStep) { + if (step <= this.completedStep) { this.currentStep = step this.completedStep = step - 1; } }, haveStates(addressType) { - if(this.countryStates[this.address[addressType].country] && this.countryStates[this.address[addressType].country].length) + if (this.countryStates[this.address[addressType].country] && this.countryStates[this.address[addressType].country].length) return true; return false; @@ -181,12 +181,12 @@ validateForm: function (scope) { this.$validator.validateAll(scope).then((result) => { - if(result) { - if(scope == 'address-form') { + if (result) { + if (scope == 'address-form') { this.saveAddress() - } else if(scope == 'shipping-form') { + } else if (scope == 'shipping-form') { this.saveShipping() - } else if(scope == 'payment-form') { + } else if (scope == 'payment-form') { this.savePayment() } } @@ -202,7 +202,7 @@ .then(function(response) { this_this.disable_button = false; - if(response.data.jump_to_section == 'shipping') { + if (response.data.jump_to_section == 'shipping') { shippingHtml = Vue.compile(response.data.html) this_this.completedStep = 1; this_this.currentStep = 2; @@ -224,7 +224,7 @@ .then(function(response) { this_this.disable_button = false; - if(response.data.jump_to_section == 'payment') { + if (response.data.jump_to_section == 'payment') { paymentHtml = Vue.compile(response.data.html) this_this.completedStep = 2; this_this.currentStep = 3; @@ -246,7 +246,7 @@ .then(function(response) { this_this.disable_button = false; - if(response.data.jump_to_section == 'review') { + if (response.data.jump_to_section == 'review') { reviewHtml = Vue.compile(response.data.html) this_this.completedStep = 3; this_this.currentStep = 4; @@ -266,8 +266,8 @@ this.$http.post("{{ route('shop.checkout.save-order') }}", {'_token': "{{ csrf_token() }}"}) .then(function(response) { - if(response.data.success) { - if(response.data.redirect_url) { + if (response.data.success) { + if (response.data.redirect_url) { window.location.href = response.data.redirect_url; } else { window.location.href = "{{ route('shop.checkout.success') }}"; @@ -284,11 +284,11 @@ }, handleErrorResponse (response, scope) { - if(response.status == 422) { + if (response.status == 422) { serverErrors = response.data.errors; this.$root.addServerErrors(scope) - } else if(response.status == 403) { - if(response.data.redirect_url) { + } else if (response.status == 403) { + if (response.data.redirect_url) { window.location.href = response.data.redirect_url; } } diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php index 59a92746e..7d88ca115 100755 --- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php @@ -46,7 +46,7 @@ @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage')
- @foreach($cart->items as $item) + @foreach ($cart->items as $item) product; diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php index 3510234c5..36e411ae9 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/country-state.blade.php @@ -61,7 +61,7 @@ methods: { haveStates() { - if(this.countryStates[this.country] && this.countryStates[this.country].length) + if (this.countryStates[this.country] && this.countryStates[this.country].length) return true; return false; diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php index 1aeca2a2d..efe0f5560 100755 --- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/index.blade.php @@ -16,7 +16,7 @@ - @if(!$addresses->isEmpty()) + @if (! $addresses->isEmpty()) @@ -29,15 +29,15 @@ {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}