diff --git a/packages/Webkul/Velocity/package.json b/packages/Webkul/Velocity/package.json index 95f65da74..4ecbf27ad 100644 --- a/packages/Webkul/Velocity/package.json +++ b/packages/Webkul/Velocity/package.json @@ -1,30 +1,23 @@ { "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": "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" + "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": { "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" + "vue": "^2.1.10", + "vue-carousel": "^0.18.0" }, - "dependencies": { "bootstrap-sass": "^3.4.1", "font-awesome": "^4.7.0", diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 3f571a462..73b3f9c58 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1197,6 +1197,7 @@ z-index: 100; width: 350px; left: -230px; + display: none; position: absolute; } @@ -1728,6 +1729,10 @@ margin-left: 0px !important; } +.product-price .price-label { + margin-right: 6px; +} + .product-price .sticker { top: 0; left: 0; @@ -1762,6 +1767,12 @@ margin-left: 0px; } +.method-sticker { + background-color: grey; + display: block; + color: white; +} + /* @author Shubham Mehrotra */ body { overflow-x: hidden; @@ -3372,6 +3383,10 @@ button[disabled] { font-size: 16px; } +.product-detail .right .product-price .sticker { + display: none; +} + .product-detail .thumb-list { left: 15px; z-index: 1000; diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_24_164544_add_footer_content_in_channels.php b/packages/Webkul/Velocity/src/Database/Migrations/2019_12_24_164544_add_footer_content_in_channels.php deleted file mode 100644 index 7cdd26b52..000000000 --- a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_24_164544_add_footer_content_in_channels.php +++ /dev/null @@ -1,32 +0,0 @@ -text('subscription_bar_content')->nullable(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('channels', function($table) { - $table->dropColumn('subscription_bar_content'); - }); - } -} diff --git a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php b/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php index 6f386994e..5e4d84023 100644 --- a/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php +++ b/packages/Webkul/Velocity/src/Database/Migrations/2019_12_30_155256_create_velocity_meta_data.php @@ -20,6 +20,7 @@ class CreateVelocityMetaData extends Migration $table->text('footer_left_content'); $table->text('footer_middle_content'); $table->boolean('slider')->default(0); + $table->text('subscription_bar_content')->nullable(); $table->timestamps(); }); diff --git a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php index 71eeb63a1..7cfd09540 100644 --- a/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php +++ b/packages/Webkul/Velocity/src/Database/Seeders/VelocityMetaDataSeeder.php @@ -21,6 +21,9 @@ class VelocityMetaDataSeeder extends Seeder 'footer_middle_content' => '
', 'slider' => 1, + + 'subscription_bar_content' => '
+
' ]); } } diff --git a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php index 918ccf545..74ace0799 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -39,8 +39,6 @@ class VelocityServiceProvider extends ServiceProvider $this->publishes([ __DIR__ . '/../Resources/views/' => resource_path('themes/velocity/views'), - - dirname(__DIR__) . '/Resources/views/admin/settings/channels/edit.blade.php' => base_path('resources/views/vendor/admin/settings/channels/edit.blade.php') ]); $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'velocity'); diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss index a3cd62f3a..c4cb2b5c0 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -1028,6 +1028,10 @@ } .product-price { + .price-label { + margin-right: 6px; + } + .sticker { top: 0; left: 0; @@ -1063,4 +1067,9 @@ :first-child { margin-left: 0px; } +} +.method-sticker { + background-color: grey; + display: block; + color: white; } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss index f9b106bf3..7a5117152 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss @@ -294,6 +294,12 @@ } } } + + .product-price { + .sticker { + display: none; + } + } } .thumb-list { diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index 4e82d1042..3aac7cae5 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -92,6 +92,7 @@ return [ 'title' => 'Velocity meta data', 'home-page-content' => 'Home Page Content', 'footer-left-content' => 'Footer Left Content', + 'subscription-content' => 'Subscription bar Content', 'activate-slider' => 'Activate Slider', 'footer-left-raw-content' => 'We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.', 'footer-middle-content' => 'Footer Middle Content', diff --git a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php index 02f802067..8dc7cbed5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/admin/meta-info/meta-data.blade.php @@ -37,6 +37,19 @@ +
+ + + +
+
-
+ @foreach($activeShippings as $shippingMethod) +
+ {{ $shippingMethod}} +
+ @endforeach
diff --git a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php index 6ede3c7c6..b1dd47634 100644 --- a/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/layouts/footer/newsletter-subscription.blade.php @@ -1,7 +1,7 @@ @if (core()->getConfigData('customer.settings.newsletter.subscription'))
- {!! DbView::make(core()->getCurrentChannel())->field('subscription_bar_content')->render() !!} + {!! $velocityMetaData->subscription_bar_content !!}
-