Commit Graph

24 Commits

Author SHA1 Message Date
Almira Krdzic
35484c6d4f Merge branch 'master' into package-details 2018-09-06 23:30:03 +02:00
Almira Krdzic
cd5f09487d Add package addons and options 2018-09-06 23:29:29 +02:00
Almira Krdzic
54e6495795 Use order notes for comments 2018-08-29 09:13:38 +02:00
GotPPay
936193ba0c display returned message 2018-08-29 09:12:46 +02:00
GotPPay
9134a44a71 check comment owner by username 2018-08-29 09:12:46 +02:00
GotPPay
768e3b919e change comments handling 2018-08-29 09:12:46 +02:00
GotPPay
8b5374ee24 change endpoints for order details, comments and documents 2018-08-29 09:12:46 +02:00
GotPPay
04c7a7536f use custom endpoints for customer acceptance 2018-08-29 09:12:46 +02:00
Almira Krdzic
438d92e16e Add support for package payment methods and basic checkout proccess 2018-08-29 07:56:37 +02:00
Almira Krdzic
5ac3bfff36 Add package bundles 2018-08-26 15:41:08 +02:00
Almira Krdzic
47bc6bdab1 Merge branch 'master' into orders 2018-08-13 11:49:57 +02:00
Almira Krdzic
b9b1181bf4 Handle additional orders info for wiaas 2018-08-09 12:20:20 +02:00
Nedim Uka
7c5a97b768 Resolved conflict 2018-08-09 11:57:41 +02:00
Nedim Uka
0b899c09af Connected and enabled co-maket 2018-08-09 11:48:23 +02:00
GotPPay
20232e1eed remove obsolete variable 2018-08-08 18:12:17 +02:00
GotPPay
2a0726d256 apply changes from order helper 2018-08-08 16:46:59 +02:00
Almira Krdzic
b8653ad18b Work on wiaas orders 2018-08-08 12:21:26 +02:00
GotPPay
5a06649406 limit number of orders 2018-08-07 14:13:58 +02:00
GotPPay
5ceb376f8f fetch next actions from wiaas plugin 2018-08-06 20:47:29 +02:00
GotPPay
9d24fd8649 create adapter for orders object and use it to accomodate for displaying 2018-08-06 20:44:10 +02:00
GotPPay
d2ff1e497a override missing modules using hardcoded values 2018-08-06 20:44:10 +02:00
Nedim Uka
5c07b371a0 Fixed docker env bugs, and issues from PR 2018-07-26 13:47:59 +02:00
Nedim Uka
1f6b1043a4 Enabled Json Web Token authorisation on backend, and frontend 2018-07-24 17:28:24 +02:00
GotPPay
b5f87f27f8 initial docker setup 2018-06-14 16:49:28 +02:00