From 68e17fc711575f852afa2cf1ad9e6df0952a17fa Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 25 Nov 2020 12:49:49 +0530 Subject: [PATCH 01/14] Fixed Issue For Non Attributes --- .../Product/src/Repositories/ProductRepository.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index 2e3b6539e..db098c265 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -569,9 +569,10 @@ class ProductRepository extends Repository if ($attribute) { if ($attribute->code === 'price') { $query->orderBy('min_price', $direction); - } else { - $query->orderBy($sort === 'created_at' ? 'product_flat.created_at' : $attribute->code, $direction); } + } else { + /* created_at is not an attribute so it will be in else case */ + $query->orderBy($sort === 'created_at' ? 'product_flat.created_at' : $attribute->code, $direction); } return $query; @@ -773,14 +774,14 @@ class ProductRepository extends Repository ]); } } - + /** * @object $data * @object $copiedProduct * @object $copiedProductImageVideo */ private function copyProductImageVideo($data, $copiedProduct, $copiedProductImageVideo): void - { + { $path = explode("/", $data->path); $path = 'product/' . $copiedProduct->id .'/'. end($path); From ca7a52e54c6f1eda4aa3b08577619e4a23e5a8a3 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 25 Nov 2020 12:58:07 +0530 Subject: [PATCH 02/14] Some Changes Done --- .../Webkul/Product/src/Repositories/ProductRepository.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php index db098c265..e6776d091 100755 --- a/packages/Webkul/Product/src/Repositories/ProductRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php @@ -569,10 +569,12 @@ class ProductRepository extends Repository if ($attribute) { if ($attribute->code === 'price') { $query->orderBy('min_price', $direction); + } else { + $query->orderBy($attribute->code, $direction); } } else { - /* created_at is not an attribute so it will be in else case */ - $query->orderBy($sort === 'created_at' ? 'product_flat.created_at' : $attribute->code, $direction); + /* `created_at` is not an attribute so it will be in else case */ + $query->orderBy('product_flat.created_at', $direction); } return $query; From fe969261793593e694a49cd4f57e1d46f44f15fa Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 25 Nov 2020 18:28:21 +0530 Subject: [PATCH 03/14] Changes Added Which Has Been Reverted --- packages/Webkul/API/Providers/ModuleServiceProvider.php | 4 ++-- packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php | 4 ++-- .../Webkul/Payment/src/Providers/ModuleServiceProvider.php | 4 ++-- .../Webkul/Paypal/src/Providers/ModuleServiceProvider.php | 4 ++-- packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php | 4 ++-- .../Webkul/Shipping/src/Providers/ModuleServiceProvider.php | 4 ++-- packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php | 4 ++-- packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php | 4 ++-- packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/Webkul/API/Providers/ModuleServiceProvider.php b/packages/Webkul/API/Providers/ModuleServiceProvider.php index 015d47c34..d3e3324c5 100644 --- a/packages/Webkul/API/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/API/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\API\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php index dced77512..589513245 100644 --- a/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Admin/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Admin\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php index 5dd1dc590..d880f5fbc 100644 --- a/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Payment/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Payment\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php index 07530cbb3..0e2936814 100644 --- a/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Paypal/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Paypal\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php index ed2806511..95e9852b5 100644 --- a/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Rule/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Rule\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php index 2323fad24..25517b99b 100644 --- a/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Shipping/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Shipping\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php index be4783197..ab1768fc0 100644 --- a/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Shop/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Shop\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php index 279ece017..d8eb46d9d 100644 --- a/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Theme/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Theme\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; diff --git a/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php index b0b1cf023..b60a33922 100644 --- a/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php +++ b/packages/Webkul/Ui/src/Providers/ModuleServiceProvider.php @@ -2,9 +2,9 @@ namespace Webkul\Ui\Providers; -use Konekt\Concord\BaseModuleServiceProvider; +use Webkul\Core\Providers\CoreModuleServiceProvider; -class ModuleServiceProvider extends BaseModuleServiceProvider +class ModuleServiceProvider extends CoreModuleServiceProvider { protected $models = [ ]; From 810cdfd35a9277c4a32dd4d52ae245b415e5ace3 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Wed, 25 Nov 2020 20:32:01 +0530 Subject: [PATCH 04/14] Dynamic Path Added To Debugger --- .../Webkul/DebugBar/src/DataCollector/ModuleCollector.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php b/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php index 9311a50d2..c0e9e64f9 100644 --- a/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php +++ b/packages/Webkul/DebugBar/src/DataCollector/ModuleCollector.php @@ -271,8 +271,8 @@ class ModuleCollector extends DataCollector implements DataCollectorInterface, R public function getAssets() { return [ - 'base_path' => '/home/jitendra/www/html/laravel/bagisto/packages/Webkul/DebugBar/src/Resources/', - 'base_url' => '/home/jitendra/www/html/laravel/bagisto/packages/Webkul/DebugBar/src/Resources/', + 'base_path' => __DIR__ . '/../Resources/', + 'base_url' => __DIR__ . '/../Resources/', 'css' => 'widgets/modules/widget.css', 'js' => 'widgets/modules/widget.js' ]; From bea41e9e42354be0f53c36cef1ee473c5777e7d1 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Thu, 26 Nov 2020 13:55:22 +0530 Subject: [PATCH 05/14] optimization code --- .../Product/src/Repositories/ProductFlatRepository.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php index dc9027d3d..4f1bd776d 100644 --- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php +++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php @@ -102,11 +102,9 @@ class ProductFlatRepository extends Repository foreach ($products as $key => $product) { foreach ($filterAttributes as $attribute) { - if ($attribute->code <> 'price') { - if (isset($product[$attribute->code])) { - if (! in_array($product[$attribute->code], $allProductAttributeOptionsCode)) { - array_push($allProductAttributeOptionsCode, $product[$attribute->code]); - } + if ($attribute->code <> 'price' && isset($product[$attribute->code])) { + if (! in_array($product[$attribute->code], $allProductAttributeOptionsCode)) { + array_push($allProductAttributeOptionsCode, $product[$attribute->code]); } } } From ed2b8c8fb71b0f29e8a714be983bb8a5d3d28785 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 26 Nov 2020 14:07:14 +0530 Subject: [PATCH 06/14] Adjusted Hardcoded Value --- packages/Webkul/Product/src/Helpers/Toolbar.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Product/src/Helpers/Toolbar.php b/packages/Webkul/Product/src/Helpers/Toolbar.php index 69d6814b7..8d06a1f88 100755 --- a/packages/Webkul/Product/src/Helpers/Toolbar.php +++ b/packages/Webkul/Product/src/Helpers/Toolbar.php @@ -94,7 +94,7 @@ class Toolbar extends AbstractProduct } elseif (! isset($params['sort'])) { $sortBy = core()->getConfigData('catalog.products.storefront.sort_by') ? core()->getConfigData('catalog.products.storefront.sort_by') - : 'created_at-asc'; + : 'name-desc'; if ($key == $sortBy) { return true; From dff0466971485f81e4e258aa43ccd687898fd454 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 27 Nov 2020 11:10:04 +0530 Subject: [PATCH 07/14] Added Method --- .../Http/Controllers/OnepageController.php | 17 +++++++++++++++++ packages/Webkul/Shop/src/Http/routes.php | 3 +++ .../assets/js/UI/components/mini-cart.vue | 19 +++++++++++-------- .../shop/checkout/cart/mini-cart.blade.php | 7 +------ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php index aa4349cd8..f3abafb3e 100755 --- a/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/OnepageController.php @@ -350,4 +350,21 @@ class OnepageController extends Controller ], 422); } } + + /** + * Check for minimum order. + * + * @return \Illuminate\Http\Response + */ + public function checkMinimumOrder() + { + $minimumOrderAmount = (float) core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0; + + $status = Cart::checkMinimumOrder(); + + return response()->json([ + 'status' => ! $status ? false : true, + 'message' => ! $status ? trans('shop::app.checkout.cart.minimum-order-message', ['amount' => core()->currency($minimumOrderAmount)]) : 'Success', + ]); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 1f7212ccd..c9e3fe892 100755 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -76,6 +76,9 @@ Route::group(['middleware' => ['web', 'locale', 'theme', 'currency']], function //Checkout Save Payment Method Form Route::post('/checkout/save-payment', 'Webkul\Shop\Http\Controllers\OnepageController@savePayment')->name('shop.checkout.save-payment'); + /* check minimum order */ + Route::post('/checkout/check-minimum-order', 'Webkul\Shop\Http\Controllers\OnepageController@checkMinimumOrder')->name('shop.checkout.check-minimum-order'); + //Checkout Save Order Route::post('/checkout/save-order', 'Webkul\Shop\Http\Controllers\OnepageController@saveOrder')->name('shop.checkout.save-order'); diff --git a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue index 0c0d84a35..5e7bd219f 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue +++ b/packages/Webkul/Velocity/src/Resources/assets/js/UI/components/mini-cart.vue @@ -7,7 +7,6 @@ v-if="cartItems.length > 0" class="modal-content sensitive-modal cart-modal-content hide"> -
@@ -40,7 +39,6 @@
-