From 2721080a1b08941394235fe3295e27e7a1cc15e1 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Thu, 20 Sep 2018 14:03:28 +0530
Subject: [PATCH 1/5] Just add more logics to cart and cart items from here

---
 packages/Webkul/Cart/src/Cart.php             | 127 +++++++++++-------
 ..._09_05_150915_create_cart_items_table.php} |   2 +-
 .../src/Http/Controllers/CartController.php   |  44 +++---
 .../src/Http/ViewComposers/CartComposer.php   |  29 +++-
 packages/Webkul/Cart/src/Models/Cart.php      |   6 +-
 packages/Webkul/Cart/src/Models/CartItem.php  |  17 +++
 .../Webkul/Cart/src/Models/CartProduct.php    |  11 --
 .../src/Providers/CartServiceProvider.php     |   9 +-
 ...tRepository.php => CartItemRepository.php} |   8 +-
 .../Cart/src/Repositories/CartRepository.php  |  28 +++-
 packages/Webkul/Core/src/Core.php             |   4 +-
 .../Criteria/AttributeToSelectCriteria.php    |   4 +-
 .../src/Models/ProductAttributeValue.php      |   2 +-
 packages/Webkul/Shop/src/Http/routes.php      |   3 +-
 .../assets/js/components/cart-dropdown.vue    |   2 +
 .../views/layouts/header/index.blade.php      |  14 +-
 .../Resources/views/products/view.blade.php   |  15 ++-
 17 files changed, 216 insertions(+), 109 deletions(-)
 rename packages/Webkul/Cart/src/Database/migrations/{2018_09_05_150915_create_cart_products_table.php => 2018_09_05_150915_create_cart_items_table.php} (93%)
 create mode 100644 packages/Webkul/Cart/src/Models/CartItem.php
 delete mode 100644 packages/Webkul/Cart/src/Models/CartProduct.php
 rename packages/Webkul/Cart/src/Repositories/{CartProductRepository.php => CartItemRepository.php} (80%)

diff --git a/packages/Webkul/Cart/src/Cart.php b/packages/Webkul/Cart/src/Cart.php
index a580a8789..5f9555ff8 100644
--- a/packages/Webkul/Cart/src/Cart.php
+++ b/packages/Webkul/Cart/src/Cart.php
@@ -6,7 +6,7 @@ use Carbon\Carbon;
 
 //Cart repositories
 use Webkul\Cart\Repositories\CartRepository;
-use Webkul\Cart\Repositories\CartProductRepository;
+use Webkul\Cart\Repositories\CartItemRepository;
 
 //Customer repositories
 use Webkul\Customer\Repositories\CustomerRepository;
