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

224 Commits

Author SHA1 Message Date
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
m.korolev
d8b2b3bab2 Add article field 2013-07-29 17:58:41 +04:00
Grisha Pomadchin
4f934aed10 api module fix 2013-07-29 17:53:54 +04:00
Grisha Pomadchin
e1776dfb46 customersUpload beta (not working) 2013-07-29 17:48:24 +04:00
Grisha Pomadchin
e730bbf743 agent bug fix 2013-07-29 12:48:16 +04:00
Grisha Pomadchin
d293f532de fio parse; small fixes; 2013-07-29 12:29:41 +04:00
Ilyas Salikhov
a4eeec4031 fix status association 2013-07-26 16:32:07 +04:00
Ilyas Salikhov
5b39c7349f change date format 2013-07-26 16:17:34 +04:00
Ilyas Salikhov
c6d11680f3 change date format 2013-07-26 15:56:00 +04:00
Grisha Pomadchin
4e0831bf8d Merge branch 'master' of https://github.com/intarocrm/bitrix-module 2013-07-25 18:16:08 +04:00
Grisha Pomadchin
62f92b5dde general fixes; +handle server error on step3 installation; 2013-07-25 18:15:24 +04:00
Ilyas Salikhov
88d22602f1 change path to export file 2013-07-25 18:15:15 +04:00
Grisha Pomadchin
abb2cdf7ea istallation fixes; diiscountPercent fix; 2013-07-25 16:56:36 +04:00
Grisha Pomadchin
7bf2c2b8dc deleted inc files 2013-07-25 15:33:13 +04:00
Grisha Pomadchin
73ef894431 corrected lang files; added groups of statuses; 2013-07-25 15:30:00 +04:00
m.korolev
e8b1a78cdf bugfix ProductName and XML ID 2013-07-25 09:42:08 +04:00
m.korolev
d81f71cd5e Export can be from all InfoBlocks now 2013-07-24 23:41:05 +04:00
Grisha Pomadchin
1e16626047 error codes update; 2013-07-24 18:27:56 +04:00
Grisha Pomadchin
12d768772f api err statuses fix; 2013-07-24 17:32:39 +04:00
Grisha Pomadchin
58eacc3caf new api err statuses; +apiUpd added order createdAt field 2013-07-24 17:29:50 +04:00
Grisha Pomadchin
6230fc1392 updated logic; render order cancel status; sending statusComment; 2013-07-24 16:40:08 +04:00
Grisha Pomadchin
454e1a1553 optimized json responses; +apiUpd initial price; discountPercent; progressBar fixes. 2013-07-24 16:14:17 +04:00
Grisha Pomadchin
7adc05f146 general fixes 2013-07-24 14:44:48 +04:00
m.korolev
8b1f454486 Path to lang-files has changed 2013-07-24 12:26:44 +04:00
Grisha Pomadchin
dc2ead629f v 0.3.5; improved ICrmOrderActions; + added step3 during install 2013-07-23 17:02:37 +04:00
Grisha Pomadchin
6f4f617d6a host url fix. 2013-07-18 23:03:08 +04:00
Grisha Pomadchin
55b76fd9c7 updated api class; small bugfixes. 2013-07-18 22:55:52 +04:00
Grisha Pomadchin
3d5a00ca6a Installer changes; bug fixes. 2013-07-18 14:35:33 +04:00
Grisha Pomadchin
9f06cc0c5d Installer changes; bug fixes. 2013-07-18 14:32:10 +04:00
Grisha Pomadchin
fda1c857d2 bug fix with not uploaded orders (bitrix -> crm). 2013-07-17 19:12:58 +04:00
Grisha Pomadchin
b551f9e661 changed module name; v 0.3.0 2013-07-16 18:50:05 +04:00