Merge pull request #1475 from DivanteLtd/develop

1.2.0 release

Author: pkarw

.travis.yml

@@ -1,3 +1,6 @@
+sudo: required
+addons:
+  chrome: stable
 language: node_js
 node_js:
   - "8"

config/default.json

@@ -26,7 +26,7 @@
           "index": "vue_storefront_catalog_de"
         },
         "tax": {
-          "sourcePriceIncludesTax": false,          
+          "sourcePriceIncludesTax": false,
           "defaultCountry": "DE",
           "defaultRegion": "",
           "calculateServerSide": true
@@ -53,7 +53,7 @@
           "index": "vue_storefront_catalog_it"
         },
         "tax": {
-          "sourcePriceIncludesTax": false,          
+          "sourcePriceIncludesTax": false,
           "defaultCountry": "IT",
           "defaultRegion": "",
           "calculateServerSide": true
@@ -95,6 +95,7 @@
       }
     },
     "cart": {
+      "multisiteCommonCart": true,
       "server_merge_by_default": true,
       "synchronize": true,
       "synchronize_totals": true,
@@ -129,7 +130,7 @@
       "defaultFilters": ["color", "size", "price", "erin_recommends"],
       "sortByAttributes": {
         "Latest": "updated_at",
-        "Price":"price"
+        "Price":"final_price"
       },
       "galleryVariantsGroupAttribute": "color"
     },
@@ -156,9 +157,9 @@
         "attributes": "INDEXEDDB",
         "products": "INDEXEDDB",
         "elasticCache": "INDEXEDDB",
-        "claims": "LOCALSTORAGE",        
-        "compare": "INDEXEDDB",        
-        "syncTasks": "INDEXEDDB",        
+        "claims": "LOCALSTORAGE",
+        "compare": "INDEXEDDB",
+        "syncTasks": "INDEXEDDB",
         "newsletterPreferences": "INDEXEDDB",
         "ordersHistory": "INDEXEDDB",
         "checkoutFieldValues": "LOCALSTORAGE"
@@ -217,6 +218,7 @@
       "api_key": "my_example_api_key"
     },
     "cms": {
-      "endpoint": "http://localhost:8080/api/ext/cms-data/cms{{type}}/{{cmsId}}"
+      "endpoint": "http://localhost:8080/api/ext/cms-data/cms{{type}}/{{cmsId}}",
+      "endpointIdentifier": "http://localhost:8080/api/ext/cms-data/cms{{type}}Identifier/{{cmsIdentifier}}/storeId/{{storeId}}"
     }
 }

core/api/cart/addToCart.js

@@ -1,3 +1,11 @@
+/**
+ * Functionality for adding product to the cart.
+ *
+ * #### Methods
+ * - **`addToCart(product)`** adds passed product to the cart. Dispatches `cart/addItem` Vuex action
+ *
+ * Part of [Cart API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
+ */
 export const addToCart = {
   methods: {
     addToCart (product) {

core/api/cart/closeMicrocart.js

@@ -1,9 +1,9 @@
 import { addToCart } from './addToCart'
 import { removeFromCart } from './removeFromCart'
 import { productsInCart } from './productsInCart'
-import { closeMicrocart } from './closeMicrocart'
-import { openMicrocart } from './openMicrocart'
-import { isMicrocartOpen } from './isMicrocartOpen'
+import { closeMicrocart } from './ui/closeMicrocart'
+import { openMicrocart } from './ui/openMicrocart'
+import { isMicrocartOpen } from './ui/isMicrocartOpen'
 
 export {
   addToCart,

core/api/cart/index.js

@@ -1,3 +1,11 @@
+/**
+ * Functionality for returning products in cart.
+ *
+ * #### Computed properties
+ * - **`productsInCart`** returns products in cart. Returns `cart/cartItems` Vuex state.
+ *
+ * Part of [Cart API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
+ */
 export const productsInCart = {
   computed: {
     productsInCart () {

core/api/cart/isMicrocartOpen.js

@@ -1,3 +1,11 @@
+/**
+ * Functionality for removing product from the cart.
+ *
+ * #### Methods
+ * - **`removeFromCart(product)`** removes passed product from the cart (basing on `sku` & `parentSku`). Dispatches `cart/removeItem` Vuex action.
+ *
+ * Part of [Cart API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
+ */
 export const removeFromCart = {
   methods: {
     removeFromCart (product) {

core/api/cart/openMicrocart.js

@@ -0,0 +1,15 @@
+/**
+ * [Helper] Optional UI functionality for closing microcart.
+ *
+ * #### Methods
+ * - **`openMicrocart`** sets `microcart` and `overlay` property from ui state to `false`. Dispatches `ui/setMicrocart'` Vuex action
+ *
+ * Part of [Cart API Module](https://github.com/DivanteLtd/vue-storefront/tree/master/doc/api-modules)
+ */
+export const closeMicrocart = {
+  methods: {
+    closeMicrocart () {
+      this.$store.commit('ui/setMicrocart', false)
+    }
+  }
+}