@@ -24,67 +24,75 @@ use Cookie;
 
 class Cart {
 
-    protected $_config;
-
     protected $cart;
 
-    protected $cartProduct;
+    protected $cartItem;
 
     protected $customer;
 
     //Cookie expiry limit in minutes
-    protected $minutes = 150;
+    protected $minutes;
 
-    public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer ,$minutes = 150) {
+    public function __construct(CartRepository $cart, CartItemRepository $cartItem, CustomerRepository $customer, $minutes = 150) {
 
         $this->customer = $customer;
 
         $this->cart = $cart;
 
-        $this->cartProduct = $cartProduct;
+        $this->cartItem = $cartItem;
 
         $this->minutes = $minutes;
     }
 
-    public function guestUnitAdd($id) {
+    public function guestUnitAdd($id, $data) {
 
-        //empty array for storing the products
+        //empty array for storing the products.
         $products = array();
 
         if(Cookie::has('cart_session_id')) {
 
-            //getting the cart session id from cookie
+            //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);
 
-            //check there is any cart or not
+            //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
+                //if someone deleted handle flow to the normal.
                 $this->repairCart($cart_session_id, $id);
             }
 
-            //matching the session id present in the cookie and database are same or not.
+            //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_items = $this->cart->items($current_cart_id);
+
                 $current_cart_products = array();
 
-                $current_cart_products = $this->cart->getProducts($current_cart_id);
+                foreach($current_cart_items as $current_cart_item) {
+                    array_push($current_cart_products, $this->cartItem->getProduct($current_cart_item->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;
+                    $product_id = $value;
 
                     if($product_id == $id) {
-                        //create status code to communicate with session flash
+                        //create status code to communicate with session flash.
+                        $cartItemId = $this->cartItem->findOneByField('product_id', $id)->id;
+
+                        $cartItemQuantity = $this->cartItem->findOneByField('product_id', $id)->quantity;
+
+                        $this->cartItem->update(['quantity' => $cartItemQuantity + $data['quantity']], $cartItemId);
+
                         session()->flash('error', 'Item Already In Cart');
 
-                        //remove this its temporary
+                        //remove this its temporary.
                         dump('Item Already In Cart');
 
                         return redirect()->back();
@@ -92,29 +100,27 @@ class Cart {
                 }
 
                 //cart data being attached to the instace.
-                $cart_data = $this->cart->attach($current_cart_id, $id, 1);
+                $cart_data = $this->cart->attach($current_cart_id, $id, $data['quantity']);
 
-                //getting the products after being attached to cart instance
-                $cart_products = $this->cart->getProducts($current_cart_id);
+                //getting the products after being attached to cart instance.
+                $cart_products = $this->cart->items($current_cart_id);
 
                 //storing the information in session.
                 session()->put('cart_data', [$current_cart, $cart_products]);
 
                 session()->flash('Success', 'Item Added To Cart Successfully');
 
-                dump($cart_products);
-
-                //return the control to the controller
+                //return the control to the controller.
                 return redirect()->back();
 
             } else {
-                //repair the cart, will remake the session
+                //repair the cart, will remake the session.
                 //and add the product in the new cart instance.
                 $this->repairCart($cart_session_id, $id);
             }
         } else {
             //function call
-            $this->createNewCart($id);
+            $this->createNewCart($id, $data);
         }
     }
 
@@ -128,11 +134,12 @@ class Cart {
      * @return mixed
     */
 
-    public function createNewCart($id) {
+    public function createNewCart($id, $data) {
 
         $fresh_cart_session_id = session()->getId();
 
-        $data['session_id'] = $fresh_cart_session_id;
+        if(!auth()->guard('customer')->check())
+            $data['session_id'] = $fresh_cart_session_id;
 
         $data['channel_id'] = core()->getCurrentChannel()->id;
 
@@ -144,10 +151,12 @@ class Cart {
 
             $cart_product['product_id'] = $id;
 
-            $cart_product['quantity'] = 1;
+            $cart_product['quantity'] = $data['quantity'];
 
             $cart_product['cart_id'] = $new_cart_id;
 
+            $cart_product['price'] = $new_cart_id;
+
             if($cart_product = $this->cart->attach($new_cart_id, $cart_product['product_id'], $cart_product['quantity'])) {
 
                 session()->put('cart_data', [$cart, $cart_product]);
@@ -248,7 +257,7 @@ class Cart {
     of the logged in user.
     */
 
-    public function add($id) {
+    public function add($id, $itemdata) {
 
         $products = array();
 
@@ -272,24 +281,32 @@ class Cart {
          * table.
          */
         if(isset($customer_cart)) {
-            $customer_cart_products = $this->cart->getProducts($customer_cart_id);
+            $customer_cart_items = $this->cart->items($customer_cart_id);
+
+            $customer_cart_products = array();
+
+            foreach($customer_cart_items as $customer_cart_item) {
+                array_push($customer_cart_products, $this->cartItem->getProduct($customer_cart_item->id));
+            }
 
             if (isset($customer_cart_products)) {
 
                 foreach ($customer_cart_products as $customer_cart_product) {
-                    if($customer_cart_product->id == $id) {
-                        dump('Item already exists in cart');
+                    if($customer_cart_product == $id) {
+                        $cartItemId = $this->cartItem->findOneByField('product_id', $id)->id;
+
+                        $cartItemQuantity = $this->cartItem->findOneByField('product_id', $id)->quantity;
+
+                        $this->cartItem->update(['quantity' => $cartItemQuantity + $itemdata['quantity']], $cartItemId);
 
                         session()->flash('error', 'Item already exists in cart');
 
                         return redirect()->back();
-
-                        //maybe increase the quantity in here
                     }
                 }
                 //add the product in the cart
 
-                $this->cart->attach($customer_cart_id, $id, 1);
+                $this->cart->attach($customer_cart_id, $id, $itemdata['quantity']);
 
                 session()->flash('success', 'Item Added To Cart Successfully');
 
@@ -315,7 +332,7 @@ class Cart {
             if($new_cart = $this->cart->create($data)) {
                 $new_cart_id = $new_cart->id ?? $new_cart['id'];
 
-                $this->cart->attach($new_cart_id, $id, 1);
+                $this->cart->attach($new_cart_id, $id, $itemdata['quantity']);
 
                 session()->flash('success', 'Item Added To Cart Successfully');
 
@@ -370,46 +387,60 @@ class Cart {
             $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');
+                dd('Some One Deleted Cart');
 
                 return redirect()->back();
             }
+            $guest_cart_items = $this->cart->items($guest_cart->id);
 
-            $guest_cart_products = $this->cart->getProducts($guest_cart->id);
+            $guest_cart_products = array();
+
+            foreach($guest_cart_items as $guest_cart_item) {
+                array_push($guest_cart_products, $this->cartItem->getProduct($guest_cart_item->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);
+                $customer_cart_items = $this->cart->items($customer_cart->id);
+
+                $customer_cart_products = array();
+
+                foreach($customer_cart_items as $customer_cart_item) {
+                    array_push($customer_cart_products, $this->cartItem->getProduct($customer_cart_item->id));
+                }
 
                 foreach($guest_cart_products as $key => $guest_cart_product) {
-
                     foreach($customer_cart_products as $customer_cart_product) {
+                        if($guest_cart_product == $customer_cart_product) {
+                            $cartItemId = $this->cartItem->findWhere(['cart_id'=> $guest_cart->id, 'product_id' => $guest_cart_product])[0]->id;
 
-                        if($guest_cart_product->id == $customer_cart_product->id) {
+                            $cartItemQuantity = $this->cartItem->findWhere(['cart_id'=> $guest_cart->id, 'product_id' => $guest_cart_product])[0]->quantity;
 
-                            $quantity = $guest_cart_product->toArray()['pivot']['quantity'] + 1;
+                            $customerItemId = $this->cartItem->findWhere(['cart_id'=> $customer_cart->id, 'product_id' => $customer_cart_product])[0]->id;
 
-                            $pivot = $guest_cart_product->toArray()['pivot'];
+                            $customerItemQuantity = $this->cartItem->findWhere(['cart_id'=> $customer_cart->id, 'product_id' => $customer_cart_product])[0]->quantity;
 
-                            $saveQuantity = $this->cart->updateRelatedForMerge($pivot, 'quantity', $quantity);
+                            $this->cartItem->delete($cartItemId);
+
+                            $this->cartItem->update(['quantity' => $cartItemQuantity + $customerItemQuantity], $customerItemId);
 
                             unset($guest_cart_products[$key]);
                         }
                     }
                 }
-
                 //insert the new products here.
                 foreach ($guest_cart_products as $key => $guest_cart_product) {
-                    $product = $guest_cart_product->toArray();
+                    // dd($this->cartItem->findWhere(['cart_id'=> $guest_cart->id, 'product_id' => $guest_cart_product])[0]);
+                    $cartItemId = $this->cartItem->findWhere(['cart_id'=> $guest_cart->id, 'product_id' => $guest_cart_product])[0]->id;
 
-                    $this->cart->updateRelatedForMerge($product['pivot'], 'cart_id', $customer_cart->id);
+                    $this->cartItem->update(['cart_id' => $customer_cart->id], $cartItemId);
                 }
 
                 //detach with guest cart records
-                $this->cart->detachAndDeleteParent($guest_cart->id);
+                $this->cart->deleteParent($guest_cart->id);
 
                 Cookie::queue(Cookie::forget('cart_session_id'));
 
diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_products_table.php b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php
similarity index 93%
rename from packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_products_table.php
rename to packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php
index 5d3f4b2ce..0ab6260f7 100644
--- a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_products_table.php
+++ b/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php
@@ -13,7 +13,7 @@ class CreateCartProductsTable extends Migration
      */
     public function up()
     {
-        Schema::create('cart_products', function (Blueprint $table) {
+        Schema::create('cart_items', function (Blueprint $table) {
             $table->increments('id');
             $table->integer('product_id')->unsigned();
             $table->foreign('product_id')->references('id')->on('products');
diff --git a/packages/Webkul/Cart/src/Http/Controllers/CartController.php b/packages/Webkul/Cart/src/Http/Controllers/CartController.php
index 101d28b9a..fd6f1d5fe 100644
--- a/packages/Webkul/Cart/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Cart/src/Http/Controllers/CartController.php
@@ -7,7 +7,7 @@ use Illuminate\Http\Response;
 
 //Cart repositories
 use Webkul\Cart\Repositories\CartRepository;
-use Webkul\Cart\Repositories\CartProductRepository;
+use Webkul\Cart\Repositories\CartItemRepository;
 
 //Customer repositories
 use Webkul\Customer\Repositories\CustomerRepository;
@@ -36,11 +36,11 @@ class CartController extends Controller
 
     protected $cart;
 
-    protected $cartProduct;
+    protected $cartItem;
 
     protected $customer;
 
-    public function __construct(CartRepository $cart, CartProductRepository $cartProduct, CustomerRepository $customer) {
+    public function __construct(CartRepository $cart, CartItemRepository $cartItem, CustomerRepository $customer) {
 
         $this->middleware('customer')->except(['add', 'remove', 'test']);
 
@@ -48,7 +48,7 @@ class CartController extends Controller
 
         $this->cart = $cart;
 
-        $this->cartProduct = $cartProduct;
+        $this->cartItem = $cartItem;
     }
 
     /**
@@ -60,11 +60,11 @@ class CartController extends Controller
      */
 
     public function add($id) {
-
+        $data = request()->input();
         if(auth()->guard('customer')->check()) {
-            Cart::add($id);
+            Cart::add($id, $data);
         } else {
-            Cart::guestUnitAdd($id);
+            Cart::guestUnitAdd($id, $data);
         }
 
         return redirect()->back();
@@ -81,20 +81,26 @@ class CartController extends Controller
         return redirect()->back();
     }
 
-    // public function test() {
-    //     $cookie = Cookie::get('cart_session_id');
+    /**
+     * This is a test for
+     * relationship existence
+     * from cart item to product
+     *
+     * @return Array
+     */
+    public function test() {
+        $cartItems = $this->cart->items(75);
 
-    //     $cart = $this->cart->findOneByField('session_id', $cookie);
+        $products = array();
+        foreach($cartItems as $cartItem) {
+            $cartItemId = $cartItem->id;
 
-    //     $cart_products = $this->cart->getProducts($cart->id);
+            $this->cart->updateItem(75, $cartItemId, 'quantity', $cartItem->quantity+1);
 
-    //     foreach($cart_products as $cart_product) {
-    //         $quantity = $cart_product->toArray()['pivot']['quantity'] + 1;
+            array_push($products, ['product_id' => $this->cartItem->getProduct($cartItemId), 'quantity' => $cartItem->quantity]);
+        }
 
-    //         $pivot = $cart_product->toArray()['pivot'];
-
-    //         $saveQuantity = $this->cart->saveRelated($pivot, 'quantity', $quantity+1);
-    //     }
-    //     dd('done');
-    // }
+        dd($products);
+        return response()->json($products, 200);
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
index a216c1d5c..10f3d799d 100644
--- a/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
+++ b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
@@ -7,6 +7,8 @@ use Illuminate\Support\Collection;
 
 use Webkul\Cart\Repositories\CartRepository;
 
+use Webkul\Cart\Repositories\CartItemRepository;
+
 use Cookie;
 use Cart;
 /**
@@ -32,27 +34,42 @@ class CartComposer
      * @param  View  $view
      * @return void
      */
-    public function __construct(CartRepository $cart) {
+    public function __construct(CartRepository $cart, CartItemRepository $cartItem) {
         $this->cart = $cart;
+
+        $this->cartItem = $cartItem;
     }
 
     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']);
+            if(isset($cart)) {
+                $cart_items = $this->cart->items($cart['id']);
 
-            // dd($cart_products);
+                $cart_products = array();
 
-            $view->with('cart', $cart_products);
+                foreach($cart_items as $cart_item) {
+                    array_push($cart_products, $this->cartItem->getProduct($cart_item->id));
+                }
 
+                $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']);
+                if(isset($cart)) {
+                    $cart_items = $this->cart->items($cart['id']);
 
-                $view->with('cart', $cart_products);
+                    $cart_products = array();
+
+                    foreach($cart_items as $cart_item) {
+                        array_push($cart_products, $this->cartItem->getProduct($cart_item->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 f1591cdb4..ff076ad79 100644
--- a/packages/Webkul/Cart/src/Models/Cart.php
+++ b/packages/Webkul/Cart/src/Models/Cart.php
@@ -16,6 +16,10 @@ class Cart extends Model
 
     public function with_products() {
 
-        return $this->belongsToMany(Product::class, 'cart_products')->withPivot('id', 'product_id','quantity', 'cart_id');
+        return $this->belongsToMany(Product::class, 'cart_items')->withPivot('id', 'product_id','quantity', 'cart_id');
+    }
+
+    public function items() {
+        return $this->hasMany('Webkul\Cart\Models\CartItem');
     }
 }
diff --git a/packages/Webkul/Cart/src/Models/CartItem.php b/packages/Webkul/Cart/src/Models/CartItem.php
new file mode 100644
index 000000000..d864ae6f8
--- /dev/null
+++ b/packages/Webkul/Cart/src/Models/CartItem.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Webkul\Cart\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+
+class CartItem extends Model
+{
+    protected $table = 'cart_items';
+
+    protected $fillable = ['product_id','quantity','cart_id','tax_category_id','coupon_code'];
+
+    public function product() {
+        return $this->hasOne('Webkul\Product\Models\Product', 'id', 'product_id');
+    }
+}
diff --git a/packages/Webkul/Cart/src/Models/CartProduct.php b/packages/Webkul/Cart/src/Models/CartProduct.php
deleted file mode 100644
index 8b8a9d32b..000000000
--- a/packages/Webkul/Cart/src/Models/CartProduct.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Webkul\Cart\Models;
-use Illuminate\Database\Eloquent\Model;
-
-class CartProduct extends Model
-{
-    protected $table = 'cart_products';
-
-    protected $fillable = ['product_id','quantity','cart_id','tax_category_id','coupon_code'];
-}
diff --git a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php
index d1ba3b051..ab3302409 100644
--- a/packages/Webkul/Cart/src/Providers/CartServiceProvider.php
+++ b/packages/Webkul/Cart/src/Providers/CartServiceProvider.php
@@ -46,10 +46,13 @@ class CartServiceProvider extends ServiceProvider
         //to make the cart facade and bind the
         //alias to the class needed to be called.
         $loader = AliasLoader::getInstance();
-        $loader->alias('cart', CartFacade::class);
+
+        $loader->alias('cart', Cart::class);
 
         $this->app->singleton('cart', function () {
-            return new Cart();
+            return new cart();
         });
+
+        $this->app->bind('cart', 'Webkul\Cart\Cart');
     }
-}
+}
\ No newline at end of file
diff --git a/packages/Webkul/Cart/src/Repositories/CartProductRepository.php b/packages/Webkul/Cart/src/Repositories/CartItemRepository.php
similarity index 80%
rename from packages/Webkul/Cart/src/Repositories/CartProductRepository.php
rename to packages/Webkul/Cart/src/Repositories/CartItemRepository.php
index 0c3636d5d..78f2e615d 100644
--- a/packages/Webkul/Cart/src/Repositories/CartProductRepository.php
+++ b/packages/Webkul/Cart/src/Repositories/CartItemRepository.php
@@ -11,7 +11,7 @@ use Webkul\Core\Eloquent\Repository;
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
  */
 
-class CartProductRepository extends Repository
+class CartItemRepository extends Repository
 {
     /**
      * Specify Model class name
@@ -21,7 +21,7 @@ class CartProductRepository extends Repository
 
     function model()
     {
-        return 'Webkul\Cart\Models\CartProduct';
+        return 'Webkul\Cart\Models\CartItem';
     }
 
     /**
@@ -51,4 +51,8 @@ class CartProductRepository extends Repository
 
         return $cartitems;
     }
+
+    public function getProduct($cartItemId) {
+        return $this->model->find($cartItemId)->product->id;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Cart/src/Repositories/CartRepository.php b/packages/Webkul/Cart/src/Repositories/CartRepository.php
index e7f951abd..cca574045 100644
--- a/packages/Webkul/Cart/src/Repositories/CartRepository.php
+++ b/packages/Webkul/Cart/src/Repositories/CartRepository.php
@@ -77,12 +77,25 @@ class CartRepository extends Repository
      *
      * @return Mixed
      */
-    public function updateRelatedForMerge($pivot, $column, $value) {
-        $cart_product = $this->model->findOrFail($pivot['cart_id']);
+    public function updateRelatedForMerge($cart_id, $product_id, $column, $value) {
+        $cart_product = $this->model->findOrFail($cart_id);
 
-        return $cart_product->with_products()->updateExistingPivot($pivot['product_id'], array($column => $value));
+        return $cart_product->with_products()->updateExistingPivot($product_id, array($column => $value));
     }
 
+    /**
+     * Update the quantity of
+     * previously added item
+     * in the cart.
+     *
+     * @return Mixed
+     */
+
+    // public function updateRelatedInItems($cartId, $cartItemId, $column, $value) {
+
+    //     return $this->updateItem($cartId)->syncWithoutDetaching($cartItemId, [$column => $value]);
+    // }
+
     /**
      * Method to detach
      * associations.
@@ -92,12 +105,13 @@ class CartRepository extends Repository
      *
      * @return Mixed
      */
-    public function detachAndDeleteParent($cart_id) {
+    public function deleteParent($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);
     }
+
+    public function items($cartId) {
+        return $this->model->find($cartId)->items;
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php
index 0b5d36e49..119d43b41 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/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php
index cc86260e7..4f5a47cff 100644
--- a/packages/Webkul/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php
+++ b/packages/Webkul/Product/src/Contracts/Criteria/AttributeToSelectCriteria.php
@@ -59,13 +59,13 @@ class AttributeToSelectCriteria extends AbstractProduct implements CriteriaInter
     public function apply($model, RepositoryInterface $repository)
     {
         $model = $model->select('products.*');
-        
+
         foreach ($this->attributeToSelect as $code) {
             $attribute = $this->attribute->findOneByField('code', $code);
 
             if(!$attribute)
                 continue;
-            
+
             $productValueAlias = 'pav_' . $attribute->code;
 
             $model = $model->leftJoin('product_attribute_values as ' . $productValueAlias, function($qb) use($attribute, $productValueAlias) {
diff --git a/packages/Webkul/Product/src/Models/ProductAttributeValue.php b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
index 828664442..6eb459ae3 100644
--- a/packages/Webkul/Product/src/Models/ProductAttributeValue.php
+++ b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
@@ -23,7 +23,7 @@ class ProductAttributeValue extends Model
         'boolean' => 'boolean_value',
         'select' => 'integer_value',
         'multiselect' => 'text_value',
-        'datetime' => 'datetime_time',
+        'datetime' => 'datetime_value',
         'date' => 'date_value',
     ];
 
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 7d8361989..6e00de737 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -14,8 +14,7 @@ Route::group(['middleware' => ['web']], function () {
         'view' => 'shop::checkout.onepage'
     ])->name('shop.checkout');
 
-    /* dummy routes ends here */
-
+    Route::get('test', 'Webkul\Cart\Http\Controllers\CartController@test');
 
     Route::get('/products/{slug}', 'Webkul\Shop\Http\Controllers\ProductController@index')->defaults('_config', [
         'view' => 'shop::products.view'
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
index 9b27c8634..570197b9d 100644
--- a/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue
+++ b/packages/Webkul/Shop/src/Resources/assets/js/components/cart-dropdown.vue
@@ -75,6 +75,8 @@ export default {
 
         initializeDropdown: function() {
             this.totalitems = this.items.length;
+            this.cart_items = this.items;
+            console.log("The cart items here are = ",cart_items);
         }
     }
 }
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 0fdee9e33..72fa0b8da 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
@@ -91,7 +91,19 @@
 
             </ul>
 
-            <cart-dropdown @if(isset($cart)) :items='@json($cart)' @endif></cart-dropdown>
+            @if(isset($cart))
+                <cart-dropdown :items='@json($cart)'></cart-dropdown>
+            @else
+                <ul class="cart-dropdown">
+                    <li class="cart-summary">
+                        <span class="icon cart-icon"></span>
+
+                        <span class="cart"><span class="cart-count">0</span>Products</span>
+
+                        <span class="icon arrow-down-icon"></span>
+                    </li>
+                </ul>
+            @endif
 
             {{-- Meant for responsive views only --}}
             <ul class="ham-dropdown-container">
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 c0b2786b9..3e2e9ab1c 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view.blade.php
@@ -8,15 +8,13 @@
 @section('content-wrapper')
     <section class="product-detail">
         <div class="category-breadcrumbs">
-
             <span class="breadcrumb">Home</span> > <span class="breadcrumb">Men</span> > <span class="breadcrumb">Slit Open Jeans</span>
-
         </div>
         <div class="layouter">
             <form method="POST" action="{{ route('cart.add', $product->id) }}">
                 @csrf()
 
-                <input type="hidden" name="product">
+                <input type="hidden" name="product" value="{{ $product->id }}">
 
                 @include ('shop::products.view.gallery')
 
@@ -37,6 +35,17 @@
                         {{ $product->short_description }}
                     </div>
 
+                    <div class="quantity control-group">
+                    <label class="reqiured">Quantity</label>
+                        <input name="quantity" class="control" value="1" v-validate="'numeric'" required style="width: 60px;">
+                    </div>
+
+                    @if ($product->type == 'configurable')
+                        <input type="hidden" value="true" name="is_configurable">
+                    @else
+                        <input type="hidden" value="false" name="is_configurable">
+                    @endif
+
                     @include ('shop::products.view.configurable-options')
 
                     <accordian :title="'{{ __('shop::app.products.description') }}'" :active="true">

From 50a0bc60b566318d29d8a0ac650484ba58d1af1a Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Thu, 20 Sep 2018 15:30:52 +0530
Subject: [PATCH 2/5] Cart Fixes

---
 packages/Webkul/Cart/src/Cart.php             | 15 ++++++------
 .../src/Http/Controllers/CartController.php   | 24 ++++++++++++++++++-
 .../src/Http/ViewComposers/CartComposer.php   |  1 +
 .../Cart/src/Repositories/CartRepository.php  |  5 ++--
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/packages/Webkul/Cart/src/Cart.php b/packages/Webkul/Cart/src/Cart.php
index 5f9555ff8..aececafae 100644
--- a/packages/Webkul/Cart/src/Cart.php
+++ b/packages/Webkul/Cart/src/Cart.php
@@ -14,9 +14,9 @@ use Webkul\Customer\Repositories\CustomerRepository;
 use Cookie;
 
 /**
- * Cart facade for all
+ * Facade for all
  * the methods to be
- * implemented for Cart.
+ * implemented in Cart.
  *
  * @author    Prashant Singh <prashant.singh852@webkul.com>
  * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
@@ -79,7 +79,6 @@ class Cart {
 
                 //checking new product coming in the cart is new or previously added item.
                 foreach($current_cart_products as $key => $value) {
-
                     $product_id = $value;
 
                     if($product_id == $id) {
@@ -100,7 +99,7 @@ class Cart {
                 }
 
                 //cart data being attached to the instace.
-                $cart_data = $this->cart->attach($current_cart_id, $id, $data['quantity']);
+                $cart_data = $this->cart->attach($current_cart_id, $id, $data['quantity'], $data['price']);
 
                 //getting the products after being attached to cart instance.
                 $cart_products = $this->cart->items($current_cart_id);
@@ -155,9 +154,9 @@ class Cart {
 
             $cart_product['cart_id'] = $new_cart_id;
 
-            $cart_product['price'] = $new_cart_id;
+            $cart_product['price'] = $data['price'];
 
-            if($cart_product = $this->cart->attach($new_cart_id, $cart_product['product_id'], $cart_product['quantity'])) {
+            if($cart_product = $this->cart->attach($new_cart_id, $cart_product['product_id'], $cart_product['quantity'], $cart_product['price'])) {
 
                 session()->put('cart_data', [$cart, $cart_product]);
 
@@ -306,7 +305,7 @@ class Cart {
                 }
                 //add the product in the cart
 
-                $this->cart->attach($customer_cart_id, $id, $itemdata['quantity']);
+                $this->cart->attach($customer_cart_id, $id, $itemdata['quantity'], $itemdata['price']);
 
                 session()->flash('success', 'Item Added To Cart Successfully');
 
@@ -332,7 +331,7 @@ class Cart {
             if($new_cart = $this->cart->create($data)) {
                 $new_cart_id = $new_cart->id ?? $new_cart['id'];
 
-                $this->cart->attach($new_cart_id, $id, $itemdata['quantity']);
+                $this->cart->attach($new_cart_id, $id, $itemdata['quantity'], $itemdata['price']);
 
                 session()->flash('success', 'Item Added To Cart Successfully');
 
diff --git a/packages/Webkul/Cart/src/Http/Controllers/CartController.php b/packages/Webkul/Cart/src/Http/Controllers/CartController.php
index fd6f1d5fe..4dce35386 100644
--- a/packages/Webkul/Cart/src/Http/Controllers/CartController.php
+++ b/packages/Webkul/Cart/src/Http/Controllers/CartController.php
@@ -9,6 +9,9 @@ use Illuminate\Http\Response;
 use Webkul\Cart\Repositories\CartRepository;
 use Webkul\Cart\Repositories\CartItemRepository;
 
+//Product Repository
+use Webkul\Product\Repositories\ProductRepository;
+
 //Customer repositories
 use Webkul\Customer\Repositories\CustomerRepository;
 
@@ -40,7 +43,9 @@ class CartController extends Controller
 
     protected $customer;
 
-    public function __construct(CartRepository $cart, CartItemRepository $cartItem, CustomerRepository $customer) {
+    protected $product;
+
+    public function __construct(CartRepository $cart, CartItemRepository $cartItem, CustomerRepository $customer, ProductRepository $product) {
 
         $this->middleware('customer')->except(['add', 'remove', 'test']);
 
@@ -49,6 +54,8 @@ class CartController extends Controller
         $this->cart = $cart;
 
         $this->cartItem = $cartItem;
+
+        $this->product = $product;
     }
 
     /**
@@ -61,6 +68,21 @@ class CartController extends Controller
 
     public function add($id) {
         $data = request()->input();
+        // dd($data);
+        if(!isset($data['is_configurable']) || !isset($data['product']) ||!isset($data['quantity'])) {
+            session()->flash('error', 'Cannot Product Due to User\'s miscreancy in system\'s integrity');
+
+            return redirect()->back();
+        }
+
+        if($data['is_configurable'] == "false") {
+            $data['price'] = $this->product->findOneByField('id', $data['product'])->price;
+        } else {
+            $id = $data['selected_configurable_option'];
+
+            $data['price'] = $this->product->findOneByField('id', $data['selected_configurable_option'])->price;
+        }
+
         if(auth()->guard('customer')->check()) {
             Cart::add($id, $data);
         } else {
diff --git a/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
index 10f3d799d..210e95017 100644
--- a/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
+++ b/packages/Webkul/Cart/src/Http/ViewComposers/CartComposer.php
@@ -9,6 +9,7 @@ use Webkul\Cart\Repositories\CartRepository;
 
 use Webkul\Cart\Repositories\CartItemRepository;
 
+
 use Cookie;
 use Cart;
 /**
diff --git a/packages/Webkul/Cart/src/Repositories/CartRepository.php b/packages/Webkul/Cart/src/Repositories/CartRepository.php
index cca574045..2ba0cde9f 100644
--- a/packages/Webkul/Cart/src/Repositories/CartRepository.php
+++ b/packages/Webkul/Cart/src/Repositories/CartRepository.php
@@ -63,9 +63,8 @@ class CartRepository extends Repository
      *
      * @return Mixed
     */
-    public function attach($cart_id, $product_id, $quantity) {
-
-        return $this->model->findOrFail($cart_id)->with_products()->attach($cart_id, ['product_id' => $product_id, 'cart_id' => $cart_id, 'quantity' => $quantity]);
+    public function attach($cart_id, $product_id, $quantity, $price) {
+        return $this->model->findOrFail($cart_id)->with_products()->attach($cart_id, ['product_id' => $product_id, 'cart_id' => $cart_id, 'quantity' => $quantity, 'price' => $price]);
 
     }
 

From 31ae7c025e08eb889ac83818c7a0188bfb960c65 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 20 Sep 2018 15:31:51 +0530
Subject: [PATCH 3/5] Check process

---
 composer.json                                 |    6 +-
 config/app.php                                |    1 +
 config/carriers.php                           |    7 +-
 config/paymentmethods.php                     |   13 +
 .../2018_09_05_150444_create_cart_table.php   |    0
 ...9_05_150915_create_cart_products_table.php |    0
 .../2018_09_19_092845_create_cart_address.php |   43 +
 .../2018_09_19_093453_create_cart_payment.php |   34 +
 ...2018_09_19_093508_create_cart_shipping.php |   41 +
 .../Http/Controllers/CheckoutController.php   |   32 +-
 packages/Webkul/Cart/src/Models/Cart.php      |   19 +-
 .../Webkul/Cart/src/Models/CartAddress.php    |   10 +
 .../Webkul/Cart/src/Models/CartShipping.php   |   10 +
 ..._09_20_060658_create_core_config_table.php |   34 +
 .../src/Providers/CoreServiceProvider.php     |    1 +
 packages/Webkul/Payment/Payment.php           |   32 +
 packages/Webkul/Payment/composer.json         |   27 +
 .../Webkul/Payment/src/Facades/Payment.php    |   18 +
 packages/Webkul/Payment/src/Http/helpers.php  |   10 +
 .../Payment/src/Payment/CashOnDelivery.php    |   13 +
 .../Webkul/Payment/src/Payment/Payment.php    |   71 +
 .../src/Providers/PaymentServiceProvider.php  |   46 +
 .../Webkul/Product/src/Models/Product.php     |    2 +-
 .../src/Models/ProductAttributeValue.php      |    2 +-
 .../src/Carriers/AbstractShipping.php         |   82 +
 .../Webkul/Shipping/src/Carriers/FlatRate.php |   36 +-
 .../src/Contracts/AbstractShipping.php        |   15 -
 .../Webkul/Shipping/src/Facades/Shipping.php  |   18 +
 packages/Webkul/Shipping/src/Helpers/Rate.php |   29 -
 packages/Webkul/Shipping/src/Http/helpers.php |   10 +
 .../src/Providers/ShippingServiceProvider.php |   20 +-
 packages/Webkul/Shipping/src/Shipping.php     |   29 +
 packages/Webkul/Shop/src/Http/routes.php      |    6 +
 .../Shop/src/Resources/assets/sass/app.scss   | 1135 +------
 .../Webkul/Shop/src/Resources/lang/en/app.php |    3 +-
 .../views/checkout/onepage.blade.php          |  121 +-
 .../checkout/onepage/customer-info.blade.php  |   44 +-
 .../views/checkout/onepage/shipping.blade.php |   26 +
 public/themes/default/assets/css/shop.css     |  848 +----
 public/themes/default/assets/js/shop.js       | 2801 +++++++++++++----
 40 files changed, 3161 insertions(+), 2534 deletions(-)
 create mode 100644 config/paymentmethods.php
 rename packages/Webkul/Cart/src/Database/{migrations => Migrations}/2018_09_05_150444_create_cart_table.php (100%)
 rename packages/Webkul/Cart/src/Database/{migrations => Migrations}/2018_09_05_150915_create_cart_products_table.php (100%)
 create mode 100644 packages/Webkul/Cart/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
 create mode 100644 packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php
 create mode 100644 packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093508_create_cart_shipping.php
 create mode 100644 packages/Webkul/Cart/src/Models/CartAddress.php
 create mode 100644 packages/Webkul/Cart/src/Models/CartShipping.php
 create mode 100644 packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php
 create mode 100644 packages/Webkul/Payment/Payment.php
 create mode 100644 packages/Webkul/Payment/composer.json
 create mode 100644 packages/Webkul/Payment/src/Facades/Payment.php
 create mode 100644 packages/Webkul/Payment/src/Http/helpers.php
 create mode 100644 packages/Webkul/Payment/src/Payment/CashOnDelivery.php
 create mode 100644 packages/Webkul/Payment/src/Payment/Payment.php
 create mode 100644 packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php
 create mode 100644 packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
 delete mode 100644 packages/Webkul/Shipping/src/Contracts/AbstractShipping.php
 create mode 100644 packages/Webkul/Shipping/src/Facades/Shipping.php
 delete mode 100644 packages/Webkul/Shipping/src/Helpers/Rate.php
 create mode 100644 packages/Webkul/Shipping/src/Http/helpers.php
 create mode 100644 packages/Webkul/Shipping/src/Shipping.php

diff --git a/composer.json b/composer.json
index 0a58b0e6c..cc67bf6ff 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,8 @@
         "webkul/laravel-product": "self.version",
         "webkul/laravel-shop": "self.version",
         "webkul/laravel-theme": "self.version",
-        "webkul/laravel-shipping": "self.version"
+        "webkul/laravel-shipping": "self.version",
+        "webkul/laravel-payment": "self.version"
     },
     "autoload": {
         "classmap": [
@@ -61,7 +62,8 @@
             "Webkul\\Inventory\\": "packages/Webkul/Inventory/src",
             "Webkul\\Product\\": "packages/Webkul/Product/src",
             "Webkul\\Theme\\": "packages/Webkul/Theme/src",
-            "Webkul\\Shipping\\": "packages/Webkul/Shipping/src"
+            "Webkul\\Shipping\\": "packages/Webkul/Shipping/src",
+            "Webkul\\Payment\\": "packages/Webkul/Payment/src"
         }
     },
     "autoload-dev": {
diff --git a/config/app.php b/config/app.php
index c0f4ca1dd..fd2e405f9 100644
--- a/config/app.php
+++ b/config/app.php
@@ -192,6 +192,7 @@ return [
         Webkul\Theme\Providers\ThemeServiceProvider::class,
         Webkul\Cart\Providers\CartServiceProvider::class,
         Webkul\Shipping\Providers\ShippingServiceProvider::class,
+        Webkul\Payment\Providers\PaymentServiceProvider::class,
     ],
 
     /*
diff --git a/config/carriers.php b/config/carriers.php
index 87ef4edc0..f088f4172 100644
--- a/config/carriers.php
+++ b/config/carriers.php
@@ -5,12 +5,9 @@ return [
         'code' => 'flatrate',
         'title' => 'Flatrate',
         'description' => 'This is a flat rate',
-        'status' => '1',
+        'active' => true,
         'default_rate' => '10',
-        'type' => [
-                'per_unit' => 'Per Unit',
-                'per order' => 'Per Order',
-            ],
+        'type' => 'per_unit',
         'class' => 'Webkul\Shipping\Carriers\FlatRate',
     ]
 ];
diff --git a/config/paymentmethods.php b/config/paymentmethods.php
new file mode 100644
index 000000000..9b63a0c10
--- /dev/null
+++ b/config/paymentmethods.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'cashondelivery' => [
+        'code' => 'cashondelivery',
+        'title' => 'Cash On Delivery',
+        'class' => 'Webkul\Payment\Payment\Payment',
+        'order_status' => 'Pending',
+        'active' => true
+    ]
+];
+
+?>
\ No newline at end of file
diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150444_create_cart_table.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150444_create_cart_table.php
similarity index 100%
rename from packages/Webkul/Cart/src/Database/migrations/2018_09_05_150444_create_cart_table.php
rename to packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150444_create_cart_table.php
diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_products_table.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php
similarity index 100%
rename from packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_products_table.php
rename to packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php
diff --git a/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_092845_create_cart_address.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
new file mode 100644
index 000000000..070ea4609
--- /dev/null
+++ b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_092845_create_cart_address.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCartAddress extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cart_address', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('address1');
+            $table->string('address2')->nullable();
+            $table->string('country');
+            $table->string('state');
+            $table->string('city');
+            $table->integer('postcode');
+            $table->string('phone');
+            $table->string('address_type');
+            $table->integer('cart_id')->nullable()->unsigned();
+            $table->foreign('cart_id')->references('id')->on('cart');
+            $table->integer('customer_id')->nullable()->unsigned();
+            $table->foreign('customer_id')->references('id')->on('customers');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('cart_address');
+    }
+}
diff --git a/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php
new file mode 100644
index 000000000..9521ad2b6
--- /dev/null
+++ b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093453_create_cart_payment.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCartPayment extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cart_payment', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('method');
+            $table->integer('cart_id')->nullable()->unsigned();
+            $table->foreign('cart_id')->references('id')->on('cart');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('cart_payment');
+    }
+}
diff --git a/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093508_create_cart_shipping.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093508_create_cart_shipping.php
new file mode 100644
index 000000000..9413012ae
--- /dev/null
+++ b/packages/Webkul/Cart/src/Database/Migrations/2018_09_19_093508_create_cart_shipping.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCartShipping extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('cart_shipping', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('carrier');
+            $table->string('carrier_title');
+            $table->string('method');
+            $table->string('method_title');
+            $table->string('method_description')->nullable();
+            $table->double('price')->nullable();
+            $table->integer('cart_id')->nullable()->unsigned();
+            $table->foreign('cart_id')->references('id')->on('cart');
+            $table->integer('cart_address_id')->nullable()->unsigned();
+            $table->foreign('cart_address_id')->references('id')->on('cart_address');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('cart_shipping');
+    }
+}
diff --git a/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php
index b763fc1e9..058b8ac5b 100644
--- a/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php
+++ b/packages/Webkul/Cart/src/Http/Controllers/CheckoutController.php
@@ -5,6 +5,7 @@ use Illuminate\Routing\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Auth;
+use Webkul\Shipping\Facades\Shipping;
 
 /**
  * Chekout controller for the customer
@@ -15,7 +16,6 @@ use Auth;
  */
 class CheckoutController extends Controller
 {
-
     /**
      * Contains route related configuration
      *
@@ -43,4 +43,34 @@ class CheckoutController extends Controller
         return view($this->_config['view']);
     }
 
+    /**
+     * Saves customer address.
+     *
+     * @return \Illuminate\Http\Response
+    */
+    public function saveAddress()
+    {
+
+        return response()->json([
+                'shipping' => Shipping::collectRates()
+            ]);
+    }
+
+    /**
+     * Saves shipping method.
+     *
+     * @return \Illuminate\Http\Response
+    */
+    public function saveShipping()
+    {
+    }
+
+    /**
+     * Saves payment method.
+     *
+     * @return \Illuminate\Http\Response
+    */
+    public function saveAPayment()
+    {
+    }
 }
\ 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 f1591cdb4..78c3c4152 100644
--- a/packages/Webkul/Cart/src/Models/Cart.php
+++ b/packages/Webkul/Cart/src/Models/Cart.php
@@ -3,8 +3,9 @@
 namespace Webkul\Cart\Models;
 
 use Illuminate\Database\Eloquent\Model;
-
 use Webkul\Product\Models\Product;
+use Webkul\Cart\Models\CartAddress;
+use Webkul\Cart\Models\CartShipping;
 
 class Cart extends Model
 {
@@ -18,4 +19,20 @@ class Cart extends Model
 
         return $this->belongsToMany(Product::class, 'cart_products')->withPivot('id', 'product_id','quantity', 'cart_id');
     }
+
+    /**
+     * Get the addresses for the cart.
+     */
+    public function addresses()
+    {
+        return $this->hasMany(CartAddress::class);
+    }
+
+    /**
+     * Get the shipping for the cart.
+     */
+    public function shipping()
+    {
+        return $this->hasMany(CartShipping::class);
+    }
 }
diff --git a/packages/Webkul/Cart/src/Models/CartAddress.php b/packages/Webkul/Cart/src/Models/CartAddress.php
new file mode 100644
index 000000000..5ecad6830
--- /dev/null
+++ b/packages/Webkul/Cart/src/Models/CartAddress.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\Cart\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CartAddress extends Model
+{
+    
+}
diff --git a/packages/Webkul/Cart/src/Models/CartShipping.php b/packages/Webkul/Cart/src/Models/CartShipping.php
new file mode 100644
index 000000000..fd1cc7f76
--- /dev/null
+++ b/packages/Webkul/Cart/src/Models/CartShipping.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webkul\Cart\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CartShipping extends Model
+{
+    
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php b/packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php
new file mode 100644
index 000000000..3f287656d
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2018_09_20_060658_create_core_config_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateCoreConfigTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('core_config', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('code');
+            $table->string('value');
+            $table->integer('channel_id')->unsigned();
+            $table->foreign('channel_id')->references('id')->on('channels')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('core_config');
+    }
+}
diff --git a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
index 2c036ddca..f0d7e4113 100644
--- a/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
+++ b/packages/Webkul/Core/src/Providers/CoreServiceProvider.php
@@ -33,6 +33,7 @@ class CoreServiceProvider extends ServiceProvider
         Validator::extend('slug', 'Webkul\Core\Contracts\Validations\Slug@passes');
         Validator::extend('code', 'Webkul\Core\Contracts\Validations\Code@passes');
     }
+    
     /**
      * Register services.
      *
diff --git a/packages/Webkul/Payment/Payment.php b/packages/Webkul/Payment/Payment.php
new file mode 100644
index 000000000..543172f86
--- /dev/null
+++ b/packages/Webkul/Payment/Payment.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Webkul\Payment;
+
+use Illuminate\Support\Facades\Config;
+
+class Payment
+{
+    /**
+     * Returns all supported payment methods
+     *
+     * @return array
+     */
+    public function getSupportedPaymentMethods()
+    {
+        $paymentMethods = [];
+
+        foreach (Config::get('paymentmethods') as $paymentMethod) {
+            if($paymentMethod['active']) {
+                $object = new $paymentMethod['class'];
+
+                $paymentMethods[] = [
+                    'code' => $object->getCode(),
+                    'title' => $object->getTitle(),
+                    'description' => $object->getDescription(),
+                ];
+            }
+        }
+
+        return $paymentMethods;
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Payment/composer.json b/packages/Webkul/Payment/composer.json
new file mode 100644
index 000000000..7806912d2
--- /dev/null
+++ b/packages/Webkul/Payment/composer.json
@@ -0,0 +1,27 @@
+{
+    "name": "webkul/laravel-payment",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Jitendra Singh",
+            "email": "jitendra@webkul.com"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "Webkul\\Payment\\": "src/"
+        }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Webkul\\Payment\\Providers\\PaymentServiceProvider"
+            ],
+            "aliases": {
+                "Bouncer": "Webkul\\Payment\\Facades\\Bouncer"
+            }
+        }
+    },
+    "minimum-stability": "dev"
+}
diff --git a/packages/Webkul/Payment/src/Facades/Payment.php b/packages/Webkul/Payment/src/Facades/Payment.php
new file mode 100644
index 000000000..ee919d03b
--- /dev/null
+++ b/packages/Webkul/Payment/src/Facades/Payment.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Webkul\Payment\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Payment extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'payment';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Payment/src/Http/helpers.php b/packages/Webkul/Payment/src/Http/helpers.php
new file mode 100644
index 000000000..eeca421de
--- /dev/null
+++ b/packages/Webkul/Payment/src/Http/helpers.php
@@ -0,0 +1,10 @@
+<?php
+    use Webkul\Payment\Payment;
+    
+    if (! function_exists('payment')) {
+        function payment()
+        {
+            return new Payment;
+        }
+    }
+?>
\ No newline at end of file
diff --git a/packages/Webkul/Payment/src/Payment/CashOnDelivery.php b/packages/Webkul/Payment/src/Payment/CashOnDelivery.php
new file mode 100644
index 000000000..8db87b36f
--- /dev/null
+++ b/packages/Webkul/Payment/src/Payment/CashOnDelivery.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Webkul\Payment\Payment;
+
+class CashOnDelivery extends Payment
+{
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    protected $code  = 'cashondelivery';
+}
\ No newline at end of file
diff --git a/packages/Webkul/Payment/src/Payment/Payment.php b/packages/Webkul/Payment/src/Payment/Payment.php
new file mode 100644
index 000000000..d30347621
--- /dev/null
+++ b/packages/Webkul/Payment/src/Payment/Payment.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Webkul\Payment\Payment;
+
+use Illuminate\Support\Facades\Config;
+
+abstract class Payment
+{
+    /**
+     * Checks if payment method is available
+     *
+     * @return array
+     */
+    public function isAvailable()
+    {
+        return $this->getConfigData('active');
+    }
+
+    /**
+     * Returns payment method code
+     *
+     * @return array
+     */
+    public function getCode()
+    {
+        if (empty($this->code)) {
+            // throw exception
+        }
+
+        return $this->_code;
+    }
+
+    /**
+     * Returns payment method title
+     *
+     * @return array
+     */
+    public function getTitle()
+    {
+        return $this->getConfigData('title');
+    }
+
+    /**
+     * Returns payment method decription
+     *
+     * @return array
+     */
+    public function getDecription()
+    {
+        return $this->getConfigData('decription');
+    }
+
+    /**
+     * Retrieve information from payment configuration
+     *
+     * @param string $field
+     * @param int|string|null $channelId
+     *
+     * @return mixed
+     */
+    public function getConfigData($field, $channelId = null)
+    {
+        if (null === $channelId) {
+            $channelId = core()->getCurrentChannel()->getId();
+        }
+
+        $paymentConfig = Config::get('paymentmethods' . $this->getCode());
+
+        return $paymentConfig[$field];
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php b/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php
new file mode 100644
index 000000000..2bd28d181
--- /dev/null
+++ b/packages/Webkul/Payment/src/Providers/PaymentServiceProvider.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Webkul\Payment\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use Illuminate\Foundation\AliasLoader;
+use Illuminate\Routing\Router;
+use Webkul\Payment\Payment;
+use Webkul\Payment\Facades\Payment as PaymentFacade;
+
+class PaymentServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot(Router $router)
+    {
+        include __DIR__ . '/../Http/helpers.php';
+    }
+    
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->registerFacades();
+    }
+    /**
+     * Register Bouncer as a singleton.
+     *
+     * @return void
+     */
+    protected function registerFacades()
+    {
+        $loader = AliasLoader::getInstance();
+        $loader->alias('payment', PaymentFacade::class);
+
+        $this->app->singleton('payment', function () {
+            return new Payment();
+        });
+    }
+}
diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php
index 1ca1cf59c..73c475242 100644
--- a/packages/Webkul/Product/src/Models/Product.php
+++ b/packages/Webkul/Product/src/Models/Product.php
@@ -157,7 +157,7 @@ class Product extends Model
      * @return mixed
      */
     public function getAttribute($key)
-    {   
+    {
         if (!method_exists(self::class, $key) && !in_array($key, ['parent_id', 'attribute_family_id']) && !isset($this->attributes[$key])) {
             if (isset($this->id) && $this->isCustomAttribute($key)) {
                 $this->attributes[$key] = '';
diff --git a/packages/Webkul/Product/src/Models/ProductAttributeValue.php b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
index 828664442..6eb459ae3 100644
--- a/packages/Webkul/Product/src/Models/ProductAttributeValue.php
+++ b/packages/Webkul/Product/src/Models/ProductAttributeValue.php
@@ -23,7 +23,7 @@ class ProductAttributeValue extends Model
         'boolean' => 'boolean_value',
         'select' => 'integer_value',
         'multiselect' => 'text_value',
-        'datetime' => 'datetime_time',
+        'datetime' => 'datetime_value',
         'date' => 'date_value',
     ];
 
diff --git a/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php b/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
new file mode 100644
index 000000000..8c2690dfd
--- /dev/null
+++ b/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Webkul\Shipping\Carriers;
+
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Abstract class Shipping
+ *
+ * @author    Jitendra Singh <jitendra@webkul.com>
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+abstract class AbstractShipping
+{
+
+    abstract public function calculate();
+
+    /**
+     * Checks if payment method is available
+     *
+     * @return array
+     */
+    public function isAvailable()
+    {
+        return $this->getConfigData('active');
+    }
+
+    /**
+     * Returns payment method code
+     *
+     * @return array
+     */
+    public function getCode()
+    {
+        if (empty($this->code)) {
+            // throw exception
+        }
+
+        return $this->code;
+    }
+
+    /**
+     * Returns payment method title
+     *
+     * @return array
+     */
+    public function getTitle()
+    {
+        return $this->getConfigData('title');
+    }
+
+    /**
+     * Returns payment method decription
+     *
+     * @return array
+     */
+    public function getDecription()
+    {
+        return $this->getConfigData('decription');
+    }
+
+    /**
+     * Retrieve information from payment configuration
+     *
+     * @param string $field
+     * @param int|string|null $channelId
+     *
+     * @return mixed
+     */
+    public function getConfigData($field, $channelId = null)
+    {
+        if (null === $channelId) {
+            $channelId = core()->getCurrentChannel()->id;
+        }
+
+        $shippingConfig = Config::get('carriers' . $this->getCode());
+
+        return $shippingConfig[$field];
+    }
+
+}
+?>
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Carriers/FlatRate.php b/packages/Webkul/Shipping/src/Carriers/FlatRate.php
index ba3faa6c7..ec9a1457c 100644
--- a/packages/Webkul/Shipping/src/Carriers/FlatRate.php
+++ b/packages/Webkul/Shipping/src/Carriers/FlatRate.php
@@ -2,8 +2,8 @@
 
 namespace Webkul\Shipping\Carriers;
 
-use Webkul\Shipping\Contracts\AbstractShipping;
 use Config;
+use Webkul\Cart\Models\CartShipping;
 
 /**
  * Class Rate.
@@ -11,8 +11,40 @@ use Config;
  */
 class FlatRate extends AbstractShipping
 {
+    /**
+     * Payment method code
+     *
+     * @var string
+     */
+    protected $code  = 'flatrate';
+
     public function calculate()
     {
-        return [];
+        return [
+            'carrier_code' => 'flatrate',
+            'carrier_title' => 'Flat Rate',
+            'carrier_description' => '',
+            'rates' => [
+                [
+                    'method' => 'flatrate_flatrate',
+                    'method_title' => 'Flat Rate',
+                    'price' => 10,
+                    'price_formated' => core()->currency(10),
+                ]
+            ]
+        ];
+        
+        $object = new CartShipping;
+
+        $object->carrier = 'flatrate_flatrate';
+        $object->carrier_title = $this->getConfigData('description');
+        $object->method = 'flatrate';
+        $object->method_title = $this->getConfigData('title');
+        $object->method_description = $this->getConfigData('description');
+        $object->price = 10;
+
+        return [
+                'flatrate' => [$object]
+            ];
     }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Contracts/AbstractShipping.php b/packages/Webkul/Shipping/src/Contracts/AbstractShipping.php
deleted file mode 100644
index bce60f009..000000000
--- a/packages/Webkul/Shipping/src/Contracts/AbstractShipping.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Webkul\Shipping\Contracts;
-
-/**
- * Abstract class Shipping
- * @author Rahul Shukla <rahulshukla.symfony517@webkul.com>
- */
-abstract class AbstractShipping
-{
-
-    abstract public function calculate();
-
-}
-?>
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Facades/Shipping.php b/packages/Webkul/Shipping/src/Facades/Shipping.php
new file mode 100644
index 000000000..65ba5ad85
--- /dev/null
+++ b/packages/Webkul/Shipping/src/Facades/Shipping.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Webkul\Shipping\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Shipping extends Facade
+{
+    /**
+     * Get the registered name of the component.
+     *
+     * @return string
+     */
+    protected static function getFacadeAccessor()
+    {
+        return 'shipping';
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Helpers/Rate.php b/packages/Webkul/Shipping/src/Helpers/Rate.php
deleted file mode 100644
index 826155dc8..000000000
--- a/packages/Webkul/Shipping/src/Helpers/Rate.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Webkul\Shipping\Helper;
-
-use Illuminate\Support\Facades\Config;
-
-/**
- * Class Rate.
- *
- */
-class Rate
-{
-    public function collectRates()
-    {
-        $rates = [];
-
-        $shippingMethods = Config::get('carriers');
-
-        foreach($shippingMethods as $shippingMethod) {
-            $object = new $shippingMethod['class'];
-
-            if($rate = $object->calculate()) {
-                $rates[] = $rate;
-            }
-        }
-
-        return $rates;
-    }
-}
\ No newline at end of file
diff --git a/packages/Webkul/Shipping/src/Http/helpers.php b/packages/Webkul/Shipping/src/Http/helpers.php
new file mode 100644
index 000000000..93a8f1baa
--- /dev/null
+++ b/packages/Webkul/Shipping/src/Http/helpers.php
@@ -0,0 +1,10 @@
+<?php
+    use Webkul\Shipping\Shipping;
+    
+    if (! function_exists('shipping')) {
+        function shipping()
+        {
+            return new Shipping;
+        }
+    }
+?>
\ 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 4757cce0d..f7a29055d 100644
--- a/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php
+++ b/packages/Webkul/Shipping/src/Providers/ShippingServiceProvider.php
@@ -3,8 +3,11 @@
 namespace Webkul\Shipping\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Foundation\AliasLoader;
 use Illuminate\Routing\Router;
 use Webkul\Customer\Http\Middleware\RedirectIfNotCustomer;
+use Webkul\Shipping\Shipping;
+use Webkul\Shipping\Facades\Shipping as ShippingFacade;
 
 class ShippingServiceProvider extends ServiceProvider
 {
@@ -15,8 +18,9 @@ class ShippingServiceProvider extends ServiceProvider
      */
     public function boot(Router $router)
     {
+        include __DIR__ . '/../Http/helpers.php';
     }
-
+    
     /**
      * Register services.
      *
@@ -24,6 +28,20 @@ class ShippingServiceProvider extends ServiceProvider
      */
     public function register()
     {
+        $this->registerFacades();
+    }
+    /**
+     * Register Bouncer as a singleton.
+     *
+     * @return void
+     */
+    protected function registerFacades()
+    {
+        $loader = AliasLoader::getInstance();
+        $loader->alias('shipping', ShippingFacade::class);
 
+        $this->app->singleton('shipping', function () {
+            return new Shipping();
+        });
     }
 }
diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php
new file mode 100644
index 000000000..d0d2f9642
--- /dev/null
+++ b/packages/Webkul/Shipping/src/Shipping.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Webkul\Shipping;
+
+use Illuminate\Support\Facades\Config;
+
+/**
+ * Class Shipping.
+ *
+ */
+class Shipping
+{
+    public function collectRates()
+    {
+        $rates = [];
+
+        foreach(Config::get('carriers') as $shippingMethod) {
+            $object = new $shippingMethod['class'];
+
+            // if($object->isAvailable()) {
+                $rates[] = $object->calculate();
+            // }
+        }
+
+        return $rates;
+
+        // return view('shop::checkout.onepage.shipping', compact('rates'));
+    }
+}
\ 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 7d8361989..5c043fa0a 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -14,6 +14,12 @@ Route::group(['middleware' => ['web']], function () {
         'view' => 'shop::checkout.onepage'
     ])->name('shop.checkout');
 
+    Route::post('/checkout/save-address', 'Webkul\Cart\Http\Controllers\CheckoutController@saveAddress')->name('shop.checkout.save-address');
+
+    Route::post('/checkout/save-shipping', 'Webkul\Cart\Http\Controllers\CheckoutController@saveShipping')->name('shop.checkout.save-shipping');
+
+    Route::post('/checkout/save-payment', 'Webkul\Cart\Http\Controllers\CheckoutController@savePayment')->name('shop.checkout.save-payment');
+
     /* dummy routes ends here */
 
 
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index 16a6e521e..554d6f408 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -758,7 +758,7 @@ section.slider-block {
                 }
 
                 .filter-attributes-title .icon {
-                    background-image: url('../images//arrow-up.svg') !important;
+                    background-image: url('../images/arrow-up.svg') !important;
                 }
             }
         }
@@ -1515,162 +1515,73 @@ section.product-detail {
                     font-size: 16px;
                 }
             }
-
-            // .rating-reviews {
-            //     margin-top: 0px;
-            //     width: 50%;
-            //     margin-left: 20px;
-
-            //     .title-inline {
-            //         display: inline-flex;
-            //         align-items: center;
-            //         justify-content: space-between;
-            //         margin-bottom: 20px;
-            //         width: 100%;
-
-            //         button {
-            //             float: right;
-            //             border-radius: 0px !important;
-            //         }
-            //     }
-
-            //     .overall {
-            //         display: flex;
-            //         flex-direction: row;
-            //         align-items: center;
-            //         justify-content: space-between;
-            //         height: 150px;
-
-            //         .left-side {
-            //             margin-bottom: 20px;
-
-            //             .number{
-            //                 font-size: 34px;
-            //             }
-            //         }
-
-            //         .right-side {
-            //             display: block;
-
-            //             .rater {
-            //                 display: inline-flex;
-            //                 align-items: center;
-
-            //                 .star {
-            //                     width: 50px;
-            //                     height: 20px;
-            //                     padding: 1px;
-            //                     margin-right: 8px;
-            //                 }
-
-            //                 .line-bar {
-            //                     height: 4px;
-            //                     width: 158px;
-            //                     margin-right: 12px;
-            //                     background: $bar-color;
-
-            //                     .line-value {
-            //                         background-color: $dark-blue-shade;
-            //                     }
-            //                 }
-            //             }
-            //         }
-            //     }
-
-            //     .reviews {
-            //         margin-top: 34px;
-            //         margin-bottom: 90px;
-
-            //         .review {
-            //             margin-bottom: 25px;
-
-            //             .title {
-            //                 margin-bottom: 5px;
-            //             }
-
-            //             .stars {
-            //                 margin-bottom: 15px;
-            //             }
-            //             .message {
-            //                 margin-bottom: 10px;
-            //             }
-            //         }
-            //         .view-all {
-            //             margin-top:15px;
-            //             color: $logo-color;
-            //             margin-bottom:15px;
-            //         }
-            //     }
-            // }
-
-
         }
     }
 }
 
-// .rating-reviews {
+.rating-reviews {
 
-//     .rating-header {
-//         font-weight: 600;
-//         padding: 20px 0;
-//     }
+    .rating-header {
+        font-weight: 600;
+        padding: 20px 0;
+    }
 
-//     .stars {
-//         .icon {
-//             width: 16px;
-//             height: 16px;
-//         }
-//     }
+    .stars {
+        .icon {
+            width: 16px;
+            height: 16px;
+        }
+    }
 
-//     .overall {
-//         display: flex;
-//         flex-direction: row;
-//         align-items: center;
-//         justify-content: space-between;
+    .overall {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
 
-//         .review-info {
-//             .number {
-//                 font-size: 34px;
-//             }
+        .review-info {
+            .number {
+                font-size: 34px;
+            }
 
-//             .total-reviews {
-//                 margin-top: 10px;
-//             }
-//         }
-//     }
+            .total-reviews {
+                margin-top: 10px;
+            }
+        }
+    }
 
-//     .reviews {
-//         margin-top: 40px;
-//         margin-bottom: 40px;
+    .reviews {
+        margin-top: 40px;
+        margin-bottom: 40px;
 
-//         .review {
-//             margin-bottom: 25px;
+        .review {
+            margin-bottom: 25px;
 
-//             .title {
-//                 margin-bottom: 5px;
-//             }
+            .title {
+                margin-bottom: 5px;
+            }
 
-//             .stars {
-//                 margin-bottom: 15px;
-//                 display: inline-block;
-//             }
+            .stars {
+                margin-bottom: 15px;
+                display: inline-block;
+            }
 
-//             .message {
-//                 margin-bottom: 10px;
-//             }
+            .message {
+                margin-bottom: 10px;
+            }
 
-//             .reviewer-details {
-//                 color: #5E5E5E;
-//             }
-//         }
+            .reviewer-details {
+                color: #5E5E5E;
+            }
+        }
 
-//         .view-all {
-//             margin-top:15px;
-//             color: $logo-color;
-//             margin-bottom:15px;
-//         }
-//     }
-// }
+        .view-all {
+            margin-top:15px;
+            color: $logo-color;
+            margin-bottom:15px;
+        }
+    }
+}
 
 /* cart pages and elements css begins here */
 section.cart {
@@ -2202,572 +2113,8 @@ section.cart {
 
 // oder page css end here
 
-// responsive order page css start here
-
-@media all and (max-width: 480px) {
-
-    .order {
-        margin-left: 0%;
-
-        .order-section-head {
-            display: none;
-        }
-
-        .order-section-head-small {
-            display: block;
-            margin-top: -15px;
-
-            span {
-                display:inline-block;
-                width:33.3%;
-            }
-
-            .icon {
-                float: left;
-
-                img {
-                    margin-top: 11px;
-                }
-            }
-
-            .order-number {
-                text-align: center;
-                font-size: 16px;
-                color: #242424;
-                letter-spacing: -0.38px;
-                text-align: center;
-                margin-top: 13px;
-                margin-bottom: 13px;
-            }
-
-            .cancel {
-                float: right;
-                text-align: right;
-                font-size: 17px;
-                color: #0031F0;
-                letter-spacing: -0.11px;
-                margin-top: 13px;
-                margin-bottom: 13px;
-            }
-
-            .horizon-rule {
-                border: .5px solid #E8E8E8;
-                width: 150%;
-                margin-left: -10%;
-                margin-right: -10%;
-            }
-        }
-
-        .payment-place {
-            font-size: 16px;
-            color: $profile-content-color;
-            margin-top: 4%;
-
-            .placed-on {
-                display: flex;
-                flex-direction: column;
-
-                .place-text {
-                    width:100%;
-
-                    span {
-                        font-size: 14px;
-                    }
-
-                    .processing {
-                        display: block;
-                        float: right;
-                        background: #2ED04C;
-                        height: 25px;
-                        border-radius: 100px;
-                        font-size: 14px;
-                        color: #FFFFFF;
-                        letter-spacing: -0.12px;
-                        width: 110px;
-                        text-align: center;
-                        padding-top: 3.5px;
-                        padding-left: 5px;
-                        margin-top: 3px;
-                    }
-                }
-
-                .place-date{
-                    margin-top: -5px;
-                }
-            }
-
-            .payment-status {
-                display: flex;
-                flex-direction: column;
-
-                .payment-text {
-
-                    span {
-                        font-size: 14px;
-                    }
-                }
-
-                .status {
-                    margin-top: 2px;
-                }
-            }
-
-            .horizontal-rule {
-                margin-top: 1.1%;
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: #e8e8e8;
-            }
-        }
-
-        .order-details{
-           display: none;
-        }
-
-        .total {
-            margin-top: 5%;
-            height: 130px;
-
-            .calculate {
-                width: 100%;
-                float: left;
-
-                .sub-total {
-
-                    .left {
-                        margin-left: 0px;
-                        width:100px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .ship-handle {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                       display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .discount {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .grand-total {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .due {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-            }
-        }
-
-        .horizontal-rule {
-            display: none;
-        }
-
-        .table {
-            display:none;
-        }
-
-        .product-config {
-            border: 1px solid #E8E8E8;
-            height: 19%;
-            width:100%;
-            margin-top: 10px;
-            display: block;
-
-            .product-attribute {
-                display: flex;
-                flex-direction: row;
-
-                .product-property {
-                    width: 30%;
-                    margin-top: 10px;
-                    margin-left: 5px;
-
-                    span {
-                        font-size: 14px;
-                        color: #5E5E5E;
-                        letter-spacing: -0.11px;
-                    }
-                }
-
-                .property-name {
-                    margin-top: 10px;
-                    width:50%;
-
-                    span {
-                        font-size: 16px;
-                        color: #5E5E5E;
-                        letter-spacing: -0.11px;
-                    }
-                }
-            }
-
-        }
-
-        .order-information {
-            flex-direction: column;
-
-            .order-address-method {
-                width : 250px;
-            }
-
-            .order-address-method:nth-child(3) {
-                margin-top: 10px;
-            }
-
-            .order-address-method:nth-child(2) {
-                margin-top: 10px;
-            }
-
-            .order-address-method:nth-child(4) {
-                margin-top: 10px;
-            }
-
-        }
-    }
-}
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-
-    .order {
-        margin-left: 0%;
-
-        .order-section-head {
-            display: none;
-        }
-
-        .order-section-head-small {
-            display: block;
-            margin-top: -15px;
-
-            span {
-                display:inline-block;
-                width:33.3%;
-            }
-
-            .icon {
-                float: left;
-
-                img {
-                    margin-top: 11px;
-                }
-            }
-
-            .order-number {
-                text-align: center;
-                font-size: 16px;
-                color: #242424;
-                letter-spacing: -0.38px;
-                text-align: center;
-                margin-top: 13px;
-                margin-bottom: 13px;
-            }
-
-            .cancel {
-                float: right;
-                text-align: right;
-                font-size: 17px;
-                color: #0031F0;
-                letter-spacing: -0.11px;
-                margin-top: 13px;
-                margin-bottom: 13px;
-            }
-
-            .horizon-rule {
-                border: .5px solid #E8E8E8;
-                width: 150%;
-                margin-left: -10%;
-                margin-right: -10%;
-            }
-        }
-
-        .payment-place {
-            font-size: 16px;
-            color: $profile-content-color;
-            margin-top: 4%;
-
-            .placed-on {
-                display: flex;
-                flex-direction: column;
-
-                .place-text {
-                    width:100%;
-
-                    span {
-                        font-size: 14px;
-                    }
-
-                    .processing {
-                        display: block;
-                        float: right;
-                        background: #2ED04C;
-                        height: 25px;
-                        border-radius: 100px;
-                        font-size: 14px;
-                        color: #FFFFFF;
-                        letter-spacing: -0.12px;
-                        width: 110px;
-                        text-align: center;
-                        padding-top: 3.5px;
-                        padding-left: 5px;
-                        margin-top: 3px;
-                    }
-                }
-
-                .place-date{
-                    margin-top: -5px;
-                }
-            }
-
-            .payment-status {
-                display: flex;
-                flex-direction: column;
-
-                .payment-text {
-
-                    span {
-                        font-size: 14px;
-                    }
-                }
-
-                .status {
-                    margin-top: 2px;
-                }
-            }
-
-            .horizontal-rule {
-                margin-top: 1.1%;
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: #e8e8e8;
-            }
-        }
-
-        .order-details{
-           display: none;
-        }
-
-        .total {
-            margin-top: 5%;
-            height: 130px;
-
-            .calculate {
-                width: 100%;
-                float: left;
-
-                .sub-total {
-
-                    .left {
-                        margin-left: 0px;
-                        width:100px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .ship-handle {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                       display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .discount {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .grand-total {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-
-                .due {
-
-                    .left {
-                        margin-left: 0px;
-                    }
-
-                    .middle {
-                        display: none;
-                    }
-
-                    .right {
-                        float:right;
-                        width:25%;
-                    }
-                }
-            }
-        }
-
-        .horizontal-rule {
-            display: none;
-        }
-
-        .table {
-            display:none;
-        }
-
-        .product-config {
-            border: 1px solid #E8E8E8;
-            height: 19%;
-            width:100%;
-            margin-top: 10px;
-            display: block;
-
-            .product-attribute {
-                display: flex;
-                flex-direction: row;
-
-                .product-property {
-                    width: 30%;
-                    margin-top: 10px;
-                    margin-left: 5px;
-
-                    span {
-                        font-size: 14px;
-                        color: #5E5E5E;
-                        letter-spacing: -0.11px;
-                    }
-                }
-
-                .property-name {
-                    margin-top: 10px;
-                    width:50%;
-
-                    span {
-                        font-size: 16px;
-                        color: #5E5E5E;
-                        letter-spacing: -0.11px;
-                    }
-                }
-            }
-
-        }
-
-        .order-information {
-            flex-direction: column;
-
-            .order-address-method {
-                width : 250px;
-            }
-
-            .order-address-method:nth-child(3) {
-                margin-top: 10px;
-            }
-
-            .order-address-method:nth-child(2) {
-                margin-top: 10px;
-            }
-
-            .order-address-method:nth-child(4) {
-                margin-top: 10px;
-            }
-
-        }
-    }
-
-}
-// responsive order css end here
-
 // checkout starts here
-.checkout-process{
+.checkout-process {
     display: flex;
     flex-direction: row;
     width: 100%;
@@ -2784,7 +2131,7 @@ section.cart {
             justify-content: space-between;
             width: 100%;
             padding-bottom: 15px;
-            border-bottom: 1px solid #E8E8E8;;
+            border-bottom: 1px solid #E8E8E8;
 
             li {
                 height: 48px;
@@ -2797,9 +2144,31 @@ section.cart {
                     border-radius: 50%;
                     display: inline-flex;
                     border: 1px solid #E8E8E8;
+                    background-repeat: no-repeat;
+                    background-position: center;
                     
-                    img {
-                        margin: auto;
+                    &.address-info {
+                        background-image: url('../images/address.svg');
+                    }
+                    
+                    &.shipping {
+                        background-image: url('../images/shipping.svg');
+                    }
+                    
+                    &.payment {
+                        background-image: url('../images/payment.svg');
+                    }
+                    
+                    &.review {
+                        background-image: url('../images/finish.svg');
+                    }
+                }
+
+                &.completed {
+                    cursor: pointer;
+
+                    .decorator {
+                        background-image: url('../images/complete.svg');
                     }
                 }
 
@@ -2841,6 +2210,12 @@ section.cart {
                 padding-top: 20px;
                 padding-bottom: 20px;
             }
+
+            .shipping-methods {
+                h4 {
+                    margin: 0;
+                }
+            }
         }
     }
 
@@ -2879,14 +2254,6 @@ section.cart {
                 }
             }
 
-            .horizontal-rule {
-                margin-top: 6%;
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: #e8e8e8;
-            }
-
             .payble-amount {
                 margin-top: 12px;
 
@@ -2901,7 +2268,6 @@ section.cart {
                     }
 
                     .right {
-
                         float:right;
                         font-size: 16px;
                         color: #242424;
@@ -2911,341 +2277,8 @@ section.cart {
         }
     }
 }
-
 // checkout ends here
 
-// responsive checkout start here
-
-@media all and (max-width: 480px) {
-    .checkout-process{
-        width: 100%;
-        margin-top: 3%;
-
-        .left-side {
-            width: 100%;
-            margin-right: 0%;
-            height: 60px;
-
-            .checkout-menu {
-                width: 100%;
-
-                ul.checkout-detail {
-                    height: 60px;
-                    width: 100%;
-                    padding: 5px;
-
-                    li {
-                        height: 48px;
-
-                        .wrapper {
-                            display: flex;
-
-                            span {
-                               display: none;
-                            }
-                        }
-                    }
-
-                    .line {
-                        margin-top: 23px;
-                        width: 100%;
-                        margin-left: 5px;
-                        margin-right: 5px;
-                        border: 1px solid #E7E7E7;
-                        height: 1px;
-                    }
-                }
-
-                .horizontal-rule {
-                   display: none;
-                }
-            }
-        }
-
-        .right-side {
-            display: none;
-        }
-    }
-
-    .order-info{
-        width: 100%;
-        margin-right: 0%;
-        margin-top: 10px;
-        height:50px;
-
-        .control-group {
-
-            .control{
-                width:100%;
-            }
-        }
-
-        .different-billing-addr {
-            margin-top: 5%;
-        }
-
-        .horizontal-rule {
-            margin-top: 10%;
-        }
-
-        .countinue-button {
-            margin-top: 8%;
-        }
-    }
-}
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-
-    .checkout-process{
-        width: 100%;
-        margin-top:3%;
-
-        .left-side {
-            width: 100%;
-            margin-right: 0%;
-            height: 60px;
-
-            .checkout-menu {
-                width: 100%;
-
-                ul.checkout-detail {
-                    height: 60px;
-                    width: 100%;
-                    padding: 5px;
-
-                    li {
-                        height: 48px;
-
-                        .wrapper {
-                            display:flex;
-
-                            span {
-                               display: none;
-                            }
-
-                        }
-                    }
-
-                    .line {
-                        margin-top: 23px;
-                        width: 100%;
-                        margin-left: 10px;
-                        margin-right: 10px;
-                        border: 1px solid #E7E7E7;
-                        height: 1px;
-                    }
-                }
-
-                .horizontal-rule {
-                   display: none;
-                }
-            }
-        }
-
-        .right-side {
-            display:none;
-        }
-    }
-
-    .order-info{
-        width: 100%;
-        margin-right: 0%;
-        margin-top: 10px;
-        height:50px;
-
-        .control-group {
-
-            .control{
-                width:100%;
-            }
-        }
-
-        .different-billing-addr {
-            margin-top: 3%;
-        }
-
-        .horizontal-rule {
-            margin-top: 10%;
-        }
-
-        .countinue-button {
-            margin-top: 5%;
-        }
-    }
-}
-// responsive checkout end here
-
-
-
-//shipment start here
-.ship-method {
-    width: 67%;
-    margin-right: 6%;
-    height: 600px;
-    margin-top: -190px;
-
-    .ship-info {
-
-        .ship-text{
-            font-size: 24px;
-            color: #242424;
-            letter-spacing: -0.58px;
-            font-weight: bold;
-        }
-    }
-
-    .ship-price {
-        margin-top: 31px;
-
-        .price-checkbox {
-            display:flex;
-
-            span {
-                margin-left: 8px;
-                font-size: 16px;
-                color: #242424;
-                line-height: 22px;
-                font-weight: bold;
-            }
-
-        }
-
-        .price-checkbox-text {
-            margin-left: 25px;
-            width:580px;
-            height:44px;
-            margin-top: 4px;
-
-            b {
-               font-size: 16px;
-            }
-
-            span {
-                font-size: 16px;
-                color: #242424;
-                line-height: 22px;
-            }
-        }
-
-
-    }
-
-    .horizontal-rule {
-        margin-top: 7%;
-        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;
-        }
-    }
-}
-//shipment end here
-
-// payment method start here
-.payment-method {
-    width: 67%;
-    margin-right: 6%;
-    height: 600px;
-    margin-top: -190px;
-
-    .payment-info {
-
-        .payment-text{
-            font-size: 24px;
-            color: #242424;
-            letter-spacing: -0.58px;
-            font-weight: bold;
-        }
-    }
-
-    .payment-price {
-        margin-top: 31px;
-
-        .payment-checkbox {
-            display:flex;
-
-            span {
-                margin-left: 8px;
-                font-size: 16px;
-                color: #242424;
-                line-height: 22px;
-                font-weight: bold;
-            }
-
-        }
-
-        .payment-checkbox-text {
-            margin-left: 25px;
-            width:580px;
-            height:44px;
-            margin-top: 4px;
-
-            b {
-               font-size: 16px;
-            }
-
-            span {
-                font-size: 16px;
-                color: #242424;
-                line-height: 22px;
-            }
-        }
-
-
-    }
-
-    .horizontal-rule {
-        margin-top: 7%;
-        width: 100%;
-        height: 1px;
-        vertical-align: middle;
-        background: #e8e8e8;
-    }
-
-    .countinue-button {
-        margin-top: 3%;
-
-        button {
-            background: #0031F0;
-            font-size: 14px; .horizontal-rule {
-                margin-top: 7%;
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: #e8e8e8;
-            }
-            color: #FFFFFF;
-            letter-spacing: -0.26px; .horizontal-rule {
-                margin-top: 7%;
-                width: 100%;
-                height: 1px;
-                vertical-align: middle;
-                background: #e8e8e8;
-            }
-            text-align: center;
-            height: 38px;
-            width: 137px;
-            border: none;
-        }
-    }
-}
-// payment method end here
-
-
 // complete page start here
 .complete-page{
     width:880px;
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 13b6216bc..7c8d171eb 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -84,7 +84,8 @@ return [
             'order-summary' => 'Order Summary',
             'shipping-address' => 'Shipping Address',
             'use_for_shipping' => 'Ship to this address',
-            'continue' => 'Continue'
+            'continue' => 'Continue',
+            'shipping-method' => 'Shipping Method'
         ]
     ]
 ];
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
index dbb4cb629..40a6ae6f7 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage.blade.php
@@ -18,40 +18,28 @@
             <div class="col-main">
 
                 <ul class="checkout-steps">
-                    <li class="active">
-                        <div class="decorator">
-                            <img src="{{ bagisto_asset('images/address.svg') }}" />
-                        </div>
-                        
+                    <li class="active" :class="[completedStep >= 0 ? 'active' : '', completedStep > 0 ? 'completed' : '']" @click="navigateToStep(1)">
+                        <div class="decorator address-info"></div>
                         <span>{{ __('shop::app.checkout.onepage.information') }}</span>
                     </li>
                     
-                    <li>
-                        <div class="decorator">
-                            <img src="{{ bagisto_asset('images/shipping.svg') }}" />
-                        </div>
-                        
+                    <li :class="[currentStep == 2 || completedStep > 1 ? 'active' : '', completedStep > 1 ? 'completed' : '']" @click="navigateToStep(2)">
+                        <div class="decorator shipping"></div>
                         <span>{{ __('shop::app.checkout.onepage.shipping') }}</span>
                     </li>
                     
-                    <li>
-                        <div class="decorator">
-                            <img src="{{ bagisto_asset('images/payment.svg') }}" />
-                        </div>
-                        
+                    <li :class="[currentStep == 3 || completedStep > 2 ? 'active' : '', completedStep > 2 ? 'completed' : '']" @click="navigateToStep(3)">
+                        <div class="decorator payment"></div>
                         <span>{{ __('shop::app.checkout.onepage.payment') }}</span>
                     </li>
                     
-                    <li>
-                        <div class="decorator">
-                            <img src="{{ bagisto_asset('images/finish.svg') }}" />
-                        </div>
-                        
+                    <li :class="[currentStep == 4 ? 'active' : '']">
+                        <div class="decorator review"></div>
                         <span>{{ __('shop::app.checkout.onepage.complete') }}</span>
                     </li>
                 </ul>
 
-                <div class="step-content information">
+                <div class="step-content information" v-show="currentStep == 1">
 
                     @include('shop::checkout.onepage.customer-info')
 
@@ -65,15 +53,32 @@
 
                 </div>
 
-            </div>
+                <div class="step-content shipping" v-show="currentStep == 2">
+                    
+                    @include('shop::checkout.onepage.shipping')
 
-            <div class="step-content shipping">
-            </div>
+                    <div class="button-group">
 
-            <div class="step-content payment">
-            </div>
+                        <button type="button" class="btn btn-lg btn-primary" @click="validateForm('shipping-form')">
+                            {{ __('shop::app.checkout.onepage.continue') }}
+                        </button>
+
+                    </div>
+
+                </div>
+
+                <div class="step-content payment" v-show="currentStep == 3">
+
+                    @include('shop::checkout.onepage.payment')
+
+                </div>
+
+                <div class="step-content review" v-show="currentStep == 4">
+
+                    @include('shop::checkout.onepage.review')
+
+                </div>
 
-            <div class="step-content review">
             </div>
 
             @include('shop::checkout.onepage.summary')
@@ -89,10 +94,27 @@
             inject: ['$validator'],
 
             data: () => ({
-                billing: {
-                    use_for_shipping: true
+                currentStep: 1,
+
+                completedStep: 0,
+
+                shipping_methods: [],
+
+                payment_methods: [],
+
+                address: {
+                    billing: {
+                        use_for_shipping: true
+                    },
+
+                    shipping: {},
                 },
-                shipping: {},
+
+                selected_shipping_method: '',
+
+                selected_payment: {
+                    method: ''
+                }
             }),
 
             created () {
@@ -100,19 +122,52 @@
             },
 
             methods: {
+                navigateToStep (step) {
+                    if(step <= this.completedStep) {
+                        this.currentStep = step
+                        this.completedStep = step - 1;
+                    }
+                },
+
                 validateForm: function (scope) {
                     this.$validator.validateAll(scope).then((result) => {
                         if(result) {
-                            this.saveAddress()
+                            if(scope == 'address-form') {
+                                this.saveAddress()
+                            } else if(scope == 'shipping-form') {
+                                this.saveShipping()
+                            }
                         }
                     });
                 },
 
                 saveAddress () {
+                    var this_this = this;
+
+                    this.$http.post("{{ route('shop.checkout.save-address') }}", this.address)
+                        .then(function(response) {
+                            if(response.data.shipping) {
+                                this_this.shipping_methods = response.data.shipping
+                                this_this.completedStep = 1;
+                                this_this.currentStep = 2;
+                            }
+                        })
+                },
+
+                saveShipping () {
                     // this.$http.get('https://api.coindesk.com/v1/bpi/currentprice.json')
                     //     .then(function(response) {
-                    //         console.log(response)
-                    //     })
+                            this.completedStep = 2;
+                            this.currentStep = 3;
+                        // })
+                },
+
+                savePayment () {
+                    // this.$http.get('https://api.coindesk.com/v1/bpi/currentprice.json')
+                    //     .then(function(response) {
+                            this.completedStep = 1;
+                            this.currentStep = 2;
+                        // })
                 }
             }
         })
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
index 9a0d01d2a..96642d85b 100644
--- 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
@@ -15,7 +15,7 @@
                 {{ __('shop::app.checkout.onepage.first-name') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="billing.first_name"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[first_name]" name="billing[first_name]" v-model="address.billing.first_name"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[first_name]')">
                 @{{ errors.first('address-form.billing[first_name]') }}
@@ -27,7 +27,7 @@
                 {{ __('shop::app.checkout.onepage.last-name') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="billing.last_name"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[last_name]" name="billing[last_name]" v-model="address.billing.last_name"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[last_name]')">
                 @{{ errors.first('address-form.billing[last_name]') }}
@@ -39,7 +39,7 @@
                 {{ __('shop::app.checkout.onepage.email') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[email]" name="billing[email]" v-model="billing.email"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[email]" name="billing[email]" v-model="address.billing.email"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[email]')">
                 @{{ errors.first('address-form.billing[email]') }}
@@ -51,7 +51,7 @@
                 {{ __('shop::app.checkout.onepage.address1') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[address1]" name="billing[address1]" v-model="billing.address1"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[address1]" name="billing[address1]" v-model="address.billing.address1"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[address1]')">
                 @{{ errors.first('address-form.billing[address1]') }}
@@ -63,7 +63,7 @@
                 {{ __('shop::app.checkout.onepage.address2') }}
             </label>
 
-            <input type="text" class="control" id="billing[address2]" name="billing[address2]" v-model="billing.address2"/>
+            <input type="text" class="control" id="billing[address2]" name="billing[address2]" v-model="address.billing.address2"/>
         </div>
 
         <div class="control-group" :class="[errors.has('address-form.billing[city]') ? 'has-error' : '']">
@@ -71,7 +71,7 @@
                 {{ __('shop::app.checkout.onepage.city') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="billing.city"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[city]" name="billing[city]" v-model="address.billing.city"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[city]')">
                 @{{ errors.first('address-form.billing[city]') }}
@@ -83,7 +83,7 @@
                 {{ __('shop::app.checkout.onepage.state') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="billing.state"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[state]" name="billing[state]" v-model="address.billing.state"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[state]')">
                 @{{ errors.first('address-form.billing[state]') }}
@@ -95,7 +95,7 @@
                 {{ __('shop::app.checkout.onepage.postcode') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="billing.postcode"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[postcode]" name="billing[postcode]" v-model="address.billing.postcode"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[postcode]')">
                 @{{ errors.first('address-form.billing[postcode]') }}
@@ -107,7 +107,7 @@
                 {{ __('shop::app.checkout.onepage.phone') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="billing.phone"/>
+            <input type="text" v-validate="'required'" class="control" id="billing[phone]" name="billing[phone]" v-model="address.billing.phone"/>
 
             <span class="control-error" v-if="errors.has('address-form.billing[phone]')">
                 @{{ errors.first('address-form.billing[phone]') }}
@@ -119,7 +119,7 @@
                 {{ __('shop::app.checkout.onepage.country') }}
             </label>
 
-            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="billing.country">
+            <select type="text" v-validate="'required'" class="control" id="billing[country]" name="billing[country]" v-model="address.billing.country">
                 <option value=""></option>
 
                 @foreach (country()->all() as $code => $country)
@@ -136,7 +136,7 @@
 
         <div class="control-group">
             <span class="checkbox">
-                <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="billing.use_for_shipping"/>
+                <input type="checkbox" id="billing[use_for_shipping]" name="billing[use_for_shipping]" v-model="address.billing.use_for_shipping"/>
                 <label class="checkbox-view" for="billing[use_for_shipping]"></label>
                 {{ __('shop::app.checkout.onepage.use_for_shipping') }}
             </span>
@@ -144,7 +144,7 @@
         </div>
     </div>
 
-    <div class="form-container" v-if="!billing.use_for_shipping">
+    <div class="form-container" v-if="!address.billing.use_for_shipping">
 
         <div class="form-header">
             <h1>{{ __('shop::app.checkout.onepage.shipping-address') }}</h1>
@@ -155,7 +155,7 @@
                 {{ __('shop::app.checkout.onepage.first-name') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="shipping.first_name"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[first_name]" name="shipping[first_name]" v-model="address.shipping.first_name"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[first_name]')">
                 @{{ errors.first('address-form.shipping[first_name]') }}
@@ -167,7 +167,7 @@
                 {{ __('shop::app.checkout.onepage.last-name') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="shipping.last_name"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[last_name]" name="shipping[last_name]" v-model="address.shipping.last_name"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[last_name]')">
                 @{{ errors.first('address-form.shipping[last_name]') }}
@@ -179,7 +179,7 @@
                 {{ __('shop::app.checkout.onepage.email') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[email]" name="shipping[email]" v-model="shipping.email"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[email]" name="shipping[email]" v-model="address.shipping.email"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[email]')">
                 @{{ errors.first('address-form.shipping[email]') }}
@@ -191,7 +191,7 @@
                 {{ __('shop::app.checkout.onepage.address1') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[address1]" name="shipping[address1]" v-model="shipping.address1"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[address1]" name="shipping[address1]" v-model="address.shipping.address1"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[address1]')">
                 @{{ errors.first('address-form.shipping[address1]') }}
@@ -203,7 +203,7 @@
                 {{ __('shop::app.checkout.onepage.address2') }}
             </label>
 
-            <input type="text" class="control" id="shipping[address2]" name="shipping[address2]" v-model="shipping.address2"/>
+            <input type="text" class="control" id="shipping[address2]" name="shipping[address2]" v-model="address.shipping.address2"/>
         </div>
 
         <div class="control-group" :class="[errors.has('address-form.shipping[city]') ? 'has-error' : '']">
@@ -211,7 +211,7 @@
                 {{ __('shop::app.checkout.onepage.city') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="shipping.city"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[city]" name="shipping[city]" v-model="address.shipping.city"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[city]')">
                 @{{ errors.first('address-form.shipping[city]') }}
@@ -223,7 +223,7 @@
                 {{ __('shop::app.checkout.onepage.state') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="shipping.state"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[state]" name="shipping[state]" v-model="address.shipping.state"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[state]')">
                 @{{ errors.first('address-form.shipping[state]') }}
@@ -235,7 +235,7 @@
                 {{ __('shop::app.checkout.onepage.postcode') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="shipping.postcode"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[postcode]" name="shipping[postcode]" v-model="address.shipping.postcode"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[postcode]')">
                 @{{ errors.first('address-form.shipping[postcode]') }}
@@ -247,7 +247,7 @@
                 {{ __('shop::app.checkout.onepage.phone') }}
             </label>
 
-            <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="shipping.phone"/>
+            <input type="text" v-validate="'required'" class="control" id="shipping[phone]" name="shipping[phone]" v-model="address.shipping.phone"/>
 
             <span class="control-error" v-if="errors.has('address-form.shipping[phone]')">
                 @{{ errors.first('address-form.shipping[phone]') }}
@@ -259,7 +259,7 @@
                 {{ __('shop::app.checkout.onepage.country') }}
             </label>
 
-            <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="shipping.country">
+            <select type="text" v-validate="'required'" class="control" id="shipping[country]" name="shipping[country]" v-model="address.shipping.country">
                 <option value=""></option>
 
                 @foreach (country()->all() as $code => $country)
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
index e69de29bb..a9c0800e9 100644
--- a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/shipping.blade.php
@@ -0,0 +1,26 @@
+<form data-vv-scope="shipping-form">
+    <div class="form-container">
+        <div class="form-header">
+            <h1>{{ __('shop::app.checkout.onepage.shipping-method') }}</h1>
+        </div>
+
+        <div class="shipping-methods">
+
+            <div class="control-group" v-for='(shipping_method, index) in shipping_methods' :class="[errors.has('shipping-form.shipping_method') ? 'has-error' : '']">
+                <h4 for="">@{{ shipping_method.carrier_title }}</h4>
+
+                <span class="radio"  v-for='(rate, index) in shipping_method.rates'>
+                    <input v-validate="'required'" type="radio" :id="rate.method" name="shipping_method" :value="rate.method">
+                    <label class="radio-view" :for="rate.method"></label>
+                    @{{ rate.method_title }}
+                    <b>@{{ rate.price_formated }}</b>
+                </span>
+
+                <span class="control-error" v-if="errors.has('shipping-form.shipping_method')">
+                    @{{ errors.first('shipping-form.shipping_method') }}
+                </span>
+            </div>
+
+        </div>
+    </div>
+</form>
\ 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 4be3042bb..f307a35e2 100644
--- a/public/themes/default/assets/css/shop.css
+++ b/public/themes/default/assets/css/shop.css
@@ -816,7 +816,7 @@ section.slider-block div.slider-content div.slider-control .light-right-icon {
 }
 
 .layered-filter-wrapper .filter-attributes .filter-attributes-item.active .filter-attributes-title .icon {
-  background-image: url("../images//arrow-up.svg") !important;
+  background-image: url("../images/arrow-up.svg") !important;
 }
 
 .main-container-wrapper {
@@ -1605,6 +1605,72 @@ section.product-detail div.layouter form .details .full-description {
   font-size: 16px;
 }
 
+.rating-reviews .rating-header {
+  font-weight: 600;
+  padding: 20px 0;
+}
+
+.rating-reviews .stars .icon {
+  width: 16px;
+  height: 16px;
+}
+
+.rating-reviews .overall {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: justify;
+      -ms-flex-pack: justify;
+          justify-content: space-between;
+}
+
+.rating-reviews .overall .review-info .number {
+  font-size: 34px;
+}
+
+.rating-reviews .overall .review-info .total-reviews {
+  margin-top: 10px;
+}
+
+.rating-reviews .reviews {
+  margin-top: 40px;
+  margin-bottom: 40px;
+}
+
+.rating-reviews .reviews .review {
+  margin-bottom: 25px;
+}
+
+.rating-reviews .reviews .review .title {
+  margin-bottom: 5px;
+}
+
+.rating-reviews .reviews .review .stars {
+  margin-bottom: 15px;
+  display: inline-block;
+}
+
+.rating-reviews .reviews .review .message {
+  margin-bottom: 10px;
+}
+
+.rating-reviews .reviews .review .reviewer-details {
+  color: #5E5E5E;
+}
+
+.rating-reviews .reviews .view-all {
+  margin-top: 15px;
+  color: #0031f0;
+  margin-bottom: 15px;
+}
+
 /* cart pages and elements css begins here */
 section.cart {
   color: #242424;
@@ -2145,462 +2211,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo
   color: #3A3A3A;
 }
 
-@media all and (max-width: 480px) {
-  .order {
-    margin-left: 0%;
-  }
-  .order .order-section-head {
-    display: none;
-  }
-  .order .order-section-head-small {
-    display: block;
-    margin-top: -15px;
-  }
-  .order .order-section-head-small span {
-    display: inline-block;
-    width: 33.3%;
-  }
-  .order .order-section-head-small .icon {
-    float: left;
-  }
-  .order .order-section-head-small .icon img {
-    margin-top: 11px;
-  }
-  .order .order-section-head-small .order-number {
-    text-align: center;
-    font-size: 16px;
-    color: #242424;
-    letter-spacing: -0.38px;
-    text-align: center;
-    margin-top: 13px;
-    margin-bottom: 13px;
-  }
-  .order .order-section-head-small .cancel {
-    float: right;
-    text-align: right;
-    font-size: 17px;
-    color: #0031F0;
-    letter-spacing: -0.11px;
-    margin-top: 13px;
-    margin-bottom: 13px;
-  }
-  .order .order-section-head-small .horizon-rule {
-    border: .5px solid #E8E8E8;
-    width: 150%;
-    margin-left: -10%;
-    margin-right: -10%;
-  }
-  .order .payment-place {
-    font-size: 16px;
-    color: #5e5e5e;
-    margin-top: 4%;
-  }
-  .order .payment-place .placed-on {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .payment-place .placed-on .place-text {
-    width: 100%;
-  }
-  .order .payment-place .placed-on .place-text span {
-    font-size: 14px;
-  }
-  .order .payment-place .placed-on .place-text .processing {
-    display: block;
-    float: right;
-    background: #2ED04C;
-    height: 25px;
-    border-radius: 100px;
-    font-size: 14px;
-    color: #FFFFFF;
-    letter-spacing: -0.12px;
-    width: 110px;
-    text-align: center;
-    padding-top: 3.5px;
-    padding-left: 5px;
-    margin-top: 3px;
-  }
-  .order .payment-place .placed-on .place-date {
-    margin-top: -5px;
-  }
-  .order .payment-place .payment-status {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .payment-place .payment-status .payment-text span {
-    font-size: 14px;
-  }
-  .order .payment-place .payment-status .status {
-    margin-top: 2px;
-  }
-  .order .payment-place .horizontal-rule {
-    margin-top: 1.1%;
-    width: 100%;
-    height: 1px;
-    vertical-align: middle;
-    background: #e8e8e8;
-  }
-  .order .order-details {
-    display: none;
-  }
-  .order .total {
-    margin-top: 5%;
-    height: 130px;
-  }
-  .order .total .calculate {
-    width: 100%;
-    float: left;
-  }
-  .order .total .calculate .sub-total .left {
-    margin-left: 0px;
-    width: 100px;
-  }
-  .order .total .calculate .sub-total .middle {
-    display: none;
-  }
-  .order .total .calculate .sub-total .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .ship-handle .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .ship-handle .middle {
-    display: none;
-  }
-  .order .total .calculate .ship-handle .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .discount .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .discount .middle {
-    display: none;
-  }
-  .order .total .calculate .discount .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .grand-total .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .grand-total .middle {
-    display: none;
-  }
-  .order .total .calculate .grand-total .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .due .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .due .middle {
-    display: none;
-  }
-  .order .total .calculate .due .right {
-    float: right;
-    width: 25%;
-  }
-  .order .horizontal-rule {
-    display: none;
-  }
-  .order .table {
-    display: none;
-  }
-  .order .product-config {
-    border: 1px solid #E8E8E8;
-    height: 19%;
-    width: 100%;
-    margin-top: 10px;
-    display: block;
-  }
-  .order .product-config .product-attribute {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .order .product-config .product-attribute .product-property {
-    width: 30%;
-    margin-top: 10px;
-    margin-left: 5px;
-  }
-  .order .product-config .product-attribute .product-property span {
-    font-size: 14px;
-    color: #5E5E5E;
-    letter-spacing: -0.11px;
-  }
-  .order .product-config .product-attribute .property-name {
-    margin-top: 10px;
-    width: 50%;
-  }
-  .order .product-config .product-attribute .property-name span {
-    font-size: 16px;
-    color: #5E5E5E;
-    letter-spacing: -0.11px;
-  }
-  .order .order-information {
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .order-information .order-address-method {
-    width: 250px;
-  }
-  .order .order-information .order-address-method:nth-child(3) {
-    margin-top: 10px;
-  }
-  .order .order-information .order-address-method:nth-child(2) {
-    margin-top: 10px;
-  }
-  .order .order-information .order-address-method:nth-child(4) {
-    margin-top: 10px;
-  }
-}
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-  .order {
-    margin-left: 0%;
-  }
-  .order .order-section-head {
-    display: none;
-  }
-  .order .order-section-head-small {
-    display: block;
-    margin-top: -15px;
-  }
-  .order .order-section-head-small span {
-    display: inline-block;
-    width: 33.3%;
-  }
-  .order .order-section-head-small .icon {
-    float: left;
-  }
-  .order .order-section-head-small .icon img {
-    margin-top: 11px;
-  }
-  .order .order-section-head-small .order-number {
-    text-align: center;
-    font-size: 16px;
-    color: #242424;
-    letter-spacing: -0.38px;
-    text-align: center;
-    margin-top: 13px;
-    margin-bottom: 13px;
-  }
-  .order .order-section-head-small .cancel {
-    float: right;
-    text-align: right;
-    font-size: 17px;
-    color: #0031F0;
-    letter-spacing: -0.11px;
-    margin-top: 13px;
-    margin-bottom: 13px;
-  }
-  .order .order-section-head-small .horizon-rule {
-    border: .5px solid #E8E8E8;
-    width: 150%;
-    margin-left: -10%;
-    margin-right: -10%;
-  }
-  .order .payment-place {
-    font-size: 16px;
-    color: #5e5e5e;
-    margin-top: 4%;
-  }
-  .order .payment-place .placed-on {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .payment-place .placed-on .place-text {
-    width: 100%;
-  }
-  .order .payment-place .placed-on .place-text span {
-    font-size: 14px;
-  }
-  .order .payment-place .placed-on .place-text .processing {
-    display: block;
-    float: right;
-    background: #2ED04C;
-    height: 25px;
-    border-radius: 100px;
-    font-size: 14px;
-    color: #FFFFFF;
-    letter-spacing: -0.12px;
-    width: 110px;
-    text-align: center;
-    padding-top: 3.5px;
-    padding-left: 5px;
-    margin-top: 3px;
-  }
-  .order .payment-place .placed-on .place-date {
-    margin-top: -5px;
-  }
-  .order .payment-place .payment-status {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .payment-place .payment-status .payment-text span {
-    font-size: 14px;
-  }
-  .order .payment-place .payment-status .status {
-    margin-top: 2px;
-  }
-  .order .payment-place .horizontal-rule {
-    margin-top: 1.1%;
-    width: 100%;
-    height: 1px;
-    vertical-align: middle;
-    background: #e8e8e8;
-  }
-  .order .order-details {
-    display: none;
-  }
-  .order .total {
-    margin-top: 5%;
-    height: 130px;
-  }
-  .order .total .calculate {
-    width: 100%;
-    float: left;
-  }
-  .order .total .calculate .sub-total .left {
-    margin-left: 0px;
-    width: 100px;
-  }
-  .order .total .calculate .sub-total .middle {
-    display: none;
-  }
-  .order .total .calculate .sub-total .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .ship-handle .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .ship-handle .middle {
-    display: none;
-  }
-  .order .total .calculate .ship-handle .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .discount .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .discount .middle {
-    display: none;
-  }
-  .order .total .calculate .discount .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .grand-total .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .grand-total .middle {
-    display: none;
-  }
-  .order .total .calculate .grand-total .right {
-    float: right;
-    width: 25%;
-  }
-  .order .total .calculate .due .left {
-    margin-left: 0px;
-  }
-  .order .total .calculate .due .middle {
-    display: none;
-  }
-  .order .total .calculate .due .right {
-    float: right;
-    width: 25%;
-  }
-  .order .horizontal-rule {
-    display: none;
-  }
-  .order .table {
-    display: none;
-  }
-  .order .product-config {
-    border: 1px solid #E8E8E8;
-    height: 19%;
-    width: 100%;
-    margin-top: 10px;
-    display: block;
-  }
-  .order .product-config .product-attribute {
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    -webkit-box-orient: horizontal;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: row;
-            flex-direction: row;
-  }
-  .order .product-config .product-attribute .product-property {
-    width: 30%;
-    margin-top: 10px;
-    margin-left: 5px;
-  }
-  .order .product-config .product-attribute .product-property span {
-    font-size: 14px;
-    color: #5E5E5E;
-    letter-spacing: -0.11px;
-  }
-  .order .product-config .product-attribute .property-name {
-    margin-top: 10px;
-    width: 50%;
-  }
-  .order .product-config .product-attribute .property-name span {
-    font-size: 16px;
-    color: #5E5E5E;
-    letter-spacing: -0.11px;
-  }
-  .order .order-information {
-    -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
-        -ms-flex-direction: column;
-            flex-direction: column;
-  }
-  .order .order-information .order-address-method {
-    width: 250px;
-  }
-  .order .order-information .order-address-method:nth-child(3) {
-    margin-top: 10px;
-  }
-  .order .order-information .order-address-method:nth-child(2) {
-    margin-top: 10px;
-  }
-  .order .order-information .order-address-method:nth-child(4) {
-    margin-top: 10px;
-  }
-}
-
 .checkout-process {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -2648,10 +2258,32 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo
   display: -ms-inline-flexbox;
   display: inline-flex;
   border: 1px solid #E8E8E8;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
-.checkout-process .col-main ul.checkout-steps li .decorator img {
-  margin: auto;
+.checkout-process .col-main ul.checkout-steps li .decorator.address-info {
+  background-image: url("../images/address.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.shipping {
+  background-image: url("../images/shipping.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.payment {
+  background-image: url("../images/payment.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li .decorator.review {
+  background-image: url("../images/finish.svg");
+}
+
+.checkout-process .col-main ul.checkout-steps li.completed {
+  cursor: pointer;
+}
+
+.checkout-process .col-main ul.checkout-steps li.completed .decorator {
+  background-image: url("../images/complete.svg");
 }
 
 .checkout-process .col-main ul.checkout-steps li span {
@@ -2692,6 +2324,10 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo
   padding-bottom: 20px;
 }
 
+.checkout-process .col-main .step-content .shipping-methods h4 {
+  margin: 0;
+}
+
 .checkout-process .col-right {
   width: 35%;
   padding-left: 40px;
@@ -2723,14 +2359,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo
   color: #242424;
 }
 
-.checkout-process .col-right .order-summary .horizontal-rule {
-  margin-top: 6%;
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #e8e8e8;
-}
-
 .checkout-process .col-right .order-summary .payble-amount {
   margin-top: 12px;
 }
@@ -2752,292 +2380,6 @@ section.cart .cart-content .right-side .coupon-section .after-coupon-amount .amo
   color: #242424;
 }
 
-@media all and (max-width: 480px) {
-  .checkout-process {
-    width: 100%;
-    margin-top: 3%;
-  }
-  .checkout-process .left-side {
-    width: 100%;
-    margin-right: 0%;
-    height: 60px;
-  }
-  .checkout-process .left-side .checkout-menu {
-    width: 100%;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail {
-    height: 60px;
-    width: 100%;
-    padding: 5px;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail 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 span {
-    display: none;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail .line {
-    margin-top: 23px;
-    width: 100%;
-    margin-left: 5px;
-    margin-right: 5px;
-    border: 1px solid #E7E7E7;
-    height: 1px;
-  }
-  .checkout-process .left-side .checkout-menu .horizontal-rule {
-    display: none;
-  }
-  .checkout-process .right-side {
-    display: none;
-  }
-  .order-info {
-    width: 100%;
-    margin-right: 0%;
-    margin-top: 10px;
-    height: 50px;
-  }
-  .order-info .control-group .control {
-    width: 100%;
-  }
-  .order-info .different-billing-addr {
-    margin-top: 5%;
-  }
-  .order-info .horizontal-rule {
-    margin-top: 10%;
-  }
-  .order-info .countinue-button {
-    margin-top: 8%;
-  }
-}
-
-@media all and (min-width: 481px) and (max-width: 920px) {
-  .checkout-process {
-    width: 100%;
-    margin-top: 3%;
-  }
-  .checkout-process .left-side {
-    width: 100%;
-    margin-right: 0%;
-    height: 60px;
-  }
-  .checkout-process .left-side .checkout-menu {
-    width: 100%;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail {
-    height: 60px;
-    width: 100%;
-    padding: 5px;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail 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 span {
-    display: none;
-  }
-  .checkout-process .left-side .checkout-menu ul.checkout-detail .line {
-    margin-top: 23px;
-    width: 100%;
-    margin-left: 10px;
-    margin-right: 10px;
-    border: 1px solid #E7E7E7;
-    height: 1px;
-  }
-  .checkout-process .left-side .checkout-menu .horizontal-rule {
-    display: none;
-  }
-  .checkout-process .right-side {
-    display: none;
-  }
-  .order-info {
-    width: 100%;
-    margin-right: 0%;
-    margin-top: 10px;
-    height: 50px;
-  }
-  .order-info .control-group .control {
-    width: 100%;
-  }
-  .order-info .different-billing-addr {
-    margin-top: 3%;
-  }
-  .order-info .horizontal-rule {
-    margin-top: 10%;
-  }
-  .order-info .countinue-button {
-    margin-top: 5%;
-  }
-}
-
-.ship-method {
-  width: 67%;
-  margin-right: 6%;
-  height: 600px;
-  margin-top: -190px;
-}
-
-.ship-method .ship-info .ship-text {
-  font-size: 24px;
-  color: #242424;
-  letter-spacing: -0.58px;
-  font-weight: bold;
-}
-
-.ship-method .ship-price {
-  margin-top: 31px;
-}
-
-.ship-method .ship-price .price-checkbox {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.ship-method .ship-price .price-checkbox span {
-  margin-left: 8px;
-  font-size: 16px;
-  color: #242424;
-  line-height: 22px;
-  font-weight: bold;
-}
-
-.ship-method .ship-price .price-checkbox-text {
-  margin-left: 25px;
-  width: 580px;
-  height: 44px;
-  margin-top: 4px;
-}
-
-.ship-method .ship-price .price-checkbox-text b {
-  font-size: 16px;
-}
-
-.ship-method .ship-price .price-checkbox-text span {
-  font-size: 16px;
-  color: #242424;
-  line-height: 22px;
-}
-
-.ship-method .horizontal-rule {
-  margin-top: 7%;
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #e8e8e8;
-}
-
-.ship-method .countinue-button {
-  margin-top: 3%;
-}
-
-.ship-method .countinue-button button {
-  background: #0031F0;
-  font-size: 14px;
-  color: #FFFFFF;
-  letter-spacing: -0.26px;
-  text-align: center;
-  height: 38px;
-  width: 137px;
-  border: none;
-}
-
-.payment-method {
-  width: 67%;
-  margin-right: 6%;
-  height: 600px;
-  margin-top: -190px;
-}
-
-.payment-method .payment-info .payment-text {
-  font-size: 24px;
-  color: #242424;
-  letter-spacing: -0.58px;
-  font-weight: bold;
-}
-
-.payment-method .payment-price {
-  margin-top: 31px;
-}
-
-.payment-method .payment-price .payment-checkbox {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.payment-method .payment-price .payment-checkbox span {
-  margin-left: 8px;
-  font-size: 16px;
-  color: #242424;
-  line-height: 22px;
-  font-weight: bold;
-}
-
-.payment-method .payment-price .payment-checkbox-text {
-  margin-left: 25px;
-  width: 580px;
-  height: 44px;
-  margin-top: 4px;
-}
-
-.payment-method .payment-price .payment-checkbox-text b {
-  font-size: 16px;
-}
-
-.payment-method .payment-price .payment-checkbox-text span {
-  font-size: 16px;
-  color: #242424;
-  line-height: 22px;
-}
-
-.payment-method .horizontal-rule {
-  margin-top: 7%;
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #e8e8e8;
-}
-
-.payment-method .countinue-button {
-  margin-top: 3%;
-}
-
-.payment-method .countinue-button button {
-  background: #0031F0;
-  font-size: 14px;
-  color: #FFFFFF;
-  letter-spacing: -0.26px;
-  text-align: center;
-  height: 38px;
-  width: 137px;
-  border: none;
-}
-
-.payment-method .countinue-button button .horizontal-rule {
-  margin-top: 7%;
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #e8e8e8;
-}
-
-.payment-method .countinue-button button .horizontal-rule {
-  margin-top: 7%;
-  width: 100%;
-  height: 1px;
-  vertical-align: middle;
-  background: #e8e8e8;
-}
-
 .complete-page {
   width: 880px;
   height: 1050px;
diff --git a/public/themes/default/assets/js/shop.js b/public/themes/default/assets/js/shop.js
index ea917445b..785943a1c 100644
--- a/public/themes/default/assets/js/shop.js
+++ b/public/themes/default/assets/js/shop.js
@@ -60,34 +60,317 @@
 /******/ 	__webpack_require__.p = "/";
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 2);
+/******/ 	return __webpack_require__(__webpack_require__.s = 12);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports) {
+/***/ (function(module, exports, __webpack_require__) {
 
-var g;
+"use strict";
 
-// This works in non-strict mode
-g = (function() {
-	return this;
-})();
 
-try {
-	// This works if eval is allowed (see CSP)
-	g = g || Function("return this")() || (1,eval)("this");
-} catch(e) {
-	// This works if the window reference is available
-	if(typeof window === "object")
-		g = window;
+var bind = __webpack_require__(5);
+var isBuffer = __webpack_require__(21);
+
+/*global toString:true*/
+
+// utils is a library of generic helper functions non-specific to axios
+
+var toString = Object.prototype.toString;
+
+/**
+ * Determine if a value is an Array
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Array, otherwise false
+ */
+function isArray(val) {
+  return toString.call(val) === '[object Array]';
 }
 
-// g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
+/**
+ * Determine if a value is an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an ArrayBuffer, otherwise false
+ */
+function isArrayBuffer(val) {
+  return toString.call(val) === '[object ArrayBuffer]';
+}
 
-module.exports = g;
+/**
+ * Determine if a value is a FormData
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an FormData, otherwise false
+ */
+function isFormData(val) {
+  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+}
+
+/**
+ * Determine if a value is a view on an ArrayBuffer
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a view on an ArrayBuffer, otherwise false
+ */
+function isArrayBufferView(val) {
+  var result;
+  if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
+    result = ArrayBuffer.isView(val);
+  } else {
+    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+  }
+  return result;
+}
+
+/**
+ * Determine if a value is a String
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a String, otherwise false
+ */
+function isString(val) {
+  return typeof val === 'string';
+}
+
+/**
+ * Determine if a value is a Number
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Number, otherwise false
+ */
+function isNumber(val) {
+  return typeof val === 'number';
+}
+
+/**
+ * Determine if a value is undefined
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if the value is undefined, otherwise false
+ */
+function isUndefined(val) {
+  return typeof val === 'undefined';
+}
+
+/**
+ * Determine if a value is an Object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is an Object, otherwise false
+ */
+function isObject(val) {
+  return val !== null && typeof val === 'object';
+}
+
+/**
+ * Determine if a value is a Date
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Date, otherwise false
+ */
+function isDate(val) {
+  return toString.call(val) === '[object Date]';
+}
+
+/**
+ * Determine if a value is a File
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a File, otherwise false
+ */
+function isFile(val) {
+  return toString.call(val) === '[object File]';
+}
+
+/**
+ * Determine if a value is a Blob
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Blob, otherwise false
+ */
+function isBlob(val) {
+  return toString.call(val) === '[object Blob]';
+}
+
+/**
+ * Determine if a value is a Function
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Function, otherwise false
+ */
+function isFunction(val) {
+  return toString.call(val) === '[object Function]';
+}
+
+/**
+ * Determine if a value is a Stream
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a Stream, otherwise false
+ */
+function isStream(val) {
+  return isObject(val) && isFunction(val.pipe);
+}
+
+/**
+ * Determine if a value is a URLSearchParams object
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a URLSearchParams object, otherwise false
+ */
+function isURLSearchParams(val) {
+  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
+}
+
+/**
+ * Trim excess whitespace off the beginning and end of a string
+ *
+ * @param {String} str The String to trim
+ * @returns {String} The String freed of excess whitespace
+ */
+function trim(str) {
+  return str.replace(/^\s*/, '').replace(/\s*$/, '');
+}
+
+/**
+ * Determine if we're running in a standard browser environment
+ *
+ * This allows axios to run in a web worker, and react-native.
+ * Both environments support XMLHttpRequest, but not fully standard globals.
+ *
+ * web workers:
+ *  typeof window -> 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
+};
 
 
 /***/ }),
@@ -201,27 +484,928 @@ module.exports = function normalizeComponent (
 
 /***/ }),
 /* 2 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ (function(module, exports) {
 
-__webpack_require__(3);
-module.exports = __webpack_require__(25);
+var g;
+
+// This works in non-strict mode
+g = (function() {
+	return this;
+})();
+
+try {
+	// This works if eval is allowed (see CSP)
+	g = g || Function("return this")() || (1,eval)("this");
+} catch(e) {
+	// This works if the window reference is available
+	if(typeof window === "object")
+		g = window;
+}
+
+// g can still be undefined, but nothing to do about it...
+// We return undefined, instead of nothing here, so it's
+// easier to handle this case. if(!global) { ...}
+
+module.exports = g;
 
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports, __webpack_require__) {
 
-window.jQuery = window.$ = $ = __webpack_require__(4);
-window.Vue = __webpack_require__(5);
-window.VeeValidate = __webpack_require__(9);
+"use strict";
+/* WEBPACK VAR INJECTION */(function(process) {
+
+var utils = __webpack_require__(0);
+var normalizeHeaderName = __webpack_require__(23);
+
+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__(6);
+  } else if (typeof process !== 'undefined') {
+    // For node use HTTP adapter
+    adapter = __webpack_require__(6);
+  }
+  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__(4)))
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports) {
+
+// shim for using process in browser
+var process = module.exports = {};
+
+// cached from whatever global is present so that test runners that stub it
+// don't break things.  But we need to wrap it in a try catch in case it is
+// wrapped in strict mode code which doesn't define any globals.  It's inside a
+// function because try/catches deoptimize in certain engines.
+
+var cachedSetTimeout;
+var cachedClearTimeout;
+
+function defaultSetTimout() {
+    throw new Error('setTimeout has not been defined');
+}
+function defaultClearTimeout () {
+    throw new Error('clearTimeout has not been defined');
+}
+(function () {
+    try {
+        if (typeof setTimeout === 'function') {
+            cachedSetTimeout = setTimeout;
+        } else {
+            cachedSetTimeout = defaultSetTimout;
+        }
+    } catch (e) {
+        cachedSetTimeout = defaultSetTimout;
+    }
+    try {
+        if (typeof clearTimeout === 'function') {
+            cachedClearTimeout = clearTimeout;
+        } else {
+            cachedClearTimeout = defaultClearTimeout;
+        }
+    } catch (e) {
+        cachedClearTimeout = defaultClearTimeout;
+    }
+} ())
+function runTimeout(fun) {
+    if (cachedSetTimeout === setTimeout) {
+        //normal enviroments in sane situations
+        return setTimeout(fun, 0);
+    }
+    // if setTimeout wasn't available but was latter defined
+    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
+        cachedSetTimeout = setTimeout;
+        return setTimeout(fun, 0);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedSetTimeout(fun, 0);
+    } catch(e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
+            return cachedSetTimeout.call(null, fun, 0);
+        } catch(e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
+            return cachedSetTimeout.call(this, fun, 0);
+        }
+    }
+
+
+}
+function runClearTimeout(marker) {
+    if (cachedClearTimeout === clearTimeout) {
+        //normal enviroments in sane situations
+        return clearTimeout(marker);
+    }
+    // if clearTimeout wasn't available but was latter defined
+    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
+        cachedClearTimeout = clearTimeout;
+        return clearTimeout(marker);
+    }
+    try {
+        // when when somebody has screwed with setTimeout but no I.E. maddness
+        return cachedClearTimeout(marker);
+    } catch (e){
+        try {
+            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
+            return cachedClearTimeout.call(null, marker);
+        } catch (e){
+            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
+            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
+            return cachedClearTimeout.call(this, marker);
+        }
+    }
+
+
+
+}
+var queue = [];
+var draining = false;
+var currentQueue;
+var queueIndex = -1;
+
+function cleanUpNextTick() {
+    if (!draining || !currentQueue) {
+        return;
+    }
+    draining = false;
+    if (currentQueue.length) {
+        queue = currentQueue.concat(queue);
+    } else {
+        queueIndex = -1;
+    }
+    if (queue.length) {
+        drainQueue();
+    }
+}
+
+function drainQueue() {
+    if (draining) {
+        return;
+    }
+    var timeout = runTimeout(cleanUpNextTick);
+    draining = true;
+
+    var len = queue.length;
+    while(len) {
+        currentQueue = queue;
+        queue = [];
+        while (++queueIndex < len) {
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
+        }
+        queueIndex = -1;
+        len = queue.length;
+    }
+    currentQueue = null;
+    draining = false;
+    runClearTimeout(timeout);
+}
+
+process.nextTick = function (fun) {
+    var args = new Array(arguments.length - 1);
+    if (arguments.length > 1) {
+        for (var i = 1; i < arguments.length; i++) {
+            args[i - 1] = arguments[i];
+        }
+    }
+    queue.push(new Item(fun, args));
+    if (queue.length === 1 && !draining) {
+        runTimeout(drainQueue);
+    }
+};
+
+// v8 likes predictible objects
+function Item(fun, array) {
+    this.fun = fun;
+    this.array = array;
+}
+Item.prototype.run = function () {
+    this.fun.apply(null, this.array);
+};
+process.title = 'browser';
+process.browser = true;
+process.env = {};
+process.argv = [];
+process.version = ''; // empty string to avoid regexp issues
+process.versions = {};
+
+function noop() {}
+
+process.on = noop;
+process.addListener = noop;
+process.once = noop;
+process.off = noop;
+process.removeListener = noop;
+process.removeAllListeners = noop;
+process.emit = noop;
+process.prependListener = noop;
+process.prependOnceListener = noop;
+
+process.listeners = function (name) { return [] }
+
+process.binding = function (name) {
+    throw new Error('process.binding is not supported');
+};
+
+process.cwd = function () { return '/' };
+process.chdir = function (dir) {
+    throw new Error('process.chdir is not supported');
+};
+process.umask = function() { return 0; };
+
+
+/***/ }),
+/* 5 */
+/***/ (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);
+  };
+};
+
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+var settle = __webpack_require__(24);
+var buildURL = __webpack_require__(26);
+var parseHeaders = __webpack_require__(27);
+var isURLSameOrigin = __webpack_require__(28);
+var createError = __webpack_require__(7);
+var btoa = (typeof window !== 'undefined' && window.btoa && window.btoa.bind(window)) || __webpack_require__(29);
+
+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__(30);
+
+      // 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);
+  });
+};
+
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var enhanceError = __webpack_require__(25);
+
+/**
+ * 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);
+};
+
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+module.exports = function isCancel(value) {
+  return !!(value && value.__CANCEL__);
+};
+
+
+/***/ }),
+/* 9 */
+/***/ (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;
+
+
+/***/ }),
+/* 10 */
+/***/ (function(module, exports) {
+
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+// css base code, injected by the css-loader
+module.exports = function(useSourceMap) {
+	var list = [];
+
+	// return the list of modules as css string
+	list.toString = function toString() {
+		return this.map(function (item) {
+			var content = cssWithMappingToString(item, useSourceMap);
+			if(item[2]) {
+				return "@media " + item[2] + "{" + content + "}";
+			} else {
+				return content;
+			}
+		}).join("");
+	};
+
+	// import a list of modules into the list
+	list.i = function(modules, mediaQuery) {
+		if(typeof modules === "string")
+			modules = [[null, modules, ""]];
+		var alreadyImportedModules = {};
+		for(var i = 0; i < this.length; i++) {
+			var id = this[i][0];
+			if(typeof id === "number")
+				alreadyImportedModules[id] = true;
+		}
+		for(i = 0; i < modules.length; i++) {
+			var item = modules[i];
+			// skip already imported module
+			// this implementation is not 100% perfect for weird media query combinations
+			//  when a module is imported multiple times with different media queries.
+			//  I hope this will never occur (Hey this way we have smaller bundles)
+			if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) {
+				if(mediaQuery && !item[2]) {
+					item[2] = mediaQuery;
+				} else if(mediaQuery) {
+					item[2] = "(" + item[2] + ") and (" + mediaQuery + ")";
+				}
+				list.push(item);
+			}
+		}
+	};
+	return list;
+};
+
+function cssWithMappingToString(item, useSourceMap) {
+	var content = item[1] || '';
+	var cssMapping = item[3];
+	if (!cssMapping) {
+		return content;
+	}
+
+	if (useSourceMap && typeof btoa === 'function') {
+		var sourceMapping = toComment(cssMapping);
+		var sourceURLs = cssMapping.sources.map(function (source) {
+			return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
+		});
+
+		return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
+	}
+
+	return [content].join('\n');
+}
+
+// Adapted from convert-source-map (MIT)
+function toComment(sourceMap) {
+	// eslint-disable-next-line no-undef
+	var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
+	var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
+
+	return '/*# ' + data + ' */';
+}
+
+
+/***/ }),
+/* 11 */
+/***/ (function(module, exports, __webpack_require__) {
+
+/*
+  MIT License http://www.opensource.org/licenses/mit-license.php
+  Author Tobias Koppers @sokra
+  Modified by Evan You @yyx990803
+*/
+
+var hasDocument = typeof document !== 'undefined'
+
+if (typeof DEBUG !== 'undefined' && DEBUG) {
+  if (!hasDocument) {
+    throw new Error(
+    'vue-style-loader cannot be used in a non-browser environment. ' +
+    "Use { target: 'node' } in your Webpack config to indicate a server-rendering environment."
+  ) }
+}
+
+var listToStyles = __webpack_require__(47)
+
+/*
+type StyleObject = {
+  id: number;
+  parts: Array<StyleObjectPart>
+}
+
+type StyleObjectPart = {
+  css: string;
+  media: string;
+  sourceMap: ?string
+}
+*/
+
+var stylesInDom = {/*
+  [id: number]: {
+    id: number,
+    refs: number,
+    parts: Array<(obj?: StyleObjectPart) => void>
+  }
+*/}
+
+var head = hasDocument && (document.head || document.getElementsByTagName('head')[0])
+var singletonElement = null
+var singletonCounter = 0
+var isProduction = false
+var noop = function () {}
+var options = null
+var ssrIdKey = 'data-vue-ssr-id'
+
+// Force single-tag solution on IE6-9, which has a hard limit on the # of <style>
+// tags it will allow on a page
+var isOldIE = typeof navigator !== 'undefined' && /msie [6-9]\b/.test(navigator.userAgent.toLowerCase())
+
+module.exports = function (parentId, list, _isProduction, _options) {
+  isProduction = _isProduction
+
+  options = _options || {}
+
+  var styles = listToStyles(parentId, list)
+  addStylesToDom(styles)
+
+  return function update (newList) {
+    var mayRemove = []
+    for (var i = 0; i < styles.length; i++) {
+      var item = styles[i]
+      var domStyle = stylesInDom[item.id]
+      domStyle.refs--
+      mayRemove.push(domStyle)
+    }
+    if (newList) {
+      styles = listToStyles(parentId, newList)
+      addStylesToDom(styles)
+    } else {
+      styles = []
+    }
+    for (var i = 0; i < mayRemove.length; i++) {
+      var domStyle = mayRemove[i]
+      if (domStyle.refs === 0) {
+        for (var j = 0; j < domStyle.parts.length; j++) {
+          domStyle.parts[j]()
+        }
+        delete stylesInDom[domStyle.id]
+      }
+    }
+  }
+}
+
+function addStylesToDom (styles /* Array<StyleObject> */) {
+  for (var i = 0; i < styles.length; i++) {
+    var item = styles[i]
+    var domStyle = stylesInDom[item.id]
+    if (domStyle) {
+      domStyle.refs++
+      for (var j = 0; j < domStyle.parts.length; j++) {
+        domStyle.parts[j](item.parts[j])
+      }
+      for (; j < item.parts.length; j++) {
+        domStyle.parts.push(addStyle(item.parts[j]))
+      }
+      if (domStyle.parts.length > item.parts.length) {
+        domStyle.parts.length = item.parts.length
+      }
+    } else {
+      var parts = []
+      for (var j = 0; j < item.parts.length; j++) {
+        parts.push(addStyle(item.parts[j]))
+      }
+      stylesInDom[item.id] = { id: item.id, refs: 1, parts: parts }
+    }
+  }
+}
+
+function createStyleElement () {
+  var styleElement = document.createElement('style')
+  styleElement.type = 'text/css'
+  head.appendChild(styleElement)
+  return styleElement
+}
+
+function addStyle (obj /* StyleObjectPart */) {
+  var update, remove
+  var styleElement = document.querySelector('style[' + ssrIdKey + '~="' + obj.id + '"]')
+
+  if (styleElement) {
+    if (isProduction) {
+      // has SSR styles and in production mode.
+      // simply do nothing.
+      return noop
+    } else {
+      // has SSR styles but in dev mode.
+      // for some reason Chrome can't handle source map in server-rendered
+      // style tags - source maps in <style> only works if the style tag is
+      // created and inserted dynamically. So we remove the server rendered
+      // styles and inject new ones.
+      styleElement.parentNode.removeChild(styleElement)
+    }
+  }
+
+  if (isOldIE) {
+    // use singleton mode for IE9.
+    var styleIndex = singletonCounter++
+    styleElement = singletonElement || (singletonElement = createStyleElement())
+    update = applyToSingletonTag.bind(null, styleElement, styleIndex, false)
+    remove = applyToSingletonTag.bind(null, styleElement, styleIndex, true)
+  } else {
+    // use multi-style-tag mode in all other cases
+    styleElement = createStyleElement()
+    update = applyToTag.bind(null, styleElement)
+    remove = function () {
+      styleElement.parentNode.removeChild(styleElement)
+    }
+  }
+
+  update(obj)
+
+  return function updateStyle (newObj /* StyleObjectPart */) {
+    if (newObj) {
+      if (newObj.css === obj.css &&
+          newObj.media === obj.media &&
+          newObj.sourceMap === obj.sourceMap) {
+        return
+      }
+      update(obj = newObj)
+    } else {
+      remove()
+    }
+  }
+}
+
+var replaceText = (function () {
+  var textStore = []
+
+  return function (index, replacement) {
+    textStore[index] = replacement
+    return textStore.filter(Boolean).join('\n')
+  }
+})()
+
+function applyToSingletonTag (styleElement, index, remove, obj) {
+  var css = remove ? '' : obj.css
+
+  if (styleElement.styleSheet) {
+    styleElement.styleSheet.cssText = replaceText(index, css)
+  } else {
+    var cssNode = document.createTextNode(css)
+    var childNodes = styleElement.childNodes
+    if (childNodes[index]) styleElement.removeChild(childNodes[index])
+    if (childNodes.length) {
+      styleElement.insertBefore(cssNode, childNodes[index])
+    } else {
+      styleElement.appendChild(cssNode)
+    }
+  }
+}
+
+function applyToTag (styleElement, obj) {
+  var css = obj.css
+  var media = obj.media
+  var sourceMap = obj.sourceMap
+
+  if (media) {
+    styleElement.setAttribute('media', media)
+  }
+  if (options.ssrId) {
+    styleElement.setAttribute(ssrIdKey, obj.id)
+  }
+
+  if (sourceMap) {
+    // https://developer.chrome.com/devtools/docs/javascript-debugging
+    // this makes source maps inside style tags work properly in Chrome
+    css += '\n/*# sourceURL=' + sourceMap.sources[0] + ' */'
+    // http://stackoverflow.com/a/26603875
+    css += '\n/*# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))) + ' */'
+  }
+
+  if (styleElement.styleSheet) {
+    styleElement.styleSheet.cssText = css
+  } else {
+    while (styleElement.firstChild) {
+      styleElement.removeChild(styleElement.firstChild)
+    }
+    styleElement.appendChild(document.createTextNode(css))
+  }
+}
+
+
+/***/ }),
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(13);
+module.exports = __webpack_require__(56);
+
+
+/***/ }),
+/* 13 */
+/***/ (function(module, exports, __webpack_require__) {
+
+window.jQuery = window.$ = $ = __webpack_require__(14);
+window.Vue = __webpack_require__(15);
+window.VeeValidate = __webpack_require__(18);
+window.axios = __webpack_require__(19);
 
 Vue.use(VeeValidate);
+Vue.prototype.$http = axios;
 
-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));
+Vue.component("category-nav", __webpack_require__(38));
+Vue.component("category-item", __webpack_require__(41));
+Vue.component("image-slider", __webpack_require__(44));
+Vue.component("vue-slider", __webpack_require__(50));
+Vue.component("cart-dropdown", __webpack_require__(51));
 
 $(document).ready(function () {
 
@@ -274,7 +1458,7 @@ $(document).ready(function () {
 });
 
 /***/ }),
-/* 4 */
+/* 14 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -10645,12 +11829,12 @@ return jQuery;
 
 
 /***/ }),
-/* 5 */
+/* 15 */
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
 /* WEBPACK VAR INJECTION */(function(global, setImmediate) {/*!
- * Vue.js v2.5.16
+ * Vue.js v2.5.17
  * (c) 2014-2018 Evan You
  * Released under the MIT License.
  */
@@ -15739,7 +16923,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
   value: FunctionalRenderContext
 });
 
-Vue.version = '2.5.16';
+Vue.version = '2.5.17';
 
 /*  */
 
@@ -21608,10 +22792,10 @@ Vue.compile = compileToFunctions;
 
 module.exports = Vue;
 
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(6).setImmediate))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2), __webpack_require__(16).setImmediate))
 
 /***/ }),
-/* 6 */
+/* 16 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(global) {var scope = (typeof global !== "undefined" && global) ||
@@ -21667,7 +22851,7 @@ exports._unrefActive = exports.active = function(item) {
 };
 
 // setimmediate attaches itself to the global object
-__webpack_require__(7);
+__webpack_require__(17);
 // On some exotic environments, it's not clear which object `setimmediate` was
 // able to install onto.  Search each possibility in the same order as the
 // `setimmediate` library.
@@ -21678,10 +22862,10 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
                          (typeof global !== "undefined" && global.clearImmediate) ||
                          (this && this.clearImmediate);
 
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)))
 
 /***/ }),
-/* 7 */
+/* 17 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(global, process) {(function (global, undefined) {
@@ -21871,200 +23055,10 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
     attachTo.clearImmediate = clearImmediate;
 }(typeof self === "undefined" ? typeof global === "undefined" ? this : global : self));
 
-/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0), __webpack_require__(8)))
+/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2), __webpack_require__(4)))
 
 /***/ }),
-/* 8 */
-/***/ (function(module, exports) {
-
-// shim for using process in browser
-var process = module.exports = {};
-
-// cached from whatever global is present so that test runners that stub it
-// don't break things.  But we need to wrap it in a try catch in case it is
-// wrapped in strict mode code which doesn't define any globals.  It's inside a
-// function because try/catches deoptimize in certain engines.
-
-var cachedSetTimeout;
-var cachedClearTimeout;
-
-function defaultSetTimout() {
-    throw new Error('setTimeout has not been defined');
-}
-function defaultClearTimeout () {
-    throw new Error('clearTimeout has not been defined');
-}
-(function () {
-    try {
-        if (typeof setTimeout === 'function') {
-            cachedSetTimeout = setTimeout;
-        } else {
-            cachedSetTimeout = defaultSetTimout;
-        }
-    } catch (e) {
-        cachedSetTimeout = defaultSetTimout;
-    }
-    try {
-        if (typeof clearTimeout === 'function') {
-            cachedClearTimeout = clearTimeout;
-        } else {
-            cachedClearTimeout = defaultClearTimeout;
-        }
-    } catch (e) {
-        cachedClearTimeout = defaultClearTimeout;
-    }
-} ())
-function runTimeout(fun) {
-    if (cachedSetTimeout === setTimeout) {
-        //normal enviroments in sane situations
-        return setTimeout(fun, 0);
-    }
-    // if setTimeout wasn't available but was latter defined
-    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
-        cachedSetTimeout = setTimeout;
-        return setTimeout(fun, 0);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedSetTimeout(fun, 0);
-    } catch(e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
-            return cachedSetTimeout.call(null, fun, 0);
-        } catch(e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
-            return cachedSetTimeout.call(this, fun, 0);
-        }
-    }
-
-
-}
-function runClearTimeout(marker) {
-    if (cachedClearTimeout === clearTimeout) {
-        //normal enviroments in sane situations
-        return clearTimeout(marker);
-    }
-    // if clearTimeout wasn't available but was latter defined
-    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
-        cachedClearTimeout = clearTimeout;
-        return clearTimeout(marker);
-    }
-    try {
-        // when when somebody has screwed with setTimeout but no I.E. maddness
-        return cachedClearTimeout(marker);
-    } catch (e){
-        try {
-            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
-            return cachedClearTimeout.call(null, marker);
-        } catch (e){
-            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
-            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
-            return cachedClearTimeout.call(this, marker);
-        }
-    }
-
-
-
-}
-var queue = [];
-var draining = false;
-var currentQueue;
-var queueIndex = -1;
-
-function cleanUpNextTick() {
-    if (!draining || !currentQueue) {
-        return;
-    }
-    draining = false;
-    if (currentQueue.length) {
-        queue = currentQueue.concat(queue);
-    } else {
-        queueIndex = -1;
-    }
-    if (queue.length) {
-        drainQueue();
-    }
-}
-
-function drainQueue() {
-    if (draining) {
-        return;
-    }
-    var timeout = runTimeout(cleanUpNextTick);
-    draining = true;
-
-    var len = queue.length;
-    while(len) {
-        currentQueue = queue;
-        queue = [];
-        while (++queueIndex < len) {
-            if (currentQueue) {
-                currentQueue[queueIndex].run();
-            }
-        }
-        queueIndex = -1;
-        len = queue.length;
-    }
-    currentQueue = null;
-    draining = false;
-    runClearTimeout(timeout);
-}
-
-process.nextTick = function (fun) {
-    var args = new Array(arguments.length - 1);
-    if (arguments.length > 1) {
-        for (var i = 1; i < arguments.length; i++) {
-            args[i - 1] = arguments[i];
-        }
-    }
-    queue.push(new Item(fun, args));
-    if (queue.length === 1 && !draining) {
-        runTimeout(drainQueue);
-    }
-};
-
-// v8 likes predictible objects
-function Item(fun, array) {
-    this.fun = fun;
-    this.array = array;
-}
-Item.prototype.run = function () {
-    this.fun.apply(null, this.array);
-};
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
-process.version = ''; // empty string to avoid regexp issues
-process.versions = {};
-
-function noop() {}
-
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
-process.prependListener = noop;
-process.prependOnceListener = noop;
-
-process.listeners = function (name) { return [] }
-
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-};
-
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
-};
-process.umask = function() { return 0; };
-
-
-/***/ }),
-/* 9 */
+/* 18 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29046,15 +30040,903 @@ var index_esm = {
 
 
 /***/ }),
-/* 10 */
+/* 19 */
+/***/ (function(module, exports, __webpack_require__) {
+
+module.exports = __webpack_require__(20);
+
+/***/ }),
+/* 20 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+var bind = __webpack_require__(5);
+var Axios = __webpack_require__(22);
+var defaults = __webpack_require__(3);
+
+/**
+ * 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__(9);
+axios.CancelToken = __webpack_require__(36);
+axios.isCancel = __webpack_require__(8);
+
+// Expose all/spread
+axios.all = function all(promises) {
+  return Promise.all(promises);
+};
+axios.spread = __webpack_require__(37);
+
+module.exports = axios;
+
+// Allow use of default import syntax in TypeScript
+module.exports.default = axios;
+
+
+/***/ }),
+/* 21 */
+/***/ (function(module, exports) {
+
+/*!
+ * Determine if an object is a Buffer
+ *
+ * @author   Feross Aboukhadijeh <https://feross.org>
+ * @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))
+}
+
+
+/***/ }),
+/* 22 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var defaults = __webpack_require__(3);
+var utils = __webpack_require__(0);
+var InterceptorManager = __webpack_require__(31);
+var dispatchRequest = __webpack_require__(32);
+
+/**
+ * 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;
+
+
+/***/ }),
+/* 23 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+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];
+    }
+  });
+};
+
+
+/***/ }),
+/* 24 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var createError = __webpack_require__(7);
+
+/**
+ * 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
+    ));
+  }
+};
+
+
+/***/ }),
+/* 25 */
+/***/ (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;
+};
+
+
+/***/ }),
+/* 26 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+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;
+};
+
+
+/***/ }),
+/* 27 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+// 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;
+};
+
+
+/***/ }),
+/* 28 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+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;
+    };
+  })()
+);
+
+
+/***/ }),
+/* 29 */
+/***/ (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;
+
+
+/***/ }),
+/* 30 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+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() {}
+    };
+  })()
+);
+
+
+/***/ }),
+/* 31 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+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;
+
+
+/***/ }),
+/* 32 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+var transformData = __webpack_require__(33);
+var isCancel = __webpack_require__(8);
+var defaults = __webpack_require__(3);
+var isAbsoluteURL = __webpack_require__(34);
+var combineURLs = __webpack_require__(35);
+
+/**
+ * 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);
+  });
+};
+
+
+/***/ }),
+/* 33 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var utils = __webpack_require__(0);
+
+/**
+ * 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;
+};
+
+
+/***/ }),
+/* 34 */
+/***/ (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 "<scheme>://" 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);
+};
+
+
+/***/ }),
+/* 35 */
+/***/ (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;
+};
+
+
+/***/ }),
+/* 36 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var Cancel = __webpack_require__(9);
+
+/**
+ * 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;
+
+
+/***/ }),
+/* 37 */
+/***/ (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);
+  };
+};
+
+
+/***/ }),
+/* 38 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var disposed = false
 var normalizeComponent = __webpack_require__(1)
 /* script */
-var __vue_script__ = __webpack_require__(11)
+var __vue_script__ = __webpack_require__(39)
 /* template */
-var __vue_template__ = __webpack_require__(12)
+var __vue_template__ = __webpack_require__(40)
 /* template functional */
 var __vue_template_functional__ = false
 /* styles */
@@ -29093,7 +30975,7 @@ module.exports = Component.exports
 
 
 /***/ }),
-/* 11 */
+/* 39 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29147,7 +31029,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 });
 
 /***/ }),
-/* 12 */
+/* 40 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var render = function() {
@@ -29197,15 +31079,15 @@ if (false) {
 }
 
 /***/ }),
-/* 13 */
+/* 41 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var disposed = false
 var normalizeComponent = __webpack_require__(1)
 /* script */
-var __vue_script__ = __webpack_require__(14)
+var __vue_script__ = __webpack_require__(42)
 /* template */
-var __vue_template__ = __webpack_require__(15)
+var __vue_template__ = __webpack_require__(43)
 /* template functional */
 var __vue_template_functional__ = false
 /* styles */
@@ -29244,7 +31126,7 @@ module.exports = Component.exports
 
 
 /***/ }),
-/* 14 */
+/* 42 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29287,7 +31169,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 });
 
 /***/ }),
-/* 15 */
+/* 43 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var render = function() {
@@ -29323,19 +31205,19 @@ if (false) {
 }
 
 /***/ }),
-/* 16 */
+/* 44 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var disposed = false
 function injectStyle (ssrContext) {
   if (disposed) return
-  __webpack_require__(17)
+  __webpack_require__(45)
 }
 var normalizeComponent = __webpack_require__(1)
 /* script */
-var __vue_script__ = __webpack_require__(22)
+var __vue_script__ = __webpack_require__(48)
 /* template */
-var __vue_template__ = __webpack_require__(23)
+var __vue_template__ = __webpack_require__(49)
 /* template functional */
 var __vue_template_functional__ = false
 /* styles */
@@ -29374,17 +31256,17 @@ module.exports = Component.exports
 
 
 /***/ }),
-/* 17 */
+/* 45 */
 /***/ (function(module, exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(18);
+var content = __webpack_require__(46);
 if(typeof content === 'string') content = [[module.i, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
-var update = __webpack_require__(20)("b16cefe6", content, false, {});
+var update = __webpack_require__(11)("b16cefe6", content, false, {});
 // Hot Module Replacement
 if(false) {
  // When the styles change, update the <style> tags
@@ -29400,10 +31282,10 @@ if(false) {
 }
 
 /***/ }),
-/* 18 */
+/* 46 */
 /***/ (function(module, exports, __webpack_require__) {
 
-exports = module.exports = __webpack_require__(19)(false);
+exports = module.exports = __webpack_require__(10)(false);
 // imports
 
 
@@ -29414,317 +31296,7 @@ exports.push([module.i, "\n.slide-enter-active {\n\n    -webkit-transition: all
 
 
 /***/ }),
-/* 19 */
-/***/ (function(module, exports) {
-
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-// css base code, injected by the css-loader
-module.exports = function(useSourceMap) {
-	var list = [];
-
-	// return the list of modules as css string
-	list.toString = function toString() {
-		return this.map(function (item) {
-			var content = cssWithMappingToString(item, useSourceMap);
-			if(item[2]) {
-				return "@media " + item[2] + "{" + content + "}";
-			} else {
-				return content;
-			}
-		}).join("");
-	};
-
-	// import a list of modules into the list
-	list.i = function(modules, mediaQuery) {
-		if(typeof modules === "string")
-			modules = [[null, modules, ""]];
-		var alreadyImportedModules = {};
-		for(var i = 0; i < this.length; i++) {
-			var id = this[i][0];
-			if(typeof id === "number")
-				alreadyImportedModules[id] = true;
-		}
-		for(i = 0; i < modules.length; i++) {
-			var item = modules[i];
-			// skip already imported module
-			// this implementation is not 100% perfect for weird media query combinations
-			//  when a module is imported multiple times with different media queries.
-			//  I hope this will never occur (Hey this way we have smaller bundles)
-			if(typeof item[0] !== "number" || !alreadyImportedModules[item[0]]) {
-				if(mediaQuery && !item[2]) {
-					item[2] = mediaQuery;
-				} else if(mediaQuery) {
-					item[2] = "(" + item[2] + ") and (" + mediaQuery + ")";
-				}
-				list.push(item);
-			}
-		}
-	};
-	return list;
-};
-
-function cssWithMappingToString(item, useSourceMap) {
-	var content = item[1] || '';
-	var cssMapping = item[3];
-	if (!cssMapping) {
-		return content;
-	}
-
-	if (useSourceMap && typeof btoa === 'function') {
-		var sourceMapping = toComment(cssMapping);
-		var sourceURLs = cssMapping.sources.map(function (source) {
-			return '/*# sourceURL=' + cssMapping.sourceRoot + source + ' */'
-		});
-
-		return [content].concat(sourceURLs).concat([sourceMapping]).join('\n');
-	}
-
-	return [content].join('\n');
-}
-
-// Adapted from convert-source-map (MIT)
-function toComment(sourceMap) {
-	// eslint-disable-next-line no-undef
-	var base64 = btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap))));
-	var data = 'sourceMappingURL=data:application/json;charset=utf-8;base64,' + base64;
-
-	return '/*# ' + data + ' */';
-}
-
-
-/***/ }),
-/* 20 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/*
-  MIT License http://www.opensource.org/licenses/mit-license.php
-  Author Tobias Koppers @sokra
-  Modified by Evan You @yyx990803
-*/
-
-var hasDocument = typeof document !== 'undefined'
-
-if (typeof DEBUG !== 'undefined' && DEBUG) {
-  if (!hasDocument) {
-    throw new Error(
-    'vue-style-loader cannot be used in a non-browser environment. ' +
-    "Use { target: 'node' } in your Webpack config to indicate a server-rendering environment."
-  ) }
-}
-
-var listToStyles = __webpack_require__(21)
-
-/*
-type StyleObject = {
-  id: number;
-  parts: Array<StyleObjectPart>
-}
-
-type StyleObjectPart = {
-  css: string;
-  media: string;
-  sourceMap: ?string
-}
-*/
-
-var stylesInDom = {/*
-  [id: number]: {
-    id: number,
-    refs: number,
-    parts: Array<(obj?: StyleObjectPart) => void>
-  }
-*/}
-
-var head = hasDocument && (document.head || document.getElementsByTagName('head')[0])
-var singletonElement = null
-var singletonCounter = 0
-var isProduction = false
-var noop = function () {}
-var options = null
-var ssrIdKey = 'data-vue-ssr-id'
-
-// Force single-tag solution on IE6-9, which has a hard limit on the # of <style>
-// tags it will allow on a page
-var isOldIE = typeof navigator !== 'undefined' && /msie [6-9]\b/.test(navigator.userAgent.toLowerCase())
-
-module.exports = function (parentId, list, _isProduction, _options) {
-  isProduction = _isProduction
-
-  options = _options || {}
-
-  var styles = listToStyles(parentId, list)
-  addStylesToDom(styles)
-
-  return function update (newList) {
-    var mayRemove = []
-    for (var i = 0; i < styles.length; i++) {
-      var item = styles[i]
-      var domStyle = stylesInDom[item.id]
-      domStyle.refs--
-      mayRemove.push(domStyle)
-    }
-    if (newList) {
-      styles = listToStyles(parentId, newList)
-      addStylesToDom(styles)
-    } else {
-      styles = []
-    }
-    for (var i = 0; i < mayRemove.length; i++) {
-      var domStyle = mayRemove[i]
-      if (domStyle.refs === 0) {
-        for (var j = 0; j < domStyle.parts.length; j++) {
-          domStyle.parts[j]()
-        }
-        delete stylesInDom[domStyle.id]
-      }
-    }
-  }
-}
-
-function addStylesToDom (styles /* Array<StyleObject> */) {
-  for (var i = 0; i < styles.length; i++) {
-    var item = styles[i]
-    var domStyle = stylesInDom[item.id]
-    if (domStyle) {
-      domStyle.refs++
-      for (var j = 0; j < domStyle.parts.length; j++) {
-        domStyle.parts[j](item.parts[j])
-      }
-      for (; j < item.parts.length; j++) {
-        domStyle.parts.push(addStyle(item.parts[j]))
-      }
-      if (domStyle.parts.length > item.parts.length) {
-        domStyle.parts.length = item.parts.length
-      }
-    } else {
-      var parts = []
-      for (var j = 0; j < item.parts.length; j++) {
-        parts.push(addStyle(item.parts[j]))
-      }
-      stylesInDom[item.id] = { id: item.id, refs: 1, parts: parts }
-    }
-  }
-}
-
-function createStyleElement () {
-  var styleElement = document.createElement('style')
-  styleElement.type = 'text/css'
-  head.appendChild(styleElement)
-  return styleElement
-}
-
-function addStyle (obj /* StyleObjectPart */) {
-  var update, remove
-  var styleElement = document.querySelector('style[' + ssrIdKey + '~="' + obj.id + '"]')
-
-  if (styleElement) {
-    if (isProduction) {
-      // has SSR styles and in production mode.
-      // simply do nothing.
-      return noop
-    } else {
-      // has SSR styles but in dev mode.
-      // for some reason Chrome can't handle source map in server-rendered
-      // style tags - source maps in <style> only works if the style tag is
-      // created and inserted dynamically. So we remove the server rendered
-      // styles and inject new ones.
-      styleElement.parentNode.removeChild(styleElement)
-    }
-  }
-
-  if (isOldIE) {
-    // use singleton mode for IE9.
-    var styleIndex = singletonCounter++
-    styleElement = singletonElement || (singletonElement = createStyleElement())
-    update = applyToSingletonTag.bind(null, styleElement, styleIndex, false)
-    remove = applyToSingletonTag.bind(null, styleElement, styleIndex, true)
-  } else {
-    // use multi-style-tag mode in all other cases
-    styleElement = createStyleElement()
-    update = applyToTag.bind(null, styleElement)
-    remove = function () {
-      styleElement.parentNode.removeChild(styleElement)
-    }
-  }
-
-  update(obj)
-
-  return function updateStyle (newObj /* StyleObjectPart */) {
-    if (newObj) {
-      if (newObj.css === obj.css &&
-          newObj.media === obj.media &&
-          newObj.sourceMap === obj.sourceMap) {
-        return
-      }
-      update(obj = newObj)
-    } else {
-      remove()
-    }
-  }
-}
-
-var replaceText = (function () {
-  var textStore = []
-
-  return function (index, replacement) {
-    textStore[index] = replacement
-    return textStore.filter(Boolean).join('\n')
-  }
-})()
-
-function applyToSingletonTag (styleElement, index, remove, obj) {
-  var css = remove ? '' : obj.css
-
-  if (styleElement.styleSheet) {
-    styleElement.styleSheet.cssText = replaceText(index, css)
-  } else {
-    var cssNode = document.createTextNode(css)
-    var childNodes = styleElement.childNodes
-    if (childNodes[index]) styleElement.removeChild(childNodes[index])
-    if (childNodes.length) {
-      styleElement.insertBefore(cssNode, childNodes[index])
-    } else {
-      styleElement.appendChild(cssNode)
-    }
-  }
-}
-
-function applyToTag (styleElement, obj) {
-  var css = obj.css
-  var media = obj.media
-  var sourceMap = obj.sourceMap
-
-  if (media) {
-    styleElement.setAttribute('media', media)
-  }
-  if (options.ssrId) {
-    styleElement.setAttribute(ssrIdKey, obj.id)
-  }
-
-  if (sourceMap) {
-    // https://developer.chrome.com/devtools/docs/javascript-debugging
-    // this makes source maps inside style tags work properly in Chrome
-    css += '\n/*# sourceURL=' + sourceMap.sources[0] + ' */'
-    // http://stackoverflow.com/a/26603875
-    css += '\n/*# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(JSON.stringify(sourceMap)))) + ' */'
-  }
-
-  if (styleElement.styleSheet) {
-    styleElement.styleSheet.cssText = css
-  } else {
-    while (styleElement.firstChild) {
-      styleElement.removeChild(styleElement.firstChild)
-    }
-    styleElement.appendChild(document.createTextNode(css))
-  }
-}
-
-
-/***/ }),
-/* 21 */
+/* 47 */
 /***/ (function(module, exports) {
 
 /**
@@ -29757,7 +31329,7 @@ module.exports = function listToStyles (parentId, list) {
 
 
 /***/ }),
-/* 22 */
+/* 48 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29855,7 +31427,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 });
 
 /***/ }),
