bitrix-module

RetailCRM-Mirror/bitrix-module

Fork 0

mirror of synced 2025-04-11 21:21:00 +00:00

Commit graph

a37ac0f99c fix customized classes load Mozgito 2022-04-08 10:01:04 +03:00
5b906d706e added parameter "site" support in API client KMityai 2022-03-24 17:33:24 +03:00
e610aeb743 site rewrite fixed KMityai 2022-03-24 17:15:16 +03:00
904b910d36

Update RetailCrmOrder_v5.php Smiley48 2022-03-11 15:42:50 +03:00
843b490b26

Merge pull request #3 from retailcrm/master Smiley48 2022-03-11 15:37:23 +03:00
dee1da0f10 изменено: CHANGELOG.md изменено: README.md изменено: intaro.retailcrm/classes/general/ApiClient_v5.php изменено: intaro.retailcrm/classes/general/history/RetailCrmHistory_v5.php изменено: intaro.retailcrm/classes/general/order/RetailCrmOrder_v5.php изменено: intaro.retailcrm/include.php изменено: intaro.retailcrm/install/export/local/components/intaro/lp.register/templates/.default/lang/ru/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/lp.register/templates/.default/result_modifier.php изменено: intaro.retailcrm/install/export/local/components/intaro/lp.register/templates/.default/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/lp.score/component.php изменено: intaro.retailcrm/install/export/local/components/intaro/lp.score/lang/ru/component.php изменено: intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/lang/ru/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/result_modifier.php изменено: intaro.retailcrm/install/export/local/components/intaro/main.register/templates/.default/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.basket.basket/templates/.default/lang/ru/result_modifier.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.basket.basket/templates/.default/result_modifier.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.basket.basket/templates/.default/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/lang/ru/template.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/order_ajax.js изменено: intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/result_modifier.php изменено: intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/scripts/intaro.js изменено: intaro.retailcrm/install/export/local/components/intaro/sale.order.ajax/templates/.default/template.php изменено: intaro.retailcrm/install/index.php изменено: intaro.retailcrm/install/version.php изменено: intaro.retailcrm/lib/component/builder/bitrix/loyaltydatabuilder.php изменено: intaro.retailcrm/lib/component/configprovider.php изменено: intaro.retailcrm/lib/component/constants.php изменено: intaro.retailcrm/lib/component/handlers/eventshandlers.php изменено: intaro.retailcrm/lib/icml/icmldirector.php изменено: intaro.retailcrm/lib/icml/xmlofferbuilder.php изменено: intaro.retailcrm/lib/model/bitrix/xml/xmloffer.php изменено: intaro.retailcrm/lib/service/customerservice.php изменено: intaro.retailcrm/lib/service/loyaltyaccountservice.php изменено: intaro.retailcrm/lib/service/loyaltyservice.php изменено: intaro.retailcrm/lib/service/orderloyaltydataservice.php изменено: intaro.retailcrm/options.php изменено: tests/BitrixTestCase.php изменено: tests/classes/general/AddressBuilderTest.php изменено: tests/classes/general/CustomerBuilderTest.php изменено: tests/classes/general/order/RetailCrmOrder_v5Test.php изменено: tests/classes/general/services/RetailCrmServiceTest.php Максим Кузнецов 2022-03-11 15:25:45 +03:00
8f06dbcb1b

Retreat the change to master Smiley48 2022-03-09 14:31:45 +03:00
34e8105583

