diff --git a/.env.example b/.env.example index f136fbdf2..a06cfe97c 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -APP_NAME=Razzo +APP_NAME=Bagisto APP_ENV=local APP_VERSION=0.1.6 APP_KEY= @@ -34,13 +34,6 @@ MAIL_ENCRYPTION=tls SHOP_MAIL_FROM= ADMIN_MAIL_TO= -STRIPE_ENABLE_TESTING= -STRIPE_TEST_PUBLISHABLE_KEY= -STRIPE_TEST_SECRET_KEY= -STRIPE_LIVE_PUBLISHABLE_KEY= -STRIPE_LIVE_SECRET_KEY= -STRIPE_STATEMENT_DESCRIPTOR= - fixer_api_key= PUSHER_APP_ID= diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 51792b28d..4c2d12de3 100755 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -30,9 +30,7 @@ class Kernel extends HttpKernel \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, - \Illuminate\Routing\Middleware\SubstituteBindings::class, - \Webkul\SAASCustomizer\Http\Middleware\ValidatesDomain::class, - \Webkul\ShowPriceAfterLogin\Http\Middleware\ShowShopAfterLogin::class + \Illuminate\Routing\Middleware\SubstituteBindings::class ], 'api' => [ diff --git a/composer.json b/composer.json index fa707f8ab..bfa1b36cc 100755 --- a/composer.json +++ b/composer.json @@ -90,19 +90,7 @@ "Webkul\\Tax\\": "packages/Webkul/Tax/src", "Webkul\\API\\": "packages/Webkul/API", "Webkul\\Discount\\": "packages/Webkul/Discount/src", - "Webkul\\CMS\\": "packages/Webkul/CMS/src", - "Webkul\\CustomerDocument\\": "packages/Webkul/CustomerDocument", - "Webkul\\BulkAddToCart\\": "packages/Webkul/BulkAddToCart", - "Webkul\\AdminAuthCheck\\": "packages/Webkul/AdminAuthCheck/src", - "Webkul\\StripeConnect\\": "packages/Webkul/StripeConnect/src", - "Webkul\\CustomerCreditMax\\": "packages/Webkul/CustomerCreditMax", - "Webkul\\CustomerGroupCatalog\\": "packages/Webkul/CustomerGroupCatalog", - "Webkul\\ShowPriceAfterLogin\\": "packages/Webkul/ShowPriceAfterLogin/src", - "Webkul\\PreOrder\\": "packages/Webkul/PreOrder/src", - "Webkul\\Webfont\\": "packages/Webkul/Webfont/src", - "Webkul\\GTM\\": "packages/Webkul/GTM/src", - "Webkul\\Custom\\": "packages/Webkul/Custom/src", - "Webkul\\SAASCustomizer\\": "packages/Webkul/SAASCustomizer/src" + "Webkul\\CMS\\": "packages/Webkul/CMS/src" } }, "autoload-dev": { diff --git a/config/app.php b/config/app.php index 77070b7cc..3bb520a73 100755 --- a/config/app.php +++ b/config/app.php @@ -52,7 +52,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://bagsaas.com'), + 'url' => env('APP_URL', 'http://localhost'), /* |-------------------------------------------------------------------------- @@ -245,19 +245,7 @@ return [ Webkul\Tax\Providers\TaxServiceProvider::class, Webkul\API\Providers\APIServiceProvider::class, Webkul\Discount\Providers\DiscountServiceProvider::class, - Webkul\CMS\Providers\CMSServiceProvider::class, - Webkul\CustomerDocument\Providers\CustomerDocumentServiceProvider::class, - Webkul\BulkAddToCart\Providers\BulkAddToCartServiceProvider::class, - Webkul\AdminAuthCheck\Providers\AdminAuthCheckServiceProvider::class, - Webkul\Webfont\Providers\WebfontServiceProvider::class, - Webkul\GTM\Providers\GTMServiceProvider::class, - Webkul\StripeConnect\Providers\StripeConnectServiceProvider::class, - Webkul\ShowPriceAfterLogin\Providers\ShowPriceAfterLoginServiceProvider::class, - Webkul\CustomerCreditMax\Providers\CustomerCreditMaxServiceProvider::class, - Webkul\PreOrder\Providers\PreOrderServiceProvider::class, - Webkul\CustomerGroupCatalog\Providers\CustomerGroupCatalogServiceProvider::class, - Webkul\SAASCustomizer\Providers\SAASCustomizerServiceProvider::class, - Webkul\Custom\Providers\CustomServiceProvider::class + Webkul\CMS\Providers\CMSServiceProvider::class ], /* @@ -315,7 +303,6 @@ return [ 'PDF' => Barryvdh\DomPDF\Facade::class, 'Excel' => Maatwebsite\Excel\Facades\Excel::class, 'Concord' => Konekt\Concord\Facades\Concord::class, - 'Helper' => Konekt\Concord\Facades\Helper::class, - 'Company' => Webkul\SAASCustomizer\Facades\Company::class + 'Helper' => Konekt\Concord\Facades\Helper::class ], ]; \ No newline at end of file diff --git a/config/auth.php b/config/auth.php index df9f39404..cd086cdb3 100755 --- a/config/auth.php +++ b/config/auth.php @@ -27,11 +27,6 @@ return [ 'provider' => 'admins' ], - 'super-admin' => [ - 'driver' => 'session', - 'provider' => 'superadmins' - ], - 'admin-api' => [ 'driver' => 'token', 'provider' => 'admins', @@ -47,11 +42,6 @@ return [ 'admins' => [ 'driver' => 'eloquent', 'model' => Webkul\User\Models\Admin::class, - ], - - 'superadmins' => [ - 'driver' => 'eloquent', - 'model' => Webkul\SAASCustomizer\Models\SuperAdmin::class ] ], diff --git a/config/concord.php b/config/concord.php index 4ffc94270..311ede347 100755 --- a/config/concord.php +++ b/config/concord.php @@ -20,9 +20,6 @@ return [ \Webkul\Tax\Providers\ModuleServiceProvider::class, \Webkul\User\Providers\ModuleServiceProvider::class, \Webkul\Discount\Providers\ModuleServiceProvider::class, - \Webkul\CMS\Providers\ModuleServiceProvider::class, - \Webkul\StripeConnect\Providers\ModuleServiceProvider::class, - \Webkul\PreOrder\Providers\ModuleServiceProvider::class, - \Webkul\Webfont\Providers\ModuleServiceProvider::class + \Webkul\CMS\Providers\ModuleServiceProvider::class ] ]; \ No newline at end of file diff --git a/config/excluded-sites.php b/config/excluded-sites.php deleted file mode 100644 index 25058db0c..000000000 --- a/config/excluded-sites.php +++ /dev/null @@ -1,5 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CustomerApprovalController extends Controller -{ - protected $_config; - - public function __construct() - { - $this->_config = request('_config'); - } - - public function index() - { - - } - - public function approve() - { - dd('approving the newly created customer'); - } -} \ No newline at end of file diff --git a/packages/Webkul/AdminAuthCheck/src/Listeners/LoginAuthenticationAttempt.php b/packages/Webkul/AdminAuthCheck/src/Listeners/LoginAuthenticationAttempt.php deleted file mode 100644 index a9cd8244a..000000000 --- a/packages/Webkul/AdminAuthCheck/src/Listeners/LoginAuthenticationAttempt.php +++ /dev/null @@ -1,54 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class LoginAuthenticationAttempt -{ - protected $superAdmin; - - public function __construct(SuperAdmin $superAdmin) { - $this->superAdmin = $superAdmin; - } - - public function handle() - { - $company = Company::getCurrent(); - - if (! auth()->guard('super-admin')->check()) { - $credentials = request()->all(); - $credentials['company_id'] = $company->id; - - unset($credentials['_token']); - - if (auth()->guard('admin')->check()) { - $admin = auth()->guard('admin')->user(); - - if (Company::getCurrent()->id != $admin->company_id) { - auth()->guard('admin')->logout(); - - throw new \Exception('invalid_admin_login', 400); - } - } else if (auth()->guard('customer')->check()) { - $customer = auth()->guard('customer')->user(); - - if (Company::getCurrent()->id != $customer->company_id) { - auth()->guard('customer')->logout(); - - if (! auth()->guard('customer')->attempt($credentials)) { - - throw new \Exception('invalid_customer_login', 400); - } - } - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/AdminAuthCheck/src/Providers/AdminAuthCheckProvider.php b/packages/Webkul/AdminAuthCheck/src/Providers/AdminAuthCheckProvider.php deleted file mode 100644 index 224453f11..000000000 --- a/packages/Webkul/AdminAuthCheck/src/Providers/AdminAuthCheckProvider.php +++ /dev/null @@ -1,32 +0,0 @@ -loadRoutesFrom(__DIR__.'/../Routes/web.php'); - - $this->app->bind( - ExceptionHandler::class, - Handler::class - ); - - // $this->app->register(ModuleServiceProvider::class); - } - - public function register() - { - $this->app->register(EventServiceProvider::class); - } -} \ No newline at end of file diff --git a/packages/Webkul/AdminAuthCheck/src/Providers/EventServiceProvider.php b/packages/Webkul/AdminAuthCheck/src/Providers/EventServiceProvider.php deleted file mode 100644 index b399e71be..000000000 --- a/packages/Webkul/AdminAuthCheck/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - // 'Webkul\AdminAuthCheck\Listeners\LoginAuthenticationAttempt' - // ], // make use of this to stop admins logging into other sites - - 'Illuminate\Auth\Events\Authenticated' => [ - 'Webkul\AdminAuthCheck\Listeners\LoginAuthenticationAttempt' - ] - ]; -} \ No newline at end of file diff --git a/packages/Webkul/AdminAuthCheck/src/Providers/ModuleServiceProvider.php b/packages/Webkul/AdminAuthCheck/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index 3372c26ef..000000000 --- a/packages/Webkul/AdminAuthCheck/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,11 +0,0 @@ - 'Set Category Visibility', -]; \ No newline at end of file diff --git a/packages/Webkul/AdminAuthCheck/src/Routes/web.php b/packages/Webkul/AdminAuthCheck/src/Routes/web.php deleted file mode 100644 index a4abe2daf..000000000 --- a/packages/Webkul/AdminAuthCheck/src/Routes/web.php +++ /dev/null @@ -1,2 +0,0 @@ - 'account.bulk-add-to-cart', - 'name' => 'bulkaddtocart::app.products.bulk-add-to-cart', - 'route' =>'cart.bulk-add-to-cart.create', - 'sort' => 7 - ] -]; - -?> \ No newline at end of file diff --git a/packages/Webkul/BulkAddToCart/src/Http/Controllers/BulkAddToCartController.php b/packages/Webkul/BulkAddToCart/src/Http/Controllers/BulkAddToCartController.php deleted file mode 100644 index 80fbe4a6b..000000000 --- a/packages/Webkul/BulkAddToCart/src/Http/Controllers/BulkAddToCartController.php +++ /dev/null @@ -1,194 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class BulkAddToCartController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * ProductRepository object - * - * @var array - */ - protected $product; - - /** - * Create a new controller instance. - * - * @param \Webkul\Product\Repositories\ProductRepository $product - * @return void - */ - public function __construct(Product $product) - { - $this->product = $product; - - $this->_config = request('_config'); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - return view($this->_config['view']); - } - - /** - * Store a newly created resource in storage. - * - * @return \Illuminate\Http\Response - */ - public function store() - { - $valid_extension = ['xlsx', 'csv', 'xls', 'ods']; - - if (! in_array(request()->file('file')->getClientOriginalExtension(), $valid_extension)) { - session()->flash('error', trans('bulkaddtocart::app.products.upload-error')); - - return redirect()->back(); - } else { - try { - $excelData = (new DataGridImport)->toArray(request()->file('file')); - $cart = []; - - foreach ($excelData as $data) { - foreach ($data as $column => $uploadData) { - $validator = Validator::make($uploadData, [ - 'sku' => 'required', - 'quantity' => 'required|numeric|min:1', - ]); - - $product = $this->product->findOneWhere([ - 'sku' => $uploadData['sku'], - ]); - - if ($product) { - $canAdd = $product->haveSufficientQuantity($uploadData['quantity']); - - if (! $canAdd) { - $sufficientQuantity[] = $column + 1; - } else if ($product->type == 'simple' && $uploadData['quantity'] > 0) { - if ($product->parent_id != null) { - $parentProduct = $this->product->findOneWhere([ - 'id' => $product->parent_id, - ]); - - foreach ($parentProduct->super_attributes as $super_attribute) { - if ($super_attribute->type == 'select') { - foreach ($product->attribute_values as $attribute_value) { - if ($super_attribute->id == $attribute_value->attribute_id) { - $attributes[$super_attribute->id] = (string) $attribute_value->integer_value; - } - } - } - } - - $cart['product'] = (string) $parentProduct->id; - $cart['quantity'] = (string) $uploadData['quantity']; - $cart['is_configurable'] = 'true'; - $cart['selected_configurable_option'] = (string) $product->id; - $cart['super_attribute'] = $attributes; - } else { - $cart['product'] = (string) $product->id; - $cart['quantity'] = (string) $uploadData['quantity']; - $cart['is_configurable'] = 'false'; - } - - request()->merge([ - 'quantity' => $cart['quantity'] - ]); - - Event::fire('checkout.cart.add.before', $cart['product']); - - $result = Cart::add($cart['product'], $cart); - - Event::fire('checkout.cart.add.after', $result); - - Cart::collectTotals(); - } - } else { - $skuError[] = $column + 1; - } - - if ($validator->fails()) { - $failedRules[$column+1] = $validator->errors(); - } - } - } - - if (isset($failedRules)) { - foreach ($failedRules as $coulmn => $fail) { - if ($fail->first('sku')) { - $errorMsg[$coulmn] = $fail->first('sku'); - } else if ($fail->first('quantity')) { - $errorMsg[$coulmn] = $fail->first('quantity'); - } - } - - foreach ($errorMsg as $key => $msg) { - $msg = str_replace(".", "", $msg); - $message[] = $msg. ' at Row ' .$key . '.'; - } - - $finalMsg[] = implode(" ", $message); - } - if (isset($skuError)) { - $errorRows = implode(",", $skuError); - $finalMsg[] = trans('bulkaddtocart::app.products.sku-error') . ' ' . $errorRows . '.'; - } - if (isset($sufficientQuantity)) { - $errorRows = implode(",", $sufficientQuantity); - $finalMsg[] = trans('bulkaddtocart::app.products.quantity-error') . ' ' . $errorRows . '.'; - } - if (isset($finalMsg)) { - $finalErrorMsg = implode(" ", $finalMsg); - - session()->flash('error', $finalErrorMsg); - - return redirect()->back(); - } else { - session()->flash('success', trans('bulkaddtocart::app.products.upload-sucess')); - - return redirect()->route($this->_config['redirect']); - } - } catch (\Exception $e) { - session()->flash('error', $e->getMessage()); - - return redirect()->back(); - } - } - } - - /** - * Download Sample - * - * @return \Illuminate\Http\Response - */ - public function downLoadSample() - { - return Storage::download('sample/sample.xls'); - } -} \ No newline at end of file diff --git a/packages/Webkul/BulkAddToCart/src/Http/Controllers/Controller.php b/packages/Webkul/BulkAddToCart/src/Http/Controllers/Controller.php deleted file mode 100644 index 47f4fa3ef..000000000 --- a/packages/Webkul/BulkAddToCart/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ - ['web', 'locale', 'theme', 'currency']], function () { - - Route::prefix('customer')->group(function () { - - Route::group(['middleware' => ['customer']], function () { - - Route::get('bulk-add-to-cart', 'Webkul\BulkAddToCart\Http\Controllers\BulkAddToCartController@create')->defaults('_config', [ - 'view' => 'bulkaddtocart::products.bulk-add-to-cart' - ])->name('cart.bulk-add-to-cart.create'); - - Route::post('bulk-add-to-cart', 'Webkul\BulkAddToCart\Http\Controllers\BulkAddToCartController@store')->defaults('_config', [ - 'redirect' => 'shop.checkout.cart.index' - ])->name('cart.bulk-add-to-cart.store'); - - Route::get('download-sample', 'Webkul\BulkAddToCart\Http\Controllers\BulkAddToCartController@downLoadSample')->defaults('_config', [ - 'view' => 'bulkaddtocart::products.bulk-add-to-cart' - ])->name('cart.bulk-add-to-cart.sample.download'); - }); - }); -}); \ No newline at end of file diff --git a/packages/Webkul/BulkAddToCart/src/Providers/BulkAddToCartServiceProvider.php b/packages/Webkul/BulkAddToCart/src/Providers/BulkAddToCartServiceProvider.php deleted file mode 100644 index f9f096835..000000000 --- a/packages/Webkul/BulkAddToCart/src/Providers/BulkAddToCartServiceProvider.php +++ /dev/null @@ -1,45 +0,0 @@ -loadRoutesFrom(__DIR__ . '/../Http/routes.php'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'bulkaddtocart'); - - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'bulkaddtocart'); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - } - - /** - * Register package config. - * - * @return void - */ - protected function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/menu.php', 'menu.customer' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/BulkAddToCart/src/Resources/lang/en/app.php b/packages/Webkul/BulkAddToCart/src/Resources/lang/en/app.php deleted file mode 100644 index f50ca79c5..000000000 --- a/packages/Webkul/BulkAddToCart/src/Resources/lang/en/app.php +++ /dev/null @@ -1,17 +0,0 @@ - [ - 'bulk-add-to-cart' => 'Bulk Add to Cart', - 'file' => 'File', - 'submit' => 'Submit', - 'upload-sucess' => 'Products Sucessfully added to Cart', - 'quantity-error' => 'Products have not sufficient quantity at row', - 'upload-error' => 'The file must be a file of type: xls, xlsx, csv, ods.', - 'enough-row-error' => 'file has not enough rows', - 'sku-error' => 'Invalid SKU at row', - 'allowed-type' => 'Allowed Type :', - 'file-type' => 'csv, xls, xlsx, ods.', - 'download-sample' => 'Download Sample' - ], -]; \ No newline at end of file diff --git a/packages/Webkul/BulkAddToCart/src/Resources/views/products/bulk-add-to-cart.blade.php b/packages/Webkul/BulkAddToCart/src/Resources/views/products/bulk-add-to-cart.blade.php deleted file mode 100644 index d024f5a67..000000000 --- a/packages/Webkul/BulkAddToCart/src/Resources/views/products/bulk-add-to-cart.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('shop::layouts.master') - -@section('page_title') - {{ __('bulkaddtocart::app.products.bulk-add-to-cart') }} -@endsection - -@section('content-wrapper') - -
- @include('shop::customers.account.partials.sidemenu') - -
- - - - - -
-
-@endsection \ No newline at end of file diff --git a/packages/Webkul/Custom/.gitignore b/packages/Webkul/Custom/.gitignore deleted file mode 100755 index 49e0fc6b4..000000000 --- a/packages/Webkul/Custom/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/node_modules -/package-lock.json \ No newline at end of file diff --git a/packages/Webkul/Custom/composer.json b/packages/Webkul/Custom/composer.json deleted file mode 100644 index 739e6ea92..000000000 --- a/packages/Webkul/Custom/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "bagisto/laravel-custom", - "description": "Custom package to over ride settings", - "license": "MIT", - "authors": [ - { - "name": "Webkul", - "email": "support@webkul.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "Webkul\\Custom\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\Custom\\Providers\\CustomServiceProvider" - ], - "aliases": {} - } - }, - "minimum-stability": "dev" -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Database/Migrations/2019_08_23_102253_add_url_key_column_in_sliders_table.php b/packages/Webkul/Custom/src/Database/Migrations/2019_08_23_102253_add_url_key_column_in_sliders_table.php deleted file mode 100644 index cd82fbbc6..000000000 --- a/packages/Webkul/Custom/src/Database/Migrations/2019_08_23_102253_add_url_key_column_in_sliders_table.php +++ /dev/null @@ -1,34 +0,0 @@ -string('url_type')->nullable(); - $table->string('url_key')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('sliders', function (Blueprint $table) { - $this->dropColumn('url_type'); - $this->dropColumn('url_key'); - }); - } -} diff --git a/packages/Webkul/Custom/src/Helpers/CollectURLKeys.php b/packages/Webkul/Custom/src/Helpers/CollectURLKeys.php deleted file mode 100644 index 08e2894dd..000000000 --- a/packages/Webkul/Custom/src/Helpers/CollectURLKeys.php +++ /dev/null @@ -1,72 +0,0 @@ -category = $category; - - $this->product = $product; - } - - public function getCategoryKeys() - { - $categories = $this->category->all(); - - $categoryURLKeys = collect(); - - foreach ($categories as $category) { - if (strtolower($category->slug) != 'root') { - $categoryURLKeys->push([ - 'id' => $category->id, - 'name' => $category->name, - 'url_key' => $category->slug - ]); - } - } - - return $categoryURLKeys; - } - - public function getProductKeys() - { - $products = $this->product->findWhere( - [ - 'status' => 1, - 'visible_individually' => 1, - 'channel' => core()->getCurrentChannel()->code, - 'locale' => core()->getCurrentlocale()->code - ] - ); - - $productURLKeys = collect(); - - foreach ($products as $product) { - $productURLKeys->push([ - 'id' => $product->id, - 'name' => $product->name, - 'url_key' => $product->url_key - ]); - } - - return $productURLKeys; - } -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Http/Controllers/Controller.php b/packages/Webkul/Custom/src/Http/Controllers/Controller.php deleted file mode 100755 index 52b7fdb84..000000000 --- a/packages/Webkul/Custom/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +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('sliders' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Observers/CustomerObserver.php b/packages/Webkul/Custom/src/Observers/CustomerObserver.php deleted file mode 100644 index 2cc88330a..000000000 --- a/packages/Webkul/Custom/src/Observers/CustomerObserver.php +++ /dev/null @@ -1,19 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - - $model->status = 0; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Observers/SliderObserver.php b/packages/Webkul/Custom/src/Observers/SliderObserver.php deleted file mode 100644 index 56193c827..000000000 --- a/packages/Webkul/Custom/src/Observers/SliderObserver.php +++ /dev/null @@ -1,28 +0,0 @@ -content); - - // if (! auth()->guard('super-admin')->check()) { - // $model->company_id = Company::getCurrent()->id; - // } - // } - - // public function saving(Slider $model) - - // { dd($model->content); - - // if (! auth()->guard('super-admin')->check()) { - // $model->company_id = Company::getCurrent()->id; - // } - // } -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php b/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php deleted file mode 100755 index a52571833..000000000 --- a/packages/Webkul/Custom/src/Providers/CustomServiceProvider.php +++ /dev/null @@ -1,34 +0,0 @@ -loadViewsFrom(__DIR__ . '/../Resources/views', 'custom'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'custom'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->app->concord->registerModel(\Webkul\Core\Contracts\Slider::class, \Webkul\Custom\Models\Slider::class); - - \Webkul\SAASCustomizer\Models\Customer\Customer::observe(\Webkul\Custom\Observers\CustomerObserver::class); - - \Webkul\Custom\Models\Slider::observe(\Webkul\Custom\Observers\SliderObserver::class); - - $this->publishes([ - __DIR__ . '/../Resources/views/navmenu.blade.php' => resource_path('views/vendor/shop/layouts/header/nav-menu/navmenu.blade.php'), - ]); - } - - public function register() - { - $this->app->register(EventServiceProvider::class); - } -} diff --git a/packages/Webkul/Custom/src/Providers/EventServiceProvider.php b/packages/Webkul/Custom/src/Providers/EventServiceProvider.php deleted file mode 100644 index 582a94f5c..000000000 --- a/packages/Webkul/Custom/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,25 +0,0 @@ -addTemplate('custom::customslider'); - }); - - Event::listen('bagisto.admin.settings.slider.edit.after', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('custom::customslider'); - }); - } -} \ No newline at end of file diff --git a/packages/Webkul/Custom/src/Providers/ModuleServiceProvider.php b/packages/Webkul/Custom/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index c3be049e2..000000000 --- a/packages/Webkul/Custom/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,11 +0,0 @@ -getCategoryKeys(); - - $productKeys = $link->getProductKeys(); -@endphp - -
- - - -
\ No newline at end of file diff --git a/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php b/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php deleted file mode 100644 index 200a9b60d..000000000 --- a/packages/Webkul/Custom/src/Resources/views/navmenu.blade.php +++ /dev/null @@ -1,177 +0,0 @@ -{!! view_render_event('bagisto.shop.layout.header.category.before') !!} - -getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) { - if ($category->slug) - array_push($categories, $category); -} - -$cmsPages = app('Webkul\CMS\Repositories\CMSRepository')->findWhere([ - 'channel_id' => core()->getCurrentChannel()->id, - 'locale_id' => core()->getCurrentLocale()->id -]); - -?> - - - -{!! view_render_event('bagisto.shop.layout.header.category.after') !!} - - -@push('scripts') - - - - - - - - - - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/CustomerCreditMax/src/Config/system.php b/packages/Webkul/CustomerCreditMax/src/Config/system.php deleted file mode 100644 index 2a74ae81b..000000000 --- a/packages/Webkul/CustomerCreditMax/src/Config/system.php +++ /dev/null @@ -1,23 +0,0 @@ - 'customer.settings.credit_max', - 'name' => 'customercreditmax::app.admin.system.credit-max', - 'sort' => 4, - 'fields' => [ - [ - 'name' => 'status', - 'title' => 'customercreditmax::app.admin.system.use-credit-max', - 'type' => 'boolean', - 'channel_based' => true - ], [ - 'name' => 'amount', - 'title' => 'customercreditmax::app.admin.system.max-credit-amount', - 'type' => 'text', - 'validation' => 'decimal', - 'channel_based' => true - ] - ], - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerCreditMax/src/Listeners/Cart.php b/packages/Webkul/CustomerCreditMax/src/Listeners/Cart.php deleted file mode 100644 index c408c5ec6..000000000 --- a/packages/Webkul/CustomerCreditMax/src/Listeners/Cart.php +++ /dev/null @@ -1,72 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Cart -{ - /** - * OrderRepository object - * - * @var Product - */ - protected $orderRepository; - - /** - * Create a new cart event listener instance. - * - * @param Webkul\Sales\Repositories\OrderRepository $orderRepository - * @return void - */ - public function __construct(OrderRepository $orderRepository) - { - $this->orderRepository = $orderRepository; - } - - /** - * Return current logged in customer - * - * @return Customer | Boolean - */ - public function getCurrentCustomerGuard() - { - $guard = request()->has('token') ? 'api' : 'customer'; - - return auth()->guard($guard); - } - - /** - * Checks if customer credit amount exceeded or not - * - * @param mixed $cartItem - */ - public function cartItemAddBefore($productId) - { - if (! core()->getConfigData('customer.settings.credit_max.status') || ! $this->getCurrentCustomerGuard()->check()) - return; - - $baseGrandTotal = $this->orderRepository->scopeQuery(function ($query) { - return $query - ->where('orders.customer_id', $this->getCurrentCustomerGuard()->user()->id) - ->where('orders.status', '<>', 'canceled'); - })->sum('base_grand_total'); - - $baseGrandTotalInvoiced = $this->orderRepository->scopeQuery(function ($query) { - return $query - ->where('orders.customer_id', $this->getCurrentCustomerGuard()->user()->id) - ->where('orders.status', '<>', 'canceled'); - })->sum('base_grand_total_invoiced'); - - if ( ($baseGrandTotal - $baseGrandTotalInvoiced) >= core()->getConfigData('customer.settings.credit_max.amount')) - throw new \Exception('You available credit limit has been exceeded. Please pay your pending invoice.'); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerCreditMax/src/Providers/CustomerCreditMax.php b/packages/Webkul/CustomerCreditMax/src/Providers/CustomerCreditMax.php deleted file mode 100755 index 0649134c0..000000000 --- a/packages/Webkul/CustomerCreditMax/src/Providers/CustomerCreditMax.php +++ /dev/null @@ -1,33 +0,0 @@ -loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'customercreditmax'); - - $this->app->register(EventServiceProvider::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerCreditMax/src/Providers/EventServiceProvider.php b/packages/Webkul/CustomerCreditMax/src/Providers/EventServiceProvider.php deleted file mode 100644 index 01ea52aea..000000000 --- a/packages/Webkul/CustomerCreditMax/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,19 +0,0 @@ - [ - 'system' => [ - 'credit-max' => 'Credit Max', - 'use-credit-max' => 'Use Credit Max', - 'max-credit-amount' => 'Max Credit Amount' - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/.gitignore b/packages/Webkul/CustomerDocument/.gitignore deleted file mode 100644 index 6376db975..000000000 --- a/packages/Webkul/CustomerDocument/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/package-lock.json -npm-debug.log \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/composer.json b/packages/Webkul/CustomerDocument/composer.json deleted file mode 100644 index 383539bb4..000000000 --- a/packages/Webkul/CustomerDocument/composer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "bagisto/customer-document", - "license": "MIT", - "authors": [ - { - "name": "Rahul Shukla", - "email": "rahulshukla517@webkul.com" - } - ], - "autoload": { - "psr-4": { - "Webkul\\CustomerDocument\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\CustomerDocument\\CustomerDocumentServiceProvider" - ], - "aliases": {} - } - }, - "minimum-stability": "dev" -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/package.json b/packages/Webkul/CustomerDocument/package.json deleted file mode 100644 index 2d948db6a..000000000 --- a/packages/Webkul/CustomerDocument/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "cross-env npm run watch -- --watch-poll --progress", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "axios": "^0.18", - "cross-env": "^5.1.4", - "laravel-mix": "^2.1", - "laravel-mix-merge-manifest": "^0.1.1", - "jquery": "^3.2", - "vue": "^2.1.10" - }, - "dependencies": { - "vee-validate": "2.0.0-rc.26", - "vue-flatpickr": "^2.3.0", - "vue-slider-component": "^2.7.5" - } -} diff --git a/packages/Webkul/CustomerDocument/src/Config/acl.php b/packages/Webkul/CustomerDocument/src/Config/acl.php deleted file mode 100644 index 0a3ad31a6..000000000 --- a/packages/Webkul/CustomerDocument/src/Config/acl.php +++ /dev/null @@ -1,15 +0,0 @@ - 'documents', - 'name' => 'customerdocument::app.admin.customers.documents', - 'route' => 'admin.documents.index', - 'sort' => 1 - ], [ - 'key' => 'documents.files', - 'name' => 'customerdocument::app.admin.documents.b2b-files', - 'route' => 'admin.documents.index', - 'sort' => 2 - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Config/customer-menu.php b/packages/Webkul/CustomerDocument/src/Config/customer-menu.php deleted file mode 100644 index e736b2f99..000000000 --- a/packages/Webkul/CustomerDocument/src/Config/customer-menu.php +++ /dev/null @@ -1,10 +0,0 @@ - 'account.documents', - 'name' => 'customerdocument::app.admin.customers.documents', - 'route' =>'customer.documents.index', - 'sort' => 6 - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Config/menu.php b/packages/Webkul/CustomerDocument/src/Config/menu.php deleted file mode 100644 index 9eacd453a..000000000 --- a/packages/Webkul/CustomerDocument/src/Config/menu.php +++ /dev/null @@ -1,19 +0,0 @@ - 'documents', - 'name' => 'customerdocument::app.admin.customers.documents', - 'route' => 'admin.documents.index', - 'sort' => 6, - 'icon-class' => 'document-icon', - ], [ - 'key' => 'documents.files', - 'name' => 'customerdocument::app.admin.documents.b2b-files', - 'route' => 'admin.documents.index', - 'sort' => 1, - 'icon-class' => '', - ], -]; - -?> \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Config/system.php b/packages/Webkul/CustomerDocument/src/Config/system.php deleted file mode 100644 index 858285d2b..000000000 --- a/packages/Webkul/CustomerDocument/src/Config/system.php +++ /dev/null @@ -1,21 +0,0 @@ - 'customer.settings.documents', - 'name' => 'customerdocument::app.admin.customers.documents', - 'sort' => 4, - 'fields' => [ - [ - 'name' => 'size', - 'title' => 'customerdocument::app.admin.customers.size', - 'type' => 'text', - 'validation' => 'decimal:2' - ], [ - 'name' => 'allowed_extensions', - 'title' => 'customerdocument::app.admin.customers.allowed-types', - 'type' => 'text' - ] - ], - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Contracts/CustomerDocument.php b/packages/Webkul/CustomerDocument/src/Contracts/CustomerDocument.php deleted file mode 100644 index 44ca2e742..000000000 --- a/packages/Webkul/CustomerDocument/src/Contracts/CustomerDocument.php +++ /dev/null @@ -1,7 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CustomerDocumentDataGrid extends DataGrid -{ - protected $index = 'id'; //the column that needs to be treated as index column - - protected $sortOrder = 'desc'; //asc or desc - - protected $itemsPerPage = 10; - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('customer_documents') - ->addSelect('id', 'name', 'status', 'type'); - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('admin::app.datagrid.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'name', - 'label' => trans('admin::app.datagrid.name'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'status', - 'label' => trans('admin::app.datagrid.status'), - 'type' => 'string', - 'sortable' => true, - 'searchable' => false, - 'filterable' => false, - 'wrapper' => function($value) { - if ($value->status == 1) - return 'Active'; - else - return 'Inactive'; - } - ]); - - $this->addColumn([ - 'index' => 'type', - 'label' => trans('admin::app.datagrid.type'), - 'type' => 'string', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - } - - public function prepareActions() { - $this->addAction([ - 'type' => 'Edit', - 'method' => 'GET', - 'route' => 'admin.documents.edit', - 'icon' => 'icon pencil-lg-icon' - ]); - - $this->addAction([ - 'type' => 'Delete', - 'method' => 'POST', // use GET request only for redirect purposes - 'route' => 'admin.documents.delete', - 'confirm_text' => trans('ui::app.datagrid.massaction.delete', ['resource' => 'product']), - 'icon' => 'icon trash-icon' - ]); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php b/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php deleted file mode 100644 index 2a8b61f42..000000000 --- a/packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php +++ /dev/null @@ -1,39 +0,0 @@ -increments('id'); - $table->string('name'); - $table->text('description')->nullable(); - $table->boolean('status')->default(1); - $table->string('type'); - $table->string('path'); - $table->integer('customer_id')->default(0); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('customer_documents'); - } -} diff --git a/packages/Webkul/CustomerDocument/src/Http/Controllers/Admin/DocumentController.php b/packages/Webkul/CustomerDocument/src/Http/Controllers/Admin/DocumentController.php deleted file mode 100644 index 89fd194ff..000000000 --- a/packages/Webkul/CustomerDocument/src/Http/Controllers/Admin/DocumentController.php +++ /dev/null @@ -1,280 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class DocumentController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * CustomerDocumentRepository object - * - * @var array - */ - protected $customerDocument; - - /** - * Create a new controller instance. - * - * @param \Webkul\Customer\Repositories\CustomerDocumentRepository $customerDocument - */ - public function __construct(CustomerDocumentRepository $customerDocument) - { - $this->_config = request('_config'); - - $this->customerDocument = $customerDocument; - } - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - return view($this->_config['view']); - } - - /** - * Show the form for creating a new resource. - * - * @return \Illuminate\Http\Response - */ - public function create() - { - return view($this->_config['view']); - } - - /** - * Store a newly created resource in storage. - * - * @return \Illuminate\Http\Response - */ - public function store() - { - $excludedExtensions = core()->getConfigData('customer.settings.documents.allowed_extensions'); - $maxSize = core()->getConfigData('customer.settings.documents.size'); - - if ($excludedExtensions != '') { - $valid_extension = explode(',', $excludedExtensions); - } else { - $valid_extension = []; - } - - $originalSize = filesize(request()->file('file')) / 1000; - - if ($maxSize != null) { - $maxSize = (float) $maxSize * 1000; - } else { - $maxSize = 5 * 1024; - } - - if (! ($originalSize <= $maxSize) || $originalSize == 0) { - session()->flash('error', trans('customerdocument::app.admin.customers.size-error')); - - return redirect()->back(); - } - - if (! empty($valid_extension) && (! in_array(request()->file('file')->getClientOriginalExtension(), $valid_extension))) { - session()->flash('error', trans('customerdocument::app.admin.customers.upload-error')); - - return redirect()->back(); - } else { - try { - $data = request()->all(); - - if (request()->hasFile('file')) { - $dir = 'customer'; - $document['path'] = request()->file('file')->store($dir); - } - - if (isset($data['customer_id'])) { - $document['customer_id'] = $data['customer_id']; - } else { - $document['customer_id'] = 0; - } - - if (isset($data['status'])) { - $document['status'] = $data['status']; - } else { - $document['status'] = 1; - } - - $document['name'] = $data['name']; - $document['description'] = $data['description']; - $document['type'] = $data['type']; - - $this->customerDocument->create($document); - - session()->flash('success', trans('customerdocument::app.admin.customers.upload-success')); - - if (isset($data['customer_id'])) { - return redirect()->back(); - } - - return redirect()->route($this->_config['redirect']); - } catch (\Exception $e) { - session()->flash('error', $e); - - return redirect()->back(); - } - } - } - - /** - * Show the form for editing the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function edit($id) - { - $document = $this->customerDocument->findOrFail($id); - - return view($this->_config['view'], compact('document')); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - $excludedExtensions = core()->getConfigData('customer.settings.documents.allowed_extensions'); - $maxSize = core()->getConfigData('customer.settings.documents.size'); - - if ($excludedExtensions != '') { - $valid_extension = explode(',', $excludedExtensions); - } else { - $valid_extension = []; - } - - $originalSize = filesize(request()->file('file')) / 1000; - - if ($maxSize != null) { - $maxSize = (float) $maxSize * 1000; - } else { - $maxSize = 5 * 1024; - } - - if (! ($originalSize <= $maxSize)) { - session()->flash('error', trans('customerdocument::app.admin.customers.size-error')); - - return redirect()->back(); - } - - if (! empty($valid_extension) && (! in_array(request()->file('file')->getClientOriginalExtension(), $valid_extension))) { - session()->flash('error', trans('customerdocument::app.admin.customers.upload-error')); - - return redirect()->back(); - } else { - try { - $data = request()->all(); - - $uploaDocument = $this->customerDocument->findOrfail($id); - - if (request()->hasFile('file')) { - $dir = 'customer'; - $document['path'] = request()->file('file')->store($dir); - Storage::delete($uploaDocument['path']); - } - - $document['name'] = $data['name']; - $document['description'] = $data['description']; - $document['type'] = $data['type']; - $document['status'] = $data['status']; - - $this->customerDocument->update($document, $id); - - session()->flash('success', trans('customerdocument::app.admin.customers.upload-success')); - - return redirect()->route($this->_config['redirect']); - } catch (\Exception $e) { - session()->flash('error', $e); - - return redirect()->back(); - } - } - } - - /** - * Remove the specified resource from storage.. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy($id) - { - $document = $this->customerDocument->findOrfail($id); - - try { - $this->customerDocument->delete($id); - - Storage::delete($document['path']); - - session()->flash('success', trans('admin::app.response.delete-success', ['name' => 'Document'])); - - return response()->json(['message' => true], 200); - } catch (\Exception $e) { - session()->flash('error', trans('admin::app.response.delete-failed', ['name' => 'Document'])); - } - - return response()->json(['message' => false], 400); - } - - /** - * download the file for the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function download($id) - { - $document = $this->customerDocument->findOrfail($id); - - $extension = explode('.', $document['path']); - - $name = $document['name'].'.'.end($extension); - - return Storage::download($document['path'], $name); - } - - /** - * Remove the specified resource from storage.. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function delete($id) - { - $document = $this->customerDocument->findOrfail($id); - - $this->customerDocument->delete($id); - - Storage::delete($document['path']); - - session()->flash('success', trans('customerdocument::app.admin.customers.delete-success')); - - return redirect()->back(); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Http/Controllers/Controller.php b/packages/Webkul/CustomerDocument/src/Http/Controllers/Controller.php deleted file mode 100644 index ec04aa1e9..000000000 --- a/packages/Webkul/CustomerDocument/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class DocumentController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * CustomerDocumentRepository object - * - * @var array - */ - protected $customerDocument; - - /** - * Create a new controller instance. - * - * @param \Webkul\Customer\Repositories\CustomerDocumentRepository $customerDocument - */ - public function __construct(CustomerDocumentRepository $customerDocument) - { - $this->_config = request('_config'); - - $this->customerDocument = $customerDocument; - } - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $documents = $this->customerDocument->findWhere(['customer_id' => auth()->guard('customer')->user()->id]); - - return view($this->_config['view'], compact('documents')); - } - - /** - * upload document - * - * @return \Illuminate\Http\Response - */ - public function upload() - { - $excludedExtensions = core()->getConfigData('customer.settings.documents.allowed_extensions'); - $maxSize = core()->getConfigData('customer.settings.documents.size'); - - $valid_extension = explode(',', $excludedExtensions); - - $originalSize = filesize(request()->file('file')) / 1000; - - if ($maxSize != null) { - $maxSize = (float) $maxSize * 1000; - } else { - $maxSize = 5 * 1024; - } - - if (! ($originalSize <= $maxSize) || $originalSize == 0) { - session()->flash('error', trans('customerdocument::app.admin.customers.size-error')); - - return redirect()->back(); - } - - if (! in_array(request()->file('file')->getClientOriginalExtension(), $valid_extension)) { - session()->flash('error', trans('customerdocument::app.admin.customers.upload-error')); - - return redirect()->back(); - } else { - try { - $data = request()->all(); - - if (request()->hasFile('file')) { - $dir = 'customer'; - $document['path'] = request()->file('file')->store($dir); - } - - $document['customer_id'] = $data['customer_id']; - $document['name'] = $data['name']; - $document['description'] = $data['description']; - - $this->customerDocument->create($document); - - session()->flash('success', trans('customerdocument::app.admin.customers.upload-success')); - - return redirect()->back(); - } catch (\Exception $e) { - session()->flash('error', $e); - - return redirect()->back(); - } - } - } - - /** - * download the file for the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function download($id) - { - $document = $this->customerDocument->findOrfail($id); - - return Storage::download($document['path'], $document['name']); - } - - /** - * Remove the specified resource from storage.. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function delete($id) - { - $document = $this->customerDocument->findOrfail($id); - - $this->customerDocument->delete($id); - - Storage::delete($document['path']); - - session()->flash('success', trans('customerdocument::app.admin.customers.delete-success')); - - return redirect()->back(); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Http/Controllers/Shop/DocumentController.php b/packages/Webkul/CustomerDocument/src/Http/Controllers/Shop/DocumentController.php deleted file mode 100644 index bbc912467..000000000 --- a/packages/Webkul/CustomerDocument/src/Http/Controllers/Shop/DocumentController.php +++ /dev/null @@ -1,83 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class DocumentController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * CustomerDocumentRepository object - * - * @var array - */ - protected $customerDocument; - - /** - * Create a new controller instance. - * - * @param \Webkul\Customer\Repositories\CustomerDocumentRepository $customerDocument - */ - public function __construct(CustomerDocumentRepository $customerDocument) - { - $this->_config = request('_config'); - - $this->customerDocument = $customerDocument; - } - - /** - * Display a listing of the resource. - * - * @return \Illuminate\Http\Response - */ - public function index() - { - $documents = $this->customerDocument->getDocuments(auth()->guard('customer')->user()->id); - - $productDocument = $marketingDocument = []; - - foreach($documents as $document) { - if ($document->type == 'marketing') { - $marketingDocument[] = $document; - } else if ($document->type == 'product') { - $productDocument[] = $document; - } - } - - return view($this->_config['view'], compact('productDocument', 'marketingDocument')); - } - - /** - * download the file for the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function download($id) - { - $document = $this->customerDocument->findOrfail($id); - - $extension = explode('.', $document['path']); - - $name = $document['name'].'.'.end($extension); - - return Storage::download($document['path'], $name); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Http/admin-routes.php b/packages/Webkul/CustomerDocument/src/Http/admin-routes.php deleted file mode 100644 index a52e575b4..000000000 --- a/packages/Webkul/CustomerDocument/src/Http/admin-routes.php +++ /dev/null @@ -1,41 +0,0 @@ - ['web']], function () { - - Route::prefix('admin')->group(function () { - - Route::group(['middleware' => ['admin']], function () { - - //document Management Routes - Route::get('documents', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@index')->defaults('_config',[ - 'view' => 'customerdocument::admin.documents.index' - ])->name('admin.documents.index'); - - Route::get('documents/create', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@create')->defaults('_config',[ - 'view' => 'customerdocument::admin.documents.create' - ])->name('admin.documents.create'); - - Route::post('documents/create', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@store')->defaults('_config',[ - 'redirect' => 'admin.documents.index' - ])->name('admin.documents.store'); - - Route::get('documents/edit/{id}', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@edit')->defaults('_config',[ - 'view' => 'customerdocument::admin.documents.edit' - ])->name('admin.documents.edit'); - - Route::put('documents/edit/{id}', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@update')->defaults('_config',[ - 'redirect' => 'admin.documents.index' - ])->name('admin.documents.update'); - - Route::post('documents/delete/{id}', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@destroy')->name('admin.documents.delete'); - - Route::get('download-document/{id}', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@download')->defaults('_config', [ - 'view' => 'customerdocument::admin.documents.edit' - ])->name('admin.documents.download'); - - Route::get('customer-documents/delete/{id}', 'Webkul\CustomerDocument\Http\Controllers\Admin\DocumentController@delete')->name('admin.customer.documents.delete'); - }); - - }); - -}); diff --git a/packages/Webkul/CustomerDocument/src/Http/front-routes.php b/packages/Webkul/CustomerDocument/src/Http/front-routes.php deleted file mode 100644 index 17510c44c..000000000 --- a/packages/Webkul/CustomerDocument/src/Http/front-routes.php +++ /dev/null @@ -1,21 +0,0 @@ - ['web', 'locale', 'theme', 'currency']], function () { - - Route::prefix('customer')->group(function () { - - Route::group(['middleware' => ['customer']], function () { - - Route::prefix('account')->group(function () { - - Route::get('documents', 'Webkul\CustomerDocument\Http\Controllers\Shop\DocumentController@index')->defaults('_config', [ - 'view' => 'customerdocument::shop.customers.document' - ])->name('customer.documents.index'); - - Route::get('download-document/{id}', 'Webkul\CustomerDocument\Http\Controllers\Shop\DocumentController@download')->defaults('_config', [ - 'redirect' => 'admin.customer.index' - ])->name('customer.document.download'); - }); - }); - }); -}); \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php b/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php deleted file mode 100644 index f31502d1d..000000000 --- a/packages/Webkul/CustomerDocument/src/Models/CustomerDocument.php +++ /dev/null @@ -1,13 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Providers/CustomerDocumentServiceProvider.php b/packages/Webkul/CustomerDocument/src/Providers/CustomerDocumentServiceProvider.php deleted file mode 100644 index 5a83d91ba..000000000 --- a/packages/Webkul/CustomerDocument/src/Providers/CustomerDocumentServiceProvider.php +++ /dev/null @@ -1,71 +0,0 @@ -loadRoutesFrom(__DIR__ . '/../Http/admin-routes.php'); - - $this->loadRoutesFrom(__DIR__ . '/../Http/front-routes.php'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'customerdocument'); - - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'customerdocument'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations'); - - $this->publishes([ - dirname(__DIR__) . '/Resources/assets/sass/customerdocument.scss' => base_path('public/vendor/webkul/customerdocument/assets/css/customerdocument.css') - ]); - - \Webkul\CustomerDocument\Models\CustomerDocument::observe(\Webkul\CustomerDocument\Observers\CustomerDocumentObserver::class); - - $this->app->register(ModuleServiceProvider::class); - - $this->app->register(EventServiceProvider::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - } - - /** - * Register package config. - * - * @return void - */ - protected function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/menu.php', 'menu.admin' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/customer-menu.php', 'menu.customer' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/acl.php', 'acl' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Providers/EventServiceProvider.php b/packages/Webkul/CustomerDocument/src/Providers/EventServiceProvider.php deleted file mode 100644 index f841c00e7..000000000 --- a/packages/Webkul/CustomerDocument/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,25 +0,0 @@ -addTemplate('customerdocument::style'); - }); - - Event::listen('bagisto.admin.customer.edit.after', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('customerdocument::admin.customers.upload'); - }); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Providers/ModuleServiceProvider.php b/packages/Webkul/CustomerDocument/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index 49aaf5ace..000000000 --- a/packages/Webkul/CustomerDocument/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CustomerDocumentRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\CustomerDocument\Contracts\CustomerDocument'; - } - - /** - * get All Documents - * - * @param int $id - * @return array - */ - function getDocuments($id) - { - return $this->model - ->whereIn('customer_id', [$id, 0]) - ->where('status', '1') - ->get(); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document-Active.svg b/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document-Active.svg deleted file mode 100644 index b5d872c99..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document-Active.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Icon-Document-Active - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document.svg b/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document.svg deleted file mode 100644 index 864a1c4c1..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/assets/images/Icon-Document.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Icon-Document - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/assets/sass/customerdocument.scss b/packages/Webkul/CustomerDocument/src/Resources/assets/sass/customerdocument.scss deleted file mode 100644 index 11572a59e..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/assets/sass/customerdocument.scss +++ /dev/null @@ -1,23 +0,0 @@ -.icon { - display: inline-block; - background-size: cover; -} - -%menu-properties { - width: 48px; - height: 48px; - display: inline-block; - background-size: cover; -} - -.document-icon { - @extend %menu-properties; - background-image: url("../images/Icon-Document.svg"); -} - -.active { - .document-icon { - @extend %menu-properties; - background-image: url("../images/Icon-Document-Active.svg"); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php b/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php deleted file mode 100644 index 8f54af8fc..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php +++ /dev/null @@ -1,41 +0,0 @@ -[ - 'customers' => [ - 'documents' => 'Documents', - 'add-document' => 'Add Document', - 'submit' => 'Submit', - 'file' => 'File', - 'name' => 'Name', - 'download' => 'Download', - 'upload-success' => 'Document uploaded successfully.', - 'delete-success' => 'Document deleted successfully.', - 'empty' => 'You Do not Have Any Documents.', - 'allowed-types' => 'Allowed types (ex: csv,xls,doc,docx,etc)', - 'allowed-types-one' => 'Allowed types: ', - 'file-type' => 'csv, xls, xlsx, ods, png, jpeg, zip.', - 'upload-error' => 'Invalid File Format', - 'size-error' => 'File exceeds allowed size limits', - 'description' => 'Description', - 'size' => 'Max Size Allowed (MB)', - 'any-type' => 'All file types are allowed' - ], - - 'documents' => [ - 'title' => 'Documents', - 'add-document' => 'Add Document', - 'b2b-files' => 'B2B Files', - 'save-document' => 'Save Document', - 'type' => 'Type', - 'status' => 'Status', - 'active' => 'Active', - 'in-active' => 'Inactive', - 'product' => 'Product', - 'marketing' => 'Marketing', - 'other' => 'Other', - 'add-document' => 'Add Document', - 'edit-document' => 'Edit Document' - ], - ], -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php deleted file mode 100644 index 7c4914412..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php +++ /dev/null @@ -1,127 +0,0 @@ -findWhere(['customer_id' => $customer->id, 'status' => 1]); - -?> - -@section('css') - @parent - - -@stop - - -
- - - -
- - - - - - - - - - - - - @foreach ($documents as $document) - - - - - - - - @endforeach - -
{{ __('customerdocument::app.admin.customers.name') }}{{ __('customerdocument::app.admin.documents.type') }}{{ __('customerdocument::app.admin.customers.description') }}{{ __('customerdocument::app.admin.customers.download') }}
{{ $document->name }}{{ $document->type }}{{ $document->description }} - - - - - - - -
-
- -
- - - -

{{ __('customerdocument::app.admin.customers.add-document') }}

- -
-
- @csrf() - - - -
- - - @{{ errors.first('name') }} -
- -
- - - @{{ errors.first('type') }} -
- -
- - - - - @{{ errors.first('description') }} -
- -
- - - - - @php - $allowedTypes = core()->getConfigData('customer.settings.documents.allowed_extensions'); - @endphp - - {{ __('customerdocument::app.admin.customers.allowed-types-one') }} - - - @if ($allowedTypes != null) - {{ $allowedTypes }} - @else - {{ __('customerdocument::app.admin.customers.any-type') }} - @endif - - - - @{{ errors.first('file') }} -
- - - -
-
- \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php deleted file mode 100644 index f6506cefd..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/create.blade.php +++ /dev/null @@ -1,98 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('customerdocument::app.admin.documents.add-document') }} -@stop - -@section('content') -
-
- -
-
-

- - - {{ __('customerdocument::app.admin.documents.add-document') }} -

-
- -
- -
-
- -
- -
- @csrf() - -
- - - @{{ errors.first('name') }} -
- -
- - - @{{ errors.first('type') }} -
- -
- - - @{{ errors.first('status') }} -
- -
- - - - - @{{ errors.first('description') }} -
- -
- - - - - @php - $allowedTypes = core()->getConfigData('customer.settings.documents.allowed_extensions'); - @endphp - -
- {{ __('customerdocument::app.admin.customers.allowed-types-one') }} - - - @if ($allowedTypes != null) - {{ $allowedTypes }} - @else - {{ __('customerdocument::app.admin.customers.any-type') }} - @endif - - - -
- - @{{ errors.first('file') }} -
- -
-
-
-
- -@stop \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php deleted file mode 100644 index 601523c92..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/edit.blade.php +++ /dev/null @@ -1,104 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('customerdocument::app.admin.documents.edit-document') }} -@stop - -@section('content') -
-
- -
-
-

- - - {{ __('customerdocument::app.admin.documents.edit-document') }} -

-
- -
- -
-
- -
- -
- @csrf() - - - -
- - - @{{ errors.first('name') }} -
- -
- - - @{{ errors.first('type') }} -
- -
- - - @{{ errors.first('status') }} -
- -
- - - - - @{{ errors.first('description') }} -
- -
- - - - - - - - - @php - $allowedTypes = core()->getConfigData('customer.settings.documents.allowed_extensions'); - @endphp - -
- {{ __('customerdocument::app.admin.customers.allowed-types-one') }} - - - @if ($allowedTypes != null) - {{ $allowedTypes }} - @else - {{ __('customerdocument::app.admin.customers.any-type') }} - @endif - - - -
- - @{{ errors.first('file') }} -
- -
-
-
-
- -@stop \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/index.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/index.blade.php deleted file mode 100644 index aace174b5..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/admin/documents/index.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('customerdocument::app.admin.documents.title') }} -@stop - -@section('content') - -
-
-
-

{{ __('customerdocument::app.admin.documents.title') }}

-
-
- - {{ __('customerdocument::app.admin.documents.add-document') }} - -
-
- -
- @inject('customerDocumentGrid','Webkul\CustomerDocument\DataGrids\CustomerDocumentDataGrid') - - {!! $customerDocumentGrid->render() !!} -
-
- -@stop - diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php deleted file mode 100644 index 3f33c97aa..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/shop/customers/document.blade.php +++ /dev/null @@ -1,117 +0,0 @@ -@extends('shop::layouts.master') - -@section('page_title') - {{ __('customerdocument::app.admin.customers.documents') }} -@endsection - -@section('content-wrapper') - -
- - @include('shop::customers.account.partials.sidemenu') - -
- - - -
- - - - - @if (! empty($productDocument)) - - @else - - @endif - - - - @if (! empty($marketingDocument)) - - @else - - @endif - - - - -
-
- -
- -@endsection - -@push('scripts') - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/src/Resources/views/style.blade.php b/packages/Webkul/CustomerDocument/src/Resources/views/style.blade.php deleted file mode 100644 index 0107c1567..000000000 --- a/packages/Webkul/CustomerDocument/src/Resources/views/style.blade.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/Webkul/CustomerDocument/webpack.mix.js b/packages/Webkul/CustomerDocument/webpack.mix.js deleted file mode 100644 index a194837bb..000000000 --- a/packages/Webkul/CustomerDocument/webpack.mix.js +++ /dev/null @@ -1,18 +0,0 @@ -const { mix } = require("laravel-mix"); -require("laravel-mix-merge-manifest"); - -// var publicPath = 'publishable/assets'; -var publicPath = "../../../public/vendor/webkul/customerdocument/assets"; - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - - mix.copy(__dirname + "/src/Resources/assets/images", publicPath + "/images/") - .sass(__dirname + "/src/Resources/assets/sass/customerdocument.scss", "css/customerdocument.css") - .options({ - processCssUrls: false - }); - -if (mix.inProduction()) { - mix.version(); -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171024_create_customer_group_products_table.php b/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171024_create_customer_group_products_table.php deleted file mode 100644 index 461b1eeeb..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171024_create_customer_group_products_table.php +++ /dev/null @@ -1,34 +0,0 @@ -integer('customer_group_id')->unsigned(); - $table->integer('product_id')->unsigned(); - - $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); - $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('customer_group_products'); - } -} diff --git a/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171240_create_customer_group_categories_table.php b/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171240_create_customer_group_categories_table.php deleted file mode 100644 index 6886b95ad..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Database/Migrations/2019_06_14_171240_create_customer_group_categories_table.php +++ /dev/null @@ -1,34 +0,0 @@ -integer('customer_group_id')->unsigned(); - $table->integer('category_id')->unsigned(); - - $table->foreign('customer_group_id')->references('id')->on('customer_groups')->onDelete('cascade'); - $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('customer_group_categories'); - } -} diff --git a/packages/Webkul/CustomerGroupCatalog/src/Http/Controllers/Admin/CustomerGroupController.php b/packages/Webkul/CustomerGroupCatalog/src/Http/Controllers/Admin/CustomerGroupController.php deleted file mode 100644 index eb2d12af5..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Http/Controllers/Admin/CustomerGroupController.php +++ /dev/null @@ -1,140 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CustomerGroupController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * CustomerGroupRepository object - * - * @var object - */ - protected $customerGroupRepository; - - /** - * ProductRepository object - * - * @var object - */ - protected $productRepository; - - /** - * CategoryRepository object - * - * @var object - */ - protected $categoryRepository; - - /** - * Create a new controller instance. - * - * @param \Webkul\Customer\Repositories\CustomerGroupRepository $customerGroupRepositor; - * @param \Webkul\Product\Repositories\ProductRepository $productRepository; - * @param \Webkul\Category\Repositories\CategoryRepository $categoryRepository; - * @return void - */ - public function __construct( - CustomerGroupRepository $customerGroupRepository, - ProductRepository $productRepository, - CategoryRepository $categoryRepository - ) - { - $this->_config = request('_config'); - - $this->customerGroupRepository = $customerGroupRepository; - - $this->productRepository = $productRepository; - - $this->categoryRepository = $categoryRepository; - } - - /** - * Search for catalog - * - * @return \Illuminate\Http\Response - */ - public function search() - { - $results = []; - - if (request()->input('type') == 'products') { - foreach ($this->productRepository->searchProductByAttribute(request()->input('query')) as $row) { - $results[] = [ - 'id' => $row->product_id, - 'name' => $row->name, - ]; - } - } else { - foreach ($this->categoryRepository->search(request()->input('query')) as $row) { - $results[] = [ - 'id' => $row->id, - 'name' => $row->name, - ]; - } - } - - return response()->json($results); - } - - /** - * Store a newly created resource in storage. - * - * @return \Illuminate\Http\Response - */ - public function store() - { - $this->validate(request(), [ - 'name' => 'string|required', - 'code' => 'string|unique:customer_groups,code' - ]); - - $data = request()->all(); - - $data['is_user_defined'] = 1; - - $this->customerGroupRepository->create($data); - - session()->flash('success', trans('admin::app.response.create-success', ['name' => 'Customer Group'])); - - return redirect()->route($this->_config['redirect']); - } - - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - $this->validate(request(), [ - 'name' => 'string|required', - ]); - - $this->customerGroupRepository->update(request()->all(), $id); - - session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer Group'])); - - return redirect()->route($this->_config['redirect']); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Http/admin-routes.php b/packages/Webkul/CustomerGroupCatalog/src/Http/admin-routes.php deleted file mode 100644 index 2e57739b0..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Http/admin-routes.php +++ /dev/null @@ -1,23 +0,0 @@ - ['web']], function () { - - Route::prefix('admin')->group(function () { - - Route::group(['middleware' => ['admin']], function () { - - //Seller routes - Route::get('groups/catalog/search', 'Webkul\CustomerGroupCatalog\Http\Controllers\Admin\CustomerGroupController@search')->name('admin.customer_group_catalog.search.catalog'); - - Route::post('groups/create', 'Webkul\CustomerGroupCatalog\Http\Controllers\Admin\CustomerGroupController@store')->defaults('_config',[ - 'redirect' => 'admin.groups.index' - ])->name('admin.customer_group_catalog.store'); - - Route::put('groups/edit/{id}', 'Webkul\CustomerGroupCatalog\Http\Controllers\Admin\CustomerGroupController@update')->defaults('_config',[ - 'redirect' => 'admin.groups.index' - ])->name('admin.customer_group_catalog.update'); - }); - - }); - -}); \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php b/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php deleted file mode 100644 index 08e59b146..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Models/CustomerGroup.php +++ /dev/null @@ -1,26 +0,0 @@ -belongsToMany(ProductProxy::modelClass(), 'customer_group_products'); - } - - /** - * The categories that belong to the customer group. - */ - public function categories() - { - return $this->belongsToMany(CategoryProxy::modelClass(), 'customer_group_categories'); - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Observers/CustomerGroupObserver.php b/packages/Webkul/CustomerGroupCatalog/src/Observers/CustomerGroupObserver.php deleted file mode 100644 index f182d7a12..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Observers/CustomerGroupObserver.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/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php b/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php deleted file mode 100755 index d0f682a70..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Providers/CustomerGroupCatalogServiceProvider.php +++ /dev/null @@ -1,38 +0,0 @@ -loadRoutesFrom(__DIR__ . '/../Http/admin-routes.php'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'customergroupcatalog'); - - \Webkul\CustomerGroupCatalog\Models\CustomerGroup::observe(\Webkul\CustomerGroupCatalog\Observers\CustomerGroupObserver::class); - - $this->publishes([ - __DIR__ . '/../Resources/views/admin/customers/groups' => resource_path('views/vendor/admin/customers/groups'), - __DIR__ . '/../Resources/views/shop/layouts' => resource_path('views/vendor/shop/layouts'), - ]); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php deleted file mode 100644 index dbd9e3283..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CategoryRepository.php +++ /dev/null @@ -1,129 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CategoryRepository extends BaseCategoryRepository -{ - /** - * Search Category - * - * @return Collection - */ - public function search($term) - { - return $this->getModel()->join('category_translations', function ($join) { - $join->on('categories.id', 'category_translations.category_id') - ->where('category_translations.locale', app()->getLocale()) - ->where('category_translations.name', 'like', '%' . urldecode(request()->input('query')) . '%'); - }) - ->select('categories.*') - ->groupBy('categories.id') - ->get(); - } - - /** - * get visible category tree - * - * @param integer $id - * @return mixed - */ - public function getVisibleCategoryTree($id = null) - { - static $categories = []; - - if (array_key_exists($id, $categories)) - return $categories[$id]; - - $customer = auth()->guard(request()->has('token') ? 'api' : 'customer')->user(); - - $categoryIds = []; - $showCategories = []; - $parentCategoryIds = []; - - if (! $customer) { - $categories = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->get(); - - $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->findOneByField('code', 'guest')->categories()->pluck('id')->toArray(); - - $showCategories = $this->getShowAbleCatyegory($categories, $categoryIds); - } else { - if ($customer->group) { - $categories = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->find($customer->group->id)->categories()->get(); - - $categoryIds = app('Webkul\CustomerGroupCatalog\Repositories\CustomerGroupRepository')->find($customer->group->id)->categories()->pluck('id')->toArray(); - - $showCategories = $this->getShowAbleCatyegory($categories, $categoryIds); - } - } - - if (count($showCategories)) { - $categories[$id] = $id - ? $this->model::orderBy('position', 'ASC')->where('status', 1)->whereIn('id', $categoryIds)->descendantsOf($id)->toTree() - : $this->model::orderBy('position', 'ASC')->where('status', 1)->whereIn('id', $categoryIds)->get()->toTree(); - - return $categories[$id]; - } else { - // $categories[$id] = $id - // ? $this->model::orderBy('position', 'ASC')->where('status', 1)->descendantsOf($id)->toTree() - // : $this->model::orderBy('position', 'ASC')->where('status', 1)->get()->toTree(); - - return []; - } - } - - /** - * get show able category - * - * @param integer array - * @return array - */ - public function getShowAbleCatyegory($categories, $categoryIds) { - $showCategories = []; - - foreach ($categories as $category) { - $parentCategoryIds[] = $category->id; - $parentCategory = $this->getParentCategory($category->parent_id); - - $result = array_merge($parentCategoryIds, $parentCategory); - $count = 0; - foreach($result as $cat) { - if (in_array($cat, $categoryIds)) { - $count++; - } - } - - if (count($result) == $count) { - $showCategories[] = $category->id; - } - } - - return $showCategories; - } - - /** - * get parent category - * - * @param integer $id - * @return array - */ - public function getParentCategory($parentId) { - $parentCategories = []; - $parentCategory = $this->getModel()->where('id', $parentId)->first(); - - if ($parentCategory->parent_id != null) { - $parentCategories[] = array_push($parentCategories, $parentCategory->id); - $this->getParentCategory($parentCategory->parent_id); - } - - return $parentCategories; - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CustomerGroupRepository.php b/packages/Webkul/CustomerGroupCatalog/src/Repositories/CustomerGroupRepository.php deleted file mode 100755 index 8772764e3..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Repositories/CustomerGroupRepository.php +++ /dev/null @@ -1,102 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CustomerGroupRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\CustomerGroupCatalog\Models\CustomerGroup'; - } - - /** - * @param array $data - * @return mixed - */ - public function create(array $data) - { - $group = parent::create($data); - - if (isset($data['products'])) { - $group->products()->sync($data['products']); - } else { - $group->products()->sync([]); - } - - if (isset($data['categories'])) { - $group->categories()->sync($data['categories']); - } else { - $group->categories()->sync([]); - } - - return $group; - } - - /** - * @param array $data - * @param $id - * @param string $attribute - * @return mixed - */ - public function update(array $data, $id, $attribute = "id") - { - parent::update($data, $id, $attribute); - - $group = $this->find($id); - - if (isset($data['products'])) { - $group->products()->sync($data['products']); - } else { - $group->products()->sync([]); - } - - if (isset($data['categories'])) { - $group->categories()->sync($data['categories']); - } else { - $group->categories()->sync([]); - } - - return ; - } - - /** - * @return Collection - */ - public function getProducts($group) - { - $products = []; - - foreach ($this->find($group->id)->products as $product) { - $products[] = ['id' => $product->id, 'name' => $product->name]; - } - - return $products; - } - - /** - * @return Collection - */ - public function getCategories($group) - { - $categories = []; - - foreach ($this->find($group->id)->categories as $category) { - $categories[] = ['id' => $category->id, 'name' => $category->name]; - } - - return $categories; - } -} \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/lang/en/app.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/lang/en/app.php deleted file mode 100644 index 61a55e305..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/lang/en/app.php +++ /dev/null @@ -1,14 +0,0 @@ - [ - 'groups' => [ - 'general' => 'General', - 'linked-product-categories' => 'Linked Categories', - 'categories' => 'Categories', - 'products' => 'Products', - 'search-hint' => 'Start typing name', - 'no-result-found' => 'Categories not found with same name.' - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/create.blade.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/create.blade.php deleted file mode 100644 index d8fde03ef..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/create.blade.php +++ /dev/null @@ -1,217 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('admin::app.customers.groups.add-title') }} -@stop - -@section('content') -
-
- -
-
-

- - - {{ __('admin::app.customers.groups.add-title') }} -

-
- -
- -
-
- -
-
- @csrf() - - -
- -
- - - @{{ errors.first('code') }} -
- -
- - - @{{ errors.first('name') }} -
- -
- - - -
- - - -
- - -
-
- -
-
-@stop - -@push('scripts') - - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/edit.blade.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/edit.blade.php deleted file mode 100644 index d82c390ae..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/admin/customers/groups/edit.blade.php +++ /dev/null @@ -1,234 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('admin::app.customers.groups.edit-title') }} -@stop - -@section('content') -
-
- -
-
-

- - - {{ __('admin::app.customers.groups.edit-title') }} -

-
- -
- -
-
- -
- -
- @csrf() - - - - -
- -
- - - - @{{ errors.first('code') }} -
- -
- - - @{{ errors.first('name') }} -
- -
- - - - -
- - - -
- -
-
-
-
-@stop - -@push('scripts') - - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/footer/footer.blade.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/footer/footer.blade.php deleted file mode 100755 index 2f8532d59..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/footer/footer.blade.php +++ /dev/null @@ -1,94 +0,0 @@ -
-
-
- - getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){ - if ($category->slug) - array_push($categories, $category); - } - ?> - - @if (count($categories)) -
- Categories - - -
- @endif - - {!! DbView::make(core()->getCurrentChannel())->field('footer_content')->render() !!} - -
- @if(core()->getConfigData('customer.settings.newsletter.subscription')) - {{ __('shop::app.footer.subscribe-newsletter') }} -
-
-
-
- - -
-
-
- @endif - - - - {{ __('shop::app.footer.locale') }} -
-
- -
-
- -
- {{ __('shop::app.footer.currency') }} -
-
- -
-
-
- -
-
-
-
diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/header/nav-menu/navmenu.blade.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/header/nav-menu/navmenu.blade.php deleted file mode 100755 index e65090536..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/layouts/header/nav-menu/navmenu.blade.php +++ /dev/null @@ -1,137 +0,0 @@ -{!! view_render_event('bagisto.shop.layout.header.category.before') !!} - -getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) { - if ($category->slug) - array_push($categories, $category); -} - -?> - - - -{!! view_render_event('bagisto.shop.layout.header.category.after') !!} - - -@push('scripts') - - - - - - - - - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/products/index.blade.php b/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/products/index.blade.php deleted file mode 100755 index 347e23722..000000000 --- a/packages/Webkul/CustomerGroupCatalog/src/Resources/views/shop/products/index.blade.php +++ /dev/null @@ -1,128 +0,0 @@ -@extends('shop::layouts.master') - -@section('page_title') - {{ $category->meta_title ?? $category->name }} -@stop - -@section('seo') - - -@stop - -@section('content-wrapper') - @inject ('productRepository', 'Webkul\Product\Repositories\ProductRepository') - -
- {!! view_render_event('bagisto.shop.products.index.before', ['category' => $category]) !!} - -
- - @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description'])) - @include ('shop::products.list.layered-navigation') - @endif - -
display_mode == 'description_only') style="width: 100%" @endif> -
- @if (!is_null($category->image)) - - @endif -
- - @if (in_array($category->display_mode, [null, 'description_only', 'products_and_description'])) - @if ($category->description) -
- {!! $category->description !!} -
- @endif - @endif - - @if (in_array($category->display_mode, [null, 'products_only', 'products_and_description'])) - getAll($category->id); ?> - - @if ($products->count()) - - @include ('shop::products.list.toolbar') - - @inject ('toolbarHelper', 'Webkul\Product\Helpers\Toolbar') - - @if ($toolbarHelper->getCurrentMode() == 'grid') -
- @foreach ($products as $productFlat) - - @include ('shop::products.list.card', ['product' => $productFlat]) - - @endforeach -
- @else -
- @foreach ($products as $productFlat) - - @include ('shop::products.list.card', ['product' => $productFlat]) - - @endforeach -
- @endif - - {!! view_render_event('bagisto.shop.products.index.pagination.before', ['category' => $category]) !!} - -
- {{ $products->appends(request()->input())->links() }} -
- - {!! view_render_event('bagisto.shop.products.index.pagination.after', ['category' => $category]) !!} - - @else - -
-

{{ __('shop::app.products.whoops') }}

- -

- {{ __('shop::app.products.empty') }} -

-
- - @endif - @endif -
-
- - {!! view_render_event('bagisto.shop.products.index.after', ['category' => $category]) !!} -
-@stop - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/packages/Webkul/GTM/composer.json b/packages/Webkul/GTM/composer.json deleted file mode 100644 index d887d2a7a..000000000 --- a/packages/Webkul/GTM/composer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "bagisto/laravel-gtm", - "license": "MIT", - "authors": [ - { - "name": "Prashant Singh", - "email": "prashant.singh852@webkul.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "Webkul\\GTM\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\GTM\\Providers\\GTMServiceProvider" - ], - - "aliases": { - } - } - }, - "minimum-stability": "dev" -} \ No newline at end of file diff --git a/packages/Webkul/GTM/readme.md b/packages/Webkul/GTM/readme.md deleted file mode 100644 index f93ddb239..000000000 --- a/packages/Webkul/GTM/readme.md +++ /dev/null @@ -1,52 +0,0 @@ -# Introduction: -Bagisto webfont is dynamic implementation of google web fonts. It allows you to choose fonts from google fonts directly from your own Bagisto instance. Choose as many google fonts at once and customize your font for storefront or backend or both within few steps. - -# Feature of Bagisto webfont module - -* Allows you to activate and deactivate module. -* Allow a default font in case you have chosen none. -* Separate control for using font in admin panel or storefront. - -# Requirements -* Bagisto v0.1.7 or higher. - -# Note: -Before proceeding you need google fonts API key. You can get your own key by following instructions after opening the link below: - -> https://developers.google.com/fonts/docs/developer_api - -# Installation -* Extract contents of the zip file in the root of your Bagisto instance. -* Do entry in composer.json in psr-4 object: - -``` -"Webkul\\Webfont\\": "packages/Webkul/Webfont/src" -``` - -* Do entry in config/app.php, inside providers array preferably at the end of it: - -``` -Webkul\Webfont\Providers\WebfontServiceProvider::class -``` - -* Do entry in config\concord.php file: - -``` -\Webkul\Webfont\Providers\ModuleServiceProvider::class -``` - -* Run command below: -1. composer dump-autoload -> Proceed if there are no errors encountered - -2. php artisan migrate - -3. php artisan route:cache - -* You can now find the module configuration in admin panel under Configuration > General > Design. - -* In the configuration page, there is a field for API key which will require to enter your own Google Fonts Developer API key. - -* Find the module under CMS > Webfont. - -> Congrats, you are all set to use Google fonts from your Bagisto instance. diff --git a/packages/Webkul/GTM/src/Config/system.php b/packages/Webkul/GTM/src/Config/system.php deleted file mode 100644 index 735f46c1f..000000000 --- a/packages/Webkul/GTM/src/Config/system.php +++ /dev/null @@ -1,39 +0,0 @@ - 'general.gtm', - 'name' => 'gtm::app.gtm', - 'sort' => 3, - ], [ - 'key' => 'general.gtm.values', - 'name' => 'gtm::app.values', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'status', - 'title' => 'gtm::app.gtm-status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], - - 'channel_based' => false, - 'locale_based' => false - ], [ - 'name' => 'container_id', - 'title' => 'gtm::app.container-id', - 'type' => 'text', - 'validation' => 'required', - 'channel_based' => false, - 'locale_based' => false - ] - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Providers/EventServiceProvider.php b/packages/Webkul/GTM/src/Providers/EventServiceProvider.php deleted file mode 100644 index 6d056bfea..000000000 --- a/packages/Webkul/GTM/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,26 +0,0 @@ -addTemplate('gtm::head'); - }); - - 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/Providers/GTMServiceProvider.php b/packages/Webkul/GTM/src/Providers/GTMServiceProvider.php deleted file mode 100644 index c1de00f25..000000000 --- a/packages/Webkul/GTM/src/Providers/GTMServiceProvider.php +++ /dev/null @@ -1,45 +0,0 @@ -loadViewsFrom(__DIR__ . '/../Resources/views', 'gtm'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'gtm'); - - $this->app->register(EventServiceProvider::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - } - - /** - * Registers config - */ - protected function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - } -} diff --git a/packages/Webkul/GTM/src/Resources/lang/en/app.php b/packages/Webkul/GTM/src/Resources/lang/en/app.php deleted file mode 100644 index 80084c573..000000000 --- a/packages/Webkul/GTM/src/Resources/lang/en/app.php +++ /dev/null @@ -1,8 +0,0 @@ - 'Tag Manager', - 'container-id' => 'Container ID', - 'values' => 'Settings', - 'gtm-status' => 'Status' -]; \ 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 deleted file mode 100644 index b32f35172..000000000 --- a/packages/Webkul/GTM/src/Resources/views/body.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -@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.checkout.cart.index') - @include('gtm::cart') - @endif - - @if (\Route::current()->getName() == 'shop.checkout.success') - @include('gtm::checkout-success') - @endif - -@endif \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/cart.blade.php b/packages/Webkul/GTM/src/Resources/views/cart.blade.php deleted file mode 100644 index b314c34b7..000000000 --- a/packages/Webkul/GTM/src/Resources/views/cart.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@inject ('priceHelper', 'Webkul\Product\Helpers\Price') - -@inject('productFlat', 'Webkul\Product\Repositories\ProductFlatRepository') - - \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/category.blade.php b/packages/Webkul/GTM/src/Resources/views/category.blade.php deleted file mode 100644 index 39cf462ca..000000000 --- a/packages/Webkul/GTM/src/Resources/views/category.blade.php +++ /dev/null @@ -1,92 +0,0 @@ -@inject ('priceHelper', 'Webkul\Product\Helpers\Price') - -@inject('productFlat', 'Webkul\Product\Repositories\ProductFlatRepository') - -@php - $uri = request()->getRequestUri(); - - $uri = explode('/', $uri); - - $slug = last($uri); - - $productRepository = app('Webkul\Product\Repositories\ProductRepository'); - - $categoryRepository = app('Webkul\Category\Repositories\CategoryRepository'); - - $category = $categoryRepository->findBySlugOrFail($slug); - - $products = $productRepository->getAll($category->id); - - $toolbarHelper = app('Webkul\Product\Helpers\Toolbar'); -@endphp - - \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/checkout-success.blade.php b/packages/Webkul/GTM/src/Resources/views/checkout-success.blade.php deleted file mode 100644 index a86ec76fa..000000000 --- a/packages/Webkul/GTM/src/Resources/views/checkout-success.blade.php +++ /dev/null @@ -1,13 +0,0 @@ - \ 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 deleted file mode 100644 index 2eb537f67..000000000 --- a/packages/Webkul/GTM/src/Resources/views/head.blade.php +++ /dev/null @@ -1,3 +0,0 @@ -@if (core()->getConfigData('general.gtm.values.status')) - -@endif \ No newline at end of file diff --git a/packages/Webkul/GTM/src/Resources/views/product.blade.php b/packages/Webkul/GTM/src/Resources/views/product.blade.php deleted file mode 100644 index 089b36395..000000000 --- a/packages/Webkul/GTM/src/Resources/views/product.blade.php +++ /dev/null @@ -1,60 +0,0 @@ -@inject ('priceHelper', 'Webkul\Product\Helpers\Price') - -@inject('productFlat', 'Webkul\Product\Repositories\ProductFlatRepository') - -@php - $uri = request()->getRequestUri(); - - $uri = explode('/', $uri); - - $slug = last($uri); - - $product = $productFlat->findWhere([ - 'url_key' => $slug, - 'locale' => app()->getLocale(), - 'channel' => core()->getCurrentChannel()->code - ]); -@endphp - -@if (count($product)) - @php - $product = $product->first()->product; - - $category = $product->categories->first()->slug; - @endphp - - -@endif \ No newline at end of file diff --git a/packages/Webkul/PreOrder/package.json b/packages/Webkul/PreOrder/package.json deleted file mode 100644 index f080febb5..000000000 --- a/packages/Webkul/PreOrder/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "cross-env npm run watch -- --watch-poll --progress", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "cross-env": "^5.1.4", - "laravel-mix": "^2.1", - "laravel-mix-merge-manifest": "^0.1.1", - "vue": "^2.1.10" - }, - "dependencies": { - } -} diff --git a/packages/Webkul/PreOrder/publishable/assets/css/preorder-admin.css b/packages/Webkul/PreOrder/publishable/assets/css/preorder-admin.css deleted file mode 100644 index e8dcd59ff..000000000 --- a/packages/Webkul/PreOrder/publishable/assets/css/preorder-admin.css +++ /dev/null @@ -1 +0,0 @@ -.preorder-icon{width:48px;height:48px;display:inline-block;background-size:cover;background-image:url("../images/Icon-Preorder.svg")}.active.preorder-icon,.active .preorder-icon{background-image:url("../images/Icon-Preorder-Active.svg")}.navbar-left{width:100px}.navbar-left ul.menubar li.menu-item{padding:10px 7px}.content-container{padding-left:100px}.preorder-info{padding:15px;width:auto;border:1px solid #d3d3d3;border-left:4px solid #0031f0;margin:15px 0}.pre-order-item-info .heading{font-weight:600;margin-bottom:10px;margin-top:10px;display:block}.pre-order-item-info .row{margin-bottom:5px;padding-left:10px;display:block}.pre-order-item-info .row:last-child{margin-bottom:0} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/publishable/assets/css/preorder.css b/packages/Webkul/PreOrder/publishable/assets/css/preorder.css deleted file mode 100644 index 1d6d36594..000000000 --- a/packages/Webkul/PreOrder/publishable/assets/css/preorder.css +++ /dev/null @@ -1 +0,0 @@ -.preorder-info{padding:15px;width:auto;border:1px solid #d3d3d3;border-left:4px solid #0031f0;margin:15px 0}.pre-order-item-info .heading{font-weight:600;margin-bottom:10px;margin-top:10px;display:block}.pre-order-item-info .row{margin-bottom:5px;display:block;padding:0!important;padding-left:10px!important}.pre-order-item-info .row:last-child{margin-bottom:0} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder-Active.svg b/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder-Active.svg deleted file mode 100644 index b16e78546..000000000 --- a/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder-Active.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - Icon-Preorder-Active - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder.svg b/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder.svg deleted file mode 100644 index f5666d659..000000000 --- a/packages/Webkul/PreOrder/publishable/assets/images/Icon-Preorder.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon-Preorder - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/PreOrder/publishable/assets/mix-manifest.json b/packages/Webkul/PreOrder/publishable/assets/mix-manifest.json deleted file mode 100644 index 0862fcdef..000000000 --- a/packages/Webkul/PreOrder/publishable/assets/mix-manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "/css/preorder.css": "/css/preorder.css?id=eb619a72fbd2982b4cf1", - "/css/preorder-admin.css": "/css/preorder-admin.css?id=bb404f27ac5c0a5295ce" -} diff --git a/packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php b/packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php deleted file mode 100644 index f9c60b792..000000000 --- a/packages/Webkul/PreOrder/src/Commands/Console/GenerateData.php +++ /dev/null @@ -1,202 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class GenerateData extends Command -{ - /** - * Company Repository object - */ - protected $company; - - /** - * AttributeRepository object - */ - protected $attribute; - - /** - * AttributeFamilyRepository object - */ - protected $attributeFamily; - - /** - * Holds the execution signature of the command needed - * to be executed for generating super user - */ - protected $signature = 'preorder:install'; - - /** - * Will inhibit the description related to this - * command's role - */ - protected $description = 'Generates needed data for preorder module'; - - public function __construct(CompanyRepository $company, AttributeRepository $attribute, AttributeFamilyRepository $attributeFamily) - { - parent::__construct(); - - $this->company = $company; - - $this->attribute = $attribute; - - $this->attributeFamily = $attributeFamily; - } - - /** - * Does the all sought of lifting required to be performed for - * generating a super user - */ - public function handle() - { - $email = $this->ask('Please enter email?'); - - $data = [ - 'email' => $email - ]; - - $validator = Validator::make($data, [ - 'email' => 'required|email', - ]); - - if($validator->fails()) { - $this->comment('Email invalid, please enter try again.'); - - return false; - } - - $this->comment('You entered = '. $email); - - $password = $this->ask('Please enter password?'); - - $data = [ - 'password' => $password - ]; - - $validator = Validator::make($data, [ - 'password' => 'required|string|min:6' - ]); - - if ($validator->fails()) { - $this->comment('Password invalid, make sure password is atleast 6 characters of length.'); - - return false; - } - - if (auth('super-admin')->attempt([ - 'email' => $email, - 'password' => $password - ])) { - $this->comment('Generating preorder data....'); - - $this->generate(); - - auth()->guard('super-admin')->logout(); - - $this->comment('Done'); - } else { - $this->comment('Wrong credentials entered'); - } - } - - /** - * Does the all sought of lifting required to be performed for - * generating a super user - */ - public function generate() - { - $companies = $this->company->all(['id']); - - if ($companies->count() == 0) { - $this->comment('No companies found to generate preorder data'); - - return false; - } else { - foreach ($companies as $company) { - $this->createPreOrderData($company->id); - } - - return true; - } - } - - /*** - * Creates attributes for one company at a time - */ - public function createPreOrderData($id) - { - $allowPreorderAttribute = $this->attribute->create([ - "code" => "allow_preorder", - "type" => "boolean", - "admin_name" => "Allow Preorder", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - 'company_id' => $id - ]); - - $preorderQtyAttribute = $this->attribute->create([ - "code" => "preorder_qty", - "type" => "text", - "admin_name" => "Preorder Qty", - "is_required" => 0, - "is_unique" => 0, - "validation" => "numeric", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - 'company_id' => $id - ]); - - $preorderAvailabilityAttribute = $this->attribute->create([ - "code" => "preorder_availability", - "type" => "date", - "admin_name" => "Product Availability", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - 'company_id' => $id - ]); - - $attributeFamily = $this->attributeFamily->findWhere([ - 'company_id' => $id - ])->first(); - - $generalGroup = $attributeFamily->attribute_groups()->where('name', 'General')->first(); - - $generalGroup->custom_attributes()->save($allowPreorderAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 1 ]); - - $generalGroup->custom_attributes()->save($preorderQtyAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 2 ]); - - $generalGroup->custom_attributes()->save($preorderAvailabilityAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 3 ]); - - return true; - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Config/acl.php b/packages/Webkul/PreOrder/src/Config/acl.php deleted file mode 100644 index a34dcf342..000000000 --- a/packages/Webkul/PreOrder/src/Config/acl.php +++ /dev/null @@ -1,10 +0,0 @@ - 'preorder', - 'name' => 'preorder::app.admin.layouts.preorder', - 'route' => 'admin.preorder.preorders.index', - 'sort' => 1 - ] -]; \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Config/admin-menu.php b/packages/Webkul/PreOrder/src/Config/admin-menu.php deleted file mode 100644 index 26ce0fb0e..000000000 --- a/packages/Webkul/PreOrder/src/Config/admin-menu.php +++ /dev/null @@ -1,11 +0,0 @@ - 'preorder', - 'name' => 'preorder::app.admin.layouts.preorder', - 'route' => 'admin.preorder.preorders.index', - 'sort' => 3, - 'icon-class' => 'preorder-icon', - ] -]; \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Config/purge-pool.php b/packages/Webkul/PreOrder/src/Config/purge-pool.php deleted file mode 100644 index f4626a1f2..000000000 --- a/packages/Webkul/PreOrder/src/Config/purge-pool.php +++ /dev/null @@ -1,5 +0,0 @@ - 'Webkul\PreOrder\Helpers\PreOrderDataPurger' -]; \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Config/system.php b/packages/Webkul/PreOrder/src/Config/system.php deleted file mode 100644 index e27ab3f61..000000000 --- a/packages/Webkul/PreOrder/src/Config/system.php +++ /dev/null @@ -1,54 +0,0 @@ - 'preorder', - 'name' => 'preorder::app.admin.system.preorder', - 'sort' => 1 - ], [ - 'key' => 'preorder.settings', - 'name' => 'preorder::app.admin.system.settings', - 'sort' => 1, - ], [ - 'key' => 'preorder.settings.general', - 'name' => 'preorder::app.admin.system.general', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'preorder_type', - 'title' => 'preorder::app.admin.system.preorder-type', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'preorder::app.admin.system.partial-payment', - 'value' => 'partial' - ], [ - 'title' => 'preorder::app.admin.system.complete-payment', - 'value' => 'complete' - ] - ], - 'channel_based' => true, - ], [ - 'name' => 'percent', - 'title' => 'preorder::app.admin.system.preorder-percent', - 'type' => 'text', - 'validation' => 'between:0,99', - 'info' => 'preorder::app.admin.system.preorder-percent-info', - 'depends' => 'preorder_type:partial', - 'channel_based' => true - ], [ - 'name' => 'message', - 'title' => 'preorder::app.admin.system.message', - 'type' => 'textarea', - 'locale_based' => true, - 'channel_based' => true - ] - // , [ - // 'name' => 'enable_auto_mail', - // 'title' => 'preorder::app.admin.system.enable-automatic-mail', - // 'type' => 'boolean', - // 'channel_based' => true - // ] - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php b/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php deleted file mode 100644 index 85c9f7289..000000000 --- a/packages/Webkul/PreOrder/src/Contracts/PreOrderItem.php +++ /dev/null @@ -1,7 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Order extends DataGrid -{ - protected $index = 'id'; - - protected $sortOrder = 'desc'; - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('orders') - ->leftJoin('order_address as order_address_shipping', function($leftJoin) { - $leftJoin->on('order_address_shipping.order_id', '=', 'orders.id') - ->where('order_address_shipping.address_type', 'shipping'); - }) - ->leftJoin('order_address as order_address_billing', function($leftJoin) { - $leftJoin->on('order_address_billing.order_id', '=', 'orders.id') - ->where('order_address_billing.address_type', 'billing'); - }) - ->leftJoin('pre_order_items', function($leftJoin) { - $leftJoin->on('pre_order_items.order_id', 'orders.id'); - }) - ->addSelect('orders.id', 'orders.base_sub_total', 'orders.base_grand_total', 'orders.created_at', 'channel_name', 'orders.status') - ->addSelect(DB::raw('CONCAT(order_address_billing.first_name, " ", order_address_billing.last_name) as billed_to')) - ->addSelect(DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name) as shipped_to')) - ->addSelect(DB::raw('COUNT(pre_order_items.id) as is_preorder')) - ->groupBy('orders.id'); - - $this->addFilter('billed_to', DB::raw('CONCAT(order_address_billing.first_name, " ", order_address_billing.last_name)')); - $this->addFilter('shipped_to', DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name)')); - $this->addFilter('id', 'orders.id'); - $this->addFilter('status', 'orders.status'); - $this->addFilter('created_at', 'orders.created_at'); - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('admin::app.datagrid.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'base_sub_total', - 'label' => trans('admin::app.datagrid.sub-total'), - 'type' => 'price', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'base_grand_total', - 'label' => trans('admin::app.datagrid.grand-total'), - 'type' => 'price', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'created_at', - 'label' => trans('admin::app.datagrid.order-date'), - 'type' => 'datetime', - 'sortable' => true, - 'searchable' => false, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'channel_name', - 'label' => trans('admin::app.datagrid.channel-name'), - 'type' => 'string', - 'sortable' => true, - 'searchable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'status', - 'label' => trans('admin::app.datagrid.status'), - 'type' => 'string', - 'sortable' => true, - 'searchable' => true, - 'closure' => true, - 'filterable' => false, - 'wrapper' => function ($value) { - if ($value->status == 'processing') - return 'Processing'; - else if ($value->status == 'completed') - return 'Completed'; - else if ($value->status == "canceled") - return 'Canceled'; - else if ($value->status == "closed") - return 'Closed'; - else if ($value->status == "pending") - return 'Pending'; - else if ($value->status == "pending_payment") - return 'Pending Payment'; - else if ($value->status == "fraud") - return 'Fraud'; - } - ]); - - $this->addColumn([ - 'index' => 'billed_to', - 'label' => trans('admin::app.datagrid.billed-to'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'shipped_to', - 'label' => trans('admin::app.datagrid.shipped-to'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'is_preorder', - 'label' => trans('preorder::app.datagrid.order-type'), - 'type' => 'string', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true, - 'wrapper' => function ($row) { - if ($row->is_preorder) - return trans('preorder::app.datagrid.preorder'); - else - return trans('preorder::app.datagrid.normal-order'); - } - ]); - } - - public function prepareActions() { - $this->addAction([ - 'type' => 'View', - 'method' => 'GET', - 'route' => 'admin.sales.orders.view', - 'icon' => 'icon eye-icon' - ]); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php b/packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php deleted file mode 100644 index 4d4bd8fd7..000000000 --- a/packages/Webkul/PreOrder/src/DataGrids/Admin/PreOrder.php +++ /dev/null @@ -1,181 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class PreOrder extends DataGrid -{ - protected $index = 'id'; - - protected $sortOrder = 'desc'; - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('pre_order_items') - ->leftJoin('order_items', 'pre_order_items.order_item_id', '=', 'order_items.id') - ->leftJoin('orders', 'pre_order_items.order_id', '=', 'orders.id') - ->leftJoin('order_items as payment_order_items', 'pre_order_items.payment_order_item_id', '=', 'payment_order_items.id') - ->addSelect('pre_order_items.id', 'pre_order_items.order_id', 'order_items.name as product_name', 'orders.customer_email', 'order_item_id', 'preorder_type', 'pre_order_items.status', 'base_paid_amount', 'pre_order_items.email_sent', 'base_remaining_amount', 'payment_order_items.order_id as payment_order_id') - ->addSelect(DB::raw('CONCAT(orders.customer_first_name, " ", orders.customer_last_name) as customer_name')); - - $this->addFilter('id', 'pre_order_items.id'); - $this->addFilter('status', 'pre_order_items.status'); - $this->addFilter('order_id', 'pre_order_items.order_id'); - $this->addFilter('payment_order_id', 'payment_order_items.order_id'); - $this->addFilter('product_name', 'order_items.name'); - $this->addFilter('customer_name', DB::raw('CONCAT(orders.customer_first_name, " ", orders.customer_last_name)')); - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('preorder::app.datagrid.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'order_id', - 'label' => trans('preorder::app.datagrid.order-id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true, - 'closure' => true, - 'wrapper' => function ($row) { - return '' . $row->order_id . ''; - } - ]); - - $this->addColumn([ - 'index' => 'payment_order_id', - 'label' => trans('preorder::app.datagrid.payment-order-id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => false, - 'filterable' => true, - 'closure' => true, - 'wrapper' => function ($row) { - if ($row->payment_order_id) - return '' . $row->payment_order_id . ''; - else - return 'N/A'; - } - ]); - - $this->addColumn([ - 'index' => 'product_name', - 'label' => trans('preorder::app.datagrid.product-name'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'customer_name', - 'label' => trans('preorder::app.datagrid.customer-name'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'customer_email', - 'label' => trans('preorder::app.datagrid.customer-email'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'base_paid_amount', - 'label' => trans('preorder::app.datagrid.paid-amount'), - 'type' => 'price', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'base_remaining_amount', - 'label' => trans('preorder::app.datagrid.remaining-amount'), - 'type' => 'price', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'preorder_type', - 'label' => trans('preorder::app.datagrid.preorder-type'), - 'type' => 'boolean', - 'sortable' => true, - 'searchable' => false, - 'filterable' => true, - 'wrapper' => function ($value) { - if ($value->preorder_type == 'partial') - return trans('preorder::app.datagrid.partial-payment'); - else - return trans('preorder::app.datagrid.complete-payment'); - } - ]); - - $this->addColumn([ - 'index' => 'status', - 'label' => trans('preorder::app.datagrid.status'), - 'type' => 'string', - 'sortable' => true, - 'searchable' => false, - 'filterable' => true, - 'wrapper' => function ($value) { - if ($value->status == 'pending') - return trans('preorder::app.datagrid.pending'); - if ($value->status == 'processing') - return trans('preorder::app.datagrid.processing'); - else - return trans('preorder::app.datagrid.completed'); - } - ]); - - $this->addColumn([ - 'index' => 'email_sent', - 'label' => trans('preorder::app.datagrid.email-sent'), - 'type' => 'boolean', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true, - 'wrapper' => function($value) { - if ($value->email_sent == 1) - return trans('preorder::app.datagrid.yes'); - else - return trans('preorder::app.datagrid.no'); - } - ]); - } - - public function prepareMassActions() - { - $this->addMassAction([ - 'type' => 'delete', - 'label' => 'Notify Customer', - 'action' => route('admin.preorder.preorders.notify-customer'), - 'method' => 'POST' - ]); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php b/packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php deleted file mode 100644 index b5db7610c..000000000 --- a/packages/Webkul/PreOrder/src/Database/Migrations/2019_06_04_163237_create_pre_order_items_table.php +++ /dev/null @@ -1,50 +0,0 @@ -increments('id'); - $table->string('preorder_type'); - $table->double('preorder_percent')->default(0); - $table->string('token'); - $table->string('status'); - $table->boolean('email_sent')->default(0); - $table->double('paid_amount')->nullable(); - $table->double('base_paid_amount')->nullable(); - $table->double('base_remaining_amount')->nullable(); - - $table->integer('order_id')->unsigned(); - $table->foreign('order_id')->references('id')->on('orders')->onDelete('cascade'); - - $table->integer('order_item_id')->unsigned(); - $table->foreign('order_item_id')->references('id')->on('order_items')->onDelete('cascade'); - - $table->integer('payment_order_item_id')->nullable()->unsigned(); - $table->foreign('payment_order_item_id')->references('id')->on('order_items')->onDelete('set null'); - - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('pre_order_items'); - } -} diff --git a/packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php b/packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php deleted file mode 100755 index 98f9f20b0..000000000 --- a/packages/Webkul/PreOrder/src/Database/Seeders/AttributeSeeder.php +++ /dev/null @@ -1,69 +0,0 @@ -create([ - "code" => "allow_preorder", - "type" => "boolean", - "admin_name" => "Allow Preorder", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1 - ]); - - $preorderQtyAttribute = app('Webkul\Attribute\Repositories\AttributeRepository')->create([ - "code" => "preorder_qty", - "type" => "text", - "admin_name" => "Preorder Qty", - "is_required" => 0, - "is_unique" => 0, - "validation" => "numeric", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1 - ]); - - $preorderAvailabilityAttribute = app('Webkul\Attribute\Repositories\AttributeRepository')->create([ - "code" => "preorder_availability", - "type" => "date", - "admin_name" => "Product Availability", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1 - ]); - - $attributeFamilies = app('Webkul\Attribute\Repositories\AttributeFamilyRepository')->all(); - - foreach ($attributeFamilies as $attributeFamily) { - $generalGroup = $attributeFamily->attribute_groups()->where('name', 'General')->first(); - - $generalGroup->custom_attributes()->save($allowPreorderAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 1 ]); - - $generalGroup->custom_attributes()->save($preorderQtyAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 2 ]); - - $generalGroup->custom_attributes()->save($preorderAvailabilityAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 3 ]); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php b/packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php deleted file mode 100755 index 28979a17c..000000000 --- a/packages/Webkul/PreOrder/src/Database/Seeders/DatabaseSeeder.php +++ /dev/null @@ -1,18 +0,0 @@ -call(AttributeSeeder::class); - } -} diff --git a/packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php b/packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php deleted file mode 100644 index 541cfcf2c..000000000 --- a/packages/Webkul/PreOrder/src/Helpers/PreOrderDataPurger.php +++ /dev/null @@ -1,101 +0,0 @@ -attribute = $attribute; - $this->attributeFamily = $attributeFamily; - } - - /*** - * Creates attributes for one company at a time - */ - public function createPreOrderData($id) - { - $allowPreorderAttribute = $this->attribute->create([ - "code" => "allow_preorder", - "type" => "boolean", - "admin_name" => "Allow Preorder", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - "use_in_flat" => 1, - 'company_id' => $id - ]); - - $preorderQtyAttribute = $this->attribute->create([ - "code" => "preorder_qty", - "type" => "text", - "admin_name" => "Preorder Qty", - "is_required" => 0, - "is_unique" => 0, - "validation" => "numeric", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - "use_in_flat" => 1, - 'company_id' => $id - ]); - - $preorderAvailabilityAttribute = $this->attribute->create([ - "code" => "preorder_availability", - "type" => "date", - "admin_name" => "Product Availability", - "is_required" => 0, - "is_unique" => 0, - "validation" => "", - "value_per_locale" => 0, - "value_per_channel" => 1, - "is_filterable" => 0, - "is_configurable" => 0, - "is_visible_on_front" => 0, - "is_user_defined" => 1, - "use_in_flat" => 1, - 'company_id' => $id - ]); - - $attributeFamilies = $this->attributeFamily->all(); - - foreach ($attributeFamilies as $attributeFamily) { - $generalGroup = $attributeFamily->attribute_groups()->where(['name' => 'General', 'company_id' => $id])->first(); - - $generalGroup->custom_attributes()->save($allowPreorderAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 1 ]); - - $generalGroup->custom_attributes()->save($preorderQtyAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 2 ]); - - $generalGroup->custom_attributes()->save($preorderAvailabilityAttribute, [ 'position' => $generalGroup->custom_attributes()->count() + 3 ]); - } - - return true; - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Helpers/Product.php b/packages/Webkul/PreOrder/src/Helpers/Product.php deleted file mode 100644 index b66efc1ab..000000000 --- a/packages/Webkul/PreOrder/src/Helpers/Product.php +++ /dev/null @@ -1,60 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Product -{ - /** - * ProductRepository object - * - * @var Product - */ - protected $productRepository; - - /** - * Create a new customer event listener instance. - * - * @param Webkul\Product\Repositories\ProductRepository $productRepository - * @return void - */ - public function __construct( - ProductRepository $productRepository - ) - { - $this->productRepository = $productRepository; - } - - /** - * Return preorder variants - * - * @param Product $product - */ - public function getPreOrderVariants($product) - { - $config = []; - - foreach ($product->variants as $variant) { - if ($variant->totalQuantity() < 1 && $variant->allow_preorder) { - $config[$variant->product_id] = [ - 'preorder_qty' => $variant->preorder_qty, - 'availability_text' => $variant->preorder_availability && Carbon::parse($variant->preorder_availability) > Carbon::now() - ? trans('preorder::app.shop.products.available-on', [ - 'date' => core()->formatDate(Carbon::parse($variant->preorder_availability), 'F d, Y') - ]) - : null - ]; - } - } - - return $config; - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php b/packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php deleted file mode 100644 index ce821e1b4..000000000 --- a/packages/Webkul/PreOrder/src/Http/Controllers/Admin/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class PreOrderController extends Controller -{ - /** - * Contains route related configuration - * - * @var array - */ - protected $_config; - - /** - * PreOrderItemRepository object - * - * @var array - */ - protected $preOrderItemRepository; - - /** - * Create a new controller instance. - * - * @param \Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository - * @return void - */ - public function __construct( - PreOrderItemRepository $preOrderItemRepository - ) - { - $this->_config = request('_config'); - - $this->preOrderItemRepository = $preOrderItemRepository; - } - - /** - * Method to populate the seller order page which will be populated. - * - * @return Mixed - */ - public function index($url) - { - return view($this->_config['view']); - } - - /** - * Mass notify customers for in stock preorder products - * - * @return response - */ - public function notifyCustomer() - { - $data = request()->all(); - - if (! isset($data['massaction-type'])) { - return redirect()->back(); - } - - $preOrderItemIds = explode(',', $data['indexes']); - - foreach ($preOrderItemIds as $preOrderItemId) { - $preOrderItem = $this->preOrderItemRepository->find($preOrderItemId); - - if (! $this->preOrderItemRepository->canBeComplete($preOrderItem->order_item)) - continue; - - try { - Mail::send(new ProductInStockNotification($preOrderItem)); - - $this->preOrderItemRepository->update([ - 'email_sent' => 1 - ], $preOrderItem->id); - } catch (\Exception $e) { - - } - } - - session()->flash('success', trans('preorder::app.admin.preorders.mass-notify-success')); - - return redirect()->route($this->_config['redirect']); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php b/packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php deleted file mode 100644 index ef40c3d6e..000000000 --- a/packages/Webkul/PreOrder/src/Http/Controllers/Shop/Controller.php +++ /dev/null @@ -1,12 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class PreOrderController extends Controller -{ - /** - * ProductRepository object - * - * @var array - */ - protected $productRepository; - - /** - * OrderItemRepository object - * - * @var array - */ - protected $orderItemRepository; - - /** - * PreOrderItemRepository object - * - * @var array - */ - protected $preOrderItemRepository; - - /** - * Create a new controller instance. - * - * @param Webkul\Product\Repositories\ProductRepository $productRepository - * @param Webkul\Sales\Repositories\OrderItemRepository $orderItemRepository - * @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository - * @return void - */ - public function __construct( - ProductRepository $productRepository, - OrderItemRepository $orderItemRepository, - PreOrderItemRepository $preOrderItemRepository - ) - { - $this->productRepository = $productRepository; - - $this->orderItemRepository = $orderItemRepository; - - $this->preOrderItemRepository = $preOrderItemRepository; - } - - /** - * @return \Illuminate\Http\Response - */ - public function complete() - { - try { - if (request()->route('token')) - $preOrderItem = $this->preOrderItemRepository->findOneByField('token', request()->route('token')); - else - $preOrderItem = $this->preOrderItemRepository->find(request()->input('id')); - - if (! $preOrderItem) - return abort(404); - - if ($preOrderItem->payment_order_item_id != null) - throw new \Exception('Payment has been done for this order'); - - $orderItem = $this->orderItemRepository->findOrFail($preOrderItem->order_item_id); - - if (! $this->preOrderItemRepository->canBeComplete($orderItem)) { - session()->flash('error', trans('preorder::app.shop.preorders.complete-preorder-error')); - - if (request()->route('token')) - return redirect()->route('shop.home.index'); - else - return back(); - } - - $data = []; - - if ($orderItem->type == 'configurable') { - $data = [ - 'pre_order_payment' => true, - 'order_item_id' => $preOrderItem->order_item_id, - 'product' => $orderItem->product_id, - 'quantity' => $orderItem->qty_ordered, - 'is_configurable' => true, - 'selected_configurable_option' => $orderItem->child->product_id - ]; - - foreach ($this->productRepository->getSuperAttributes($orderItem->product) as $attribute) { - $data['super_attribute'][$attribute['id']] = $orderItem->child->product->{$attribute['code']}; - } - } else { - $data = [ - 'pre_order_payment' => true, - 'order_item_id' => $preOrderItem->order_item_id, - 'product' => $orderItem->product_id, - 'quantity' => $orderItem->qty_ordered, - 'is_configurable' => false, - ]; - } - - request()->request->add($data); - - Event::fire('checkout.cart.add.before', $data['product']); - - $result = Cart::add($data['product'], $data); - - Event::fire('checkout.cart.add.after', $result); - - return redirect()->route('shop.checkout.onepage.index'); - } catch(\Exception $e) { - session()->flash('error', trans($e->getMessage())); - - return redirect()->back(); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Http/admin-routes.php b/packages/Webkul/PreOrder/src/Http/admin-routes.php deleted file mode 100644 index cc24c5b88..000000000 --- a/packages/Webkul/PreOrder/src/Http/admin-routes.php +++ /dev/null @@ -1,22 +0,0 @@ - ['web']], function () { - - Route::prefix('admin')->group(function () { - - Route::group(['middleware' => ['admin']], function () { - - //Seller routes - Route::get('preorders', 'Webkul\PreOrder\Http\Controllers\Admin\PreOrderController@index')->defaults('_config', [ - 'view' => 'preorder::admin.preorders.index' - ])->name('admin.preorder.preorders.index'); - - //product massdelete - Route::post('preorders/notify-customer', 'Webkul\PreOrder\Http\Controllers\Admin\PreOrderController@notifyCustomer')->defaults('_config', [ - 'redirect' => 'admin.preorder.preorders.index' - ])->name('admin.preorder.preorders.notify-customer'); - }); - - }); - -}); \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Http/front-routes.php b/packages/Webkul/PreOrder/src/Http/front-routes.php deleted file mode 100644 index 2e45e35b3..000000000 --- a/packages/Webkul/PreOrder/src/Http/front-routes.php +++ /dev/null @@ -1,5 +0,0 @@ - ['web', 'theme', 'locale', 'currency']], function () { - Route::get('/complete-preorder/{token}', 'Webkul\PreOrder\Http\Controllers\Shop\PreOrderController@complete')->name('preorder.shop.preorder.complete'); -}); \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Listeners/Cart.php b/packages/Webkul/PreOrder/src/Listeners/Cart.php deleted file mode 100644 index 30f685596..000000000 --- a/packages/Webkul/PreOrder/src/Listeners/Cart.php +++ /dev/null @@ -1,205 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Cart -{ - /** - * PriceHelper object - * - * @var Object - */ - protected $priceHelper; - - /** - * ProductRepository object - * - * @var Product - */ - protected $productRepository; - - /** - * PreOrderItemRepository object - * - * @var Product - */ - protected $preOrderItemRepository; - - /** - * Create a new customer event listener instance. - * - * @param Webkul\Product\Helpers\Price $priceHelper - * @param Webkul\Product\Repositories\ProductRepository $productRepository - * @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository - * @return void - */ - public function __construct( - PriceHelper $priceHelper, - ProductRepository $productRepository, - PreOrderItemRepository $preOrderItemRepository - ) - { - $this->priceHelper = $priceHelper; - - $this->productRepository = $productRepository; - - $this->preOrderItemRepository = $preOrderItemRepository; - } - - /** - * Before product added to the cart - * - * @param mixed $cartItem - */ - public function cartItemAddBefore($productId) - { - $data = request()->all(); - - if (! isset($data['pre_order_payment'])) { - if ($this->haveCompletePreorderProduct($productId)) - throw new \Exception('Product can not be added with preorder payment.'); - - $product = $this->productRepository->find($productId); - - if ($product->type == 'configurable') { - if (isset($data['selected_configurable_option'])) { - $product = $this->productRepository->find($data['selected_configurable_option']); - } else { - return; - } - } - - if ($product->totalQuantity() > 0 || ! $product->allow_preorder) - return; - - if (! isset($data['quantity'])) - $data['quantity'] = 1; - - if ($cart = CartFacade::getCart()) { - $cartItem = $cart->items()->where('product_id', $productId)->first(); - - if ($cartItem) { - $quantity = $cartItem->quantity + $data['quantity']; - } else { - $quantity = $data['quantity']; - } - } else { - $quantity = $data['quantity']; - } - - if ($product->preorder_qty && $product->preorder_qty < $quantity) - throw new \Exception('Requested quantity not available for preorder.'); - } else { - if ($cart = CartFacade::getCart()) { - $cartItem = $cart->items()->where('product_id', $productId)->first(); - - if ($cartItem) { - throw new \Exception('Invalid quantity for complete preorder payment.'); - } else { - throw new \Exception('Preorder payment can not be added with other product.'); - } - } - } - } - - /** - * @param integer $productId - */ - public function haveCompletePreorderProduct($productId) - { - if (! $cart = CartFacade::getCart()) - return false; - - foreach ($cart->items()->get() as $item) { - if (isset($item->additional['pre_order_payment'])) - return true; - } - - return false; - } - - /** - * Before product update to the cart - * - * @param CartItem $item - */ - public function cartItemUpdateBefore($item) - { - if (isset($item->additional['pre_order_payment'])) - throw new \Exception('Preoder payment qunatity can not be updated.'); - - $quantities = request()->get('qty'); - - $product = $item->type == 'configurable' ? $item->child->product_flat : $item->product_flat; - - if ($product->totalQuantity() > 0 || ! $product->allow_preorder) - return; - - if ($product->preorder_qty && $product->preorder_qty < $quantities[$item->id]) - throw new \Exception('Requested quantity not available for preorder.'); - } - - /** - * After product added to the cart - * - * @param mixed $cartItem - */ - public function cartItemAddAfter($cartItem) - { - if (! request()->input('pre_order_payment')) { - $product = $this->productRepository->find($cartItem->product_id); - - if ($product->type == 'configurable') { - if (isset($cartItem['additional']['selected_configurable_option'])) { - $product = $this->productRepository->find($cartItem['additional']['selected_configurable_option']); - } else { - return; - } - } - - if ($product->totalQuantity() > 0 || ! $product->allow_preorder) - return; - - if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') { - if (is_null(core()->getConfigData('preorder.settings.general.percent'))) { - $preOrderPercentage = 0; - } else { - $preOrderPercentage = core()->getConfigData('preorder.settings.general.percent'); - } - } else { - $preOrderPercentage = 100; - } - - $productPrice = $cartItem->type == 'configurable' - ? ($this->priceHelper->getMinimalPrice($cartItem->child->product_flat) * $preOrderPercentage) / 100 - : ($this->priceHelper->getMinimalPrice($cartItem->product_flat) * $preOrderPercentage) / 100; - - $cartItem->price = core()->convertPrice($productPrice); - $cartItem->base_price = $productPrice; - $cartItem->custom_price = $productPrice; - - $cartItem->save(); - } else { - $preOrderItem = $this->preOrderItemRepository->findOneByField('order_item_id', request()->input('order_item_id')); - - $productPrice = $preOrderItem->base_remaining_amount / $preOrderItem->order_item->qty_ordered; - - $cartItem->price = core()->convertPrice($productPrice); - $cartItem->base_price = $productPrice; - $cartItem->custom_price = $productPrice; - - $cartItem->save(); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Listeners/Invoice.php b/packages/Webkul/PreOrder/src/Listeners/Invoice.php deleted file mode 100644 index ea542fc7c..000000000 --- a/packages/Webkul/PreOrder/src/Listeners/Invoice.php +++ /dev/null @@ -1,76 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Invoice -{ - /** - * PreOrderItemRepository object - * - * @var Object - */ - protected $preOrderItemRepository; - - /** - * OrderRepository object - * - * @var Object - */ - protected $orderRepository; - - /** - * Create a new Order event listener instance. - * - * @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository - * @param Webkul\Sales\Repositories\OrderRepository $orderRepository - * @return void - */ - public function __construct(PreOrderItemRepository $preOrderItemRepository, OrderRepository $orderRepository) - { - $this->preOrderItemRepository = $preOrderItemRepository; - - $this->orderRepository = $orderRepository; - } - - /** - * After sales invoice creation, creater marketplace invoice - * - * @param mixed $invoice - */ - public function afterInvoice($invoice) - { - foreach ($invoice->items()->get() as $item) { - if (isset($item->additional['pre_order_payment'])) { - $preOrderItem = $this->preOrderItemRepository->findOneByField('order_item_id', $item->additional['order_item_id']); - - $this->preOrderItemRepository->update([ - 'status' => 'completed', - ], $preOrderItem->id); - - if (! $item->order_item->qty_to_invoice) { - $this->orderRepository->update([ - 'status' => 'completed', - ], $item->order_item->order_id); - } - } else { - $preOrderItem = $this->preOrderItemRepository->findOneByField('order_item_id', $item->order_item_id); - - if (! $preOrderItem || $preOrderItem->base_remaining_amount) - return; - - $this->preOrderItemRepository->update([ - 'status' => 'completed', - ], $preOrderItem->id); - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Listeners/Order.php b/packages/Webkul/PreOrder/src/Listeners/Order.php deleted file mode 100644 index 58b7f5fa2..000000000 --- a/packages/Webkul/PreOrder/src/Listeners/Order.php +++ /dev/null @@ -1,106 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class Order -{ - /** - * PriceHelper object - * - * @var Object - */ - protected $priceHelper; - - /** - * PreOrderItemRepository object - * - * @var Object - */ - protected $preOrderItemRepository; - - /** - * Create a new Order event listener instance. - * - * @param Webkul\Product\Helpers\Price $priceHelper - * @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository - * @return void - */ - public function __construct( - PriceHelper $priceHelper, - PreOrderItemRepository $preOrderItemRepository - ) - { - $this->priceHelper = $priceHelper; - - $this->preOrderItemRepository = $preOrderItemRepository; - } - - /** - * After sales order creation, add entry to pre_order_items order table - * - * @param mixed $order - */ - public function afterPlaceOrder($order) - { - foreach ($order->items()->get() as $item) { - if (isset($item->additional['pre_order_payment'])) { - $preOrderItem = $this->preOrderItemRepository->findOneByField('order_item_id', $item->additional['order_item_id']); - - $this->preOrderItemRepository->update([ - 'status' => 'processing', - 'payment_order_item_id' => $item->id - ], $preOrderItem->id); - } else { - if ($item->type == 'configurable') { - if ($item->child->product->totalQuantity() > -1 || ! $item->child->product->allow_preorder) { - continue; - } - } else { - if ($item->product->totalQuantity() > -1 || ! $item->product->allow_preorder) { - continue; - } - } - - if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') { - $preOrderType = 'partial'; - - if (is_null(core()->getConfigData('preorder.settings.general.percent'))) { - $preOrderPercentage = 0; - } else { - $preOrderPercentage = core()->getConfigData('preorder.settings.general.percent'); - } - } else { - $preOrderType = 'complete'; - - $preOrderPercentage = 100; - } - - $productPrice = $item->type == 'configurable' - ? $this->priceHelper->getMinimalPrice($item->child->product) - : $this->priceHelper->getMinimalPrice($item->product); - - $this->preOrderItemRepository->create([ - 'preorder_type' => $preOrderType, - 'preorder_percent' => $preOrderPercentage, - 'status' => 'pending', - 'paid_amount' => $item->total, - 'base_paid_amount' => $item->base_total, - 'base_remaining_amount' => ($productPrice * $item->qty_ordered) - $item->base_total, - 'order_id' => $order->id, - 'order_item_id' => $item->id, - 'token' => str_random(32) - ]); - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php b/packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php deleted file mode 100644 index d9f9bc1f3..000000000 --- a/packages/Webkul/PreOrder/src/Mail/ProductInStockNotification.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class ProductInStockNotification extends Mailable -{ - use Queueable, SerializesModels; - - /** - * The order item instance. - * - * @var Order - */ - public $item; - - /** - * Create a new message instance. - * - * @return void - */ - public function __construct($item) - { - $this->item = $item; - } - - /** - * Build the message. - * - * @return $this - */ - public function build() - { - return $this->to($this->item->order->customer_email, $this->item->order->customer_full_name) - ->subject(trans('preorder::app.mail.in-stock.subject')) - ->view('preorder::emails.in-stock'); - } -} diff --git a/packages/Webkul/PreOrder/src/Models/PreOrderItem.php b/packages/Webkul/PreOrder/src/Models/PreOrderItem.php deleted file mode 100644 index 6f5419e99..000000000 --- a/packages/Webkul/PreOrder/src/Models/PreOrderItem.php +++ /dev/null @@ -1,71 +0,0 @@ - 'Pending', - 'processing' => 'Processing', - 'completed' => 'Completed' - ]; - - protected $typeLabel = [ - 'partial' => 'Partial Payment', - 'complete' => 'Complete Payment' - ]; - - /** - * Get the order record associated with the pre order item. - */ - public function order() - { - return $this->belongsTo(OrderProxy::modelClass()); - } - - /** - * Get the order item record associated with the pre order item. - */ - public function order_item() - { - return $this->belongsTo(OrderItemProxy::modelClass()); - } - - /** - * Get the order item record associated with the pre order item. - */ - public function payment_order_item() - { - return $this->belongsTo(OrderItemProxy::modelClass(), 'payment_order_item_id'); - } - - /** - * Returns the status label from status code - */ - public function getStatusLabelAttribute() - { - return $this->statusLabel[$this->status]; - } - - /** - * Returns the type label from status code - */ - public function getTypeLabelAttribute() - { - return $this->typeLabel[$this->preorder_type]; - } -} diff --git a/packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php b/packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php deleted file mode 100644 index 60d08d8d0..000000000 --- a/packages/Webkul/PreOrder/src/Models/PreOrderItemProxy.php +++ /dev/null @@ -1,10 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php b/packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php deleted file mode 100644 index e9cadc202..000000000 --- a/packages/Webkul/PreOrder/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,35 +0,0 @@ -addTemplate('preorder::admin.layouts.style'); - }); - - Event::listen('bagisto.shop.products.view.short_description.before', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('preorder::shop.products.preorder-info'); - }); - - Event::listen('checkout.cart.add.before', 'Webkul\PreOrder\Listeners\Cart@cartItemAddBefore'); - - Event::listen('checkout.cart.update.before', 'Webkul\PreOrder\Listeners\Cart@cartItemUpdateBefore'); - - Event::listen('checkout.cart.add.after', 'Webkul\PreOrder\Listeners\Cart@cartItemAddAfter'); - - Event::listen('checkout.order.save.after', 'Webkul\PreOrder\Listeners\Order@afterPlaceOrder'); - - Event::listen('sales.invoice.save.after', 'Webkul\PreOrder\Listeners\Invoice@afterInvoice'); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php b/packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index f54ee3633..000000000 --- a/packages/Webkul/PreOrder/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,12 +0,0 @@ -app->register(EventServiceProvider::class); - - $this->loadRoutesFrom(__DIR__ . '/../Http/admin-routes.php'); - - $this->loadRoutesFrom(__DIR__ . '/../Http/front-routes.php'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'preorder'); - - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'preorder'); - - $this->publishes([ - __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/preorder/assets'), - ], 'public'); - - $this->publishes([ - __DIR__ . '/../Resources/views/shop/products/add-buttons.blade.php' => resource_path('views/vendor/shop/products/add-buttons.blade.php'), - __DIR__ . '/../Resources/views/shop/products/view/product-add.blade.php' => resource_path('views/vendor/shop/products/view/product-add.blade.php'), - - __DIR__ . '/../Resources/views/admin/sales/orders' => resource_path('views/vendor/admin/sales/orders'), - __DIR__ . '/../Resources/views/shop/customers/account/orders' => resource_path('views/vendor/shop/customers/account/orders'), - ]); - - //model observer for all the core models of Bagisto - $this->bootModelObservers(); - } - - /** - * Model observer for preorder model - */ - public function bootModelObservers() - { - \Webkul\PreOrder\Models\PreOrderItem::observe(\Webkul\PreOrder\Observers\PreOrderItemObserver::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - - $this->registerFacades(); - - $this->commands($this->commands); - } - - /** - * Register Bouncer as a singleton. - * - * @return void - */ - protected function registerFacades() - { - $loader = AliasLoader::getInstance(); - $loader->alias('shipping', ShippingFacade::class); - - $this->app->singleton('shipping', function () { - return new Shipping(); - }); - } - - /** - * Register package config. - * - * @return void - */ - public function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/admin-menu.php', 'menu.admin' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/purge-pool.php', 'purge-pool' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/acl.php', 'acl' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php b/packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php deleted file mode 100755 index 82366393e..000000000 --- a/packages/Webkul/PreOrder/src/Repositories/PreOrderItemRepository.php +++ /dev/null @@ -1,92 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class PreOrderItemRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - - function model() - { - return 'Webkul\PreOrder\Contracts\PreOrderItem'; - } - - /** - * @param integer $orderId - * @return boolean - */ - public function isPreOrderPaymentOrder($orderId) - { - return $this->resetScope()->scopeQuery(function ($query) use ($orderId) { - return $query->leftJoin('order_items', 'pre_order_items.payment_order_item_id', '=', 'order_items.id') - ->leftJoin('orders', 'order_items.order_id', '=', 'orders.id') - ->where('orders.id', $orderId); - })->count(); - } - - /** - * @param integer $orderId - * @return boolean - */ - public function havePreOrderItems($orderId) - { - return $this->resetScope()->scopeQuery(function ($query) use ($orderId) { - return $query->where('pre_order_items.order_id', $orderId); - })->count(); - } - - /** - * @param OrderItem $orderItem - * @return boolean - */ - public function canBeComplete($orderItem) - { - $this->resetScope(); - - $preOrderItem = $this->findOneByField('order_item_id', $orderItem->id); - - if (! $preOrderItem || $preOrderItem->status == 'completed') - return false; - - if ($orderItem->type == 'configurable') { - $isInStock = $orderItem->child->product && $this->getProductTotalQuantity($orderItem->child->product) >= $orderItem->qty_ordered ? true : false; - } else { - $isInStock = $orderItem->product && $this->getProductTotalQuantity($orderItem->product) >= $orderItem->qty_ordered ? true : false; - } - - return $isInStock && $orderItem->qty_invoiced == $orderItem->qty_ordered ? true : false; - } - - /** - * @return integer - */ - public function getProductTotalQuantity($product) - { - $total = 0; - - $channelInventorySourceIds = core()->getCurrentChannel() - ->inventory_sources() - ->where('status', 1) - ->pluck('id'); - - foreach ($product->inventories as $inventory) { - if (is_numeric($index = $channelInventorySourceIds->search($inventory->inventory_source_id))) { - $total += $inventory->qty; - } - } - - return $total; - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg b/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg deleted file mode 100644 index b16e78546..000000000 --- a/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder-Active.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - Icon-Preorder-Active - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder.svg b/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder.svg deleted file mode 100644 index f5666d659..000000000 --- a/packages/Webkul/PreOrder/src/Resources/assets/images/Icon-Preorder.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - Icon-Preorder - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/assets/sass/admin.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/admin.scss deleted file mode 100644 index a2dd9da32..000000000 --- a/packages/Webkul/PreOrder/src/Resources/assets/sass/admin.scss +++ /dev/null @@ -1,40 +0,0 @@ -@import "icons"; - -.navbar-left { - width: 100px; - - ul.menubar li.menu-item { - padding: 10px 7px; - } -} - -.content-container { - padding-left: 100px; -} - -.preorder-info { - padding: 15px; - width: auto; - border: 1px solid #d3d3d3; - border-left: 4px solid #0031f0; - margin: 15px 0; -} - -.pre-order-item-info { - .heading { - font-weight: 600; - margin-bottom: 10px; - margin-top: 10px; - display: block; - } - - .row { - margin-bottom: 5px; - padding-left: 10px; - display: block; - - &:last-child { - margin-bottom: 0; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/assets/sass/app.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/app.scss deleted file mode 100644 index 1dc63dd13..000000000 --- a/packages/Webkul/PreOrder/src/Resources/assets/sass/app.scss +++ /dev/null @@ -1,27 +0,0 @@ -.preorder-info { - padding: 15px; - width: auto; - border: 1px solid #d3d3d3; - border-left: 4px solid #0031f0; - margin: 15px 0; -} - -.pre-order-item-info { - .heading { - font-weight: 600; - margin-bottom: 10px; - margin-top: 10px; - display: block; - } - - .row { - margin-bottom: 5px; - display: block; - padding: 0 !important; - padding-left: 10px !important; - - &:last-child { - margin-bottom: 0; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/assets/sass/icons.scss b/packages/Webkul/PreOrder/src/Resources/assets/sass/icons.scss deleted file mode 100644 index 16b0ab5b0..000000000 --- a/packages/Webkul/PreOrder/src/Resources/assets/sass/icons.scss +++ /dev/null @@ -1,17 +0,0 @@ -.preorder-icon { - width: 48px; - height: 48px; - display: inline-block; - background-size: cover; - background-image: url("../images/Icon-Preorder.svg"); -} - -.active { - .preorder-icon { - background-image: url("../images/Icon-Preorder-Active.svg"); - } - - &.preorder-icon { - background-image: url("../images/Icon-Preorder-Active.svg"); - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/lang/en/app.php b/packages/Webkul/PreOrder/src/Resources/lang/en/app.php deleted file mode 100644 index fd2730703..000000000 --- a/packages/Webkul/PreOrder/src/Resources/lang/en/app.php +++ /dev/null @@ -1,93 +0,0 @@ - [ - 'products' => [ - 'percent-to-pay' => 'Pay :percent% as Preorder.', - 'nothing-to-pay' => 'Nothing to pay for Preorder.', - 'available-on' => 'Available On: :date', - 'preorder' => 'Preorder', - 'complete-preorder-error' => 'Preorder payment not be completed.' - ], - - 'sales' => [ - 'orders' => [ - 'preorder-summary' => 'This order contains preorder items', - 'preorder-information' => 'Preorder Information', - 'preorder-payment-information' => 'Preorder Payment Information', - 'type' => 'Type : ', - 'status' => 'Status : ', - 'payment-order' => 'Payment Order', - 'reference-order' => 'Reference Order' - ] - ], - ], - - 'admin' => [ - 'layouts' => [ - 'preorder' => 'Preorder' - ], - - 'preorders' => [ - 'title' => 'Preorders', - 'mass-notify-success' => 'Stock notification email sent succesfully.' - ], - - 'sales' => [ - 'orders' => [ - 'preorder-summary' => 'This order contains preorder items', - 'preorder-information' => 'Preorder Information', - 'preorder-payment-information' => 'Preorder Payment Information', - 'type' => 'Type : ', - 'status' => 'Status : ', - 'reference-order' => 'Reference Order : ', - 'payment-order' => 'Payment Order : ' - ] - ], - - 'system' => [ - 'preorder' => 'Preorder', - 'settings' => 'Settings', - 'general' => 'General', - 'preorder-type' => 'Preorder Type', - 'partial-payment' => 'Partial Payment', - 'complete-payment' => 'Complete Payment', - 'preorder-percent' => 'Preorder Percent', - 'preorder-percent-info' => 'This value will be used if "Preorder Type" is selected as "Partial Payment".', - 'message' => 'Message', - 'enable-automatic-mail' => 'Enable Automatic Mail' - ] - ], - - 'datagrid' => [ - 'id' => 'Id', - 'order-id' => 'Order Id', - 'payment-order-id' => 'Payment Order Id', - 'product-name' => 'Product Name', - 'customer-name' => 'Customer Name', - 'customer-email' => 'Customer Email', - 'paid-amount' => 'Paid Amount', - 'remaining-amount' => 'Remaining Amount', - 'preorder-type' => 'Preorder Type', - 'status' => 'Status', - 'partial-payment' => 'Partial Payment', - 'complete-payment' => 'Complete Payment', - 'pending' => 'Pending', - 'processing' => 'Processing', - 'completed' => 'Completed', - 'email-sent' => 'Email Sent', - 'yes' => 'Yes', - 'no' => 'No', - 'order-type' => 'Order Type', - 'preorder' => 'Preorder', - 'normal-order' => 'Normal Order' - ], - - 'mail' => [ - 'in-stock' => [ - 'subject' => 'Product in stock notification', - 'dear' => 'Dear :name', - 'info' => 'Product :name has been arrived in stock now. Click here to complete preorder.' - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/admin/layouts/style.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/layouts/style.blade.php deleted file mode 100644 index 0d93717f6..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/admin/layouts/style.blade.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php deleted file mode 100644 index 9133bb40d..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/admin/preorders/index.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('preorder::app.admin.preorders.title') }} -@stop - -@section('content-wrapper') - -
-
-
-

{{ __('preorder::app.admin.preorders.title') }}

-
- -
-
-
- -
- - {!! app('Webkul\PreOrder\DataGrids\Admin\PreOrder')->render() !!} - -
-
- -@stop diff --git a/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php deleted file mode 100644 index fde3254d3..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/index.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('admin::app.sales.orders.title') }} -@stop - -@section('content') -
-
-
-

{{ __('admin::app.sales.orders.title') }}

-
- -
-
- - - {{ __('admin::app.export.export') }} - -
-
-
- -
- @inject('orderGrid', 'Webkul\PreOrder\DataGrids\Admin\Order') - - {!! $orderGrid->render() !!} -
-
- - -

{{ __('admin::app.export.download') }}

-
- -
- - -@stop - -@push('scripts') - @include('admin::export.export', ['gridName' => $orderGrid]) -@endpush \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php b/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php deleted file mode 100644 index 065ec8bd8..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/admin/sales/orders/view.blade.php +++ /dev/null @@ -1,503 +0,0 @@ -@extends('admin::layouts.master') - -@section('page_title') - {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }} -@stop - -@section('content-wrapper') - -
- -
- -
-

- - - {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }} -

-
- -
- @if ($order->canCancel()) - - {{ __('admin::app.sales.orders.cancel-btn-title') }} - - @endif - - @if ($order->canInvoice()) - - {{ __('admin::app.sales.orders.invoice-btn-title') }} - - @endif - - @if ($order->canShip() && ! app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->isPreOrderPaymentOrder($order->id)) - - {{ __('admin::app.sales.orders.shipment-btn-title') }} - - @endif -
-
- -
- - - -
- - havePreOrderItems($order->id); - ?> - - @if ($havePreOrderItems) -
{{ __('preorder::app.admin.sales.orders.preorder-summary') }}
- @endif - - -
- -
-
- {{ __('admin::app.sales.orders.order-info') }} -
- -
-
- - {{ __('admin::app.sales.orders.order-date') }} - - - - {{ $order->created_at }} - -
- -
- - {{ __('admin::app.sales.orders.order-status') }} - - - - {{ $order->status_label }} - -
- -
- - {{ __('admin::app.sales.orders.channel') }} - - - - {{ $order->channel_name }} - -
-
-
- -
-
- {{ __('admin::app.sales.orders.account-info') }} -
- -
-
- - {{ __('admin::app.sales.orders.customer-name') }} - - - - {{ $order->customer_full_name }} - -
- -
- - {{ __('admin::app.sales.orders.email') }} - - - - {{ $order->customer_email }} - -
- - @if (! is_null($order->customer)) -
- - {{ __('admin::app.customers.customers.customer_group') }} - - - - {{ $order->customer->group['name'] }} - -
- @endif -
-
- -
- - - -
- -
-
- {{ __('admin::app.sales.orders.billing-address') }} -
- -
- - @include ('admin::sales.address', ['address' => $order->billing_address]) - -
-
- - @if ($order->shipping_address) -
-
- {{ __('admin::app.sales.orders.shipping-address') }} -
- -
- - @include ('admin::sales.address', ['address' => $order->shipping_address]) - -
-
- @endif - -
- - - -
- -
-
- {{ __('admin::app.sales.orders.payment-info') }} -
- -
-
- - {{ __('admin::app.sales.orders.payment-method') }} - - - - {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} - -
- -
- - {{ __('admin::app.sales.orders.currency') }} - - - - {{ $order->order_currency_code }} - -
-
-
- -
-
- {{ __('admin::app.sales.orders.shipping-info') }} -
- -
-
- - {{ __('admin::app.sales.orders.shipping-method') }} - - - - {{ $order->shipping_title }} - -
- -
- - {{ __('admin::app.sales.orders.shipping-price') }} - - - - {{ core()->formatBasePrice($order->base_shipping_amount) }} - -
-
-
-
- - - -
- -
- - - - - - - - - - - @if ($order->base_discount_amount > 0) - - @endif - - - - - - - @foreach ($order->items as $item) - - - - - - - - - - - - - - - - @if ($order->base_discount_amount > 0) - - @endif - - - - @endforeach -
{{ __('admin::app.sales.orders.SKU') }}{{ __('admin::app.sales.orders.product-name') }}{{ __('admin::app.sales.orders.price') }}{{ __('admin::app.sales.orders.item-status') }}{{ __('admin::app.sales.orders.subtotal') }}{{ __('admin::app.sales.orders.tax-percent') }}{{ __('admin::app.sales.orders.tax-amount') }}{{ __('admin::app.sales.orders.discount-amount') }}{{ __('admin::app.sales.orders.grand-total') }}
- {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }} - - {{ $item->name }} - - @if ($html = $item->getOptionDetailHtml()) -

{{ $html }}

- @endif - - @if ($preOrderItem = $preOrderItemRepository->findOneByField('order_item_id', $item->id)) -
- type == 'configurable')style="margin-top: 0"@endif> - {{ __('preorder::app.admin.sales.orders.preorder-information') }} - - - - {{ __('preorder::app.admin.sales.orders.type') }} - - {{ $preOrderItem->type_label }} - - - - {{ __('preorder::app.admin.sales.orders.status') }} - - {{ $preOrderItem->status_label }} - - - @if ($preOrderItem->payment_order_item) - - {{ __('preorder::app.admin.sales.orders.payment-order') }} - - - #{{ $preOrderItem->payment_order_item->order_id }} - - - @endif -
- @elseif ($preOrderItem = app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id)) -
- type == 'configurable')style="margin-top: 0"@endif> - {{ __('preorder::app.admin.sales.orders.preorder-payment-information') }} - - - - {{ __('preorder::app.admin.sales.orders.reference-order') }} - - - #{{ $preOrderItem->order_id }} - - -
- @endif - 		{{ core()->formatBasePrice($item->base_price) }} - - {{ $item->qty_ordered ? __('admin::app.sales.orders.item-ordered', ['qty_ordered' => $item->qty_ordered]) : '' }} - - - - {{ $item->qty_invoiced ? __('admin::app.sales.orders.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }} - - - - {{ $item->qty_shipped ? __('admin::app.sales.orders.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }} - - - - {{ $item->qty_canceled ? __('admin::app.sales.orders.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - - {{ core()->formatBasePrice($item->base_total) }}{{ $item->tax_percent }}%{{ core()->formatBasePrice($item->base_tax_amount) }}{{ core()->formatBasePrice($item->base_discount_amount) }} - {{ core()->formatBasePrice($item->base_total + $item->base_tax_amount) }} -
-
- - - - - - - - - - - - - - - @if ($order->base_discount_amount > 0) - - - - - - @endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ __('admin::app.sales.orders.subtotal') }}-{{ core()->formatBasePrice($order->base_sub_total) }}
{{ __('admin::app.sales.orders.shipping-handling') }}-{{ core()->formatBasePrice($order->base_shipping_amount) }}
{{ __('admin::app.sales.orders.discount') }}--{{ core()->formatBasePrice($order->base_discount_amount) }}
{{ __('admin::app.sales.orders.tax') }}-{{ core()->formatBasePrice($order->base_tax_amount) }}
{{ __('admin::app.sales.orders.grand-total') }}-{{ core()->formatBasePrice($order->base_grand_total) }}
{{ __('admin::app.sales.orders.total-paid') }}-{{ core()->formatBasePrice($order->base_grand_total_invoiced) }}
{{ __('admin::app.sales.orders.total-refunded') }}-{{ core()->formatBasePrice($order->base_grand_total_refunded) }}
{{ __('admin::app.sales.orders.total-due') }}-{{ core()->formatBasePrice($order->base_total_due) }}
- -
- - -
- - - - -
- - - - - - - - - - - - - - - - @foreach ($order->invoices as $invoice) - - - - - - - - - - @endforeach - - @if (! $order->invoices->count()) - - - - @endif -
{{ __('admin::app.sales.invoices.id') }}{{ __('admin::app.sales.invoices.date') }}{{ __('admin::app.sales.invoices.order-id') }}{{ __('admin::app.sales.invoices.customer-name') }}{{ __('admin::app.sales.invoices.status') }}{{ __('admin::app.sales.invoices.amount') }}{{ __('admin::app.sales.invoices.action') }}
#{{ $invoice->id }}{{ $invoice->created_at }}#{{ $invoice->order->id }}{{ $invoice->address->name }}{{ $invoice->status_label }}{{ core()->formatBasePrice($invoice->base_grand_total) }} - - - -
{{ __('admin::app.common.no-result-found') }}
-
- - - - - -
- - - - - - - - - - - - - - - - @foreach ($order->shipments as $shipment) - - - - - - - - - - @endforeach - - @if (! $order->shipments->count()) - - - - @endif -
{{ __('admin::app.sales.shipments.id') }}{{ __('admin::app.sales.shipments.date') }}{{ __('admin::app.sales.shipments.order-id') }}{{ __('admin::app.sales.shipments.order-date') }}{{ __('admin::app.sales.shipments.customer-name') }}{{ __('admin::app.sales.shipments.total-qty') }}{{ __('admin::app.sales.shipments.action') }}
#{{ $shipment->id }}{{ $shipment->created_at }}#{{ $shipment->order->id }}{{ $shipment->order->created_at }}{{ $shipment->address->name }}{{ $shipment->total_qty }} - - - -
{{ __('admin::app.common.no-result-found') }}
-
- - - -
- -
-@stop \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/emails/in-stock.blade.php b/packages/Webkul/PreOrder/src/Resources/views/emails/in-stock.blade.php deleted file mode 100644 index 68c66fc92..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/emails/in-stock.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@component('shop::emails.layouts.master') - -
- - - -
- -
- -
-

- {{ __('preorder::app.mail.in-stock.dear', ['name' => $item->order->customer_full_name]) }}, -

- -

- - {!! - __('preorder::app.mail.in-stock.info', [ - 'name' => '' . $item->order_item->product->name . '', - 'link' => $item->order->is_guest ? route('preorder.shop.preorder.complete', ['token' => $item->token]) : route('customer.orders.view', ['id' => $item->order_id]) - ]) - !!} - -

-
- -
-

- {!! - __('shop::app.mail.order.help', [ - 'support_email' => '' . config('mail.from.address'). '' - ]) - !!} -

- -

- {{ __('shop::app.mail.order.thanks') }} -

-
- -
- -@endcomponent \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php deleted file mode 100644 index 9e3483e70..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/shop/customers/account/orders/view.blade.php +++ /dev/null @@ -1,414 +0,0 @@ -@extends('shop::layouts.master') - -@section('page_title') - {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }} -@endsection - -@push('css') - -@endpush - -@section('content-wrapper') - -
- @include('shop::customers.account.partials.sidemenu') - -
- - - - {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!} - -
- - - - - havePreOrderItems($order->id); - ?> - - @if ($havePreOrderItems) -
{{ __('preorder::app.shop.sales.orders.preorder-summary') }}
- @endif - -
-
-
- - {{ __('shop::app.customer.account.order.view.placed-on') }} - - - - {{ core()->formatDate($order->created_at, 'd M Y') }} - -
-
-
- -
-
- {{ __('shop::app.customer.account.order.view.products-ordered') }} -
- -
-
- - - - - - - - - - - - - - - - - @foreach ($order->items as $item) - - - - - - - - - - - - - - - - - - @endforeach - - -
{{ __('shop::app.customer.account.order.view.SKU') }}{{ __('shop::app.customer.account.order.view.product-name') }}{{ __('shop::app.customer.account.order.view.price') }}{{ __('shop::app.customer.account.order.view.item-status') }}{{ __('shop::app.customer.account.order.view.subtotal') }}{{ __('shop::app.customer.account.order.view.tax-percent') }}{{ __('shop::app.customer.account.order.view.tax-amount') }}{{ __('shop::app.customer.account.order.view.grand-total') }}
- {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }} - - {{ $item->name }} - - @if ($preOrderItem = $preOrderItemRepository->resetScope()->findOneByField('order_item_id', $item->id)) -
- type == 'configurable')style="margin-top: 0"@endif> - {{ __('preorder::app.shop.sales.orders.preorder-information') }} - - - - {{ __('preorder::app.shop.sales.orders.type') }} - - {{ $preOrderItem->type_label }} - - - - {{ __('preorder::app.shop.sales.orders.status') }} - - {{ $preOrderItem->status_label }} - - - @if ($preOrderItem->payment_order_item) - - {{ __('preorder::app.shop.sales.orders.payment-order') }} - - - #{{ $preOrderItem->payment_order_item->order_id }} - - - @endif -
- @elseif ($preOrderItem = app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id)) -
- type == 'configurable')style="margin-top: 0"@endif> - {{ __('preorder::app.shop.sales.orders.preorder-payment-information') }} - - - - {{ __('preorder::app.shop.sales.orders.reference-order') }} - - - #{{ $preOrderItem->order_id }} - - -
- @endif - 		{{ core()->formatPrice($item->price, $order->order_currency_code) }} - - {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }} - - - - {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }} - - - - {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }} - - - - {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }} - - {{ core()->formatPrice($item->total, $order->order_currency_code) }}{{ number_format($item->tax_percent, 2) }}%{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }} - {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }} - - canBeComplete($item); ?> - - @if ($canBeComplete) - Complete Preorder - @endif -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ __('shop::app.customer.account.order.view.subtotal') }}-{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.shipping-handling') }}-{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.tax') }}-{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.grand-total') }}-{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.total-paid') }}-{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.total-refunded') }}-{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.total-due') }}-{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}
-
-
-
- - - @if ($order->invoices->count()) - - - @foreach ($order->invoices as $invoice) - -
-
- {{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }} - - - {{ __('shop::app.customer.account.order.view.print') }} - -
- -
-
- - - - - - - - - - - - - - - - @foreach ($invoice->items as $item) - - - - - - - - - - @endforeach - -
{{ __('shop::app.customer.account.order.view.SKU') }}{{ __('shop::app.customer.account.order.view.product-name') }}{{ __('shop::app.customer.account.order.view.price') }}{{ __('shop::app.customer.account.order.view.qty') }}{{ __('shop::app.customer.account.order.view.subtotal') }}{{ __('shop::app.customer.account.order.view.tax-amount') }}{{ __('shop::app.customer.account.order.view.grand-total') }}
{{ $item->child ? $item->child->sku : $item->sku }}{{ $item->name }}{{ core()->formatPrice($item->price, $order->order_currency_code) }}{{ $item->qty }}{{ core()->formatPrice($item->total, $order->order_currency_code) }}{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - -
{{ __('shop::app.customer.account.order.view.subtotal') }}-{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.shipping-handling') }}-{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.tax') }}-{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}
{{ __('shop::app.customer.account.order.view.grand-total') }}-{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}
-
-
-
- - @endforeach - - - @endif - - @if ($order->shipments->count()) - - - @foreach ($order->shipments as $shipment) - -
-
- {{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }} -
- -
- -
- - - - - - - - - - - - @foreach ($shipment->items as $item) - - - - - - - - @endforeach - - -
{{ __('shop::app.customer.account.order.view.SKU') }}{{ __('shop::app.customer.account.order.view.product-name') }}{{ __('shop::app.customer.account.order.view.qty') }}
{{ $item->sku }}{{ $item->name }}{{ $item->qty }}
-
-
-
- - @endforeach - - - @endif - - -
-
-
-
-
- {{ __('shop::app.customer.account.order.view.shipping-address') }} -
- -
- - @include ('admin::sales.address', ['address' => $order->billing_address]) - -
-
- -
-
- {{ __('shop::app.customer.account.order.view.billing-address') }} -
- -
- - @include ('admin::sales.address', ['address' => $order->shipping_address]) - -
-
- -
-
- {{ __('shop::app.customer.account.order.view.shipping-method') }} -
- -
- - {{ $order->shipping_title }} - -
-
- -
-
- {{ __('shop::app.customer.account.order.view.payment-method') }} -
- -
- {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }} -
-
-
-
-
- -
- - {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!} - -
- -
- -@endsection \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php deleted file mode 100644 index af665b735..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/shop/products/add-buttons.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -@if ($product->type != "configurable" && $product->totalQuantity() < 1 && $product->allow_preorder) - @if (core()->getConfigData('preorder.settings.general.percent')) - @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') -

{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}

- @endif - @endif -@endif - -@if ($product->type == "configurable") -
- - {{ __('shop::app.products.add-to-cart') }} - - - @include('shop::products.wishlist') -
-@else -
-
- @csrf - - - - - @if ($product->totalQuantity() < 1 && $product->product->allow_preorder) - - @else - - @endif -
- - @include('shop::products.wishlist') -
-@endif \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php deleted file mode 100644 index 10345a30d..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/shop/products/preorder-info.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -@if ($product->type != 'configurable' && $product->totalQuantity() < 1 && $product->allow_preorder) -
- - @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial') - @if (core()->getConfigData('preorder.settings.general.percent')) -

{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}

- @endif - @endif - - @if (core()->getConfigData('preorder.settings.general.message') != '') -

{{ core()->getConfigData('preorder.settings.general.message') }}

- @endif - - @if ($product->preorder_availability && \Carbon\Carbon::parse($product->preorder_availability) > \Carbon\Carbon::now()) -

- {!! - __('preorder::app.shop.products.available-on', [ - 'date' => core()->formatDate(\Carbon\Carbon::parse($product->preorder_availability), 'F d, Y') - ]) - !!} -

- @endif -
-@elseif ($product->type == 'configurable') - - - @push('scripts') - - - - @endpush -@endif - -@push('css') - -@endpush \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Resources/views/shop/products/view/product-add.blade.php b/packages/Webkul/PreOrder/src/Resources/views/shop/products/view/product-add.blade.php deleted file mode 100644 index 584d15fa1..000000000 --- a/packages/Webkul/PreOrder/src/Resources/views/shop/products/view/product-add.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} - -
- @if ($product->type != 'configurable') - @if ($product->totalQuantity() < 1 && $product->product->allow_preorder) - - @else - @include ('shop::products.add-to-cart', ['product' => $product]) - - @include ('shop::products.buy-now') - @endif - @else - @include ('shop::products.add-to-cart', ['product' => $product]) - - @include ('shop::products.buy-now') - - - @endif -
- -{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/src/Shipping.php b/packages/Webkul/PreOrder/src/Shipping.php deleted file mode 100644 index 34dbec218..000000000 --- a/packages/Webkul/PreOrder/src/Shipping.php +++ /dev/null @@ -1,62 +0,0 @@ -items()->get() as $item) { - if (isset($item->additional['pre_order_payment'])) - $havePreOrderPaymentItem = true; - } - - if (! $havePreOrderPaymentItem) - return parent::collectRates(); - - $object = new CartShippingRate; - - $object->carrier = 'free'; - $object->carrier_title = core()->getConfigData('sales.carriers.free.title'); - $object->method = 'free_free'; - $object->method_title = core()->getConfigData('sales.carriers.free.title'); - $object->method_description = core()->getConfigData('sales.carriers.free.description'); - $object->price = 0; - $object->base_price = 0; - - $this->rates[] = $object; - - $this->saveAllShippingRates(); - - return [ - 'jump_to_section' => 'shipping', - 'html' => view('shop::checkout.onepage.shipping', ['shippingRateGroups' => $this->getGroupedAllShippingRates()])->render() - ]; - } -} \ No newline at end of file diff --git a/packages/Webkul/PreOrder/webpack.mix.js b/packages/Webkul/PreOrder/webpack.mix.js deleted file mode 100644 index bc2d92bb3..000000000 --- a/packages/Webkul/PreOrder/webpack.mix.js +++ /dev/null @@ -1,22 +0,0 @@ -const { mix } = require("laravel-mix"); -require("laravel-mix-merge-manifest"); - -if (mix.inProduction()) { - var publicPath = 'publishable/assets'; -} else { - var publicPath = "../../../public/vendor/webkul/preorder/assets"; -} - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - -mix.copyDirectory(__dirname + "/src/Resources/assets/images", publicPath + "/images") - .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/preorder.css") - .sass(__dirname + "/src/Resources/assets/sass/admin.scss", "css/preorder-admin.css") - .options({ - processCssUrls: false - }); - -if (mix.inProduction()) { - mix.version(); -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/.gitignore b/packages/Webkul/SAASCustomizer/.gitignore deleted file mode 100755 index 30bc16279..000000000 --- a/packages/Webkul/SAASCustomizer/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/node_modules \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/changelog-0.1.x.md b/packages/Webkul/SAASCustomizer/changelog-0.1.x.md deleted file mode 100644 index 0b76f45a0..000000000 --- a/packages/Webkul/SAASCustomizer/changelog-0.1.x.md +++ /dev/null @@ -1,22 +0,0 @@ -# CHANGELOG for v0.1.x - -#### This changelog consists the bug & security fixes and new features being included in the releases listed below. - -## **v0.1.1(26th of july, 2019)** - _Release_ - -* [enhancement] Improved exception handling. -* [bug] Fixed issues in registration form. -* [bug] Fixed cross seller authentication bugs. -* [feature] Super admin panel. -* [feature] Super admin can block sellers. -* [feature] Improved security for customer and admin authentication. - -## **v0.1.2(26th of july, 2019)** - _Release_ - -* [enhancement] New exception screens for - * Domain not found. - * Seller blocked. - * Performing illegal actions (ex. creating more than one channel or locale other than english). - * Not allowed to visit sections (ex. visiting super admin panel). -* [bug] Various bug fixes in observers. -* [enhancement] Removed phone number validation from phone number field. \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/composer.json b/packages/Webkul/SAASCustomizer/composer.json deleted file mode 100755 index 52beeea54..000000000 --- a/packages/Webkul/SAASCustomizer/composer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "bagisto/laravel-Saas", - "license": "MIT", - "authors": [ - { - "name": "Prashant Singh", - "email": "prashant.singh852@webkul.com" - } - ], - "require": { - "konekt/concord": "^1.2" - }, - "autoload": { - "psr-4": { - "Webkul\\SAASCustomizer\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\SAASCustomizer\\Providers\\SAASCustomizerServiceProvider" - ], - "aliases": {} - } - }, - "minimum-stability": "dev" -} diff --git a/packages/Webkul/SAASCustomizer/customization-readme.md b/packages/Webkul/SAASCustomizer/customization-readme.md deleted file mode 100644 index d79035f54..000000000 --- a/packages/Webkul/SAASCustomizer/customization-readme.md +++ /dev/null @@ -1,31 +0,0 @@ -# Requirements: - -1. SaaS-based system on Bagisto with all the core features . -2. Seller Creation with their own store and domain -3. Stripe Connect as payment, where the connect is under our Stripe account. -4. Seller functionality : Own Admin dashboard, Create/Edit Products, Checked Order status and Completion, Edit/Create Customers, Add Notes on Customer -5. Create discount rules -6. The seller should approve customers who sign up -7. Platform locale in English -8. The seller should control which categories or products a specific customer can see. -9. Upload CSV/Excel file with SKU,Quantity for bulk add to cart -10. Customers should be logged in to see prices and buy. -11. The seller should make custom prices for customers. So this customer gets 10% of all products. -12. The seller can upload PDF and images documents to a page, where the customer can download them. -13. The seller can upload documents to a customer, where the customer can see their documents on their account. -14. It should be possible to add credit max on the customer, so if the customer has unpaid invoices of xxx dollars, they cannot buy any more, before the invoices are paid. -15. Pre Order and Backorder products - -# Installation Steps: - -* Inside the project root '.env' have 'app_url' parameter which must be set as your main domain. -* Then run the command 'php artisan saas:install' -* Open the main domain you would be only be able to see the registration page. - -* There should only be a commission/fee on every transaction, made with Stripe. Not on products. - -There is the Stripe fee 2.9% + 30cent, and there is our platform fee, which we can set in Stripe(it is going to be 2%). We would like them to be shown as a total service fee in the totals on the cart. So if the customer is buying a product to 100$ -The will see subtotal of 100$, shipping: 3$, service fee 5,347 $. ((103*2,9%+2%)+0,30)-103 = 5,347$ -We would like that the Seller can choose from their backend settings, who should pay the service fee. Is it the customer, so the amount will be 108,347 $ for the customer, and the Seller will get 103$ after fees. - -If the Seller should pay the fees, the amount will be 103$ for the customer and the payout for the Seller will be 103-5,347$ = 97,653$ \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/package.json b/packages/Webkul/SAASCustomizer/package.json deleted file mode 100755 index 2d948db6a..000000000 --- a/packages/Webkul/SAASCustomizer/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "cross-env npm run watch -- --watch-poll --progress", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "axios": "^0.18", - "cross-env": "^5.1.4", - "laravel-mix": "^2.1", - "laravel-mix-merge-manifest": "^0.1.1", - "jquery": "^3.2", - "vue": "^2.1.10" - }, - "dependencies": { - "vee-validate": "2.0.0-rc.26", - "vue-flatpickr": "^2.3.0", - "vue-slider-component": "^2.7.5" - } -} diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/css/saas.css b/packages/Webkul/SAASCustomizer/publishable/assets/css/saas.css deleted file mode 100644 index 083c724c8..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/assets/css/saas.css +++ /dev/null @@ -1 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);html{font-family:montserrat,sans-serif}::-webkit-input-placeholder{font-family:montserrat,sans-serif}::-ms-input-placeholder{font-family:montserrat,sans-serif}::placeholder{font-family:montserrat,sans-serif}.mt-30{margin-top:30px}.mt-60{margin-top:60px}.mt-90{margin-top:90px}.form-container{width:420px;margin-left:auto;margin-right:auto;padding:10px}.form-container .brand-logo{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:100%}.form-container .step-one button,.form-container .step-three button,.form-container .step-two button{width:150px;margin-left:calc(50% - 75px)}.registration .control-group .control{width:100%}.step-navigator{margin-top:30px;margin-bottom:15px;width:100%}.step-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.step-list .step-item{cursor:pointer;height:64px;width:64px;border:1px solid #c7c7c7;border-radius:50%;text-align:center;padding-top:24px}.step-list .step-item.active{border:1px solid blue}.content{padding:25px}.content-container{padding-left:45px;padding-right:45px} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/images/block.svg b/packages/Webkul/SAASCustomizer/publishable/assets/images/block.svg deleted file mode 100644 index 0312ffb16..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/assets/images/block.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - block - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/images/compass.svg b/packages/Webkul/SAASCustomizer/publishable/assets/images/compass.svg deleted file mode 100644 index 8554e43ab..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/assets/images/compass.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - compass - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/images/razzo-logo.png b/packages/Webkul/SAASCustomizer/publishable/assets/images/razzo-logo.png deleted file mode 100644 index 62a1281b0..000000000 Binary files a/packages/Webkul/SAASCustomizer/publishable/assets/images/razzo-logo.png and /dev/null differ diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/js/saas.js b/packages/Webkul/SAASCustomizer/publishable/assets/js/saas.js deleted file mode 100644 index 6102aa371..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/assets/js/saas.js +++ /dev/null @@ -1 +0,0 @@ -!function(n){var t={};function r(e){if(t[e])return t[e].exports;var o=t[e]={i:e,l:!1,exports:{}};return n[e].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=n,r.c=t,r.d=function(n,t,e){r.o(n,t)||Object.defineProperty(n,t,{configurable:!1,enumerable:!0,get:e})},r.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return r.d(t,"a",t),t},r.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},r.p="/",r(r.s=0)}({0:function(n,t,r){r("J66Q"),n.exports=r("MT9B")},J66Q:function(n,t){},MT9B:function(n,t){}}); \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/assets/mix-manifest.json b/packages/Webkul/SAASCustomizer/publishable/assets/mix-manifest.json deleted file mode 100644 index 9e8ed27cc..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/assets/mix-manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "/js/saas.js": "/js/saas.js?id=245497d286e5c4f9d97d", - "/css/saas.css": "/css/saas.css?id=7d38805f44fcc72f979a" -} diff --git a/packages/Webkul/SAASCustomizer/publishable/saas/assets/css/saas.css b/packages/Webkul/SAASCustomizer/publishable/saas/assets/css/saas.css deleted file mode 100644 index 90365a12c..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/saas/assets/css/saas.css +++ /dev/null @@ -1 +0,0 @@ -@import url(https://fonts.googleapis.com/css?family=Montserrat:400,500);html{font-family:montserrat,sans-serif}::-webkit-input-placeholder{font-family:montserrat,sans-serif}::-ms-input-placeholder{font-family:montserrat,sans-serif}::placeholder{font-family:montserrat,sans-serif}.mt-30{margin-top:30px}.mt-60{margin-top:60px}.mt-90{margin-top:90px}.form-container{width:420px;margin-left:auto;margin-right:auto;padding:10px}.form-container .brand-logo{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:100%}.form-container .step-one button,.form-container .step-three button,.form-container .step-two button{width:150px;margin-left:calc(50% - 75px)}.registration .control-group .control{width:100%}.step-navigator{margin-top:30px;margin-bottom:15px;width:100%}.step-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.step-list .step-item{cursor:pointer;height:64px;width:64px;border:1px solid #c7c7c7;border-radius:50%;text-align:center;padding-top:24px}.step-list .step-item.active{border:1px solid blue}.content{padding:25px} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/saas/assets/js/saas.js b/packages/Webkul/SAASCustomizer/publishable/saas/assets/js/saas.js deleted file mode 100644 index 6102aa371..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/saas/assets/js/saas.js +++ /dev/null @@ -1 +0,0 @@ -!function(n){var t={};function r(e){if(t[e])return t[e].exports;var o=t[e]={i:e,l:!1,exports:{}};return n[e].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=n,r.c=t,r.d=function(n,t,e){r.o(n,t)||Object.defineProperty(n,t,{configurable:!1,enumerable:!0,get:e})},r.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return r.d(t,"a",t),t},r.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},r.p="/",r(r.s=0)}({0:function(n,t,r){r("J66Q"),n.exports=r("MT9B")},J66Q:function(n,t){},MT9B:function(n,t){}}); \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/publishable/saas/assets/mix-manifest.json b/packages/Webkul/SAASCustomizer/publishable/saas/assets/mix-manifest.json deleted file mode 100644 index aa04eff08..000000000 --- a/packages/Webkul/SAASCustomizer/publishable/saas/assets/mix-manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "/js/saas.js": "/js/saas.js?id=245497d286e5c4f9d97d", - "/css/saas.css": "/css/saas.css?id=9eb1d0ced2d463f11fd9" -} diff --git a/packages/Webkul/SAASCustomizer/readme.md b/packages/Webkul/SAASCustomizer/readme.md deleted file mode 100644 index f52e14fbc..000000000 --- a/packages/Webkul/SAASCustomizer/readme.md +++ /dev/null @@ -1,70 +0,0 @@ -# Introduction: -Bagisto SAAS extension is eCommerce virtual mall, where multiple-vendor can sign-up and create their own e-commerce store with their personalized domain name. SAAS extension will help you in appealing sellers to get registered with your business and use common resources such as Payment gateways, Shipping methods, etc. - -Get involved and control your mall by managing commissions directly from single place, control on customer signups, super cool super admin panel to manage sellers, activate/deactivate your sellers from super admin panel too and lots more. - - -# Feature of Laravel ecommerce SAAS Module - -* Easy to Setup and manage SAAS based eCommerce solution. -* Scaling your business is now directly proportional to no. of sellers. -* Separate admin panel for each seller. -* Ability of seller to change domain at will. -* Easily manageable orders. -* Faster updates will bring lots of demanding features. - -# Requirements -* Bagisto v0.1.6 or higher. - -# Note - 1. Do not install bagisto till you configure this extension initially w/ it. - 2. Before proceeding this extension you need to copy files from zip -file to root location of your Bagisto installed inside it - 3. Do not try to seed the database with command 'php artisan db:seed' - -# Installation -* Run the command from root in terminal 'composer create-project' -* Find '.env' file in root directory and change the APP_URL param to domain, -ex: www.example.com and do not forget to configure Mail and DB parameters inside .env file -* Run the following commands: - -``` -php artisan migrate (will take a while) -php artisan storage:link -php artisan vendor:publish -``` -* Do couple of entries in root composer.json in psr-4 object: - -``` -'Webkul\SAASCustomizer\": "packages/Webkul/SAASCustomizer/src', -'Webkul\CustomerCustomizer\": "packages/Webkul/CustomerCustomizer/src' -``` -* Another entry inside file('app/Http/Kernel.php',): -In this file you can find an array 'middlewareGroups' inside it there is -a key named 'web' inside it do an entry: - -``` -Webkul\SAASCustomizer\Http\Middleware\ValidatesDomain::class' -``` -* Find a file auth.php present inside config folder from root and do the following entries: -``` -'super-admin' => [ - 'driver' => 'session', - 'provider' => 'superadmins' -] -``` -> insert the above code in 'guards' array. - -``` -'superadmins' => [ - 'driver' => 'eloquent', - 'model' => Webkul\SAASCustomizer\Models\SuperAdmin::class -] -``` -> insert the above code in 'providers' array. - -* Run the command from root in terminal 'composer dump-autoload'. -* In your terminal now type command 'php artisan SAAS:install', to generate the super admin credentials -* Access super admin panel using: -www.domain.com/super/login -* Run your SAAS based store. \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Commands/Console/GenerateSU.php b/packages/Webkul/SAASCustomizer/src/Commands/Console/GenerateSU.php deleted file mode 100644 index 73bdd8367..000000000 --- a/packages/Webkul/SAASCustomizer/src/Commands/Console/GenerateSU.php +++ /dev/null @@ -1,117 +0,0 @@ -company = $company; - $this->details = $details; - $this->admin = $admin; - $this->role = $role; - } - - /** - * Does the all sought of lifting required to be performed for - * generating a super user - */ - public function handle() - { - $this->comment('Generating super user for the system....'); - - $email = $this->ask('Please enter email?'); - - $data = [ - 'email' => $email - ]; - - $validator = Validator::make($data, [ - 'email' => 'required|email', - ]); - - if($validator->fails()) { - $this->comment('Email invalid, please enter try again.'); - - return false; - } - - unset($data); - - $this->comment('You entered = '. $email); - - $password = $this->ask('Please enter password?'); - $data = [ - 'password' => $password - ]; - - $validator = Validator::make($data, [ - 'password' => 'required|string|min:6' - ]); - - if ($validator->fails()) { - $this->comment('Password invalid, make sure password is atleast 6 characters of length.'); - - return false; - } - - $this->comment('You entered = '. $password); - - unset($data); - - if ($this->confirm('Do you wish to continue?')) { - $result = $this->generateSuperUserCompany($email, $password); - - if ($result) { - $this->comment('Super user for the system is created'); - } else { - $this->comment('Super user for the system already exists, please contact support@bagisto.com for troubleshooting.'); - } - - } else { - $this->comment('Please try creating the super user again'); - } - } - - public function generateSuperUserCompany($email, $password) - { - $super_admin = \DB::select('select * from super_admins'); - - if(count($super_admin)) { - return false; - } - - $data = [ - 'email' => $email, - 'password' => bcrypt($password), - ]; - - \DB::insert('insert into super_admins (id, email, password, created_at, updated_at) values (?, ?, ?, ?, ?)', [1, $data['email'], $data['password'], now(), now()]); - - return true; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Company.php b/packages/Webkul/SAASCustomizer/src/Company.php deleted file mode 100644 index 8c3d2d480..000000000 --- a/packages/Webkul/SAASCustomizer/src/Company.php +++ /dev/null @@ -1,135 +0,0 @@ -company = $company; - } - - public function isAllowed() - { - $primaryServerName = config('app.url'); - - if (isset($_SERVER['SERVER_NAME'])) - $currentURL = $_SERVER['SERVER_NAME']; - else - $currentURL = $primaryServerName; - - $primaryServerNameWithoutProtocol = null; - - if (str_contains($primaryServerName, 'http://')) { - $primaryServerNameWithoutProtocol = explode('http://', $primaryServerName)[1]; - } else if (str_contains($primaryServerName, 'https://')) { - $primaryServerNameWithoutProtocol = explode('https://', $primaryServerName)[1]; - } - - if (str_contains($primaryServerNameWithoutProtocol, '/')) { - $primaryServerNameWithoutProtocol = explode('/', $primaryServerNameWithoutProtocol)[0]; - } - - if ($currentURL == $primaryServerNameWithoutProtocol) { - return true; - } else { - return false; - } - } - - protected function getAllRegisteredDomains() - { - $domains = $this->company->all(); - - return $domains; - } - - public function getCurrent() - { - $superAdmin = new SuperAdmin; - - $primaryServerName = config('app.url'); - - if (isset($_SERVER['SERVER_NAME'])) - $currentURL = $_SERVER['SERVER_NAME']; - else - $currentURL = $primaryServerName; - - if (str_contains($primaryServerName, 'http://')) { - $primaryServerNameWithoutProtocol = explode('http://', $primaryServerName)[1]; - } else if (str_contains($primaryServerName, 'https://')) { - $primaryServerNameWithoutProtocol = explode('https://', $primaryServerName)[1]; - } - - if (str_contains($currentURL, 'http://')) { - $currentURL = explode('http://', $currentURL)[1]; - } else if (str_contains($currentURL, 'http://')) { - $currentURL = explode('http://', $currentURL)[1]; - } - - if (str_contains($primaryServerNameWithoutProtocol, '/')) { - $primaryServerNameWithoutProtocol = explode('/', $primaryServerNameWithoutProtocol)[0]; - } - - if ($currentURL == $primaryServerNameWithoutProtocol) { - $company = 'super-company'; - - return $company; - } else { - $company = $this->company->findWhere(['domain' => $currentURL]); - - if ($company->isEmpty()) { - throw new \Exception('domain_not_found', 400); - } else { - $company = $company->first(); - - if ($company->is_active == 0) { - throw new \Exception('company_blocked_by_administrator', 400); - } - } - - return $company; - } - } - - /** - * Returns if there are companies - * already created - */ - public function count() - { - return $this->company->findWhere([['id', '>', '0']])->count(); - } - - public function getPrimaryUrl() - { - if (str_contains(env('APP_URL'), 'http://')) { - $primaryServerNameWithoutProtocol = explode('http://', env('APP_URL'))[1]; - } else if (str_contains($primaryServerName, 'https://')) { - $primaryServerNameWithoutProtocol = explode('https://', env('APP_URL'))[1]; - } - - return $primaryServerNameWithoutProtocol; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Config/excluded-sites.php b/packages/Webkul/SAASCustomizer/src/Config/excluded-sites.php deleted file mode 100644 index b15c670d8..000000000 --- a/packages/Webkul/SAASCustomizer/src/Config/excluded-sites.php +++ /dev/null @@ -1,5 +0,0 @@ - 'company', - 'name' => 'saas::app.menu.companies', - 'route' => 'super.companies.index', - 'sort' => 1, - 'icon-class' => 'settings-icon', - ] -]; \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/DataGrids/CompaniesDataGrid.php b/packages/Webkul/SAASCustomizer/src/DataGrids/CompaniesDataGrid.php deleted file mode 100644 index 56805f74f..000000000 --- a/packages/Webkul/SAASCustomizer/src/DataGrids/CompaniesDataGrid.php +++ /dev/null @@ -1,92 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CompaniesDataGrid extends DataGrid -{ - protected $index = 'id'; //the column that needs to be treated as index column - - protected $sortOrder = 'desc'; //asc or desc - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('companies') - ->select('id') - ->addSelect('id', 'name', 'domain', 'is_active'); - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('admin::app.datagrid.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'name', - 'label' => trans('admin::app.datagrid.name'), - 'type' => 'string', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'domain', - 'label' => trans('saas::app.datagrid.domain'), - 'type' => 'string', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'is_active', - 'label' => trans('admin::app.datagrid.status'), - 'type' => 'boolean', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true, - 'closure' => true, - 'wrapper' => function ($row) { - if ($row->is_active ==1) { - return ''; - } else { - return ''; - } - } - ]); - } - - public function prepareActions() - { - $this->addAction([ - 'type' => 'View', - 'method' => 'GET', //use post only for redirects only - 'route' => 'super.companies.show-stats', - 'icon' => 'icon eye-icon' - ]); - - $this->addAction([ - 'type' => 'View', - 'method' => 'GET', //use post only for redirects only - 'route' => 'super.companies.edit', - 'icon' => 'icon pencil-lg-icon' - ]); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/DatabaseManager.php b/packages/Webkul/SAASCustomizer/src/Database/DatabaseManager.php deleted file mode 100644 index c030fd762..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/DatabaseManager.php +++ /dev/null @@ -1,48 +0,0 @@ -guard('super-admin')->check()) { - if (count(explode('as', $table)) == 1) { - if ($table == 'companies' || $table == 'country_states' || $table == 'countries') { - - return $this->query()->from($table); - } else { - return $this->query()->from($table)->where($table . '.company_id', $company->id); - } - } else if (count(explode('as', $table)) == 2) { - $name = explode('as', $table); - $tempName = trim($name[0]); - - if ($tempName == 'companies' || $tempName == 'country_states' || $tempName == 'countries' || $table == 'customer_documents') { - return $this->query()->from($table); - } else { - return $this->query()->from($table)->where(trim($name[1]) . '.company_id', $company->id); - } - } else { - throw \Exception('Unusual Entities'); - } - } else { - return $this->query()->from($table); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Database/Eloquent/Builder.php b/packages/Webkul/SAASCustomizer/src/Database/Eloquent/Builder.php deleted file mode 100644 index e4a6a9b9d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Eloquent/Builder.php +++ /dev/null @@ -1,14 +0,0 @@ -increments('id'); - $table->string('name')->unique(); - $table->string('email')->nullable(); - $table->string('username')->unique(); - $table->string('logo')->nullable(); - $table->string('domain')->unique(); - $table->string('city')->nullable(); - $table->string('state')->nullable(); - $table->string('zip_code')->nullable(); - $table->string('country')->nullable(); - $table->text('address1')->nullable(); - $table->text('address2')->nullable(); - $table->text('description')->nullable(); - $table->json('more_info')->nullable(); - $table->boolean('is_active')->default(1); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('companies'); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_03_26_152524_alter_all_unique_contraints.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_03_26_152524_alter_all_unique_contraints.php deleted file mode 100644 index 79aab3101..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_03_26_152524_alter_all_unique_contraints.php +++ /dev/null @@ -1,248 +0,0 @@ -dropUnique('attributes_code_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['code', 'company_id'], 'attribute_company_code_unique_index'); - }); - - Schema::table('attribute_families', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('attribute_groups', function (Blueprint $table) { - $table->dropForeign(['attribute_family_id']); - $table->dropUnique('attribute_groups_attribute_family_id_name_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->foreign('attribute_family_id')->references('id')->on('attribute_families')->onDelete('cascade'); - $table->unique(['attribute_family_id', 'name', 'company_id'], 'attribute_family_id_name_company_id_unique_index'); - }); - - // Category package migration alterations - Schema::table('categories', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('category_translations', function (Blueprint $table) { - $table->dropForeign(['category_id']); - $table->dropUnique('category_translations_category_id_slug_locale_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade'); - $table->unique(['category_id', 'slug', 'locale', 'company_id'], 'id_slug_locale_company_id_unique_index'); - }); - - // Checkout package migration alterations - Schema::table('cart', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - // Core package migration alterations - Schema::table('channels', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('core_config', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('currencies', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('currency_exchange_rates', function(Blueprint $table) { - $table->dropForeign(['target_currency']); - $table->dropUnique('currency_exchange_rates_target_currency_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->foreign('target_currency')->references('id')->on('currencies')->onDelete('cascade'); - $table->unique(['target_currency', 'company_id'], 'target_currency_company_id_unique_id'); - }); - - Schema::table('locales', function(Blueprint $table) { - $table->dropUnique('locales_code_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['code', 'company_id'], 'code_company_id_unqiue_index'); - }); - - Schema::table('sliders', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('subscribers_list', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - // customer package table alterations - Schema::table('customers', function (Blueprint $table) { - $table->dropUnique('customers_email_unique'); - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['email', 'company_id']); - }); - - // Schema::table('customer_password_resets', function (Blueprint $table) { - // $table->integer('company_id')->unsigned()->after('email'); - // $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - // }); - - Schema::table('customer_addresses', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('customer_groups', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('wishlist', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - // Inventory package table alterations - Schema::table('inventory_sources', function (Blueprint $table) { - $table->dropUnique('inventory_sources_code_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['code', 'company_id'], 'code_company_id_unique'); - }); - - // product package table alterations - Schema::table('products', function (Blueprint $table) { - $table->dropUnique('products_sku_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['sku', 'company_id'], 'sku_company_id_unique'); - }); - - Schema::table('product_flat', function (Blueprint $table) { - $table->dropForeign(['product_id']); - $table->dropUnique('product_flat_unique_index'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->foreign('product_id')->references('id')->on('products')->onDelete('cascade'); - $table->unique(['product_id', 'channel', 'locale', 'company_id'], 'product_flat_unique_index'); - }); - - Schema::table('product_attribute_values', function (Blueprint $table) { - $table->dropUnique('chanel_locale_attribute_value_index_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['channel', 'locale', 'attribute_id', 'product_id', 'company_id'], 'channel_locale_attr_id_product_id_company_unique'); - }); - - Schema::table('product_inventories', function (Blueprint $table) { - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('product_reviews', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - // sales package table alterations - Schema::table('invoices', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('invoice_items', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('orders', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('order_items', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('order_address', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('order_payment', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('shipments', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - // Schema::table('shipment_items', function (Blueprint $table) { - // $table->integer('company_id')->unsigned()->after('id'); - // $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - // }); - - // tax package table alterations - Schema::table('tax_categories', function (Blueprint $table) { - $table->dropUnique('tax_categories_code_unique'); - $table->dropUnique('tax_categories_name_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['name', 'company_id']); - $table->unique(['code', 'company_id']); - }); - - Schema::table('tax_rates', function (Blueprint $table) { - $table->dropUnique('tax_rates_identifier_unique'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->unique(['identifier', 'company_id']); - }); - - Schema::table('roles', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('admins', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_04_05_105951_create_company_personal_details_table.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_04_05_105951_create_company_personal_details_table.php deleted file mode 100644 index fe2ad3b39..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_04_05_105951_create_company_personal_details_table.php +++ /dev/null @@ -1,38 +0,0 @@ -increments('id'); - $table->string('first_name')->nullable(); - $table->string('last_name')->nullable(); - $table->string('email')->nullable()->unique(); - $table->string('skype')->nullable(); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->json('more_info')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('company_personal_details'); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_05_20_102233_create_super_admins_table.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_05_20_102233_create_super_admins_table.php deleted file mode 100644 index 465963f60..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_05_20_102233_create_super_admins_table.php +++ /dev/null @@ -1,35 +0,0 @@ -enum('id', [1])->unique(); - $table->string('email'); - $table->string('password'); - $table->boolean('status')->default(1); - $table->string('remember_token')->nullable(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('super_admins'); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_06_11_164314_alter_catalog_rules_tables.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_06_11_164314_alter_catalog_rules_tables.php deleted file mode 100644 index ffbdb9c8e..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_06_11_164314_alter_catalog_rules_tables.php +++ /dev/null @@ -1,35 +0,0 @@ -integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('cart_rules', function (Blueprint $table) { - $table->dropForeign(['company_id']); - $table->dropColumn('company_id'); - }); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_16_121748_alter_cms_catalog_rule_table.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_16_121748_alter_cms_catalog_rule_table.php deleted file mode 100644 index b5920beac..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_16_121748_alter_cms_catalog_rule_table.php +++ /dev/null @@ -1,64 +0,0 @@ -integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('catalog_rules', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('catalog_rule_products', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - - Schema::table('catalog_rule_products_price', function (Blueprint $table) { - $table->integer('company_id')->unsigned()->after('id'); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('cms_pages', function (Blueprint $table) { - $table->dropForeign(['company_id']); - $table->dropColumn('company_id'); - }); - - Schema::table('catalog_rules', function (Blueprint $table) { - $table->dropForeign(['company_id']); - $table->dropColumn('company_id'); - }); - - Schema::table('catalog_rules_products', function (Blueprint $table) { - $table->dropForeign(['company_id']); - $table->dropColumn('company_id'); - }); - - Schema::table('catalog_rules_products_price', function (Blueprint $table) { - $table->dropForeign(['company_id']); - $table->dropColumn('company_id'); - }); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_19_222319_alter_customer_groups_table.php b/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_19_222319_alter_customer_groups_table.php deleted file mode 100644 index 7c9675d62..000000000 --- a/packages/Webkul/SAASCustomizer/src/Database/Migrations/2019_08_19_222319_alter_customer_groups_table.php +++ /dev/null @@ -1,35 +0,0 @@ -dropUnique('customer_groups_code_unique'); - $table->unique(['code', 'company_id']); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('customer_groups', function (Blueprint $table) { - $table->dropUnique('customer_groups_code_company_id_unique'); - $table->unique('code'); - }); - - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php b/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php deleted file mode 100644 index 01cab317b..000000000 --- a/packages/Webkul/SAASCustomizer/src/Exceptions/Handler.php +++ /dev/null @@ -1,102 +0,0 @@ - 'Resource not found', - 403 => '403 forbidden Error', - 401 => 'Unauthenticated', - 500 => '500 Internal Server Error', - ]; - - /** - * Render an exception into an HTTP response. - * - * @param \Illuminate\Http\Request $request - * @param \Exception $exception - * @return \Illuminate\Http\Response - */ - public function render($request, Exception $exception) - { - $path = 'saas'; - - if ($exception->getMessage() == 'domain_not_found') { - return $this->response($path, 400, trans('saas::app.exceptions.domain-not-found'), 'domain_not_found'); - } - - if ($exception->getMessage() == 'company_blocked_by_administrator') { - return $this->response($path, 404, trans('saas::app.exceptions.company-blocked-by-administrator'), 'company_blocked_by_administrator'); - } - - if ($exception->getMessage() == 'not_allowed_to_visit_this_section') { - return $this->response($path, 400, trans('saas::app.exceptions.not-allowed-to-visit-this-section'), 'not_allowed_to_visit_this_section'); - } - - if ($exception->getMessage() == 'illegal_action') { - return $this->response($path, 400, trans('saas::app.exceptions.illegal-action'), 'illegal_action'); - } - - if ($exception->getMessage() == 'invalid_admin_login' || $exception->getMessage() == 'invalid_customer_login') { - return $this->response($path, 404, trans('saas::app.exceptions.auth')); - } - - if ($exception instanceof HttpException) { - $statusCode = in_array($exception->getStatusCode(), [401, 403, 404, 503]) ? $exception->getStatusCode() : 500; - - return $this->response($path, $statusCode); - } else if ($exception instanceof ModelNotFoundException) { - return $this->response($path, 404); - } else if ($exception instanceof PDOException) { - return $this->response($path, 500); - } - - return parent::render($request, $exception); - } - - /** - * Convert an authentication exception into a response. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Auth\AuthenticationException $exception - * @return \Illuminate\Http\Response - */ - protected function unauthenticated($request, AuthenticationException $exception) - { - if ($request->expectsJson()) { - return response()->json(['error' => $this->jsonErrorMessages[401]], 401); - } - - return redirect()->guest(route('super.session.index')); - } - - private function isAdminUri() - { - return strpos($_SERVER['REQUEST_URI'], 'super') !== false ? true : false; - } - - private function response($path, $statusCode, $message = null, $type = null) - { - if (request()->expectsJson()) { - return response()->json([ - 'error' => isset($this->jsonErrorMessages[$statusCode]) - ? $this->jsonErrorMessages[$statusCode] - : trans('saas::app.status.something-wrong-1') - ], $statusCode); - } - - if ($type == null) { - return response()->view("{$path}::errors.{$statusCode}", ['message' => $message, 'status' => $statusCode], $statusCode); - } else { - return response()->view("{$path}::errors.{$type}", ['message' => $message, 'status' => $statusCode], $statusCode); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Facades/Company.php b/packages/Webkul/SAASCustomizer/src/Facades/Company.php deleted file mode 100644 index b8a4fdfb0..000000000 --- a/packages/Webkul/SAASCustomizer/src/Facades/Company.php +++ /dev/null @@ -1,18 +0,0 @@ -company = Company::getCurrent(); - $this->category = $category; - $this->inventory = $inventory; - $this->locale = $locale; - $this->currency = $currency; - $this->channel = $channel; - $this->attribute = $attribute; - $this->attributeFamily = $attributeFamily; - $this->attributeGroup = $attributeGroup; - $this->customerGroup = $customerGroup; - $this->cms = $cms; - } - - /** - * Prepare data for the customer groups - */ - public function prepareCustomerGroupData() - { - $this->company = Company::getCurrent(); - - $data = [ - 'code' => 'guest', - 'name' => 'Guest', - 'is_user_defined' => 0, - 'company_id' => $this->company->id - ]; - - $customerGroup0 = $this->customerGroup->create($data); - - // default customer group 1 - $data = [ - 'id' => 1, - 'code' => 'general', - 'name' => 'General', - 'is_user_defined' => 0, - 'company_id' => $this->company->id - ]; - - $customerGroup1 = $this->customerGroup->create($data); - - // default customer group 2 - $data = [ - 'id' => 2, - 'code' => 'wholesale', - 'name' => 'Wholesale', - 'is_user_defined' => 0, - 'company_id' => $this->company->id - ]; - - $customerGroup2 = $this->customerGroup->create($data); - - return ['default' => $customerGroup1, 'wholesale' => $customerGroup2]; - } - - /** - * Prepares category data - */ - public function prepareCategoryData() - { - $this->company = Company::getCurrent(); - - $data = [ - 'position' => '1', - 'image' => NULL, - 'status' => '1', - 'parent_id' => NULL, - 'name' => 'Root', - 'slug' => 'root', - 'description' => 'Root', - 'meta_title' => '', - 'meta_description' => '', - 'meta_keywords' => '', - 'locale' => 'all', - 'company_id' => $this->company->id - ]; - - $category = $this->category->create($data); - - return $category; - } - - /** - * Prepares data for a default inventory - */ - public function prepareInventoryData() - { - $this->company = Company::getCurrent(); - - $data = [ - 'code' => 'default', - 'name' => 'Default', - 'contact_name' => 'Detroit Warehouse', - 'contact_email' => 'warehouse@example.com', - 'contact_number' => '9876543210', - 'status' => 1, - 'country' => 'US', - 'state' => 'MI', - 'street' => '12th Street', - 'city' => 'Detroit', - 'postcode' => '48127', - 'company_id' => $this->company->id - ]; - - return $this->inventory->create($data); - } - - /** - * Creates a default locale - */ - public function prepareLocaleData() - { - $this->company = Company::getCurrent(); - - $data = [ - 'code' => 'en', - 'name' => 'English', - 'company_id' => $this->company->id - ]; - - return $this->locale->create($data); - } - - /** - * Prepares a default currency - */ - public function prepareCurrencyData() - { - $this->company = Company::getCurrent(); - - $data = [ - 'code' => 'USD', - 'name' => 'US Dollar', - 'company_id' => $this->company->id - ]; - - return $this->currency->create($data); - } - - /** - * Prepares a default channel - */ - public function prepareChannelData() - { - $this->company = Company::getCurrent(); - - $inventorySource = $this->inventory->findOneWhere(['company_id' => $this->company->id]); - $locale = $this->locale->findOneWhere(['company_id' => $this->company->id]); - $currency = $this->currency->findOneWhere(['company_id' => $this->company->id]); - $category = $this->category->findOneWhere(['company_id' => $this->company->id]); - - $data = [ - 'code' => 'default', - 'name' => 'Default Channel', - 'description' => 'Default Channel', - "inventory_sources" => [ - 0 => $inventorySource->id - ], - "root_category_id" => $category->id, - 'hostname' => $this->company->domain, - 'locales' => [ - 0 => $locale->id - ], - "default_locale_id" => $locale->id, - - 'currencies' => [ - 0 => $currency->id - ], - - 'base_currency_id' => $currency->id, - 'theme' => 'default', - - 'home_page_content' => '

@include("shop::home.slider") @include("shop::home.featured-products") @include("shop::home.new-products")

', - - 'footer_content' => '
Quick Links
Connect With Us
', - - 'company_id' => $this->company->id - ]; - - return $this->channel->create($data); - - // $newChannel->locales()->sync($data['locales']); - - // $newChannel->currencies()->sync($data['currencies']); - - // $newChannel->inventory_sources()->sync($data['inventory_sources']); - - // $this->uploadImages($data, $channel); - - // $this->uploadImages($data, $channel, 'favicon'); - } - - /** - * Prepare Attribute Data - */ - public function prepareAttributeData() - { - $this->company = Company::getCurrent(); - - $sku = ['code' => 'sku','admin_name' => 'SKU','type' => 'text','validation' => NULL,'position' => '1','is_required' => '1','is_unique' => '1','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'SKU']]; - - $this->attribute->create($sku); - - $name = ['code' => 'name', 'admin_name' => 'Name', 'type' => 'text', 'validation' => NULL, 'position' => '2', 'is_required' => '1', 'is_unique' => '0', 'value_per_locale' => '1', 'value_per_channel' => '1', 'is_filterable' => '0', 'is_configurable' => '0', 'is_user_defined' => '0', 'is_visible_on_front' => '0', 'company_id' => $this->company->id,'en' => ['name' => 'Name']]; - - $this->attribute->create($name); - - $url_key = ['code' => 'url_key', 'admin_name' => 'URL Key', 'type' => 'text', 'validation' => NULL, 'position' => '3', 'is_required' => '1', 'is_unique' => '1', 'value_per_locale' => '0', 'value_per_channel' => '0', 'is_filterable' => '0', 'is_configurable' => '0', 'is_user_defined' => '0', 'is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'URL Key']]; - - $this->attribute->create($url_key); - - $taxCategoryId = ['code' => 'tax_category_id', 'admin_name' => 'Tax Category', 'type' => 'select', 'validation' => NULL, 'position' => '4', 'is_required' => '0', 'is_unique' => '0', 'value_per_locale' => '0', 'value_per_channel' => '1', 'is_filterable' => '0', 'is_configurable' => '0', 'is_user_defined' => '0', 'is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Tax Category']]; - - $this->attribute->create($taxCategoryId); - - $new = ['code' => 'new', 'admin_name' => 'New', 'type' => 'boolean', 'validation' => NULL, 'position' => '5', 'is_required' => '0', 'is_unique' => '0', 'value_per_locale' => '0', 'value_per_channel' => '0', 'is_filterable' => '0','is_configurable' => '0', 'is_user_defined' => '0', 'is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'New']]; - - $this->attribute->create($new); - - $featured = ['id' => '6', 'code' => 'featured', 'admin_name' => 'Featured', 'type' => 'boolean', 'validation' => NULL, 'position' => '6', 'is_required' => '0', 'is_unique' => '0', 'value_per_locale' => '0', 'value_per_channel' => '0', 'is_filterable' => '0', 'is_configurable' => '0', 'is_user_defined' => '0', 'is_visible_on_front' => '0', 'company_id' => 1, 'en' => ['name' => 'Featured']]; - - $this->attribute->create($featured); - - $visibleIndividually = ['code' => 'visible_individually','admin_name' => 'Visible Individually','type' => 'boolean','validation' => NULL,'position' => '7','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Visible Individually']]; - - $this->attribute->create($visibleIndividually); - - $status = ['code' => 'status','admin_name' => 'Status','type' => 'boolean','validation' => NULL,'position' => '8','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Status']]; - - $this->attribute->create($status); - - $shortDesc = ['code' => 'short_description','admin_name' => 'Short Description','type' => 'textarea','validation' => NULL,'position' => '9','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Short Description']]; - - $this->attribute->create($shortDesc); - - $desc = ['code' => 'description','admin_name' => 'Description','type' => 'textarea','validation' => NULL,'position' => '10','is_required' => '1','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Description']]; - - $this->attribute->create($desc); - - $price = ['code' => 'price','admin_name' => 'Price','type' => 'price','validation' => 'decimal','position' => '11','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Price']]; - - $this->attribute->create($price); - - $cost = ['code' => 'cost','admin_name' => 'Cost','type' => 'price','validation' => 'decimal','position' => '12','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => 1, 'en' => ['name' => 'Cost']]; - - $this->attribute->create($cost); - - $specialPrice = ['code' => 'special_price','admin_name' => 'Special Price','type' => 'price','validation' => 'decimal','position' => '13','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Special Price']]; - - $this->attribute->create($specialPrice); - - $specialFrom = ['code' => 'special_price_from','admin_name' => 'Special Price From','type' => 'date','validation' => NULL,'position' => '14','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Special Price From']]; - - $this->attribute->create($specialFrom); - - $specialTo = ['code' => 'special_price_to','admin_name' => 'Special Price To','type' => 'date','validation' => NULL,'position' => '15','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Special Price To']]; - - $this->attribute->create($specialTo); - - $metaTitle = ['code' => 'meta_title','admin_name' => 'Meta Title','type' => 'textarea','validation' => NULL,'position' => '16','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Meta Title']]; - - $this->attribute->create($metaTitle); - - $metaKeywords = ['code' => 'meta_keywords','admin_name' => 'Meta Keywords','type' => 'textarea','validation' => NULL,'position' => '17','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0', 'is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','company_id' => $this->company->id, 'en' => ['name' => 'Meta Keywords']]; - - $this->attribute->create($metaKeywords); - - $metaDesc = ['code' => 'meta_description','admin_name' => 'Meta Description','type' => 'textarea','validation' => NULL,'position' => '18','is_required' => '0','is_unique' => '0','value_per_locale' => '1','value_per_channel' => '1','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Meta Description']]; - - $this->attribute->create($metaDesc); - - $width = ['code' => 'width','admin_name' => 'Width','type' => 'text','validation' => 'decimal','position' => '19','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Width']]; - - $this->attribute->create($width); - - $height = ['code' => 'height','admin_name' => 'Height','type' => 'text','validation' => 'decimal','position' => '20','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Height']]; - - $this->attribute->create($height); - - $depth = ['code' => 'depth','admin_name' => 'Depth','type' => 'text','validation' => 'decimal','position' => '21','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Depth']]; - - $this->attribute->create($depth); - - $weight = ['code' => 'weight','admin_name' => 'Weight','type' => 'text','validation' => 'decimal','position' => '22','is_required' => '1','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '0','is_configurable' => '0','is_user_defined' => '0','is_visible_on_front' => '0','company_id' => $this->company->id, 'en' => ['name' => 'Weight']]; - - $this->attribute->create($weight); - - $color = ['code' => 'color','admin_name' => 'Color','type' => 'select','validation' => NULL,'position' => '23','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Color'], 'options' => [ - 'option_0' => ['admin_name' => 'Red', 'en' => ['label' => 'Red'], 'sort_order' => '1'], - 'option_1' => ['admin_name' => 'Green', 'en' => ['label' => 'Green'],'sort_order' => '2'], - 'option_2' => ['admin_name' => 'Yellow', 'en' => ['label' => 'Yellow'], 'sort_order' => '3'], - 'option_3' => ['admin_name' => 'Black', 'en' => ['label' => 'Black'], 'sort_order' => '4'], - 'option_4' => ['admin_name' => 'White', 'en' => ['label' => 'White'], 'sort_order' => '5'] - ]]; - - $this->attribute->create($color); - - $size = ['code' => 'size','admin_name' => 'Size','type' => 'select','validation' => NULL,'position' => '24','is_required' => '0','is_unique' => '0','value_per_locale' => '0','value_per_channel' => '0','is_filterable' => '1','is_configurable' => '1','is_user_defined' => '1','is_visible_on_front' => '0', 'company_id' => $this->company->id, 'en' => ['name' => 'Size'], 'options' => [ - 'option_0' => ['id' => '6','admin_name' => 'S', 'en' => ['label' => 'S'], 'sort_order' => '1'], - 'option_1' => ['id' => '7','admin_name' => 'M', 'en' => ['label' => 'M'], 'sort_order' => '2'], - 'option_2' => ['id' => '8','admin_name' => 'L', 'en' => ['label' => 'L'], 'sort_order' => '3'], - 'option_3' => ['id' => '9','admin_name' => 'XL', 'en' => ['label' => 'XL'], 'sort_order' => '4'] - ]]; - - $this->attribute->create($size); - - return true; - } - - /** - * To prepare the attribute family - */ - public function prepareAttributeFamilyData() - { - $this->company = Company::getCurrent(); - - $data = ['code' => 'default', 'name' => 'Default', 'status' => '0', 'is_user_defined' => '1', 'company_id' => $this->company->id]; - - $attributeFamily = $this->attributeFamily->create($data); - - return $attributeFamily; - } - - /** - * To prepare the attribute group mappings - */ - public function prepareAttributeGroupData() - { - $this->company = Company::getCurrent(); - - $attributeFamily = $this->attributeFamily->findOneWhere(['company_id' => $this->company->id]); - $attributes = $this->attribute->all(); - - $group1 = ['sku', 'name', 'url_key', 'tax_category_id', 'new', 'featured', 'visible_individually', 'status', 'color', 'size']; - $group2 = ['short_description', 'description']; - $group3 = ['meta_title', 'meta_keywords', 'meta_description']; - $group4 = ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to']; - $group5 = ['width', 'height', 'depth', 'weight']; - - // creating group 1 - $this->attributeGroup->create(['name' => 'General', 'position' => '1', 'is_user_defined' => '0', 'attribute_family_id' => $attributeFamily->id, 'company_id' => $this->company->id]); - - $attributeGroup = $this->attributeGroup->findOneWhere(['name' => 'General']); - - $i = 1; - foreach($group1 as $code) { - $i++; - - foreach ($attributes as $value) { - if($value->code == $code) { - DB::table('attribute_group_mappings')->insert([ - ['attribute_id' => $value->id, 'attribute_group_id' => $attributeGroup->id, 'position' => $i] - ]); - } - } - } - - // creating group 2 - $g2 = $this->attributeGroup->create(['name' => 'Description', 'position' => '2', 'is_user_defined' => '0', 'attribute_family_id' => $attributeFamily->id, 'company_id' => $this->company->id]); - - $attributeGroup = $this->attributeGroup->findOneWhere(['name' => 'Description']); - - $i = 1; - foreach($group2 as $code) { - $i++; - - foreach ($attributes as $value) { - if($value->code == $code) { - DB::table('attribute_group_mappings')->insert([ - ['attribute_id' => $value->id, 'attribute_group_id' => $attributeGroup->id, 'position' => $i] - ]); - } - } - } - - // creating group 3 - $g3 = $this->attributeGroup->create(['name' => 'Meta Description', 'position' => '3', 'is_user_defined' => '0', 'attribute_family_id' => $attributeFamily->id, 'company_id' => $this->company->id]); - - $attributeGroup = $this->attributeGroup->findOneWhere(['name' => 'Meta Description']); - - $i = 1; - foreach($group3 as $code) { - $i++; - - foreach ($attributes as $value) { - if($value->code == $code) { - DB::table('attribute_group_mappings')->insert([ - ['attribute_id' => $value->id, 'attribute_group_id' => $attributeGroup->id, 'position' => $i] - ]); - } - } - } - - // creating group 4 - $g4 = $this->attributeGroup->create(['name' => 'Price', 'position' => '4', 'is_user_defined' => '0', 'attribute_family_id' => $attributeFamily->id, 'company_id' => $this->company->id]); - - $attributeGroup = $this->attributeGroup->findOneWhere(['name' => 'Price']); - - $i = 1; - foreach($group4 as $code) { - $i++; - - foreach ($attributes as $value) { - if($value->code == $code) { - DB::table('attribute_group_mappings')->insert([ - ['attribute_id' => $value->id, 'attribute_group_id' => $attributeGroup->id, 'position' => $i] - ]); - } - } - } - - // creating group 5 - $g5 = $this->attributeGroup->create(['name' => 'Shipping', 'position' => '5', 'is_user_defined' => '0', 'attribute_family_id' => $attributeFamily->id, 'company_id' => $this->company->id]); - - $attributeGroup = $this->attributeGroup->findOneWhere(['name' => 'Shipping']); - - $i = 1; - foreach($group5 as $code) { - $i++; - - foreach ($attributes as $value) { - if($value->code == $code) { - DB::table('attribute_group_mappings')->insert([ - ['attribute_id' => $value->id, 'attribute_group_id' => $attributeGroup->id, 'position' => $i] - ]); - } - } - } - - return true; - } - - /** - * To prepare the country state data for - * admin and customers country & state fields - * auto population - */ - public function prepareCountryStateData() - { - $countries = json_decode(file_get_contents(base_path().'/packages/Webkul/Core/src/Data/countries.json'), true); - - DB::table('countries')->insert($countries); - - $states = json_decode(file_get_contents(base_path().'/packages/Webkul/Core/src/Data/states.json'), true); - - DB::table('country_states')->insert($states); - - return true; - } - - /** - * To prepare the cms pages data for the seller's shop - */ - public function prepareCMSPagesData($channel, $locale) - { - $aboutus = [ - 'url_key' => 'about-us', - 'html_content' => '
-
About us page content
-
', - 'page_title' => 'About Us', - 'meta_title' => 'about us', - 'meta_description' => '', - 'meta_keywords' => 'aboutus', - 'content' => '{"html": "
\r\n
About us page content
\r\n
", - "meta_title": "about us", - "page_title": "About Us", - "meta_keywords": "aboutus ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($aboutus); - - $returnpolicy = [ - 'url_key' => 'return-policy', - 'html_content' => '
-
Return policy page content
-
', - 'page_title' => 'Return Policy', - 'meta_title' => 'return policy', - 'meta_description' => '', - 'meta_keywords' => 'return, policy', - 'content' => '{"html": "
\r\n
Return policy page content
\r\n
", - "meta_title": "return policy", - "page_title": "Return Policy", - "meta_keywords": "return, policy ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($returnpolicy); - - $refundpolicy = [ - 'url_key' => 'refund-policy', - 'html_content' => '
-
Refund policy page content
-
', - 'page_title' => 'Refund Policy', - 'meta_title' => 'Refund policy', - 'meta_description' => '', - 'meta_keywords' => 'refund, policy', - 'content' => '{"html": "
\r\n
Refund policy page content
\r\n
", - "meta_title": "Refund policy", - "page_title": "Refund Policy", - "meta_keywords": "refund,policy ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($refundpolicy); - - $termsconditions = [ - 'url_key' => 'terms-conditions', - 'html_content' => '
-
Terms & conditions page content
-
', - 'page_title' => 'Terms & Conditions', - 'meta_title' => 'Terms & Conditions', - 'meta_description' => '', - 'meta_keywords' => 'term, conditions', - 'content' => '{"html": "
\r\n
Terms & conditions page content
\r\n
", - "meta_title": "Terms & Conditions", - "page_title": "Terms & Conditions", - "meta_keywords": "terms, conditions ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($termsconditions); - - $termsofuse = [ - 'url_key' => 'terms-of-use', - 'html_content' => '
-
Terms of use page content
-
', - 'page_title' => 'Terms of use', - 'meta_title' => 'Terms of use', - 'meta_description' => '', - 'meta_keywords' => 'term, use', - 'content' => '{"html": "
\r\n
Terms of use page content
\r\n
", - "meta_title": "Terms of use", - "page_title": "Terms of use", - "meta_keywords": "terms, use ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($termsofuse); - - $contactus = [ - 'url_key' => 'contact-us', - 'html_content' => '
-
Contact us page content
-
', - 'page_title' => 'Contact Us', - 'meta_title' => 'Contact Us', - 'meta_description' => '', - 'meta_keywords' => 'contact, us', - 'content' => '{"html": "
\r\n
Contact us page content
\r\n
", - "meta_title": "Contact Us", - "page_title": "Contact Us", - "meta_keywords": "contact, us ", "meta_description": ""}', - 'channel_id' => $channel->id, - 'locale_id' => $locale->id, - 'company_id' => $this->company->id - ]; - - $this->cms->create($contactus); - } - - /** - * It will store a check in the companies - * that all the necessary data had been - * inserted successfully or not - * - * @param boolean seedCompleted - */ - public function setInstallationCompleteParam() - { - $this->seedCompleted = true; - - $info = [ - 'company_created' => true, - 'seeded' => true - ]; - - $info = json_encode($info); - - $this->company->update([ - 'more_info' => $info - ]); - - return true; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Helpers/StatsPurger.php b/packages/Webkul/SAASCustomizer/src/Helpers/StatsPurger.php deleted file mode 100644 index aba932432..000000000 --- a/packages/Webkul/SAASCustomizer/src/Helpers/StatsPurger.php +++ /dev/null @@ -1,77 +0,0 @@ -category = $category; - $this->inventory = $inventory; - $this->locale = $locale; - $this->currency = $currency; - $this->channel = $channel; - $this->attribute = $attribute; - $this->attributeFamily = $attributeFamily; - $this->attributeGroup = $attributeGroup; - $this->customerGroup = $customerGroup; - $this->product = $product; - } - - public function getAggregates($companyId) - { - $products = DB::table('products')->where('company_id', '=', $companyId)->count(); - $attributes = DB::table('attributes')->where('company_id', '=', $companyId)->count(); - $customers = DB::table('customers')->where('company_id', '=', $companyId)->count(); - $customerGroups = DB::table('customer_groups')->where('company_id', '=', $companyId)->count(); - $categories = DB::table('categories')->where('company_id', '=', $companyId)->count(); - - return [ - 'products' => $products, - 'attributes' => $attributes, - 'customers' => $customers, - 'customer-groups' => $customerGroups, - 'categories' => $categories - ]; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Http/Controllers/CompanyController.php b/packages/Webkul/SAASCustomizer/src/Http/Controllers/CompanyController.php deleted file mode 100644 index 7e53118c3..000000000 --- a/packages/Webkul/SAASCustomizer/src/Http/Controllers/CompanyController.php +++ /dev/null @@ -1,302 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CompanyController extends Controller -{ - protected $attribute; - protected $_config; - protected $details; - protected $admin; - protected $role; - protected $dataSeed; - protected $companyStats; - - public function __construct(CompanyRepository $company, CompanyDetailsRepository $details, Admin $admin, Role $role, DataPurger $dataSeed, StatsPurger $companyStats) - { - $this->company = $company; - $this->details = $details; - $this->admin = $admin; - $this->role = $role; - $this->dataSeed = $dataSeed; - $this->companyStats = $companyStats; - $this->_config = request('_config'); - $this->middleware('auth:super-admin', ['only' => ['showCompanyStats', 'edit', 'update']]); - - if (! Company::isAllowed()) { - throw new \Exception('not_allowed_to_visit_this_section', 400); - } - } - - public function showCompanyStats($id) - { - $aggregates = $this->companyStats->getAggregates($id); - - $company = $this->company->find($id); - - return view('saas::companies.company.index')->with('company', [$company, $aggregates]); - } - - public function create() - { - return view($this->_config['view']); - } - - protected function store() - { - $validator = Validator::make(Request::all(), [ - 'email' => 'required|email|max:191|unique:admins,email', - 'password' => 'required|string|confirmed|min:6', - 'username' => 'required|alpha_num|min:3|max:64', - 'first_name' => 'required|string|max:191', - 'last_name' => 'nullable|string|max:191', - 'phone_no' => 'required', - 'org_name' => 'required|string|max:191' - ]); - - $data = Request::all(); - - $authEmail = $data['email']; - unset($data['email']); - - if ($validator->fails()) { - return response()->json(['success' => false, 'errors' => $validator->errors()], 403); - } - - $validator = Validator::make(Request::all(), [ - 'username' => 'not_in:'.implode(',', config('excluded-sites')) - ]); - - if ($validator->fails()) { - return response()->json([ - 'success' => false, - 'errors' => $validator->errors() - ], 403); - } - - if (strtolower($data['username']) == 'www' || strtolower($data['username']) == 'http' || strtolower($data['username']) == 'https') { - session()->flash('warning', 'Illegal subdomain name'); - } - - $data['name'] = $data['org_name']; - unset($data['org_name']); - - $primaryServerName = config('app.url'); - - if (str_contains($primaryServerName, 'http://')) { - $primaryServerNameWithoutProtocol = explode('http://', $primaryServerName)[1]; - } else if (str_contains($primaryServerName, 'https://')) { - $primaryServerNameWithoutProtocol = explode('https://', $primaryServerName)[1]; - } - - $currentURL = $_SERVER['SERVER_NAME']; - - if (substr_count($currentURL, '.') > 1) { - $primaryServerNameWithoutProtocol = explode('.', $primaryServerNameWithoutProtocol); - - if ($data['username'] != $primaryServerNameWithoutProtocol[0]) { - $primaryServerNameWithoutProtocol[0] = $data['username']; - - $primaryServeNameWithoutProtocol = implode('.', $primaryServerNameWithoutProtocol); - - $temp = explode('/', $primaryServeNameWithoutProtocol); - - $data['domain'] = current($temp); - - $data['url'] = $primaryServeNameWithoutProtocol; - } else { - return response()->json([ - 'success' => false, - 'errors' => [trans('saas::app.custom-errors.same-domain')] - ], 403); - } - } else { - $data['domain'] = strtolower($data['username']). '.' . $primaryServerNameWithoutProtocol; - } - - $validator = Validator::make($data, [ - 'domain' => 'required|unique:companies,domain' - ]); - - if ($validator->fails()) { - return response()->json(['success' => false, 'errors' => $validator->errors()], 403); - } - - $company = $this->company->create($data); - - if ($company) { - $info = [ - 'created' => true, - 'seeded' => false - ]; - - $info = json_encode($info); - - $company->update([ - 'extra_info' => $info - ]); - - $data['password'] = bcrypt($data['password']); - $data['name'] = $data['first_name'].' '.$data['last_name']; - $data['status'] = 1; - - //creates a new full privilege role when new company is registered - $role = $this->role->create([ - 'name' => 'Administrator', - 'description' => 'Administrator role', - 'permission_type' => 'all', - 'company_id' => $company->id - ]); - - $data['role_id'] = $role->id; - $data['email'] = $authEmail; - $data['company_id'] = $company->id; - - //creates a new full privilege admin with newly created role above - $this->admin->create($data); - - //creates the personal details record for the company - $this->details->create($data); - - return response()->json([ - 'success' => true, 'redirect' => isset($data['url']) ? $data['url'] : $data['domain'] - ], 200); - } else { - return response()->json([ - 'success' => false - ], 403); - } - } - - public function validateStepOne() - { - $niceNames = array( - 'email' => 'Email' - ); - - $validator = Validator::make(request()->all(), [ - 'email' => 'required|email|unique:admins,email' - ]); - - $validator->setAttributeNames($niceNames); - - if ($validator->fails()) { - return response()->json([ - 'success' => false, - 'errors' => $validator->errors() - ], 403); - } else { - return response()->json([ - 'success' => true, - 'errors' => null - ], 200); - } - } - - public function validateStepThree() - { - $niceNames = array( - 'username' => 'Username', - 'org_name' => 'Organization Name' - ); - - $validator = Validator::make(request()->all(), [ - 'username' => 'required|alpha_num|min:3|max:64|unique:companies,username', - 'org_name' => 'required|string|max:191|unique:companies,name' - ]); - - $validator->setAttributeNames($niceNames); - - if ($validator->fails()) { - return response()->json([ - 'success' => false, - 'errors' => $validator->errors() - ], 403); - } else { - return response()->json([ - 'success' => true, - 'errors' => null - ], 200); - } - - // $this->validate(request(), [ - // 'username' => 'required|alpha_num|min:3|max:64|unique:companies,username', - // 'org_name' => 'required|string|max:191|unique:companies,name' - // ]); - } - - public function edit($id) - { - $company = $this->company->findOrFail($id); - - return view('saas::companies.company.edit')->with('company', $company); - } - - public function update($id) - { - $this->validate(request(), [ - 'email' => 'email|max:191|unique:companies,email,'.$id, - 'name' => 'required|string|max:191|unique:companies,name,'.$id, - 'domain' => 'required|string|max:191|unique:companies,domain,'.$id, - 'is_active' => 'required|boolean' - ]); - - $data = request()->all(); - - $company = $this->company->findOrFail($id); - - if ($company) { - $result = $company->update($data); - - if ($result) { - session()->flash('success', trans('saas::app.status.something-wrong')); - } else { - session()->flash('warning', trans('saas::app.status.something-wrong')); - } - } else { - session()->flash('warning', trans('saas::app.status.something-wrong')); - } - - return redirect()->back(); - } - - protected function changeStatus($id) - { - $company = $this->company->find($id); - - if ($company->is_active == 0) { - $company->update([ - 'is_active' => 1 - ]); - - session()->flash('success', trans('saas::app.status.company-activated')); - } else { - $company->update([ - 'is_active' => 0 - ]); - - session()->flash('warning', trans('saas::app.status.company-deactivated')); - } - - return redirect()->back(); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Http/Controllers/Controller.php b/packages/Webkul/SAASCustomizer/src/Http/Controllers/Controller.php deleted file mode 100755 index b991f412d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class PurgeController extends Controller -{ - protected $dataSeed; - - public function __construct(DataPurger $dataSeed) - { - $this->dataSeed = $dataSeed; - $this->_config = request('_config'); - } - - public function seedDatabase() - { - $locale = $this->dataSeed->prepareLocaleData(); - - $this->dataSeed->prepareCategoryData(); // translation table not getting populated - - $this->dataSeed->prepareInventoryData(); - - $this->dataSeed->prepareCurrencyData(); - - $channel = $this->dataSeed->prepareChannelData(); - - // need to get executed only first time - if (Company::count() == 1) { - try { - $this->dataSeed->prepareCountryStateData(); - } catch (\Exception $e) { - - } - } - - $this->dataSeed->prepareCustomerGroupData(); - - $this->dataSeed->prepareAttributeData(); - - $this->dataSeed->prepareAttributeFamilyData(); - - $this->dataSeed->prepareAttributeGroupData(); - - $this->dataSeed->prepareCMSPagesData($channel, $locale); - - Event::fire('new.company.registered'); - - $this->dataSeed->setInstallationCompleteParam(); - - session()->flash('success', trans('saas::app.status.store-created')); - - return redirect()->route('shop.home.index'); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Http/Controllers/SuperUserController.php b/packages/Webkul/SAASCustomizer/src/Http/Controllers/SuperUserController.php deleted file mode 100644 index 7ff5fd08d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Http/Controllers/SuperUserController.php +++ /dev/null @@ -1,69 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class SuperUserController extends Controller -{ - public function __construct() - { - $this->middleware('auth:super-admin', ['only' => ['list']]); - } - - /** - * To show the login screen - */ - public function index() - { - if (! auth()->guard('super-admin')->check()) { - return view('saas::companies.auth.login'); - } else { - return redirect()->route('super.session.index'); - } - } - - public function store() - { - $this->validate(request(), [ - 'email' => 'required|email', - 'password' => 'required' - ]); - - if (! auth()->guard('super-admin')->attempt(request(['email', 'password']))) { - session()->flash('error', trans('admin::app.users.users.login-error')); - - return redirect()->route('super.session.index'); - } - - session()->flash('success', 'Logged in successfully'); - - return redirect()->route('super.companies.index'); - } - - public function list() - { - return view('saas::companies.index'); - } - - /** - * Remove the specified resource from storage. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function destroy() - { - auth()->guard('super-admin')->logout(); - - return redirect()->route('super.session.index'); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Http/Middleware/RedirectIfNotSuperAdmin.php b/packages/Webkul/SAASCustomizer/src/Http/Middleware/RedirectIfNotSuperAdmin.php deleted file mode 100755 index 7df06c001..000000000 --- a/packages/Webkul/SAASCustomizer/src/Http/Middleware/RedirectIfNotSuperAdmin.php +++ /dev/null @@ -1,26 +0,0 @@ -check()) { - return redirect()->route('super.session.index'); - } - - return $next($request); - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Http/Middleware/ValidatesDomain.php b/packages/Webkul/SAASCustomizer/src/Http/Middleware/ValidatesDomain.php deleted file mode 100644 index ff25d7513..000000000 --- a/packages/Webkul/SAASCustomizer/src/Http/Middleware/ValidatesDomain.php +++ /dev/null @@ -1,87 +0,0 @@ -company = $company; - } - - /** - * Handle an incoming request. - * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @return mixed - */ - public function handle($request, Closure $next) - { - $primaryServerName = config('app.url'); - - $currentURL = $_SERVER['SERVER_NAME']; - - $params['domain'] = $currentURL; - - $validator = Validator::make($params, [ - 'domain' => 'required|ip' - ]); - - if (str_contains($primaryServerName, 'http://')) { - $primaryServerNameWithoutProtocol = explode('http://', $primaryServerName)[1]; - } else if (str_contains($primaryServerName, 'https://')) { - $primaryServerNameWithoutProtocol = explode('https://', $primaryServerName)[1]; - } - - //restricts the IP address usage to access the system - if ($validator->fails()) { - //case where IP validation fails - if (str_contains($currentURL, 'http://')) { - $currentURL = explode('http://', $currentURL)[1]; - } else if (str_contains($currentURL, 'http://')) { - $currentURL = explode('http://', $currentURL)[1]; - } - } else { - //case where IP validation passes then it should redirect to the main domain - return redirect()->route('company.create.index'); - } - - if (str_contains($primaryServerNameWithoutProtocol, '/')) { - $primaryServerNameWithoutProtocol = explode('/', $primaryServerNameWithoutProtocol)[0]; - } - - if ($currentURL == $primaryServerNameWithoutProtocol) { - if (request()->is('company/*') || request()->is('super/*')) { - return $next($request); - } else { - return redirect()->route('company.create.index'); - } - } else { - if ((request()->is('company/*') || request()->is('super/*')) && ! request()->is('company/seed-data')) { - throw new \Exception('not_allowed_to_visit_this_section', 400); - } else { - $company = $this->company->findWhere(['domain' => $currentURL]); - - if (count($company) == 1) { - return $next($request); - } else if (count($company) == 0) { - throw new \Exception('domain_not_found', 400); - } else { - return $next($request); - } - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php b/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php deleted file mode 100644 index 54c0e56e3..000000000 --- a/packages/Webkul/SAASCustomizer/src/Listeners/CompanyRegistered.php +++ /dev/null @@ -1,33 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CompanyRegistered -{ - public function handle() - { - $company = Company::getCurrent(); - - foreach(config('purge-pool') as $key => $pool) { - $poolInstance = app($pool); - - $poolInstance->createPreOrderData($company->id); - } - - try { - Mail::queue(new NewCompanyNotification($company)); - } catch (\Exception $e) { - - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Attribute/Attribute.php b/packages/Webkul/SAASCustomizer/src/Models/Attribute/Attribute.php deleted file mode 100644 index 8e83a4dcd..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Attribute/Attribute.php +++ /dev/null @@ -1,29 +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('attributes' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeFamily.php b/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeFamily.php deleted file mode 100755 index ea11afed6..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeFamily.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('attribute_families' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeGroup.php b/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeGroup.php deleted file mode 100755 index c093338f9..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeGroup.php +++ /dev/null @@ -1,29 +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('attribute_groups' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeOption.php b/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeOption.php deleted file mode 100755 index 83b435090..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Attribute/AttributeOption.php +++ /dev/null @@ -1,20 +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('cms_pages' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Category/Category.php b/packages/Webkul/SAASCustomizer/src/Models/Category/Category.php deleted file mode 100755 index 208a38f8e..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Category/Category.php +++ /dev/null @@ -1,28 +0,0 @@ -guard('super-admin')->check() || ! isset($company->id)) { - return new QueryBuilder($query); - } else { - return new QueryBuilder($query->where('categories.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Category/CategoryTranslation.php b/packages/Webkul/SAASCustomizer/src/Models/Category/CategoryTranslation.php deleted file mode 100755 index aabdf4cb3..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Category/CategoryTranslation.php +++ /dev/null @@ -1,29 +0,0 @@ -where('category_translations' . '.company_id', $company->id)); - // } else { - // return new \Illuminate\Database\Eloquent\Builder($query->where('category_translations' . '.company_id', null)); - // } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Checkout/Cart.php b/packages/Webkul/SAASCustomizer/src/Models/Checkout/Cart.php deleted file mode 100755 index 02fc71c19..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Checkout/Cart.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('cart' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Checkout/CartAddress.php b/packages/Webkul/SAASCustomizer/src/Models/Checkout/CartAddress.php deleted file mode 100755 index d99a015ee..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Checkout/CartAddress.php +++ /dev/null @@ -1,22 +0,0 @@ -hasOne(CompanyDetails::class); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/CompanyDetails.php b/packages/Webkul/SAASCustomizer/src/Models/CompanyDetails.php deleted file mode 100644 index 6776b912f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/CompanyDetails.php +++ /dev/null @@ -1,17 +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('channels' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/CoreConfig.php b/packages/Webkul/SAASCustomizer/src/Models/Core/CoreConfig.php deleted file mode 100755 index 29a185898..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/CoreConfig.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('core_config' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/Currency.php b/packages/Webkul/SAASCustomizer/src/Models/Core/Currency.php deleted file mode 100755 index bd411bcc7..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/Currency.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('currencies' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/CurrencyExchangeRate.php b/packages/Webkul/SAASCustomizer/src/Models/Core/CurrencyExchangeRate.php deleted file mode 100755 index 96664a82d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/CurrencyExchangeRate.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('currency_exchange_rates' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/Locale.php b/packages/Webkul/SAASCustomizer/src/Models/Core/Locale.php deleted file mode 100755 index 742b74f2a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/Locale.php +++ /dev/null @@ -1,28 +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('locales' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/Slider.php b/packages/Webkul/SAASCustomizer/src/Models/Core/Slider.php deleted file mode 100755 index 845e18e99..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/Slider.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('sliders' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Core/SubscribersList.php b/packages/Webkul/SAASCustomizer/src/Models/Core/SubscribersList.php deleted file mode 100755 index 24a059c29..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Core/SubscribersList.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('subscribers_list' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Customer/Customer.php b/packages/Webkul/SAASCustomizer/src/Models/Customer/Customer.php deleted file mode 100755 index eeba8ebb9..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Customer/Customer.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('customers' . '.company_id', $company->id)); - } - } -} diff --git a/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerAddress.php b/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerAddress.php deleted file mode 100755 index 5a264fd2d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerAddress.php +++ /dev/null @@ -1,28 +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('customer_addresses' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerGroup.php b/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerGroup.php deleted file mode 100755 index e7e20599c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Customer/CustomerGroup.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('customer_groups' . '.company_id', $company->id)); - } - - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Customer/Wishlist.php b/packages/Webkul/SAASCustomizer/src/Models/Customer/Wishlist.php deleted file mode 100755 index ccb4d0ca7..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Customer/Wishlist.php +++ /dev/null @@ -1,29 +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('wishlist' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CartRule.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CartRule.php deleted file mode 100644 index c923e1b66..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Discount/CartRule.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('cart_rules' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.php deleted file mode 100644 index a2f49d784..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRule.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('cart_rules' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.php deleted file mode 100644 index ba7a31c71..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProducts.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('cart_rules' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php b/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.php deleted file mode 100644 index 69b4fde2f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Discount/CatalogRuleProductsPrice.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('cart_rules' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Inventory/InventorySource.php b/packages/Webkul/SAASCustomizer/src/Models/Inventory/InventorySource.php deleted file mode 100755 index 00cc86c7a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Inventory/InventorySource.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('inventory_sources' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Product/Product.php b/packages/Webkul/SAASCustomizer/src/Models/Product/Product.php deleted file mode 100755 index 3400c3333..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Product/Product.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('products' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductAttributeValue.php b/packages/Webkul/SAASCustomizer/src/Models/Product/ProductAttributeValue.php deleted file mode 100755 index aed510c1c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductAttributeValue.php +++ /dev/null @@ -1,21 +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('product_flat' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductImage.php b/packages/Webkul/SAASCustomizer/src/Models/Product/ProductImage.php deleted file mode 100755 index ca4a18ae6..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductImage.php +++ /dev/null @@ -1,21 +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('product_inventories' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductOrderedInventory.php b/packages/Webkul/SAASCustomizer/src/Models/Product/ProductOrderedInventory.php deleted file mode 100644 index a72e4f284..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Product/ProductOrderedInventory.php +++ /dev/null @@ -1,21 +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('product_reviews' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/Invoice.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/Invoice.php deleted file mode 100755 index 004f8eb9c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/Invoice.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('invoices' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/InvoiceItem.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/InvoiceItem.php deleted file mode 100755 index fc92be1e8..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/InvoiceItem.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('invoice_items' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/Order.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/Order.php deleted file mode 100755 index e456167f7..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/Order.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('orders' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderAddress.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderAddress.php deleted file mode 100755 index d5d7cb4be..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderAddress.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('order_address' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderItem.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderItem.php deleted file mode 100755 index 265c083b4..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderItem.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('order_items' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderPayment.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderPayment.php deleted file mode 100755 index 25f6fcb39..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/OrderPayment.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('order_payment' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/Shipment.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/Shipment.php deleted file mode 100755 index 6de5aba03..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/Shipment.php +++ /dev/null @@ -1,26 +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('shipments' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Sales/ShipmentItem.php b/packages/Webkul/SAASCustomizer/src/Models/Sales/ShipmentItem.php deleted file mode 100755 index 40616890c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Sales/ShipmentItem.php +++ /dev/null @@ -1,28 +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('shipment_items' . '.company_id', $company->id)); - - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/SuperAdmin.php b/packages/Webkul/SAASCustomizer/src/Models/SuperAdmin.php deleted file mode 100644 index ccbe0b506..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/SuperAdmin.php +++ /dev/null @@ -1,24 +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('tax_categories' . '.company_id', $company->id)); - - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/Tax/TaxMap.php b/packages/Webkul/SAASCustomizer/src/Models/Tax/TaxMap.php deleted file mode 100755 index edfc19709..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/Tax/TaxMap.php +++ /dev/null @@ -1,19 +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('tax_rates' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/User/Admin.php b/packages/Webkul/SAASCustomizer/src/Models/User/Admin.php deleted file mode 100755 index 7bb89f68d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/User/Admin.php +++ /dev/null @@ -1,36 +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('admins' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Models/User/Role.php b/packages/Webkul/SAASCustomizer/src/Models/User/Role.php deleted file mode 100755 index df08164cd..000000000 --- a/packages/Webkul/SAASCustomizer/src/Models/User/Role.php +++ /dev/null @@ -1,30 +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('roles' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php b/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php deleted file mode 100644 index bc0c8a1ae..000000000 --- a/packages/Webkul/SAASCustomizer/src/Notifications/NewCompanyNotification.php +++ /dev/null @@ -1,50 +0,0 @@ - @prashant-webkul - * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class NewCompanyNotification extends Mailable -{ - use Queueable, SerializesModels; - - /** - * @var Company - */ - public $company; - - /** - * Create a new message instance. - * - * @return void - */ - public function __construct($company) - { - $this->company = $company; - } - - /** - * Build the message. - * - * @return $this - */ - public function build() - { - $superAdmin = new SuperAdmin; - $superAdmin = $superAdmin->all()->first(); - - return $this->to($superAdmin->email) - ->subject('New Company Registered') - ->view('saas::emails.new-company')->with('company', $this->company); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Notifications/SuperAdminGenerated.php b/packages/Webkul/SAASCustomizer/src/Notifications/SuperAdminGenerated.php deleted file mode 100644 index e1fb31146..000000000 --- a/packages/Webkul/SAASCustomizer/src/Notifications/SuperAdminGenerated.php +++ /dev/null @@ -1,48 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class SuperAdminGeneratedNotification extends Mailable -{ - use Queueable, SerializesModels; - - /** - * The order instance. - * - * @var Order - */ - // public $order; - - /** - * Create a new message instance. - * - * @return void - */ - public function __construct() - { - // $this->order = $order; - } - - /** - * Build the message. - * - * @return $this - */ - public function build() - { - // return $this->to(env('ADMIN_MAIL_TO')) - // ->subject(trans('shop::app.mail.order.subject')) - // ->view('shop::emails.sales.new-admin-order'); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeFamilyObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeFamilyObserver.php deleted file mode 100755 index 585f3f1a6..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeFamilyObserver.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/Observers/Attribute/AttributeGroupObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeGroupObserver.php deleted file mode 100755 index 4ad9953bb..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeGroupObserver.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/Observers/Attribute/AttributeObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeObserver.php deleted file mode 100644 index 18cfecc3d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeObserver.php +++ /dev/null @@ -1,25 +0,0 @@ -guard('super-admin')->check()) { - $model->use_in_flat = 0; - $model->company_id = Company::getCurrent()->id; - } - } - - public function updating(Attribute $model) - { - if (! auth()->guard('super-admin')->check()) { - $model->use_in_flat = 0; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeOptionObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeOptionObserver.php deleted file mode 100755 index 772af5a1a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Attribute/AttributeOptionObserver.php +++ /dev/null @@ -1,15 +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/Observers/Category/CategoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Category/CategoryObserver.php deleted file mode 100755 index f367d839e..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Category/CategoryObserver.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/Observers/Category/CategoryTranslationObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Category/CategoryTranslationObserver.php deleted file mode 100755 index 48401125f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Category/CategoryTranslationObserver.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/Observers/Checkout/CartAddressObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Checkout/CartAddressObserver.php deleted file mode 100755 index 9fa15b4d8..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Checkout/CartAddressObserver.php +++ /dev/null @@ -1,14 +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/Observers/Checkout/CartPaymentObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Checkout/CartPaymentObserver.php deleted file mode 100755 index b5cabeb88..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Checkout/CartPaymentObserver.php +++ /dev/null @@ -1,14 +0,0 @@ -guard('super-admin')->check()) { - if ($model->count() == 0) { - $model->company_id = Company::getCurrent()->id; - } else { - session()->flash('error', trans('saas::app.custom-errors.channel-creating')); - - throw new \Exception('illegal_action'); - } - } - } - - public function updating(Channel $channel) - { - if (! auth()->guard('super-admin')->check()) { - if ($channel->hostname != Company::getCurrent()->domain) { - session()->flash('warning', trans('saas::app.custom-errors.channel-hostname')); - - throw new \Exception('illegal_action'); - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Core/CoreConfigObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/CoreConfigObserver.php deleted file mode 100755 index 18d7f693f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/CoreConfigObserver.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/Observers/Core/CurrencyExchangeRate.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/CurrencyExchangeRate.php deleted file mode 100755 index 1a4602a90..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/CurrencyExchangeRate.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/Observers/Core/CurrencyObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/CurrencyObserver.php deleted file mode 100755 index 29093a218..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/CurrencyObserver.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/Observers/Core/LocaleObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/LocaleObserver.php deleted file mode 100755 index edf55f642..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/LocaleObserver.php +++ /dev/null @@ -1,32 +0,0 @@ -guard('super-admin')->check()) { - if ($model->count() == 0) { - $model->company_id = Company::getCurrent()->id; - } else { - session()->flash('error', trans('saas::app.custom-errors.locale-creation')); - - abort(404); - } - } - } - - public function deleting(Locale $model) - { - if ($model->count() == 1) { - session()->flash('error', trans('saas::app.custom-errors.locale-delete')); - } - - return false; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/Core/SliderObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/SliderObserver.php deleted file mode 100755 index 626804026..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/SliderObserver.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/Observers/Core/SubscribersListObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Core/SubscribersListObserver.php deleted file mode 100755 index 3927f0c28..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Core/SubscribersListObserver.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/Observers/Customer/CustomerAddressObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerAddressObserver.php deleted file mode 100755 index 8688abc8a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerAddressObserver.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/Observers/Customer/CustomerGroupObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerGroupObserver.php deleted file mode 100755 index 88502367f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerGroupObserver.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/Observers/Customer/CustomerObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerObserver.php deleted file mode 100755 index da4047acd..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Customer/CustomerObserver.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/Observers/Customer/WishlistObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Customer/WishlistObserver.php deleted file mode 100755 index 8231249b4..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Customer/WishlistObserver.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/Observers/Discount/CartRuleObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CartRuleObserver.php deleted file mode 100644 index d0e24586c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CartRuleObserver.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/Observers/Discount/CatalogRuleObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.php deleted file mode 100644 index 78aee2b74..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleObserver.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/Observers/Discount/CatalogRuleProductsObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.php deleted file mode 100644 index 31a42daa3..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsObserver.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/Observers/Discount/CatalogRuleProductsPriceObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.php deleted file mode 100644 index 5698a68b4..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Discount/CatalogRuleProductsPriceObserver.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/Observers/Inventory/InventorySourceObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Inventory/InventorySourceObserver.php deleted file mode 100755 index c097a23c4..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Inventory/InventorySourceObserver.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/Observers/Product/ProductAttributeValueObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductAttributeValueObserver.php deleted file mode 100755 index 987cf6a27..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductAttributeValueObserver.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/Observers/Product/ProductFlatObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductFlatObserver.php deleted file mode 100644 index b1cf611e1..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductFlatObserver.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/Observers/Product/ProductImageObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductImageObserver.php deleted file mode 100755 index dcf8f2efb..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductImageObserver.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/Observers/Product/ProductInventoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductInventoryObserver.php deleted file mode 100755 index 6eb7221a7..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductInventoryObserver.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/Observers/Product/ProductObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductObserver.php deleted file mode 100755 index eeb66731d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductObserver.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/Observers/Product/ProductOrderedInventoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductOrderedInventoryObserver.php deleted file mode 100644 index 568a56dd9..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductOrderedInventoryObserver.php +++ /dev/null @@ -1,14 +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/Observers/Product/ProductSalableInventoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductSalableInventoryObserver.php deleted file mode 100644 index d43283012..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Product/ProductSalableInventoryObserver.php +++ /dev/null @@ -1,14 +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/Observers/Sales/InvoiceObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/InvoiceObserver.php deleted file mode 100755 index 304b1fa42..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/InvoiceObserver.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/Observers/Sales/OrderAddressObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderAddressObserver.php deleted file mode 100755 index 737153040..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderAddressObserver.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/Observers/Sales/OrderItemInventoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderItemInventoryObserver.php deleted file mode 100755 index c41fb3d40..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderItemInventoryObserver.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/Observers/Sales/OrderItemObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderItemObserver.php deleted file mode 100755 index f8ad1ca50..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderItemObserver.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/Observers/Sales/OrderObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderObserver.php deleted file mode 100755 index 253f278ae..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderObserver.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/Observers/Sales/OrderPaymentObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderPaymentObserver.php deleted file mode 100755 index f29aa2906..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/OrderPaymentObserver.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/Observers/Sales/ShipmentItemObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/ShipmentItemObserver.php deleted file mode 100755 index be48d8846..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/ShipmentItemObserver.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/Observers/Sales/ShipmentObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Sales/ShipmentObserver.php deleted file mode 100755 index 673166373..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Sales/ShipmentObserver.php +++ /dev/null @@ -1,16 +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/Observers/Tax/TaxCategoryObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Tax/TaxCategoryObserver.php deleted file mode 100755 index 20bd17286..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Tax/TaxCategoryObserver.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/Observers/Tax/TaxRateObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/Tax/TaxRateObserver.php deleted file mode 100755 index 9697c449b..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/Tax/TaxRateObserver.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/Observers/User/AdminObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/User/AdminObserver.php deleted file mode 100755 index 00d4e3de9..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/User/AdminObserver.php +++ /dev/null @@ -1,19 +0,0 @@ -company_id)) { - $model->company_id = Company::getCurrent()->id; - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Observers/User/RoleObserver.php b/packages/Webkul/SAASCustomizer/src/Observers/User/RoleObserver.php deleted file mode 100755 index 2214fd267..000000000 --- a/packages/Webkul/SAASCustomizer/src/Observers/User/RoleObserver.php +++ /dev/null @@ -1,19 +0,0 @@ -company_id)) { - $model->company_id = Company::getCurrent()->id; - } - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Providers/EventServiceProvider.php b/packages/Webkul/SAASCustomizer/src/Providers/EventServiceProvider.php deleted file mode 100644 index ee16a2bb2..000000000 --- a/packages/Webkul/SAASCustomizer/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,19 +0,0 @@ -loadRoutesFrom(__DIR__.'/../Routes/web.php'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'saas'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'saas'); - - $this->publishes([ - __DIR__ . '/../../publishable/assets' => public_path('vendor/webkul/saas/assets'), - ], 'public'); - - $router->aliasMiddleware('super-admin', RedirectIfNotSuperAdmin::class); - - //over ride system's default validation - $this->registerPresenceVerifier(); - - //over ride system's default validation DB presence verifier - $this->registerValidationFactory(); - - //model observer for all the core models of Bagisto - $this->bootModelObservers(); - - //over ride all existing core models of Bagisto - $this->overrideModels(); - - $this->app->bind( - ExceptionHandler::class, - Handler::class - ); - - $this->composeView(); - - $this->app->register(EventServiceProvider::class); - - $this->app->register(ModuleServiceProvider::class); - } - - /** - * Compose View - */ - public function composeView() - { - view()->composer(['saas::companies.layouts.nav-left', 'saas::companies.layouts.nav-aside'], function ($view) { - $tree = Tree::create(); - - foreach (config('menu.super-admin') as $index => $item) { - $tree->add($item, 'menu'); - } - - $tree->items = core()->sortItems($tree->items); - - $view->with('menu', $tree); - }); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - - $this->registerFacades(); - - //override DB facade - $this->app->singleton('db', function ($app) { - return new \Webkul\SAASCustomizer\Database\DatabaseManager($app, $app['db.factory']); - }); - - $this->commands($this->commands); - } - - public function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/purge-pool.php', 'purge-pool' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/super-menu.php', 'menu.super-admin' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/excluded-sites.php', 'excluded-sites' - ); - } - - /** - * Register the validation factory. - * - * @return void - */ - protected function registerValidationFactory() - { - $this->app->singleton('validator', function ($app) { - $validator = new \Illuminate\Validation\Factory($app['translator'], $app); - - // The validation presence verifier is responsible for determining the existence of - // values in a given data collection which is typically a relational database or - // other persistent data stores. It is used to check for "uniqueness" as well. - if (isset($app['db'], $app['validation.presence'])) { - $validator->setPresenceVerifier($app['validation.presence']); - } - - return $validator; - }); - } - - /** - * Register the database presence verifier. - * - * @return void - */ - protected function registerPresenceVerifier() - { - $this->app->singleton('validation.presence', function ($app) { - return new \Webkul\SAASCustomizer\Validation\DatabasePresenceVerifier($app['db']); - }); - } - - - /** - * Register Bouncer as a singleton. - * - * @return void - */ - protected function registerFacades() - { - $loader = AliasLoader::getInstance(); - $loader->alias('company', CompanyFacade::class); - - $this->app->singleton('company', function () { - return app()->make(Company::class); - }); - } - - /** - * Override the existing models - */ - public function overrideModels() - { - // Attribute Models Starts - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\Attribute::class, \Webkul\SAASCustomizer\Models\Attribute\Attribute::class); - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\AttributeFamily::class, \Webkul\SAASCustomizer\Models\Attribute\AttributeFamily::class); - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\AttributeGroup::class, \Webkul\SAASCustomizer\Models\Attribute\AttributeGroup::class); - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\AttributeOption::class, \Webkul\SAASCustomizer\Models\Attribute\AttributeOption::class); - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\AttributeOptionTranslation::class, \Webkul\SAASCustomizer\Models\Attribute\AttributeOptionTranslation::class); - $this->app->concord->registerModel(\Webkul\Attribute\Contracts\AttributeTranslation::class, \Webkul\SAASCustomizer\Models\Attribute\AttributeTranslation::class); - - // Category Models Starts - $this->app->concord->registerModel(\Webkul\Category\Contracts\Category::class, \Webkul\SAASCustomizer\Models\Category\Category::class); - $this->app->concord->registerModel(\Webkul\Category\Contracts\CategoryTranslation::class, \Webkul\SAASCustomizer\Models\Category\CategoryTranslation::class); - - // Checkout Models Starts - $this->app->concord->registerModel(\Webkul\Checkout\Contracts\Cart::class, \Webkul\SAASCustomizer\Models\Checkout\Cart::class); - $this->app->concord->registerModel(\Webkul\Checkout\Contracts\CartAddress::class, \Webkul\SAASCustomizer\Models\Checkout\CartAddress::class); - $this->app->concord->registerModel(\Webkul\Checkout\Contracts\CartItem::class, \Webkul\SAASCustomizer\Models\Checkout\CartItem::class); - $this->app->concord->registerModel(\Webkul\Checkout\Contracts\CartPayment::class, \Webkul\SAASCustomizer\Models\Checkout\CartPayment::class); - $this->app->concord->registerModel(\Webkul\Checkout\Contracts\CartShippingRate::class, \Webkul\SAASCustomizer\Models\Checkout\CartShippingRate::class); - - // Core Models Starts - $this->app->concord->registerModel(\Webkul\Core\Contracts\Channel::class, \Webkul\SAASCustomizer\Models\Core\Channel::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\CoreConfig::class, \Webkul\SAASCustomizer\Models\Core\CoreConfig::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\Currency::class, \Webkul\SAASCustomizer\Models\Core\Currency::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\CurrencyExchangeRate::class, \Webkul\SAASCustomizer\Models\Core\CurrencyExchangeRate::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\Locale::class, \Webkul\SAASCustomizer\Models\Core\Locale::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\Slider::class, \Webkul\SAASCustomizer\Models\Core\Slider::class); - $this->app->concord->registerModel(\Webkul\Core\Contracts\SubscribersList::class, \Webkul\SAASCustomizer\Models\Core\SubscribersList::class); - - // Customer Models Starts - $this->app->concord->registerModel(\Webkul\Customer\Contracts\Customer::class, \Webkul\SAASCustomizer\Models\Customer\Customer::class); - $this->app->concord->registerModel(\Webkul\Customer\Contracts\CustomerAddress::class, \Webkul\SAASCustomizer\Models\Customer\CustomerAddress::class); - $this->app->concord->registerModel(\Webkul\Customer\Contracts\CustomerGroup::class, \Webkul\SAASCustomizer\Models\Customer\CustomerGroup::class); - $this->app->concord->registerModel(\Webkul\Customer\Contracts\Wishlist::class, \Webkul\SAASCustomizer\Models\Customer\Wishlist::class); - - // Inventory Models Starts - $this->app->concord->registerModel(\Webkul\Inventory\Contracts\InventorySource::class, \Webkul\SAASCustomizer\Models\Inventory\InventorySource::class); - - // Product Models Starts - $this->app->concord->registerModel(\Webkul\Product\Contracts\Product::class, \Webkul\SAASCustomizer\Models\Product\Product::class); - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductAttributeValue::class, \Webkul\SAASCustomizer\Models\Product\ProductAttributeValue::class); - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductFlat::class, \Webkul\SAASCustomizer\Models\Product\ProductFlat::class); - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductImage::class, \Webkul\SAASCustomizer\Models\Product\ProductImage::class); - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductInventory::class, \Webkul\SAASCustomizer\Models\Product\ProductInventory::class); - - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductOrderedInventory::class, \Webkul\SAASCustomizer\Models\Product\ProductOrderedInventory::class); - $this->app->concord->registerModel(\Webkul\Product\Contracts\ProductReview::class, \Webkul\SAASCustomizer\Models\Product\ProductReview::class); - - // Sales Models Starts - $this->app->concord->registerModel(\Webkul\Sales\Contracts\Invoice::class, \Webkul\SAASCustomizer\Models\Sales\Invoice::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\InvoiceItem::class, \Webkul\SAASCustomizer\Models\Sales\InvoiceItem::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\Order::class, \Webkul\SAASCustomizer\Models\Sales\Order::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\OrderAddress::class, \Webkul\SAASCustomizer\Models\Sales\OrderAddress::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\OrderItem::class, \Webkul\SAASCustomizer\Models\Sales\OrderItem::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\OrderPayment::class, \Webkul\SAASCustomizer\Models\Sales\OrderPayment::class); - $this->app->concord->registerModel(\Webkul\Sales\Contracts\Shipment::class, \Webkul\SAASCustomizer\Models\Sales\Shipment::class); - // $this->app->concord->registerModel(\Webkul\Sales\Contracts\ShipmentItem::class, \Webkul\SAASCustomizer\Models\Sales\ShipmentItem::class); - - // Tax Models Starts - $this->app->concord->registerModel(\Webkul\Tax\Contracts\TaxCategory::class, \Webkul\SAASCustomizer\Models\Tax\TaxCategory::class); - $this->app->concord->registerModel(\Webkul\Tax\Contracts\TaxMap::class, \Webkul\SAASCustomizer\Models\Tax\TaxMap::class); - $this->app->concord->registerModel(\Webkul\Tax\Contracts\TaxRate::class, \Webkul\SAASCustomizer\Models\Tax\TaxRate::class); - - // User Models Starts - $this->app->concord->registerModel(\Webkul\User\Contracts\Admin::class, \Webkul\SAASCustomizer\Models\User\Admin::class); - $this->app->concord->registerModel(\Webkul\User\Contracts\Role::class, \Webkul\SAASCustomizer\Models\User\Role::class); - - //Discount Model - $this->app->concord->registerModel(\Webkul\Discount\Contracts\CartRule::class, \Webkul\SAASCustomizer\Models\Discount\CartRule::class); - $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRule::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRule::class); - $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRuleProducts::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProducts::class); - $this->app->concord->registerModel(\Webkul\Discount\Contracts\CatalogRuleProductsPrice::class, \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProductsPrice::class); - - $this->app->concord->registerModel(\Webkul\CMS\Contracts\CMS::class, \Webkul\SAASCustomizer\Models\CMS\CMS::class); - } - - /** - * Boot all the model observers - */ - public function bootModelObservers() - { - \Webkul\SAASCustomizer\Models\Attribute\Attribute::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeObserver::class); - - \Webkul\SAASCustomizer\Models\Attribute\AttributeFamily::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeFamilyObserver::class); - - \Webkul\SAASCustomizer\Models\Attribute\AttributeGroup::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeGroupObserver::class); - - \Webkul\SAASCustomizer\Models\Attribute\AttributeOption::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeOptionObserver::class); - - \Webkul\SAASCustomizer\Models\Attribute\AttributeOptionTranslation::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeOptionTranslationObserver::class); - - \Webkul\SAASCustomizer\Models\Attribute\AttributeTranslation::observe(\Webkul\SAASCustomizer\Observers\Attribute\AttributeTranslationObserver::class); - - \Webkul\SAASCustomizer\Models\Category\Category::observe(\Webkul\SAASCustomizer\Observers\Category\CategoryObserver::class); - - \Webkul\SAASCustomizer\Models\Category\CategoryTranslation::observe(\Webkul\SAASCustomizer\Observers\Category\CategoryTranslationObserver::class); - - \Webkul\SAASCustomizer\Models\Checkout\Cart::observe(\Webkul\SAASCustomizer\Observers\Checkout\CartObserver::class); - - \Webkul\SAASCustomizer\Models\Checkout\CartAddress::observe(\Webkul\SAASCustomizer\Observers\Checkout\CartAddressObserver::class); - - \Webkul\SAASCustomizer\Models\Checkout\CartItem::observe(\Webkul\SAASCustomizer\Observers\Checkout\CartItemObserver::class); - - \Webkul\SAASCustomizer\Models\Checkout\CartPayment::observe(\Webkul\SAASCustomizer\Observers\Checkout\CartPaymentObserver::class); - - \Webkul\SAASCustomizer\Models\Checkout\CartShippingRate::observe(\Webkul\SAASCustomizer\Observers\Checkout\CartShippingRateObserver::class); - - \Webkul\SAASCustomizer\Models\Core\Channel::observe(\Webkul\SAASCustomizer\Observers\Core\ChannelObserver::class); - - \Webkul\SAASCustomizer\Models\Core\CoreConfig::observe(\Webkul\SAASCustomizer\Observers\Core\CoreConfigObserver::class); - - \Webkul\SAASCustomizer\Models\Core\Currency::observe(\Webkul\SAASCustomizer\Observers\Core\CurrencyObserver::class); - - \Webkul\SAASCustomizer\Models\Core\CurrencyExchangeRate::observe(\Webkul\SAASCustomizer\Observers\Core\CurrencyExchangeRateObserver::class); - - \Webkul\SAASCustomizer\Models\Core\Locale::observe(\Webkul\SAASCustomizer\Observers\Core\LocaleObserver::class); - - \Webkul\SAASCustomizer\Models\Core\Slider::observe(\Webkul\SAASCustomizer\Observers\Core\SliderObserver::class); - - \Webkul\SAASCustomizer\Models\Core\SubscribersList::observe(\Webkul\SAASCustomizer\Observers\Core\SubscribersListObserver::class); - - \Webkul\SAASCustomizer\Models\Customer\Customer::observe(\Webkul\SAASCustomizer\Observers\Customer\CustomerObserver::class); - - \Webkul\SAASCustomizer\Models\Customer\CustomerAddress::observe(\Webkul\SAASCustomizer\Observers\Customer\CustomerAddressObserver::class); - - \Webkul\SAASCustomizer\Models\Customer\CustomerGroup::observe(\Webkul\SAASCustomizer\Observers\Customer\CustomerGroupObserver::class); - - \Webkul\SAASCustomizer\Models\Customer\Wishlist::observe(\Webkul\SAASCustomizer\Observers\Customer\WishlistObserver::class); - - \Webkul\SAASCustomizer\Models\Inventory\InventorySource::observe(\Webkul\SAASCustomizer\Observers\Inventory\InventorySourceObserver::class); - - \Webkul\SAASCustomizer\Models\Product\Product::observe(\Webkul\SAASCustomizer\Observers\Product\ProductObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductAttributeValue::observe(\Webkul\SAASCustomizer\Observers\Product\ProductAttributeValueObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductFlat::observe(\Webkul\SAASCustomizer\Observers\Product\ProductFlatObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductImage::observe(\Webkul\SAASCustomizer\Observers\Product\ProductImageObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductInventory::observe(\Webkul\SAASCustomizer\Observers\Product\ProductInventoryObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductOrderedInventory::observe(\Webkul\SAASCustomizer\Observers\Product\ProductOrderedInventoryObserver::class); - - \Webkul\SAASCustomizer\Models\Product\ProductReview::observe(\Webkul\SAASCustomizer\Observers\Product\ProductReviewObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\Invoice::observe(\Webkul\SAASCustomizer\Observers\Sales\InvoiceObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\InvoiceItem::observe(\Webkul\SAASCustomizer\Observers\Sales\InvoiceItemObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\Order::observe(\Webkul\SAASCustomizer\Observers\Sales\OrderObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\OrderAddress::observe(\Webkul\SAASCustomizer\Observers\Sales\OrderAddressObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\OrderItem::observe(\Webkul\SAASCustomizer\Observers\Sales\OrderItemObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\OrderPayment::observe(\Webkul\SAASCustomizer\Observers\Sales\OrderPaymentObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\Shipment::observe(\Webkul\SAASCustomizer\Observers\Sales\ShipmentObserver::class); - - \Webkul\SAASCustomizer\Models\Sales\ShipmentItem::observe(\Webkul\SAASCustomizer\Observers\Sales\ShipmentObserver::class); - - \Webkul\SAASCustomizer\Models\Tax\TaxCategory::observe(\Webkul\SAASCustomizer\Observers\Tax\TaxCategoryObserver::class); - - \Webkul\SAASCustomizer\Models\Tax\TaxRate::observe(\Webkul\SAASCustomizer\Observers\Tax\TaxRateObserver::class); - - \Webkul\SAASCustomizer\Models\User\Admin::observe(\Webkul\SAASCustomizer\Observers\User\AdminObserver::class); - - \Webkul\SAASCustomizer\Models\User\Role::observe(\Webkul\SAASCustomizer\Observers\User\RoleObserver::class); - - \Webkul\SAASCustomizer\Models\Discount\CartRule::observe(\Webkul\SAASCustomizer\Observers\Discount\CartRuleObserver::class); - - \Webkul\SAASCustomizer\Models\CMS\CMS::observe(\Webkul\SAASCustomizer\Observers\CMS\CMSObserver::class); - - \Webkul\SAASCustomizer\Models\Discount\CatalogRule::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleObserver::class); - - \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProducts::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleProductsObserver::class); - - \Webkul\SAASCustomizer\Models\Discount\CatalogRuleProductsPrice::observe(\Webkul\SAASCustomizer\Observers\Discount\CatalogRuleProductsPriceObserver::class); - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Repositories/CompanyDetailsRepository.php b/packages/Webkul/SAASCustomizer/src/Repositories/CompanyDetailsRepository.php deleted file mode 100644 index b1eb49503..000000000 --- a/packages/Webkul/SAASCustomizer/src/Repositories/CompanyDetailsRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CompanyDetailsRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\SAASCustomizer\Models\CompanyDetails'; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Repositories/CompanyRepository.php b/packages/Webkul/SAASCustomizer/src/Repositories/CompanyRepository.php deleted file mode 100644 index 84e8c8cdc..000000000 --- a/packages/Webkul/SAASCustomizer/src/Repositories/CompanyRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class CompanyRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\SAASCustomizer\Models\Company'; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Repositories/StripeSuperAdminRepository.php b/packages/Webkul/SAASCustomizer/src/Repositories/StripeSuperAdminRepository.php deleted file mode 100644 index 03bb45515..000000000 --- a/packages/Webkul/SAASCustomizer/src/Repositories/StripeSuperAdminRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class StripeSuperAdminRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\SAASCustomizer\Models\StripeSuperAdmin'; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Repositories/SuperAdminRepository.php b/packages/Webkul/SAASCustomizer/src/Repositories/SuperAdminRepository.php deleted file mode 100644 index 2082f9d2f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Repositories/SuperAdminRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class SuperAdminRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\SAASCustomizer\Models\SuperAdmin'; - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/block.svg b/packages/Webkul/SAASCustomizer/src/Resources/assets/images/block.svg deleted file mode 100644 index 0312ffb16..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/block.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - block - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/compass.svg b/packages/Webkul/SAASCustomizer/src/Resources/assets/images/compass.svg deleted file mode 100644 index 8554e43ab..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/compass.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - compass - Created with Sketch. - - - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/razzo-logo.png b/packages/Webkul/SAASCustomizer/src/Resources/assets/images/razzo-logo.png deleted file mode 100644 index 62a1281b0..000000000 Binary files a/packages/Webkul/SAASCustomizer/src/Resources/assets/images/razzo-logo.png and /dev/null differ diff --git a/packages/Webkul/SAASCustomizer/src/Resources/assets/js/app.js b/packages/Webkul/SAASCustomizer/src/Resources/assets/js/app.js deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/Webkul/SAASCustomizer/src/Resources/assets/sass/app.scss b/packages/Webkul/SAASCustomizer/src/Resources/assets/sass/app.scss deleted file mode 100644 index a42d918c5..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/assets/sass/app.scss +++ /dev/null @@ -1,84 +0,0 @@ -@import url("https://fonts.googleapis.com/css?family=Montserrat:400,500"); - -html { - font-family: "montserrat", sans-serif; -} - -::placeholder { - font-family: "montserrat", sans-serif; -} - -.mt-30 { - margin-top: 30px; -} - -.mt-60 { - margin-top: 60px; -} - -.mt-90 { - margin-top: 90px; -} - -.form-container { - width: 420px; - margin-left: auto; - margin-right: auto; - padding: 10px; - - .brand-logo { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - } - - .step-one, .step-two, .step-three { - button { - width: 150px; - margin-left: calc(50% - 75px); - } - } -} - -.registration { - .control-group .control { - width: 100%; - } -} - -.step-navigator { - margin-top: 30px; - margin-bottom: 15px; - width: 100%; -} - -.step-list { - display: flex; - flex-direction: row; - align-items: center; - justify-content: space-between; - - .step-item { - cursor: pointer; - height: 64px; - width: 64px; - border: 1px solid #c7c7c7; - border-radius: 50%; - text-align: center; - padding-top: 24px; - } - - .step-item.active { - border: 1px solid blue; - } -} - -.content { - padding: 25px; -} - -.content-container { - padding-left: 45px; - padding-right: 45px; -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/lang/en/app.php b/packages/Webkul/SAASCustomizer/src/Resources/lang/en/app.php deleted file mode 100644 index 94cd57976..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/lang/en/app.php +++ /dev/null @@ -1,76 +0,0 @@ - [ - 'step-1' => 'Step 1', - 'auth-cred' => 'Authentication Credentials', - 'email' => 'Email', - 'phone' => 'Phone', - 'username' => 'Username', - 'password' => 'Password', - 'cpassword' => 'Confirm Password', - 'continue' => 'Continue', - 'step-2' => 'Step 2', - 'personal' => 'Personal Details', - 'first-name' => 'First Name', - 'last-name' => 'Last Name', - 'step-3' => 'Step 3', - 'org-details' => 'Organization Details', - 'org-name' => 'Organization Name' - ], - - 'customers' => [ - 'approve' => 'Approve New' - ], - - 'company' => [ - 'companies' => 'Companies' - ], - - 'datagrid' => [ - 'domain' => 'Domain' - ], - - 'channel-warning' => 'Creating more than one channel is prohibited', - - 'menu' => [ - 'companies' => 'Companies' - ], - - 'connect-stripe' => [ - 'stripe-settings' => 'Stripe Settings' - ], - - 'status' => [ - 'company-activated' => 'Company successfully activated', - 'company-deactivated' => 'Company successfully deactivated', - 'company-updated' => 'Company Updated Successfully', - 'something-wrong' => 'Something went wrong', - 'store-created' => 'Store Created Successfully', - 'something-wrong-1' => 'Something went wrong, please try again later.', - ], - - 'exceptions' => [ - 'domain-not-found' => 'Domain Not Found', - 'company-blocked-by-administrator' => 'This seller is blocked', - 'not-allowed-to-visit-this-section' => 'You are not allowed to use this section', - 'auth' => 'Authentication Error', - 'illegal-action' => 'You are not allowed to perform this action' - ], - - 'custom-errors' => [ - 'channel-creating' => 'Creating more than one channel is not allowed', - 'channel-hostname' => 'Kindly contact admin to change your hostname', - 'same-domain' => 'Cannot keep same sub-domain as main domain', - 'block-message' => 'If you want to unblock this seller, free feel to contact us we are available 24x7 to solve your issue.', - 'blocked' => 'has been blocked', - 'illegal-action' => 'You have performed an illegal action', - 'not-allowed-to-visit' => 'You are not allowed to visit this section, this section is only meant for usage by admins only', - 'domain-message' => 'Oops! We could not help at :domain', - 'domain-desc' => 'If you wish to create an account with :domain - as an organization, feel free to create an account and get started.', - 'illegal-message' => 'The action you performed is disabled by site admin, kindly mail your site administrator for more details on this.', - 'locale-creation' => 'Creating locale other than English is not allowed', - 'locale-delete' => 'Cannot delete the Locale' - ] -]; \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/login.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/login.blade.php deleted file mode 100644 index e16a031e4..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/login.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('admin::app.users.sessions.title') }} -@stop - -@section('content-wrapper') -
-

{{ __('admin::app.users.sessions.title') }}

- -
- @csrf -
-
- - - @{{ errors.first('email') }} -
- -
- - - @{{ errors.first('password') }} -
- -
- {{ __('admin::app.users.sessions.forget-password-link-title') }} -
- -
- -
-
-
-
-@stop \ 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 deleted file mode 100644 index eff21de1c..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/register.blade.php +++ /dev/null @@ -1,287 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Seller Registration -@endsection - -@section('content-wrapper') - - - @push('scripts') - - - - @endpush -@endsection \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/step-one.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/step-one.blade.php deleted file mode 100644 index 7531011eb..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/auth/step-one.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -
- @csrf -
-

Step 1:

- -

Authentication Credentials

- -
- - - - - {{-- data-vv-as=""{{ __('shop::app.customer.login-form.email') }}"" --}} - - @{{ errors.first('email') }} -
- -
- - - - - @{{ errors.first('password') }} -
- -
- - - - - @{{ errors.first('password_confirmation') }} -
-
-
\ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/edit.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/edit.blade.php deleted file mode 100644 index 752fac171..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/edit.blade.php +++ /dev/null @@ -1,92 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('Edit Company') }} -@endsection - -@section('content-wrapper') - - - @push('scripts') - - - - @endpush -@endsection \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/index.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/index.blade.php deleted file mode 100644 index 8ef9b5557..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/company/index.blade.php +++ /dev/null @@ -1,43 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Company Insights -@stop - -@section('content-wrapper') -
-
-
-

Company Insights

-
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - -
No. of ProductsNo. of AttributesNo. of CustomersNo. of Customer GroupsNo. of CategoriesDomain
{{ $company[1]['products'] }}{{ $company[1]['attributes'] }}{{ $company[1]['customers'] }}{{ $company[1]['customer-groups'] }}{{ $company[1]['categories'] }}{{ $company[0]->domain }}
-
-
-
-@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/index.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/index.blade.php deleted file mode 100644 index d5fb5fe6e..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/index.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Companies -@stop - -@section('content-wrapper') -
-
-
-

Companies

-
-
- -
- @inject('companies', 'Webkul\SAASCustomizer\DataGrids\CompaniesDataGrid') - {!! $companies->render() !!} -
-
-@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/master.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/master.blade.php deleted file mode 100755 index 825347488..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/master.blade.php +++ /dev/null @@ -1,65 +0,0 @@ - - - - @yield('page_title') - - - - - - - - - - - - @yield('head') - - @yield('css') - - - getLocale() == 'ar') class="rtl" @endif style="scroll-behavior: smooth;"> -
- - - @include ('saas::companies.layouts.nav-top') - - @auth('super-admin') - @include ('saas::companies.layouts.nav-left') - @endauth - -
- @yield('content-wrapper') -
-
- - - - - - - @stack('scripts') - -
- - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-aside.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-aside.blade.php deleted file mode 100644 index 0d6438b2f..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-aside.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -
- - - {{--
- -
--}} -
diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-left.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-left.blade.php deleted file mode 100644 index e5a14e54a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-left.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -
- -
\ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-top.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-top.blade.php deleted file mode 100644 index e2d312256..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/nav-top.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -
-
- -
- -
-
- @auth('super-admin') -
-
-
- - Super Admin - -
- -
- -
-
- - -
-
-
- @endauth -
-
-
\ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/tabs.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/companies/layouts/tabs.blade.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/emails/new-company.php b/packages/Webkul/SAASCustomizer/src/Resources/views/emails/new-company.php deleted file mode 100644 index 9784a7830..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/emails/new-company.php +++ /dev/null @@ -1 +0,0 @@ -New company is registered. \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/400.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/400.blade.php deleted file mode 100644 index a5c8134d6..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/400.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - 400 Bad Request -@stop - -@section('content-wrapper') - -
- -
- -
-
- {{$status}} -
- -
- {{ $message }} -
- -
- Bad Request -
-
- -
- -
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/401.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/401.blade.php deleted file mode 100755 index aab5672fa..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/401.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('admin::app.error.401.page-title') }} -@stop - -@section('content-wrapper') -
- -
- -
- -
- {{ __('admin::app.error.401.name') }} -
- -
- {{ __('admin::app.error.401.title') }} -
- -
- {{ __('admin::app.error.401.message') }} -
- - - {{ __('admin::app.error.go-to-home') }} - - -
- -
- -
- -
-@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/403.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/403.blade.php deleted file mode 100755 index 10b8f578e..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/403.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('admin::app.error.403.page-title') }} -@stop - -@section('content-wrapper') -
- -
- -
- -
- {{ __('admin::app.error.403.name') }} -
- -
- {{ __('admin::app.error.403.title') }} -
- -
- {{ __('admin::app.error.403.message') }} -
- - - {{ __('admin::app.error.go-to-home') }} - - -
- -
- -
- -
-@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/404.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/404.blade.php deleted file mode 100755 index 0df66a256..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/404.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('admin::app.error.404.page-title') }} -@stop - -@section('content-wrapper') -
- -
- -
- -
- {{ __('admin::app.error.404.name') }} -
- -
- {{ __('admin::app.error.404.title') }} -
- -
- {{ __('admin::app.error.404.message') }} -
- - - {{ __('admin::app.error.go-to-home') }} - - -
- -
- -
- -
-@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/500.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/500.blade.php deleted file mode 100755 index 7b6933eab..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/500.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ __('admin::app.error.500.page-title') }} -@stop - -@section('content-wrapper') - -
- -
- -
-
- {{$status}} -
- -
- {{ $message }} -
- -
- {{ __('admin::app.error.500.title') }} -
-
- -
- -
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/503.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/503.blade.php deleted file mode 100644 index 8161f623a..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/503.blade.php +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - Document - - - -
- -
- -
- -
- {{ __('admin::app.error.in-maitainace') }} -
- -
- {{ __('admin::app.error.right-back') }} -
-
- -
- -
-
- - \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/auth.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/auth.blade.php deleted file mode 100644 index 0dd4e2aae..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/auth.blade.php +++ /dev/null @@ -1,34 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - 400 Bad Request -@stop - -@section('content-wrapper') - -
- -
- -
-
- {{$status}} -
- -
- {{ $message }} -
- -
- Please try again by clicking here -
-
- -
- -
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/company_blocked_by_administrator.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/company_blocked_by_administrator.blade.php deleted file mode 100644 index f1381a04d..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/company_blocked_by_administrator.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ $status }} {{ __('saas::app.exceptions.not-allowed-to-visit-this-section') }} -@stop - -@section('content-wrapper') - -
- -
- -
-
- Seller Blocked -
- -
- {{ \Company::getCurrent()->name }} {{ __('saas::app.custom-errors.blocked') }}. -
- -
- {{ __('saas::app.custom-errors.block-message') }} - - {{-- Contact Us --}} -
-
- -
-
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/domain_not_found.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/domain_not_found.blade.php deleted file mode 100644 index c1d702298..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/domain_not_found.blade.php +++ /dev/null @@ -1,45 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ $status }} {{ $message }} -@stop - -@section('content-wrapper') - -
- -
- -
-
- - -
- - {{ $message }} -
- -
- {!! __('saas::app.custom-errors.domain-message', [ - 'domain' => $_SERVER['SERVER_NAME'] - ]) !!}. -
- -
- {!! __('saas::app.custom-errors.domain-desc', [ - 'domain' => $_SERVER['SERVER_NAME'] - ]) !!} - -
- - Contact Us -
-
- -
-
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/illegal_action.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/illegal_action.blade.php deleted file mode 100644 index 2554ffc95..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/illegal_action.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ $status }} {{ __('saas::app.exceptions.not-allowed-to-visit-this-section') }} -@stop - -@section('content-wrapper') - -
- -
- -
-
- Illegal Action -
- -
- {{ __('saas::app.custom-errors.illegal-action') }}. -
- -
- {{ __('saas::app.custom-errors.illegal-message') }} - - {{-- Contact Us --}} -
-
- -
-
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/not_allowed_to_visit_this_section.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/errors/not_allowed_to_visit_this_section.blade.php deleted file mode 100644 index 05080aca1..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/errors/not_allowed_to_visit_this_section.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - {{ $status }} {{ $message }} -@stop - -@section('content-wrapper') - -
- -
- -
-
- {{ __('saas::app.exceptions.not-allowed-to-visit-this-section') }} -
-
- -
-
- -
- -@stop \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Resources/views/installation/holdscreen.blade.php b/packages/Webkul/SAASCustomizer/src/Resources/views/installation/holdscreen.blade.php deleted file mode 100644 index 8721af315..000000000 --- a/packages/Webkul/SAASCustomizer/src/Resources/views/installation/holdscreen.blade.php +++ /dev/null @@ -1,9 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Seller Registration -@endsection - -@section('content-wrapper') - -@endsection \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Routes/web.php b/packages/Webkul/SAASCustomizer/src/Routes/web.php deleted file mode 100644 index 0026eb621..000000000 --- a/packages/Webkul/SAASCustomizer/src/Routes/web.php +++ /dev/null @@ -1,41 +0,0 @@ - 'web'], function () { - Route::prefix('company')->group(function() { - //create company - Route::get('register', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@create')->defaults('_config', [ - 'view' => 'saas::companies.auth.register' - ])->name('company.create.index'); - - Route::post('validate/step-one', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@validateStepOne')->name('company.validate.step-one'); - - Route::post('validate/step-three', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@validateStepThree')->name('company.validate.step-three'); - - Route::post('register', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@store')->name('company.create.store'); - - Route::get('/seed-data', 'Webkul\SAASCustomizer\Http\Controllers\PurgeController@seedDatabase')->name('company.create.data'); - }); - - Route::prefix('super')->group(function() { - Route::get('login', 'Webkul\SAASCustomizer\Http\Controllers\SuperUserController@index')->name('super.session.index'); - - Route::post('login', 'Webkul\SAASCustomizer\Http\Controllers\SuperUserController@store')->defaults('_config', [ - 'redirect' => 'super.companies.index' - ])->name('super.session.create'); - - Route::get('logout', 'Webkul\SAASCustomizer\Http\Controllers\SuperUserController@destroy')->name('super.session.destroy'); - - // GET Route leading to the listing of the companies grid - Route::get('companies', 'Webkul\SAASCustomizer\Http\Controllers\SuperUserController@list')->name('super.companies.index'); - - Route::get('companies/edit/{id}', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@edit')->name('super.companies.edit'); - - Route::post('companies/edit/{id}', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@update')->name('super.companies.update'); - - // To show the stats of the registered companies - Route::get('companies/view/{id}', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@showCompanyStats')->name('super.companies.show-stats'); - - // To show the stats of the registered companies - Route::get('companies/status/{id}', 'Webkul\SAASCustomizer\Http\Controllers\CompanyController@changeStatus')->name('super.companies.change-status'); - }); -}); \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/src/Validation/DatabasePresenceVerifier.php b/packages/Webkul/SAASCustomizer/src/Validation/DatabasePresenceVerifier.php deleted file mode 100644 index 574166662..000000000 --- a/packages/Webkul/SAASCustomizer/src/Validation/DatabasePresenceVerifier.php +++ /dev/null @@ -1,32 +0,0 @@ -id) && $table != 'admins') { - return $this->db->connection($this->connection)->table($table)->useWritePdo()->where ('company_id', '=', $company->id); - } else { - // apply the company id check dynamically here to eliminate unique validation woes - return $this->db->connection($this->connection)->table($table)->useWritePdo(); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/SAASCustomizer/webpack.mix.js b/packages/Webkul/SAASCustomizer/webpack.mix.js deleted file mode 100644 index 3dcd3bcbd..000000000 --- a/packages/Webkul/SAASCustomizer/webpack.mix.js +++ /dev/null @@ -1,22 +0,0 @@ -const { mix } = require("laravel-mix"); -require("laravel-mix-merge-manifest"); - -if (mix.inProduction()) { - var publicPath = 'publishable/assets'; -} else { - var publicPath = "../../../public/vendor/webkul/saas/assets"; -} - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - -mix.js(__dirname + "/src/Resources/assets/js/app.js", "js/saas.js") - .copyDirectory( __dirname + '/src/Resources/assets/images', publicPath + '/images') - .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/saas.css") - .options({ - processCssUrls: false - }); - -if (mix.inProduction()) { - mix.version(); -} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/Config/system.php b/packages/Webkul/ShowPriceAfterLogin/Config/system.php deleted file mode 100644 index cd71e32d2..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/Config/system.php +++ /dev/null @@ -1,47 +0,0 @@ - 'showpriceafterlogin', - 'name' => 'showpriceafterlogin::app.showpriceafterlogin.name', - 'sort' => 5 - ], [ - 'key' => 'showpriceafterlogin.settings', - 'name' => 'showpriceafterlogin::app.showpriceafterlogin.settings', - 'sort' => 1, - ], [ - 'key' => 'showpriceafterlogin.settings.settings', - 'name' => 'showpriceafterlogin::app.showpriceafterlogin.settings', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'enableordisable', - 'title' => 'showpriceafterlogin::app.showpriceafterlogin.toggle', - 'type' => 'boolean', - 'channel_based' => true, - 'locale_based' => false - ], [ - 'name' => 'hide-shop-before-login', - 'title' => 'showpriceafterlogin::app.showpriceafterlogin.hide-shop-before-login', - 'type' => 'boolean', - 'channel_based' => false, - 'locale_based' => false - ], [ - 'name' => 'selectfunction', - 'title' => 'showpriceafterlogin::app.showpriceafterlogin.select-function', - 'type' => 'select', - 'options' => [ - [ - 'name' => 'hide-buy-cart-guest', - 'title' => 'showpriceafterlogin::app.showpriceafterlogin.hide-buy-cart-guest', - 'value' => "hide-buy-cart-guest" - ], [ - 'name' => 'hide-price-buy-cart', - 'title' => 'showpriceafterlogin::app.showpriceafterlogin.hide-price-buy-cart-guest', - 'value' => "hide-price-buy-cart-guest" - ] - ], - ] - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/composer.json b/packages/Webkul/ShowPriceAfterLogin/composer.json deleted file mode 100644 index baf5adf0b..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "bagisto/showPriceAfterLogin", - "description": "show price and add to cart button after login ", - "license": "MIT", - "authors": [ - { - "name": "Prateek Srivastava", - "email": "prateek.srivastava781@webkul.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "Webkul\\ShowPriceAfterLogin\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\ShowPriceAfterLogin\\Providers\\ShowPriceAfterLoginServiceProvider" - ], - "aliases": {} - } - }, - "minimum-stability": "dev" -} diff --git a/packages/Webkul/ShowPriceAfterLogin/package.json b/packages/Webkul/ShowPriceAfterLogin/package.json deleted file mode 100644 index 8c4598302..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "npm run watch -- --watch-poll", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "cross-env": "^5.1.4", - "laravel-mix": "^2.1", - "laravel-mix-merge-manifest": "^0.1.1" - } -} diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Http/Middleware/ShowShopAfterLogin.php b/packages/Webkul/ShowPriceAfterLogin/src/Http/Middleware/ShowShopAfterLogin.php deleted file mode 100644 index e90840c2e..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Http/Middleware/ShowShopAfterLogin.php +++ /dev/null @@ -1,56 +0,0 @@ -getConfigData('ShowPriceAfterLogin.settings.settings.hide-shop-before-login'); - $moduleEnabled = core()->getConfigData('ShowPriceAfterLogin.settings.settings.enableordisable'); - - if ($status && $moduleEnabled) { - if (! auth()->guard('customer')->check() && ! request()->is('customer/*') && ! request()->is('admin/*')) { - return redirect()->route('customer.session.index'); - } - } - - - return $next($request); - } -} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php b/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php deleted file mode 100644 index 1fe3b1f1e..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Providers/ShowPriceAfterLoginServiceProvider.php +++ /dev/null @@ -1,58 +0,0 @@ -loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'showpriceafterlogin'); - - $this->publishes([ - dirname(__DIR__) . '/Resources/views/card.blade.php' => base_path('resources/views/vendor/shop/products/list/card.blade.php') - ]); - - $this->publishes([ - dirname(__DIR__) . '/Resources/views/price.blade.php' => base_path('resources/views/vendor/shop/products/price.blade.php') - ]); - - $this->publishes([ - 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/add-buttons.blade.php' => base_path('views/vendor/shop/products/add-buttons.blade.php') - // ]); - - $this->publishes([ - 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') - ]); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/../Config/system.php', 'core' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/lang/en/app.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/lang/en/app.php deleted file mode 100644 index 7590896d7..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/lang/en/app.php +++ /dev/null @@ -1,20 +0,0 @@ - [ - 'name' => 'Show Price After Login', - 'settings' => 'Settings', - 'toggle' => 'Enable Module', - 'hide-shop-before-login' => 'Hide Shop Before Login', - 'hide-price-buy-cart-guest' => 'Hide Price & Buy/Add-to-Cart For Guest', - 'hide-buy-cart-guest' => 'Hide Buy/Add-to-Cart For Guest', - 'select-function' => 'Select Function', - 'configure' => 'Configure', - 'configurations' => 'Configuration', - ], - - 'products' => [ - 'login-to-view-price' => 'Login To View Price', - 'login-to-buy' => 'Login To Buy' - ] -]; \ No newline at end of file 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 deleted file mode 100644 index a3d6e82ce..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/add-to-cart.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -{!! 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')) -
- - {{ __('showpriceafterlogin::app.products.login-to-view-price') }} - -
-@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 deleted file mode 100644 index c7fdb4225..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/buy-now.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -{!! 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 deleted file mode 100644 index 893b79ce2..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/card.blade.php +++ /dev/null @@ -1,55 +0,0 @@ -{!! 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 - -
- @inject ('productImageHelper', 'Webkul\Product\Helpers\ProductImage') - - getProductBaseImage($product); ?> - - @if ($product->new) -
- {{ __('shop::app.products.new') }} -
- @endif - -
- - - -
- -
- -
- - - {{ $product->name }} - - -
- - @include ('shop::products.price', ['product' => $product]) - - @if (($status && ! auth()->guard('customer')->check()) && ($function == 'hide-buy-cart-guest' || $function == 'hide-price-buy-cart-guest')) - - @else - @include('shop::products.add-buttons', ['product' => $product]) - @endif -
- -
- -{!! view_render_event('bagisto.shop.products.list.card.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/price.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/price.blade.php deleted file mode 100644 index b1e9f830f..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/price.blade.php +++ /dev/null @@ -1,33 +0,0 @@ -{!! view_render_event('bagisto.shop.products.price.before', ['product' => $product]) !!} - -@php - $status = core()->getConfigData('showpriceafterlogin.settings.settings.enableordisable'); - - $function = core()->getConfigData('showpriceafterlogin.settings.settings.selectfunction'); -@endphp - -
- @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - @if (($status && ! auth()->guard('customer')->check()) && $function == "hide-price-buy-cart-guest") - @else - @if ($product->type == 'configurable') - {{ __('shop::app.products.price-label') }} - - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - @else - @if ($priceHelper->haveSpecialPrice($product)) -
- {{ __('shop::app.products.sale') }} -
- - {{ core()->currency($product->price) }} - - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - @else - {{ core()->currency($product->price) }} - @endif - @endif - @endif -
- -{!! view_render_event('bagisto.shop.products.price.after', ['product' => $product]) !!} \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/review-price.blade.php b/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/review-price.blade.php deleted file mode 100644 index 37ba19952..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/src/Resources/views/review-price.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@php - $status = core()->getConfigData('showpriceafterlogin.settings.settings.enableordisable'); - $function = core()->getConfigData('showpriceafterlogin.settings.settings.selectfunction'); -@endphp - -@if(($status && ! auth()->guard('customer')->check()) && $function == 'hide-price-buy-cart-guest') -
- @inject ('priceHelper', 'Webkul\Product\Helpers\Price') - - @if ($product->type == 'configurable') - {{ core()->currency($priceHelper->getMinimalPrice($product)) }} - @else - @if ($priceHelper->haveSpecialPrice($product)) - {{ core()->currency($priceHelper->getSpecialPrice($product)) }} - @else - {{ core()->currency($product->price) }} - @endif - @endif -
-@endif \ No newline at end of file diff --git a/packages/Webkul/ShowPriceAfterLogin/webpack.mix.js b/packages/Webkul/ShowPriceAfterLogin/webpack.mix.js deleted file mode 100644 index b57811642..000000000 --- a/packages/Webkul/ShowPriceAfterLogin/webpack.mix.js +++ /dev/null @@ -1,22 +0,0 @@ -const { mix } = require("laravel-mix"); -require("laravel-mix-merge-manifest"); - -if (mix.inProduction()) { - var publicPath = 'publishable/assets'; -} else { - var publicPath = "../../../public/vendor/module/assets"; -} - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - -mix.js(__dirname + "/src/Resources/assets/js/app.js", 'js/custom_app.js') - .copyDirectory( __dirname + '/src/Resources/assets/images', publicPath + '/images') - .sass(__dirname + "/src/Resources/assets/sass/app.scss", 'css/custom_app.css') - .options({ - processCssUrls: false - }); - -if (mix.inProduction()) { - mix.version(); -} diff --git a/packages/Webkul/StripeConnect/.gitignore b/packages/Webkul/StripeConnect/.gitignore deleted file mode 100644 index 6376db975..000000000 --- a/packages/Webkul/StripeConnect/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/node_modules -/package-lock.json -npm-debug.log \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/composer.json b/packages/Webkul/StripeConnect/composer.json deleted file mode 100644 index ccce67bde..000000000 --- a/packages/Webkul/StripeConnect/composer.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "bagisto/laravel-stripe-connect", - "license": "MIT", - "authors": [ - { - "name": "Prashant Singh", - "email": "prashant.singh852@webkul.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "Webkul\\StripeConnect\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\StripeConnect\\Providers\\StripeConnectServiceProdiver" - ], - "aliases": {} - } - }, - "minimum-stability": "dev" -} diff --git a/packages/Webkul/StripeConnect/package.json b/packages/Webkul/StripeConnect/package.json deleted file mode 100644 index 2d948db6a..000000000 --- a/packages/Webkul/StripeConnect/package.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "private": true, - "scripts": { - "dev": "npm run development", - "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", - "watch-poll": "cross-env npm run watch -- --watch-poll --progress", - "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js", - "prod": "npm run production", - "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js" - }, - "devDependencies": { - "axios": "^0.18", - "cross-env": "^5.1.4", - "laravel-mix": "^2.1", - "laravel-mix-merge-manifest": "^0.1.1", - "jquery": "^3.2", - "vue": "^2.1.10" - }, - "dependencies": { - "vee-validate": "2.0.0-rc.26", - "vue-flatpickr": "^2.3.0", - "vue-slider-component": "^2.7.5" - } -} diff --git a/packages/Webkul/StripeConnect/publishable/assets/css/stripe.css b/packages/Webkul/StripeConnect/publishable/assets/css/stripe.css deleted file mode 100644 index b6a00e6cf..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/css/stripe.css +++ /dev/null @@ -1 +0,0 @@ -.stripe-close-icon{width:24px;height:24px;background-image:url("../images/icons/close-icon.svg");position:absolute;top:5px;right:5px}.active .stripe-icon,.icon,.stripe-icon{display:inline-block;background-size:cover}.active .stripe-icon,.stripe-icon{width:48px;height:48px}.stripe-icon{background-image:url("../images/icons/Icon-Stripe.svg")}.active .stripe-icon{background-image:url("../images/icons/Icon-Stripe-Active.svg")}#stripe-pay-button label{display:inline;color:#fff}.more-payment-icons{text-align:center;margin-top:15px}.more-payment-icons .visa-icon{width:45px;height:28px;background-image:url("../images/icons/visa.svg");padding-left:32px}.more-payment-icons .master-icon{width:45px;height:28px;background-image:url("../images/icons/master.svg");padding-left:32px}.more-payment-icons .mastro-icon{width:45px;height:28px;background-image:url("../images/icons/mastro.svg");padding-left:32px}.more-payment-icons .pci-icon{width:45px;height:28px;background-image:url("../images/icons/pci.svg");padding-left:32px}.add-card{display:none}.stripe-block-modal{top:120px;left:calc(50% - 222px)!important;display:block;position:fixed;z-index:11;width:450px;background:#fff;border:1px solid #979797;-webkit-box-shadow:0 11px 23px 6px rgba(0,0,0,.28);box-shadow:0 11px 23px 6px rgba(0,0,0,.28);border-radius:5px;margin-left:0!important}.stripe-block-modal .stripe-title{padding-bottom:20px;padding-top:20px;text-align:center}.stripe-form-content{padding-top:30px;padding-bottom:10px}.stripe-form-content .stripe-fields .control-group{margin-bottom:10px}.stripe-form-content .btn.btn-primary.btn-lg{width:100%}.stripe-errors{margin-bottom:10px;color:#ff5252}.stripe-block-modal.close{display:none}.stripe-card-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;font-size:16px}.stripe-card-info .radio-container{padding-left:28px}.stripe-card-info span.icon{width:35px;height:32px}.stripe-card-info a#delete-card,.stripe-card-info a#edit-card,.stripe-card-info span.card-last-four{font-style:normal}.stripe-card-info a#edit-card,.stripe-card-info span.card-last-four{margin-right:14px}.stripe-cards-block{display:none}.payment-icon{width:25px} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/fonts/montserrat-v12-latin-regular.eot b/packages/Webkul/StripeConnect/publishable/assets/fonts/montserrat-v12-latin-regular.eot deleted file mode 100644 index 58433f250..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/fonts/montserrat-v12-latin-regular.eot and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe-Active.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe-Active.svg deleted file mode 100644 index b85762bac..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe-Active.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Icon-Stripe-Active - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe.svg deleted file mode 100644 index 721b1549e..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/Icon-Stripe.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Icon-Stripe - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.png deleted file mode 100644 index cfa741901..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.svg deleted file mode 100644 index 7f0b311cf..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy 2.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy 2 - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.png deleted file mode 100644 index d7583aaf6..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.svg deleted file mode 100644 index 1cc4e9f56..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender copy.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.png deleted file mode 100644 index 0cd04df06..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.svg deleted file mode 100644 index fefe7a424..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/calender.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - calender - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.png deleted file mode 100644 index db4e51a0f..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.svg deleted file mode 100644 index 2a5f8eb6a..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/card.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - card - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.png deleted file mode 100644 index 2629266e8..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.svg deleted file mode 100644 index 922694293..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/check-1.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - check-1 - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/close-icon.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/close-icon.svg deleted file mode 100644 index e8b45b1e6..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/close-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy 2 - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/close.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/close.svg deleted file mode 100644 index 73345683f..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/close.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - close - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/cross-icon.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/cross-icon.svg deleted file mode 100755 index cf00c5a56..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/cross-icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Icon-Cross - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.png deleted file mode 100644 index 1b9be03cb..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.svg deleted file mode 100644 index d6fe4161b..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/logo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - logo - Created with Sketch. - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/master.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/master.svg deleted file mode 100644 index 5930b2dce..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/master.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - master - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/mastro.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/mastro.svg deleted file mode 100644 index 593985c89..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/mastro.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - mastro - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/pci.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/pci.svg deleted file mode 100644 index bbe13319e..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/pci.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - pci - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/stripe-logo.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/stripe-logo.png deleted file mode 100644 index c86ee507b..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/stripe-logo.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.png b/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.png deleted file mode 100644 index 538b66543..000000000 Binary files a/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.svg deleted file mode 100644 index 3c303cd22..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/successful.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - successful - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/images/icons/visa.svg b/packages/Webkul/StripeConnect/publishable/assets/images/icons/visa.svg deleted file mode 100644 index 9286d752e..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/images/icons/visa.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - visa - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/publishable/assets/mix-manifest.json b/packages/Webkul/StripeConnect/publishable/assets/mix-manifest.json deleted file mode 100644 index b385cfedd..000000000 --- a/packages/Webkul/StripeConnect/publishable/assets/mix-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "/css/stripe.css": "/css/stripe.css?id=c080e9000376f04850a8" -} diff --git a/packages/Webkul/StripeConnect/readme.md b/packages/Webkul/StripeConnect/readme.md deleted file mode 100644 index 1037165ef..000000000 --- a/packages/Webkul/StripeConnect/readme.md +++ /dev/null @@ -1 +0,0 @@ -http://%%%%%.domain.com/admin/stripe/connect/retrieve/token \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Config/acl.php b/packages/Webkul/StripeConnect/src/Config/acl.php deleted file mode 100644 index 481436a58..000000000 --- a/packages/Webkul/StripeConnect/src/Config/acl.php +++ /dev/null @@ -1,15 +0,0 @@ - 'stripe', - 'name' => 'STRIPE', - 'route' => 'admin.stripe.seller', - 'sort' => 1 - ], [ - 'key' => 'stripe.connect', - 'name' => 'Connect Account', - 'route' => 'admin.stripe.seller', - 'sort' => 2 - ] -]; \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Config/admin-menu.php b/packages/Webkul/StripeConnect/src/Config/admin-menu.php deleted file mode 100644 index bc87a73a0..000000000 --- a/packages/Webkul/StripeConnect/src/Config/admin-menu.php +++ /dev/null @@ -1,17 +0,0 @@ - 'stripe', - 'name' => 'STRIPE', - 'route' => 'admin.stripe.seller', - 'sort' => 7, - 'icon-class' => 'stripe-icon', - ], [ - 'key' => 'stripe.connect', - 'name' => 'Connect Account', - 'route' => 'admin.stripe.seller', - 'sort' => 1, - 'icon-class' => '', - ] -]; \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Config/paymentmethods.php b/packages/Webkul/StripeConnect/src/Config/paymentmethods.php deleted file mode 100644 index 475e4a396..000000000 --- a/packages/Webkul/StripeConnect/src/Config/paymentmethods.php +++ /dev/null @@ -1,12 +0,0 @@ - [ - 'code' => 'stripe', - 'title' => 'RazzoPay', - 'description' => 'RazzoPay Payments', - 'class' => 'Webkul\StripeConnect\Payment\StripePayment', - 'sandbox' => true, - 'active' => true - ] -]; \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Config/system.php b/packages/Webkul/StripeConnect/src/Config/system.php deleted file mode 100644 index a71b9d471..000000000 --- a/packages/Webkul/StripeConnect/src/Config/system.php +++ /dev/null @@ -1,38 +0,0 @@ - 'stripe', - 'name' => 'Stripe Connect', - 'sort' => 5 - ], [ - 'key' => 'stripe.connect', - 'name' => 'Connect Account', - 'sort' => 1, - ], [ - 'key' => 'stripe.connect.details', - 'name' => 'Account Details', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'stripefees', - 'title' => 'Stripe fee to be paid by customer or seller', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Seller', - 'value' => 'seller' - ], [ - 'title' => 'Customer', - 'value' => 'customer' - ] - ], - 'validation' => 'required' - ], [ - 'name' => 'statementdescriptor', - 'title' => 'Statement Descriptor', - 'type' => 'text' - ] - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Contracts/StripeCart.php b/packages/Webkul/StripeConnect/src/Contracts/StripeCart.php deleted file mode 100644 index 4175718e4..000000000 --- a/packages/Webkul/StripeConnect/src/Contracts/StripeCart.php +++ /dev/null @@ -1,7 +0,0 @@ -increments('id'); - $table->integer('customer_id')->nullable()->unsigned(); - $table->foreign('customer_id')->references('id')->on('customers')->onDelete('cascade'); - $table->string('token'); - $table->boolean('need_new_token')->default(0); - $table->string('last_four')->length(4)->nullable(); - $table->json('misc')->nullable(); - - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('stripe_cards'); - } -} diff --git a/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_09_152250_create_stripe_companies_table.php b/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_09_152250_create_stripe_companies_table.php deleted file mode 100644 index ea6343626..000000000 --- a/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_09_152250_create_stripe_companies_table.php +++ /dev/null @@ -1,37 +0,0 @@ -increments('id'); - $table->string('access_token'); - $table->string('refresh_token'); - $table->string('stripe_publishable_key'); - $table->string('stripe_user_id'); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('stripe_companies'); - } -} diff --git a/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_11_174319_create_stripe_cart_table.php b/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_11_174319_create_stripe_cart_table.php deleted file mode 100644 index f5850aca0..000000000 --- a/packages/Webkul/StripeConnect/src/Database/Migrations/2019_06_11_174319_create_stripe_cart_table.php +++ /dev/null @@ -1,34 +0,0 @@ -increments('id'); - $table->integer('cart_id')->unsigned(); - $table->foreign('cart_id')->references('id')->on('cart')->onDelete('cascade'); - $table->json('stripe_token'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('stripe_cart'); - } -} diff --git a/packages/Webkul/StripeConnect/src/Http/Controllers/Controller.php b/packages/Webkul/StripeConnect/src/Http/Controllers/Controller.php deleted file mode 100755 index d75c0d17a..000000000 --- a/packages/Webkul/StripeConnect/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,12 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class SellerRegistrationController extends Controller -{ - /** - * To hold the StripeConnect Repository Instance - */ - protected $stripeConnect; - - public function __construct(StripeConnect $stripeConnect) - { - $this->stripeConnect = $stripeConnect; - - Stripe::setApiKey(env('STRIPE_TEST_SECRET_KEY')); - } - - public function index() - { - return view('stripe::connect'); - } - - /** - * To process the retrieved token after the seller's onboarding - * on platform account - */ - public function retrieveToken() - { - if (! request()->has('error')) { - $scope = request()->input('scope'); - $code = request()->input('code'); - - $client = new Client(); //GuzzleHttp\Client - $result = $client->post('https://connect.stripe.com/oauth/token', [ - 'auth' => [env('STRIPE_TEST_SECRET_KEY'), ''], - 'form_params' => [ - 'code' => $code, - 'grant_type' => 'authorization_code' - ] - ]); - - $decoded = json_decode($result->getBody()->getContents()); - $access_token = $decoded->access_token; - $refresh_token = $decoded->refresh_token; - $publishable_key = $decoded->stripe_publishable_key; - $stripe_user_id = $decoded->stripe_user_id; - - $result = $this->stripeConnect->create([ - 'access_token' => $access_token, - 'refresh_token' => $refresh_token, - 'stripe_publishable_key' => $publishable_key, - 'stripe_user_id' => $stripe_user_id - ]); - - if ($result) { - session()->flash('success', trans('stripe::app.account-connected')); - } else { - session()->flash('error', trans('stripe::app.problem-connecting')); - } - } else { - session()->flash('error', request()->input('error_description')); - } - - return redirect()->route('admin.stripe.seller'); - } - - public function revokeAccess() - { - $stripeConnectDetails = $this->stripeConnect->findWhere([ - 'company_id' => \Company::getCurrent()->id - ])->first(); - - $client = new Client(); //GuzzleHttp\Client - $result = $client->post('https://connect.stripe.com/oauth/deauthorize', [ - 'auth' => [env('STRIPE_TEST_SECRET_KEY'), ''], - 'form_params' => [ - 'client_id' => env('STRIPE_CLIENT_ID'), - 'stripe_user_id' => $stripeConnectDetails->stripe_user_id - ] - ]); - - if ($result->getStatusCode() == 200) { - $stripeConnectDetails->delete(); - - session()->flash('info', 'Your stripe account has been successfully revoked from the platform'); - } else { - session()->flash('error', $result->getBody()); - } - - return redirect()->route('admin.stripe.seller'); - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php b/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php deleted file mode 100644 index 46c70d2c6..000000000 --- a/packages/Webkul/StripeConnect/src/Http/Controllers/StripeConnectController.php +++ /dev/null @@ -1,354 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class StripeConnectController extends Controller -{ - /** - * OrderRepository object - * - * @var array - */ - protected $orderRepository; - - /** - * StripeRepository object - * - * @var array - */ - protected $stripeRepository; - - /** - * To hold the live stripe publishable key - */ - protected $stripeLivePublishableKey = null; - - /** - * To hold the live stripe secret key - */ - protected $stripeLiveSecretKey = null; - - /** - * To hold the Test stripe publishable key - */ - protected $stripeTestPublishableKey = null; - - /** - * To hold the Test stripe secret key - */ - protected $stripeTestSecretKey = null; - - /** - * Determine test mode - */ - protected $testMode; - - /** - * Determine if Stripe is active or Not - */ - protected $active; - - /** - * Statement descriptor string - */ - protected $statementDescriptor; - - /** - * Stripe Cart Repository Instance holder - */ - protected $stripeCart; - - /** - * Stripe Connect Repository Instance holder - */ - protected $stripeConnect; - - /** - * Create a new controller instance. - * - * @param Webkul\Attribute\Repositories\OrderRepository $orderRepository - * @return void - */ - public function __construct( - OrderRepository $orderRepository, - StripeCart $stripeCart, - StripeConnect $stripeConnect - ) - { - // $this->middleware('auth:super-admin', ['only' => ['storeDetails', 'createDetails', 'editDetails', 'updateDetails']]); - - $this->orderRepository = $orderRepository; - - $this->stripeCart = $stripeCart; - - $this->stripeConnect = $stripeConnect; - - $this->testMode = env('STRIPE_ENABLE_TESTING', true); - - $this->stripeTestPublishableKey = env('STRIPE_TEST_PUBLISHABLE_KEY') ?? 'NULL'; - - $this->stripeTestSecretKey = env('STRIPE_TEST_SECRET_KEY') ?? 'NULL'; - - $this->stripeLivePublishableKey = env('STRIPE_LIVE_PUBLISHABLE_KEY') ?? 'NULL'; - - $this->stripeLiveSecretKey = env('STRIPE_LIVE_SECRET_KEY') ?? 'NULL'; - - $this->stripeAdminFees = env('STRIPE_ADMIN_COMMISSION', 0.0) ?? 'NULL'; - - if (config('stripe.connect.details.statementdescriptor')) { - $this->statementDescriptor = config('stripe.connect.details.statementdescriptor') ?? 'NULL'; - } else { - $this->statementDescriptor = env('STRIPE_STATEMENT_DESCRIPTOR', 'NULL'); - } - } - - public function collectToken() - { - $data = request()->all(); - - if (auth()->guard('customer')->check()) { - //customer authenticated but using saved card - if(isset($data['useSavedCard'])) { - // session()->put('stripe_card', $data); - $this->stripeCart->create([ - 'cart_id' => \Cart::getCart()->id, - 'stripe_token' => json_encode($data) - ]); - - return response()->json(['success' => 'true']); - //customer authenticated but not using saved card - } else { - $misc = request()->input('stripeReturn'); - - //customer authenticated but opt to remember card - $last4 = null; - if (isset($data['last4'])) { - $stripeToken = $data['stripeToken']; - $last4 = $data['last4']; - - $result = $this->stripeRepository->create([ - 'customer_id' => auth()->guard('customer')->user()->id, - 'token' => $stripeToken, - 'last_four' => $last4, - 'misc' => json_encode($misc) - ]); - - // session()->put(['stripe_card' => $result]); - $this->stripeCart->create([ - 'cart_id' => \Cart::getCart()->id, - 'stripe_token' => json_encode($data) - ]); - - if ($result) { - return response()->json(['success' => 'true']); - } else { - return response()->json(['success' => 'false'], 400); - } - - //customer authenticated but not opting for remembering card - } else { - $stripeCart = $this->stripeCart->findWhere([ - 'cart_id' => Cart::getCart()->id - ]); - - if ($stripeCart->count() == 0) { - $this->stripeCart->create([ - 'cart_id' => \Cart::getCart()->id, - 'stripe_token' => json_encode($data) - ]); - } else { - $stripeCart->first()->update([ - 'stripe_token' => json_encode($data) - ]); - } - } - - return response()->json(['success' => 'true']); - } - } else { - //customer not authenticated - $stripeCart = $this->stripeCart->findWhere([ - 'cart_id' => Cart::getCart()->id - ]); - - if ($stripeCart->count() == 0) { - $this->stripeCart->create([ - 'cart_id' => \Cart::getCart()->id, - 'stripe_token' => json_encode($data) - ]); - } else { - $stripeCart->first()->update([ - 'stripe_token' => json_encode($data) - ]); - } - - - return response()->json(['success' => 'true']); - } - } - - public function createCharge() - { - $stripeConnect = $this->stripeConnect->findWhere([ - 'company_id' => \Company::getCurrent()->id - ]); - - if ($stripeConnect->count()) { - $sellerUserId = $stripeConnect->first()->stripe_user_id; - } else { - session()->flash('warning', 'Stripe unavailable for this seller'); - - return redirect()->route('shop.checkout.success'); - } - - if ($this->testMode) { - Stripe::setApiKey($this->stripeTestSecretKey); - } else { - Stripe::setApiKey($this->stripeLiveSecretKey); - } - - $stripeCard = $this->stripeCart->findWhere([ - 'cart_id' => Cart::getCart()->id - ])->first()->stripe_token; - - $stripeCard = json_decode($stripeCard); - - if (isset($stripeCard->stripeToken)) { - $stripeToken = $stripeCard->stripeToken; - } else if (isset($stripeCard->useSavedCard)) { - $cardId = $stripeCard->savedCardId; - - $card = $this->stripeRepository->findOneByField('id', $cardId); - - if ($card->need_new_token) { - $result = false; - } else { - $stripeToken = $card->token; - - $this->stripeRepository->update(['need_new_token' => 1], $cardId); - } - } else { - $stripeToken = $stripeCard->stripeToken; - } - - try { - $cart = Cart::getCart(); - - $applicationFee = ($this->stripeAdminFees * $cart->base_grand_total) / 100; - - if (core()->getConfigData('stripe.connect.details.stripefees') == "customer") { - $result = StripeCharge::create([ - "amount" => round(Cart::getCart()->base_grand_total + $applicationFee, 2) * 100, - "currency" => Cart::getCart()->base_currency_code, - "source" => $stripeToken, - "description" => "Purchased ".Cart::getCart()->items_count." items", - 'application_fee_amount' => round($applicationFee, 2) * 100, - 'statement_descriptor' => $this->statementDescriptor, - ], [ - 'stripe_account' => $sellerUserId - ]); - - $cart->update([ - 'base_grand_total' => $cart->grand_total + $applicationFee, - 'grand_total' => $cart->grand_total + core()->convertPrice($cart->grand_total + $applicationFee, $cart->cart_currency_code) - ]); - } else { - $result = StripeCharge::create([ - "amount" => round(Cart::getCart()->base_grand_total, 2) * 100, - "currency" => Cart::getCart()->base_currency_code, - "source" => $stripeToken, - "description" => "Purchased ".Cart::getCart()->items_count." items", - 'application_fee_amount' => round($applicationFee, 2) * 100, - 'statement_descriptor' => $this->statementDescriptor, - ], [ - 'stripe_account' => $sellerUserId - ]); - } - } catch(\Exception $e) { - if (core()->getConfigData('stripe.connect.details.stripefees') == "customer") { - $cart->update([ - 'base_grand_total' => $cart->grand_total - $applicationFee, - 'grand_total' => $cart->grand_total - core()->convertPrice($applicationFee, $cart->cart_currency_code) - ]); - } - - $result = false; - } - - // catch(\Stripe\Error\Card $e) { - // // Since it's a decline, \Stripe\Error\Card will be caught - // $body = $e->getJsonBody(); - // $err = $body['error']; - - // print('Status is:' . $e->getHttpStatus() . "\n"); - // print('Type is:' . $err['type'] . "\n"); - // print('Code is:' . $err['code'] . "\n"); - // // param is '' in this case - // print('Param is:' . $err['param'] . "\n"); - // print('Message is:' . $err['message'] . "\n"); - // } catch (\Stripe\Error\RateLimit $e) { - // // Too many requests made to the API too quickly - // } catch (\Stripe\Error\InvalidRequest $e) { - // // Invalid parameters were supplied to Stripe's API - // } catch (\Stripe\Error\Authentication $e) { - // // Authentication with Stripe's API failed - // // (maybe you changed API keys recently) - // } catch (\Stripe\Error\ApiConnection $e) { - // // Network communication with Stripe failed - // } catch (\Stripe\Error\Base $e) { - // // Display a very generic error to the user, and maybe send - // // yourself an email - // } catch (Exception $e) { - // // Something else happened, completely unrelated to Stripe - // } - - $this->stripeCart->deleteWhere([ - 'cart_id' => \Cart::getCart()->id - ]); - - if ($result) { - $order = $this->orderRepository->create(Cart::prepareDataForOrder()); - - Cart::deActivateCart(); - - session()->flash('order', $order); - - return redirect()->route('shop.checkout.success'); - } else { - session()->flash('error', trans('stripe::app.payment-failed')); - - return redirect()->route('shop.home.index'); - } - - return redirect()->route('shop.home.index'); - } - - public function deleteCard() - { - $deleteIfFound = $this->stripeRepository->findWhere(['id' => request()->input('id'), 'customer_id' => auth()->guard('customer')->user()->id]); - - $result = $deleteIfFound->first()->delete(); - - return (string)$result; - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Http/routes.php b/packages/Webkul/StripeConnect/src/Http/routes.php deleted file mode 100644 index f994f47c1..000000000 --- a/packages/Webkul/StripeConnect/src/Http/routes.php +++ /dev/null @@ -1,38 +0,0 @@ -group(function () { - Route::group(['middleware' => ['admin']], function () { - Route::get('stripe/connect', 'Webkul\StripeConnect\Http\Controllers\SellerRegistrationController@index')->name('admin.stripe.seller'); - - Route::get('stripe/connect/retrieve/token', 'Webkul\StripeConnect\Http\Controllers\SellerRegistrationController@retrieveToken')->name('admin.stripe.retrieve-grant'); - - Route::get('stripe/connect/revoke', 'Webkul\StripeConnect\Http\Controllers\SellerRegistrationController@revokeAccess')->name('admin.stripe.revoke-access'); - }); -}); - -Route::prefix('super')->group(function () { - Route::get('stripe/create', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@createDetails')->name('admin.stripe.create-details'); - - Route::post('stripe/store', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@storeDetails')->name('admin.stripe.store-details'); - - Route::get('stripe/edit', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@editDetails')->name('admin.stripe.edit-details'); - - Route::post('stripe/update', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@updateDetails')->name('admin.stripe.update-details'); -}); - -Route::group(['middleware' => ['web']], function () { -// Route::middleware('web')->group(function () { - Route::prefix('checkout')->group(function () { - Route::get('/stripe', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@collectCard')->defaults('_config', [ - 'view' => 'stripe::checkout.card' - ])->name('stripe.cardcollect'); - - Route::get('/stripe/card/check', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@checkCard')->name('stripe.check.card.unique'); - - Route::get('/stripe/card/delete', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@deleteCard')->name('stripe.delete.saved.cart'); - - Route::post('/sendtoken', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@collectToken')->name('stripe.get.token'); - - Route::get('/create/charge', 'Webkul\StripeConnect\Http\Controllers\StripeConnectController@createCharge')->name('stripe.make.payment'); - }); -}); \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Models/StripeCart.php b/packages/Webkul/StripeConnect/src/Models/StripeCart.php deleted file mode 100644 index 688fe53ca..000000000 --- a/packages/Webkul/StripeConnect/src/Models/StripeCart.php +++ /dev/null @@ -1,15 +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/StripeConnect/src/Models/StripeConnectProxy.php b/packages/Webkul/StripeConnect/src/Models/StripeConnectProxy.php deleted file mode 100644 index d7a5eb291..000000000 --- a/packages/Webkul/StripeConnect/src/Models/StripeConnectProxy.php +++ /dev/null @@ -1,10 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Payment/Stripe.php b/packages/Webkul/StripeConnect/src/Payment/Stripe.php deleted file mode 100755 index b5a0a9bd8..000000000 --- a/packages/Webkul/StripeConnect/src/Payment/Stripe.php +++ /dev/null @@ -1,61 +0,0 @@ - - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -abstract class Stripe extends Payment -{ - /** - * To hold the stripe live API key - */ - protected $apiKey; - - /** - * To hold the instance of the sku intance of the stripe API - */ - protected $sku; - - /** - * Bank statement descriptor, to hold the statement descriptor value - */ - protected $statementDescriptor; - - /** - * Checkout.js link for payment processing - */ - protected $checkoutLink; - - /** - * To redirect to the stripe payment page - */ - public function getStripeUrl() - { - return route('stripe.make.payment'); - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Payment/StripePayment.php b/packages/Webkul/StripeConnect/src/Payment/StripePayment.php deleted file mode 100644 index 7f614cfe2..000000000 --- a/packages/Webkul/StripeConnect/src/Payment/StripePayment.php +++ /dev/null @@ -1,33 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class StripePayment extends Stripe -{ - protected $code = 'stripe'; - - /** - * Get the redirect url for redirecting to - */ - public function getRedirectUrl() - { - return route('stripe.make.payment'); - } - - /** - * Stripe web URL generic getter - * - * @param array $params - * @return string - */ - public function getStripeUrl($params = []) - { - $this->getRedirectUrl(); - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Providers/EventServiceProvider.php b/packages/Webkul/StripeConnect/src/Providers/EventServiceProvider.php deleted file mode 100644 index e017db345..000000000 --- a/packages/Webkul/StripeConnect/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,34 +0,0 @@ -addTemplate('stripe::checkout.style'); - }); - - Event::listen('bagisto.shop.layout.head', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('stripe::checkout.style'); - }); - - Event::listen('bagisto.shop.checkout.payment-method.after', function($viewRenderEventManager){ - $viewRenderEventManager->addTemplate('stripe::checkout.card'); - }); - - Event::listen('bagisto.shop.layout.body.after', function($viewRenderEventManager) { - $viewRenderEventManager->addTemplate('stripe::checkout.card-script'); - }); - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Providers/ModuleServiceProvider.php b/packages/Webkul/StripeConnect/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index a7edee222..000000000 --- a/packages/Webkul/StripeConnect/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,13 +0,0 @@ -publishes([ - dirname(__DIR__) . '/Resources/assets/sass/stripe.scss' => base_path('public/vendor/webkul/stripe/assets/css/stripe.css') - ]); - - $this->publishes([ - dirname(__DIR__) . '/Resources/assets/images/' => base_path('public/vendor/webkul/stripe/assets/images/') - ]); - - $this->publishes([ - dirname(__DIR__) . '/Resources/views/checkout/total' => resource_path('views/vendor/shop/checkout/total') - ]); - - \Webkul\StripeConnect\Models\StripeConnect::observe(\Webkul\StripeConnect\Observers\StripeConnectObserver::class); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'stripe'); - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'stripe'); - - $this->app->register(EventServiceProvider::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - } - - /** - * Merge the stripe connect's configuration with the admin panel - */ - public function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/admin-menu.php', 'menu.admin' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/paymentmethods.php', 'paymentmethods' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/acl.php', 'acl' - ); - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Repositories/StripeCartRepository.php b/packages/Webkul/StripeConnect/src/Repositories/StripeCartRepository.php deleted file mode 100644 index 602c9fa7e..000000000 --- a/packages/Webkul/StripeConnect/src/Repositories/StripeCartRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class StripeCartRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\StripeConnect\Contracts\StripeCart'; - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Repositories/StripeConnectRepository.php b/packages/Webkul/StripeConnect/src/Repositories/StripeConnectRepository.php deleted file mode 100644 index 8b5aa05c6..000000000 --- a/packages/Webkul/StripeConnect/src/Repositories/StripeConnectRepository.php +++ /dev/null @@ -1,24 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class StripeConnectRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - function model() - { - return 'Webkul\StripeConnect\Contracts\StripeConnect'; - } -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/fonts/montserrat-v12-latin-regular.eot b/packages/Webkul/StripeConnect/src/Resources/assets/fonts/montserrat-v12-latin-regular.eot deleted file mode 100644 index 58433f250..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/fonts/montserrat-v12-latin-regular.eot and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe-Active.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe-Active.svg deleted file mode 100644 index b85762bac..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe-Active.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Icon-Stripe-Active - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe.svg deleted file mode 100644 index 721b1549e..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/Icon-Stripe.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Icon-Stripe - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.png deleted file mode 100644 index cfa741901..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.svg deleted file mode 100644 index 7f0b311cf..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy 2.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy 2 - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.png deleted file mode 100644 index d7583aaf6..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.svg deleted file mode 100644 index 1cc4e9f56..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender copy.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.png deleted file mode 100644 index 0cd04df06..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.svg deleted file mode 100644 index fefe7a424..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/calender.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - calender - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.png deleted file mode 100644 index db4e51a0f..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.svg deleted file mode 100644 index 2a5f8eb6a..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/card.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - card - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.png deleted file mode 100644 index 2629266e8..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.svg deleted file mode 100644 index 922694293..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/check-1.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - check-1 - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close-icon.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close-icon.svg deleted file mode 100644 index e8b45b1e6..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close-icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - calender copy 2 - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close.svg deleted file mode 100644 index 73345683f..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/close.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - close - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/cross-icon.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/cross-icon.svg deleted file mode 100755 index cf00c5a56..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/cross-icon.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - Icon-Cross - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.png deleted file mode 100644 index 1b9be03cb..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.svg deleted file mode 100644 index d6fe4161b..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/logo.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - logo - Created with Sketch. - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/master.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/master.svg deleted file mode 100644 index 5930b2dce..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/master.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - master - Created with Sketch. - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/mastro.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/mastro.svg deleted file mode 100644 index 593985c89..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/mastro.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - mastro - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/pci.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/pci.svg deleted file mode 100644 index bbe13319e..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/pci.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - pci - Created with Sketch. - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/stripe-logo.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/stripe-logo.png deleted file mode 100644 index c86ee507b..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/stripe-logo.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.png b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.png deleted file mode 100644 index 538b66543..000000000 Binary files a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.png and /dev/null differ diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.svg deleted file mode 100644 index 3c303cd22..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/successful.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - successful - Created with Sketch. - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/visa.svg b/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/visa.svg deleted file mode 100644 index 9286d752e..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/images/icons/visa.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - visa - Created with Sketch. - - - - - - - - - - - - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/assets/sass/stripe.scss b/packages/Webkul/StripeConnect/src/Resources/assets/sass/stripe.scss deleted file mode 100644 index 3c4bbbe38..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/assets/sass/stripe.scss +++ /dev/null @@ -1,156 +0,0 @@ -.stripe-close-icon { - width: 24px; - height: 24px; - background-image: url("../images/icons/close-icon.svg"); - position: absolute; - top: 5px; - right: 5px; -} - -.icon { - display: inline-block; - background-size: cover; -} - -%menu-properties { - width: 48px; - height: 48px; - display: inline-block; - background-size: cover; -} - -.stripe-icon { - @extend %menu-properties; - background-image: url("../images/icons/Icon-Stripe.svg"); -} - -.active { - .stripe-icon { - @extend %menu-properties; - background-image: url("../images/icons/Icon-Stripe-Active.svg"); - } -} - -#stripe-pay-button label { - display: inline; - color: #ffffff; -} - -.more-payment-icons { - text-align: center; - margin-top: 15px; - - .visa-icon { - width: 45px; - height: 28px; - background-image: url("../images/icons/visa.svg"); - padding-left: 32px; - } - - .master-icon { - width: 45px; - height: 28px; - background-image: url("../images/icons/master.svg"); - padding-left: 32px; - } - - .mastro-icon { - width: 45px; - height: 28px; - background-image: url("../images/icons/mastro.svg"); - padding-left: 32px; - } - - .pci-icon { - width: 45px; - height: 28px; - background-image: url("../images/icons/pci.svg"); - padding-left: 32px; - } -} -.add-card { - display: none; -} - -.stripe-cards { - // position: relative; -} - -.stripe-block-modal { - top: 120px; - left: calc(50% - 222px) !important; - display: block; - position: fixed; - z-index: 11; - width: 450px; - background: #FFFFFF; - border: 1px solid #979797; - box-shadow: 0 11px 23px 6px rgba(0,0,0,0.28); - border-radius: 5px; - margin-left: 0px !important; - - - - .stripe-title { - padding-bottom: 20px; - padding-top: 20px; - text-align: center; - } -} - -.stripe-form-content { - padding-top: 30px; - padding-bottom: 10px; - - .stripe-fields { - .control-group { - margin-bottom: 10px; - } - } - - .btn.btn-primary.btn-lg { - width: 100%; - } -} - -.stripe-errors { - margin-bottom: 10px; - color: #FF5252 -} - -.stripe-block-modal.close { - display: none; -} - -.stripe-card-info { - display: flex; - flex-direction: row; - align-items: center; - justify-content: flex-start; - font-size: 16px; - - .radio-container { - padding-left: 28px; - } - - span.icon { - width: 35px; - height:32px; - } - - span.card-last-four, a#edit-card, a#delete-card { - font-style: normal; - } - - span.card-last-four, a#edit-card { - margin-right: 14px; - } -} - -.stripe-cards-block { - display: none; -} - -.payment-icon { - width: 25px; -} \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/lang/en/app.php b/packages/Webkul/StripeConnect/src/Resources/lang/en/app.php deleted file mode 100644 index 65c8e45de..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/lang/en/app.php +++ /dev/null @@ -1,31 +0,0 @@ - 'Connect Stripe', - 'revoke-access' => 'Revoke Your Stripe Account Access', - 'client-id-missing' => 'The client id has not been set up by admin for the platform.', - 'nameoncard' => 'Name on Card', - 'click-here' => 'Click Here', - 'not-ready' => 'This seller ain\'t Stripe ready', - 'pay-now' => 'Pay Now', - 'account-connected' => 'Your Stripe account is successfully integrated with the platform', - 'problem-connecting' => 'There was some problem in onboarding your account', - 'stripe-unavailable' => 'Stripe unavailable for this seller', - 'expirymonth' => 'Expiration Month', - 'expiryyear' => 'Expiration Year', - 'cvc' => 'CVC', - 'cardno' => 'Card Number', - 'paynow' => 'Pay Now', - 'errors-in-fields' => 'Please correct the errors and try - again', - 'add-card' => 'Pay With New Card', - 'remember-card' => 'Remember Card', - 'pay' => 'Pay', - 'payment-failed' => 'Error! Payment Cannot Be Done', - 'payment-success' => 'Success! Payment Done', - 'click-continue' => 'Click continue to proceed further', - 'some-error' => 'Some error occurred', - 'transaction-fee' => 'Transaction Fees', - 'more-info' => '(after successful order)', - 'continue' => 'Please click on continue to complete your transaction' -]; \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/checkout/card-script.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/checkout/card-script.blade.php deleted file mode 100644 index 4e5e17f8d..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/checkout/card-script.blade.php +++ /dev/null @@ -1,320 +0,0 @@ -@if(request()->is('checkout/onepage')) - - - - - - -@endif \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/checkout/card.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/checkout/card.blade.php deleted file mode 100644 index 9a8595108..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/checkout/card.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@if($payment['method'] == "stripe") - @include('stripe::components.add-card') -
-
- - - - - -
- -
- - @include('stripe::components.stripe-form') - - -
-@endif \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/checkout/style.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/checkout/style.blade.php deleted file mode 100644 index 758c26a06..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/checkout/style.blade.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/checkout/total/summary.blade.php deleted file mode 100644 index c8f441948..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/checkout/total/summary.blade.php +++ /dev/null @@ -1,96 +0,0 @@ -
-

{{ __('shop::app.checkout.total.order-summary') }}

- -
- - -
- - @if ($cart->selected_shipping_rate) -
- - -
- @endif - - @if ($cart->base_tax_total) -
- - -
- @endif - -
discount_amount && $cart->discount_amount > 0) style="display: block;" @else style="display: none;" @endif> - - -
- - @if(core()->getConfigData('stripe.connect.details.stripefees') == 'customer' && isset($cart->payment) && $cart->payment->method == 'stripe') -
- @php - $applicationFee = env('STRIPE_ADMIN_COMMISSION', 0.0000) / 100 * $cart->base_grand_total; - @endphp - - - - -
- @endif - - -
- - -
- -
is('checkout/cart')) v-if="parseInt(discount)" @endif> - @if (! request()->is('checkout/cart')) - @if (! $cart->coupon_code) -
-
-
-
- -
- -
* @{{ error_message }}
- - -
-
-
- @else -
-
- - - -
-
- @endif - @endif -
-
\ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/components/add-card.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/components/add-card.blade.php deleted file mode 100644 index 0959aafc7..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/components/add-card.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -
- - - {{ __('stripe::app.add-card') }} - - -
\ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/components/saved-cards.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/components/saved-cards.blade.php deleted file mode 100644 index 10b397457..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/components/saved-cards.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@php - $cards = collect(); - - if(auth()->guard('customer')->check()) { - $customer_id = auth()->guard('customer')->user()->id; - - $cards = app('Webkul\Stripe\Repositories\StripeRepository')->findWhere(['customer_id' => $customer_id]); - } -@endphp - -@if(auth()->guard('customer')->check()) -
-
- @foreach($cards as $card) - @if(!$card->need_new_token) -
- - - - *** *** {{ $card->last_four }} - {{-- Edit --}} - Delete -
- @endif - @endforeach -
-
-@endif \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/components/stripe-form.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/components/stripe-form.blade.php deleted file mode 100644 index 83c4953db..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/components/stripe-form.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -
-
-
-
- - - -
-
- -
-
- - - - - - - {{-- @if(auth()->guard('customer')->check()) -
- - - - {{ __('stripe::app.remember-card') }} - -
- @endif --}} - - @php - $enableStripe = 0; - - $stripeConnect = app('Webkul\StripeConnect\Repositories\StripeConnectRepository')->findWhere([ - 'company_id' => \Company::getCurrent()->id - ]); - - if ($stripeConnect->count() == 1) { - $enableStripe = 1; - } - @endphp - - @if (! env('STRIPE_CLIENT_ID') || ! $enableStripe) - {{ __('stripe::app.not-ready') }} - @else - - @endif -
-
-
- -
- - - - - - - - - - - - - - - -
-
\ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/connect.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/connect.blade.php deleted file mode 100644 index d62d433b5..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/connect.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - Connect Stripe Account -@stop - -@section('content') -
-
-
-

Connect Your Stripe Account

-
-
-
-
- -
- @if (env('STRIPE_CLIENT_ID')) - @inject('stripeConnect', 'Webkul\StripeConnect\Repositories\StripeConnectRepository') - - @if($stripeConnect->findWhere(['company_id' => \Company::getCurrent()->id])->count() == 0) - {{ __('stripe::app.connect-stripe') }} - @else - {{ __('stripe::app.revoke-access') }} - @endif - @else - - {{ __('stripe::app.client-id-missing') }} -

- {{ __('stripe::app.click-here') }} - - @endif -
-
-@stop \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/super-admin/create.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/super-admin/create.blade.php deleted file mode 100644 index 6d749705d..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/super-admin/create.blade.php +++ /dev/null @@ -1,91 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Add Stripe Details -@stop - -@section('content-wrapper') -
-
-
-
-

- - - Add Stripe Details -

-
- -
- @inject('stripeSuperAdmin', 'Webkul\StripeConnect\Repositories\StripeSuperAdminRepository') - - @if ($stripeSuperAdmin->all()->count()) - Edit Details - @else - - @endif -
-
- -
- -
- @csrf() -
- - - @{{ errors.first('title') }} -
- -
- - - @{{ errors.first('description') }} -
- -
- - - @{{ errors.first('enable_on_checkout') }} -
- -
- - - @{{ errors.first('enable_testing') }} -
- -
- - - @{{ errors.first('test_publishable_key') }} -
-
- - - @{{ errors.first('test_secret_key') }} -
- -
- - - @{{ errors.first('live_publishable_key') }} -
-
- - - @{{ errors.first('live_secret_key') }} -
-
-
-
-
-@stop \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/src/Resources/views/super-admin/edit.blade.php b/packages/Webkul/StripeConnect/src/Resources/views/super-admin/edit.blade.php deleted file mode 100644 index b81e34211..000000000 --- a/packages/Webkul/StripeConnect/src/Resources/views/super-admin/edit.blade.php +++ /dev/null @@ -1,85 +0,0 @@ -@extends('saas::companies.layouts.master') - -@section('page_title') - Update Stripe Details -@stop - -@section('content-wrapper') -
-
-
-
-

- - - Update Stripe Details -

-
- -
- -
-
- -
- -
- @csrf() -
- - - @{{ errors.first('title') }} -
- -
- - - @{{ errors.first('description') }} -
- -
- - - @{{ errors.first('enable_on_checkout') }} -
- -
- - - @{{ errors.first('enable_testing') }} -
- -
- - - @{{ errors.first('test_publishable_key') }} -
-
- - - @{{ errors.first('test_secret_key') }} -
- -
- - - @{{ errors.first('live_publishable_key') }} -
-
- - - @{{ errors.first('live_secret_key') }} -
-
-
-
-
-@stop \ No newline at end of file diff --git a/packages/Webkul/StripeConnect/webpack.mix.js b/packages/Webkul/StripeConnect/webpack.mix.js deleted file mode 100644 index cb0e630e3..000000000 --- a/packages/Webkul/StripeConnect/webpack.mix.js +++ /dev/null @@ -1,22 +0,0 @@ -const { mix } = require("laravel-mix"); -require("laravel-mix-merge-manifest"); - -if (mix.inProduction()) { - var publicPath = 'publishable/assets'; -} else { - var publicPath = "../../../public/vendor/webkul/stripe/assets"; -} - -mix.setPublicPath(publicPath).mergeManifest(); -mix.disableNotifications(); - - mix.copy(__dirname + "/src/Resources/assets/images", publicPath + "/images/") - .copy(__dirname + "/src/Resources/assets/fonts", publicPath + "/fonts/") - .sass(__dirname + "/src/Resources/assets/sass/stripe.scss", "css/stripe.css") - .options({ - processCssUrls: false - }); - -if (mix.inProduction()) { - mix.version(); -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/composer.json b/packages/Webkul/Webfont/composer.json deleted file mode 100644 index 94a724827..000000000 --- a/packages/Webkul/Webfont/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "bagisto/laravel-webfont", - "license": "MIT", - "authors": [ - { - "name": "Prashant Singh", - "email": "prashant.singh852@webkul.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "Webkul\\Webfont\\": "src/" - } - }, - "extra": { - "laravel": { - "providers": [ - "Webkul\\User\\Providers\\WebfontServiceProvider" - ], - "aliases": { - } - } - }, - "minimum-stability": "dev" -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/readme.md b/packages/Webkul/Webfont/readme.md deleted file mode 100644 index 6dc12b4c2..000000000 --- a/packages/Webkul/Webfont/readme.md +++ /dev/null @@ -1,54 +0,0 @@ -# Laravel Webfont v0.1 - -# Introduction: -Bagisto webfont is dynamic implementation of google web fonts. It allows you to choose fonts from google fonts directly from your own Bagisto instance. Choose as many google fonts at once and customize your font for storefront or backend or both within few steps. - -# Feature of Bagisto webfont module - -* Allows you to activate and deactivate module. -* Allow a default font in case you have chosen none. -* Separate control for using font in admin panel or storefront. - -# Requirements -* Bagisto v0.1.7 or higher. - -# Note: -Before proceeding you need google fonts API key. You can get your own key by following instructions after opening the link below: - -> https://developers.google.com/fonts/docs/developer_api - -# Installation -* Extract contents of the zip file in the root of your Bagisto instance. -* Do entry in composer.json in psr-4 object: - -``` -"Webkul\\Webfont\\": "packages/Webkul/Webfont/src" -``` - -* Do entry in config/app.php, inside providers array preferably at the end of it: - -``` -Webkul\Webfont\Providers\WebfontServiceProvider::class -``` - -* Do entry in config\concord.php file: - -``` -\Webkul\Webfont\Providers\ModuleServiceProvider::class -``` - -* Run command below: -1. composer dump-autoload -> Proceed if there are no errors encountered - -2. php artisan migrate - -3. php artisan route:cache - -* You can now find the module configuration in admin panel under Configuration > General > Design. - -* In the configuration page, there is a field for API key which will require to enter your own Google Fonts Developer API key. - -* Find the module under CMS > Webfont. - -> Congrats, you are all set to use Google fonts from your Bagisto instance. diff --git a/packages/Webkul/Webfont/src/Config/menu.php b/packages/Webkul/Webfont/src/Config/menu.php deleted file mode 100644 index 46d9b717a..000000000 --- a/packages/Webkul/Webfont/src/Config/menu.php +++ /dev/null @@ -1,11 +0,0 @@ - 'cms.webfont', - 'name' => 'webfont::app.webfont', - 'route' => 'admin.cms.webfont', - 'sort' => 2, - 'icon-class' => '', - ] -]; \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Config/system.php b/packages/Webkul/Webfont/src/Config/system.php deleted file mode 100644 index 17efa27d8..000000000 --- a/packages/Webkul/Webfont/src/Config/system.php +++ /dev/null @@ -1,77 +0,0 @@ - 'general.design.webfont', - 'name' => 'webfont::app.webfont', - 'sort' => 1, - 'fields' => [ - [ - 'name' => 'status', - 'title' => 'webfont::app.webfont-status', - 'type' => 'select', - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ], - - 'channel_based' => false, - 'locale_based' => false - ], [ - 'name' => 'webfont', - 'title' => 'webfont::app.webfont-api', - 'type' => 'text', - 'validation' => 'required', - 'channel_based' => false, - 'locale_based' => false - ], [ - 'name' => 'enable_backend', - 'title' => 'webfont::app.webfont-backend', - 'type' => 'select', - 'channel_based' => false, - 'locale_based' => false, - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ] - ], [ - 'name' => 'enable_frontend', - 'title' => 'webfont::app.webfont-frontend', - 'type' => 'select', - 'channel_based' => false, - 'locale_based' => false, - 'options' => [ - [ - 'title' => 'Active', - 'value' => true - ], [ - 'title' => 'Inactive', - 'value' => false - ] - ] - ], [ - 'name' => 'primary_color', - 'title' => 'webfont::app.webfont-primary', - 'type' => 'text', - 'channel_based' => false, - 'locale_based' => false - ], [ - 'name' => 'secondary_color', - 'title' => 'webfont::app.webfont-secondary', - 'type' => 'text', - 'channel_based' => false, - 'locale_based' => false - ] - ] - ] -]; \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Contracts/Webfont.php b/packages/Webkul/Webfont/src/Contracts/Webfont.php deleted file mode 100644 index 0d7038033..000000000 --- a/packages/Webkul/Webfont/src/Contracts/Webfont.php +++ /dev/null @@ -1,7 +0,0 @@ - @prashant-webkul - * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class WebfontDataGrid extends DataGrid -{ - protected $index = 'id'; //the column that needs to be treated as index column - - protected $sortOrder = 'desc'; //asc or desc - - public function prepareQueryBuilder() - { - $queryBuilder = DB::table('google_web_fonts') - ->select('id', 'font', 'activated'); - - $this->setQueryBuilder($queryBuilder); - } - - public function addColumns() - { - $this->addColumn([ - 'index' => 'id', - 'label' => trans('webfont::app.id'), - 'type' => 'number', - 'searchable' => false, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'font', - 'label' => trans('webfont::app.font'), - 'type' => 'string', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true - ]); - - $this->addColumn([ - 'index' => 'activated', - 'label' => trans('webfont::app.activated'), - 'type' => 'boolean', - 'searchable' => true, - 'sortable' => true, - 'filterable' => true, - 'wrapper' => function($row) { - if ($row->activated) { - return trans('webfont::app.activated'); - } else { - return trans('webfont::app.de-activated'); - } - } - ]); - } - - public function prepareActions() - { - $this->addAction([ - 'type' => 'Edit', - 'method' => 'GET', //use post only for redirects only - 'route' => 'admin.cms.webfont.activate', - 'icon' => 'icon pencil-lg-icon' - ]); - - $this->addAction([ - 'type' => 'Delete', - 'method' => 'POST', //use post only for requests other than redirects - 'route' => 'admin.cms.webfont.remove', - 'icon' => 'icon trash-icon' - ]); - } -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Database/Migrations/2019_08_13_141430_create_google_web_fonts_table.php b/packages/Webkul/Webfont/src/Database/Migrations/2019_08_13_141430_create_google_web_fonts_table.php deleted file mode 100644 index 9752dff61..000000000 --- a/packages/Webkul/Webfont/src/Database/Migrations/2019_08_13_141430_create_google_web_fonts_table.php +++ /dev/null @@ -1,35 +0,0 @@ -increments('id'); - $table->text('font'); - $table->boolean('activated')->default(0); - $table->integer('company_id')->unsigned(); - $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('google_web_fonts'); - } -} diff --git a/packages/Webkul/Webfont/src/Http/Controllers/Controller.php b/packages/Webkul/Webfont/src/Http/Controllers/Controller.php deleted file mode 100644 index 89433c3d4..000000000 --- a/packages/Webkul/Webfont/src/Http/Controllers/Controller.php +++ /dev/null @@ -1,13 +0,0 @@ - @prashant-webkul - * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) - */ -class WebfontController extends Controller -{ - /** - * Hold webfont repository instance - */ - protected $webfont; - - public function __construct(Webfont $webfont) - { - $this->middleware('auth:admin'); - - $this->webfont = $webfont; - } - - public function index() - { - return view('webfont::admin-index'); - } - - public function add() - { - $client = new GuzzleHttp\Client(); - - if (core()->getConfigData('general.design.webfont.webfont')) { - $res = $client->request('GET', 'https://www.googleapis.com/webfonts/v1/webfonts?key='.env('WEBFONT_API_ID')); - - if ($res->getStatusCode() == 200) { - $result = (string) $res->getBody()->getContents(); - - return view('webfont::add-font')->with('fonts', json_decode($result)->items); - } else { - session()->flash('error', trans('webfont::app.cannot-fetch')); - - return redirect()->route('admin.cms.webfont'); - } - } else { - session()->flash('error', trans('webfont::app.set-api-key')); - - return redirect()->route('admin.cms.webfont'); - } - } - - public function store() - { - $fonts = request()->input('fonts'); - - $fonts = json_decode($fonts); - - foreach($fonts as $font) { - $this->webfont->create(['font' => $font]); - } - - session()->flash('success', trans('webfont::app.create-success')); - - return redirect()->route('admin.cms.webfont'); - } - - public function activate($id) - { - $font = $this->webfont->findWhere([ - 'activated' => 1 - ]); - - if (count($font)) { - $font = $font->first(); - - $font->update([ - 'activated' => 0 - ]); - - $font = $this->webfont->findOrFail($id); - - $font->update([ - 'activated' => 1 - ]); - } else { - $font = $this->webfont->findOrFail($id); - - $font->update([ - 'activated' => 1 - ]); - } - - session()->flash('success', trans('webfont::app.active-success')); - - return redirect()->route('admin.cms.webfont'); - } - - public function remove($id) - { - $font = $this->webfont->findOrFail($id); - - if($font->delete()) { - session()->flash('success', trans('webfont::app.delete-success')); - - return response()->json(['message' => true], 200); - } else { - session()->flash('error', trans('webfont::app.delete-fail')); - } - } - - public function fetchAndSync() - { - $client = new GuzzleHttp\Client(); - - return view('webfont::add-font'); - } - - public function homeSeo() - { - return redirect()->route('admin.cms.index'); - } -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Http/routes.php b/packages/Webkul/Webfont/src/Http/routes.php deleted file mode 100644 index 4e7f7261d..000000000 --- a/packages/Webkul/Webfont/src/Http/routes.php +++ /dev/null @@ -1,13 +0,0 @@ - ['admin']], function () { - Route::get('admin/webfont', 'Webkul\Webfont\Http\Controllers\WebfontController@index')->name('admin.cms.webfont'); - - Route::get('admin/webfont/add', 'Webkul\Webfont\Http\Controllers\WebfontController@add')->name('admin.cms.webfont.add'); - - Route::post('admin/webfont/add', 'Webkul\Webfont\Http\Controllers\WebfontController@store')->name('admin.cms.webfont.store'); - - Route::get('admin/webfont/activate/{id}', 'Webkul\Webfont\Http\Controllers\WebfontController@activate')->name('admin.cms.webfont.activate'); - - Route::post('admin/webfont/remove/{id}', 'Webkul\Webfont\Http\Controllers\WebfontController@remove')->name('admin.cms.webfont.remove'); -}); diff --git a/packages/Webkul/Webfont/src/Listeners/Webfont.php b/packages/Webkul/Webfont/src/Listeners/Webfont.php deleted file mode 100644 index 297c686ba..000000000 --- a/packages/Webkul/Webfont/src/Listeners/Webfont.php +++ /dev/null @@ -1,24 +0,0 @@ -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/Models/Webfont.php b/packages/Webkul/Webfont/src/Models/Webfont.php deleted file mode 100644 index 9ff8e0281..000000000 --- a/packages/Webkul/Webfont/src/Models/Webfont.php +++ /dev/null @@ -1,31 +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('google_web_fonts' . '.company_id', $company->id)); - } - } -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Models/WebfontProxy.php b/packages/Webkul/Webfont/src/Models/WebfontProxy.php deleted file mode 100644 index 85309513b..000000000 --- a/packages/Webkul/Webfont/src/Models/WebfontProxy.php +++ /dev/null @@ -1,10 +0,0 @@ -guard('super-admin')->check()) { - $model->company_id = Company::getCurrent()->id; - } - } -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php b/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php deleted file mode 100644 index 66ef37a1a..000000000 --- a/packages/Webkul/Webfont/src/Providers/EventServiceProvider.php +++ /dev/null @@ -1,26 +0,0 @@ -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/Providers/ModuleServiceProvider.php b/packages/Webkul/Webfont/src/Providers/ModuleServiceProvider.php deleted file mode 100644 index 17aaffd42..000000000 --- a/packages/Webkul/Webfont/src/Providers/ModuleServiceProvider.php +++ /dev/null @@ -1,12 +0,0 @@ -loadViewsFrom(__DIR__ . '/../Resources/views', 'webfont'); - - $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - - $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'webfont'); - - $this->loadRoutesFrom(__DIR__ . '/../Http/routes.php'); - - \Webkul\Webfont\Models\Webfont::observe(\Webkul\Webfont\Observers\WebfontObserver::class); - - $this->app->register(EventServiceProvider::class); - } - - /** - * Register services. - * - * @return void - */ - public function register() - { - $this->registerConfig(); - } - - /** - * Registers config - */ - protected function registerConfig() - { - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/system.php', 'core' - ); - - $this->mergeConfigFrom( - dirname(__DIR__) . '/Config/menu.php', 'menu.admin' - ); - } -} diff --git a/packages/Webkul/Webfont/src/Repositories/WebfontRepository.php b/packages/Webkul/Webfont/src/Repositories/WebfontRepository.php deleted file mode 100644 index cfaf3eb1b..000000000 --- a/packages/Webkul/Webfont/src/Repositories/WebfontRepository.php +++ /dev/null @@ -1,26 +0,0 @@ - @prashant-webkul - * @copyright 2019 Webkul Software Pvt Ltd (http://www.webkul.com) - */ - -class WebfontRepository extends Repository -{ - /** - * Specify Model class name - * - * @return mixed - */ - - function model() - { - return 'Webkul\Webfont\Contracts\Webfont'; - } -} \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Resources/lang/en/app.php b/packages/Webkul/Webfont/src/Resources/lang/en/app.php deleted file mode 100644 index 06e161d4f..000000000 --- a/packages/Webkul/Webfont/src/Resources/lang/en/app.php +++ /dev/null @@ -1,30 +0,0 @@ - 'ID', - 'homeseo' => 'Home Page SEO', - 'webfont-primary' => 'Primary accent color', - 'webfont-secondary' => 'Secondary accent color', - 'font' => 'Font', - 'title' => 'Webfonts', - 'save-btn-title' => 'Save Web Font', - 'cannot-fetch' => 'Cannot fetch the list of fonts, make sure that you are connected to internet', - 'set-api-key' => 'Set API key first', - 'select-fonts' => 'Select Fonts', - 'select-font-label' => 'Multiple selection and search are possible', - 'select-values' => 'Please select values', - 'create-success' => 'Fonts added to storage successfully', - 'activated' => 'Activated', - 'de-activated' => 'Deactived', - 'active-success' => 'Font activated successfully', - 'delete-success' => 'Font deleted successfully', - 'delete-fail' => 'Cannot delete font', - 'add' => 'Add Web Font', - 'remove' => 'Remove', - 'webfont' => 'Webfont', - 'webfont-api' => 'API Key', - 'webfont-default' => 'Default Font', - 'webfont-status' => 'Status', - 'webfont-frontend' => 'Enable for storefront', - 'webfont-backend' => 'Enable for backend' -]; \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Resources/views/add-font.blade.php b/packages/Webkul/Webfont/src/Resources/views/add-font.blade.php deleted file mode 100644 index 33ceaf693..000000000 --- a/packages/Webkul/Webfont/src/Resources/views/add-font.blade.php +++ /dev/null @@ -1,104 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('webfont::app.title') }} -@stop - -@section('content') -
- -
-@stop - -@push('scripts') - - - -@endpush \ No newline at end of file diff --git a/packages/Webkul/Webfont/src/Resources/views/admin-index.blade.php b/packages/Webkul/Webfont/src/Resources/views/admin-index.blade.php deleted file mode 100644 index 20cd142d7..000000000 --- a/packages/Webkul/Webfont/src/Resources/views/admin-index.blade.php +++ /dev/null @@ -1,27 +0,0 @@ -@extends('admin::layouts.content') - -@section('page_title') - {{ __('webfont::app.title') }} -@stop - -@section('content') - -
-
-
-

{{ __('webfont::app.title') }}

-
-
- - {{ __('webfont::app.add') }} - -
-
- -
- @inject('webfontGrid', 'Webkul\Webfont\DataGrids\WebfontDataGrid') - - {!! $webfontGrid->render() !!} -
-
-@stop \ 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 deleted file mode 100644 index cb3d6ab7e..000000000 --- a/packages/Webkul/Webfont/src/Resources/views/webfont.blade.php +++ /dev/null @@ -1,117 +0,0 @@ -@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'); - - $primaryColor = core()->getConfigData('general.design.webfont.primary_color') ?? '#02bb89'; - - $secondaryColor = core()->getConfigData('general.design.webfont.secondary_color') ?? '#436be0'; - - $font = $activatedFont->findOneWhere([ - 'activated' => 1 - ]); - - if (isset($font)) { - $activeFont = $font->font; - - $font = explode(',', $activeFont)[0]; - - $family = explode(',', $activeFont)[1]; - } else { - $font = 'Montserrat'; - - $family = 'sans-serif'; - } - @endphp - - - - -@endif \ No newline at end of file