1
0
mirror of synced 2024-11-23 22:06:11 +03:00
Commit Graph

252 Commits

Author SHA1 Message Date
Chernyavtsev Ivan
d051204e4b fix convert charset for comments in orderCreate method 2014-05-28 16:13:24 +04:00
Grisha Pomadchin
fc4447d925 multiship format fix 2014-05-22 18:29:03 +04:00
Grisha Pomadchin
76e0db8202 +multiship 2014-05-22 17:50:33 +04:00
Grisha Pomadchin
3a738a5d00 +multiship 2014-05-22 17:48:44 +04:00
Grisha Pomadchin
562d60bd5a +apiv3 2014-05-19 13:41:10 +04:00
Grisha Pomadchin
77bb3160c1 Merge branch 'purchase-price' of github.com:intarocrm/bitrix-module into 1.0.3a 2014-04-17 11:40:11 +04:00
Grisha Pomadchin
62ad023f03 LOCATION fix 2014-04-17 11:35:34 +04:00
Ilyas Salikhov
4b5dea4263 Upload purchase price in order products 2014-04-16 15:41:17 +04:00
Grisha Pomadchin
c5c0804ee7 fix locations 2014-04-16 14:34:05 +04:00
Grisha Pomadchin
9e4b72c3ae fix location props 2014-04-16 12:27:34 +04:00
Grisha Pomadchin
f73a4feeb9 Merge branch 'purchase-price' of github.com:intarocrm/bitrix-module into 1.0.3a 2014-04-16 11:31:49 +04:00
Grisha Pomadchin
9f0a2a1b1d Revert to 7dcc438 2014-04-16 11:28:00 +04:00
Ilyas Salikhov
2406c71652 Purchase price loading 2014-04-15 20:31:11 +04:00
Grisha Pomadchin
695f26cc67 fix address format 2014-04-02 10:59:12 +04:00
Grisha Pomadchin
7dcc438fe8 api class methods fix 2014-03-22 15:15:37 +04:00
Grisha Pomadchin
7657ae434a api class fix 2014-03-22 15:08:51 +04:00
Grisha Pomadchin
38e7157d18 +apiv2; +upd RestApi 2014-03-22 14:52:17 +04:00
Grisha Pomadchin
413bab2be6 delivery Service upload fix 2014-03-13 18:37:07 +04:00
Grisha Pomadchin
4fadc1d43c global fix 2014-03-13 13:37:16 +04:00
Grisha Pomadchin
abb4bae99a v1.0.1 2014-03-13 13:21:43 +04:00
Grisha Pomadchin
6f70fcaac7 history fix; v1.0.01 2014-03-13 13:00:51 +04:00
Grisha Pomadchin
274fd7a9a4 event side effects (hisotry) fix 2014-03-13 12:58:52 +04:00
Grisha Pomadchin
2f309dee4a history fix & new version 2014-03-13 12:07:52 +04:00
Ilyas Salikhov
0f885e2e54 optimize catalog export + added limitation on offers fetching 2014-02-19 15:18:35 +04:00
Ilyas Salikhov
45662c78ed https in urls in ICML 2014-02-14 18:51:19 +03:00
Grisha Pomadchin
a1cf53dedf order status empty fix 2014-02-13 17:34:42 +04:00
m.korolev
e53d63116d Merge branch 'origin/master' 2014-02-13 15:20:31 +04:00
m.korolev
5cbab8609f fix server_name 2014-02-13 15:20:23 +04:00
Grisha Pomadchin
3590e998f5 fix custom order type func 2014-02-12 11:19:46 +04:00
m.korolev
14d7d2d201 Merge branch 'exportICMLSize' 2014-02-12 11:10:20 +04:00
Grisha Pomadchin
663431dc19 fix custom order type funcs 2014-02-12 11:06:32 +04:00
Grisha Pomadchin
1df0d65827 upd custom type func calls 2014-02-12 09:44:35 +04:00
m.korolev
9fa0d8e1b8 fix added param, param 2014-02-11 15:06:40 +04:00
Grisha Pomadchin
5d0f4e745a fix custom order type function names 2014-02-10 15:23:57 +04:00
Grisha Pomadchin
74fb142f05 crm to bitrix type function 2014-02-10 12:25:18 +04:00
Grisha Pomadchin
98a6012fe5 custom type function 2014-02-10 12:19:36 +04:00
m.korolev
d2d814f731 Merge branch 'exportICMLSize' 2014-02-03 12:32:41 +04:00
m.korolev
512cac0b27 fix global User creating 2014-02-03 12:32:11 +04:00
Grisha Pomadchin
8718f7f637 price fix 2014-02-01 17:02:40 +04:00
Grisha Pomadchin
513f852b60 fixes 2014-02-01 12:12:29 +04:00
Grisha Pomadchin
1fdd539252 fixes 2014-01-31 20:20:37 +04:00
m.korolev
8910c7ef37 Merge branch 'exportICMLSize' 2014-01-31 20:11:52 +04:00
m.korolev
68aefcf6c5 Fix USER 2014-01-31 20:11:28 +04:00
Grisha Pomadchin
296c7a82c1 Merge branch 'exportICMLSize' of github.com:intarocrm/bitrix-module into fullExport 2014-01-30 12:31:46 +04:00
m.korolev
98ad65413c Fix ICML Loading 2014-01-30 12:26:37 +04:00
Grisha Pomadchin
2de2077055 opt export DeliveryServices 2014-01-29 18:42:52 +04:00
Grisha Pomadchin
a8f746d1bd fix orderHistory init time; 2014-01-28 17:46:27 +04:00
Grisha Pomadchin
08c5169417 fix orderHistory init time; 2014-01-28 17:45:02 +04:00
Grisha Pomadchin
f08b54033e email from customer obj 2014-01-28 12:53:36 +04:00
Grisha Pomadchin
fb148315d7 create users 2014-01-28 12:44:20 +04:00
Grisha Pomadchin
13a91ebf6a Merge branch 'exportICMLSize' of github.com:intarocrm/bitrix-module into fullExport 2014-01-28 10:23:59 +04:00
Grisha Pomadchin
48a19f8ce5 workin' ver 2014-01-27 19:14:43 +04:00
Grisha Pomadchin
3f7cc6b963 +deliveryServices options & install; -order send 2014-01-23 17:50:58 +04:00
m.korolev
ccf74770a9 Dimensions have added 2014-01-23 17:05:07 +04:00
Grisha Pomadchin
c024e9609c incl lang file 2013-12-30 00:37:29 +04:00
Grisha Pomadchin
3b41004926 lang fix 2013-12-29 21:27:23 +04:00
Grisha Pomadchin
4eaaec53b7 order discount fix 2013-12-28 19:20:38 +04:00
Grisha Pomadchin
36a5c31bae history session fix 2013-12-26 20:40:11 +04:00
Grisha Pomadchin
098d966039 history session fix 2013-12-26 01:49:50 +04:00
b12
4bc57cc63a fix bugs in product status processing 2013-12-25 18:38:25 +04:00
Ilyas Salikhov
deac6e4cb4 ready for product statuses 2013-12-25 16:30:46 +04:00
Grisha Pomadchin
be1041a38f Merge branch 'master' of github.com:intarocrm/bitrix-module 2013-12-03 15:54:27 +04:00
Grisha Pomadchin
d4abc60e2f user creation fix 2013-11-28 17:02:21 +04:00
m.korolev
5ce54327c2 get encoding from default site 2013-11-28 15:42:22 +04:00
Grisha Pomadchin
18906ce9ce to v0.5.1 2013-11-28 15:08:07 +04:00
Grisha Pomadchin
531799b16a null dicount 2013-11-15 17:51:51 +04:00
Grisha Pomadchin
870c1f4a11 null dicount 2013-11-15 17:49:40 +04:00
Grisha Pomadchin
fae73904d2 discount fix 2013-11-15 17:26:51 +04:00
Grisha Pomadchin
344a952f99 discount fix 2013-11-15 16:51:57 +04:00
Grisha Pomadchin
63d03327f3 fixes due to status and site 2013-11-15 15:55:54 +04:00
Grisha Pomadchin
8f2d6befbc cancel event fix; discount upd fix. 2013-11-14 16:41:19 +04:00
m.korolev
c67359ce94 bugfix encoding ICML loading 2013-11-14 15:53:26 +04:00
Grisha Pomadchin
b9e681a683 fix summ null error 2013-11-13 23:05:19 +04:00
Grisha Pomadchin
5e33d50f98 fix summ null error 2013-11-13 22:58:53 +04:00
Grisha Pomadchin
60c3af7f97 fix index, cancel status, % priceoff fix 2013-11-13 18:01:44 +04:00
Grisha Pomadchin
f22f5d310c Merge branch 'master' of github.com:intarocrm/bitrix-module 2013-11-09 01:12:44 +04:00
Grisha Pomadchin
c6b9fe67c5 added upd with methods 2013-11-09 01:12:20 +04:00
m.korolev
3ee055c215 bugfix charset error from cli 2013-11-08 19:21:08 +04:00
Grisha Pomadchin
2de51507a7 general order sum fix 2013-11-06 16:01:25 +04:00
Grisha Pomadchin
3d2ac096d2 price history fix 2013-11-06 15:24:22 +04:00
Grisha Pomadchin
cbff7073bf empty phones fix 2013-10-31 11:45:26 +04:00
Grisha Pomadchin
270bb72c9d empty phones fix 2013-10-31 11:44:12 +04:00
Grisha Pomadchin
7cdda7aa11 api changes fix 2013-10-31 10:49:20 +04:00
Grisha Pomadchin
45c180c40e upd +0.4.3 2013-10-30 17:01:34 +04:00
Grisha Pomadchin
6603923d53 cancel status fix 2013-10-29 19:16:32 +04:00
Grisha Pomadchin
b79577105a Merge branch 'history' of github.com:intarocrm/bitrix-module 2013-10-29 14:41:46 +04:00
m.korolev
52e6e1d933 fix loading not active products 2013-10-15 15:58:25 +04:00
m.korolev
d4c6d405dd 1. Added load not active products
2. Remake loading ICML
2013-10-10 17:46:14 +04:00
Grisha Pomadchin
3623a8e134 order final fixes 2013-10-09 19:29:07 +04:00
Grisha Pomadchin
59ed1b87cc fix order history 2013-10-09 19:24:28 +04:00
Grisha Pomadchin
323b67d400 history fix duplicate products 2013-10-04 16:36:43 +04:00
Grisha Pomadchin
3644c385b3 rm var_dump 2013-10-02 17:49:24 +04:00
Grisha Pomadchin
8508c6bebb new orders create 2013-10-02 17:45:28 +04:00
Grisha Pomadchin
0d8d174980 v0.4.1 2013-10-02 17:42:20 +04:00
m.korolev
62bbcc0f48 Merge branch 'master'
Conflicts:
	intaro.intarocrm/classes/general/ICMLLoader.php
2013-09-23 17:44:26 +04:00
Grisha Pomadchin
f63a3271a6 number fix 2013-09-22 23:12:29 +04:00
Grisha Pomadchin
66c0d8998b event fixes 2013-09-22 21:28:28 +04:00
Grisha Pomadchin
6c2552881b catalog export fix 2013-09-22 20:03:35 +04:00
Grisha Pomadchin
0e5c9b5b6c fixes due to upload event & upload agent 2013-09-20 19:12:01 +04:00
Grisha Pomadchin
e210a7a26f histore update fixes 2013-09-19 00:18:32 +04:00