From 11fbe0b0f92719b69c5e5c9e49635574222abde9 Mon Sep 17 00:00:00 2001 From: prateek srivastava Date: Tue, 31 Dec 2019 11:43:17 +0530 Subject: [PATCH] product view, dynamic payment, shipping methods --- assets | 1 + package.json | 3 +- .../ProductsCategoriesProxyController.php | 6 +-- packages/Webkul/Velocity/package.json | 22 ++++------- .../Webkul/Velocity/publishable/assets/assets | 1 + .../publishable/assets/css/velocity.css | 12 +++++- ...10618_add_suscription_bar_in_velocity.php} | 6 +-- .../Seeders/VelocityMetaDataSeeder.php | 3 ++ .../src/Providers/VelocityServiceProvider.php | 2 +- .../Resources/assets/sass/components/app.scss | 10 +++++ .../Velocity/src/Resources/lang/en/app.php | 1 + .../views/admin/meta-info/meta-data.blade.php | 15 ++++++- .../footer-links/footer-right.blade.php | 39 +++++++++++++++---- .../footer/newsletter-subscription.blade.php | 2 +- .../products/view/bundle-options.blade.php | 6 +-- .../view/configurable-options.blade.php | 6 +-- .../products/view/downloadable.blade.php | 6 +-- .../products/view/grouped-products.blade.php | 2 +- velocity | 1 + 19 files changed, 100 insertions(+), 44 deletions(-) create mode 120000 assets create mode 120000 packages/Webkul/Velocity/publishable/assets/assets rename packages/Webkul/Velocity/src/Database/Migrations/{2019_12_24_164544_add_footer_content_in_channels.php => 2019_12_31_110618_add_suscription_bar_in_velocity.php} (74%) create mode 120000 velocity diff --git a/assets b/assets new file mode 120000 index 000000000..2233d0905 --- /dev/null +++ b/assets @@ -0,0 +1 @@ +/home/users/pratik.srivastava/www/html/velocity-1/packages/Webkul/Velocity/publishable/assets/home/users/pratik.srivastava/www/html/velocity-1/public/themes/velocity/assets \ No newline at end of file diff --git a/package.json b/package.json index 88cbe757f..15af6c640 100755 --- a/package.json +++ b/package.json @@ -21,8 +21,9 @@ "vue": "^2.5.7" }, "dependencies": { + "opencollective": "^1.0.3", "opencollective-postinstall": "^2.0.1", - "opencollective": "^1.0.3" + "vue-carousel": "^0.18.0" }, "collective": { "type": "opencollective", diff --git a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php index d8dfad45f..ab11d23dd 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/ProductsCategoriesProxyController.php @@ -61,10 +61,10 @@ class ProductsCategoriesProxyController extends Controller public function index(string $slugOrPath) { - if ($category = $this->categoryRepository->findByPath($slugOrPath)) { + // if ($category = $this->categoryRepository->findByPath($slugOrPath)) { - return view($this->_config['category_view'], compact('category')); - } + // return view($this->_config['category_view'], compact('category')); + // } if ($product = $this->productRepository->findBySlug($slugOrPath)) { diff --git a/packages/Webkul/Velocity/package.json b/packages/Webkul/Velocity/package.json index 95f65da74..96d57c7ff 100644 --- a/packages/Webkul/Velocity/package.json +++ b/packages/Webkul/Velocity/package.json @@ -1,21 +1,14 @@ { "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", @@ -24,7 +17,6 @@ "jquery": "^3.2", "vue": "^2.1.10" }, - "dependencies": { "bootstrap-sass": "^3.4.1", "font-awesome": "^4.7.0", diff --git a/packages/Webkul/Velocity/publishable/assets/assets b/packages/Webkul/Velocity/publishable/assets/assets new file mode 120000 index 000000000..1d8f2e3d5 --- /dev/null +++ b/packages/Webkul/Velocity/publishable/assets/assets @@ -0,0 +1 @@ +/home/users/pratik.srivastava/www/html/velocity-1/packages/Webkul/Velocity/publishable/assets \ No newline at end of file diff --git a/packages/Webkul/Velocity/publishable/assets/css/velocity.css b/packages/Webkul/Velocity/publishable/assets/css/velocity.css index 15e38043d..5c2e4eda3 100644 --- a/packages/Webkul/Velocity/publishable/assets/css/velocity.css +++ b/packages/Webkul/Velocity/publishable/assets/css/velocity.css @@ -1720,6 +1720,10 @@ margin-left: 0px !important; } +.product-price .price-label { + margin-right: 6px; +} + .product-price .sticker { top: 0; left: 0; @@ -1745,6 +1749,12 @@ text-decoration: line-through; } +.method-sticker { + background-color: grey; + display: block; + color: white; +} + /* @author Shubham Mehrotra */ body { overflow-x: hidden; @@ -2709,7 +2719,7 @@ body::after { } .ml15, .advertisement-two-container .ad-2-rt { - margin-left: 15px; + margin-left: 15px !important; } .body-blur { 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_31_110618_add_suscription_bar_in_velocity.php similarity index 74% rename from packages/Webkul/Velocity/src/Database/Migrations/2019_12_24_164544_add_footer_content_in_channels.php rename to packages/Webkul/Velocity/src/Database/Migrations/2019_12_31_110618_add_suscription_bar_in_velocity.php index 7cdd26b52..703d163a3 100644 --- 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_31_110618_add_suscription_bar_in_velocity.php @@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema; use Illuminate\Database\Schema\Blueprint; use Illuminate\Database\Migrations\Migration; -class AddFooterContentInChannels extends Migration +class AddSuscriptionBarInVelocity extends Migration { /** * Run the migrations. @@ -13,7 +13,7 @@ class AddFooterContentInChannels extends Migration */ public function up() { - Schema::table('channels', function($table) { + Schema::table('velocity_meta_data', function($table) { $table->text('subscription_bar_content')->nullable(); }); } @@ -25,7 +25,7 @@ class AddFooterContentInChannels extends Migration */ public function down() { - Schema::table('channels', function($table) { + Schema::table('velocity_meta_data', function($table) { $table->dropColumn('subscription_bar_content'); }); } 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..5242c3f33 100644 --- a/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php +++ b/packages/Webkul/Velocity/src/Providers/VelocityServiceProvider.php @@ -40,7 +40,7 @@ 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') + // 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 3b7c4d993..1082d4c40 100644 --- a/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss +++ b/packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss @@ -1015,6 +1015,10 @@ } .product-price { + .price-label { + margin-right: 6px; + } + .sticker { top: 0; left: 0; @@ -1039,4 +1043,10 @@ .special-price { text-decoration: line-through; } +} + +.method-sticker { + background-color: grey; + display: block; + color: white; } \ No newline at end of file diff --git a/packages/Webkul/Velocity/src/Resources/lang/en/app.php b/packages/Webkul/Velocity/src/Resources/lang/en/app.php index 610d3ea7d..e5567c598 100644 --- a/packages/Webkul/Velocity/src/Resources/lang/en/app.php +++ b/packages/Webkul/Velocity/src/Resources/lang/en/app.php @@ -93,6 +93,7 @@ return [ 'title' => 'Velocity meta data', 'home-page-content' => 'Home Page Content', 'footer-left-content' => 'Footer Left Content', + 'subscription-content' => 'Subscription bar Content', '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', 'update-meta-data' => 'Update Meta Data', 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 299034b1b..f91d35ce1 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 @@ -24,6 +24,19 @@ {{-- @include ($typeView) --}} +
+ + + +
+
-
+ @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'))
-