From dbfe16e3bdb3fdfea085a4f9fe3c3706d11d3f95 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Sat, 15 Sep 2018 14:46:16 +0530 Subject: [PATCH 1/5] Rework the merge function else all would be fine --- packages/Webkul/Cart/src/Cart.php | 223 +++++++++++------- .../Shop/src/Resources/assets/sass/app.scss | 6 + .../Resources/views/products/add-to.blade.php | 6 +- public/themes/default/assets/css/shop.css | 6 + 4 files changed, 148 insertions(+), 93 deletions(-) diff --git a/packages/Webkul/Cart/src/Cart.php b/packages/Webkul/Cart/src/Cart.php index 9145f8c18..6df54b6e0 100644 --- a/packages/Webkul/Cart/src/Cart.php +++ b/packages/Webkul/Cart/src/Cart.php @@ -297,103 +297,146 @@ class Cart { public function mergeCart() { if(Cookie::has('cart_session_id')) { + /* + Check for previous cart of customer and + pull products from that cart instance + and then check for unique products + and delete the record with session id + and increase the quantity of the products + that are added again before deleting the + guest cart record. + */ + //To hold the customer ID which is currently logged in + $customer_id = auth()->guard('customer')->user()->id; + + //having the session id saved in the cart. $cart_session_id = Cookie::get('cart_session_id'); - $current_cart = $this->cart->findOneByField('session_id', $cart_session_id); + //pull the record from cart table for above session id. + $guest_cart = $this->cart->findOneByField($cart_session_id); - //it is impossible to not have an entry in cart table and cart_products. - //will later handle the exceoption. - $current_cart_id = $current_cart['id'] ?? $current_cart->id; + if(!isset($guest_cart)) { + dd('Some One Deleted Cart or it wasn\'t there from the start'); - $current_cart_session_id = $current_cart['session_id'] ?? $current_cart->session_id; - - $current_cart_products = $this->cart->getProducts($current_cart_id); - - $customer_id = auth()->guard('customer')->user()->id; //working - - if($cart_session_id == $current_cart_session_id) { - $current_cart_products = array(); - - $customer_cart = $this->cart->findByField(['customer_id'=> $customer_id]); - - //check previous saved cart of customer. - if(!$customer_cart->isEmpty()) { - - $customer_cart_id = $customer_cart->id; - - $customer_cart_products = $this->cart->getProducts($customer_cart_id); - - foreach($current_cart_products as $key => $value) { - - $product_id = $value['id'] ?? $value->id; - - foreach($current_cart_products as $key => $current_cart_product) { - - $current_product_id = $current_cart_product['id'] ?? $current_cart_product->id; - - if($current_product_id == $product_id) { - - unset($current_cart_products[$key]); - } - } - } - - - foreach($current_cart_products as $current_cart_product) { - - $current_cart_product_id = $current_cart_product['id'] ?? $current_cart_product->id; - - $this->cart->attach($current_cart_id, $current_cart_product_id, 1); - } - - $this->cart->update(['customer_id' => $customer_id], $current_cart_id); - - $customer_cart = $this->cart->findOneByField('customer_id', $customer_id); - - $customer_cart_id = $customer_cart->id; - - if($this->cart->getProducts($customer_cart_id) && isset($current_cart_products)) { - foreach($current_cart_products as $key => $value) { - - array_push($cart_products, $current_cart_product); - } - } - - session()->put('cart_data', [$customer_cart, $cart_products]); - - session()->flash('Success', 'Item Added In Cart'); - - dump($cart_products); - - return redirect()->back(); - } else { - - $session_id = session()->getId(); - - $customer_id = auth()->guard('customer')->user()->id; - - $updated_cart = $this->cart->update(['customer_id' => $customer_id, 'session_id' => $session_id], $current_cart_id); - - $updated_cart_products = $this->cart->getProducts($updated_cart->id); - - Cookie::queue('cart_session_id', $session_id, 120); - - session()->put('cart_session_id', $session_id); - - session('cart_data', [$updated_cart, $updated_cart_products]); - - return redirect()->back(); - } - } else { - throw new \Exception('Error, Session discrepancies found.'); - - $this->repairCart($cart_session_id, $id); + return redirect()->back(); } - } else { - throw new \Exception('Nothing found'); - return redirect()->back(); + //check if the current logged in customer is also + //having any previously saved cart instances. + $customer_cart = $this->cart->findOneByField('customer_id', $customer_id); + + } + + // if(Cookie::has('cart_session_id')) { + + // /* + // Check for previous cart of customer and + // pull products from that cart instance + // and then check for unique products + // and delete the record with session id + // and increase the quantity of the products + // that are added again before deleting the + // guest cart record. + // */ + + // $cart_session_id = Cookie::get('cart_session_id'); + + // $current_cart = $this->cart->findOneByField('session_id', $cart_session_id); + + // //it is impossible to not have an entry in cart table and cart_products. + // //will later handle the exceoption. + // $current_cart_id = $current_cart['id'] ?? $current_cart->id; + + // $current_cart_session_id = $current_cart['session_id'] ?? $current_cart->session_id; + + // $current_cart_products = $this->cart->getProducts($current_cart_id); + + // $customer_id = auth()->guard('customer')->user()->id; //working + + // if($cart_session_id == $current_cart_session_id) { + // $current_cart_products = array(); + + // $customer_cart = $this->cart->findByField(['customer_id'=> $customer_id]); + + // //check previous saved cart of customer. + // if(!$customer_cart->isEmpty()) { + + // $customer_cart_id = $customer_cart->id; + + // $customer_cart_products = $this->cart->getProducts($customer_cart_id); + + // foreach($current_cart_products as $key => $value) { + + // $product_id = $value['id'] ?? $value->id; + + // foreach($current_cart_products as $key => $current_cart_product) { + + // $current_product_id = $current_cart_product['id'] ?? $current_cart_product->id; + + // if($current_product_id == $product_id) { + + // unset($current_cart_products[$key]); + // } + // } + // } + + + // foreach($current_cart_products as $current_cart_product) { + + // $current_cart_product_id = $current_cart_product['id'] ?? $current_cart_product->id; + + // $this->cart->attach($current_cart_id, $current_cart_product_id, 1); + // } + + // $this->cart->update(['customer_id' => $customer_id], $current_cart_id); + + // $customer_cart = $this->cart->findOneByField('customer_id', $customer_id); + + // $customer_cart_id = $customer_cart->id; + + // if($this->cart->getProducts($customer_cart_id) && isset($current_cart_products)) { + // foreach($current_cart_products as $key => $value) { + + // array_push($cart_products, $current_cart_product); + // } + // } + + // session()->put('cart_data', [$customer_cart, $cart_products]); + + // session()->flash('Success', 'Item Added In Cart'); + + // dump($cart_products); + + // return redirect()->back(); + // } else { + + // $session_id = session()->getId(); + + // $customer_id = auth()->guard('customer')->user()->id; + + // $updated_cart = $this->cart->update(['customer_id' => $customer_id, 'session_id' => $session_id], $current_cart_id); + + // $updated_cart_products = $this->cart->getProducts($updated_cart->id); + + // Cookie::queue('cart_session_id', $session_id, 120); + + // session()->put('cart_session_id', $session_id); + + // session('cart_data', [$updated_cart, $updated_cart_products]); + + // return redirect()->back(); + // } + // } else { + // throw new \Exception('Error, Session discrepancies found.'); + + // $this->repairCart($cart_session_id, $id); + // } + // } else { + // throw new \Exception('Nothing found'); + + // return redirect()->back(); + // } } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 2fbcbcb14..799e0760b 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -1412,6 +1412,12 @@ section.product-detail { .cart-fav-seg { display: block; float: right; + + .wishlist { + position: absolute; + margin-top: -500px; + margin-right: -100px; + } } } diff --git a/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php b/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php index 1839cb16b..1ebdd16b1 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/add-to.blade.php @@ -1,7 +1,7 @@
- + @include ('shop::products.add-to-cart', ['product' => $product]) - - + +
\ No newline at end of file diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index f15ae984f..b674c2995 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -1501,6 +1501,12 @@ section.product-detail div.layouter form div.product-image-group .cart-fav-seg { float: right; } +section.product-detail div.layouter form div.product-image-group .cart-fav-seg .wishlist { + position: absolute; + margin-top: -500px; + margin-right: -100px; +} + section.product-detail div.layouter form .details { width: 50%; } From ec6d777b25aa36eb11cf63894e59fd14c0b44f07 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Mon, 17 Sep 2018 13:57:32 +0530 Subject: [PATCH 2/5] Cart Working by adding the products as guest and logged in user and merging in case of guest user to logged in. Ready for next phase of checkouts. --- packages/Webkul/Cart/src/Cart.php | 178 ++++++------------ .../src/Http/Controllers/CartController.php | 19 +- packages/Webkul/Cart/src/Models/Cart.php | 2 +- .../Cart/src/Repositories/CartRepository.php | 41 +++- packages/Webkul/Shop/src/Http/routes.php | 2 + 5 files changed, 113 insertions(+), 129 deletions(-) diff --git a/packages/Webkul/Cart/src/Cart.php b/packages/Webkul/Cart/src/Cart.php index 6df54b6e0..9969c4f23 100644 --- a/packages/Webkul/Cart/src/Cart.php +++ b/packages/Webkul/Cart/src/Cart.php @@ -45,7 +45,7 @@ class Cart { $products = array(); - $minutes = 10; + $minutes = 150; if(Cookie::has('cart_session_id')) { @@ -95,21 +95,16 @@ class Cart { return redirect()->back(); } else { - // throw new \Exception('Error, Many or Few Session discrepancies found.'); - + //repair the cart $this->repairCart($cart_session_id, $id); } } else { + //create a new cart instance. $this->createNewCart($id); } } /*helpers*/ - public function makeCartSession($to_process) { - session()->put('cart_session_id', $to_process); - - return session()->get('cart_session_id'); - } /** * Create New Cart @@ -156,6 +151,17 @@ class Cart { return redirect()->back(); } + /** + * This makes session + * cart. + */ + public function makeCartSession($cart_session_id) { + session()->put('cart_session_id', $cart_session_id); + + return session()->get('cart_session_id'); + } + + /** * Reset Session and * Cookie values @@ -296,6 +302,7 @@ class Cart { public function mergeCart() { + //considering cookie as a source of truth. if(Cookie::has('cart_session_id')) { /* Check for previous cart of customer and @@ -314,7 +321,7 @@ class Cart { $cart_session_id = Cookie::get('cart_session_id'); //pull the record from cart table for above session id. - $guest_cart = $this->cart->findOneByField($cart_session_id); + $guest_cart = $this->cart->findOneByField('session_id', $cart_session_id); if(!isset($guest_cart)) { dd('Some One Deleted Cart or it wasn\'t there from the start'); @@ -322,121 +329,54 @@ class Cart { return redirect()->back(); } + $guest_cart_products = $this->cart->getProducts($guest_cart->id); + //check if the current logged in customer is also //having any previously saved cart instances. $customer_cart = $this->cart->findOneByField('customer_id', $customer_id); + if(isset($customer_cart)) { + $customer_cart_products = $this->cart->getProducts($customer_cart->id); + foreach($guest_cart_products as $key => $guest_cart_product) { + + foreach($customer_cart_products as $customer_cart_product) { + + if($guest_cart_product->id == $customer_cart_product->id) { + + $quantity = $guest_cart_product->toArray()['pivot']['quantity'] + 1; + + $pivot = $guest_cart_product->toArray()['pivot']; + + $saveQuantity = $this->cart->updateRelatedForMerge($pivot, 'quantity', $quantity); + + unset($guest_cart_products[$key]); + } + } + } + + //insert the new products here. + foreach ($guest_cart_products as $key => $guest_cart_product) { + $product = $guest_cart_product->toArray(); + + $this->cart->updateRelatedForMerge($product['pivot'], 'cart_id', $customer_cart->id); + } + + //detach with guest cart records + $this->cart->detachAndDeleteParent($guest_cart->id); + + Cookie::queue(Cookie::forget('cart_session_id')); + + return redirect()->back(); + } else { + //this will just update the customer id column in the cart table + $this->cart->update(['customer_id' => $customer_id], $guest_cart->id); + + Cookie::queue(Cookie::forget('cart_session_id')); + + return redirect()->back(); + } } - - // if(Cookie::has('cart_session_id')) { - - // /* - // Check for previous cart of customer and - // pull products from that cart instance - // and then check for unique products - // and delete the record with session id - // and increase the quantity of the products - // that are added again before deleting the - // guest cart record. - // */ - - // $cart_session_id = Cookie::get('cart_session_id'); - - // $current_cart = $this->cart->findOneByField('session_id', $cart_session_id); - - // //it is impossible to not have an entry in cart table and cart_products. - // //will later handle the exceoption. - // $current_cart_id = $current_cart['id'] ?? $current_cart->id; - - // $current_cart_session_id = $current_cart['session_id'] ?? $current_cart->session_id; - - // $current_cart_products = $this->cart->getProducts($current_cart_id); - - // $customer_id = auth()->guard('customer')->user()->id; //working - - // if($cart_session_id == $current_cart_session_id) { - // $current_cart_products = array(); - - // $customer_cart = $this->cart->findByField(['customer_id'=> $customer_id]); - - // //check previous saved cart of customer. - // if(!$customer_cart->isEmpty()) { - - // $customer_cart_id = $customer_cart->id; - - // $customer_cart_products = $this->cart->getProducts($customer_cart_id); - - // foreach($current_cart_products as $key => $value) { - - // $product_id = $value['id'] ?? $value->id; - - // foreach($current_cart_products as $key => $current_cart_product) { - - // $current_product_id = $current_cart_product['id'] ?? $current_cart_product->id; - - // if($current_product_id == $product_id) { - - // unset($current_cart_products[$key]); - // } - // } - // } - - - // foreach($current_cart_products as $current_cart_product) { - - // $current_cart_product_id = $current_cart_product['id'] ?? $current_cart_product->id; - - // $this->cart->attach($current_cart_id, $current_cart_product_id, 1); - // } - - // $this->cart->update(['customer_id' => $customer_id], $current_cart_id); - - // $customer_cart = $this->cart->findOneByField('customer_id', $customer_id); - - // $customer_cart_id = $customer_cart->id; - - // if($this->cart->getProducts($customer_cart_id) && isset($current_cart_products)) { - // foreach($current_cart_products as $key => $value) { - - // array_push($cart_products, $current_cart_product); - // } - // } - - // session()->put('cart_data', [$customer_cart, $cart_products]); - - // session()->flash('Success', 'Item Added In Cart'); - - // dump($cart_products); - - // return redirect()->back(); - // } else { - - // $session_id = session()->getId(); - - // $customer_id = auth()->guard('customer')->user()->id; - - // $updated_cart = $this->cart->update(['customer_id' => $customer_id, 'session_id' => $session_id], $current_cart_id); - - // $updated_cart_products = $this->cart->getProducts($updated_cart->id); - - // Cookie::queue('cart_session_id', $session_id, 120); - - // session()->put('cart_session_id', $session_id); - - // session('cart_data', [$updated_cart, $updated_cart_products]); - - // return redirect()->back(); - // } - // } else { - // throw new \Exception('Error, Session discrepancies found.'); - - // $this->repairCart($cart_session_id, $id); - // } - // } else { - // throw new \Exception('Nothing found'); - - // return redirect()->back(); - // } + return redirect()->back(); } } \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Http/Controllers/CartController.php b/packages/Webkul/Cart/src/Http/Controllers/CartController.php index 972719384..101d28b9a 100644 --- a/packages/Webkul/Cart/src/Http/Controllers/CartController.php +++ b/packages/Webkul/Cart/src/Http/Controllers/CartController.php @@ -42,7 +42,7 @@ class CartController extends Controller public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer) { - $this->middleware('customer')->except(['add', 'remove']); + $this->middleware('customer')->except(['add', 'remove', 'test']); $this->customer = $customer; @@ -80,4 +80,21 @@ class CartController extends Controller return redirect()->back(); } + + // public function test() { + // $cookie = Cookie::get('cart_session_id'); + + // $cart = $this->cart->findOneByField('session_id', $cookie); + + // $cart_products = $this->cart->getProducts($cart->id); + + // foreach($cart_products as $cart_product) { + // $quantity = $cart_product->toArray()['pivot']['quantity'] + 1; + + // $pivot = $cart_product->toArray()['pivot']; + + // $saveQuantity = $this->cart->saveRelated($pivot, 'quantity', $quantity+1); + // } + // dd('done'); + // } } \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Models/Cart.php b/packages/Webkul/Cart/src/Models/Cart.php index f03c3a82f..20f376f67 100644 --- a/packages/Webkul/Cart/src/Models/Cart.php +++ b/packages/Webkul/Cart/src/Models/Cart.php @@ -15,6 +15,6 @@ class Cart extends Model protected $hidden = ['coupon_code']; public function with_products() { - return $this->belongsToMany(Product::class, 'cart_products'); + return $this->belongsToMany(Product::class, 'cart_products')->withPivot('id', 'product_id','quantity', 'cart_id'); } } diff --git a/packages/Webkul/Cart/src/Repositories/CartRepository.php b/packages/Webkul/Cart/src/Repositories/CartRepository.php index 0ba0e4b07..e7f951abd 100644 --- a/packages/Webkul/Cart/src/Repositories/CartRepository.php +++ b/packages/Webkul/Cart/src/Repositories/CartRepository.php @@ -16,7 +16,7 @@ class CartRepository extends Repository /** * Specify Model class name * - * @return mixed + * @return Mixed */ function model() @@ -26,7 +26,7 @@ class CartRepository extends Repository /** * @param array $data - * @return mixed + * @return Mixed */ public function create(array $data) @@ -40,7 +40,7 @@ class CartRepository extends Repository * @param array $data * @param $id * @param string $attribute - * @return mixed + * @return Mixed */ public function update(array $data, $id, $attribute = "id") @@ -61,18 +61,43 @@ class CartRepository extends Repository * Method to attach * associations * - * @return Eloquent + * @return Mixed */ public function attach($cart_id, $product_id, $quantity) { - $this->model->findOrFail($cart_id)->with_products()->attach($cart_id, ['product_id' => $product_id, 'cart_id' => $cart_id, 'quantity' => $quantity]); + return $this->model->findOrFail($cart_id)->with_products()->attach($cart_id, ['product_id' => $product_id, 'cart_id' => $cart_id, 'quantity' => $quantity]); } /** - * Method to detach - * associations + * This will update the + * quantity of product + * for the customer, + * in case of merge. * - * @return Eloquent + * @return Mixed */ + public function updateRelatedForMerge($pivot, $column, $value) { + $cart_product = $this->model->findOrFail($pivot['cart_id']); + + return $cart_product->with_products()->updateExistingPivot($pivot['product_id'], array($column => $value)); + } + + /** + * Method to detach + * associations. + * + * Use this only with + * guest cart only. + * + * @return Mixed + */ + public function detachAndDeleteParent($cart_id) { + $cart = $this->model->find($cart_id); + + //apply strict check for verifying guest ownership on this record. + $cart->with_products()->detach(); + + return $this->model->destroy($cart_id); + } } \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index 2f4382ce2..faf6223fc 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -2,6 +2,8 @@ Route::group(['middleware' => ['web']], function () { + Route::get('/test', 'Webkul\Cart\Http\Controllers\CartController@test'); + Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [ 'view' => 'shop::home.index' ])->name('store.home'); From acd048aaf63a3528baf6378500fdc3a6be993319 Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 19 Sep 2018 12:28:15 +0530 Subject: [PATCH 3/5] 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 @@
    @foreach($menu->items as $menuItem)
  • - + {{ $menuItem['name'] }} diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php index fc4a1d6c3..eef3ab6fd 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php @@ -1,8 +1,7 @@ @extends('admin::layouts.content') @section('page_title') - -@endsection + {{ __('admin::app.users.users.title') }} @stop @section('content') diff --git a/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php index 4221017eb..b763fc1e9 100644 --- a/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php +++ b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php @@ -10,23 +10,26 @@ use Auth; * Chekout controller for the customer * and guest for placing order * - * @author Rahul Shukla + * @author Jitendra Singh * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) */ class CheckoutController extends Controller { /** - * Display a listing of the resource. + * Contains route related configuration * - * @return \Illuminate\Http\Response + * @var array */ protected $_config; + /** + * Create a new controller instance. + * + * @return void + */ public function __construct() { - // $this->middleware(['customer', 'guest']); - $this->_config = request('_config'); } @@ -37,9 +40,7 @@ class CheckoutController extends Controller */ public function index() { - $customer_id = auth()->guard('customer')->user(); - - return view($this->_config['view'],compact('customer_id')); + return view($this->_config['view']); } } \ No newline at end of file diff --git a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php index f05e1cb39..28755d917 100644 --- a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php +++ b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php @@ -8,7 +8,8 @@ use Illuminate\Routing\Router; use Illuminate\Foundation\AliasLoader; use Webkul\User\Http\Middleware\RedirectIfNotAdmin; use Webkul\Customer\Http\Middleware\RedirectIfNotCustomer; -use Webkul\Cart\Facades\Cart; +use Webkul\Cart\Cart; +use Webkul\Cart\Facades\Cart as CartFacade; class CartServiceProvider extends ServiceProvider { @@ -17,10 +18,6 @@ class CartServiceProvider extends ServiceProvider { $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); - - // $router->aliasMiddleware('customer', RedirectIfNotCustomer::class); - $this->register(EventServiceProvider::class); } @@ -42,13 +39,10 @@ class CartServiceProvider extends ServiceProvider protected function registerFacades() { $loader = AliasLoader::getInstance(); - - $loader->alias('cart', Cart::class); + $loader->alias('cart', CartFacade::class); $this->app->singleton('cart', function () { - return new cart(); + return new Cart(); }); - - $this->app->bind('cart', 'Webkul\Cart\Cart'); } } diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index 119d43b41..0b5d36e49 100644 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -140,8 +140,8 @@ class Core $channel = $this->getCurrentChannel(); - // $currencyCode = $channel->base_currency->code; - $currencyCode = $channel->base_currency; + $currencyCode = $channel->base_currency->code; + // $currencyCode = $channel->base_currency; return currency($price, $currencyCode); } diff --git a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php index c0362f492..5d68a3249 100644 --- a/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php +++ b/packages/Webkul/Customer/src/Database/migrations/2018_07_24_083025_create_customer_addresses_table.php @@ -23,6 +23,7 @@ class CreateCustomerAddressesTable extends Migration $table->string('state'); $table->string('city'); $table->integer('postcode'); + $table->string('phone'); $table->timestamps(); }); } diff --git a/packages/Webkul/Shipping/src/Carrier/FlatRate.php b/packages/Webkul/Shipping/src/Carriers/FlatRate.php similarity index 64% rename from packages/Webkul/Shipping/src/Carrier/FlatRate.php rename to packages/Webkul/Shipping/src/Carriers/FlatRate.php index 62d0d7593..ba3faa6c7 100644 --- a/packages/Webkul/Shipping/src/Carrier/FlatRate.php +++ b/packages/Webkul/Shipping/src/Carriers/FlatRate.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/packages/Webkul/Shipping/src/Helper/Rate.php b/packages/Webkul/Shipping/src/Helper/Rate.php deleted file mode 100644 index d500829df..000000000 --- a/packages/Webkul/Shipping/src/Helper/Rate.php +++ /dev/null @@ -1,31 +0,0 @@ -calculate(); - $rates =[]; - - foreach($data as $rate){ - foreach($rate as $flat){ - $rates[$flat['name']] = $flat['price']; - } - } - - return $rates; - } - -} - - - - diff --git a/packages/Webkul/Shipping/src/Helpers/Rate.php b/packages/Webkul/Shipping/src/Helpers/Rate.php new file mode 100644 index 000000000..826155dc8 --- /dev/null +++ b/packages/Webkul/Shipping/src/Helpers/Rate.php @@ -0,0 +1,29 @@ +calculate()) { + $rates[] = $rate; + } + } + + return $rates; + } +} \ No newline at end of file diff --git a/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php index 7dc88b160..4757cce0d 100644 --- a/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php +++ b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php @@ -15,14 +15,6 @@ class ShippingServiceProvider extends ServiceProvider */ public function boot(Router $router) { - - // $router->aliasMiddleware('customer', RedirectIfNotCustomer::class); - - // $this->loadMigrationsFrom(__DIR__ . '/../Database/migrations'); - - // include __DIR__ . '/../Http/routes.php'; - - // $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'shipping'); } /** diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php index f37645460..906226fe4 100644 --- a/packages/Webkul/Shop/src/Http/routes.php +++ b/packages/Webkul/Shop/src/Http/routes.php @@ -11,7 +11,7 @@ Route::group(['middleware' => ['web']], function () { ]); Route::get('/checkout', 'Webkul\Cart\Http\Controllers\CheckoutController@index')->defaults('_config', [ - 'view' => 'shop::customers.checkout.index' + 'view' => 'shop::checkout.onepage' ])->name('shop.checkout'); /* dummy routes ends here */ @@ -37,7 +37,7 @@ Route::group(['middleware' => ['web']], function () { // Product Review routes - Route::get('/reviews/{slug}/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@show')->defaults('_config', [ + Route::get('/reviews/{slug}', 'Webkul\Shop\Http\Controllers\ReviewController@show')->defaults('_config', [ 'view' => 'shop::products.reviews.index' ])->name('shop.reviews.index'); diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 320d65719..0e18520bc 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -1,8 +1,10 @@ window.jQuery = window.$ = $ = require("jquery"); window.Vue = require("vue"); window.VeeValidate = require("vee-validate"); +window.axios = require("axios"); Vue.use(VeeValidate); +Vue.prototype.$http = axios Vue.component("category-nav", require("./components/category-nav.vue")); Vue.component("category-item", require("./components/category-item.vue")); diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index 4ff3508ad..e38dc943f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -29,7 +29,6 @@ export default { computed: { haveChildren() { - console.log(this.item); return this.item.children.length ? true : false; } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 40c9b97e0..b0a0e43c1 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -2755,87 +2755,95 @@ section.cart { } } - // responsive order css end here // checkout starts here - .checkout-process{ display: flex; flex-direction: row; width: 100%; - margin-top:3%; + margin-top: 20px; + margin-bottom: 20px; - .left-side { - width: 67%; - margin-right: 8%; - height: 100px; + .col-main { + width: 65%; + padding-right: 40px; - .checkout-menu { + ul.checkout-steps { width: 100%; + display: inline-flex; + justify-content: space-between; + width: 100%; + padding-bottom: 15px; + border-bottom: 1px solid #E8E8E8;; - ul.checkout-detail { - height: 60px; - display: inline-flex; - justify-content: space-between; - width: 100%; - padding: 5px; + li { + height: 48px; + display:flex; - - li { + .decorator { height: 48px; + width: 48px; + border: 1px solid black; + border-radius: 50%; + display: inline-flex; + border: 1px solid #E8E8E8; + + img { + margin: auto; + } + } - .wrapper { - display:flex; + span { + margin-left: 7px; + margin-top: auto; + margin-bottom: auto; + font-size: 16px; + } - .decorator { - height: 48px; - width: 48px; - border: 1px solid black; - border-radius: 50%; - display: inline-flex; - border: 1px solid #E8E8E8; - img { - margin: auto; - } - } - - .decorator.active { - border: 1px solid blue; - } - - span { - margin-left: 7px; - margin-top: auto; - margin-bottom: auto; - font-size: 16px; - } + &.active { + color: #2650EF; + .decorator { + border: 1px solid #2650EF; } } } + } - .horizontal-rule { - margin-top: 1%; + .step-content { + padding-top: 20px; + + .form-header { width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; + display: inline-block; + + h1 { + float: left; + } + + .btn { + float: right; + } + } + + .form-container { + border-bottom: 1px solid #E8E8E8; + padding-top: 20px; + padding-bottom: 20px; } } } - .right-side { - height: 300px; - width: 300px; + .col-right { + width: 35%; + padding-left: 40px; - .purchase-detail { - margin-top:22px; - margin-left:18px; + .order-summary { .price { - span{ + span { margin-left: 3px; font-size: 16px; color: #242424; @@ -2843,7 +2851,6 @@ section.cart { } } - .item-detail { margin-top:12px; @@ -2854,8 +2861,9 @@ section.cart { font-size: 16px; color: #242424; } + .right { - float:right; + float: right; font-size: 16px; color: #242424; } @@ -2871,7 +2879,7 @@ section.cart { } .payble-amount { - margin-top:12px; + margin-top: 12px; span { margin-left: 3px; @@ -2882,6 +2890,7 @@ section.cart { color: #242424; font-weight: bold; } + .right { float:right; @@ -2892,68 +2901,6 @@ section.cart { } } } - -} - -.order-info{ - width: 67%; - margin-right: 6%; - height: 1350px; - margin-top: -190px; - - .order-guest { - - .order-text{ - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; - } - } - - .sign-in { - float:right; - } - - - .control-group { - margin-top:30px; - - label { - font-size:14px; - } - - .control { - width:600px; - } - - span { - color:red; - } - - } - - .different-billing-addr { - margin-top: 5%; - - span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; - } - } - - .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .countinue-button { - margin-top: 3%; - } } // checkout ends here @@ -2961,10 +2908,9 @@ section.cart { // responsive checkout start here @media all and (max-width: 480px) { - .checkout-process{ width: 100%; - margin-top:3%; + margin-top: 3%; .left-side { width: 100%; @@ -2983,12 +2929,11 @@ section.cart { height: 48px; .wrapper { - display:flex; + display: flex; span { display: none; } - } } @@ -3009,7 +2954,7 @@ section.cart { } .right-side { - display:none; + display: none; } } @@ -3119,96 +3064,11 @@ section.cart { } } } - // responsive checkout end here -// sign of checkout starts here - -.signin-form{ - width: 67%; - margin-right: 6%; - height: 520px; - margin-top: -190px; - - .signin-guest { - - .signin-text{ - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; - } - } - - .order-button { - float:right; - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 153px; - border: none; - } - - - .control-group { - margin-top:30px; - - label { - font-size:14px; - } - - .control { - width:600px; - } - - span { - color:red; - } - - } - - .forgot-pass { - - span { - font-size: 16px; - color: #0031F0; - letter-spacing: -0.38px; - } - } - - .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; - } - - .countinue-button { - margin-top: 3%; - - button { - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 137px; - border: none; - } - } -} - -// sign checkout end here - //shipment start here - .ship-method { width: 67%; margin-right: 6%; @@ -3284,11 +3144,9 @@ section.cart { } } } - //shipment end here // payment method start here - .payment-method { width: 67%; margin-right: 6%; @@ -3376,12 +3234,10 @@ section.cart { } } } - // payment method end here // complete page start here - .complete-page{ width:880px; height: 1050px; @@ -3737,12 +3593,10 @@ section.cart { } } } - // complete page end here // review page start here - section.review { font-size: 16px; color: $product-font-color; @@ -3914,11 +3768,4 @@ section.review { } } } - - -// review page start here - - - - - +// review page start here \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index f2aaaf9a6..13b6216bc 100644 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -6,6 +6,7 @@ return [ 'account_exists' => 'Already have an account', 'title' => 'Sign In' ], + 'signup-form' => [ 'title' => 'Sign Up', 'firstname' => 'First Name', @@ -19,10 +20,12 @@ return [ 'conditions' => 'Conditions', 'using' => 'by using this website' ], + 'login-text' => [ 'no_account' => 'Don\'t have account', 'title' => 'Sign In', ], + 'login-form' => [ 'title' => 'Sign Up', 'email' => 'E-Mail', @@ -53,5 +56,35 @@ return [ 'reviews-title' => 'Ratings & Reviews', 'write-review-btn' => 'Write Review', 'choose-option' => 'Choose an option' + ], + + 'checkout' => [ + 'cart' => [ + + ], + + 'onepage' => [ + 'title' => 'Checkout', + 'information' => 'Information', + 'shipping' => 'Shipping', + 'payment' => 'Payment', + 'complete' => 'Complete', + 'billing-address' => 'Billing Address', + 'sign-in' => 'Sign In', + 'first-name' => 'First Name', + 'last-name' => 'Last Name', + 'email' => 'Email', + 'address1' => 'Address', + 'address2' => 'Address 2', + 'city' => 'City', + 'state' => 'State', + 'postcode' => 'Zip/Postcode', + 'phone' => 'Telephone', + 'country' => 'Country', + 'order-summary' => 'Order Summary', + 'shipping-address' => 'Shipping Address', + 'use_for_shipping' => 'Ship to this address', + 'continue' => 'Continue' + ] ] ]; \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/index.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart.blade.php similarity index 100% rename from packages/Webkul/Shop/src/Resources/views/checkout/onepage/index.blade.php rename to packages/Webkul/Shop/src/Resources/views/checkout/cart.blade.php diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php new file mode 100644 index 000000000..dbb4cb629 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php @@ -0,0 +1,121 @@ +@extends('shop::layouts.master') + +@section('page_title') + {{ __('shop::app.checkout.onepage.title') }} +@stop + +@section('content-wrapper') + + + +@endsection + +@push('scripts') + + + + + +@endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php new file mode 100644 index 000000000..9a0d01d2a --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/customer-info.blade.php @@ -0,0 +1,278 @@ + + +
    + +
    +

    {{ __('shop::app.checkout.onepage.billing-address') }}

    + +     + {{ __('shop::app.checkout.onepage.sign-in') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[first_name]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[last_name]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[email]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[address1]') }} + +
    + +
    + + + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[city]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[state]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[postcode]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[phone]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.billing[country]') }} + +
    + +
    + + + + {{ __('shop::app.checkout.onepage.use_for_shipping') }} + + +
    +
    + +
    + +
    +

    {{ __('shop::app.checkout.onepage.shipping-address') }}

    +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[first_name]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[last_name]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[email]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[address1]') }} + +
    + +
    + + + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[city]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[state]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[postcode]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[phone]') }} + +
    + +
    + + + + + + @{{ errors.first('address-form.shipping[country]') }} + +
    +
    + +
    • \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/payment.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/review.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/summary.blade.php new file mode 100644 index 000000000..e5950fe05 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/summary.blade.php @@ -0,0 +1,37 @@ +
    +
    +
    + {{ __('shop::app.checkout.onepage.order-summary') }} +
    + +
    + + + + +
    + +
    + + + + +
    +
    + + + + +
    + +
    +
    + +
    + + + + +
    +
    +
    diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/success.blade.php new file mode 100644 index 000000000..e69de29bb diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php index 2a7cba245..35d745c8c 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/checkout/common/nav-right.blade.php @@ -1,37 +1,3 @@
    -
    -
    - Price Detail -
    - -
    - - - - -
    - -
    - - - - -
    -
    - - - - -
    - -
    -
    - -
    - - - - -
    -
    +
    \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php index 8342d022e..d257eedbb 100644 --- a/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/customers/checkout/index.blade.php @@ -45,15 +45,12 @@ }else{ this.isGuest=true; this.disabled=1; - - console.log(this.disabled); } } , methods: { count () { this.isShipMethod=true; - console.log(this.isShipMethod) } } diff --git a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php index ee0f7a427..e1d3cf88b 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/reviews/index.blade.php @@ -133,7 +133,6 @@ for(var key in percentage){ width= percentage[key] * 1.58; let id =key + 'star'; - console.log(id); document.getElementById(key).style.width = width + "px"; document.getElementById(key).style.height = 4 + "px"; document.getElementById(id).innerHTML = i + '\xa0\xa0' + "star"; diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index 1f53659fc..41fa4d005 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -1,5 +1,10 @@ @extends('shop::layouts.master') +@section('page_title') + {{ $product->name }} +@stop + + @section('content-wrapper')
    diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php index 1b545815c..de7dc2f49 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/configurable-options.blade.php @@ -2,7 +2,20 @@ @inject ('configurableOptionHelper', 'Webkul\Product\Product\ConfigurableOption') - + + + @push('scripts') diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php index acd1e6dbc..e495bdae6 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php @@ -63,7 +63,6 @@ }, created () { - console.log(this.images[0]) this.changeImage(this.images[0]) this.prepareThumbs() diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index 38583fc6a..23248599b 100644 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -452,6 +452,11 @@ h2 { } } +.button-group { + margin-top: 20px; + margin-bottom: 20px; +} + .alert-wrapper { width: 300px; top: 10px; diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index 9e29cbb81..c5ec4b8b6 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -2756,21 +2756,17 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo -ms-flex-direction: row; flex-direction: row; width: 100%; - margin-top: 3%; + margin-top: 20px; + margin-bottom: 20px; } -.checkout-process .left-side { - width: 67%; - margin-right: 8%; - height: 100px; +.checkout-process .col-main { + width: 65%; + padding-right: 40px; } -.checkout-process .left-side .checkout-menu { +.checkout-process .col-main ul.checkout-steps { width: 100%; -} - -.checkout-process .left-side .checkout-menu ul.checkout-detail { - height: 60px; display: -webkit-inline-box; display: -ms-inline-flexbox; display: inline-flex; @@ -2778,20 +2774,18 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo -ms-flex-pack: justify; justify-content: space-between; width: 100%; - padding: 5px; + padding-bottom: 15px; + border-bottom: 1px solid #E8E8E8; } -.checkout-process .left-side .checkout-menu ul.checkout-detail li { +.checkout-process .col-main ul.checkout-steps li { height: 48px; -} - -.checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper { display: -webkit-box; display: -ms-flexbox; display: flex; } -.checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper .decorator { +.checkout-process .col-main ul.checkout-steps li .decorator { height: 48px; width: 48px; border: 1px solid black; @@ -2802,66 +2796,80 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo border: 1px solid #E8E8E8; } -.checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper .decorator img { +.checkout-process .col-main ul.checkout-steps li .decorator img { margin: auto; } -.checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper .decorator.active { - border: 1px solid blue; -} - -.checkout-process .left-side .checkout-menu ul.checkout-detail li .wrapper span { +.checkout-process .col-main ul.checkout-steps li span { margin-left: 7px; margin-top: auto; margin-bottom: auto; font-size: 16px; } -.checkout-process .left-side .checkout-menu .horizontal-rule { - margin-top: 1%; +.checkout-process .col-main ul.checkout-steps li.active { + color: #2650EF; +} + +.checkout-process .col-main ul.checkout-steps li.active .decorator { + border: 1px solid #2650EF; +} + +.checkout-process .col-main .step-content { + padding-top: 20px; +} + +.checkout-process .col-main .step-content .form-header { width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; + display: inline-block; } -.checkout-process .right-side { - height: 300px; - width: 300px; +.checkout-process .col-main .step-content .form-header h1 { + float: left; } -.checkout-process .right-side .purchase-detail { - margin-top: 22px; - margin-left: 18px; +.checkout-process .col-main .step-content .form-header .btn { + float: right; } -.checkout-process .right-side .purchase-detail .price span { +.checkout-process .col-main .step-content .form-container { + border-bottom: 1px solid #E8E8E8; + padding-top: 20px; + padding-bottom: 20px; +} + +.checkout-process .col-right { + width: 35%; + padding-left: 40px; +} + +.checkout-process .col-right .order-summary .price span { margin-left: 3px; font-size: 16px; color: #242424; font-weight: bold; } -.checkout-process .right-side .purchase-detail .item-detail { +.checkout-process .col-right .order-summary .item-detail { margin-top: 12px; } -.checkout-process .right-side .purchase-detail .item-detail span { +.checkout-process .col-right .order-summary .item-detail span { margin-left: 3px; } -.checkout-process .right-side .purchase-detail .item-detail span label { +.checkout-process .col-right .order-summary .item-detail span label { font-size: 16px; color: #242424; } -.checkout-process .right-side .purchase-detail .item-detail span .right { +.checkout-process .col-right .order-summary .item-detail span .right { float: right; font-size: 16px; color: #242424; } -.checkout-process .right-side .purchase-detail .horizontal-rule { +.checkout-process .col-right .order-summary .horizontal-rule { margin-top: 6%; width: 100%; height: 1px; @@ -2869,83 +2877,27 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo background: #e8e8e8; } -.checkout-process .right-side .purchase-detail .payble-amount { +.checkout-process .col-right .order-summary .payble-amount { margin-top: 12px; } -.checkout-process .right-side .purchase-detail .payble-amount span { +.checkout-process .col-right .order-summary .payble-amount span { margin-left: 3px; font-weight: bold; } -.checkout-process .right-side .purchase-detail .payble-amount span label { +.checkout-process .col-right .order-summary .payble-amount span label { font-size: 16px; color: #242424; font-weight: bold; } -.checkout-process .right-side .purchase-detail .payble-amount span .right { +.checkout-process .col-right .order-summary .payble-amount span .right { float: right; font-size: 16px; color: #242424; } -.order-info { - width: 67%; - margin-right: 6%; - height: 1350px; - margin-top: -190px; -} - -.order-info .order-guest .order-text { - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; -} - -.order-info .sign-in { - float: right; -} - -.order-info .control-group { - margin-top: 30px; -} - -.order-info .control-group label { - font-size: 14px; -} - -.order-info .control-group .control { - width: 600px; -} - -.order-info .control-group span { - color: red; -} - -.order-info .different-billing-addr { - margin-top: 5%; -} - -.order-info .different-billing-addr span { - font-size: 16px; - color: #242424; - letter-spacing: -0.38px; -} - -.order-info .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.order-info .countinue-button { - margin-top: 3%; -} - @media all and (max-width: 480px) { .checkout-process { width: 100%; @@ -3072,77 +3024,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo } } -.signin-form { - width: 67%; - margin-right: 6%; - height: 520px; - margin-top: -190px; -} - -.signin-form .signin-guest .signin-text { - font-size: 24px; - color: #242424; - letter-spacing: -0.58px; - font-weight: bold; -} - -.signin-form .order-button { - float: right; - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 153px; - border: none; -} - -.signin-form .control-group { - margin-top: 30px; -} - -.signin-form .control-group label { - font-size: 14px; -} - -.signin-form .control-group .control { - width: 600px; -} - -.signin-form .control-group span { - color: red; -} - -.signin-form .forgot-pass span { - font-size: 16px; - color: #0031F0; - letter-spacing: -0.38px; -} - -.signin-form .horizontal-rule { - margin-top: 6%; - width: 100%; - height: 1px; - vertical-align: middle; - background: #e8e8e8; -} - -.signin-form .countinue-button { - margin-top: 3%; -} - -.signin-form .countinue-button button { - background: #0031F0; - font-size: 14px; - color: #FFFFFF; - letter-spacing: -0.26px; - text-align: center; - height: 38px; - width: 137px; - border: none; -} - .ship-method { width: 67%; margin-right: 6%; diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js index aee93be85..90d771820 100644 --- a/public/themes/default/assets/js/shop.js +++ b/public/themes/default/assets/js/shop.js @@ -214,8 +214,10 @@ module.exports = __webpack_require__(25); window.jQuery = window.$ = $ = __webpack_require__(4); window.Vue = __webpack_require__(5); window.VeeValidate = __webpack_require__(9); +window.axios = __webpack_require__(36); Vue.use(VeeValidate); +Vue.prototype.$http = axios; Vue.component("category-nav", __webpack_require__(10)); Vue.component("category-item", __webpack_require__(13)); @@ -29279,7 +29281,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); computed: { haveChildren: function haveChildren() { - console.log(this.item); return this.item.children.length ? true : false; } } @@ -29912,7 +29913,7 @@ if (false) { /* 24 */ /***/ (function(module, exports, __webpack_require__) { -!function(t,e){ true?module.exports=e():"function"==typeof define&&define.amd?define("vue-slider-component",[],e):"object"==typeof exports?exports["vue-slider-component"]=e():t["vue-slider-component"]=e()}(this,function(){return function(t){function e(s){if(i[s])return i[s].exports;var r=i[s]={i:s,l:!1,exports:{}};return t[s].call(r.exports,r,r.exports,e),r.l=!0,r.exports}var i={};return e.m=t,e.c=i,e.i=function(t){return t},e.d=function(t,i,s){e.o(t,i)||Object.defineProperty(t,i,{configurable:!1,enumerable:!0,get:s})},e.n=function(t){var i=t&&t.__esModule?function(){return t.default}:function(){return t};return e.d(i,"a",i),i},e.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},e.p="",e(e.s=2)}([function(t,e,i){i(7);var s=i(5)(i(1),i(6),null,null);t.exports=s.exports},function(t,e,i){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=function(){var t="undefined"!=typeof window?window.devicePixelRatio||1:1;return function(e){return Math.round(e*t)/t}}();e.default={name:"VueSliderComponent",props:{width:{type:[Number,String],default:"auto"},height:{type:[Number,String],default:6},data:{type:Array,default:null},dotSize:{type:Number,default:16},dotWidth:{type:Number,required:!1},dotHeight:{type:Number,required:!1},min:{type:Number,default:0},max:{type:Number,default:100},interval:{type:Number,default:1},show:{type:Boolean,default:!0},disabled:{type:[Boolean,Array],default:!1},piecewise:{type:Boolean,default:!1},tooltip:{type:[String,Boolean],default:"always"},eventType:{type:String,default:"auto"},direction:{type:String,default:"horizontal"},reverse:{type:Boolean,default:!1},lazy:{type:Boolean,default:!1},clickable:{type:Boolean,default:!0},speed:{type:Number,default:.5},realTime:{type:Boolean,default:!1},stopPropagation:{type:Boolean,default:!1},value:{type:[String,Number,Array,Object],default:0},piecewiseLabel:{type:Boolean,default:!1},debug:{type:Boolean,default:!0},fixed:{type:Boolean,default:!1},processDragable:{type:Boolean,default:!1},useKeyboard:{type:Boolean,default:!1},actionsKeyboard:{type:Array,default:function(){return[function(t){return t-1},function(t){return t+1}]}},tooltipMerge:{type:Boolean,default:!0},startAnimation:{type:Boolean,default:!1},sliderStyle:[Array,Object,Function],focusStyle:[Array,Object,Function],tooltipDir:[Array,String],formatter:[String,Function],mergeFormatter:[String,Function],piecewiseStyle:Object,disabledStyle:Object,piecewiseActiveStyle:Object,processStyle:Object,bgStyle:Object,tooltipStyle:[Array,Object,Function],disabledDotStyle:[Array,Object,Function],labelStyle:Object,labelActiveStyle:Object},data:function(){return{flag:!1,keydownFlag:null,focusFlag:!1,processFlag:!1,processSign:null,size:0,fixedValue:0,focusSlider:0,currentValue:0,currentSlider:0,isComponentExists:!0,isMounted:!1}},computed:{dotWidthVal:function(){return"number"==typeof this.dotWidth?this.dotWidth:this.dotSize},dotHeightVal:function(){return"number"==typeof this.dotHeight?this.dotHeight:this.dotSize},flowDirection:function(){return"vue-slider-"+this.direction+(this.reverse?"-reverse":"")},tooltipMergedPosition:function(){if(!this.isMounted)return{};var t=this.tooltipDirection[0];if(this.$refs.dot0){if("vertical"===this.direction){var e={};return e[t]="-"+(this.dotHeightVal/2-this.width/2+9)+"px",e}var i={};return i[t]="-"+(this.dotWidthVal/2-this.height/2+9)+"px",i.left="50%",i}},tooltipDirection:function(){var t=this.tooltipDir||("vertical"===this.direction?"left":"top");return Array.isArray(t)?this.isRange?t:t[1]:this.isRange?[t,t]:t},tooltipStatus:function(){return"hover"===this.tooltip&&this.flag?"vue-slider-always":this.tooltip?"vue-slider-"+this.tooltip:""},tooltipClass:function(){return["vue-slider-tooltip-"+this.tooltipDirection,"vue-slider-tooltip"]},disabledArray:function(){return Array.isArray(this.disabled)?this.disabled:[this.disabled,this.disabled]},boolDisabled:function(){return this.disabledArray.every(function(t){return!0===t})},isDisabled:function(){return"none"===this.eventType||this.boolDisabled},disabledClass:function(){return this.boolDisabled?"vue-slider-disabled":""},stateClass:function(){return{"vue-slider-state-process-drag":this.processFlag,"vue-slider-state-drag":this.flag&&!this.processFlag&&!this.keydownFlag,"vue-slider-state-focus":this.focusFlag}},isRange:function(){return Array.isArray(this.value)},slider:function(){return this.isRange?[this.$refs.dot0,this.$refs.dot1]:this.$refs.dot},minimum:function(){return this.data?0:this.min},val:{get:function(){return this.data?this.isRange?[this.data[this.currentValue[0]],this.data[this.currentValue[1]]]:this.data[this.currentValue]:this.currentValue},set:function(t){if(this.data)if(this.isRange){var e=this.data.indexOf(t[0]),i=this.data.indexOf(t[1]);e>-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(tthis.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(ithis.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else tthis.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;ee.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,t.startAnimation?t.speed:0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;ei.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r-1&&i>-1&&(this.currentValue=[e,i])}else{var s=this.data.indexOf(t);s>-1&&(this.currentValue=s)}else this.currentValue=t}},currentIndex:function(){return this.isRange?this.data?this.currentValue:[this.getIndexByValue(this.currentValue[0]),this.getIndexByValue(this.currentValue[1])]:this.getIndexByValue(this.currentValue)},indexRange:function(){return this.isRange?this.currentIndex:[0,this.currentIndex]},maximum:function(){return this.data?this.data.length-1:this.max},multiple:function(){var t=(""+this.interval).split(".")[1];return t?Math.pow(10,t.length):1},spacing:function(){return this.data?1:this.interval},total:function(){return this.data?this.data.length-1:(Math.floor((this.maximum-this.minimum)*this.multiple)%(this.interval*this.multiple)!=0&&this.printError("Prop[interval] is illegal, Please make sure that the interval can be divisible"),(this.maximum-this.minimum)/this.interval)},gap:function(){return this.size/this.total},position:function(){return this.isRange?[(this.currentValue[0]-this.minimum)/this.spacing*this.gap,(this.currentValue[1]-this.minimum)/this.spacing*this.gap]:(this.currentValue-this.minimum)/this.spacing*this.gap},limit:function(){return this.isRange?this.fixed?[[0,(this.total-this.fixedValue)*this.gap],[this.fixedValue*this.gap,this.size]]:[[0,this.position[1]],[this.position[0],this.size]]:[0,this.size]},valueLimit:function(){return this.isRange?this.fixed?[[this.minimum,this.maximum-this.fixedValue*(this.spacing*this.multiple)/this.multiple],[this.minimum+this.fixedValue*(this.spacing*this.multiple)/this.multiple,this.maximum]]:[[this.minimum,this.currentValue[1]],[this.currentValue[0],this.maximum]]:[this.minimum,this.maximum]},idleSlider:function(){return 0===this.currentSlider?1:0},wrapStyles:function(){return"vertical"===this.direction?{height:"number"==typeof this.height?this.height+"px":this.height,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}:{width:"number"==typeof this.width?this.width+"px":this.width,padding:this.dotHeightVal/2+"px "+this.dotWidthVal/2+"px"}},sliderStyles:function(){return Array.isArray(this.sliderStyle)?this.isRange?this.sliderStyle:this.sliderStyle[1]:"function"==typeof this.sliderStyle?this.sliderStyle(this.val,this.currentIndex):this.isRange?[this.sliderStyle,this.sliderStyle]:this.sliderStyle},focusStyles:function(){return Array.isArray(this.focusStyle)?this.isRange?this.focusStyle:this.focusStyle[1]:"function"==typeof this.focusStyle?this.focusStyle(this.val,this.currentIndex):this.isRange?[this.focusStyle,this.focusStyle]:this.focusStyle},disabledDotStyles:function(){var t=this.disabledDotStyle;if(Array.isArray(t))return t;if("function"==typeof t){var e=t(this.val,this.currentIndex);return Array.isArray(e)?e:[e,e]}return t?[t,t]:[{backgroundColor:"#ccc"},{backgroundColor:"#ccc"}]},tooltipStyles:function(){return Array.isArray(this.tooltipStyle)?this.isRange?this.tooltipStyle:this.tooltipStyle[1]:"function"==typeof this.tooltipStyle?this.tooltipStyle(this.val,this.currentIndex):this.isRange?[this.tooltipStyle,this.tooltipStyle]:this.tooltipStyle},elemStyles:function(){return"vertical"===this.direction?{width:this.width+"px",height:"100%"}:{height:this.height+"px"}},dotStyles:function(){return"vertical"===this.direction?{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",left:-(this.dotWidthVal-this.width)/2+"px"}:{width:this.dotWidthVal+"px",height:this.dotHeightVal+"px",top:-(this.dotHeightVal-this.height)/2+"px"}},piecewiseDotStyle:function(){return"vertical"===this.direction?{width:this.width+"px",height:this.width+"px"}:{width:this.height+"px",height:this.height+"px"}},piecewiseDotWrap:function(){if(!this.piecewise&&!this.piecewiseLabel)return!1;for(var t=[],e=0;e<=this.total;e++){var i="vertical"===this.direction?{bottom:this.gap*e-this.width/2+"px",left:0}:{left:this.gap*e-this.height/2+"px",top:0},s=this.reverse?this.total-e:e,r=this.data?this.data[s]:this.spacing*s+this.min;t.push({style:i,label:this.formatter?this.formatting(r):r,inRange:s>=this.indexRange[0]&&s<=this.indexRange[1]})}return t}},watch:{value:function(t){this.flag||this.setValue(t,!0)},max:function(t){if(tthis.max)return this.printError("The minimum value can not be greater than the maximum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},show:function(t){var e=this;t&&!this.size&&this.$nextTick(function(){e.refresh()})},fixed:function(){this.computedFixedValue()}},methods:{bindEvents:function(){document.addEventListener("touchmove",this.moving,{passive:!1}),document.addEventListener("touchend",this.moveEnd,{passive:!1}),document.addEventListener("mousedown",this.blurSlider),document.addEventListener("mousemove",this.moving),document.addEventListener("mouseup",this.moveEnd),document.addEventListener("mouseleave",this.moveEnd),document.addEventListener("keydown",this.handleKeydown),document.addEventListener("keyup",this.handleKeyup),window.addEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.addEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.addEventListener("transitionend",this.handleOverlapTooltip))},unbindEvents:function(){document.removeEventListener("touchmove",this.moving),document.removeEventListener("touchend",this.moveEnd),document.removeEventListener("mousedown",this.blurSlider),document.removeEventListener("mousemove",this.moving),document.removeEventListener("mouseup",this.moveEnd),document.removeEventListener("mouseleave",this.moveEnd),document.removeEventListener("keydown",this.handleKeydown),document.removeEventListener("keyup",this.handleKeyup),window.removeEventListener("resize",this.refresh),this.isRange&&this.tooltipMerge&&(this.$refs.dot0.removeEventListener("transitionend",this.handleOverlapTooltip),this.$refs.dot1.removeEventListener("transitionend",this.handleOverlapTooltip))},handleKeydown:function(t){if(!this.useKeyboard||!this.focusFlag)return!1;switch(t.keyCode){case 37:case 40:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[0]);break;case 38:case 39:t.preventDefault(),this.keydownFlag=!0,this.flag=!0,this.changeFocusSlider(this.actionsKeyboard[1])}},handleKeyup:function(){this.keydownFlag&&(this.keydownFlag=!1,this.flag=!1)},changeFocusSlider:function(t){var e=this;if(this.isRange){var i=this.currentIndex.map(function(i,s){if(s===e.focusSlider||e.fixed){var r=t(i),o=e.fixed?e.valueLimit[s]:[0,e.total];if(r<=o[1]&&r>=o[0])return r}return i});i[0]>i[1]&&(this.focusSlider=0===this.focusSlider?1:0,i=i.reverse()),this.setIndex(i)}else this.setIndex(t(this.currentIndex))},blurSlider:function(t){var e=this.isRange?this.$refs["dot"+this.focusSlider]:this.$refs.dot;if(!e||e===t.target)return!1;this.focusFlag=!1},formatting:function(t){return"string"==typeof this.formatter?this.formatter.replace(/\{value\}/,t):this.formatter(t)},mergeFormatting:function(t,e){return"string"==typeof this.mergeFormatter?this.mergeFormatter.replace(/\{(value1|value2)\}/g,function(i,s){return"value1"===s?t:e}):this.mergeFormatter(t,e)},getPos:function(t){return this.realTime&&this.getStaticData(),"vertical"===this.direction?this.reverse?t.pageY-this.offset:this.size-(t.pageY-this.offset):this.reverse?this.size-(t.clientX-this.offset):t.clientX-this.offset},processClick:function(t){this.fixed&&t.stopPropagation()},wrapClick:function(t){var e=this;if(this.isDisabled||!this.clickable||this.processFlag)return!1;var i=this.getPos(t);if(this.isRange)if(this.disabledArray.every(function(t){return!1===t}))this.currentSlider=i>(this.position[1]-this.position[0])/2+this.position[0]?1:0;else if(this.disabledArray[0]){if(ithis.position[1])return!1;this.currentSlider=0}if(this.disabledArray[this.currentSlider])return!1;if(this.setValueOnPos(i),this.isRange&&this.tooltipMerge){var s=setInterval(function(){return e.handleOverlapTooltip()},16.7);setTimeout(function(){return window.clearInterval(s)},1e3*this.speed)}},moveStart:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:0,i=arguments[2];if(this.disabledArray[e])return!1;if(this.stopPropagation&&t.stopPropagation(),this.isRange&&(this.currentSlider=e,i)){if(!this.processDragable)return!1;this.processFlag=!0,this.processSign={pos:this.position,start:this.getPos(t.targetTouches&&t.targetTouches[0]?t.targetTouches[0]:t)}}!i&&this.useKeyboard&&(this.focusFlag=!0,this.focusSlider=e),this.flag=!0,this.$emit("drag-start",this)},moving:function(t){if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;t.preventDefault(),t.targetTouches&&t.targetTouches[0]&&(t=t.targetTouches[0]),this.processFlag?(this.currentSlider=0,this.setValueOnPos(this.processSign.pos[0]+this.getPos(t)-this.processSign.start,!0),this.currentSlider=1,this.setValueOnPos(this.processSign.pos[1]+this.getPos(t)-this.processSign.start,!0)):this.setValueOnPos(this.getPos(t),!0),this.isRange&&this.tooltipMerge&&this.handleOverlapTooltip()},moveEnd:function(t){var e=this;if(this.stopPropagation&&t.stopPropagation(),!this.flag)return!1;this.$emit("drag-end",this),this.lazy&&this.isDiff(this.val,this.value)&&this.syncValue(),this.flag=!1,window.setTimeout(function(){e.processFlag=!1},0),this.setPosition()},setValueOnPos:function(t,e){var i=this.isRange?this.limit[this.currentSlider]:this.limit,s=this.isRange?this.valueLimit[this.currentSlider]:this.valueLimit;if(t>=i[0]&&t<=i[1]){this.setTransform(t);var r=this.getValueByIndex(Math.round(t/this.gap));this.setCurrentValue(r,e),this.isRange&&this.fixed&&(this.setTransform(t+this.fixedValue*this.gap*(0===this.currentSlider?1:-1),!0),this.setCurrentValue((r*this.multiple+this.fixedValue*this.spacing*this.multiple*(0===this.currentSlider?1:-1))/this.multiple,e,!0))}else tthis.maximum)return!1;this.isRange?this.isDiff(this.currentValue[s],t)&&(this.currentValue.splice(s,1,t),this.lazy&&this.flag||this.syncValue()):this.isDiff(this.currentValue,t)&&(this.currentValue=t,this.lazy&&this.flag||this.syncValue()),e||this.setPosition()},getValueByIndex:function(t){return(this.spacing*this.multiple*t+this.minimum*this.multiple)/this.multiple},getIndexByValue:function(t){return Math.round((t-this.minimum)*this.multiple)/(this.spacing*this.multiple)},setIndex:function(t){if(Array.isArray(t)&&this.isRange){var e=void 0;e=this.data?[this.data[t[0]],this.data[t[1]]]:[this.getValueByIndex(t[0]),this.getValueByIndex(t[1])],this.setValue(e)}else t=this.getValueByIndex(t),this.isRange&&(this.currentSlider=t>(this.currentValue[1]-this.currentValue[0])/2+this.currentValue[0]?1:0),this.setCurrentValue(t)},setValue:function(t,e,i){var s=this;if(this.isDiff(this.val,t)){var r=this.limitValue(t);this.val=this.isRange?r.concat():r,this.computedFixedValue(),this.syncValue(e)}this.$nextTick(function(){return s.setPosition(i)})},computedFixedValue:function(){if(!this.fixed)return this.fixedValue=0,!1;this.fixedValue=this.currentIndex[1]-this.currentIndex[0]},setPosition:function(t){this.flag||this.setTransitionTime(void 0===t?this.speed:t),this.isRange?(this.setTransform(this.position[0],1===this.currentSlider),this.setTransform(this.position[1],0===this.currentSlider)):this.setTransform(this.position),this.flag||this.setTransitionTime(0)},setTransform:function(t,e){var i=e?this.idleSlider:this.currentSlider,r=s(("vertical"===this.direction?this.dotHeightVal/2-t:t-this.dotWidthVal/2)*(this.reverse?-1:1)),o="vertical"===this.direction?"translateY("+r+"px)":"translateX("+r+"px)",n=this.fixed?this.fixedValue*this.gap+"px":(0===i?this.position[1]-t:t-this.position[0])+"px",l=this.fixed?(0===i?t:t-this.fixedValue*this.gap)+"px":(0===i?t:this.position[0])+"px";this.isRange?(this.slider[i].style.transform=o,this.slider[i].style.WebkitTransform=o,this.slider[i].style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=n,this.$refs.process.style[this.reverse?"top":"bottom"]=l):(this.$refs.process.style.width=n,this.$refs.process.style[this.reverse?"right":"left"]=l)):(this.slider.style.transform=o,this.slider.style.WebkitTransform=o,this.slider.style.msTransform=o,"vertical"===this.direction?(this.$refs.process.style.height=t+"px",this.$refs.process.style[this.reverse?"top":"bottom"]=0):(this.$refs.process.style.width=t+"px",this.$refs.process.style[this.reverse?"right":"left"]=0))},setTransitionTime:function(t){if(t||this.$refs.process.offsetWidth,this.isRange){for(var e=0;ee.max?(e.printError("The value of the slider is "+t+", the maximum value is "+e.max+", the value of this slider can not be greater than the maximum value"),e.max):i};return this.isRange?t.map(function(t){return i(t)}):i(t)},syncValue:function(t){var e=this.isRange?this.val.concat():this.val;this.$emit("input",e),t||this.$emit("callback",e)},getValue:function(){return this.val},getIndex:function(){return this.currentIndex},getStaticData:function(){this.$refs.elem&&(this.size="vertical"===this.direction?this.$refs.elem.offsetHeight:this.$refs.elem.offsetWidth,this.offset="vertical"===this.direction?this.$refs.elem.getBoundingClientRect().top+window.pageYOffset||document.documentElement.scrollTop:this.$refs.elem.getBoundingClientRect().left)},refresh:function(){this.$refs.elem&&(this.getStaticData(),this.computedFixedValue(),this.setPosition())},printError:function(t){this.debug&&console.error("[VueSlider error]: "+t)},handleOverlapTooltip:function(){var t=this.tooltipDirection[0]===this.tooltipDirection[1];if(this.isRange&&t){var e=this.reverse?this.$refs.tooltip1:this.$refs.tooltip0,i=this.reverse?this.$refs.tooltip0:this.$refs.tooltip1,s=e.getBoundingClientRect().right,r=i.getBoundingClientRect().left,o=e.getBoundingClientRect().y,n=i.getBoundingClientRect().y+i.getBoundingClientRect().height,l="horizontal"===this.direction&&s>r,a="vertical"===this.direction&&n>o;l||a?this.handleDisplayMergedTooltip(!0):this.handleDisplayMergedTooltip(!1)}},handleDisplayMergedTooltip:function(t){var e=this.$refs.tooltip0,i=this.$refs.tooltip1,s=this.$refs.process.getElementsByClassName("vue-merged-tooltip")[0];t?(e.style.visibility="hidden",i.style.visibility="hidden",s.style.visibility="visible"):(e.style.visibility="visible",i.style.visibility="visible",s.style.visibility="hidden")}},mounted:function(){var t=this;if(this.isComponentExists=!0,"undefined"==typeof window||"undefined"==typeof document)return this.printError("window or document is undefined, can not be initialization.");this.$nextTick(function(){t.isComponentExists&&(t.getStaticData(),t.setValue(t.limitValue(t.value),!0,0),t.bindEvents())}),this.isMounted=!0},beforeDestroy:function(){this.isComponentExists=!1,this.unbindEvents()}}},function(t,e,i){"use strict";var s=i(0);t.exports=s},function(t,e,i){e=t.exports=i(4)(),e.push([t.i,'.vue-slider-component{position:relative;box-sizing:border-box;-ms-user-select:none;user-select:none;-webkit-user-select:none;-moz-user-select:none;-o-user-select:none}.vue-slider-component.vue-slider-disabled{opacity:.5;cursor:not-allowed}.vue-slider-component.vue-slider-has-label{margin-bottom:15px}.vue-slider-component.vue-slider-disabled .vue-slider-dot{cursor:not-allowed}.vue-slider-component .vue-slider{position:relative;display:block;border-radius:15px;background-color:#ccc}.vue-slider-component .vue-slider:after{content:"";position:absolute;left:0;top:0;width:100%;height:100%;z-index:2}.vue-slider-component .vue-slider-process{position:absolute;border-radius:15px;background-color:#3498db;transition:all 0s;z-index:1}.vue-slider-component .vue-slider-process.vue-slider-process-dragable{cursor:pointer;z-index:3}.vue-slider-component.vue-slider-horizontal .vue-slider-process{width:0;height:100%;top:0;left:0;will-change:width}.vue-slider-component.vue-slider-vertical .vue-slider-process{width:100%;height:0;bottom:0;left:0;will-change:height}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-process{width:0;height:100%;top:0;right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-process{width:100%;height:0;top:0;left:0}.vue-slider-component .vue-slider-dot{position:absolute;border-radius:50%;background-color:#fff;box-shadow:.5px .5px 2px 1px rgba(0,0,0,.32);transition:all 0s;will-change:transform;cursor:pointer;z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-focus{box-shadow:0 0 2px 1px #3498db}.vue-slider-component .vue-slider-dot.vue-slider-dot-dragging{z-index:5}.vue-slider-component .vue-slider-dot.vue-slider-dot-disabled{z-index:4}.vue-slider-component.vue-slider-horizontal .vue-slider-dot{left:0}.vue-slider-component.vue-slider-vertical .vue-slider-dot{bottom:0}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-dot{right:0}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-dot{top:0}.vue-slider-component .vue-slider-tooltip-wrap{display:none;position:absolute;z-index:9}.vue-slider-component .vue-slider-tooltip{display:block;font-size:14px;white-space:nowrap;padding:2px 5px;min-width:20px;text-align:center;color:#fff;border-radius:5px;border:1px solid #3498db;background-color:#3498db}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top{top:-9px;left:50%;-webkit-transform:translate(-50%,-100%);transform:translate(-50%,-100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom{bottom:-9px;left:50%;-webkit-transform:translate(-50%,100%);transform:translate(-50%,100%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left{top:50%;left:-9px;-webkit-transform:translate(-100%,-50%);transform:translate(-100%,-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right{top:50%;right:-9px;-webkit-transform:translate(100%,-50%);transform:translate(100%,-50%)}.vue-slider-component .vue-slider-tooltip-top .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-top .vue-slider-tooltip:before{content:"";position:absolute;bottom:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-top-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-wrap.vue-merged-tooltip{display:block;visibility:hidden}.vue-slider-component .vue-slider-tooltip-bottom .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-bottom .vue-slider-tooltip:before{content:"";position:absolute;top:-10px;left:50%;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-bottom-color:inherit;-webkit-transform:translate(-50%);transform:translate(-50%)}.vue-slider-component .vue-slider-tooltip-left .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-left .vue-slider-tooltip:before{content:"";position:absolute;top:50%;right:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-left-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-tooltip-right .vue-merged-tooltip .vue-slider-tooltip:before,.vue-slider-component .vue-slider-tooltip-wrap.vue-slider-tooltip-right .vue-slider-tooltip:before{content:"";position:absolute;top:50%;left:-10px;width:0;height:0;border:5px solid transparent;border:6px solid transparent\\0;border-right-color:inherit;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.vue-slider-component .vue-slider-dot.vue-slider-hover:hover .vue-slider-tooltip-wrap{display:block}.vue-slider-component .vue-slider-dot.vue-slider-always .vue-slider-tooltip-wrap{display:block!important}.vue-slider-component .vue-slider-piecewise{position:absolute;width:100%;padding:0;margin:0;left:0;top:0;height:100%;list-style:none}.vue-slider-component .vue-slider-piecewise-item{position:absolute;width:8px;height:8px}.vue-slider-component .vue-slider-piecewise-dot{position:absolute;left:50%;top:50%;width:100%;height:100%;display:inline-block;background-color:rgba(0,0,0,.16);border-radius:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:2;transition:all .3s}.vue-slider-component .vue-slider-piecewise-item:first-child .vue-slider-piecewise-dot,.vue-slider-component .vue-slider-piecewise-item:last-child .vue-slider-piecewise-dot{visibility:hidden}.vue-slider-component.vue-slider-horizontal-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-horizontal .vue-slider-piecewise-label{position:absolute;display:inline-block;top:100%;left:50%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(-50%,8px);transform:translate(-50%,8px);visibility:visible}.vue-slider-component.vue-slider-vertical-reverse .vue-slider-piecewise-label,.vue-slider-component.vue-slider-vertical .vue-slider-piecewise-label{position:absolute;display:inline-block;top:50%;left:100%;white-space:nowrap;font-size:12px;color:#333;-webkit-transform:translate(8px,-50%);transform:translate(8px,-50%);visibility:visible}.vue-slider-component .vue-slider-sr-only{clip:rect(1px,1px,1px,1px);height:1px;width:1px;overflow:hidden;position:absolute!important}',""])},function(t,e){t.exports=function(){var t=[];return t.toString=function(){for(var t=[],e=0;ei.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r undefined + * typeof document -> undefined + * + * react-native: + * navigator.product -> 'ReactNative' + */ +function isStandardBrowserEnv() { + if (typeof navigator !== 'undefined' && navigator.product === 'ReactNative') { + return false; + } + return ( + typeof window !== 'undefined' && + typeof document !== 'undefined' + ); +} + +/** + * Iterate over an Array or an Object invoking a function for each item. + * + * If `obj` is an Array callback will be called passing + * the value, index, and complete array for each item. + * + * If 'obj' is an Object callback will be called passing + * the value, key, and complete object for each property. + * + * @param {Object|Array} obj The object to iterate + * @param {Function} fn The callback to invoke for each item + */ +function forEach(obj, fn) { + // Don't bother if no value provided + if (obj === null || typeof obj === 'undefined') { + return; + } + + // Force an array if not already something iterable + if (typeof obj !== 'object') { + /*eslint no-param-reassign:0*/ + obj = [obj]; + } + + if (isArray(obj)) { + // Iterate over array values + for (var i = 0, l = obj.length; i < l; i++) { + fn.call(null, obj[i], i, obj); + } + } else { + // Iterate over object keys + for (var key in obj) { + if (Object.prototype.hasOwnProperty.call(obj, key)) { + fn.call(null, obj[key], key, obj); + } + } + } +} + +/** + * Accepts varargs expecting each argument to be an object, then + * immutably merges the properties of each object and returns result. + * + * When multiple objects contain the same key the later object in + * the arguments list will take precedence. + * + * Example: + * + * ```js + * var result = merge({foo: 123}, {foo: 456}); + * console.log(result.foo); // outputs 456 + * ``` + * + * @param {Object} obj1 Object to merge + * @returns {Object} Result of all merge properties + */ +function merge(/* obj1, obj2, obj3, ... */) { + var result = {}; + function assignValue(val, key) { + if (typeof result[key] === 'object' && typeof val === 'object') { + result[key] = merge(result[key], val); + } else { + result[key] = val; + } + } + + for (var i = 0, l = arguments.length; i < l; i++) { + forEach(arguments[i], assignValue); + } + return result; +} + +/** + * Extends object a by mutably adding to it the properties of object b. + * + * @param {Object} a The object to be extended + * @param {Object} b The object to copy properties from + * @param {Object} thisArg The object to bind function to + * @return {Object} The resulting value of object a + */ +function extend(a, b, thisArg) { + forEach(b, function assignValue(val, key) { + if (thisArg && typeof val === 'function') { + a[key] = bind(val, thisArg); + } else { + a[key] = val; + } + }); + return a; +} + +module.exports = { + isArray: isArray, + isArrayBuffer: isArrayBuffer, + isBuffer: isBuffer, + isFormData: isFormData, + isArrayBufferView: isArrayBufferView, + isString: isString, + isNumber: isNumber, + isObject: isObject, + isUndefined: isUndefined, + isDate: isDate, + isFile: isFile, + isBlob: isBlob, + isFunction: isFunction, + isStream: isStream, + isURLSearchParams: isURLSearchParams, + isStandardBrowserEnv: isStandardBrowserEnv, + forEach: forEach, + merge: merge, + extend: extend, + trim: trim +}; + + +/***/ }), +/* 30 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; +/* WEBPACK VAR INJECTION */(function(process) { + +var utils = __webpack_require__(29); +var normalizeHeaderName = __webpack_require__(40); + +var DEFAULT_CONTENT_TYPE = { + 'Content-Type': 'application/x-www-form-urlencoded' +}; + +function setContentTypeIfUnset(headers, value) { + if (!utils.isUndefined(headers) && utils.isUndefined(headers['Content-Type'])) { + headers['Content-Type'] = value; + } +} + +function getDefaultAdapter() { + var adapter; + if (typeof XMLHttpRequest !== 'undefined') { + // For browsers use XHR adapter + adapter = __webpack_require__(32); + } else if (typeof process !== 'undefined') { + // For node use HTTP adapter + adapter = __webpack_require__(32); + } + return adapter; +} + +var defaults = { + adapter: getDefaultAdapter(), + + transformRequest: [function transformRequest(data, headers) { + normalizeHeaderName(headers, 'Content-Type'); + if (utils.isFormData(data) || + utils.isArrayBuffer(data) || + utils.isBuffer(data) || + utils.isStream(data) || + utils.isFile(data) || + utils.isBlob(data) + ) { + return data; + } + if (utils.isArrayBufferView(data)) { + return data.buffer; + } + if (utils.isURLSearchParams(data)) { + setContentTypeIfUnset(headers, 'application/x-www-form-urlencoded;charset=utf-8'); + return data.toString(); + } + if (utils.isObject(data)) { + setContentTypeIfUnset(headers, 'application/json;charset=utf-8'); + return JSON.stringify(data); + } + return data; + }], + + transformResponse: [function transformResponse(data) { + /*eslint no-param-reassign:0*/ + if (typeof data === 'string') { + try { + data = JSON.parse(data); + } catch (e) { /* Ignore */ } + } + return data; + }], + + /** + * A timeout in milliseconds to abort a request. If set to 0 (default) a + * timeout is not created. + */ + timeout: 0, + + xsrfCookieName: 'XSRF-TOKEN', + xsrfHeaderName: 'X-XSRF-TOKEN', + + maxContentLength: -1, + + validateStatus: function validateStatus(status) { + return status >= 200 && status < 300; + } +}; + +defaults.headers = { + common: { + 'Accept': 'application/json, text/plain, */*' + } +}; + +utils.forEach(['delete', 'get', 'head'], function forEachMethodNoData(method) { + defaults.headers[method] = {}; +}); + +utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) { + defaults.headers[method] = utils.merge(DEFAULT_CONTENT_TYPE); +}); + +module.exports = defaults; + +/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(8))) + +/***/ }), +/* 31 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +module.exports = function bind(fn, thisArg) { + return function wrap() { + var args = new Array(arguments.length); + for (var i = 0; i < args.length; i++) { + args[i] = arguments[i]; + } + return fn.apply(thisArg, args); + }; +}; + + +/***/ }), +/* 32 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); +var settle = __webpack_require__(41); +var buildURL = __webpack_require__(43); +var parseHeaders = __webpack_require__(44); +var isURLSameOrigin = __webpack_require__(45); +var createError = __webpack_require__(33); +var btoa = (typeof window !== 'undefined' && window.btoa && window.btoa.bind(window)) || __webpack_require__(46); + +module.exports = function xhrAdapter(config) { + return new Promise(function dispatchXhrRequest(resolve, reject) { + var requestData = config.data; + var requestHeaders = config.headers; + + if (utils.isFormData(requestData)) { + delete requestHeaders['Content-Type']; // Let the browser set it + } + + var request = new XMLHttpRequest(); + var loadEvent = 'onreadystatechange'; + var xDomain = false; + + // For IE 8/9 CORS support + // Only supports POST and GET calls and doesn't returns the response headers. + // DON'T do this for testing b/c XMLHttpRequest is mocked, not XDomainRequest. + if ("development" !== 'test' && + typeof window !== 'undefined' && + window.XDomainRequest && !('withCredentials' in request) && + !isURLSameOrigin(config.url)) { + request = new window.XDomainRequest(); + loadEvent = 'onload'; + xDomain = true; + request.onprogress = function handleProgress() {}; + request.ontimeout = function handleTimeout() {}; + } + + // HTTP basic authentication + if (config.auth) { + var username = config.auth.username || ''; + var password = config.auth.password || ''; + requestHeaders.Authorization = 'Basic ' + btoa(username + ':' + password); + } + + request.open(config.method.toUpperCase(), buildURL(config.url, config.params, config.paramsSerializer), true); + + // Set the request timeout in MS + request.timeout = config.timeout; + + // Listen for ready state + request[loadEvent] = function handleLoad() { + if (!request || (request.readyState !== 4 && !xDomain)) { + return; + } + + // The request errored out and we didn't get a response, this will be + // handled by onerror instead + // With one exception: request that using file: protocol, most browsers + // will return status as 0 even though it's a successful request + if (request.status === 0 && !(request.responseURL && request.responseURL.indexOf('file:') === 0)) { + return; + } + + // Prepare the response + var responseHeaders = 'getAllResponseHeaders' in request ? parseHeaders(request.getAllResponseHeaders()) : null; + var responseData = !config.responseType || config.responseType === 'text' ? request.responseText : request.response; + var response = { + data: responseData, + // IE sends 1223 instead of 204 (https://github.com/axios/axios/issues/201) + status: request.status === 1223 ? 204 : request.status, + statusText: request.status === 1223 ? 'No Content' : request.statusText, + headers: responseHeaders, + config: config, + request: request + }; + + settle(resolve, reject, response); + + // Clean up request + request = null; + }; + + // Handle low level network errors + request.onerror = function handleError() { + // Real errors are hidden from us by the browser + // onerror should only fire if it's a network error + reject(createError('Network Error', config, null, request)); + + // Clean up request + request = null; + }; + + // Handle timeout + request.ontimeout = function handleTimeout() { + reject(createError('timeout of ' + config.timeout + 'ms exceeded', config, 'ECONNABORTED', + request)); + + // Clean up request + request = null; + }; + + // Add xsrf header + // This is only done if running in a standard browser environment. + // Specifically not if we're in a web worker, or react-native. + if (utils.isStandardBrowserEnv()) { + var cookies = __webpack_require__(47); + + // Add xsrf header + var xsrfValue = (config.withCredentials || isURLSameOrigin(config.url)) && config.xsrfCookieName ? + cookies.read(config.xsrfCookieName) : + undefined; + + if (xsrfValue) { + requestHeaders[config.xsrfHeaderName] = xsrfValue; + } + } + + // Add headers to the request + if ('setRequestHeader' in request) { + utils.forEach(requestHeaders, function setRequestHeader(val, key) { + if (typeof requestData === 'undefined' && key.toLowerCase() === 'content-type') { + // Remove Content-Type if data is undefined + delete requestHeaders[key]; + } else { + // Otherwise add header to the request + request.setRequestHeader(key, val); + } + }); + } + + // Add withCredentials to request if needed + if (config.withCredentials) { + request.withCredentials = true; + } + + // Add responseType to request if needed + if (config.responseType) { + try { + request.responseType = config.responseType; + } catch (e) { + // Expected DOMException thrown by browsers not compatible XMLHttpRequest Level 2. + // But, this can be suppressed for 'json' type as it can be parsed by default 'transformResponse' function. + if (config.responseType !== 'json') { + throw e; + } + } + } + + // Handle progress if needed + if (typeof config.onDownloadProgress === 'function') { + request.addEventListener('progress', config.onDownloadProgress); + } + + // Not all browsers support upload events + if (typeof config.onUploadProgress === 'function' && request.upload) { + request.upload.addEventListener('progress', config.onUploadProgress); + } + + if (config.cancelToken) { + // Handle cancellation + config.cancelToken.promise.then(function onCanceled(cancel) { + if (!request) { + return; + } + + request.abort(); + reject(cancel); + // Clean up request + request = null; + }); + } + + if (requestData === undefined) { + requestData = null; + } + + // Send the request + request.send(requestData); + }); +}; + + +/***/ }), +/* 33 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var enhanceError = __webpack_require__(42); + +/** + * Create an Error with the specified message, config, error code, request and response. + * + * @param {string} message The error message. + * @param {Object} config The config. + * @param {string} [code] The error code (for example, 'ECONNABORTED'). + * @param {Object} [request] The request. + * @param {Object} [response] The response. + * @returns {Error} The created error. + */ +module.exports = function createError(message, config, code, request, response) { + var error = new Error(message); + return enhanceError(error, config, code, request, response); +}; + + +/***/ }), +/* 34 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +module.exports = function isCancel(value) { + return !!(value && value.__CANCEL__); +}; + + +/***/ }), +/* 35 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/** + * A `Cancel` is an object that is thrown when an operation is canceled. + * + * @class + * @param {string=} message The message. + */ +function Cancel(message) { + this.message = message; +} + +Cancel.prototype.toString = function toString() { + return 'Cancel' + (this.message ? ': ' + this.message : ''); +}; + +Cancel.prototype.__CANCEL__ = true; + +module.exports = Cancel; + + +/***/ }), +/* 36 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = __webpack_require__(37); + +/***/ }), +/* 37 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); +var bind = __webpack_require__(31); +var Axios = __webpack_require__(39); +var defaults = __webpack_require__(30); + +/** + * Create an instance of Axios + * + * @param {Object} defaultConfig The default config for the instance + * @return {Axios} A new instance of Axios + */ +function createInstance(defaultConfig) { + var context = new Axios(defaultConfig); + var instance = bind(Axios.prototype.request, context); + + // Copy axios.prototype to instance + utils.extend(instance, Axios.prototype, context); + + // Copy context to instance + utils.extend(instance, context); + + return instance; +} + +// Create the default instance to be exported +var axios = createInstance(defaults); + +// Expose Axios class to allow class inheritance +axios.Axios = Axios; + +// Factory for creating new instances +axios.create = function create(instanceConfig) { + return createInstance(utils.merge(defaults, instanceConfig)); +}; + +// Expose Cancel & CancelToken +axios.Cancel = __webpack_require__(35); +axios.CancelToken = __webpack_require__(53); +axios.isCancel = __webpack_require__(34); + +// Expose all/spread +axios.all = function all(promises) { + return Promise.all(promises); +}; +axios.spread = __webpack_require__(54); + +module.exports = axios; + +// Allow use of default import syntax in TypeScript +module.exports.default = axios; + + +/***/ }), +/* 38 */ +/***/ (function(module, exports) { + +/*! + * Determine if an object is a Buffer + * + * @author Feross Aboukhadijeh + * @license MIT + */ + +// The _isBuffer check is for Safari 5-7 support, because it's missing +// Object.prototype.constructor. Remove this eventually +module.exports = function (obj) { + return obj != null && (isBuffer(obj) || isSlowBuffer(obj) || !!obj._isBuffer) +} + +function isBuffer (obj) { + return !!obj.constructor && typeof obj.constructor.isBuffer === 'function' && obj.constructor.isBuffer(obj) +} + +// For Node v0.10 support. Remove this eventually. +function isSlowBuffer (obj) { + return typeof obj.readFloatLE === 'function' && typeof obj.slice === 'function' && isBuffer(obj.slice(0, 0)) +} + + +/***/ }), +/* 39 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var defaults = __webpack_require__(30); +var utils = __webpack_require__(29); +var InterceptorManager = __webpack_require__(48); +var dispatchRequest = __webpack_require__(49); + +/** + * Create a new instance of Axios + * + * @param {Object} instanceConfig The default config for the instance + */ +function Axios(instanceConfig) { + this.defaults = instanceConfig; + this.interceptors = { + request: new InterceptorManager(), + response: new InterceptorManager() + }; +} + +/** + * Dispatch a request + * + * @param {Object} config The config specific for this request (merged with this.defaults) + */ +Axios.prototype.request = function request(config) { + /*eslint no-param-reassign:0*/ + // Allow for axios('example/url'[, config]) a la fetch API + if (typeof config === 'string') { + config = utils.merge({ + url: arguments[0] + }, arguments[1]); + } + + config = utils.merge(defaults, {method: 'get'}, this.defaults, config); + config.method = config.method.toLowerCase(); + + // Hook up interceptors middleware + var chain = [dispatchRequest, undefined]; + var promise = Promise.resolve(config); + + this.interceptors.request.forEach(function unshiftRequestInterceptors(interceptor) { + chain.unshift(interceptor.fulfilled, interceptor.rejected); + }); + + this.interceptors.response.forEach(function pushResponseInterceptors(interceptor) { + chain.push(interceptor.fulfilled, interceptor.rejected); + }); + + while (chain.length) { + promise = promise.then(chain.shift(), chain.shift()); + } + + return promise; +}; + +// Provide aliases for supported request methods +utils.forEach(['delete', 'get', 'head', 'options'], function forEachMethodNoData(method) { + /*eslint func-names:0*/ + Axios.prototype[method] = function(url, config) { + return this.request(utils.merge(config || {}, { + method: method, + url: url + })); + }; +}); + +utils.forEach(['post', 'put', 'patch'], function forEachMethodWithData(method) { + /*eslint func-names:0*/ + Axios.prototype[method] = function(url, data, config) { + return this.request(utils.merge(config || {}, { + method: method, + url: url, + data: data + })); + }; +}); + +module.exports = Axios; + + +/***/ }), +/* 40 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +module.exports = function normalizeHeaderName(headers, normalizedName) { + utils.forEach(headers, function processHeader(value, name) { + if (name !== normalizedName && name.toUpperCase() === normalizedName.toUpperCase()) { + headers[normalizedName] = value; + delete headers[name]; + } + }); +}; + + +/***/ }), +/* 41 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var createError = __webpack_require__(33); + +/** + * Resolve or reject a Promise based on response status. + * + * @param {Function} resolve A function that resolves the promise. + * @param {Function} reject A function that rejects the promise. + * @param {object} response The response. + */ +module.exports = function settle(resolve, reject, response) { + var validateStatus = response.config.validateStatus; + // Note: status is not exposed by XDomainRequest + if (!response.status || !validateStatus || validateStatus(response.status)) { + resolve(response); + } else { + reject(createError( + 'Request failed with status code ' + response.status, + response.config, + null, + response.request, + response + )); + } +}; + + +/***/ }), +/* 42 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/** + * Update an Error with the specified config, error code, and response. + * + * @param {Error} error The error to update. + * @param {Object} config The config. + * @param {string} [code] The error code (for example, 'ECONNABORTED'). + * @param {Object} [request] The request. + * @param {Object} [response] The response. + * @returns {Error} The error. + */ +module.exports = function enhanceError(error, config, code, request, response) { + error.config = config; + if (code) { + error.code = code; + } + error.request = request; + error.response = response; + return error; +}; + + +/***/ }), +/* 43 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +function encode(val) { + return encodeURIComponent(val). + replace(/%40/gi, '@'). + replace(/%3A/gi, ':'). + replace(/%24/g, '$'). + replace(/%2C/gi, ','). + replace(/%20/g, '+'). + replace(/%5B/gi, '['). + replace(/%5D/gi, ']'); +} + +/** + * Build a URL by appending params to the end + * + * @param {string} url The base of the url (e.g., http://www.google.com) + * @param {object} [params] The params to be appended + * @returns {string} The formatted url + */ +module.exports = function buildURL(url, params, paramsSerializer) { + /*eslint no-param-reassign:0*/ + if (!params) { + return url; + } + + var serializedParams; + if (paramsSerializer) { + serializedParams = paramsSerializer(params); + } else if (utils.isURLSearchParams(params)) { + serializedParams = params.toString(); + } else { + var parts = []; + + utils.forEach(params, function serialize(val, key) { + if (val === null || typeof val === 'undefined') { + return; + } + + if (utils.isArray(val)) { + key = key + '[]'; + } else { + val = [val]; + } + + utils.forEach(val, function parseValue(v) { + if (utils.isDate(v)) { + v = v.toISOString(); + } else if (utils.isObject(v)) { + v = JSON.stringify(v); + } + parts.push(encode(key) + '=' + encode(v)); + }); + }); + + serializedParams = parts.join('&'); + } + + if (serializedParams) { + url += (url.indexOf('?') === -1 ? '?' : '&') + serializedParams; + } + + return url; +}; + + +/***/ }), +/* 44 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +// Headers whose duplicates are ignored by node +// c.f. https://nodejs.org/api/http.html#http_message_headers +var ignoreDuplicateOf = [ + 'age', 'authorization', 'content-length', 'content-type', 'etag', + 'expires', 'from', 'host', 'if-modified-since', 'if-unmodified-since', + 'last-modified', 'location', 'max-forwards', 'proxy-authorization', + 'referer', 'retry-after', 'user-agent' +]; + +/** + * Parse headers into an object + * + * ``` + * Date: Wed, 27 Aug 2014 08:58:49 GMT + * Content-Type: application/json + * Connection: keep-alive + * Transfer-Encoding: chunked + * ``` + * + * @param {String} headers Headers needing to be parsed + * @returns {Object} Headers parsed into an object + */ +module.exports = function parseHeaders(headers) { + var parsed = {}; + var key; + var val; + var i; + + if (!headers) { return parsed; } + + utils.forEach(headers.split('\n'), function parser(line) { + i = line.indexOf(':'); + key = utils.trim(line.substr(0, i)).toLowerCase(); + val = utils.trim(line.substr(i + 1)); + + if (key) { + if (parsed[key] && ignoreDuplicateOf.indexOf(key) >= 0) { + return; + } + if (key === 'set-cookie') { + parsed[key] = (parsed[key] ? parsed[key] : []).concat([val]); + } else { + parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val; + } + } + }); + + return parsed; +}; + + +/***/ }), +/* 45 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +module.exports = ( + utils.isStandardBrowserEnv() ? + + // Standard browser envs have full support of the APIs needed to test + // whether the request URL is of the same origin as current location. + (function standardBrowserEnv() { + var msie = /(msie|trident)/i.test(navigator.userAgent); + var urlParsingNode = document.createElement('a'); + var originURL; + + /** + * Parse a URL to discover it's components + * + * @param {String} url The URL to be parsed + * @returns {Object} + */ + function resolveURL(url) { + var href = url; + + if (msie) { + // IE needs attribute set twice to normalize properties + urlParsingNode.setAttribute('href', href); + href = urlParsingNode.href; + } + + urlParsingNode.setAttribute('href', href); + + // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils + return { + href: urlParsingNode.href, + protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '', + host: urlParsingNode.host, + search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '', + hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', + hostname: urlParsingNode.hostname, + port: urlParsingNode.port, + pathname: (urlParsingNode.pathname.charAt(0) === '/') ? + urlParsingNode.pathname : + '/' + urlParsingNode.pathname + }; + } + + originURL = resolveURL(window.location.href); + + /** + * Determine if a URL shares the same origin as the current location + * + * @param {String} requestURL The URL to test + * @returns {boolean} True if URL shares the same origin, otherwise false + */ + return function isURLSameOrigin(requestURL) { + var parsed = (utils.isString(requestURL)) ? resolveURL(requestURL) : requestURL; + return (parsed.protocol === originURL.protocol && + parsed.host === originURL.host); + }; + })() : + + // Non standard browser envs (web workers, react-native) lack needed support. + (function nonStandardBrowserEnv() { + return function isURLSameOrigin() { + return true; + }; + })() +); + + +/***/ }), +/* 46 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +// btoa polyfill for IE<10 courtesy https://github.com/davidchambers/Base64.js + +var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/='; + +function E() { + this.message = 'String contains an invalid character'; +} +E.prototype = new Error; +E.prototype.code = 5; +E.prototype.name = 'InvalidCharacterError'; + +function btoa(input) { + var str = String(input); + var output = ''; + for ( + // initialize result and counter + var block, charCode, idx = 0, map = chars; + // if the next str index does not exist: + // change the mapping table to "=" + // check if d has no fractional digits + str.charAt(idx | 0) || (map = '=', idx % 1); + // "8 - idx % 1 * 8" generates the sequence 2, 4, 6, 8 + output += map.charAt(63 & block >> 8 - idx % 1 * 8) + ) { + charCode = str.charCodeAt(idx += 3 / 4); + if (charCode > 0xFF) { + throw new E(); + } + block = block << 8 | charCode; + } + return output; +} + +module.exports = btoa; + + +/***/ }), +/* 47 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +module.exports = ( + utils.isStandardBrowserEnv() ? + + // Standard browser envs support document.cookie + (function standardBrowserEnv() { + return { + write: function write(name, value, expires, path, domain, secure) { + var cookie = []; + cookie.push(name + '=' + encodeURIComponent(value)); + + if (utils.isNumber(expires)) { + cookie.push('expires=' + new Date(expires).toGMTString()); + } + + if (utils.isString(path)) { + cookie.push('path=' + path); + } + + if (utils.isString(domain)) { + cookie.push('domain=' + domain); + } + + if (secure === true) { + cookie.push('secure'); + } + + document.cookie = cookie.join('; '); + }, + + read: function read(name) { + var match = document.cookie.match(new RegExp('(^|;\\s*)(' + name + ')=([^;]*)')); + return (match ? decodeURIComponent(match[3]) : null); + }, + + remove: function remove(name) { + this.write(name, '', Date.now() - 86400000); + } + }; + })() : + + // Non standard browser env (web workers, react-native) lack needed support. + (function nonStandardBrowserEnv() { + return { + write: function write() {}, + read: function read() { return null; }, + remove: function remove() {} + }; + })() +); + + +/***/ }), +/* 48 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +function InterceptorManager() { + this.handlers = []; +} + +/** + * Add a new interceptor to the stack + * + * @param {Function} fulfilled The function to handle `then` for a `Promise` + * @param {Function} rejected The function to handle `reject` for a `Promise` + * + * @return {Number} An ID used to remove interceptor later + */ +InterceptorManager.prototype.use = function use(fulfilled, rejected) { + this.handlers.push({ + fulfilled: fulfilled, + rejected: rejected + }); + return this.handlers.length - 1; +}; + +/** + * Remove an interceptor from the stack + * + * @param {Number} id The ID that was returned by `use` + */ +InterceptorManager.prototype.eject = function eject(id) { + if (this.handlers[id]) { + this.handlers[id] = null; + } +}; + +/** + * Iterate over all the registered interceptors + * + * This method is particularly useful for skipping over any + * interceptors that may have become `null` calling `eject`. + * + * @param {Function} fn The function to call for each interceptor + */ +InterceptorManager.prototype.forEach = function forEach(fn) { + utils.forEach(this.handlers, function forEachHandler(h) { + if (h !== null) { + fn(h); + } + }); +}; + +module.exports = InterceptorManager; + + +/***/ }), +/* 49 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); +var transformData = __webpack_require__(50); +var isCancel = __webpack_require__(34); +var defaults = __webpack_require__(30); +var isAbsoluteURL = __webpack_require__(51); +var combineURLs = __webpack_require__(52); + +/** + * Throws a `Cancel` if cancellation has been requested. + */ +function throwIfCancellationRequested(config) { + if (config.cancelToken) { + config.cancelToken.throwIfRequested(); + } +} + +/** + * Dispatch a request to the server using the configured adapter. + * + * @param {object} config The config that is to be used for the request + * @returns {Promise} The Promise to be fulfilled + */ +module.exports = function dispatchRequest(config) { + throwIfCancellationRequested(config); + + // Support baseURL config + if (config.baseURL && !isAbsoluteURL(config.url)) { + config.url = combineURLs(config.baseURL, config.url); + } + + // Ensure headers exist + config.headers = config.headers || {}; + + // Transform request data + config.data = transformData( + config.data, + config.headers, + config.transformRequest + ); + + // Flatten headers + config.headers = utils.merge( + config.headers.common || {}, + config.headers[config.method] || {}, + config.headers || {} + ); + + utils.forEach( + ['delete', 'get', 'head', 'post', 'put', 'patch', 'common'], + function cleanHeaderConfig(method) { + delete config.headers[method]; + } + ); + + var adapter = config.adapter || defaults.adapter; + + return adapter(config).then(function onAdapterResolution(response) { + throwIfCancellationRequested(config); + + // Transform response data + response.data = transformData( + response.data, + response.headers, + config.transformResponse + ); + + return response; + }, function onAdapterRejection(reason) { + if (!isCancel(reason)) { + throwIfCancellationRequested(config); + + // Transform response data + if (reason && reason.response) { + reason.response.data = transformData( + reason.response.data, + reason.response.headers, + config.transformResponse + ); + } + } + + return Promise.reject(reason); + }); +}; + + +/***/ }), +/* 50 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var utils = __webpack_require__(29); + +/** + * Transform the data for a request or a response + * + * @param {Object|String} data The data to be transformed + * @param {Array} headers The headers for the request or response + * @param {Array|Function} fns A single function or Array of functions + * @returns {*} The resulting transformed data + */ +module.exports = function transformData(data, headers, fns) { + /*eslint no-param-reassign:0*/ + utils.forEach(fns, function transform(fn) { + data = fn(data, headers); + }); + + return data; +}; + + +/***/ }), +/* 51 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/** + * Determines whether the specified URL is absolute + * + * @param {string} url The URL to test + * @returns {boolean} True if the specified URL is absolute, otherwise false + */ +module.exports = function isAbsoluteURL(url) { + // A URL is considered absolute if it begins with "://" or "//" (protocol-relative URL). + // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed + // by any combination of letters, digits, plus, period, or hyphen. + return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url); +}; + + +/***/ }), +/* 52 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/** + * Creates a new URL by combining the specified URLs + * + * @param {string} baseURL The base URL + * @param {string} relativeURL The relative URL + * @returns {string} The combined URL + */ +module.exports = function combineURLs(baseURL, relativeURL) { + return relativeURL + ? baseURL.replace(/\/+$/, '') + '/' + relativeURL.replace(/^\/+/, '') + : baseURL; +}; + + +/***/ }), +/* 53 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +var Cancel = __webpack_require__(35); + +/** + * A `CancelToken` is an object that can be used to request cancellation of an operation. + * + * @class + * @param {Function} executor The executor function. + */ +function CancelToken(executor) { + if (typeof executor !== 'function') { + throw new TypeError('executor must be a function.'); + } + + var resolvePromise; + this.promise = new Promise(function promiseExecutor(resolve) { + resolvePromise = resolve; + }); + + var token = this; + executor(function cancel(message) { + if (token.reason) { + // Cancellation has already been requested + return; + } + + token.reason = new Cancel(message); + resolvePromise(token.reason); + }); +} + +/** + * Throws a `Cancel` if cancellation has been requested. + */ +CancelToken.prototype.throwIfRequested = function throwIfRequested() { + if (this.reason) { + throw this.reason; + } +}; + +/** + * Returns an object that contains a new `CancelToken` and a function that, when called, + * cancels the `CancelToken`. + */ +CancelToken.source = function source() { + var cancel; + var token = new CancelToken(function executor(c) { + cancel = c; + }); + return { + token: token, + cancel: cancel + }; +}; + +module.exports = CancelToken; + + +/***/ }), +/* 54 */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +/** + * Syntactic sugar for invoking a function and expanding an array for arguments. + * + * Common use case would be to use `Function.prototype.apply`. + * + * ```js + * function f(x, y, z) {} + * var args = [1, 2, 3]; + * f.apply(null, args); + * ``` + * + * With `spread` this example can be re-written. + * + * ```js + * spread(function(x, y, z) {})([1, 2, 3]); + * ``` + * + * @param {Function} callback + * @returns {Function} + */ +module.exports = function spread(callback) { + return function wrap(arr) { + return callback.apply(null, arr); + }; +}; + + /***/ }) /******/ ]); \ No newline at end of file diff --git a/public/themes/default/assets/mix-manifest.json b/public/themes/default/assets/mix-manifest.json index b7e923adb..2141a2aae 100644 --- a/public/themes/default/assets/mix-manifest.json +++ b/public/themes/default/assets/mix-manifest.json @@ -1,4 +1,4 @@ { "/js/shop.js": "/js/shop.js", "/css/shop.css": "/css/shop.css" -} +} \ No newline at end of file From a24c789a3c12ca6138a64fb04c24b43770137a67 Mon Sep 17 00:00:00 2001 From: prashant-webkul Date: Wed, 19 Sep 2018 12:30:24 +0530 Subject: [PATCH 4/5] before merge --- .../views/users/users/index.blade.php | 1 - packages/Webkul/Cart/src/Cart.php | 136 ++++++--- .../src/Http/ViewComposers/CartComposer.php | 59 ++++ packages/Webkul/Cart/src/Models/Cart.php | 3 +- .../src/Providers/CartServiceProvider.php | 8 +- .../src/Providers/ComposerServiceProvider.php | 32 +++ packages/Webkul/Shop/src/Http/routes.php | 22 -- .../Shop/src/Resources/assets/js/app.js | 2 + .../assets/js/components/cart-dropdown.vue | 156 +++++++++++ .../assets/js/components/category-item.vue | 1 - .../Shop/src/Resources/assets/sass/app.scss | 27 +- .../Shop/src/Resources/assets/sass/icons.scss | 10 +- .../views/layouts/header/index.blade.php | 121 +------- .../Resources/views/products/view.blade.php | 1 - .../views/products/view/gallery.blade.php | 1 - .../assets/js/components/flash-wrapper.vue | 2 +- .../views/datagrid/table/default.blade.php | 8 +- packages/Webkul/Ui/webpack.mix.js | 2 +- public/themes/default/assets/css/shop.css | 30 +- public/themes/default/assets/js/shop.js | 265 +++++++++++++++++- resources/views/welcome.blade.php | 2 +- 21 files changed, 691 insertions(+), 198 deletions(-) create mode 100644 packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php create mode 100644 packages/Webkul/Cart/src/Providers/ComposerServiceProvider.php create mode 100644 packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php index fc4a1d6c3..466bd0e47 100644 --- a/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/users/users/index.blade.php @@ -3,7 +3,6 @@ @section('page_title') @endsection -@stop @section('content') diff --git a/packages/Webkul/Cart/src/Cart.php b/packages/Webkul/Cart/src/Cart.php index 9969c4f23..a580a8789 100644 --- a/packages/Webkul/Cart/src/Cart.php +++ b/packages/Webkul/Cart/src/Cart.php @@ -32,74 +32,88 @@ class Cart { protected $customer; - public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer) { + //Cookie expiry limit in minutes + protected $minutes = 150; + + public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer ,$minutes = 150) { $this->customer = $customer; $this->cart = $cart; $this->cartProduct = $cartProduct; + + $this->minutes = $minutes; } public function guestUnitAdd($id) { + //empty array for storing the products $products = array(); - $minutes = 150; - if(Cookie::has('cart_session_id')) { + //getting the cart session id from cookie $cart_session_id = Cookie::get('cart_session_id'); + //finding current cart instance in the database table. $current_cart = $this->cart->findOneByField('session_id', $cart_session_id); - // dd('Cookie = ',$cart_session_id, 'Session = ', session()->get('cart_session_id'), 'DB = ', $current_cart->session_id); - + //check there is any cart or not if(isset($current_cart)) { $current_cart_id = $current_cart['id'] ?? $current_cart->id; $current_cart_session_id = $current_cart['session_id'] ?? $current_cart->session_id; } else { + //if someone deleted then take the flow to the normal $this->repairCart($cart_session_id, $id); } - + //matching the session id present in the cookie and database are same or not. if((session()->get('cart_session_id') == Cookie::get('cart_session_id')) && ($current_cart_session_id == session()->get('cart_session_id'))) { $current_cart_products = array(); $current_cart_products = $this->cart->getProducts($current_cart_id); + //checking new product coming in the cart is new or previously added item. foreach($current_cart_products as $key => $value) { $product_id = $value['id'] ?? $value->id; if($product_id == $id) { + //create status code to communicate with session flash session()->flash('error', 'Item Already In Cart'); + //remove this its temporary dump('Item Already In Cart'); return redirect()->back(); } } + //cart data being attached to the instace. $cart_data = $this->cart->attach($current_cart_id, $id, 1); + //getting the products after being attached to cart instance $cart_products = $this->cart->getProducts($current_cart_id); + //storing the information in session. session()->put('cart_data', [$current_cart, $cart_products]); - session()->flash('Success', 'Item Added In Cart'); + session()->flash('Success', 'Item Added To Cart Successfully'); dump($cart_products); + //return the control to the controller return redirect()->back(); } else { - //repair the cart + //repair the cart, will remake the session + //and add the product in the new cart instance. $this->repairCart($cart_session_id, $id); } } else { - //create a new cart instance. + //function call $this->createNewCart($id); } } @@ -112,23 +126,20 @@ class Cart { * Session. * * @return mixed - */ + */ public function createNewCart($id) { - $minutes = 120; $fresh_cart_session_id = session()->getId(); - Cookie::queue('cart_session_id', $fresh_cart_session_id, $minutes); - - $cart_session_id = $this->makeCartSession($fresh_cart_session_id); - $data['session_id'] = $fresh_cart_session_id; $data['channel_id'] = core()->getCurrentChannel()->id; if($cart = $this->cart->create($data)) { + $this->makeCartSession($fresh_cart_session_id); + $new_cart_id = $cart->id ?? $cart['id']; $cart_product['product_id'] = $id; @@ -141,7 +152,7 @@ class Cart { session()->put('cart_data', [$cart, $cart_product]); - session()->flash('success', 'Product Added To Cart'); + session()->flash('success', 'Item Added To Cart Successfully'); return redirect()->back(); } @@ -156,9 +167,12 @@ class Cart { * cart. */ public function makeCartSession($cart_session_id) { - session()->put('cart_session_id', $cart_session_id); - return session()->get('cart_session_id'); + $fresh_cart_session_id = $cart_session_id; + + Cookie::queue('cart_session_id', $fresh_cart_session_id, $this->minutes); + + session()->put('cart_session_id', $fresh_cart_session_id); } @@ -170,8 +184,7 @@ class Cart { * * @return mixed */ - - public function repairCart($cart_session_id, $product_id) { + public function repairCart($cart_session_id ="null", $product_id = 0) { if($cart_session_id == session()->get('cart_session_id')) { $data['session_id'] = $cart_session_id; @@ -184,7 +197,7 @@ class Cart { $this->cart->attach($cart_id, $product_id, 1); - session()->flash('success', 'Product Added In Cart'); + session()->flash('success', 'Item Added To Cart Successfully'); return redirect()->back(); @@ -212,8 +225,8 @@ class Cart { public function guestUnitRemove($id) { //remove the products here - if(Cookie::has('session_c')) { - $products = unserialize(Cookie::get('session_c')); + if(Cookie::has('session_cart_id')) { + $products = unserialize(Cookie::get('session_cart_id')); foreach($products as $key => $value) { if($value == $id) { @@ -221,7 +234,7 @@ class Cart { array_push($products, $id); - Cookie::queue('session_c', serialize($products)); + Cookie::queue('session_cart_id', serialize($products)); return redirect()->back(); } @@ -239,46 +252,80 @@ class Cart { $products = array(); - // $customerLoggedIn = auth()->guard('customer')->check(); - - // //customer is authenticated - // if ($customerLoggedIn) { - //assuming that there is data in cookie and customer's cart also. + if(!auth()->guard('customer')->check()) { + throw new \Exception('This function is protected for auth customers only.'); + } $data['customer_id'] = auth()->guard('customer')->user()->id; $data['channel_id'] = core()->getCurrentChannel()->id; - $customerCart = $this->cart->findOneByField('customer_id', $data['customer_id']); + $customer_cart = $this->cart->findOneByField('customer_id', $data['customer_id']); //if there are products already in cart of that customer. - $customerCartId = $customerCart->id ?? $customerCart['id']; + $customer_cart_id = $customer_cart->id ?? $customer_cart['id']; - $customerCartProducts = $this->cart->getProducts($customerCartId); + /** + * Check if their any + * instance of current + * customer in the cart + * table. + */ + if(isset($customer_cart)) { + $customer_cart_products = $this->cart->getProducts($customer_cart_id); - if (isset($customerCartProducts)) { + if (isset($customer_cart_products)) { - foreach ($customerCartProducts as $previousCartProduct) { + foreach ($customer_cart_products as $customer_cart_product) { + if($customer_cart_product->id == $id) { + dump('Item already exists in cart'); - if($previousCartProduct->id == $id) { - dd('product already exists in cart'); + session()->flash('error', 'Item already exists in cart'); - session()->flash('error', 'Product already exists in cart'); + return redirect()->back(); - return redirect()->back(); + //maybe increase the quantity in here + } } + //add the product in the cart + + $this->cart->attach($customer_cart_id, $id, 1); + + session()->flash('success', 'Item Added To Cart Successfully'); + + return redirect()->back(); + } else { + $this->cart->destroy($customer_cart_id); + + session()->flash('error', 'Try Adding The Item Again'); + + dd('cart instance without any product found, delete it and create a new one for the current product id'); + + return redirect()->back(); } - //add the product in the cart + } else { + /** + * this will work + * for logged in users + * and they do not have + * any cart instance + * found in the database. + */ - $product['product_id'] = $id; + if($new_cart = $this->cart->create($data)) { + $new_cart_id = $new_cart->id ?? $new_cart['id']; - $product['quantity'] = 1; + $this->cart->attach($new_cart_id, $id, 1); - $product['cart_id'] = $customerCartId; + session()->flash('success', 'Item Added To Cart Successfully'); - $this->cartProduct->create($product); + return redirect()->back(); - return redirect()->back(); + } else { + session()->flash('error', 'Cannot Add Item in Cart'); + + return redirect()->back(); + } } } @@ -301,7 +348,6 @@ class Cart { */ public function mergeCart() { - //considering cookie as a source of truth. if(Cookie::has('cart_session_id')) { /* diff --git a/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php new file mode 100644 index 000000000..a216c1d5c --- /dev/null +++ b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php @@ -0,0 +1,59 @@ + + * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com) + */ + +class CartComposer +{ + + /** + * The cart implementation + * for shop bundle's navigation + * menu + */ + protected $cart; + + /** + * Bind data to the view. + * + * @param View $view + * @return void + */ + public function __construct(CartRepository $cart) { + $this->cart = $cart; + } + + public function compose(View $view) { + if(auth()->guard('customer')->check()) { + $cart = $this->cart->findOneByField('customer_id', auth()->guard('customer')->user()->id); + + $cart_products = $this->cart->getProducts($cart['id']); + + // dd($cart_products); + + $view->with('cart', $cart_products); + + } else { + if(Cookie::has('cart_session_id')) { + $cart = $this->cart->findOneByField('session_id', Cookie::get('cart_session_id')); + + $cart_products = $this->cart->getProducts($cart['id']); + + $view->with('cart', $cart_products); + } + } + } +} diff --git a/packages/Webkul/Cart/src/Models/Cart.php b/packages/Webkul/Cart/src/Models/Cart.php index 20f376f67..f1591cdb4 100644 --- a/packages/Webkul/Cart/src/Models/Cart.php +++ b/packages/Webkul/Cart/src/Models/Cart.php @@ -10,11 +10,12 @@ class Cart extends Model { protected $table = 'cart'; - protected $fillable = ['customer_id','session_id','channel_id','coupon_code','is_gift']; + protected $fillable = ['customer_id', 'session_id', 'channel_id', 'coupon_code', 'is_gift']; protected $hidden = ['coupon_code']; public function with_products() { + return $this->belongsToMany(Product::class, 'cart_products')->withPivot('id', 'product_id','quantity', 'cart_id'); } } diff --git a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php index f05e1cb39..ac8fc304b 100644 --- a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php +++ b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php @@ -9,6 +9,7 @@ use Illuminate\Foundation\AliasLoader; use Webkul\User\Http\Middleware\RedirectIfNotAdmin; use Webkul\Customer\Http\Middleware\RedirectIfNotCustomer; use Webkul\Cart\Facades\Cart; +use Webkul\Cart\Providers\ComposerServiceProvider; class CartServiceProvider extends ServiceProvider { @@ -19,9 +20,9 @@ class CartServiceProvider extends ServiceProvider $router->aliasMiddleware('admin', RedirectIfNotAdmin::class); - // $router->aliasMiddleware('customer', RedirectIfNotCustomer::class); + $router->aliasMiddleware('customer', RedirectIfNotCustomer::class); - $this->register(EventServiceProvider::class); + $this->app->register(ComposerServiceProvider::class); } /** @@ -41,6 +42,9 @@ class CartServiceProvider extends ServiceProvider */ protected function registerFacades() { + + //to make the cart facade and bind the + //alias to the class needed to be called. $loader = AliasLoader::getInstance(); $loader->alias('cart', Cart::class); diff --git a/packages/Webkul/Cart/src/Providers/ComposerServiceProvider.php b/packages/Webkul/Cart/src/Providers/ComposerServiceProvider.php new file mode 100644 index 000000000..3f62d51c7 --- /dev/null +++ b/packages/Webkul/Cart/src/Providers/ComposerServiceProvider.php @@ -0,0 +1,32 @@ + ['web']], function () { - Route::get('/test', 'Webkul\Cart\Http\Controllers\CartController@test'); - Route::get('/', 'Webkul\Shop\Http\Controllers\HomeController@index')->defaults('_config', [ 'view' => 'shop::home.index' ])->name('store.home'); @@ -29,15 +27,8 @@ Route::group(['middleware' => ['web']], function () { Route::post('product/remove/{id}', 'Webkul\Cart\Http\Controllers\CartController@remove')->name('cart.remove'); - // Route::post('product/customer/cart/add/{id}', 'Webkul\Cart\Http\Controllers\CartController@add')->name('cart.customer.add'); - - // Route::post('product/customer/cart/remove/{id}', 'Webkul\Cart\Http\Controllers\CartController@remove')->name('cart.customer.remove'); - - Route::get('product/customer/cart/merge', 'Webkul\Cart\Http\Controllers\CartController@handleMerge')->name('cart.merge'); - //Routes for product cart ends - // Product Review routes Route::get('/reviews/{slug}/{id}', 'Webkul\Shop\Http\Controllers\ReviewController@show')->defaults('_config', [ 'view' => 'shop::products.reviews.index' @@ -55,13 +46,6 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'admin.reviews.index' ])->name('admin.reviews.store'); - // Route::post('/reviews/create/{slug}', 'Webkul\Core\Http\Controllers\ReviewController@store')->defaults('_config', [ - // 'redirect' => 'admin.reviews.index' - // ])->name('admin.reviews.store'); - - - // Route::view('/products/{slug}', 'shop::store.product.details.index'); - Route::view('/cart', 'shop::store.product.view.cart.index'); //customer routes starts here Route::prefix('customer')->group(function () { @@ -92,12 +76,6 @@ Route::group(['middleware' => ['web']], function () { 'redirect' => 'customer.session.index' ])->name('customer.session.destroy'); - Route::view('/cart', 'shop::store.product.cart.cart.index')->name('customer.cart'); - - Route::view('/product', 'shop::store.product.details.home.index')->name('customer.product'); - - Route::view('/product/review', 'shop::store.product.review.index')->name('customer.product.review'); - //customer account Route::prefix('account')->group(function () { diff --git a/packages/Webkul/Shop/src/Resources/assets/js/app.js b/packages/Webkul/Shop/src/Resources/assets/js/app.js index 320d65719..9c192b635 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/app.js +++ b/packages/Webkul/Shop/src/Resources/assets/js/app.js @@ -8,6 +8,7 @@ Vue.component("category-nav", require("./components/category-nav.vue")); Vue.component("category-item", require("./components/category-item.vue")); Vue.component("image-slider", require("./components/image-slider.vue")); Vue.component("vue-slider", require("vue-slider-component")); +Vue.component("cart-dropdown", require("./components/cart-dropdown.vue")); $(document).ready(function () { @@ -50,6 +51,7 @@ $(document).ready(function () { const flashes = this.$refs.flashes; flashMessages.forEach(function (flash) { + console.log(flash); flashes.addFlash(flash); }, this); }, diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue new file mode 100644 index 000000000..9b27c8634 --- /dev/null +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue @@ -0,0 +1,156 @@ + + + \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue index 4ff3508ad..e38dc943f 100644 --- a/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue +++ b/packages/Webkul/Shop/src/Resources/assets/js/components/category-item.vue @@ -29,7 +29,6 @@ export default { computed: { haveChildren() { - console.log(this.item); return this.item.children.length ? true : false; } } diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index 799e0760b..f3689ae9b 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -21,6 +21,7 @@ body { .header { margin-top: 16px; margin-bottom: 21px; + user-select: none; .header-top { margin-bottom: 16px; @@ -293,7 +294,6 @@ body { .nav li li:hover > a:first-child:nth-last-child(2):before { right: 10px; } - } } @@ -310,7 +310,7 @@ body { .header-top { margin-bottom: 16px; display: flex; - max-width: 92%; + // max-width: 92%; width: 100%; margin-left: auto; margin-right: auto; @@ -482,7 +482,7 @@ body { .header-top { margin-bottom: 16px; display: flex; - max-width: 92%; + // max-width: 92%; width: 100%; margin-left: auto; margin-right: auto; @@ -1007,6 +1007,27 @@ section.slider-block { } } +//responsive for main-container-wrapper + +@media all and (max-width: 480px) { + .main-container-wrapper { + width: 100% !important; + margin-left: auto; + margin-right: auto; + } +} + +@media all and (min-width: 481px) and (max-width: 920px) { + .main-container-wrapper { + width: 90%; + margin-left: auto; + margin-right: auto; + } +} + + + + .product-price { font-size: 16px; margin-bottom: 14px; diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss index e8ce2979e..762f456ae 100644 --- a/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/icons.scss @@ -3,7 +3,7 @@ background-size: cover; } -.dropdown-right-icon{ +.dropdown-right-icon { background-image:URL('../images/icon-dropdown-left.svg'); width: 8px; height: 8px; @@ -11,6 +11,14 @@ margin-bottom: 2px; } +.icon-menu-close { + background-image:URL('../images/icon-menu-close.svg'); + width: 8px; + height: 8px; + margin-left:auto; + margin-bottom: 2px; +} + .grid-view-icon { background-image:URL('../images/icon-grid-view.svg'); width: 24px; diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php index d15ab5888..0fdee9e33 100644 --- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php @@ -1,7 +1,5 @@ @push('scripts') - - - @endpush \ No newline at end of file diff --git a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php index 1f53659fc..feaa5bd83 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php @@ -8,7 +8,6 @@
    - {{-- {{ dd(session()->getId()) }} --}}
    @csrf() diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php index 54c605929..e5ddae8a6 100644 --- a/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/products/view/gallery.blade.php @@ -61,7 +61,6 @@ }, created () { - console.log(this.images[0]) this.changeImage(this.images[0]) this.prepareThumbs() diff --git a/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue b/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue index f22019967..902807869 100644 --- a/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue +++ b/packages/Webkul/Ui/src/Resources/assets/js/components/flash-wrapper.vue @@ -5,7 +5,7 @@ class='alert-wrapper' > {!! $column->sorting() !!} @endif @endforeach - @if(isset($attribute_columns)) + {{-- @if(isset($attribute_columns)) @foreach($attribute_columns as $key => $value) {{ $value }} @endforeach - @endif + @endif --}} Actions @@ -131,11 +131,11 @@ {!! $column->render($result) !!} @endforeach - @if(isset($attribute_columns)) + {{-- @if(isset($attribute_columns)) @foreach ($attribute_columns as $atc) {{ $result->{$atc} }} @endforeach - @endif + @endif --}} @foreach($actions as $action) diff --git a/packages/Webkul/Ui/webpack.mix.js b/packages/Webkul/Ui/webpack.mix.js index 32804fbcc..4fa81616a 100644 --- a/packages/Webkul/Ui/webpack.mix.js +++ b/packages/Webkul/Ui/webpack.mix.js @@ -14,7 +14,7 @@ mix.js( ], "js/ui.js" ) - // .copy(__dirname + "/src/Resources/assets/images", publicPath + "/images") + .copy(__dirname + "/src/Resources/assets/images", publicPath + "/images") .sass(__dirname + "/src/Resources/assets/sass/app.scss", "css/ui.css") .options({ processCssUrls: false diff --git a/public/themes/default/assets/css/shop.css b/public/themes/default/assets/css/shop.css index b674c2995..da3cdc0de 100644 --- a/public/themes/default/assets/css/shop.css +++ b/public/themes/default/assets/css/shop.css @@ -11,6 +11,14 @@ margin-bottom: 2px; } +.icon-menu-close { + background-image: URL("../images/icon-menu-close.svg"); + width: 8px; + height: 8px; + margin-left: auto; + margin-bottom: 2px; +} + .grid-view-icon { background-image: URL("../images/icon-grid-view.svg"); width: 24px; @@ -40,6 +48,10 @@ body { .header { margin-top: 16px; margin-bottom: 21px; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .header .header-top { @@ -380,7 +392,6 @@ body { display: -webkit-box; display: -ms-flexbox; display: flex; - max-width: 92%; width: 100%; margin-left: auto; margin-right: auto; @@ -533,7 +544,6 @@ body { display: -webkit-box; display: -ms-flexbox; display: flex; - max-width: 92%; width: 100%; margin-left: auto; margin-right: auto; @@ -1057,6 +1067,22 @@ section.slider-block div.slider-content div.slider-control .light-right-icon { width: 100%; } +@media all and (max-width: 480px) { + .main-container-wrapper { + width: 100% !important; + margin-left: auto; + margin-right: auto; + } +} + +@media all and (min-width: 481px) and (max-width: 920px) { + .main-container-wrapper { + width: 90%; + margin-left: auto; + margin-right: auto; + } +} + .product-price { font-size: 16px; margin-bottom: 14px; diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js index 92989e592..ea917445b 100644 --- a/public/themes/default/assets/js/shop.js +++ b/public/themes/default/assets/js/shop.js @@ -221,6 +221,7 @@ Vue.component("category-nav", __webpack_require__(10)); Vue.component("category-item", __webpack_require__(13)); Vue.component("image-slider", __webpack_require__(16)); Vue.component("vue-slider", __webpack_require__(24)); +Vue.component("cart-dropdown", __webpack_require__(29)); $(document).ready(function () { @@ -263,6 +264,7 @@ $(document).ready(function () { var flashes = this.$refs.flashes; flashMessages.forEach(function (flash) { + console.log(flash); flashes.addFlash(flash); }, this); }, @@ -29279,7 +29281,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); computed: { haveChildren: function haveChildren() { - console.log(this.item); return this.item.children.length ? true : false; } } @@ -29920,5 +29921,267 @@ if (false) { // removed by extract-text-webpack-plugin +/***/ }), +/* 26 */, +/* 27 */, +/* 28 */, +/* 29 */ +/***/ (function(module, exports, __webpack_require__) { + +var disposed = false +function injectStyle (ssrContext) { + if (disposed) return + __webpack_require__(32) +} +var normalizeComponent = __webpack_require__(1) +/* script */ +var __vue_script__ = __webpack_require__(30) +/* template */ +var __vue_template__ = __webpack_require__(31) +/* template functional */ +var __vue_template_functional__ = false +/* styles */ +var __vue_styles__ = injectStyle +/* scopeId */ +var __vue_scopeId__ = null +/* moduleIdentifier (server only) */ +var __vue_module_identifier__ = null +var Component = normalizeComponent( + __vue_script__, + __vue_template__, + __vue_template_functional__, + __vue_styles__, + __vue_scopeId__, + __vue_module_identifier__ +) +Component.options.__file = "src/Resources/assets/js/components/cart-dropdown.vue" + +/* hot reload */ +if (false) {(function () { + var hotAPI = require("vue-hot-reload-api") + hotAPI.install(require("vue"), false) + if (!hotAPI.compatible) return + module.hot.accept() + if (!module.hot.data) { + hotAPI.createRecord("data-v-0f947e82", Component.options) + } else { + hotAPI.reload("data-v-0f947e82", Component.options) + } + module.hot.dispose(function (data) { + disposed = true + }) +})()} + +module.exports = Component.exports + + +/***/ }), +/* 30 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + +"use strict"; +Object.defineProperty(__webpack_exports__, "__esModule", { value: true }); +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// +// + + +// define the item component + +/* harmony default export */ __webpack_exports__["default"] = ({ + props: { + items: Array + }, + + data: function data() { + return { + toggle: true, + totalitems: 0, + cart_items: [] + }; + }, + + + computed: { + makeDropdown: function makeDropdown() {} + }, + + mounted: function mounted() { + if (this.items != undefined) this.initializeDropdown(); + }, + + methods: { + dropOrHide: function dropOrHide() { + if (this.toggle == false) { + this.toggle = true; + } else { + this.toggle = false; + } + }, + + initializeDropdown: function initializeDropdown() { + this.totalitems = this.items.length; + } + } +}); + +/***/ }), +/* 31 */ +/***/ (function(module, exports, __webpack_require__) { + +var render = function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", [ + _c("ul", { staticClass: "cart-dropdown", on: { click: _vm.dropOrHide } }, [ + _c("li", { staticClass: "cart-summary" }, [ + _c("span", { staticClass: "icon cart-icon" }), + _vm._v(" "), + _c("span", { staticClass: "cart" }, [ + _vm.totalitems > 0 + ? _c("span", { staticClass: "cart-count" }, [ + _vm._v(_vm._s(_vm.totalitems)) + ]) + : _vm._e(), + _vm._v("Products") + ]), + _vm._v(" "), + _c("span", { staticClass: "icon arrow-down-icon" }) + ]) + ]), + _vm._v(" "), + _c("div", { staticClass: "dropdown-cart", class: { show: _vm.toggle } }, [ + _c("div", { staticClass: "dropdown-header" }, [ + _c("p", { staticClass: "heading" }, [_vm._v("Cart Subtotal - $80")]), + _vm._v(" "), + _c("i", { + staticClass: "icon icon-menu-close", + on: { click: _vm.dropOrHide } + }) + ]), + _vm._v(" "), + _vm._m(0), + _vm._v(" "), + _vm._m(1) + ]) + ]) +} +var staticRenderFns = [ + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "dropdown-content" }, [ + _c("div", { staticClass: "item" }, [ + _c("div", { staticClass: "item-image" }, [_c("img")]), + _vm._v(" "), + _c("div", { staticClass: "item-details" }, [ + _c("div", { staticClass: "item-name" }, [_vm._v("Some Item Name")]), + _vm._v(" "), + _c("div", { staticClass: "item-price" }, [_vm._v("$ Some Price")]), + _vm._v(" "), + _c("div", { staticClass: "item-qty" }, [_vm._v("Some Quantity")]) + ]) + ]) + ]) + }, + function() { + var _vm = this + var _h = _vm.$createElement + var _c = _vm._self._c || _h + return _c("div", { staticClass: "dropdown-footer" }, [ + _c("a", { attrs: { href: "/" } }, [_vm._v("View Shopping Cart")]), + _vm._v(" "), + _c("button", { staticClass: "btn btn-primary btn-lg" }, [ + _vm._v("CHECKOUT") + ]) + ]) + } +] +render._withStripped = true +module.exports = { render: render, staticRenderFns: staticRenderFns } +if (false) { + module.hot.accept() + if (module.hot.data) { + require("vue-hot-reload-api") .rerender("data-v-0f947e82", module.exports) + } +} + +/***/ }), +/* 32 */ +/***/ (function(module, exports, __webpack_require__) { + +// style-loader: Adds some css to the DOM by adding a