1
0
mirror of synced 2024-11-26 23:36:08 +03:00
Commit Graph

371 Commits

Author SHA1 Message Date
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
m.korolev
ffc5c8c3b4 Merge branch 'origin/master' 2014-01-30 15:59:36 +04:00
m.korolev
5c1917a8e8 fix ICML Loading - check if is an array 2014-01-30 15:54:49 +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
4469c44861 deliveryServices export in options.php; several fixes. 2014-01-30 12:17:58 +04:00
Grisha Pomadchin
2de2077055 opt export DeliveryServices 2014-01-29 18:42:52 +04:00
Grisha Pomadchin
091d13b163 Merge branch 'exportICMLSize' of github.com:intarocrm/bitrix-module into fullExport 2014-01-28 17:50:11 +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
m.korolev
af06a1decd Fix names in settings 2014-01-28 17:09:46 +04:00
Grisha Pomadchin
83f84ebb7f version fix 2014-01-28 12:55:49 +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
7fd2c09059 rm option settings 2014-01-24 17:57:49 +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
34f83d5dcc fix commit 2014-01-22 10:36:18 +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
5df36eaa5d option charset fix 2013-11-28 15:09:42 +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
e8ffdbc62c change version file 2013-11-14 12:12:47 +04:00
Grisha Pomadchin
6f2d8b2a7b options encoding fix 2013-11-13 23:25:29 +04:00
Grisha Pomadchin
c8e6ec6e59 step3 cp1251 fix 2013-11-13 23:18:47 +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
317b580d8a comment lines for sites support 2013-11-12 15:22:35 +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
2f83fed243 exp orders by event in defaults 2013-11-01 17:08:09 +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
43cb653ee2 fixes 2013-10-29 19:29:42 +04:00
Grisha Pomadchin
fb16243351 charset fix 2013-10-29 19:21:04 +04:00
Grisha Pomadchin
6603923d53 cancel status fix 2013-10-29 19:16:32 +04:00
Grisha Pomadchin
24ff76ee0d datetime fix 2013-10-29 17:14:03 +04:00
Grisha Pomadchin
3e45e317bd histoty date init and remove 2013-10-29 16:15:40 +04:00
Grisha Pomadchin
16a94ebac4 upd version file 2013-10-29 15:30:47 +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
eddf81659d revert to 494b5a270 2013-10-08 17:07:55 +04:00
Grisha Pomadchin
78c5ff8252 descr files 2013-10-08 16:48:46 +04:00
m.korolev
c070e5bec5 Merge branch 'exportExtendedProperties'
Conflicts:
	intaro.intarocrm/export/export_run.php
	intaro.intarocrm/export/export_setup.php
	intaro.intarocrm/install/index.php
	intaro.intarocrm/install/step5.php
	intaro.intarocrm/lang/ru/icml_export_setup.php
