Yarik / artbox-ecommerce

4 commits

Merge remote-tracking branch 'origin/master'
f2a0c7a1

Administrator authored
2017-01-20 12:32:06 +0200
Browse Code »
select characteristic
579c51b8

Administrator authored
2017-01-20 12:31:45 +0200
Browse Code »
Merge branch 'master' of gitlab.artweb.com.ua:yarik.nechyporuk/artbox-ecommerce
a0da38ca

Alexey Boroda authored
2017-01-20 12:09:16 +0200
Browse Code »
select characteristic
65f5712c

Administrator authored
2017-01-20 11:30:52 +0200
Browse Code »

1 commit

Merge branch 'statistics' ...
b1cc502f
```
# Conflicts:
#	controllers/OrderController.php
```
Administrator authored
2017-01-19 11:59:31 +0200
Browse Code »

4 commits

-Date format for statistics
ca6a6b40

Alexey Boroda authored
2017-01-18 15:37:52 +0200
Browse Code »
-Total for statistics
d9fd9ce5

Alexey Boroda authored
2017-01-18 14:21:33 +0200
Browse Code »
-Manager filter on statistics
29257441

Alexey Boroda authored
2017-01-18 14:12:42 +0200
Browse Code »
-Updated at bug fix
d8203a8c

Alexey Boroda authored
2017-01-18 12:37:52 +0200
Browse Code »

8 commits

-Log updated_at, refactor immediately
31df2ba6

Alexey Boroda authored
2017-01-17 19:13:54 +0200
Browse Code »
-Credit information in order view
0b43e0d3

Alexey Boroda authored
2017-01-17 19:03:12 +0200
Browse Code »
-View bug fix
b522bd6c

Alexey Boroda authored
2017-01-17 18:45:51 +0200
Browse Code »
-View bug fix
ddbd75a1

Alexey Boroda authored
2017-01-17 16:38:07 +0200
Browse Code »
-Logs ready
ff71eeed

Alexey Boroda authored
2017-01-17 16:29:44 +0200
Browse Code »
-Otp and logging
6649cf43

Alexey Boroda authored
2017-01-17 13:07:31 +0200
Browse Code »
Merge remote-tracking branch 'origin/Credits' into statistics ...
8de5e9b3
```
# Conflicts:
#	models/Order.php
```
Alexey Boroda authored
2017-01-17 11:25:36 +0200
Browse Code »
Merge remote-tracking branch 'origin/master'
7cfb6c63

Alexey Boroda authored
2017-01-17 11:18:34 +0200
Browse Code »

7 commits

-Order history half way done
d3406983

Alexey Boroda authored
2017-01-16 18:59:44 +0200
Browse Code »
add similar products
9e6e9086

Administrator authored
2017-01-16 16:16:24 +0200
Browse Code »
add similar products
52e22ec2

Administrator authored
2017-01-16 16:06:51 +0200
Browse Code »
add similar products
d53d1c94

Administrator authored
2017-01-16 15:29:23 +0200
Browse Code »
-Order history ready
5c177682

Alexey Boroda authored
2017-01-16 13:43:26 +0200
Browse Code »
add similar products
be18439b

Administrator authored
2017-01-16 13:34:05 +0200
Browse Code »
add similar products
c9cb9ad8

Administrator authored
2017-01-16 12:54:47 +0200
Browse Code »

1 commit

-Order history ready
cbc8daa9

Alexey Boroda authored
2017-01-13 13:54:41 +0200
Browse Code »

3 commits

Credit v2
03c7b7bc

Yarik authored
2017-01-12 19:33:24 +0200
Browse Code »
-Order history ready
3bee3445

Alexey Boroda authored
2017-01-12 19:18:25 +0200
Browse Code »
Merge remote-tracking branch 'origin/master' into Credits
bfd98631

Yarik authored
2017-01-12 16:09:59 +0200
Browse Code »

2 commits

-Default statistics done
44747138

Alexey Boroda authored
2017-01-11 19:24:03 +0200
Browse Code »
-Statistics half way done
ee0e1df5

Alexey Boroda authored
2017-01-11 16:10:29 +0200
Browse Code »

5 commits

Credits v2
015cc683

Yarik authored
2017-01-10 20:41:02 +0200
Browse Code »
-Yml fix
c130fad8

Alexey Boroda authored
2017-01-10 19:42:35 +0200
Browse Code »
Merge branch 'master' into Credits ...
e6b208ea
```
# Conflicts:
#	views/order/_form.php
```
Yarik authored
2017-01-10 15:31:25 +0200
Browse Code »
Merge remote-tracking branch 'origin/master' ...
38614a3c
```
# Conflicts:
#	views/order/_form.php
```
Yarik authored
2017-01-10 14:58:03 +0200
Browse Code »
-Staistics started
1ac35977

Alexey Boroda authored
2017-01-10 12:04:22 +0200
Browse Code »

2 commits

-Status switcher
55123523

Alexey Boroda authored
2017-01-06 16:24:03 +0200
Browse Code »
-Phone 1 opened for manager
85958295

Alexey Boroda authored
2017-01-06 13:16:45 +0200
Browse Code »

2 commits

1 commit

Merge remote-tracking branch 'origin/master'
8904e372

Administrator authored
2016-12-29 16:46:42 +0200
Browse Code »