diff --git a/packages/Webkul/SAASCustomizer/src/Models/StripeConnect/StripeConnect.php b/packages/Webkul/SAASCustomizer/src/Models/StripeConnect/StripeConnect.php deleted file mode 100644 index c0124f2a0..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/StripeConnect/StripeConnect.php +++ /dev/null @@ -1,27 +0,0 @@ -guard('super-admin')->check() || ! isset($company->id)) { - return new \Illuminate\Database\Eloquent\Builder($query); - } else { - return new \Illuminate\Database\Eloquent\Builder($query->where('stripe_companies' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/StripeConnect/StripeConnectObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/StripeConnect/StripeConnectObserver.php deleted file mode 100644 index 93e73b65a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/StripeConnect/StripeConnectObserver.php +++ /dev/null @@ -1,17 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/register.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/register.blade.php index a9ef53896..ce1925e52 100644 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/register.blade.php +++ b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/register.blade.php @@ -46,7 +46,7 @@
- + @{{ errors.first('step-one.password_confirmation') }}
@@ -252,7 +252,7 @@ sendDataToServer () { var o_this = this; - return axios.post('/company/register', { + return axios.post('{{ route('company.create.store') }}', { email: this.email, first_name: this.first_name, last_name: this.last_name, diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php b/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php index e4d6aa05d..1fe3b1f1e 100644 --- a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php +++ b/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php @@ -13,26 +13,34 @@ class ShowPriceAfterLoginServiceProvider extends ServiceProvider */ public function boot() { - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'ShowPriceAfterLogin'); + $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') + dirname(__DIR__) . '/Resources/views/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') + dirname(__DIR__) . '/Resources/views/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') + dirname(__DIR__) . '/Resources/views/add-to-cart.blade.php' => base_path('resources/views/vendor/shop/products/add-to-cart.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-buttons.blade.php' => base_path('views/vendor/shop/products/add-buttons.blade.php') + // ]); $this->publishes([ - dirname(__DIR__) . '/Resources/views/Shop/review-price.blade.php' => base_path('resources/views/vendor/shop/products/review-price.blade.php') + dirname(__DIR__) . '/Resources/views/buy-now.blade.php' => base_path('resources/views/vendor/shop/products/buy-now.blade.php') + ]); + + // $this->publishes([ + // 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/review-price.blade.php' => base_path('resources/views/vendor/shop/products/review-price.blade.php') ]); } @@ -47,4 +55,4 @@ class ShowPriceAfterLoginServiceProvider extends ServiceProvider dirname(__DIR__) . '/../Config/system.php', 'core' ); } -} +} \ No newline at end of file