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 |
|
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 |
|
m.korolev
|
596709946c
|
Extended properties add to export
|
2013-09-13 16:15:54 +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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
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
|
b1b2d685db
|
event reovery
|
2013-08-14 20:12:40 +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
|
33f279f90c
|
merge export
|
2013-08-14 11:42:01 +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 |
|
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
|
f101809165
|
Revert to 7fdddd5ed
|
2013-08-06 15:02:11 +04:00 |
|
Grisha Pomadchin
|
114b2f1aae
|
after merge fixes
|
2013-08-06 10:38:27 +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
|
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 |
|
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
|
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 |
|
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
|
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
|
abb2cdf7ea
|
istallation fixes; diiscountPercent fix;
|
2013-07-25 16:56:36 +04:00 |
|
Grisha Pomadchin
|
73ef894431
|
corrected lang files; added groups of statuses;
|
2013-07-25 15:30:00 +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 |
|
Grisha Pomadchin
|
dc2ead629f
|
v 0.3.5; improved ICrmOrderActions; + added step3 during install
|
2013-07-23 17:02:37 +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 |
|