merge master to develop

Author: patzick

README.md

@@ -127,8 +127,8 @@ You can run the following command to execute the full import:
  ```
 
  ... or in multistore setup You can run the same command with specified `store-code` parameter
-`
-``bash
+
+```bash
  yarn mage2vs import --store-code=de
  ```
 

config/default.json

@@ -7,6 +7,9 @@
   "orders": {
     "useServerQueue": false
   },
+  "catalog": {
+    "excludeDisabledProducts": false
+  },
   "elasticsearch": {
     "host": "localhost",
     "port": 9200,

config/elastic.schema.category.extension.json

@@ -0,0 +1 @@
+{}

config/elastic.schema.category.json

@@ -0,0 +1,16 @@
+{
+   "properties": {
+       "url_key": {"type": "keyword"},
+       "is_active": {"type": "boolean"},
+       "product_count": {"type": "integer"},
+       "parent_id": {"type": "integer"},
+       "created_at": { 
+           "type": "date",           
+           "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+        },
+       "updated_at": { 
+           "type": "date",           
+           "format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis"
+        }
+    }
+}

config/elastic.schema.product.json

@@ -2,6 +2,7 @@
    "properties": {
        "sku": {"type": "keyword"},
        "url_key": {"type": "keyword"},
+       "slug": {"type": "keyword"},
        "size": {"type": "integer"},
        "size_options": {"type": "integer"},
        "price": {"type": "float"},
@@ -42,9 +43,11 @@
        "name": {"type": "text"},
        "configurable_children": {
            "properties": {
+               "url_key": {"type": "keyword"},
+               "sku": {"type": "keyword"},
                "has_options": {"type": "boolean"},
                "price": {"type": "float"},
-               "sku": {"type": "keyword"}
+               "special_price": {"type": "float"}
             }
         },
        "configurable_options": {

scripts/mage2vs.js

@@ -30,6 +30,7 @@ function getMagentoDefaultConfig(storeCode) {
     SKIP_ATTRIBUTES: false,
     SKIP_TAXRULE: false,
     SKIP_PRODUCTS: false,
+    PRODUCTS_EXCLUDE_DISABLED: config.catalog.excludeDisabledProducts,
     MAGENTO_CONSUMER_KEY: apiConfig.consumerKey,
     MAGENTO_CONSUMER_SECRET: apiConfig.consumerSecret,
     MAGENTO_ACCESS_TOKEN: apiConfig.accessToken,

scripts/seo.js

@@ -3,12 +3,16 @@ const config = require('config')
 const common = require('../migrations/.common')
 const es = require('../src/lib/elastic')
 
+const fs = require('fs')
+const path = require('path')
+
 program
   .command('redirects')
   .option('-i|--indexName <indexName>', 'name of the Elasticsearch index', config.elasticsearch.indices[0])
   .option('-f|--oldFormat <oldFormat>', 'use the old format', true)
   .option('-s|--size <size>', 'size', 10000)
-  .action((cmd) => {
+  .option('-d|--dest <dest>', 'dest', './')
+  .action(async (cmd) => {
     if (!cmd.indexName) {
       console.error('error: indexName must be specified');
       process.exit(1);
@@ -18,24 +22,28 @@ program
     console.log('** Please check the nginx map module options on how to use this map format: https://serverfault.com/a/441517')
     console.log('** The urls will be mapped to the new VS Url format. Please make sure You have "products.useMagentoUrlKeys=true" in Your vue-storefront/config/local.json')
 
-    es.search(common.db, {
-      index: cmd.indexName,
-      type: 'product',
-      size: cmd.size,
-      body: {}
-    }).then(function (resp) {
-      const hits = resp.hits.hits
+    try {
+      const redirects = []
+
+      await es.search(common.db, {
+        index: cmd.indexName,
+        type: 'product',
+        size: cmd.size,
+        body: {}
+      }).then(function (resp) {
+        const hits = resp.hits.hits
 
-      for (const hit of hits) {
-        const product = hit._source
-        if (cmd.oldFormat) {
-          console.log(`/${product.url_key} /p/${decodeURIComponent(product.sku)}/${product.url_key}/${decodeURIComponent(product.sku)};`)
-        } else {
-          console.log(`/${product.url_key} /${product.url_key}/${decodeURIComponent(product.sku)};`)
+        for (const hit of hits) {
+          const product = hit._source
+          if (cmd.oldFormat) {
+            redirects.push(`/${product.url_key} /p/${decodeURIComponent(product.sku)}/${product.url_key}/${decodeURIComponent(product.sku)};`)
+          } else {
+            redirects.push(`/${product.url_key} /${product.url_key}/${decodeURIComponent(product.sku)};`)
+          }
         }
-      }
+      })
 
-      es.search(common.db, {
+      await es.search(common.db, {
         index: cmd.indexName,
         type: 'category',
         size: cmd.size,
@@ -45,13 +53,22 @@ program
         for (const hit of hits) {
           const category = hit._source
           if (cmd.oldFormat) {
-            console.log(`/${category.url_path} /c/${category.url_key};`)
+            redirects.push(`/${category.url_path} /c/${category.url_key};`)
           } else {
-            console.log(`/${category.url_path} /${category.url_key};`)
+            redirects.push(`/${category.url_path} /${category.url_key};`)
           }
         }
       })
-    })
+
+      fs.writeFileSync(
+        path.join(path.resolve(cmd.dest), `${cmd.indexName}-redirects`),
+        redirects.join('\n')
+      )
+      process.exit(0)
+    } catch (error) {
+      console.error(error)
+      process.exit(1)
+    }
   })
 
 program

src/lib/elastic.js

@@ -122,6 +122,7 @@ function loadSchema(entityType) {
 
 function putMappings(db, indexName, next) {
   let productSchema = loadSchema('product');
+  let categorySchema = loadSchema('category');
   let taxruleSchema = loadSchema('taxrule');
   let attributeSchema = loadSchema('attribute');
   let pageSchema = loadSchema('page');
@@ -158,8 +159,15 @@ function putMappings(db, indexName, next) {
             type: "cms_block",
             body: blockSchema
           }).then(res5 => {
-            console.dir(res5, { depth: null, colors: true })            
-            next()
+            console.dir(res5, { depth: null, colors: true })   
+            db.indices.putMapping({
+              index: indexName,
+              type: "category",
+              body: categorySchema
+            }).then(res6 => {
+              console.dir(res6, { depth: null, colors: true })
+              next()
+            })
           })
         })
       }).catch(err3 => {

src/lib/taxcalc.js

@@ -1,3 +1,25 @@
+function isSpecialPriceActive(fromDate, toDate) {
+  const now = new Date()
+  fromDate = new Date(fromDate) || false
+  toDate = new Date(toDate) || false
+
+  if (!fromDate && !toDate) {
+    return true
+  }
+  
+  if (fromDate && toDate) {
+    return fromDate < now && toDate > now
+  }
+
+  if (fromDate && !toDate) {
+    return fromDate < now
+  }
+
+  if (!fromDate && toDate) {
+    return toDate > now
+  }
+}
+
 export function updateProductPrices (product, rate, sourcePriceInclTax = false) {
   const rateFactor = parseFloat(rate.rate) / 100
   product.price = parseFloat(product.price)
@@ -22,7 +44,7 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
   product.specialPriceInclTax = specialPriceExclTax + product.specialPriceTax
 
   if (product.special_price && (product.special_price < product.price)) {
-    if ((product.special_to_date && new Date(product.special_to_date) < new Date()) || (product.special_from_date && new Date(product.special_from_date) > new Date())) {
+    if (!isSpecialPriceActive(product.special_from_date, product.special_to_date)) {
       product.special_price = 0 // out of the dates period
     } else {
       product.originalPrice = priceExclTax
@@ -67,7 +89,7 @@ export function updateProductPrices (product, rate, sourcePriceInclTax = false)
       configurableChild.specialPriceInclTax = specialPriceExclTax + configurableChild.specialPriceTax
 
       if (configurableChild.special_price && (configurableChild.special_price < configurableChild.price)) {
-        if ((configurableChild.special_to_date && new Date(configurableChild.special_to_date) < new Date()) || (configurableChild.special_from_date && new Date(configurableChild.special_from_date) > new Date())) {
+        if (!isSpecialPriceActive(configurableChild.special_from_date, configurableChild.special_to_date)) {
           configurableChild.special_price = 0 // out of the dates period
         } else {
           configurableChild.originalPrice = priceExclTax

src/platform/magento2/review.js

@@ -1,4 +1,4 @@
-import AbstractReviewProxy from '../abstract/user'
+import AbstractReviewProxy from '../abstract/review'
 import { multiStoreConfig } from './util'
 const Magento2Client = require('magento2-rest-client').Magento2Client;