diff --git a/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php b/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php index e5f02fcde..083e76f71 100644 --- a/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php +++ b/packages/Webkul/SAASCustomizer/src/Providers/SAASCustomizerServiceProvider.php @@ -95,6 +95,10 @@ class SAASCustomizerServiceProvider extends ServiceProvider public function registerConfig() { + $this->mergeConfigFrom( + dirname(__DIR__) . '/Config/purge-pool.php', 'purge-pool' + ); + $this->mergeConfigFrom( dirname(__DIR__) . '/Config/super-menu.php', 'menu.super-admin' ); diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Http/routes.php b/packages/Webkul/ShowPriceAfterLogin/src/Http/routes.php deleted file mode 100644 index ab2a2c5a9..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Http/routes.php +++ /dev/null @@ -1,284 +0,0 @@ - ['web', 'locale', 'theme', 'currency']], function () { - //Store front home - Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [ - 'view' => 'shop::home.index' - ])->name('shop.home.index'); - - //subscription - //subscribe - Route::get('/subscribe', 'Webkul\Shop\Http\Controllers\SubscriptionController@subscribe')->name('shop.subscribe'); - - //unsubscribe - Route::get('/unsubscribe/{token}', 'Webkul\Shop\Http\Controllers\SubscriptionController@unsubscribe')->name('shop.unsubscribe'); - - //Store front header nav-menu fetch - Route::get('/categories/{slug}', 'Webkul\Shop\Http\Controllers\CategoryController@index')->defaults('_config', [ - 'view' => 'shop::products.index' - ])->name('shop.categories.index'); - - //Store front search - Route::get('/search', 'Webkul\Shop\Http\Controllers\SearchController@index')->defaults('_config', [ - 'view' => 'shop::search.search' - ])->name('shop.search.index'); - - //Country State Selector - Route::get('get/countries', 'Webkul\Core\Http\Controllers\CountryStateController@getCountries')->defaults('_config', [ - 'view' => 'shop::test' - ])->name('get.countries'); - - //Get States When Country is Passed - Route::get('get/states/{country}', 'Webkul\Core\Http\Controllers\CountryStateController@getStates')->defaults('_config', [ - 'view' => 'shop::test' - ])->name('get.states'); - - //checkout and cart - //Cart Items(listing) - Route::get('checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@index')->defaults('_config', [ - 'view' => 'shop::checkout.cart.index' - ])->name('shop.checkout.cart.index'); - - //Cart Items Add - Route::post('checkout/cart/add/{id}', 'Webkul\Shop\Http\Controllers\CartController@add')->defaults('_config', [ - 'redirect' => 'shop.checkout.cart.index' - ])->name('cart.add'); - - //Cart Items Add Configurable for more - Route::get('checkout/cart/addconfigurable/{slug}', 'Webkul\Shop\Http\Controllers\CartController@addConfigurable')->name('cart.add.configurable'); - - //Cart Items Remove - Route::get('checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->name('cart.remove'); - - //Cart Update Before Checkout - Route::post('/checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@updateBeforeCheckout')->defaults('_config', [ - 'redirect' => 'shop.checkout.cart.index' - ])->name('shop.checkout.cart.update'); - - //Cart Items Remove - Route::get('/checkout/cart/remove/{id}', 'Webkul\Shop\Http\Controllers\CartController@remove')->defaults('_config', [ - 'redirect' => 'shop.checkout.cart.index' - ])->name('shop.checkout.cart.remove'); - - //Checkout Index page - Route::get('/checkout/onepage', 'Webkul\Shop\Http\Controllers\OnepageController@index')->defaults('_config', [ - 'view' => 'shop::checkout.onepage' - ])->name('shop.checkout.onepage.index'); - - //Checkout Save Address Form Store - Route::post('/checkout/save-address', 'Webkul\Shop\Http\Controllers\OnepageController@saveAddress')->name('shop.checkout.save-address'); - - //Checkout Save Shipping Address Form Store - Route::post('/checkout/save-shipping', 'Webkul\Shop\Http\Controllers\OnepageController@saveShipping')->name('shop.checkout.save-shipping'); - - //Checkout Save Payment Method Form - Route::post('/checkout/save-payment', 'Webkul\Shop\Http\Controllers\OnepageController@savePayment')->name('shop.checkout.save-payment'); - - //Checkout Save Order - Route::post('/checkout/save-order', 'Webkul\Shop\Http\Controllers\OnepageController@saveOrder')->name('shop.checkout.save-order'); - - //Checkout Order Successfull - Route::get('/checkout/success', 'Webkul\Shop\Http\Controllers\OnepageController@success')->defaults('_config', [ - 'view' => 'shop::checkout.success' - ])->name('shop.checkout.success'); - - //Shop buynow button action - Route::get('buynow/{id}', 'Webkul\Shop\Http\Controllers\CartController@buyNow')->name('shop.product.buynow'); - - //Shop buynow button action - Route::get('move/wishlist/{id}', 'Webkul\Shop\Http\Controllers\CartController@moveToWishlist')->name('shop.movetowishlist'); - - //Show Product Details Page(For individually Viewable Product) - Route::get('/products/{slug}', 'Webkul\Shop\Http\Controllers\ProductController@index')->defaults('_config', [ - 'view' => 'shop::products.view' - ])->name('shop.products.index'); - - // Show Product Review Form - Route::get('/reviews/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@show')->defaults('_config', [ - 'view' => 'shop::products.reviews.index' - ])->name('shop.reviews.index'); - - // Show Product Review(listing) - Route::get('/product/{slug}/review', 'Webkul\Shop\Http\Controllers\ReviewController@create')->defaults('_config', [ - 'view' => 'shop::products.reviews.create' - ])->name('shop.reviews.create'); - - // Show Product Review Form Store - Route::post('/product/{slug}/review', 'Webkul\Shop\Http\Controllers\ReviewController@store')->defaults('_config', [ - 'redirect' => 'shop.home.index' - ])->name('shop.reviews.store'); - - //customer routes starts here - Route::prefix('customer')->group(function () { - // forgot Password Routes - // Forgot Password Form Show - Route::get('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.forgot-password' - ])->name('customer.forgot-password.create'); - - // Forgot Password Form Store - Route::post('/forgot-password', 'Webkul\Customer\Http\Controllers\ForgotPasswordController@store')->name('customer.forgot-password.store'); - - // Reset Password Form Show - Route::get('/reset-password/{token}', 'Webkul\Customer\Http\Controllers\ResetPasswordController@create')->defaults('_config', [ - 'view' => 'shop::customers.signup.reset-password' - ])->name('customer.reset-password.create'); - - // Reset Password Form Store - Route::post('/reset-password', 'Webkul\Customer\Http\Controllers\ResetPasswordController@store')->defaults('_config', [ - 'redirect' => 'customer.profile.index' - ])->name('customer.reset-password.store'); - - // Login Routes - // showshopafterlogin - // Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [ - // 'view' => 'shop::customers.session.index', - // ])->name('customer.login.index'); - - // Login form show - Route::get('login', 'Webkul\Customer\Http\Controllers\SessionController@show')->defaults('_config', [ - 'view' => 'shop::customers.session.index', - ])->name('customer.session.index'); - - // Login form store - Route::post('login', 'Webkul\Customer\Http\Controllers\SessionController@create')->defaults('_config', [ - 'redirect' => 'customer.profile.index' - ])->name('customer.session.create'); - - // Registration Routes - //registration form show - Route::get('register', 'Webkul\Customer\Http\Controllers\RegistrationController@show')->defaults('_config', [ - 'view' => 'shop::customers.signup.index' - ])->name('customer.register.index'); - - //registration form store - Route::post('register', 'Webkul\Customer\Http\Controllers\RegistrationController@create')->defaults('_config', [ - 'redirect' => 'customer.session.index', - ])->name('customer.register.create'); - - //verify account - Route::get('/verify-account/{token}', 'Webkul\Customer\Http\Controllers\RegistrationController@verifyAccount')->name('customer.verify'); - - //resend verification email - Route::get('/resend/verification/{email}', 'Webkul\Customer\Http\Controllers\RegistrationController@resendVerificationEmail')->name('customer.resend.verification-email'); - - // Auth Routes - Route::group(['middleware' => ['customer']], function () { - - //Customer logout - Route::get('logout', 'Webkul\Customer\Http\Controllers\SessionController@destroy')->defaults('_config', [ - 'redirect' => 'customer.session.index' - ])->name('customer.session.destroy'); - - //Customer Wishlist add - Route::get('wishlist/add/{id}', 'Webkul\Customer\Http\Controllers\WishlistController@add')->name('customer.wishlist.add'); - - //Customer Wishlist remove - Route::get('wishlist/remove/{id}', 'Webkul\Customer\Http\Controllers\WishlistController@remove')->name('customer.wishlist.remove'); - - //Customer Wishlist remove - Route::get('wishlist/removeall', 'Webkul\Customer\Http\Controllers\WishlistController@removeAll')->name('customer.wishlist.removeall'); - - //Customer Wishlist move to cart - Route::get('wishlist/move/{id}', 'Webkul\Customer\Http\Controllers\WishlistController@move')->name('customer.wishlist.move'); - - //customer account - Route::prefix('account')->group(function () { - //Customer Dashboard Route - Route::get('index', 'Webkul\Customer\Http\Controllers\AccountController@index')->defaults('_config', [ - 'view' => 'shop::customers.account.index' - ])->name('customer.account.index'); - - //Customer Profile Show - Route::get('profile', 'Webkul\Customer\Http\Controllers\CustomerController@index')->defaults('_config', [ - 'view' => 'shop::customers.account.profile.index' - ])->name('customer.profile.index'); - - //Customer Profile Edit Form Show - Route::get('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@edit')->defaults('_config', [ - 'view' => 'shop::customers.account.profile.edit' - ])->name('customer.profile.edit'); - - //Customer Profile Edit Form Store - Route::post('profile/edit', 'Webkul\Customer\Http\Controllers\CustomerController@update')->defaults('_config', [ - 'redirect' => 'customer.profile.index' - ])->name('customer.profile.edit'); - /* Profile Routes Ends Here */ - - /* Routes for Addresses */ - //Customer Address Show - Route::get('addresses', 'Webkul\Customer\Http\Controllers\AddressController@index')->defaults('_config', [ - 'view' => 'shop::customers.account.address.index' - ])->name('customer.address.index'); - - //Customer Address Create Form Show - Route::get('addresses/create', 'Webkul\Customer\Http\Controllers\AddressController@create')->defaults('_config', [ - 'view' => 'shop::customers.account.address.create' - ])->name('customer.address.create'); - - //Customer Address Create Form Store - Route::post('addresses/create', 'Webkul\Customer\Http\Controllers\AddressController@store')->defaults('_config', [ - 'view' => 'shop::customers.account.address.address', - 'redirect' => 'customer.address.index' - ])->name('customer.address.create'); - - //Customer Address Edit Form Show - Route::get('addresses/edit/{id}', 'Webkul\Customer\Http\Controllers\AddressController@edit')->defaults('_config', [ - 'view' => 'shop::customers.account.address.edit' - ])->name('customer.address.edit'); - - //Customer Address Edit Form Store - Route::put('addresses/edit/{id}', 'Webkul\Customer\Http\Controllers\AddressController@update')->defaults('_config', [ - 'redirect' => 'customer.address.index' - ])->name('customer.address.edit'); - - //Customer Address Make Default - Route::get('addresses/default/{id}', 'Webkul\Customer\Http\Controllers\AddressController@makeDefault')->name('make.default.address'); - - //Customer Address Delete - Route::get('addresses/delete/{id}', 'Webkul\Customer\Http\Controllers\AddressController@destroy')->name('address.delete'); - - /* Wishlist route */ - //Customer wishlist(listing) - Route::get('wishlist', 'Webkul\Customer\Http\Controllers\WishlistController@index')->defaults('_config', [ - 'view' => 'shop::customers.account.wishlist.wishlist' - ])->name('customer.wishlist.index'); - - /* Orders route */ - //Customer orders(listing) - Route::get('orders', 'Webkul\Shop\Http\Controllers\OrderController@index')->defaults('_config', [ - 'view' => 'shop::customers.account.orders.index' - ])->name('customer.orders.index'); - - //Customer orders view summary and status - Route::get('orders/view/{id}', 'Webkul\Shop\Http\Controllers\OrderController@view')->defaults('_config', [ - 'view' => 'shop::customers.account.orders.view' - ])->name('customer.orders.view'); - - //Prints invoice - Route::get('orders/print/{id}', 'Webkul\Shop\Http\Controllers\OrderController@print')->defaults('_config', [ - 'view' => 'shop::customers.account.orders.print' - ])->name('customer.orders.print'); - - /* Reviews route */ - //Customer reviews - Route::get('reviews', 'Webkul\Customer\Http\Controllers\CustomerController@reviews')->defaults('_config', [ - 'view' => 'shop::customers.account.reviews.index' - ])->name('customer.reviews.index'); - - //Customer review delete - Route::get('reviews/delete/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@destroy')->defaults('_config', [ - 'redirect' => 'customer.reviews.index' - ])->name('customer.review.delete'); - - //Customer all review delete - Route::get('reviews/all-delete', 'Webkul\Shop\Http\Controllers\ReviewController@deleteAll')->defaults('_config', [ - 'redirect' => 'customer.reviews.index' - ])->name('customer.review.deleteall'); - }); - }); - }); - //customer routes end here - - Route::fallback('Webkul\Shop\Http\Controllers\HomeController@notFound'); -}); diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php b/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php index 5bba24568..be43e7adc 100644 --- a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php +++ b/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php @@ -13,28 +13,35 @@ class ShowPriceAfterLoginServiceProvider extends ServiceProvider */ public function boot() { - $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'ShowPriceAfterLogin'); + $this->publishes([ + dirname(__DIR__) . '/Resources/views/Shop/card.blade.php' => base_path('resources/views/vendor/shop/products/list/card.blade.php') + ]); + + $this->publishes([ + dirname(__DIR__) . '/Resources/views/Shop/price.blade.php' => base_path('resources/views/vendor/shop/products/price.blade.php') + ]); + + $this->publishes([ + dirname(__DIR__) . '/Resources/views/Shop/add-to-cart.blade.php' => base_path('resources/views/vendor/shop/products/add-to-cart.blade.php') + ]); + // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/price.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/price.blade.php') + // dirname(__DIR__) . '/Resources/views/Shop/add-buttons.blade.php' => base_path('views/vendor/shop/products/add-buttons.blade.php') // ]); + + $this->publishes([ + dirname(__DIR__) . '/Resources/views/Shop/buy-now.blade.php' => base_path('resources/views/vendor/shop/products/buy-now.blade.php') + ]); + // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/add-to-cart.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/add-to-cart.blade.php') - // ]); - // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/add-buttons.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/add-buttons.blade.php') - // ]); - // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/buy-now.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/buy-now.blade.php') - // ]); - // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/view/product-add.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/view/product-add.blade.php') - // ]); - // $this->publishes([ - // dirname(__DIR__) . '/Resources/views/Shop/review-price.blade.php' => base_path('packages/Webkul/Shop/src/Resources/views/products/review-price.blade.php') + // dirname(__DIR__) . '/Resources/views/Shop/view/product-add.blade.php' => base_path('views/vendor/shop/products/view/product-add.blade.php') // ]); + + $this->publishes([ + dirname(__DIR__) . '/Resources/views/Shop/review-price.blade.php' => base_path('resources/views/vendor/shop/products/review-price.blade.php') + ]); } /** diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/add-to-cart.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/add-to-cart.blade.php new file mode 100644 index 000000000..b5b4b4e16 --- /dev/null +++ b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/add-to-cart.blade.php @@ -0,0 +1,19 @@ +{!! view_render_event('bagisto.shop.products.add_to_cart.before', ['product' => $product]) !!} +@php + $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); + + $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction'); +@endphp + +@if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest')) +
+@else + +@endif +{!! view_render_event('bagisto.shop.products.add_to_cart.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/buy-now.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/buy-now.blade.php new file mode 100644 index 000000000..0f7dcf1b8 --- /dev/null +++ b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/buy-now.blade.php @@ -0,0 +1,15 @@ +{!! view_render_event('bagisto.shop.products.buy_now.before', ['product' => $product]) !!} + +@php + $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); + + $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction'); +@endphp + +@if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest')) +@else + +@endif +{!! view_render_event('bagisto.shop.products.buy_now.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/card.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/card.blade.php new file mode 100644 index 000000000..dd754d56c --- /dev/null +++ b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/card.blade.php @@ -0,0 +1,55 @@ +{!! view_render_event('bagisto.shop.products.list.card.before', ['product' => $product]) !!} + +@php + $status = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); + + $function = core()->getConfigData('ShowPriceAfterLogin.settings.settings.selectfunction'); +@endphp + +