Commit Graph

172 Commits

Author SHA1 Message Date
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
Almira Krdzic
e810dd086a Merge branch 'master' into commercial-lead-prices 2018-10-15 00:31:24 +02:00
Almira Krdzic
bd724d12c2 Merge branch 'master' into organization-access 2018-10-15 00:25:11 +02:00
Bilal Catic
a5168d3487 remove unnecessary code 2018-10-14 23:42:18 +02:00
Bilal Catic
d7c34c3b0b remove double code, change hook for validation 2018-10-14 23:38:38 +02:00
Bilal Catic
55dc87e174 check if taxonomy query exists and append if exists 2018-10-14 16:03:05 +02:00
Bilal Catic
9f3fe44bb1 add proper message when adding invalid package to cart 2018-10-14 15:31:27 +02:00
Bilal Catic
ba2629ca22 refactor 2018-10-14 14:46:35 +02:00
Bilal Catic
14eda981b7 add notice instead of throwing error 2018-10-14 14:24:06 +02:00
Bilal Catic
8df4ec3dc7 move package validation to seperate function 2018-10-14 14:19:22 +02:00
Almira Krdzic
17acc9d96a Error proof creating suppliers link to organization 2018-10-13 14:28:45 +02:00
Bilal Catic
4bdad78ed8 add tests 2018-10-12 11:15:41 +02:00
Bilal Catic
f3d911e5b1 remove debug logging 2018-10-12 11:15:41 +02:00
Bilal Catic
e4a7b28301 fix tests 2018-10-12 11:15:41 +02:00
Bilal Catic
84ba574bcb add detailed error message 2018-10-12 11:15:41 +02:00
Bilal Catic
4f31cc94e8 update package status on package update 2018-10-12 11:15:41 +02:00
Bilal Catic
bc74b504db fix const declaration 2018-10-12 11:15:41 +02:00
Bilal Catic
8d2b1e52b4 prevent checkout with invalid package 2018-10-12 11:15:41 +02:00
Bilal Catic
63c1ee945f prevent adding invalid package to cart 2018-10-12 11:15:41 +02:00
Bilal Catic
1e9f959b16 fetch only available packages 2018-10-12 11:15:41 +02:00
Bilal Catic
afe4ac1676 update package status on product update 2018-10-12 11:15:41 +02:00