2013-10-08 16:39:50 +04:00
Grisha Pomadchin
a616532ae9 version file 2013-10-08 16:24:38 +04:00
Grisha Pomadchin
0a84b8f2ba changed working prot 2013-10-04 16:56:57 +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
b2ae04bebb fix complex array storage in bitrix 2013-09-25 20:36:49 +04:00
m.korolev
a6f94494c7 fix JavaScript in step 5 2013-09-23 18:27:47 +04:00
m.korolev
5265c5d5c8 Delete update.php 2013-09-23 18:16:26 +04:00
m.korolev
d058783a60 Add translations to ICML export 2013-09-23 18:05:37 +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
78087575a8 lang fix 2013-09-22 22:51:12 +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
7af1925bb2 uninstallation fix 2013-09-19 00:20:56 +04:00
Grisha Pomadchin
e210a7a26f histore update fixes 2013-09-19 00:18:32 +04:00
Grisha Pomadchin
e13fddda75 +getLocationCityId 2013-09-17 19:02:19 +04:00
Grisha Pomadchin
622dd0e56c fixed order status update 2013-09-17 18:31:15 +04:00
Grisha Pomadchin
e3ceadfe67 fix onOrderUpdateEvent 2013-09-17 18:06:58 +04:00
Grisha Pomadchin
77abe318ac removed test log 2013-09-17 15:40:23 +04:00
Grisha Pomadchin
13f72cc89f options fix 2013-09-17 15:17:39 +04:00
m.korolev
d59d100afc It update old profiles to new format 2013-09-16 15:37:22 +04:00
m.korolev
596709946c Extended properties add to export 2013-09-13 16:15:54 +04:00
Grisha Pomadchin
e8f55aa087 removed repl lines 2013-09-13 14:16:58 +04:00
Grisha Pomadchin
084147eb2b merge fix; v0.4.0 2013-09-12 19:00:46 +04:00
Grisha Pomadchin
90ea4b3eab update icml 2013-09-12 17:31:32 +04:00
Grisha Pomadchin
ebbc5d2763 merge fix 2013-09-12 17:16:54 +04:00
Grisha Pomadchin
4a9375d906 merge 2013-09-12 17:05:02 +04:00
Grisha Pomadchin
903774d57d after merge 2013-09-12 17:01:29 +04:00
Grisha Pomadchin
cbff873be0 install fix 2013-09-12 16:56:14 +04:00
Grisha Pomadchin
597696b692 merge 2013-09-12 16:53:24 +04:00
Grisha Pomadchin
e6731c7a65 Merge branch 'master' of github.com:intarocrm/bitrix-module into mode-discharge 2013-09-12 16:37:34 +04:00
Grisha Pomadchin
3f1840b323 last id fix 2013-09-12 16:29:55 +04:00
Grisha Pomadchin
3e9f019f7e fio fix 2013-09-12 16:27:43 +04:00
Grisha Pomadchin
c6e2a8c1b7 fix order last id in event 2013-09-12 11:32:50 +04:00
m.korolev
6db7bc93e1 Writing offers to file has been paginate 2013-09-11 15:37:50 +04:00
Grisha Pomadchin
5ef7ec6538 mode change in options 2013-09-10 17:15:41 +04:00
m.korolev
0397aad602 Before commit: Collect data about categories, then format this, collect data about offers, then format this, and then write all to file.
After commit: Collect all data, then format all data and write all
2013-09-10 09:25:17 +04:00
Grisha Pomadchin
22b82eff3f fix explode 2013-09-09 17:55:13 +04:00
Grisha Pomadchin
3e8013c29a fix explode 2013-09-09 17:54:38 +04:00
Grisha Pomadchin
fc469781b2 fix explode 2013-09-09 17:53:58 +04:00
Grisha Pomadchin
f09cec3e5d fex method 2013-09-09 17:52:55 +04:00
Grisha Pomadchin
8271e5ab45 fix explode name 2013-09-09 16:56:57 +04:00
Grisha Pomadchin
98aa0afcbb fio fix 2013-09-09 16:55:28 +04:00
Grisha Pomadchin
84a512eefa line fix 2013-09-09 16:53:09 +04:00
Grisha Pomadchin
b3f1800754 fix of fio fix 2013-09-09 16:52:30 +04:00
Grisha Pomadchin
f29c0f62a4 fio parsing fix 2013-09-09 16:49:08 +04:00
Grisha Pomadchin
3fa296423b added explodeFIO func 2013-09-09 16:46:37 +04:00
Grisha Pomadchin
1524a94db0 fio parsing fix 2013-09-09 16:43:44 +04:00
Grisha Pomadchin
2ccc2999e6 fixes 2013-09-09 16:35:22 +04:00
Grisha Pomadchin
0812440edc fixed fio parsing 2013-09-09 16:26:01 +04:00
Grisha Pomadchin
5dd88b798d disable multiple sites support 2013-09-05 14:01:56 +04:00
Grisha Pomadchin
f4e33b5af5 lang files fix 2013-09-05 13:43:04 +04:00
Grisha Pomadchin
ba82f22b64 +order Types support 2013-09-05 13:38:58 +04:00
Grisha Pomadchin
6f97c22b54 +step in installer 2013-09-05 12:11:29 +04:00
Ilyas Salikhov
8d7ee7b132 fix 0.3.11 2013-09-05 09:38:38 +04:00
Grisha Pomadchin
be7d3d76cd removed var_dumps 2013-09-04 20:50:49 +04:00
Grisha Pomadchin
0ce0403311 +orderHistory agent 2013-09-04 20:49:07 +04:00
Grisha Pomadchin
1d611ef2f7 class fixes 2013-09-04 20:41:51 +04:00
m.korolev
bb94fba4c3 Merge branch 'origin/master' 2013-09-04 12:20:46 +04:00
m.korolev
a3a72718f8 At now categories load from IB of product 2013-09-04 12:20:33 +04:00
Grisha Pomadchin
edcadcd052 +upd class 2013-09-03 18:23:27 +04:00
Grisha Pomadchin
c2729dcb93 inserted into options; new branch 2013-09-03 18:00:12 +04:00
Grisha Pomadchin
c1c298b4eb timezone fix; v0.3.9.1 2013-09-03 13:22:05 +04:00
Grisha Pomadchin
84d9727fa4 info in install 2013-09-02 18:17:42 +04:00
Grisha Pomadchin
76ff775810 info in install 2013-09-02 18:16:12 +04:00