Bilal Catic
|
00999122a2
|
Merge branch 'role-access' into 'master'
Enable login by role both on frontend and backend
See merge request saburly/wiaas/new-wiaas!40
|
2018-10-22 09:26:56 +00: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
|
87f408125d
|
Merge branch 'preserve-uploads-dir' into 'master'
preserve user uploaded content
See merge request saburly/wiaas/new-wiaas!38
|
2018-10-22 06:46:38 +00:00 |
|
Almira Krdzic
|
37916e4931
|
fixes
|
2018-10-22 08:46:07 +02:00 |
|
Bilal Catic
|
a07b3fb7d9
|
preserve user uploaded content
|
2018-10-21 19:18:54 +02:00 |
|
Bilal Catic
|
f76e102bf3
|
Merge branch 'package-reference' into 'master'
Package reference
See merge request saburly/wiaas/new-wiaas!36
|
2018-10-21 13:22:49 +00:00 |
|
Almira Krdzic
|
5a6f876c69
|
Merge branch 'master' into package-reference
|
2018-10-19 21:01:05 +02:00 |
|
Nedim Uka
|
9b5cc3a978
|
Merge branch 'bundle-cost-summary' into 'master'
Bundle cost summary
See merge request saburly/wiaas/new-wiaas!35
|
2018-10-19 10:28:24 +00: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 |
|
Almira
|
315ac70484
|
Merge branch 'simple-product-details' into 'master'
Added manufacturer and supplyer product numbers
See merge request saburly/wiaas/new-wiaas!30
|
2018-10-18 17:00:28 +00: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 |
|
Bilal Catic
|
c8ed5f7ff8
|
Merge branch 'resseler-to-customer' into 'master'
Link customers to their respective (commercial leads/ resellers /shops)
See merge request saburly/wiaas/new-wiaas!34
|
2018-10-17 20:27:03 +00: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 |
|
Nedim Uka
|
ecde654ae9
|
Merge branch 'commercial-lead-prices' into 'master'
Commercial lead prices
See merge request saburly/wiaas/new-wiaas!33
|
2018-10-17 09:29:54 +00: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 |
|
Bilal Catic
|
8789eb1426
|
Merge branch 'organization-access' into 'master'
Organization access
See merge request saburly/wiaas/new-wiaas!32
|
2018-10-14 22:27:52 +00:00 |
|
Almira Krdzic
|
bd724d12c2
|
Merge branch 'master' into organization-access
|
2018-10-15 00:25:11 +02:00 |
|
Almira
|
803e62ea69
|
Merge branch 'backoffice-max-cost-margin' into 'master'
Backoffice - max cost margin
See merge request saburly/wiaas/new-wiaas!31
|
2018-10-14 22:24:33 +00:00 |
|
Bilal Catic
|
a5168d3487
|
remove unnecessary code
|
2018-10-14 23:42:18 +02:00 |
|