-/* 23 */
+/* 49 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var render = function() {
@@ -29910,34 +31482,25 @@ if (false) {
 }
 
 /***/ }),
-/* 24 */
+/* 50 */
 /***/ (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(t<this.min)return this.printError("The maximum value can not be less than the minimum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},min:function(t){if(t>this.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(i<this.position[0])return!1;this.currentSlider=1}else if(this.disabledArray[1]){if(i>this.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 t<i[0]?(this.setTransform(i[0]),this.setCurrentValue(s[0]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][0],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][0],e,!0)):this.fixed||this.disabledArray[0]||1!==this.currentSlider||(this.focusSlider=0,this.currentSlider=0)):(this.setTransform(i[1]),this.setCurrentValue(s[1]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][1],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][1],e,!0)):this.fixed||this.disabledArray[1]||0!==this.currentSlider||(this.focusSlider=1,this.currentSlider=1))},isDiff:function(t,e){return Object.prototype.toString.call(t)!==Object.prototype.toString.call(e)||(Array.isArray(t)&&t.length===e.length?t.some(function(t,i){return t!==e[i]}):t!==e)},setCurrentValue:function(t,e,i){var s=i?this.idleSlider:this.currentSlider;if(t<this.minimum||t>this.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;e<this.slider.length;e++)this.slider[e].style.transitionDuration=t+"s",this.slider[e].style.WebkitTransitionDuration=t+"s";this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"}else this.slider.style.transitionDuration=t+"s",this.slider.style.WebkitTransitionDuration=t+"s",this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"},limitValue:function(t){var e=this;if(this.data)return t;var i=function(i){return i<e.min?(e.printError("The value of the slider is "+t+", the minimum value is "+e.min+", the value of this slider can not be less than the minimum value"),e.min):i>e.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;e<this.length;e++){var i=this[e];i[2]?t.push("@media "+i[2]+"{"+i[1]+"}"):t.push(i[1])}return t.join("")},t.i=function(e,i){"string"==typeof e&&(e=[[null,e,""]]);for(var s={},r=0;r<this.length;r++){var o=this[r][0];"number"==typeof o&&(s[o]=!0)}for(r=0;r<e.length;r++){var n=e[r];"number"==typeof n[0]&&s[n[0]]||(i&&!n[2]?n[2]=i:i&&(n[2]="("+n[2]+") and ("+i+")"),t.push(n))}},t}},function(t,e){t.exports=function(t,e,i,s){var r,o=t=t||{},n=typeof t.default;"object"!==n&&"function"!==n||(r=t,o=t.default);var l="function"==typeof o?o.options:o;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns),i&&(l._scopeId=i),s){var a=Object.create(l.computed||null);Object.keys(s).forEach(function(t){var e=s[t];a[t]=function(){return e}}),l.computed=a}return{esModule:r,exports:o,options:l}}},function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"show",rawName:"v-show",value:t.show,expression:"show"}],ref:"wrap",class:["vue-slider-component",t.flowDirection,t.disabledClass,t.stateClass,{"vue-slider-has-label":t.piecewiseLabel}],style:[t.wrapStyles,t.boolDisabled?t.disabledStyle:null],on:{click:t.wrapClick}},[i("div",{ref:"elem",staticClass:"vue-slider",style:[t.elemStyles,t.bgStyle],attrs:{"aria-hidden":"true"}},[t.isRange?[i("div",{key:"dot0",ref:"dot0",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[0]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[0]?t.disabledDotStyles[0]:null,t.sliderStyles[0],t.focusFlag&&0===t.focusSlider?t.focusStyles[0]:null],on:{mousedown:function(e){t.moveStart(e,0)},touchstart:function(e){t.moveStart(e,0)}}},[i("div",{ref:"tooltip0",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[0]},[t._v(t._s(t.formatter?t.formatting(t.val[0]):t.val[0]))])],{value:t.val[0],index:0,disabled:!t.boolDisabled&&t.disabledArray[0]})],2)]),t._v(" "),i("div",{key:"dot1",ref:"dot1",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&1===t.focusSlider,"vue-slider-dot-dragging":t.flag&&1===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[1]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[1]?t.disabledDotStyles[1]:null,t.sliderStyles[1],t.focusFlag&&1===t.focusSlider?t.focusStyles[1]:null],on:{mousedown:function(e){t.moveStart(e,1)},touchstart:function(e){t.moveStart(e,1)}}},[i("div",{ref:"tooltip1",class:["vue-slider-tooltip-"+t.tooltipDirection[1],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[1]},[t._v(t._s(t.formatter?t.formatting(t.val[1]):t.val[1]))])],{value:t.val[1],index:1,disabled:!t.boolDisabled&&t.disabledArray[1]})],2)])]:[i("div",{key:"dot",ref:"dot",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider}],style:[t.dotStyles,t.sliderStyles,t.focusFlag&&0===t.focusSlider?t.focusStyles:null],on:{mousedown:t.moveStart,touchstart:t.moveStart}},[i("div",{class:["vue-slider-tooltip-"+t.tooltipDirection,"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v(t._s(t.formatter?t.formatting(t.val):t.val))])],{value:t.val})],2)])],t._v(" "),i("ul",{staticClass:"vue-slider-piecewise"},t._l(t.piecewiseDotWrap,function(e,s){return i("li",{key:s,staticClass:"vue-slider-piecewise-item",style:[t.piecewiseDotStyle,e.style]},[t._t("piecewise",[t.piecewise?i("span",{staticClass:"vue-slider-piecewise-dot",style:[t.piecewiseStyle,e.inRange?t.piecewiseActiveStyle:null]}):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange}),t._v(" "),t._t("label",[t.piecewiseLabel?i("span",{staticClass:"vue-slider-piecewise-label",style:[t.labelStyle,e.inRange?t.labelActiveStyle:null]},[t._v("\n            "+t._s(e.label)+"\n          ")]):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange})],2)})),t._v(" "),i("div",{ref:"process",class:["vue-slider-process",{"vue-slider-process-dragable":t.isRange&&t.processDragable}],style:t.processStyle,on:{click:t.processClick,mousedown:function(e){t.moveStart(e,0,!0)},touchstart:function(e){t.moveStart(e,0,!0)}}},[i("div",{ref:"mergedTooltip",staticClass:"vue-merged-tooltip",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"],style:t.tooltipMergedPosition},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v("\n            "+t._s(t.mergeFormatter?t.mergeFormatting(t.val[0],t.val[1]):t.formatter?t.val[0]===t.val[1]?t.formatting(t.val[0]):t.formatting(t.val[0])+" - "+t.formatting(t.val[1]):t.val[0]===t.val[1]?t.val[0]:t.val[0]+" - "+t.val[1])+"\n          ")])])],2)]),t._v(" "),t.isRange||t.data?t._e():i("input",{directives:[{name:"model",rawName:"v-model",value:t.val,expression:"val"}],staticClass:"vue-slider-sr-only",attrs:{type:"range",min:t.min,max:t.max},domProps:{value:t.val},on:{__r:function(e){t.val=e.target.value}}})],2)])},staticRenderFns:[]}},function(t,e,i){var s=i(3);"string"==typeof s&&(s=[[t.i,s,""]]),s.locals&&(t.exports=s.locals);i(8)("743d98f5",s,!0)},function(t,e,i){function s(t){for(var e=0;e<t.length;e++){var i=t[e],s=d[i.id];if(s){s.refs++;for(var r=0;r<s.parts.length;r++)s.parts[r](i.parts[r]);for(;r<i.parts.length;r++)s.parts.push(o(i.parts[r]));s.parts.length>i.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r<i.parts.length;r++)n.push(o(i.parts[r]));d[i.id]={id:i.id,refs:1,parts:n}}}}function r(){var t=document.createElement("style");return t.type="text/css",h.appendChild(t),t}function o(t){var e,i,s=document.querySelector('style[data-vue-ssr-id~="'+t.id+'"]');if(s){if(f)return v;s.parentNode.removeChild(s)}if(m){var o=p++;s=c||(c=r()),e=n.bind(null,s,o,!1),i=n.bind(null,s,o,!0)}else s=r(),e=l.bind(null,s),i=function(){s.parentNode.removeChild(s)};return e(t),function(s){if(s){if(s.css===t.css&&s.media===t.media&&s.sourceMap===t.sourceMap)return;e(t=s)}else i()}}function n(t,e,i,s){var r=i?"":s.css;if(t.styleSheet)t.styleSheet.cssText=g(e,r);else{var o=document.createTextNode(r),n=t.childNodes;n[e]&&t.removeChild(n[e]),n.length?t.insertBefore(o,n[e]):t.appendChild(o)}}function l(t,e){var i=e.css,s=e.media,r=e.sourceMap;if(s&&t.setAttribute("media",s),r&&(i+="\n/*# sourceURL="+r.sources[0]+" */",i+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(r))))+" */"),t.styleSheet)t.styleSheet.cssText=i;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(i))}}var a="undefined"!=typeof document;if("undefined"!=typeof DEBUG&&DEBUG&&!a)throw new Error("vue-style-loader cannot be used in a non-browser environment. Use { target: 'node' } in your Webpack config to indicate a server-rendering environment.");var u=i(9),d={},h=a&&(document.head||document.getElementsByTagName("head")[0]),c=null,p=0,f=!1,v=function(){},m="undefined"!=typeof navigator&&/msie [6-9]\b/.test(navigator.userAgent.toLowerCase());t.exports=function(t,e,i){f=i;var r=u(t,e);return s(r),function(e){for(var i=[],o=0;o<r.length;o++){var n=r[o],l=d[n.id];l.refs--,i.push(l)}e?(r=u(t,e),s(r)):r=[];for(var o=0;o<i.length;o++){var l=i[o];if(0===l.refs){for(var a=0;a<l.parts.length;a++)l.parts[a]();delete d[l.id]}}}};var g=function(){var t=[];return function(e,i){return t[e]=i,t.filter(Boolean).join("\n")}}()},function(t,e){t.exports=function(t,e){for(var i=[],s={},r=0;r<e.length;r++){var o=e[r],n=o[0],l=o[1],a=o[2],u=o[3],d={id:t+":"+r,css:l,media:a,sourceMap:u};s[n]?s[n].parts.push(d):i.push(s[n]={id:n,parts:[d]})}return i}}])});
+!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},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(t<this.min)return this.printError("The maximum value can not be less than the minimum value.");var e=this.limitValue(this.val);this.setValue(e),this.refresh()},min:function(t){if(t>this.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(i<this.position[0])return!1;this.currentSlider=1}else if(this.disabledArray[1]){if(i>this.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 t<i[0]?(this.setTransform(i[0]),this.setCurrentValue(s[0]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][0],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][0],e,!0)):this.fixed||this.disabledArray[0]||1!==this.currentSlider||(this.focusSlider=0,this.currentSlider=0)):(this.setTransform(i[1]),this.setCurrentValue(s[1]),this.isRange&&this.fixed?(this.setTransform(this.limit[this.idleSlider][1],!0),this.setCurrentValue(this.valueLimit[this.idleSlider][1],e,!0)):this.fixed||this.disabledArray[1]||0!==this.currentSlider||(this.focusSlider=1,this.currentSlider=1))},isDiff:function(t,e){return Object.prototype.toString.call(t)!==Object.prototype.toString.call(e)||(Array.isArray(t)&&t.length===e.length?t.some(function(t,i){return t!==e[i]}):t!==e)},setCurrentValue:function(t,e,i){var s=i?this.idleSlider:this.currentSlider;if(t<this.minimum||t>this.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;e<this.slider.length;e++)this.slider[e].style.transitionDuration=t+"s",this.slider[e].style.WebkitTransitionDuration=t+"s";this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"}else this.slider.style.transitionDuration=t+"s",this.slider.style.WebkitTransitionDuration=t+"s",this.$refs.process.style.transitionDuration=t+"s",this.$refs.process.style.WebkitTransitionDuration=t+"s"},limitValue:function(t){var e=this;if(this.data)return t;var i=function(i){return i<e.min?(e.printError("The value of the slider is "+t+", the minimum value is "+e.min+", the value of this slider can not be less than the minimum value"),e.min):i>e.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;e<this.length;e++){var i=this[e];i[2]?t.push("@media "+i[2]+"{"+i[1]+"}"):t.push(i[1])}return t.join("")},t.i=function(e,i){"string"==typeof e&&(e=[[null,e,""]]);for(var s={},r=0;r<this.length;r++){var o=this[r][0];"number"==typeof o&&(s[o]=!0)}for(r=0;r<e.length;r++){var n=e[r];"number"==typeof n[0]&&s[n[0]]||(i&&!n[2]?n[2]=i:i&&(n[2]="("+n[2]+") and ("+i+")"),t.push(n))}},t}},function(t,e){t.exports=function(t,e,i,s){var r,o=t=t||{},n=typeof t.default;"object"!==n&&"function"!==n||(r=t,o=t.default);var l="function"==typeof o?o.options:o;if(e&&(l.render=e.render,l.staticRenderFns=e.staticRenderFns),i&&(l._scopeId=i),s){var a=Object.create(l.computed||null);Object.keys(s).forEach(function(t){var e=s[t];a[t]=function(){return e}}),l.computed=a}return{esModule:r,exports:o,options:l}}},function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"show",rawName:"v-show",value:t.show,expression:"show"}],ref:"wrap",class:["vue-slider-component",t.flowDirection,t.disabledClass,t.stateClass,{"vue-slider-has-label":t.piecewiseLabel}],style:[t.wrapStyles,t.boolDisabled?t.disabledStyle:null],on:{click:t.wrapClick}},[i("div",{ref:"elem",staticClass:"vue-slider",style:[t.elemStyles,t.bgStyle],attrs:{"aria-hidden":"true"}},[t.isRange?[i("div",{key:"dot0",ref:"dot0",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[0]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[0]?t.disabledDotStyles[0]:null,t.sliderStyles[0],t.focusFlag&&0===t.focusSlider?t.focusStyles[0]:null],on:{mousedown:function(e){t.moveStart(e,0)},touchstart:function(e){t.moveStart(e,0)}}},[i("div",{ref:"tooltip0",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[0]},[t._v(t._s(t.formatter?t.formatting(t.val[0]):t.val[0]))])],{value:t.val[0],index:0,disabled:!t.boolDisabled&&t.disabledArray[0]})],2)]),t._v(" "),i("div",{key:"dot1",ref:"dot1",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&1===t.focusSlider,"vue-slider-dot-dragging":t.flag&&1===t.currentSlider,"vue-slider-dot-disabled":!t.boolDisabled&&t.disabledArray[1]}],style:[t.dotStyles,!t.boolDisabled&&t.disabledArray[1]?t.disabledDotStyles[1]:null,t.sliderStyles[1],t.focusFlag&&1===t.focusSlider?t.focusStyles[1]:null],on:{mousedown:function(e){t.moveStart(e,1)},touchstart:function(e){t.moveStart(e,1)}}},[i("div",{ref:"tooltip1",class:["vue-slider-tooltip-"+t.tooltipDirection[1],"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles[1]},[t._v(t._s(t.formatter?t.formatting(t.val[1]):t.val[1]))])],{value:t.val[1],index:1,disabled:!t.boolDisabled&&t.disabledArray[1]})],2)])]:[i("div",{key:"dot",ref:"dot",class:[t.tooltipStatus,"vue-slider-dot",{"vue-slider-dot-focus":t.focusFlag&&0===t.focusSlider,"vue-slider-dot-dragging":t.flag&&0===t.currentSlider}],style:[t.dotStyles,t.sliderStyles,t.focusFlag&&0===t.focusSlider?t.focusStyles:null],on:{mousedown:t.moveStart,touchstart:t.moveStart}},[i("div",{class:["vue-slider-tooltip-"+t.tooltipDirection,"vue-slider-tooltip-wrap"]},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v(t._s(t.formatter?t.formatting(t.val):t.val))])],{value:t.val})],2)])],t._v(" "),i("ul",{staticClass:"vue-slider-piecewise"},t._l(t.piecewiseDotWrap,function(e,s){return i("li",{key:s,staticClass:"vue-slider-piecewise-item",style:[t.piecewiseDotStyle,e.style]},[t._t("piecewise",[t.piecewise?i("span",{staticClass:"vue-slider-piecewise-dot",style:[t.piecewiseStyle,e.inRange?t.piecewiseActiveStyle:null]}):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange}),t._v(" "),t._t("label",[t.piecewiseLabel?i("span",{staticClass:"vue-slider-piecewise-label",style:[t.labelStyle,e.inRange?t.labelActiveStyle:null]},[t._v("\n            "+t._s(e.label)+"\n          ")]):t._e()],{label:e.label,index:s,first:0===s,last:s===t.piecewiseDotWrap.length-1,active:e.inRange})],2)})),t._v(" "),i("div",{ref:"process",class:["vue-slider-process",{"vue-slider-process-dragable":t.isRange&&t.processDragable}],style:t.processStyle,on:{click:t.processClick,mousedown:function(e){t.moveStart(e,0,!0)},touchstart:function(e){t.moveStart(e,0,!0)}}},[i("div",{ref:"mergedTooltip",staticClass:"vue-merged-tooltip",class:["vue-slider-tooltip-"+t.tooltipDirection[0],"vue-slider-tooltip-wrap"],style:t.tooltipMergedPosition},[t._t("tooltip",[i("span",{staticClass:"vue-slider-tooltip",style:t.tooltipStyles},[t._v("\n            "+t._s(t.mergeFormatter?t.mergeFormatting(t.val[0],t.val[1]):t.formatter?t.val[0]===t.val[1]?t.formatting(t.val[0]):t.formatting(t.val[0])+" - "+t.formatting(t.val[1]):t.val[0]===t.val[1]?t.val[0]:t.val[0]+" - "+t.val[1])+"\n          ")])])],2)]),t._v(" "),t.isRange||t.data?t._e():i("input",{directives:[{name:"model",rawName:"v-model",value:t.val,expression:"val"}],staticClass:"vue-slider-sr-only",attrs:{type:"range",min:t.min,max:t.max},domProps:{value:t.val},on:{__r:function(e){t.val=e.target.value}}})],2)])},staticRenderFns:[]}},function(t,e,i){var s=i(3);"string"==typeof s&&(s=[[t.i,s,""]]),s.locals&&(t.exports=s.locals);i(8)("743d98f5",s,!0)},function(t,e,i){function s(t){for(var e=0;e<t.length;e++){var i=t[e],s=d[i.id];if(s){s.refs++;for(var r=0;r<s.parts.length;r++)s.parts[r](i.parts[r]);for(;r<i.parts.length;r++)s.parts.push(o(i.parts[r]));s.parts.length>i.parts.length&&(s.parts.length=i.parts.length)}else{for(var n=[],r=0;r<i.parts.length;r++)n.push(o(i.parts[r]));d[i.id]={id:i.id,refs:1,parts:n}}}}function r(){var t=document.createElement("style");return t.type="text/css",h.appendChild(t),t}function o(t){var e,i,s=document.querySelector('style[data-vue-ssr-id~="'+t.id+'"]');if(s){if(f)return v;s.parentNode.removeChild(s)}if(m){var o=p++;s=c||(c=r()),e=n.bind(null,s,o,!1),i=n.bind(null,s,o,!0)}else s=r(),e=l.bind(null,s),i=function(){s.parentNode.removeChild(s)};return e(t),function(s){if(s){if(s.css===t.css&&s.media===t.media&&s.sourceMap===t.sourceMap)return;e(t=s)}else i()}}function n(t,e,i,s){var r=i?"":s.css;if(t.styleSheet)t.styleSheet.cssText=g(e,r);else{var o=document.createTextNode(r),n=t.childNodes;n[e]&&t.removeChild(n[e]),n.length?t.insertBefore(o,n[e]):t.appendChild(o)}}function l(t,e){var i=e.css,s=e.media,r=e.sourceMap;if(s&&t.setAttribute("media",s),r&&(i+="\n/*# sourceURL="+r.sources[0]+" */",i+="\n/*# sourceMappingURL=data:application/json;base64,"+btoa(unescape(encodeURIComponent(JSON.stringify(r))))+" */"),t.styleSheet)t.styleSheet.cssText=i;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(i))}}var a="undefined"!=typeof document;if("undefined"!=typeof DEBUG&&DEBUG&&!a)throw new Error("vue-style-loader cannot be used in a non-browser environment. Use { target: 'node' } in your Webpack config to indicate a server-rendering environment.");var u=i(9),d={},h=a&&(document.head||document.getElementsByTagName("head")[0]),c=null,p=0,f=!1,v=function(){},m="undefined"!=typeof navigator&&/msie [6-9]\b/.test(navigator.userAgent.toLowerCase());t.exports=function(t,e,i){f=i;var r=u(t,e);return s(r),function(e){for(var i=[],o=0;o<r.length;o++){var n=r[o],l=d[n.id];l.refs--,i.push(l)}e?(r=u(t,e),s(r)):r=[];for(var o=0;o<i.length;o++){var l=i[o];if(0===l.refs){for(var a=0;a<l.parts.length;a++)l.parts[a]();delete d[l.id]}}}};var g=function(){var t=[];return function(e,i){return t[e]=i,t.filter(Boolean).join("\n")}}()},function(t,e){t.exports=function(t,e){for(var i=[],s={},r=0;r<e.length;r++){var o=e[r],n=o[0],l=o[1],a=o[2],u=o[3],d={id:t+":"+r,css:l,media:a,sourceMap:u};s[n]?s[n].parts.push(d):i.push(s[n]={id:n,parts:[d]})}return i}}])});
 
 /***/ }),
