1
0
mirror of synced 2024-11-27 07:46:09 +03:00
Commit Graph

380 Commits

Author SHA1 Message Date
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
Grisha Pomadchin
28ccea77e7 info in install 2013-09-02 18:15:11 +04:00
Grisha Pomadchin
3ebf5a1d31 At now articles load from Product InfoBlock 2013-09-02 17:52:56 +04:00
Grisha Pomadchin
fbddb65f37 At now articles load from Product InfoBlock 2013-09-02 17:51:12 +04:00
Grisha Pomadchin
4306e37e5d At now articles load from Product InfoBlock 2013-09-02 17:50:23 +04:00
Grisha Pomadchin
cb94c210c0 history update 2013-09-02 17:41:05 +04:00
m.korolev
f684763ea9 At now articles load from Product InfoBlock 2013-09-02 17:40:21 +04:00
Grisha Pomadchin
d02d4a9f1a added timezone check before install 2013-09-02 16:30:50 +04:00
Grisha Pomadchin
6d77b107cf added timezone check before install 2013-09-02 16:29:54 +04:00
Grisha Pomadchin
3b8ea43d80 added desciption file 2013-09-02 16:25:39 +04:00
Grisha Pomadchin
6c340f17b2 added timezone check before install 2013-09-02 16:24:30 +04:00
Grisha Pomadchin
24088aa568 added timezone check before install 2013-09-02 16:23:15 +04:00
Grisha Pomadchin
8d883e407d v0.4.0 2013-09-02 16:03:27 +04:00
Grisha Pomadchin
bb22ddb413 fixes 2013-09-02 15:57:16 +04:00
Grisha Pomadchin
db6f1d7013 multi site support 2013-09-02 15:48:38 +04:00
Grisha Pomadchin
2bb2331047 agent fix 2013-08-28 12:43:37 +04:00
Grisha Pomadchin
fbd56c2512 upd 2013-08-27 18:05:55 +04:00
Grisha Pomadchin
eda0e3b68b Merge branch 'master' of github.com:intarocrm/bitrix-module into referenceDeliveryTypeExport 2013-08-27 15:37:28 +04:00
Grisha Pomadchin
f0b87087e7 delete updater from master 2013-08-26 11:05:33 +04:00
Ilyas Salikhov
0e4988e415 Merge branch '0.3.9'
Conflicts:
	intaro.intarocrm/export/export_setup.php
	intaro.intarocrm/install/version.php
