Commit Graph

97 Commits

Author SHA1 Message Date
Almira Krdzic
c2c7356f35 fix css 2018-08-29 08:05:32 +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
Bilal Catic
6017ae8cf3 Merge branch 'orders' into 'master'
Wiaas Orders

See merge request saburly/wiaas/new-wiaas!12
2018-08-14 12:42:51 +00:00
Almira Krdzic
a878b24224 Activate plugins in docker setup 2018-08-14 13:14:48 +02:00
Almira Krdzic
3cc72d6d84 Handle tear down for unit tests 2018-08-14 12:12:54 +02:00
Almira Krdzic
bb3fecd811 Add unit tests for backend and refactor few things on frontend 2018-08-14 00:44:51 +02:00
Almira Krdzic
47bc6bdab1 Merge branch 'master' into orders 2018-08-13 11:49:57 +02:00
Almira Krdzic
7bb96ade6f Handle order status 2018-08-13 11:48:44 +02:00
Almira
cd682f0405 Merge branch 'customer-permission' into 'master'
Added read private products permission to customer

See merge request saburly/wiaas/new-wiaas!11
2018-08-09 14:44:04 +00:00
Nedim Uka
848e3f566b Added read private products permission to customer 2018-08-09 14:47:22 +02:00
Nedim Uka
0993e474c9 Merge branch 'co-market' into 'master'
Connected and enabled  co-maket

See merge request saburly/wiaas/new-wiaas!10
2018-08-09 12:37:33 +00: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
Almira
5d84f53ea7 Merge branch 'frontend-dashboards-with-login' into 'master'
Frontend dashboards with login

See merge request saburly/wiaas/new-wiaas!9
2018-08-08 16:24:38 +00:00
GotPPay
20232e1eed remove obsolete variable 2018-08-08 18:12:17 +02:00
GotPPay
086c1ecc68 fix unit test 2018-08-08 17:50:32 +02:00
GotPPay
190d139f5a use new names from order and process properties 2018-08-08 16:48:17 +02:00
GotPPay
0f515172fe change statuses to adapt to woocommerce statuses 2018-08-08 16:47:45 +02:00
GotPPay
2a0726d256 apply changes from order helper 2018-08-08 16:46:59 +02:00
GotPPay
375fcb80a7 change object properties to more readable ones 2018-08-08 16:46:14 +02:00
GotPPay
a2022f3b07 change order of plugins activation 2018-08-08 14:15:57 +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
7725556f38 enhance customer role capability 2018-08-07 13:55:59 +02:00
GotPPay
5ceb376f8f fetch next actions from wiaas plugin 2018-08-06 20:47:29 +02:00
GotPPay
ce7e864c1d add missing variable to config 2018-08-06 20:47:29 +02:00
GotPPay
ce9f0799ed stop forcing https locally 2018-08-06 20:47:29 +02:00
GotPPay
dcbb47425f include wiaas plugin for fetching delivery steps 2018-08-06 20:47:29 +02:00
GotPPay
a35fd40e3a fix docker file 2018-08-06 20:44:10 +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
GotPPay
09a2be6be8 environment fix 2018-08-06 20:44:10 +02:00
GotPPay
688cb1ad59 add htaccess 2018-08-06 20:44:10 +02:00
GotPPay
e3765f7b09 improve environment handling 2018-08-06 20:44:10 +02:00
Bilal Catic
c1834f679a Merge branch 'delivery-process' into 'master'
Delivery process

See merge request saburly/wiaas/new-wiaas!8
2018-08-06 18:03:45 +00:00
Almira Krdzic
569a638c89 update readme 2018-08-06 19:33:00 +02:00
Almira Krdzic
5afdde434b Delivery setup 2018-08-06 17:36:57 +02:00
Almira Krdzic
ed0e44b964 fixes 2018-08-01 14:47:02 +02:00
Almira
5e9beb2d97 Merge branch 'stops-redirect-on-login' into 'master'
stops redirect on login page

See merge request saburly/wiaas/new-wiaas!7
2018-08-01 09:59:58 +00:00
GotPPay
5b78b642e2 stops redirect on login page 2018-08-01 11:53:25 +02:00
Almira Krdzic
321fbc3f61 Wiaas delivery process integration with flow 2018-08-01 11:46:43 +02:00
Bilal Catic
158a3a97ad Merge branch 'new-project-structure' into 'master'
New project structure

See merge request saburly/wiaas/new-wiaas!6
2018-07-31 11:43:28 +00:00
Almira Krdzic
2c57157703 Update dotenv env file 2018-07-30 18:40:43 +02:00
Almira Krdzic
7f3437126f Merge branch 'new-project-structure' of gitlab.com:saburly/wiaas/new-wiaas into new-project-structure 2018-07-30 17:27:09 +02:00
Almira Krdzic
0ac5e5940b Updates 2018-07-30 17:26:55 +02:00
Almira
3b5074d422 Merge branch 'clean-frontend-in-new-structure' into 'new-project-structure'
remove obsolete config variables

See merge request saburly/wiaas/new-wiaas!5
2018-07-30 14:29:31 +00:00
Almira Krdzic
828c71c253 Update enviroment sample 2018-07-30 16:26:46 +02:00
GotPPay
8bad650d23 remove obsolete config variables 2018-07-30 16:20:51 +02:00