From acd048aaf63a3528baf6378500fdc3a6be993319 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 19 Sep 2018 12:28:15 +0530 Subject: [PATCH] Checkout page --- config/carrier.php | 51 - config/carriers.php | 18 + .../views/catalog/attributes/create.blade.php | 1 - .../products/accordians/inventories.blade.php | 2 + .../views/layouts/nav-left.blade.php | 2 +- .../views/users/users/index.blade.php | 3 +- .../Http/Controllers/CheckoutController.php | 17 +- .../src/Providers/CartServiceProvider.php | 14 +- packages/Webkul/Core/src/Core.php | 4 +- ...083025_create_customer_addresses_table.php | 1 + .../src/{Carrier => Carriers}/FlatRate.php | 9 +- .../src/Contracts/AbstractShipping.php | 2 - packages/Webkul/Shipping/src/Helper/Rate.php | 31 - packages/Webkul/Shipping/src/Helpers/Rate.php | 29 + .../src/Providers/ShippingServiceProvider.php | 8 - packages/Webkul/Shop/src/Http/routes.php | 4 +- .../Shop/src/Resources/assets/js/app.js | 2 + .../assets/js/components/category-item.vue | 1 - .../Shop/src/Resources/assets/sass/app.scss | 289 +-- .../Webkul/Shop/src/Resources/lang/en/app.php | 33 + .../index.blade.php => cart.blade.php} | 0 .../views/checkout/onepage.blade.php | 121 ++ .../checkout/onepage/customer-info.blade.php | 278 +++ .../views/checkout/onepage/payment.blade.php | 0 .../views/checkout/onepage/review.blade.php | 0 .../views/checkout/onepage/shipping.blade.php | 0 .../views/checkout/onepage/summary.blade.php | 37 + .../views/checkout/success.blade.php | 0 .../checkout/common/nav-right.blade.php | 36 +- .../views/customers/checkout/index.blade.php | 3 - .../views/products/reviews/index.blade.php | 1 - .../Resources/views/products/view.blade.php | 5 + .../view/configurable-options.blade.php | 15 +- .../views/products/view/gallery.blade.php | 1 - .../Ui/src/Resources/assets/sass/app.scss | 5 + public/themes/default/assets/css/shop.css | 221 +-- public/themes/default/assets/js/shop.js | 1578 ++++++++++++++++- .../themes/default/assets/mix-manifest.json | 2 +- 38 files changed, 2263 insertions(+), 561 deletions(-) delete mode 100644 config/carrier.php create mode 100644 config/carriers.php rename packages/Webkul/Shipping/src/{Carrier => Carriers}/FlatRate.php (64%) delete mode 100644 packages/Webkul/Shipping/src/Helper/Rate.php create mode 100644 packages/Webkul/Shipping/src/Helpers/Rate.php rename packages/Webkul/Shop/src/Resources/views/checkout/{onepage/index.blade.php => cart.blade.php} (100%) create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/onepage/summary.blade.php create mode 100644 packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php diff --git a/config/carrier.php b/config/carrier.php deleted file mode 100644 index c6da8a2f0..000000000 --- a/config/carrier.php +++ /dev/null @@ -1,51 +0,0 @@ - [ - [ - 'code' => 'flatrate_one', - 'title' => 'Flatrate One', - 'name' => 'fixed 20% discount for today', - 'description' => 'this is a flat rate', - 'status' => '1', - 'price' => '10', - 'type' => [ - 'per_unit' => 'Per Unit', - 'per order' => 'Per Order', - ], - 'class' => 'Webkul\Shipping\Helper\Rate', - ], - - [ - 'code' => 'flatrate_two', - 'title' => 'Flatrate Two', - 'name' => 'fixed 50% discount till 10/10/2018', - 'description' => 'this is a flat rate', - 'status' => '1', - 'price' => '100', - 'type' => [ - 'per unit' => 'Per Unit', - 'per order' => 'Per Order', - ], - 'class' => 'Webkul\Shipping\Helper\Rate', - ], - - [ - 'code' => 'flatrate_three', - 'title' => 'Flatrate Three', - 'name' => 'fixed 30% discount', - 'description' => 'this is a flat rate', - 'status' => '1', - 'price' => '1000', - 'type' => [ - 'per unit' => 'Per Unit', - 'per order' => 'Per Order', - ], - 'class' => 'Webkul\Shipping\Helper\Rate', - ] - ] - -] - -?> \ No newline at end of file diff --git a/config/carriers.php b/config/carriers.php new file mode 100644 index 000000000..87ef4edc0 --- /dev/null +++ b/config/carriers.php @@ -0,0 +1,18 @@ + [ + 'code' => 'flatrate', + 'title' => 'Flatrate', + 'description' => 'This is a flat rate', + 'status' => '1', + 'default_rate' => '10', + 'type' => [ + 'per_unit' => 'Per Unit', + 'per order' => 'Per Order', + ], + 'class' => 'Webkul\Shipping\Carriers\FlatRate', + ] +]; + +?> \ No newline at end of file diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php index 836447e9d..6c9b5c3fc 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/create.blade.php @@ -4,7 +4,6 @@ {{ __('admin::app.catalog.attributes.add-title') }} @stop - @section('content')
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php index 7c273c1e6..284ae0cb0 100644 --- a/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/accordians/inventories.blade.php @@ -18,7 +18,9 @@ ?>
+ + @{{ errors.first('inventories[{!! $inventorySource->id !!}]') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php index b1e948f9b..5abedf148 100644 --- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php @@ -2,7 +2,7 @@