2013-08-26 10:42:47 +04:00
Ilyas Salikhov
a592053447 fix encoding 2013-08-26 10:38:52 +04:00
Ilyas Salikhov
535e665fc7 v0.3.9 2013-08-26 10:33:51 +04:00
Ilyas Salikhov
42d54b1982 fix in messages 2013-08-21 19:00:14 +04:00
m.korolev
63b10e658f add empty option in select articles 2013-08-21 18:40:45 +04:00
m.korolev
82fce596dc bugfix profile editing 2013-08-21 17:08:02 +04:00
m.korolev
b1a71726fc Articles is not modatory now 2013-08-20 13:42:13 +04:00
m.korolev
57335ffb54 bugfix with & 2013-08-20 13:06:31 +04:00
m.korolev
04ea0ea00e refactoring export run and setup 2013-08-20 12:53:32 +04:00
m.korolev
a1258b9af2 bugfix Count of profile 2013-08-19 18:13:26 +04:00
m.korolev
2a66f0a67b bug fix ICMLLoader.php 2013-08-19 15:14:36 +04:00
m.korolev
6bb71edd15 Fix bugs in export encoding 2013-08-19 10:43:59 +04:00
Grisha Pomadchin
3926b01901 update up to 3.8 2013-08-16 16:29:11 +04:00
Grisha Pomadchin
07e42e793c Revert to cf6a9ab20 2013-08-16 16:24:12 +04:00
Grisha Pomadchin
9ce341cf43 update up to 0.3.8 2013-08-16 16:18:06 +04:00
Grisha Pomadchin
cf6a9ab203 stable 2013-08-15 22:05:06 +04:00
Grisha Pomadchin
9a3ec002d6 added method 2013-08-15 19:41:07 +04:00
Grisha Pomadchin
67781a6f00 merge exportICML 2013-08-15 19:29:32 +04:00
Grisha Pomadchin
e68db44642 fixes 2013-08-15 19:19:12 +04:00
Grisha Pomadchin
ca6e71d55f sending delivery types without pay systems 2013-08-15 18:49:54 +04:00
m.korolev
f2097f72f0 Actual index 2013-08-15 18:14:41 +04:00
m.korolev
4c12e36c67 BugFix names 2013-08-15 18:01:03 +04:00
m.korolev
c947c7109f 1. added error handler
2. added updater
2013-08-15 17:34:29 +04:00
m.korolev
a7d5828caa Exports files has been added 2013-08-15 14:46:13 +04:00
Grisha Pomadchin
b1b2d685db event reovery 2013-08-14 20:12:40 +04:00
Grisha Pomadchin
d0a5ad4cf0 update 0.3.7 -> 0.3.8 2013-08-14 19:56:52 +04:00
pomadchin
bba1df38dc deprecated parameters removing 2013-08-14 16:54:00 +04:00
pomadchin
f564c6c8e0 only package mode 2013-08-14 16:51:40 +04:00
pomadchin
8d5918cfc3 lang files mod 2013-08-14 12:23:00 +04:00
pomadchin
5e99c0c71d fixed issue 2013-08-14 12:12:09 +04:00
pomadchin
33f279f90c merge export 2013-08-14 11:42:01 +04:00
pomadchin
dec7cd50ea merging second 2013-08-14 11:05:37 +04:00
pomadchin
1a7cd55b46 del confl files 2013-08-14 10:50:30 +04:00
МЫ
6d7829b03c test merge 2013-08-14 10:45:05 +04:00
МЫ
29bf585826 test 2013-08-14 10:44:27 +04:00
Grisha Pomadchin
f92a62f70e statuses ajax update 2013-08-07 14:45:25 +04:00
m.korolev
e6c8e49fc1 Delete old Export to ICML 2013-08-06 19:16:55 +04:00
m.korolev
14dce123c4 Export to ICML has been modified
Added step4 into install
2013-08-06 19:13:49 +04:00
Grisha Pomadchin
0fc3b0d3df onSalePayOrder event 2013-08-06 16:50:09 +04:00
Grisha Pomadchin
05bd2807fd bank-transfer 2013-08-06 15:39:10 +04:00
Grisha Pomadchin
d2949b1a80 fixes after revert 2013-08-06 15:10:01 +04:00
Grisha Pomadchin
f101809165 Revert to 7fdddd5ed 2013-08-06 15:02:11 +04:00
Grisha Pomadchin
2e4d520f65 fix statistic update 2013-08-06 13:14:53 +04:00
Grisha Pomadchin
114b2f1aae after merge fixes 2013-08-06 10:38:27 +04:00
Grisha Pomadchin
6db7f6e656 v3.7 2013-08-06 10:31:37 +04:00
Grisha Pomadchin
fbcc052513 merging 2013-08-06 10:28:36 +04:00
Grisha Pomadchin
7fdddd5edf orderCreate fix 2013-08-05 15:39:37 +04:00
Grisha Pomadchin
07805eb6c4 orderCreate fix 2013-08-05 15:25:19 +04:00
Grisha Pomadchin
878a958ee3 orderCreate fix 2013-08-05 15:20:07 +04:00
Grisha Pomadchin
fb582a1752 func response fix 2013-08-05 15:16:52 +04:00
Grisha Pomadchin
d2aa99fdad orderCreate upgrade 2013-08-05 15:15:15 +04:00
Grisha Pomadchin
47452c4f25 upd orderEdit method 2013-08-05 14:49:51 +04:00
Grisha Pomadchin
1a674a91be added onCancelOrderEvent 2013-08-05 14:46:13 +04:00
Grisha Pomadchin
03a72e37a3 deleted version ~ 2013-08-05 10:57:33 +04:00
Grisha Pomadchin
b52e3062ca fixes 2013-08-02 18:44:59 +04:00
Grisha Pomadchin
8935639265 working props order settings 2013-08-02 17:05:12 +04:00
Grisha Pomadchin
cdef1b84c5 +optionsOrderProps 2013-08-01 18:10:51 +04:00
Grisha Pomadchin
f33f4c304f final fix 2013-07-31 17:18:33 +04:00
Grisha Pomadchin
db12c374d3 fixes 2013-07-31 10:24:47 +04:00
m.korolev
e4176b2856 Merge branch 'origin/master' 2013-07-30 17:18:39 +04:00
m.korolev
598b40e7ac The IB added without property Catalog but with link SKU 2013-07-30 17:18:31 +04:00
Ilyas Salikhov
58340c9164 Added curl checking 2013-07-30 16:14:04 +04:00
Ilyas Salikhov
e7d54bf4e8 fix messages 2013-07-29 21:59:24 +04:00
Ilyas Salikhov
bb7a7ad885 fix FIO exploding 2013-07-29 21:47:25 +04:00
Grisha Pomadchin
eb9b3c46ed lastUpORderId fix 2013-07-29 21:25:40 +04:00
Grisha Pomadchin
7adaec8435 orders export fix 2013-07-29 20:22:35 +04:00
Grisha Pomadchin
2da03f3025 some fixes 2013-07-29 18:59:51 +04:00
Grisha Pomadchin
2440aee3a3 Merge branch 'master' of https://github.com/intarocrm/bitrix-module 2013-07-29 18:43:45 +04:00
Grisha Pomadchin
9efc646066 send city fix 2013-07-29 18:43:04 +04:00
Grisha Pomadchin
bef6efeead send city fix 2013-07-29 18:42:33 +04:00
Grisha Pomadchin
72bf320605 working customerUpload + send city fix; 2013-07-29 18:40:36 +04:00
Grisha Pomadchin
befb6f59d4 working customerUpload + send city fix; 2013-07-29 18:38:15 +04:00
m.korolev
184df6a4d0 Merge remote-tracking branch 'refs/remotes/origin/master' 2013-07-29 17:59:12 +04:00