diff --git a/packages/Webkul/GTM/src/Providers/EventServiceProvider.php b/packages/Webkul/GTM/src/Providers/EventServiceProvider.php index c44038f94..6d056bfea 100644 --- a/packages/Webkul/GTM/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/GTM/src/Providers/EventServiceProvider.php @@ -15,14 +15,12 @@ class EventServiceProvider extends ServiceProvider */ public function boot() { - if (core()->getConfigData('general.gtm.values.status')) { - Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('gtm::head'); - }); + Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('gtm::head'); + }); - Event::listen('bagisto.shop.layout.body.before', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('gtm::body'); - }); - } + Event::listen('bagisto.shop.layout.body.before', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('gtm::body'); + }); } } \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/body.blade.php b/packages/Webkul/GTM/src/Resources/views/body.blade.php index e08760d41..b32f35172 100644 --- a/packages/Webkul/GTM/src/Resources/views/body.blade.php +++ b/packages/Webkul/GTM/src/Resources/views/body.blade.php @@ -1,17 +1,21 @@ - +@if (core()->getConfigData('general.gtm.values.status')) -@if (\Route::current()->getName() == 'shop.products.index') - @include('gtm::product') -@endif + -@if (\Route::current()->getName() == 'shop.categories.index') - @include('gtm::category') -@endif + @if (\Route::current()->getName() == 'shop.products.index') + @include('gtm::product') + @endif -@if (\Route::current()->getName() == 'shop.checkout.cart.index') - @include('gtm::cart') -@endif + @if (\Route::current()->getName() == 'shop.categories.index') + @include('gtm::category') + @endif + + @if (\Route::current()->getName() == 'shop.checkout.cart.index') + @include('gtm::cart') + @endif + + @if (\Route::current()->getName() == 'shop.checkout.success') + @include('gtm::checkout-success') + @endif -@if (\Route::current()->getName() == 'shop.checkout.success') - @include('gtm::checkout-success') @endif \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/head.blade.php b/packages/Webkul/GTM/src/Resources/views/head.blade.php index d4bbde5a8..2eb537f67 100644 --- a/packages/Webkul/GTM/src/Resources/views/head.blade.php +++ b/packages/Webkul/GTM/src/Resources/views/head.blade.php @@ -1 +1,3 @@ - \ No newline at end of file +@if (core()->getConfigData('general.gtm.values.status')) + +@endif \ No newline at end of file diff --git a/packages/Webkul/Payment/src/Config/paymentmethods.php b/packages/Webkul/Payment/src/Config/paymentmethods.php index 864751d7a..a4380b36a 100755 --- a/packages/Webkul/Payment/src/Config/paymentmethods.php +++ b/packages/Webkul/Payment/src/Config/paymentmethods.php @@ -5,13 +5,13 @@ return [ 'title' => 'Cash On Delivery', 'description' => 'shop::app.checkout.onepage.cash-desc', 'class' => 'Webkul\Payment\Payment\CashOnDelivery', - 'active' => true, + 'active' => false, 'sort' => 1 ], 'moneytransfer' => [ 'code' => 'moneytransfer', - 'title' => 'Money Transfer', + 'title' => 'Invoice', 'description' => 'shop::app.checkout.onepage.money-desc', 'class' => 'Webkul\Payment\Payment\MoneyTransfer', 'active' => true, @@ -24,7 +24,7 @@ return [ 'description' => 'shop::app.checkout.onepage.paypal-desc', 'class' => 'Webkul\Paypal\Payment\Standard', 'sandbox' => true, - 'active' => true, + 'active' => false, 'business_account' => 'test@webkul.com', 'sort' => 3 ] diff --git a/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php b/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php index 12bcfffc4..01cab317b 100644 --- a/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php +++ b/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php @@ -5,7 +5,6 @@ namespace Webkul\SAASCustomizer\Exceptions; use Exception; use Illuminate\Auth\AuthenticationException; use Illuminate\Database\Eloquent\PDOException; -use Illuminate\Database\Eloquent\ErrorException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Symfony\Component\HttpKernel\Exception\HttpException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; @@ -29,7 +28,7 @@ class Handler extends ExceptionHandler public function render($request, Exception $exception) { $path = 'saas'; - dd($exception); + if ($exception->getMessage() == 'domain_not_found') { return $this->response($path, 400, trans('saas::app.exceptions.domain-not-found'), 'domain_not_found'); } @@ -58,8 +57,6 @@ class Handler extends ExceptionHandler return $this->response($path, 404); } else if ($exception instanceof PDOException) { return $this->response($path, 500); - } else { - return $this->response($path, 500); } return parent::render($request, $exception); diff --git a/packages/Webkul/SAASCustomizer/src/Helpers/DataPurger.php b/packages/Webkul/SAASCustomizer/src/Helpers/DataPurger.php index 48f88117f..e06f83c44 100644 --- a/packages/Webkul/SAASCustomizer/src/Helpers/DataPurger.php +++ b/packages/Webkul/SAASCustomizer/src/Helpers/DataPurger.php @@ -118,6 +118,7 @@ class DataPurger 'code' => 'guest', 'name' => 'Guest', 'is_user_defined' => 0, + 'company_id' => $this->company->id ]; $customerGroup0 = $this->customerGroup->create($data); diff --git a/packages/Webkul/SAASCustomizer/src/Http/Controllers/PurgeController.php b/packages/Webkul/SAASCustomizer/src/Http/Controllers/PurgeController.php index a8ef90e8c..384999d56 100644 --- a/packages/Webkul/SAASCustomizer/src/Http/Controllers/PurgeController.php +++ b/packages/Webkul/SAASCustomizer/src/Http/Controllers/PurgeController.php @@ -36,8 +36,13 @@ class PurgeController extends Controller $channel = $this->dataSeed->prepareChannelData(); // need to get executed only first time - if (Company::count() == 1) - $this->dataSeed->prepareCountryStateData(); + if (Company::count() == 1) { + try { + $this->dataSeed->prepareCountryStateData(); + } catch (\Exception $e) { + + } + } $this->dataSeed->prepareCustomerGroupData(); diff --git a/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php b/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php index a821b908a..54c0e56e3 100644 --- a/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php +++ b/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php @@ -4,7 +4,7 @@ namespace Webkul\SAASCustomizer\Listeners; use Company; use Illuminate\Support\Facades\Mail; -use Webkul\SAASCustomizer\Mail\NewCompanyNotification; +use Webkul\SAASCustomizer\Notifications\NewCompanyNotification; /** * New company registered events handler @@ -24,6 +24,10 @@ class CompanyRegistered $poolInstance->createPreOrderData($company->id); } - Mail::queue(new NewCompanyNotification($company)); + try { + Mail::queue(new NewCompanyNotification($company)); + } catch (\Exception $e) { + + } } } \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php b/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php index b0b888526..bc0c8a1ae 100644 --- a/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php +++ b/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php @@ -1,6 +1,6 @@ [ 'code' => 'stripe', - 'title' => 'Stripe', - 'description' => 'Stripe Payments', + 'title' => 'RazzoPay', + 'description' => 'RazzoPay Payments', 'class' => 'Webkul\StripeConnect\Payment\StripePayment', 'sandbox' => true, 'active' => true diff --git a/packages/Webkul/Webfont/src/Listeners/Webfont.php b/packages/Webkul/Webfont/src/Listeners/Webfont.php index c6368868e..297c686ba 100644 --- a/packages/Webkul/Webfont/src/Listeners/Webfont.php +++ b/packages/Webkul/Webfont/src/Listeners/Webfont.php @@ -3,7 +3,22 @@ namespace Webkul\Webfont\Listeners; class Webfont { - public function load() { - return view('webfont::webfont'); + + public function handleFrontFont() + { + if (core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_frontend')) { + Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('webfont::webfont'); + }); + } + } + + public function handleBackFont() + { + if (core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_backend')) { + Event::listen('bagisto.admin.layout.head', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('webfont::webfont'); + }); + } } } \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php b/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php index ddafa5456..66ef37a1a 100644 --- a/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php +++ b/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php @@ -15,16 +15,12 @@ class EventServiceProvider extends ServiceProvider */ public function boot() { - if (core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_backend')) { - Event::listen('bagisto.admin.layout.head', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('webfont::webfont'); - }); - } + Event::listen('bagisto.admin.layout.head', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('webfont::webfont'); + }); - if (core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_frontend')) { - Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('webfont::webfont'); - }); - } + Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { + $viewRenderEventManager->addTemplate('webfont::webfont'); + }); } } \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Resources/views/webfont.blade.php b/packages/Webkul/Webfont/src/Resources/views/webfont.blade.php index 67a9fe894..cb3d6ab7e 100644 --- a/packages/Webkul/Webfont/src/Resources/views/webfont.blade.php +++ b/packages/Webkul/Webfont/src/Resources/views/webfont.blade.php @@ -1,115 +1,117 @@ - +@if(core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_backend') || (core()->getConfigData('general.design.webfont.status') && core()->getConfigData('general.design.webfont.enable_frontend'))) + -@php - $activatedFont = app('Webkul\Webfont\Repositories\WebfontRepository'); + @php + $activatedFont = app('Webkul\Webfont\Repositories\WebfontRepository'); - $primaryColor = core()->getConfigData('general.design.webfont.primary_color') ?? '#02bb89'; + $primaryColor = core()->getConfigData('general.design.webfont.primary_color') ?? '#02bb89'; - $secondaryColor = core()->getConfigData('general.design.webfont.secondary_color') ?? '#436be0'; + $secondaryColor = core()->getConfigData('general.design.webfont.secondary_color') ?? '#436be0'; - $font = $activatedFont->findOneWhere([ - 'activated' => 1 - ]); + $font = $activatedFont->findOneWhere([ + 'activated' => 1 + ]); - if (isset($font)) { - $activeFont = $font->font; + if (isset($font)) { + $activeFont = $font->font; - $font = explode(',', $activeFont)[0]; + $font = explode(',', $activeFont)[0]; - $family = explode(',', $activeFont)[1]; - } else { - $font = 'Montserrat'; + $family = explode(',', $activeFont)[1]; + } else { + $font = 'Montserrat'; - $family = 'sans-serif'; + $family = 'sans-serif'; + } + @endphp + + + + \ No newline at end of file + +@endif \ No newline at end of file