Commit Graph

259 Commits

Author SHA1 Message Date
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
Nedim Uka
a2656173c2 Connected supplier and organisation terms 2018-10-05 16:57:08 +02:00
Bilal Catic
9a8e05e341 Merge branch 'checkout-documents' into 'master'
Wiaas documents handling

See merge request saburly/wiaas/new-wiaas!29
2018-10-05 10:11:32 +00: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
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
Almira Krdzic
ab9ee2cb0d Checkout logic 2018-10-04 03:15:51 +02:00
Almira
451f9fb2eb Merge branch 'frontend-show-order-docuemnts' into 'master'
Display order documents in order details page

See merge request saburly/wiaas/new-wiaas!27
2018-10-03 18:46:28 +00: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
Bilal Catic
ea9a47fd39 create unit test 2018-09-30 21:37:34 +02:00
Bilal Catic
925896c469 don't show documents on other tabs 2018-09-30 21:37:34 +02:00
Bilal Catic
2cd4a77a34 rename props 2018-09-30 21:37:34 +02:00
Bilal Catic
174517a161 stop fetching data on view change 2018-09-30 21:37:34 +02:00
Bilal Catic
dc1311340f add documents property to order 2018-09-30 21:37:34 +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
Nedim Uka
21d96a0e55 Removed uneccesary code from wiaas admin panels.js 2018-09-27 15:09:52 +02:00
Nedim Uka
6afffc7eca Merge branch 'order-projects' into 'master'
CART: Order projects

See merge request saburly/wiaas/new-wiaas!25
2018-09-26 14:13:05 +00:00
Almira Krdzic
5f744f016e remove call to empty function 2018-09-26 16:06:21 +02:00
Almira Krdzic
0e59272689 Merge branch 'master' into order-projects 2018-09-26 16:03:15 +02:00
Almira
aa8aa42164 Merge branch 'login-bug' into 'master'
Replaced login screen with loader, wile validating access token

See merge request saburly/wiaas/new-wiaas!24
2018-09-26 14:02:32 +00:00
Almira Krdzic
415c5d8747 Remove empty function 2018-09-26 16:01:43 +02:00
Almira Krdzic
12805678b1 Change order project name sanitize function 2018-09-26 11:11:44 +02:00
Almira Krdzic
e1a1b4dc49 Fix filtering unavailable order projects 2018-09-25 13:47:25 +02:00
Almira Krdzic
4ecadc8bcc Fix error for html client response handling 2018-09-25 13:18:03 +02:00
Nedim Uka
eab040b13d Reduced loader size 2018-09-25 11:38:38 +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
9c4539acfe Replaced login screen with loader, wile validating access token 2018-09-24 16:10:55 +02:00
Almira Krdzic
8cc2a7c8bc Merge branch 'master' into order-projects 2018-09-21 20:48:45 +02:00
Bilal Catic
c13983d6df Merge branch 'frontend-handle-page-refresh' into 'master'
add rewrite rule to apache for frontend

See merge request saburly/wiaas/new-wiaas!23
2018-09-20 12:33:53 +00:00
Bilal Catic
0065b25fef add rewrite rule to apache for frontend 2018-09-20 14:29:34 +02:00
Almira
d8c38ec089 Merge branch 'frontend-profileSettings' into 'master'
Frontend profile settings

See merge request saburly/wiaas/new-wiaas!20
2018-09-20 12:27:02 +00:00
Bilal Catic
cbf1de3403 modify test to use DELTE instead of POST 2018-09-20 14:08:32 +02:00
Bilal Catic
41e92e2390 use DELETE instead of POST for delete action 2018-09-20 13:57:01 +02:00
Bilal Catic
5da2353d04 add tests for profile endpoints 2018-09-20 13:39:25 +02:00
Bilal Catic
4159f12854 fix company info update 2018-09-20 13:39:25 +02:00
Bilal Catic
3fa75daafd fix typo 2018-09-20 13:39:25 +02:00
Bilal Catic
c637880245 fix personal info validation 2018-09-20 13:39:25 +02:00
Bilal Catic
fa2b691996 apply snake case change 2018-09-20 13:39:25 +02:00
Bilal Catic
393158808a snake case - camel case transformations 2018-09-20 13:39:25 +02:00
Bilal Catic
0787cf834f use snake case 2018-09-20 13:39:25 +02:00