Commit Graph

192 Commits

Author SHA1 Message Date
Almira Krdzic
5cbdb482f2 test 2018-10-21 02:13:57 +02:00
Almira Krdzic
70d16f95c5 test' 2018-10-20 13:46:02 +02:00
Almira Krdzic
95318ff1c4 test 2018-10-20 00:42:03 +02:00
Almira Krdzic
88c5ae5eb1 test 2018-10-20 00:30:10 +02:00
Almira Krdzic
e618484725 test 2018-10-20 00:25:29 +02:00
Almira Krdzic
4d87551fef test 2018-10-20 00:08:48 +02:00
Almira Krdzic
52fb6dc5d9 test 2018-10-19 23:43:05 +02:00
Almira Krdzic
cfd602bef7 test 2018-10-19 23:30:03 +02:00
Almira Krdzic
6b3964c2ca test 2018-10-19 23:22:11 +02:00
Almira Krdzic
dc5461f616 test 2018-10-19 23:08:31 +02:00
Almira Krdzic
eecbeed2b8 test 2018-10-19 22:36:39 +02:00
Almira Krdzic
f21e1d90b5 test 2018-10-19 22:23:57 +02:00
Almira Krdzic
e323b597b1 test 2018-10-19 21:11:12 +02:00
Almira Krdzic
3d4c3c40c1 test 2018-10-19 20:55:33 +02:00
Almira Krdzic
c3b665cd51 test 2018-10-19 20:50:55 +02:00
Almira Krdzic
84f7974050 test 2018-10-19 20:44:30 +02:00
Almira Krdzic
bde4a9a91f test 2018-10-19 20:37:10 +02:00
Almira Krdzic
05863b4114 test 2018-10-19 20:32:42 +02:00
Almira Krdzic
fd2f01197e test 2018-10-19 20:20:19 +02:00
Almira Krdzic
30a51dae8c test 2018-10-19 20:16:05 +02:00
Almira Krdzic
b5b8a72eaf test 2018-10-19 20:10:20 +02:00
Almira Krdzic
5d8e759e80 Remove shop on org delete 2018-10-19 20:00:40 +02:00
Almira Krdzic
a5a795af93 Authenticate by role on frontend 2018-10-19 17:57:27 +02:00
Almira Krdzic
038b622eca Update product properties field 2018-10-19 12:27:25 +02:00
Almira Krdzic
e4ed26de7d add missing comma 2018-10-19 10:27:33 +02:00
Almira Krdzic
094a7bd56c Merge branch 'master' into package-reference 2018-10-19 10:19:45 +02:00
Nedim Uka
c4cddf8ace Added comment to save post method 2018-10-18 17:30:42 +02:00
Nedim Uka
00e853ae6b Fixed product status issue 2018-10-18 17:28:31 +02:00
Nedim Uka
071c549726 Impleneted search by country, and added mesurment unit 2018-10-18 16:45:26 +02:00
Almira Krdzic
d22ea58568 Import reference ui field 2018-10-18 13:36:45 +02:00
Almira Krdzic
d3c280548b customize column name for reference 2018-10-18 13:28:41 +02:00
Almira Krdzic
1ed7310994 handle package reference 2018-10-18 13:10:55 +02:00
Almira Krdzic
76e9b10235 Merge branch 'master' into bundle-cost-summary 2018-10-18 09:58:15 +02:00
Almira Krdzic
6b0dd0b5a9 handle bundle product prices editor and prices summary 2018-10-18 09:57:44 +02:00
Almira Krdzic
6d65a5f30c handle bundle product prices editor and prices summary 2018-10-18 09:57:38 +02:00
Almira Krdzic
49281f02be remove error logs 2018-10-17 19:40:25 +02:00
Almira Krdzic
b7ab761a25 Handle bundle pricing on separate page 2018-10-17 19:38:41 +02:00
Almira Krdzic
0238f9140e Fixes 2018-10-17 17:45:33 +02:00
Almira Krdzic
4d13ee40bc Add descriptive comments 2018-10-17 14:02:35 +02:00
Almira Krdzic
6c27afabfc Merge branch 'master' into resseler-to-customer 2018-10-17 13:44:15 +02:00
Almira Krdzic
755fc75ae9 Filter linked organizations as customer 2018-10-17 11:31:09 +02:00
Almira Krdzic
8769606a4b Implement shop search and refactor 2018-10-17 00:36:19 +02:00
Almira Krdzic
ddf7d4452c Refactor admin cl interface and handle product access with groups 2018-10-16 16:57:48 +02:00
Almira Krdzic
554dc37a2d updated timestamp of role related db updates so they get triggered again 2018-10-16 06:49:57 +02:00
Almira Krdzic
afab22a30b reseller to customer 2018-10-16 06:45:28 +02:00
Almira Krdzic
dc1a1c64d2 Add default roles 2018-10-15 18:08:09 +02:00
Almira Krdzic
2d7b6c55e6 add view admin dashboard to cl 2018-10-15 17:22:58 +02:00
Almira Krdzic
d7103df6dc add view admin dashboard to cl 2018-10-15 17:21:30 +02:00
Almira Krdzic
b7ac53d195 use only customer specific prices if set 2018-10-15 14:59:57 +02:00
Almira Krdzic
f14d35b1aa Fix tests 2018-10-15 05:06:46 +02:00