feat: delivery "default" delivery time and total price from services

Author: leomp12

assets/application.json

@@ -3,7 +3,7 @@
   "state": "active",
   "title": "Frete personalizado",
   "slug": "customshipping",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "type": "external",
   "authentication": true,
   "auth_callback_uri": "https://customshipping.ecomplus.biz/ecom/auth-callback",
@@ -71,6 +71,37 @@
               "maxLength": 14,
               "title": "CNPJ da transportadora",
               "description": "Insira apenas números do CNPJ"
+            },
+            "delivery_time": {
+              "title": "Prazo de entrega padrão do serviço",
+              "type": "object",
+              "required": [
+                "days"
+              ],
+              "additionalProperties": false,
+              "properties": {
+                "days": {
+                  "type": "integer",
+                  "minimum": 0,
+                  "maximum": 999999,
+                  "default": 20,
+                  "title": "Prazo de entrega (dias)",
+                  "description": "Número de dias estimado para entrega após o despacho"
+                },
+                "working_days": {
+                  "type": "boolean",
+                  "default": true,
+                  "title": "Dias úteis",
+                  "description": "Se o prazo é calculado em dias úteis"
+                }
+              }
+            },
+            "total_price": {
+              "type": "number",
+              "minimum": 0,
+              "maximum": 9999999999,
+              "title": "Preço padrão do serviço",
+              "description": "Valor do frete com possíveis taxas e adicionais fixos"
             }
           }
         }
@@ -127,9 +158,7 @@
           "title": "Regra de envio",
           "type": "object",
           "required": [
-            "service_code",
-            "delivery_time",
-            "total_price"
+            "service_code"
           ],
           "properties": {
             "service_code": {
@@ -142,8 +171,7 @@
               "title": "Faixa de CEP atendida",
               "type": "object",
               "required": [
-                "min",
-                "max"
+                "min"
               ],
               "properties": {
                 "min": {

routes/ecom/modules/calculate-shipping.js

@@ -23,11 +23,19 @@ module.exports = appSdk => {
     }
 
     const destinationZip = params.to ? params.to.zip.replace(/\D/g, '') : ''
-    const checkZipCode = rule => {
-      // validate rule zip range
+    const checkZipCode = (rule) => {
       if (destinationZip && rule.zip_range) {
         const { min, max } = rule.zip_range
-        return Boolean((!min || destinationZip >= min) && (!max || destinationZip <= max))
+        if (!min && !max) {
+          return true
+        }
+        if (!max) {
+          return destinationZip === min
+        }
+        if (!min) {
+          return destinationZip === max
+        }
+        return destinationZip >= min && destinationZip <= max
       }
       return true
     }
@@ -196,8 +204,15 @@ module.exports = appSdk => {
       if (validShippingRules.length) {
         // group by service code selecting lower price
         const shippingRulesByCode = validShippingRules.reduce((shippingRulesByCode, rule) => {
+          const serviceCode = rule.service_code
           if (typeof rule.total_price !== 'number') {
-            rule.total_price = 0
+            let service
+            if (Array.isArray(config.services)) {
+              service = config.services.find((_service) => {
+                return _service && _service.service_code === serviceCode
+              })
+            }
+            rule.total_price = (service && service.total_price) || 0
           }
           if (typeof rule.price !== 'number') {
             rule.price = rule.total_price
@@ -208,7 +223,6 @@ module.exports = appSdk => {
           if (typeof rule.amount_tax === 'number' && !isNaN(rule.amount_tax)) {
             rule.total_price += (rule.amount_tax * amount / 100)
           }
-          const serviceCode = rule.service_code
           const currentShippingRule = shippingRulesByCode[serviceCode]
           if (!currentShippingRule || currentShippingRule.total_price > rule.total_price) {
             shippingRulesByCode[serviceCode] = rule
@@ -236,8 +250,15 @@ module.exports = appSdk => {
               service = config.services.find(service => {
                 return service && service.service_code === serviceCode
               })
-              if (service && !label) {
-                label = service.label
+              if (service) {
+                if (!label) {
+                  label = service.label
+                }
+                if (!rule.delivery_time || typeof rule.delivery_time.days !== 'number') {
+                  rule.delivery_time = service.delivery_time
+                }
+                delete service.delivery_time
+                delete service.total_price
               }
             }
             if (!label) {