Commit Graph

53 Commits

Author SHA1 Message Date
Almira Krdzic
e41b643fc5 Handle order number and product ui fields 2018-10-24 12:13:07 +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
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
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
d3c280548b customize column name for reference 2018-10-18 13:28:41 +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
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
afab22a30b reseller to customer 2018-10-16 06:45:28 +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
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
57d61918b9 add minimum cost margin input box 2018-10-12 11:15:16 +02: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
Almira Krdzic
246788207b remove unused import 2018-10-04 18:36:53 +02:00
Almira Krdzic
d11860223f Merge branch 'master' into checkout-documents 2018-10-04 13:22:26 +02:00
Nedim Uka
c102b6a5ad Fixed template selection bug 2018-10-04 13:14:49 +02:00
Nedim Uka
f41252ea23 Services not listed bug fix 2018-10-04 12:54:34 +02:00
Nedim Uka
c5c07cbfae Fixed bug where template categoryes are not save properly in template 2018-10-04 12:41:17 +02:00
Nedim Uka
7ceac97fed Fixed template validation bug 2018-10-04 10:51:18 +02:00
Nedim Uka
b028fb3f04 Removed error log 2018-10-03 16:58:52 +02:00
Almira Krdzic
3ad210f883 Handle wiaas documents 2018-10-03 16:46:41 +02:00
Nedim Uka
4c760b12c3 Added unit tests for templates 2018-10-01 17:03:24 +02:00
Nedim Uka
f1c99c28ae Added documentation to methods 2018-09-28 14:24:47 +02:00
Nedim Uka
6f6fb1115a renamed variables to 2018-09-27 16:02:49 +02:00
Nedim Uka
93d03a96ee Refactored template product feature 2018-09-27 15:09:52 +02:00
Almira Krdzic
fdc01b974e Fix broken counting of orders inside order project 2018-09-24 22:19:21 +02:00
Almira Krdzic
11c26aeee1 Handle order project and refactor api 2018-09-24 21:51:55 +02:00
Nedim Uka
d3b0d10143 Deleted error logs 2018-09-20 12:34:54 +02:00
Nedim Uka
246656bc56 Fixed template category double title bug 2018-09-20 11:29:31 +02:00
Almira Krdzic
94ba69761d Show downlodable files only for simple and bundles 2018-09-20 11:26:34 +02:00
Nedim Uka
434083820c Repalced virtual product with template category 2018-09-19 22:33:59 +02:00
Nedim Uka
f2d3efc526 Added templates product 2018-09-18 13:28:54 +02:00