-/* 25 */
-/***/ (function(module, exports) {
-
-// removed by extract-text-webpack-plugin
-
-/***/ }),
-/* 26 */,
-/* 27 */,
-/* 28 */,
-/* 29 */
+/* 51 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var disposed = false
 function injectStyle (ssrContext) {
   if (disposed) return
-  __webpack_require__(32)
+  __webpack_require__(52)
 }
 var normalizeComponent = __webpack_require__(1)
 /* script */
-var __vue_script__ = __webpack_require__(30)
+var __vue_script__ = __webpack_require__(54)
 /* template */
-var __vue_template__ = __webpack_require__(31)
+var __vue_template__ = __webpack_require__(55)
 /* template functional */
 var __vue_template_functional__ = false
 /* styles */
@@ -29976,7 +31539,47 @@ module.exports = Component.exports
 
 
 /***/ }),
-/* 30 */
+/* 52 */
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__(53);
+if(typeof content === 'string') content = [[module.i, content, '']];
+if(content.locals) module.exports = content.locals;
+// add the styles to the DOM
+var update = __webpack_require__(11)("69b33cbc", content, false, {});
+// Hot Module Replacement
+if(false) {
+ // When the styles change, update the <style> tags
+ if(!content.locals) {
+   module.hot.accept("!!../../../../../node_modules/css-loader/index.js!../../../../../node_modules/vue-loader/lib/style-compiler/index.js?{\"vue\":true,\"id\":\"data-v-0f947e82\",\"scoped\":false,\"hasInlineConfig\":true}!../../../../../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./cart-dropdown.vue", function() {
+     var newContent = require("!!../../../../../node_modules/css-loader/index.js!../../../../../node_modules/vue-loader/lib/style-compiler/index.js?{\"vue\":true,\"id\":\"data-v-0f947e82\",\"scoped\":false,\"hasInlineConfig\":true}!../../../../../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./cart-dropdown.vue");
+     if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
+     update(newContent);
+   });
+ }
+ // When the module is disposed, remove the <style> tags
+ module.hot.dispose(function() { update(); });
+}
+
+/***/ }),
+/* 53 */
+/***/ (function(module, exports, __webpack_require__) {
+
+exports = module.exports = __webpack_require__(10)(false);
+// imports
+
+
+// module
+exports.push([module.i, "\n.show {\n    display: none;\n}\n.dropdown-cart {\n    position: absolute;\n    background: #FFFFFF;\n    border: 1px solid #E8E8E8;\n    -webkit-box-shadow: 1px 3px 6px 0 rgba(0,0,0,0.40);\n            box-shadow: 1px 3px 6px 0 rgba(0,0,0,0.40);\n    padding: 20px;\n    border-radius: 1px;\n    right: 10%;\n    top: 75px;\n    width: 387px;\n    z-index: 5;\n}\n.dropdown-cart > .dropdown-header {\n    width: 100%;\n}\n.dropdown-cart > .dropdown-header p{\n    display: inline;\n    line-height: 25px;\n}\n.dropdown-cart > .dropdown-header i{\n    cursor: pointer;\n    float: right;\n    height: 22px;\n    width: 22px;\n}\n.dropdown-content {\n    padding-top: 10px;\n    padding-bottom: 10px;\n}\n.dropdown-content .item{\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-orient: horizontal;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: row;\n            flex-direction: row;\n    border-bottom: 1px solid #E8E8E8;\n}\n.dropdown-content .item img{\n    height: 75px;\n    width: 75px;\n    margin-right: 8px;\n}\n.item-details .item-name {\n    font-size: 16px;\n    font-weight: bold;\n    margin-bottom: 10px;\n}\n.item-details .item-price {\n    margin-bottom: 10px;\n}\n.item-details .item-qty {\n    margin-bottom: 10px;\n}\n.dropdown-footer {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-orient: horizontal;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: row;\n            flex-direction: row;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.dropdown-footer button {\n    border-radius: 0px;\n}\n\n", ""]);
+
+// exports
+
+
+/***/ }),
+/* 54 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -30061,7 +31664,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
 });
 
 /***/ }),
