From 42b929bb222c4a6e3217d2f091677f400aec7b20 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 14 Feb 2019 18:20:04 +0530 Subject: [PATCH 1/3] admin user intended url functionality reverted --- .../Webkul/User/src/Http/Controllers/SessionController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/User/src/Http/Controllers/SessionController.php b/packages/Webkul/User/src/Http/Controllers/SessionController.php index fc386e369..f5125e86c 100755 --- a/packages/Webkul/User/src/Http/Controllers/SessionController.php +++ b/packages/Webkul/User/src/Http/Controllers/SessionController.php @@ -74,7 +74,7 @@ class SessionController extends Controller if (! auth()->guard('admin')->attempt(request(['email', 'password']), $remember)) { session()->flash('error', trans('admin::app.users.users.login-error')); - return redirect()->route('admin.session.create'); + return redirect()->back(); } if (auth()->guard('admin')->user()->status == 0) { @@ -100,4 +100,4 @@ class SessionController extends Controller return redirect()->route($this->_config['redirect']); } -} +} \ No newline at end of file From 550cabcbcb815332fe804d8ed047a01ab661e964 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Thu, 14 Feb 2019 19:24:44 +0530 Subject: [PATCH 2/3] Translation strings for datagrid and removal of dead code and pretty syntax --- packages/Webkul/Checkout/src/Cart.php | 8 +- .../Http/Controllers/ProductController.php | 156 ------------------ .../src/Http/Controllers/CartController.php | 3 +- .../src/Http/Controllers/HomeController.php | 11 +- .../Http/Controllers/OnepageController.php | 2 +- .../Http/Controllers/TaxRateController.php | 3 +- .../src/Resources/assets/sass/components.scss | 2 + .../Webkul/Ui/src/Resources/lang/en/app.php | 19 ++- .../Resources/views/datagrid/table.blade.php | 62 +++---- packages/Webkul/Ui/webpack.mix.js | 4 +- 10 files changed, 67 insertions(+), 203 deletions(-) diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php index 84cfe4534..f5649444a 100755 --- a/packages/Webkul/Checkout/src/Cart.php +++ b/packages/Webkul/Checkout/src/Cart.php @@ -672,12 +672,6 @@ class Cart { $cart->shipping_method = $shippingMethodCode; $cart->save(); - // foreach ($cart->shipping_rates as $rate) { - // if ($rate->method != $shippingMethodCode) { - // $rate->delete(); - // } - // } - return true; } @@ -814,7 +808,7 @@ class Cart { } } } - + return true; } } diff --git a/packages/Webkul/Product/src/Http/Controllers/ProductController.php b/packages/Webkul/Product/src/Http/Controllers/ProductController.php index 6adcf99ff..70d6c205e 100755 --- a/packages/Webkul/Product/src/Http/Controllers/ProductController.php +++ b/packages/Webkul/Product/src/Http/Controllers/ProductController.php @@ -266,160 +266,4 @@ class ProductController extends Controller return redirect()->route('admin.catalog.products.index'); } - - // public function testProductFlat() { - // $product = $this->product->find(2); - // $productAttributes = $product->attribute_family->custom_attributes; - // $allLocales = core()->getAllLocales(); - // $productsFlat = array(); - // $channelLocaleMap = array(); - // $nonDependentAttributes = array(); - // $localeDependentAttributes = array(); - // $channelDependentAttributes = array(); - // $channelLocaleDependentAttributes = array(); - - // foreach($productAttributes as $key => $productAttribute) { - // if($productAttribute->value_per_channel) { - // if($productAttribute->value_per_locale) { - // array_push($channelLocaleDependentAttributes, ['id' => $productAttribute->id, 'code' => $productAttribute->code]); - // } else { - // array_push($channelDependentAttributes, ['id' => $productAttribute->id, 'code' => $productAttribute->code]); - // } - // } else if($productAttribute->value_per_locale && !$productAttribute->value_per_channel) { - // array_push($localeDependentAttributes, ['id' => $productAttribute->id, 'code' => $productAttribute->code]); - // } else { - // array_push($nonDependentAttributes, ['id' => $productAttribute->id, 'code' => $productAttribute->code]); - // } - // } - - // foreach(core()->getAllChannels() as $channel) { - // $dummy = [ - // 'product_id' => $product->id, - // 'channel' => $channel->code, - // 'locale' => null, - // 'data' => $channelDependentAttributes - // ]; - - // array_push($channelLocaleMap, $dummy); - - // $dummy = []; - - // foreach($channel->locales as $locale) { - // $dummy = [ - // 'product_id' => $product->id, - // 'channel' => $channel->code, - // 'locale' => $locale->code, - // 'data' => $channelLocaleDependentAttributes - // ]; - - // array_push($channelLocaleMap, $dummy); - - // $dummy = []; - // } - // } - - // $dummy = [ - // 'product_id' => $product->id, - // 'channel' => null, - // 'locale' => null, - // 'data' => $nonDependentAttributes - // ]; - - // array_push($channelLocaleMap, $dummy); - - // $dummy = []; - - // foreach($allLocales as $key => $allLocale) { - // $dummy = [ - // 'product_id' => $product->id, - // 'channel' => null, - // 'locale' => $allLocale->code, - // 'data' => $localeDependentAttributes - // ]; - - // array_push($channelLocaleMap, $dummy); - - // $dummy = []; - // } - - // $productFlatObjects = $channelLocaleMap; - // $keyOfNonDependentAttributes = null; - - // foreach($productAttributes as $productAttribute) { - // foreach($productFlatObjects as $flatKey => $productFlatObject) { - // if($productFlatObject['channel'] == null && $productFlatObject['locale'] == null) { - // $keyOfNonDependentAttributes = $flatKey; - // } - - // foreach($productFlatObject['data'] as $key => $value) { - // if($productAttribute->code == $value['code']) { - // $valueOf = $this->productAttributeValue->findOneWhere([ - // 'product_id' => $product->id, - // 'channel' => $productFlatObject['channel'], - // 'locale' => $productFlatObject['locale'], - // 'attribute_id' => $productAttribute->id - // ]); - - // if($valueOf != null) { - // $productAttributeColumn = $this->productAttributeValue->model()::$attributeTypeFields[$productAttribute->type]; - - // $valueOf = $valueOf->{$productAttributeColumn}; - - // $productFlatObjects[$flatKey][$productAttribute->code] = $valueOf; - // } else { - // $productFlatObjects[$flatKey][$productAttribute->code] = 'null'; - // } - // } - // } - // } - // } - - // $nonDependentAttributes = $productFlatObjects[$keyOfNonDependentAttributes]; - - // array_forget($nonDependentAttributes, ['product_id', 'channel', 'locale', 'data', 'visible_individually', 'width', 'height', 'depth']); - - // unset($productFlatObjects[$keyOfNonDependentAttributes]); - - // $productFlatEntryObject = array(); - - // $tempFlatObject = array(); - - // foreach($productFlatObjects as $flatKey => $productFlatObject) { - // unset($productFlatObject['data']); - - // if(isset($productFlatObject['short_description'])) { - // $productFlatObject['description'] = $productFlatObject['short_description']; - - // unset($productFlatObject['short_description']); - // } - - // if(isset($productFlatObject['meta_title'])) { - // unset($productFlatObject['meta_title']); - // unset($productFlatObject['meta_description']); - // unset($productFlatObject['meta_keywords']); - // } - - // $tempFlatObject = array_merge($productFlatObject, $nonDependentAttributes); - - // $tempFlatObject = core()->convertEmptyStringsToNull($tempFlatObject); - - // $exists = $this->productFlat->findWhere([ - // 'product_id' => $product->id, - // 'channel' => $tempFlatObject['channel'], - // 'locale' => $tempFlatObject['locale'] - // ]); - - // if($exists->count() == 0) { - // $result = $this->productFlat->create($tempFlatObject); - // } else { - // $result = $exists->first(); - - // $result->update($tempFlatObject); - // } - - // unset($tempFlatObject); - // } - - // return 'true'; - // } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/Controllers/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/CartController.php index c7c9b01f9..849425744 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/CartController.php @@ -53,7 +53,8 @@ class CartController extends Controller ProductRepository $product, ProductImage $productImage, ProductView $productView - ) { + ) + { $this->middleware('customer')->only(['moveToWishlist']); diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php index db2056bee..8e4ebb30d 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php @@ -25,11 +25,16 @@ use Webkul\Core\Repositories\SliderRepository as Sliders; $this->sliders = $s; } - public function index() { + + /** + * loads the home page for the storefront + */ + public function index() + { $current_channel = core()->getCurrentChannel(); - $all_sliders = $this->sliders->findWhere(['channel_id'=>$current_channel['id']]); + $all_sliders = $this->sliders->findWhere(['channel_id' => $current_channel['id']]); - return view($this->_config['view'])->with('sliderData',$all_sliders->toArray()); + return view($this->_config['view'])->with('sliderData', $all_sliders->toArray()); } } diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index 0616a1c44..030da3e11 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -68,7 +68,7 @@ class OnepageController extends Controller */ public function saveAddress(CustomerAddressForm $request) { - if (Cart::hasError() || !Cart::saveCustomerAddress(request()->all()) || !$rates = Shipping::collectRates()) + if (Cart::hasError() || !Cart::saveCustomerAddress(request()->all()) || ! $rates = Shipping::collectRates()) return response()->json(['redirect_url' => route('shop.checkout.cart.index')], 403); Cart::collectTotals(); diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 97d38bc45..85d1271d7 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -73,7 +73,8 @@ class TaxRateController extends Controller * * @return mixed */ - public function create() { + public function create() + { $this->validate(request(), [ 'identifier' => 'required|string|unique:tax_rates,identifier', 'is_zip' => 'sometimes', diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss index 589d22877..e4ecf40d9 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/components.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/components.scss @@ -72,6 +72,7 @@ .dropdown-list.dropdown-container { padding: 5px; width: 100%; + top: 43px; ul { li { @@ -85,6 +86,7 @@ padding: 10px; width: 80%; margin-left: 10%; + margin-bottom: 5%; } } diff --git a/packages/Webkul/Ui/src/Resources/lang/en/app.php b/packages/Webkul/Ui/src/Resources/lang/en/app.php index 527b9263b..a2ab994e2 100755 --- a/packages/Webkul/Ui/src/Resources/lang/en/app.php +++ b/packages/Webkul/Ui/src/Resources/lang/en/app.php @@ -13,6 +13,23 @@ return [ 'no-records' => 'No Records Found', 'filter-fields-missing' => 'Some of the required field is null, please check column, condition and value properly', - 'click_on_action' => 'Do you really want to perform this action?' + 'click_on_action' => 'Do you really want to perform this action?', + 'search' => 'Search Here...', + 'filter' => 'Filter', + 'column' => 'Select Column', + 'condition' => 'Select Condition', + 'contains' => 'Contains', + 'ncontains' => 'Does not contains', + 'equals' => 'Is Equals to', + 'nequals' => 'Is Not equals to', + 'greater' => 'Greater than', + 'less' => 'Less than', + 'greatere' => 'Greater than equals to', + 'lesse' => 'Less than equals to', + 'value' => 'Select Value', + 'true' => 'True / Active', + 'false' => 'False / Inactive', + 'between' => 'Is between', + 'apply' => 'Apply' ] ]; \ No newline at end of file diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index 426b982ba..6492d30cc 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -10,7 +10,7 @@
- +
@@ -20,7 +20,7 @@
- Filter + {{ __('ui::app.datagrid.filter') }}
@@ -30,7 +30,7 @@
  • - - - - - + + + + +
    • @@ -64,13 +64,13 @@
    • @@ -85,9 +85,9 @@
    • @@ -95,9 +95,9 @@
    • @@ -106,14 +106,14 @@
    • @@ -124,7 +124,7 @@
    - +
    @@ -154,7 +154,7 @@ -
    + @csrf() diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js index 62c9ba3ef..54dca326b 100755 --- a/packages/Webkul/Ui/webpack.mix.js +++ b/packages/Webkul/Ui/webpack.mix.js @@ -1,8 +1,8 @@ const { mix } = require("laravel-mix"); require("laravel-mix-merge-manifest"); -var publicPath = 'publishable/assets'; -// var publicPath = "../../../public/vendor/webkul/ui/assets"; +// var publicPath = 'publishable/assets'; +var publicPath = "../../../public/vendor/webkul/ui/assets"; mix.setPublicPath(publicPath).mergeManifest(); mix.disableNotifications(); From f68c4e482c9a40dd3bd77e2f5c520802880b062d Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 15 Feb 2019 09:51:38 +0530 Subject: [PATCH 3/3] Fixed bug #575 --- packages/Webkul/Admin/src/Http/routes.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php index 1cb6e703f..6629253d3 100755 --- a/packages/Webkul/Admin/src/Http/routes.php +++ b/packages/Webkul/Admin/src/Http/routes.php @@ -10,10 +10,6 @@ Route::group(['middleware' => ['web']], function () { 'view' => 'admin::users.sessions.create' ])->name('admin.session.create'); - Route::get('/testgrid', 'Webkul\Admin\Http\Controllers\DataGridController@testGrid')->defaults('_config', [ - 'view' => 'admin::catalog.categories.test' - ]); - //login post route to admin auth controller Route::post('/login', 'Webkul\User\Http\Controllers\SessionController@store')->defaults('_config', [ 'redirect' => 'admin.dashboard.index' @@ -38,8 +34,6 @@ Route::group(['middleware' => ['web']], function () { // Admin Routes Route::group(['middleware' => ['admin']], function () { - Route::get('testev', 'Webkul\Product\Http\Controllers\ProductController@testProductFlat'); - Route::get('/logout', 'Webkul\User\Http\Controllers\SessionController@destroy')->defaults('_config', [ 'redirect' => 'admin.session.create' ])->name('admin.session.destroy');