Commit Graph

195 Commits

Author SHA1 Message Date
Bilal Catic
d2ce84b3fb refactor 2018-10-29 16:02:01 +01:00
Bilal Catic
bc39a69b7a fix bug with software cost 2018-10-29 16:02:01 +01:00
Nedim Uka
f5766cda99 Fixed taxonomy search in simple product 2018-10-29 15:18:49 +01:00
Almira
45090fa05f Merge branch 'organisation-bug' into 'master'
Add supplier for organisation only if it has supplier role

See merge request saburly/wiaas/new-wiaas!44
2018-10-26 07:50:32 +00:00
Almira
42c9f07195 Merge branch 'template-category-in-simple-product-search' into 'master'
Connected template category to product in bundle product search

See merge request saburly/wiaas/new-wiaas!43
2018-10-26 07:41:57 +00:00
Nedim Uka
06e7461245 Use roles from hook methods 2018-10-25 14:15:05 +02:00
Nedim Uka
0926030133 Use wiaas edit and create methods for organisations when adding supplier 2018-10-25 13:25:19 +02:00
Nedim Uka
a94afea151 Better format of template category in template search box 2018-10-25 13:05:43 +02:00
Nedim Uka
ef020f57e5 Include empty template category in search 2018-10-25 11:15:32 +02:00
Almira Krdzic
59e60bef4d handle order projects 2018-10-24 13:47:16 +02:00
Almira Krdzic
e524e6d0d5 handle only order project with radio buttons 2018-10-24 12:43:02 +02:00
Almira Krdzic
29ccb136d0 Remove unused db updates 2018-10-24 12:40:50 +02:00
Almira Krdzic
e41b643fc5 Handle order number and product ui fields 2018-10-24 12:13:07 +02:00
Nedim Uka
b0e6cbd9b2 Add supplyer for organisation only if it has supplier role 2018-10-24 11:15:04 +02:00
Nedim Uka
66452eee86 Connected template category to product in bundle product search 2018-10-23 15:48:56 +02:00
Almira Krdzic
69773c77a7 validate country 2018-10-23 12:17:25 +02:00
Almira Krdzic
e3869e720b Fix template creation 2018-10-23 11:28:11 +02:00
Almira Krdzic
09aac81276 allow admin on frontend 2018-10-22 11:00:48 +02:00
Almira Krdzic
790d24a1f6 forbid admin user on frontend 2018-10-22 10:58:45 +02:00
Almira Krdzic
3d6f15dd4f return error status on login 2018-10-22 10:35:25 +02:00
Almira Krdzic
5570cf7f91 transform auth user last 2018-10-22 09:53:40 +02:00
Almira Krdzic
e420953c39 do not set cart cookies 2018-10-22 09:52:01 +02:00
Almira Krdzic
21fafc5a43 Enable login by role both on frontend and backend 2018-10-22 09:47:48 +02:00
Almira Krdzic
5a6f876c69 Merge branch 'master' into package-reference 2018-10-19 21:01:05 +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
Almira Krdzic
67dc8d7d69 Hide unused tabs and render only edit link for package prices 2018-10-18 20:02:12 +02:00
Almira Krdzic
3ccea1804e Merge branch 'master' into bundle-cost-summary 2018-10-18 19:01:18 +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