1
0
mirror of synced 2024-12-02 10:16:06 +03:00
Commit Graph

313 Commits

Author SHA1 Message Date
Mozgito
9b8f5282b7 Исправление ошибки удаления модуля 2022-06-28 17:35:54 +03:00
Vlad
96e5bce336
Исправление работы со скидками (#258) 2022-06-28 15:28:28 +03:00
Vlad
9b1e641b16
Замена устаревшего jQuery метода 2022-06-17 11:49:38 +03:00
Vlad
af7982f790
Исправление автозагрузки классов для мультисайта (#256)
* Исправление автозагрузки классов для мультисайта
* Лишний параметр в методе создания заказа
2022-06-14 14:08:43 +03:00
Smiley48
9cf274ec66
Setup fix (#254) 2022-06-14 12:00:14 +03:00
Vlad
60e818e793
Исправление передачи местоположения в адресе доставки по истории (#253)
* Корректировка передачи местоположения в адресе доставки по истории
2022-06-14 11:57:44 +03:00
Vlad
134c92199a
Исправление автозагрузки классов (#252) 2022-05-13 15:52:21 +03:00
Mozgito
a8d99c2a08 empty product properties fix 2022-05-05 10:20:15 +03:00
Alex Lushpai
dfad5edffb update to 6.0.2 2022-04-18 16:49:59 +03:00
Alex Lushpai
243ec1ee99 Добавлена передача параметра site для методоа получения списка заказов 2022-04-18 16:43:52 +03:00
Alex Lushpai
38e6ce092a
Передача параметра site для метода работы с корпоративными клиентами 2022-04-18 16:38:14 +03:00
Alex Lushpai
56f6e54dcc
Исправление редактирования свойств заказа в 1С Битрикс 2022-04-18 16:21:02 +03:00
KMityai
bbdf690bb3 fix editing propertys in bitrix orders 2022-04-13 17:07:58 +03:00
KMityai
976d5511fc fix converting strings from utf-8 2022-04-13 16:59:27 +03:00
KMityai
e8aedb39be site rewrite fixed 2022-04-13 16:54:59 +03:00
Vlad
559bf79f7b
Fix customized classes load (#245)
* fix customized classes load
* bump to 6.0.1
2022-04-08 18:21:05 +03:00
Сергей Чазов
34e8105583
Loyalty (#241)
* Loyalty program
* fix dot bug for shops-exoprt option
* delete credantials request from services
* add CurlException for credentials catch
* add catching CurlException
* edit error msgs
* add supportind double bonuses
* add any step for bonus-input field in sale.order.ajax template
* recalculate bonuses
* fix bonus rounded
* strtoupper for params in icml
* change delivery service code
2022-03-02 15:40:53 +03:00
Alex Lushpai
e3e0d41ff5
Backport (#242)
* Add PRICE_DELIVERY for history exchange
* Fix bug with LocationTable fqn
* Fix bug with ProductType
* Changed options for prices and corps
* CustomersUpload: finding uniq clients by externalId
* Restore shipment before deleting

Co-authored-by: Sergey Chazov <oitv18@gmail.com>
2022-02-04 15:16:14 +03:00
c391379515 bump to 5.8.4 2021-11-15 11:21:09 +03:00
Vlad
1d814d69bc
fix catalog re-generation (#225) 2021-11-12 17:11:52 +03:00
64ac89d1d3
Fix icml generator path (#223) 2021-11-12 13:53:40 +03:00
Сергей Чазов
2b20702e58
Bump to 5.8.2 2021-11-02 15:43:20 +03:00
Сергей Чазов
3e5a04af62
Catalog fix
* add empty array Instead of  and add xml-header with charsets
* fix catalog purchasePrice
* use file_put_contents for flush
2021-11-02 11:25:26 +03:00
Vlad
380e1f0081
Fix catalog purchasePrice 2021-11-02 11:23:42 +03:00
Сергей Чазов
c3216f72d3
Optimize generator (#215) 2021-09-08 16:31:17 +03:00
Сергей Чазов
d06cb3c6e6
Remove date for integration payment (#214) 2021-09-08 13:00:50 +03:00
Сергей Чазов
9354bca0b3
multisite order export bug (#208) 2021-09-08 10:19:29 +03:00
Сергей Чазов
30ef0ebf8a
ICML simple product props (#207) 2021-09-08 10:05:09 +03:00
e519a933f0 bump version 2021-08-19 15:59:07 +03:00
Сергей Чазов
8458360a30
Service for manager sync
* added service for manager sync
* added manager event handler in history uploading methods
* deleted logger dependence from repository
* extract config provider proxy methods from repository to service
2021-08-19 15:46:03 +03:00
vasilevdm
876e255be8 Inventories upload fix 2021-08-14 12:18:03 +03:00
Сергей Чазов
3676808046
Corp uploading fix (#210) 2021-07-08 16:29:34 +03:00
Сергей Чазов
3967130660
Fix return type in getIntegrationPaymentTypes method (#209) 2021-06-28 17:36:10 +03:00
Сергей Чазов
a4c06ed8ee
New ICML generator 2021-05-31 16:33:02 +03:00
Сергей Чазов
c37b05c6d2
fix custom prices (#204) 2021-05-31 11:14:02 +03:00
RenCurs
4f2bc1a1b1
Remove status from integration payment (#192) 2021-04-19 15:38:09 +03:00
Alex Lushpai
e422557514
Replace CustomerBuilder 2021-04-16 15:12:27 +03:00
Sergey Chazov
c40e049485 deleted bump version 2021-04-16 13:52:52 +03:00
Sergey Chazov
176278ece4 deleted params types in CustomerAddresses 2021-04-06 16:23:38 +03:00
Sergey Chazov
de2b68c349 deleted return types in setters CustomerBuilder class 2021-04-05 14:57:04 +03:00
Alex Lushpai
554a182d66
fixed fqn for EventActions class 2021-04-05 14:13:31 +03:00
Sergey Chazov
8e444e0880 deleted return types in setters CustomerBuilder class 2021-04-05 13:40:53 +03:00
Alex Lushpai
6fd52027df
Check existence of order with UA 2021-04-02 11:59:32 +03:00
RenCurs
06ccfd9add
Create customer without contact (#189) 2021-04-02 11:58:44 +03:00
Сергей Чазов
f842142791
Check products array for emptiness (#193) 2021-04-01 15:09:16 +03:00
Ruslan Efanov
b2b637f016 fixed fqn for EventActions 2021-03-25 16:34:02 +03:00
Ruslan Efanov
422c0fa787 change check existence of order with UA 2021-03-24 13:42:15 +03:00
Sergey Chazov
2689836c65 add reset in customer bulder and bump version 2021-03-23 14:39:19 +03:00
Sergey Chazov
cec1dafd36 replace CustomerBuilder 2021-03-23 12:29:02 +03:00
Alex Lushpai
1d2a9dca82
CDN correct url in icml 2021-01-15 14:45:40 +03:00
vasilevdm
72c53b8bd4 added check to fix wiping 'fio' field if it is doesn`t present in history 2021-01-14 16:38:56 +03:00
gorokh
2c161d3d26 CDN correct url in icml 2021-01-14 16:19:31 +03:00
gorokh
12ae53cfea fixed #168 2021-01-13 17:51:36 +03:00
RenCurs
797a4d41de
Check email field length (#163) 2020-12-22 13:03:32 +03:00
Akolzin Dmitry
ae16e5b0f0
Rebranding (#164) 2020-12-15 12:39:38 +03:00
9822ba1c23
fix for country names (#161) 2020-12-08 17:01:26 +03:00
RenCurs
559ff1d8f7
OnlineConsultant (#154) 2020-11-24 12:14:26 +03:00
Evgeniy-Goroh
b34da9a756
english translation (#159) 2020-11-23 17:54:39 +03:00
Yura
460b254a13
fix #152 Проверка данных ФИО при заполнении поля в истории (#153) 2020-11-11 14:46:27 +03:00
Evgeniy-Goroh
4f5ae21915
add country (#155) 2020-11-11 11:30:07 +03:00
gorokh
c1cef99627 counttry fixed 2020-10-21 13:20:09 +03:00
gorokh
7d806a5fea fixed on create orders agent unset fields 2020-10-15 15:49:14 +03:00
f123652591 fix for bad encoding in the module settings 2020-10-01 16:15:44 +03:00
42f05ea7d8 fix updater crash 2020-09-29 15:47:16 +03:00
Sergey Chazov
80066dc6d7 add descripteion for version bump2 2020-09-28 16:35:06 +03:00
Sergey Chazov
365720fc0f add descripteion for version bump 2020-09-28 16:32:40 +03:00
Sergey Chazov
2355f3dd6a bump version 2020-09-28 13:48:07 +03:00
Сергей Чазов
ec8f5ac661
fix unseting delivery fields method (#141) 2020-09-28 13:02:03 +03:00
Evgeniy-Goroh
82d6c10c07
Manual order upload (#137) 2020-09-25 12:31:45 +03:00
4125565570
Ability to disable payment passthrough (#140)
* optional payment total in the order
* updater won't fail in case of error
2020-09-25 12:17:29 +03:00
Evgeniy-Goroh
cf8a8eb0ab
Fixed module installation upload (#136) 2020-09-11 15:06:37 +03:00
vasilevdm
c39f0eb888
fix order save when corporate isn`t enabled and CRM_CC is undefined (#135) 2020-09-08 14:31:42 +03:00
d64dd971d3
Fixed module installation error when there are no orders 2020-09-02 15:33:02 +03:00
vasilevdm
b19c857cc3
fix error during installation when orders count equals zero (#130) 2020-09-02 14:37:16 +03:00
5d49d16955
Payment status fix 2020-09-02 11:00:12 +03:00
Сергей Чазов
235ebd051f
change method for add PAYED status (#127) 2020-08-28 13:04:26 +03:00
ecb845546d
fix order upload error during installation (#125) 2020-08-26 11:21:56 +03:00
346a0ea5fe
Bump version (#124) 2020-08-25 12:37:59 +03:00
Сергей Чазов
eff355041f
Add history filter (#122) 2020-08-25 11:14:47 +03:00
DanielWeiser
458febab46
Remove cyrillic symbols (#123) 2020-08-25 10:30:16 +03:00
Evgeniy-Goroh
745d1afd5a
корректное добавление id товара при редактировании заказа (#120) 2020-08-18 15:33:54 +03:00
Akolzin Dmitry
17df3a2b22
Fix release build 2020-08-18 11:34:09 +03:00
1451d0c230
ICML optimizations 2020-07-24 14:02:29 +03:00
DanielWeiser
2bc97c84ff
Payment and shipment status 2020-07-23 16:28:36 +03:00
DanielWeiser
ad73c0c1dc
Phone required 2020-07-23 14:49:55 +03:00
DanielWeiser
a43881166b
Unset integration delivery fields on orders edit method 2020-07-22 15:11:27 +03:00
09f82bcfdf
Customer change
* remove useless request for history
* append new address to corporate customer
* centralized configuration provider
* use companyName filter in event & pass companyName into order
* add AdressBuilder* fixed for regressions
* fixed double contact problem
2020-07-14 13:47:26 +03:00
Evgeniy-Goroh
d0252f4ef2
fix encoding in icml (#109)
Co-authored-by: gorokh <gorokh@retailcrm.ru>
2020-06-02 12:55:44 +03:00
Akolzin Dmitry
5521b7fd82
Encoding fixes 2020-05-04 14:56:20 +03:00
Evgeniy-Goroh
5f7f234dd9
fix rewriting item 2020-04-30 11:56:43 +03:00
Akolzin Dmitry
1cee1ff6af
Fixes for vat rate 2020-04-29 17:47:25 +03:00
Alex Lushpai
672598a228
Update version.php 2020-04-28 14:23:17 +03:00
Alex Lushpai
d89461b366
Update description.ru 2020-04-28 14:22:44 +03:00
aee9926dfb
Correct ICML parameters names for offers 2020-04-28 14:16:12 +03:00
acaaf98c56
Corporate client support 2020-04-24 13:18:18 +03:00
Alex Lushpai
9a3ce0fc29 v5.2.6 2020-04-15 17:27:40 +03:00
gorokh
735b0f977d logic fix 2020-04-15 16:01:21 +03:00
gorokh
30555f8146 add options purchasePrice 2020-04-08 17:27:05 +03:00
gorokh
fa207afd15 issues #92 2020-04-07 13:55:59 +03:00
Akolzin Dmitry
d14a078804
Update deployment (#97)
* fix deploy stage
2020-03-24 11:36:32 +03:00
Akolzin Dmitry
86a51c8401
Update CI build (#96)
* cli Bitrix installation
* update travis config
* update installer
2020-03-23 15:12:07 +03:00
0e67c1d93d don't write in DISCOUNT_PRICE 2020-02-19 14:57:03 +03:00
d47709ba87 fix discounts for multiple positions & annotations 2020-02-19 14:35:56 +03:00
gorokh
594feae948 fix discount 2020-02-18 10:54:42 +03:00
gorokh
686548ab63 поправлена передача скидки 2020-02-12 12:25:39 +03:00
gorokh
331e76e28a fix version 2020-01-09 12:22:08 +03:00
gorokh
ae0ebc55b4 fix 2020-01-09 11:55:04 +03:00
gorokh
0085f1af2c передача externalIds у позиций товаров в заказе 2020-01-09 11:55:04 +03:00
gorokh
1a8340e0e4 Добавлено разделение поля строение/корпус на два отдельных 2020-01-09 11:21:35 +03:00
gorokh
a1bce2bda0 fix conflicts 2019-12-20 14:22:53 +03:00
gorokh
af3720f80d fix 2019-12-20 13:53:46 +03:00
gorokh
37c347276c fix version 2019-12-20 13:49:32 +03:00
gorokh
c4109cf1c6 обработка дублирующих товаров по externalId 2019-12-11 11:08:50 +03:00
gorokh
00e6f1716e добавлена обработка пустых полей 2019-11-14 18:06:23 +03:00
gorokh
b6828440f7 добавлена обработка пустого адреса 2019-11-14 13:49:24 +03:00
gorokh
027e3571a5 add changelog and version 2019-11-01 14:36:29 +03:00
gorokh
17c853144c issues #84 добавлена обработка для contragent 2019-11-01 14:22:23 +03:00
gorokh
b81cd1ccc4 добавлены customFileds при обработке истории в customer 2019-11-01 13:49:02 +03:00
gorokh
f0aeabe505 issues #78 в событии retailCrmAfterOrderSave добавлен externalId заказа 2019-11-01 13:33:07 +03:00
gorokh
bdc764e492 issues #81 добавлена проверка на id оплаты 2019-11-01 12:15:54 +03:00
gorokh
46c50034f3 issues #75 запись в лог перед отправкой в црм 2019-11-01 12:00:54 +03:00
gorokh
27a4e558fb fix 2019-10-17 12:32:59 +03:00
gorokh
b98c6ba9ea Поддержка функции добавления одинакового товара в заказ как разные товарные позиции из CRM 2019-10-17 12:26:04 +03:00
Alex Lushpai
defebe6439
Merge pull request #86 from Frosin/master
fixed service bug
2019-10-17 11:41:01 +03:00
Frosin
80e9a279f1 fixed service bug 2019-10-08 16:23:18 +03:00
Alex Lushpai
58b2348ce3
Merge pull request #82 from Frosin/master
Добавлены обработки ошибок при сохранении платежей.
2019-10-03 15:52:05 +03:00
Дмитрий
3ea5e69e81 fixed getting product price from order basket 2019-10-03 11:29:46 +03:00
Frosin
6fb591c39b fixed RetailCrmHistory_v5 2019-09-10 13:29:23 +03:00
Frosin
36bed88ef3 fixed RetailCrmHistory_v5 2019-09-10 13:23:51 +03:00
Frosin
7fe717b76a fixed register new user 2019-08-30 17:20:39 +03:00
Sergey
f26e36052f исправление генерации единиц измерения 2019-08-28 15:34:33 +03:00
Frosin
e706ae7d25 Fixed duplicate creation bug 2019-07-30 09:58:15 +03:00
gorokh
83121c4518 fix order double create 2019-07-26 17:44:37 +03:00
gorokh
d5d38b2e46 fix changelog 2019-07-18 12:29:22 +03:00
gorokh
3bf7da198d search city by zip code 2019-07-12 15:00:41 +03:00
24f862d93f Update description.ru 2019-07-03 13:36:50 +03:00
d65e248ba8 Remove copied method 2019-07-03 13:34:33 +03:00
376024e2bd Backward compatibility with previously created payments 2019-07-03 13:19:34 +03:00
5eb64d9c84 fix: don't remove payments after changes in retailCRM 2019-07-03 13:19:34 +03:00
366e3e2b1d Closes: #61 2019-07-03 13:19:34 +03:00
057a529170 Изменена логика генерации externalId для оплат 2019-07-03 13:19:34 +03:00
gorokh
fa706de2e1 Fixed sending empty order when deleting order from CMS 2019-07-01 14:38:11 +03:00
Konstantin
fb9be7859e Исправлен баг связанный с некооректным externalId 2019-05-29 13:07:59 +03:00
Sergey
04c1cc4c98 Удаление неактивного типа цены у товара 2019-05-23 17:01:49 +03:00
Konstantin
5c94edd285 fixed generating icml bug highload block without sku 2019-05-07 16:41:57 +03:00
Konstantin
b4cadedadd Fixed the legal data encoding bug 2019-05-07 08:28:15 +03:00
Konstantin
8b1c130ba6 fixed delivery service bug 2019-04-18 09:52:35 +03:00
Konstantin
f41d04fb0e fixed delivery service bug 2019-04-18 09:51:26 +03:00
Konstantin
e28ce27b89 Fixed bug with incorrect value of delivery service received by order history 2019-04-18 09:43:44 +03:00
Sergey
ba74cc6847 fix order history 2019-03-28 16:54:56 +03:00