Commit Graph

156 Commits

Author SHA1 Message Date
Almira Krdzic
49281f02be remove error logs 2018-10-17 19:40:25 +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
Bilal Catic
c7e8a526e0 add custom package status 2018-10-12 11:15:16 +02:00
Bilal Catic
ac9c89e8eb update name to reflect logic behind margin 2018-10-12 11:15:16 +02:00
Bilal Catic
ea63870704 use minimum cost margin in pricing panel 2018-10-12 11:15:16 +02:00
Bilal Catic
accc359cbe handle bundle minimum cost margin read and update 2018-10-12 11:15:16 +02:00
Bilal Catic
57d61918b9 add minimum cost margin input box 2018-10-12 11:15:16 +02:00
Almira Krdzic
a830a47d31 retrieve all commercial leads on request 2018-10-11 07:52:10 +02:00
Almira Krdzic
61109e9bf0 Merge branch 'organization-access' into commercial-lead-prices 2018-10-11 07:27:32 +02:00
Almira Krdzic
c6a1f9837d Merge branch 'master' into organization-access 2018-10-11 07:14:33 +02:00
Almira
089bea5ce4 Merge branch 'suppliers-simple-product' into 'master'
Supplier

See merge request saburly/wiaas/new-wiaas!28
2018-10-11 05:13:43 +00:00
Almira Krdzic
b53fbe5402 Handle commercial lead prices 2018-10-11 07:12:53 +02:00
Almira Krdzic
84cd11f9c9 handle user roles by organization 2018-10-11 04:16:43 +02:00
Nedim Uka
a2656173c2 Connected supplier and organisation terms 2018-10-05 16:57:08 +02:00
Almira Krdzic
246788207b remove unused import 2018-10-04 18:36:53 +02:00
Nedim Uka
360b24c6ec Added Supplier taxonomy 2018-10-04 13:33:13 +02:00
Almira Krdzic
d11860223f Merge branch 'master' into checkout-documents 2018-10-04 13:22:26 +02:00
Almira
c537557daf Merge branch 'package-template-refactoring' into 'master'
Templates refactoring

See merge request saburly/wiaas/new-wiaas!26
2018-10-04 11:21:17 +00:00