-/* 31 */
+/* 55 */
 /***/ (function(module, exports, __webpack_require__) {
 
 var render = function() {
@@ -30144,44 +31747,10 @@ if (false) {
 }
 
 /***/ }),
-/* 32 */
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__(33);
-if(typeof content === 'string') content = [[module.i, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var update = __webpack_require__(20)("69b33cbc", content, false, {});
-// Hot Module Replacement
-if(false) {
- // When the styles change, update the <style> tags
- if(!content.locals) {
-   module.hot.accept("!!../../../../../node_modules/css-loader/index.js!../../../../../node_modules/vue-loader/lib/style-compiler/index.js?{\"vue\":true,\"id\":\"data-v-0f947e82\",\"scoped\":false,\"hasInlineConfig\":true}!../../../../../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./cart-dropdown.vue", function() {
-     var newContent = require("!!../../../../../node_modules/css-loader/index.js!../../../../../node_modules/vue-loader/lib/style-compiler/index.js?{\"vue\":true,\"id\":\"data-v-0f947e82\",\"scoped\":false,\"hasInlineConfig\":true}!../../../../../node_modules/vue-loader/lib/selector.js?type=styles&index=0!./cart-dropdown.vue");
-     if(typeof newContent === 'string') newContent = [[module.id, newContent, '']];
-     update(newContent);
-   });
- }
- // When the module is disposed, remove the <style> tags
- module.hot.dispose(function() { update(); });
-}
-
-/***/ }),
-/* 33 */
-/***/ (function(module, exports, __webpack_require__) {
-
-exports = module.exports = __webpack_require__(19)(false);
-// imports
-
-
-// module
-exports.push([module.i, "\n.show {\n    display: none;\n}\n.dropdown-cart {\n    position: absolute;\n    background: #FFFFFF;\n    border: 1px solid #E8E8E8;\n    -webkit-box-shadow: 1px 3px 6px 0 rgba(0,0,0,0.40);\n            box-shadow: 1px 3px 6px 0 rgba(0,0,0,0.40);\n    padding: 20px;\n    border-radius: 1px;\n    right: 10%;\n    top: 75px;\n    width: 387px;\n    z-index: 5;\n}\n.dropdown-cart > .dropdown-header {\n    width: 100%;\n}\n.dropdown-cart > .dropdown-header p{\n    display: inline;\n    line-height: 25px;\n}\n.dropdown-cart > .dropdown-header i{\n    cursor: pointer;\n    float: right;\n    height: 22px;\n    width: 22px;\n}\n.dropdown-content {\n    padding-top: 10px;\n    padding-bottom: 10px;\n}\n.dropdown-content .item{\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-orient: horizontal;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: row;\n            flex-direction: row;\n    border-bottom: 1px solid #E8E8E8;\n}\n.dropdown-content .item img{\n    height: 75px;\n    width: 75px;\n    margin-right: 8px;\n}\n.item-details .item-name {\n    font-size: 16px;\n    font-weight: bold;\n    margin-bottom: 10px;\n}\n.item-details .item-price {\n    margin-bottom: 10px;\n}\n.item-details .item-qty {\n    margin-bottom: 10px;\n}\n.dropdown-footer {\n    display: -webkit-box;\n    display: -ms-flexbox;\n    display: flex;\n    -webkit-box-orient: horizontal;\n    -webkit-box-direction: normal;\n        -ms-flex-direction: row;\n            flex-direction: row;\n    -webkit-box-pack: justify;\n        -ms-flex-pack: justify;\n            justify-content: space-between;\n    -webkit-box-align: center;\n        -ms-flex-align: center;\n            align-items: center;\n}\n.dropdown-footer button {\n    border-radius: 0px;\n}\n\n", ""]);
-
-// exports
+/* 56 */
+/***/ (function(module, exports) {
 
+// removed by extract-text-webpack-plugin
 
 /***/ })
 /******/ ]);
\ No newline at end of file

From ce69492dcde440600b7e20ae3475715e99595fec Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Thu, 20 Sep 2018 15:40:43 +0530
Subject: [PATCH 4/5] Removed cart migration rename conflicts

---
 ...8_09_05_150915_create_cart_items_table.php |  0
 ...9_05_150915_create_cart_products_table.php | 39 -------------------
 2 files changed, 39 deletions(-)
 rename packages/Webkul/Cart/src/Database/{migrations => Migrations}/2018_09_05_150915_create_cart_items_table.php (100%)
 delete mode 100644 packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php

diff --git a/packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php
similarity index 100%
rename from packages/Webkul/Cart/src/Database/migrations/2018_09_05_150915_create_cart_items_table.php
rename to packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_items_table.php
diff --git a/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php b/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php
deleted file mode 100644
index 5d3f4b2ce..000000000
--- a/packages/Webkul/Cart/src/Database/Migrations/2018_09_05_150915_create_cart_products_table.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateCartProductsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('cart_products', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('product_id')->unsigned();
-            $table->foreign('product_id')->references('id')->on('products');
-            $table->integer('quantity')->unsigned()->default(1);
-            $table->integer('cart_id')->unsigned();
-            $table->foreign('cart_id')->references('id')->on('cart');
-            $table->integer('tax_category_id')->unsigned()->nullable();
-            $table->foreign('tax_category_id')->references('id')->on('tax_categories');
-            $table->string('coupon_code')->nullable();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('cart_items');
-    }
-}