Loyalty (#241) v6.0.0 Сергей Чазов 2022-03-02 15:40:53 +03:00
5e0651e9be change delivery service code Sergey Chazov 2022-02-21 18:08:40 +04:00
603a632704 strtoupper for params in icml Sergey Chazov 2022-02-21 13:06:48 +04:00
00df6c72fa fix bonus rounded Sergey Chazov 2022-02-21 12:47:29 +04:00
a7b874948d change tests files rules to 644 from 755 Sergey Chazov 2022-02-04 17:35:04 +04:00
8ce1e619b7 recalculate bonuses Sergey Chazov 2021-12-29 15:49:12 +03:00
0820fd7e3e add any step for bonus-input field in sale.order.ajax template Sergey Chazov 2022-01-18 17:24:35 +04:00
a2a94f4efa add supportind double bonuses Sergey Chazov 2021-12-30 11:39:18 +03:00
d8ade855aa edit error msgs Sergey Chazov 2022-01-26 18:38:52 +04:00
f04cda38fb add catching CurlException Sergey Chazov 2022-01-26 18:01:37 +04:00
0af7523daf add CurlException for credentials catch Sergey Chazov 2022-02-03 12:36:25 +04:00
868b41060c delete credantials request from services Sergey Chazov 2022-01-28 17:44:52 +04:00
03e72ace3a fix dot bug for shops-exoprt option Sergey Chazov 2022-02-04 16:48:19 +04:00
4c94a90e93 Программа лояльности Sergey Chazov 2022-02-04 12:40:18 +04:00
e3e0d41ff5

Backport (#242) v5.8.5 Alex Lushpai 2022-02-04 15:16:14 +03:00
a2804d82c5

Merge pull request #240 from Chazovs/5.8.5 backport Alex Lushpai 2022-02-03 16:50:23 +03:00
c3ee43ea4c bump version Sergey Chazov 2022-02-03 17:34:45 +04:00
baf8f3e84c restore shipment before deleting Sergey Chazov 2022-02-03 17:04:06 +04:00
c40c83aad0 customersUpload: finding uniq clients by externalId Sergey Chazov 2022-02-03 15:36:51 +04:00
fb09bf3dbb Changed options for prices and corps Sergey Chazov 2022-02-03 15:27:44 +04:00
f3f27af3a0 Fix bug with ProductType Sergey Chazov 2022-02-03 15:17:19 +04:00
d25a6eddf3 fix bug with LocationTable fqn Sergey Chazov 2022-02-03 15:11:47 +04:00
34d9d6d576 add PRICE_DELIVERY for history exchange Sergey Chazov 2022-02-03 12:52:00 +04:00
23c59dff76 add CurlException for credentials catch Sergey Chazov 2022-02-03 12:36:25 +04:00
0dc2d8d605 add PRICE_DELIVERY for history exchange Sergey Chazov 2022-02-02 12:57:17 +04:00
87db04697d fix customers upload, fix readme links Mozgito 2022-01-31 12:26:17 +03:00
c3ff1634e8

Merge branch 'retailcrm:master' into master Vlad 2022-01-31 11:53:33 +03:00
658b4c8809 delete credantials request from services Sergey Chazov 2022-01-28 17:44:52 +04:00
da4887d657 edit error msgs Sergey Chazov 2022-01-26 18:38:52 +04:00
042aabd62e add catching CurlException Sergey Chazov 2022-01-26 18:01:37 +04:00
d24967ea33

Changed options for prices and corps Smiley48 2022-01-25 16:42:31 +03:00
c1ca7cbdd3 add any step for bonus-input field in sale.order.ajax template Sergey Chazov 2022-01-18 17:24:35 +04:00
62bd2f4996 add supportind double bonuses Sergey Chazov 2021-12-30 11:39:18 +03:00
e3052087fe recalculate bonuses Sergey Chazov 2021-12-29 15:49:12 +03:00
26bc4a08f6 fix bug with LocationTable fqn Sergey Chazov 2021-11-19 13:51:19 +03:00
4cc3100c7c

Fix the error with the product offers lp Alex Lushpai 2021-11-16 14:39:19 +03:00
3c63631b49

fix the error with the product offers DmitreyZl 2021-11-16 12:56:59 +03:00
2c1fea2341 fix the error with the product offers DmitreyZl 2021-11-16 10:08:04 +03:00
3333ae3dee bump to 5.8.4 Neur0toxine 2021-11-15 11:21:09 +03:00
3154c6decd fix catalog re-generation (#225) Vlad 2021-11-12 17:11:52 +03:00
a27d9e30a9 Fix icml generator path (#223) Neur0toxine 2021-11-12 13:53:40 +03:00
703e56e407 Bump to 5.8.2 Сергей Чазов 2021-11-02 15:43:20 +03:00
75139d29e2 Catalog fix Сергей Чазов 2021-11-02 11:25:26 +03:00
116ae41ec4 Fix catalog purchasePrice Vlad 2021-11-02 11:23:42 +03:00
557acd1dfb Optimize generator (#215) Сергей Чазов 2021-09-08 16:31:17 +03:00
ee58d6b1fe Remove date for integration payment (#214) Сергей Чазов 2021-09-08 13:00:50 +03:00
87cd4b23e1 multisite order export bug (#208) Сергей Чазов 2021-09-08 10:19:29 +03:00
1440a9d5fb ICML simple product props (#207) Сергей Чазов 2021-09-08 10:05:09 +03:00
01f6ec8371 bump version Neur0toxine 2021-08-19 15:59:07 +03:00
b8384dc7de Service for manager sync Сергей Чазов 2021-08-19 15:46:03 +03:00
1365b02c9b Inventories upload fix vasilevdm 2021-08-14 12:18:03 +03:00
cf419748e4 Corp uploading fix (#210) Сергей Чазов 2021-07-08 16:29:34 +03:00
f479b2f838 Fix return type in getIntegrationPaymentTypes method (#209) Сергей Чазов 2021-06-28 17:36:10 +03:00
47e6de9d94 New ICML generator Сергей Чазов 2021-05-31 16:33:02 +03:00
16a1a5e9d8 fix custom prices (#204) Сергей Чазов 2021-05-31 11:14:02 +03:00
6ac636915e Remove status from integration payment (#192) RenCurs 2021-04-19 15:38:09 +03:00
392751b027 deleted bump version Sergey Chazov 2021-04-16 13:52:52 +03:00
74c9ea4334 deleted params types in CustomerAddresses Sergey Chazov 2021-04-06 16:23:38 +03:00
cb54429139 deleted return types in setters CustomerBuilder class Sergey Chazov 2021-04-05 14:57:04 +03:00
f61d7736cc deleted return types in setters CustomerBuilder class Sergey Chazov 2021-04-05 13:40:53 +03:00
9371f9925d add reset in customer bulder and bump version Sergey Chazov 2021-03-23 14:36:48 +03:00
517a3ffe26 replace CustomerBuilder Sergey Chazov 2021-03-23 12:29:02 +03:00
42b6c9a404 change check existence of order with UA Ruslan Efanov 2021-03-24 13:42:15 +03:00
760316cffc Create customer without contact (#189) RenCurs 2021-04-02 11:58:44 +03:00
4b12859d12 Check products array for emptiness (#193) Сергей Чазов 2021-04-01 15:09:16 +03:00
efa00671f1 CDN correct url in icml gorokh 2021-01-13 15:45:46 +03:00
0370080b56

Merge branch 'retailcrm:master' into master Vlad 2021-11-16 12:32:51 +03:00
5f69051859

Программа лояльности Neur0toxine 2021-11-16 10:48:26 +03:00
fd4c5bcdec fix for lodash encoding Neur0toxine 2021-11-15 17:20:14 +03:00
e478f11586 fix for 6.0.0 release build Neur0toxine 2021-11-15 16:33:21 +03:00
28ae2fb3e5

Программа лояльности Neur0toxine 2021-11-15 15:21:42 +03:00
866333d205 fix for softlock when customer cannot be registered in loyalty Neur0toxine 2021-11-09 15:49:46 +03:00
13adda8e22 fix for cart component identity Neur0toxine 2021-11-09 15:16:01 +03:00
ca66d9db2d fix for loyalty personal area error handling Neur0toxine 2021-11-09 14:32:06 +03:00
03a7f75a7b fix for order submit & fix for incorrect component rendering in the constructor Neur0toxine 2021-11-09 14:23:53 +03:00
08ef8baa51 load necessary modules Neur0toxine 2021-11-09 12:57:23 +03:00
00d637141c make updater self-sufficient Neur0toxine 2021-11-09 10:59:06 +03:00
ffc2abfa07 fix bonus charge rate bug Sergey Chazov 2021-11-03 14:12:49 +03:00
b8eef76c12 add updater for 6.0.0 Sergey Chazov 2021-11-03 11:51:59 +03:00
5a6bd869f2 bump to 6.0.0 version Sergey Chazov 2021-11-02 16:43:12 +03:00
e405b9e7d9 repair registration Sergey Chazov 2021-10-19 16:33:33 +03:00
a5e693c248 add empty bonus count in order Sergey Chazov 2021-10-19 14:59:48 +03:00
a5b9b90199 repair sms verification in order Sergey Chazov 2021-10-19 12:16:05 +03:00
a3b91c792a repair telephone Sergey Chazov 2021-10-12 16:59:21 +03:00
0c6b73754f add tel checking Sergey Chazov 2021-10-11 09:48:28 +03:00
0cf3bd67fe fix bonus sms confirmed process Sergey Chazov 2021-10-04 18:11:46 +03:00
11c9a56970 repair verificationCode for main.register component Sergey Chazov 2021-09-24 16:41:45 +03:00
8ca12c5ddf repair registration with sms Sergey Chazov 2021-09-24 15:58:01 +03:00
c1b0266c35 fix: hide external fields for registration action whit active = Y Sergey Chazov 2021-09-24 13:08:02 +03:00
4d4eb87f08 repair register page Sergey Chazov 2021-09-23 16:56:30 +03:00
c34d2b28a3 add status registration instead of boolean value Sergey Chazov 2021-09-23 14:37:19 +03:00
e9b8a8e42c add checking export systems in updater Sergey Chazov 2021-09-22 16:53:59 +03:00
37a5ece173 sync templates registration components Sergey Chazov 2021-09-22 16:32:53 +03:00