From bf096b645d29fb00fb0c90a380b1f77d6e69952e Mon Sep 17 00:00:00 2001
From: Akolzin Dmitry <akolzinvs@gmail.com>
Date: Wed, 20 Feb 2019 11:41:24 +0300
Subject: [PATCH] Product units

---
 go.mod                     | 2 +-
 go.sum                     | 4 ++--
 src/validator.go           | 2 +-
 src/worker.go              | 2 +-
 translate/translate.en.yml | 1 -
 translate/translate.es.yml | 1 -
 translate/translate.ru.yml | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index a9df048..8cca64d 100644
--- a/go.mod
+++ b/go.mod
@@ -41,7 +41,7 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pkg/errors v0.8.0
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/retailcrm/api-client-go v1.0.7
+	github.com/retailcrm/api-client-go v1.1.2
 	github.com/retailcrm/mg-bot-api-client-go v1.0.16
 	github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
 	github.com/stretchr/testify v1.2.2
diff --git a/go.sum b/go.sum
index f5d5697..2bef60e 100644
--- a/go.sum
+++ b/go.sum
@@ -83,8 +83,8 @@ github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/retailcrm/api-client-go v1.0.7 h1:j4C2PvPUDP9nAuYWDvJPnYNpkj+LDBgn71kHvxJmSPg=
-github.com/retailcrm/api-client-go v1.0.7/go.mod h1:QRoPE2SM6ST7i2g0yEdqm7Iw98y7cYuq3q14Ot+6N8c=
+github.com/retailcrm/api-client-go v1.1.2 h1:bgd3EpS1o3IffgO4p+QOj7Mn+eg6HRd7bIlA5IXDkhU=
+github.com/retailcrm/api-client-go v1.1.2/go.mod h1:QRoPE2SM6ST7i2g0yEdqm7Iw98y7cYuq3q14Ot+6N8c=
 github.com/retailcrm/mg-bot-api-client-go v1.0.16 h1:l7xzGp0IQTR+jJ//x3vDBz/jHnOG71MhNQtSGWq3rj8=
 github.com/retailcrm/mg-bot-api-client-go v1.0.16/go.mod h1:lJD4+WLi9CiOk4/2GUvmJ6LG4168eoilXAbfT61yK1U=
 github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 h1:4bT0pPowCpQImewr+BjzfUKcuFW+KVyB8d1OF3b6oTI=
diff --git a/src/validator.go b/src/validator.go
index 0e44796..23b1a55 100644
--- a/src/validator.go
+++ b/src/validator.go
@@ -9,7 +9,7 @@ import (
 	"gopkg.in/go-playground/validator.v9"
 )
 
-var regCommandName = regexp.MustCompile(`https://?[\da-z.-]+\.(retailcrm\.(ru|pro)|ecomlogic\.com)`)
+var regCommandName = regexp.MustCompile(`https://?[\da-z.-]+\.(retailcrm\.(ru|pro|es)|ecomlogic\.com)`)
 
 type defaultValidator struct {
 	once     sync.Once
diff --git a/src/worker.go b/src/worker.go
index 651ed6b..616103a 100644
--- a/src/worker.go
+++ b/src/worker.go
@@ -314,7 +314,7 @@ func (w *Worker) execCommand(message string) (resMes string, msgProd v1.MessageP
 					if vp.Quantity > 0 {
 						msgProd.Quantity = &v1.MessageOrderQuantity{
 							Value: vp.Quantity,
-							Unit:  w.localizer.MustLocalize(&i18n.LocalizeConfig{MessageID: "pieces"}),
+							Unit:  vo.Unit.Sym,
 						}
 					}
 
diff --git a/translate/translate.en.yml b/translate/translate.en.yml
index 58403a3..8fb698e 100644
--- a/translate/translate.en.yml
+++ b/translate/translate.en.yml
@@ -45,4 +45,3 @@ get_delivery: Get available types of deliveries
 get_product: Get product by article or name
 payment_options: "Payment options:"
 delivery_options: "Delivery options:"
-pieces: "pcs."
diff --git a/translate/translate.es.yml b/translate/translate.es.yml
index 46c69e1..8fa5285 100644
--- a/translate/translate.es.yml
+++ b/translate/translate.es.yml
@@ -45,4 +45,3 @@ get_delivery: Obtener tipos de entrega disponibles
 get_product: Recibir los productos por el artículo o el nombre
 payment_options: "Opciones de pago:"
 delivery_options: "Opciones de entrega:"
-pieces: "piezas"
diff --git a/translate/translate.ru.yml b/translate/translate.ru.yml
index 7cad758..d56156e 100644
--- a/translate/translate.ru.yml
+++ b/translate/translate.ru.yml
@@ -45,4 +45,3 @@ get_delivery: Получить доступные типы доставок
 get_product: Получить товар по артикулу или наименованию
 payment_options: "Варианты оплаты:"
 delivery_options: "Варианты доставки:"
-pieces: "шт."