From 3165112aebf6a920d1edee57ba63d7bf1796dbdf Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Thu, 20 Sep 2018 15:45:18 +0530
Subject: [PATCH 5/5] Check process fixed

---
 packages/Webkul/Shipping/src/Carriers/AbstractShipping.php | 2 +-
 packages/Webkul/Shipping/src/Shipping.php                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php b/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
index 8c2690dfd..55cb97848 100644
--- a/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
+++ b/packages/Webkul/Shipping/src/Carriers/AbstractShipping.php
@@ -73,7 +73,7 @@ abstract class AbstractShipping
             $channelId = core()->getCurrentChannel()->id;
         }
 
-        $shippingConfig = Config::get('carriers' . $this->getCode());
+        $shippingConfig = Config::get('carriers.' . $this->getCode());
 
         return $shippingConfig[$field];
     }
diff --git a/packages/Webkul/Shipping/src/Shipping.php b/packages/Webkul/Shipping/src/Shipping.php
index d0d2f9642..384c8b6f0 100644
--- a/packages/Webkul/Shipping/src/Shipping.php
+++ b/packages/Webkul/Shipping/src/Shipping.php
@@ -17,9 +17,9 @@ class Shipping
         foreach(Config::get('carriers') as $shippingMethod) {
             $object = new $shippingMethod['class'];
 
-            // if($object->isAvailable()) {
+            if($object->isAvailable()) {
                 $rates[] = $object->calculate();
-            // }
+            }
         }
 
         return $rates;