536 Commits

Author SHA1 Message Date
Almira Krdzic
c555571607 Text change 2018-11-06 15:33:33 +01:00
Almira Krdzic
a1997a813d Validate that items are from the same country and catalogue 2018-11-06 14:03:58 +01:00
Bilal Catic
a77a97b922 Merge branch 'hide-order-item-metadata' into 'master'
Hide metadata for order item

See merge request saburly/wiaas/new-wiaas!60
2018-11-06 12:47:43 +00:00
Almira Krdzic
99c203b920 Hide metadata for order item 2018-11-06 10:38:08 +01:00
Bilal Catic
053675b478 Merge branch 'add-customer-order-url-merge-tag' into 'master'
Add merge tag for customer order url

See merge request saburly/wiaas/new-wiaas!59
2018-11-06 06:42:26 +00:00
Almira Krdzic
f34ce98655 Merge branch 'master' into add-customer-order-url-merge-tag 2018-11-06 07:18:53 +01:00
Almira Krdzic
6ef9936403 add merge tag for customer order url 2018-11-06 02:04:34 +01:00
Bilal Catic
e0060dd69d Merge branch 'fix-order-organizations-data' into 'master'
Fix order organization info

See merge request saburly/wiaas/new-wiaas!58
2018-11-05 19:57:44 +00:00
Almira Krdzic
d6528e75cf Merge branch 'master' into fix-order-organizations-data 2018-11-05 20:54:08 +01:00
Almira Krdzic
c9b04dac1e Fix order organization info 2018-11-05 20:33:11 +01:00
Bilal Catic
09b5779056 Merge branch 'add-installation-date-action' into 'master'
Add installation date action

See merge request saburly/wiaas/new-wiaas!57
2018-11-05 19:17:18 +00:00
Almira Krdzic
fcbddcb22a fix form import 2018-11-05 19:00:07 +01:00
Almira Krdzic
dd53584d20 Enable admin to enter installation date on delivery process:
:
2018-11-05 18:18:44 +01:00
Bilal Catic
c23e570399 Merge branch 'cart-number' into 'master'
Display * instead of cart count

See merge request saburly/wiaas/new-wiaas!56
2018-11-05 13:05:54 +00:00
Nedim Uka
f5e9aa7495 Renamed Co-Market to Wiaas Market on frontend 2018-11-05 13:55:10 +01:00
Nedim Uka
aef8347df3 Display * instead of cart count 2018-11-05 13:37:47 +01:00
Bilal Catic
75141b6bd1 Merge branch 'bundle-units' into 'master'
Added wiaas_units selection to bundle products

See merge request saburly/wiaas/new-wiaas!52
2018-11-05 11:41:53 +00:00
Nedim Uka
e2952a240c Added wiaas_units selection to bundle products 2018-11-05 12:27:39 +01:00
Bilal Catic
afa370f403 Merge branch 'persist-workflow-documents' into 'master'
Persist workflow fields for order

See merge request saburly/wiaas/new-wiaas!55
2018-11-05 10:24:58 +00:00
Almira Krdzic
b02f0881d3 Fix customer acceptance flow 2018-11-05 10:53:54 +01:00
Almira Krdzic
0d62e7da4b Merge branch 'master' into persist-workflow-documents 2018-11-05 08:52:41 +01:00
Almira Krdzic
3dcef84709 Persist workflow entry fields to order 2018-11-05 08:48:25 +01:00
Almira
0600bbee9f Merge branch 'set-default-status-to-open' into 'master'
Set default status to open

See merge request saburly/wiaas/new-wiaas!54
2018-11-04 23:03:09 +00:00
Bilal Catic
75a574279b change order status to processing when process is assigned 2018-11-04 23:59:54 +01:00
Bilal Catic
9e599617c4 remove wiaas from method name 2018-11-04 23:40:52 +01:00
Bilal Catic
bc310ed738 change order status to open 2018-11-04 23:26:30 +01:00
Bilal Catic
5d872a33da register and display custom order statuses 2018-11-04 23:26:30 +01:00
Bilal Catic
cedd4bf9e9 Merge branch 'order-delivery-flow' into 'master'
Order delivery flow integration with order fields and order organization participants

See merge request saburly/wiaas/new-wiaas!53
2018-11-04 22:16:39 +00:00
Almira Krdzic
4e8b04fa8d Handle order files download separately from delivery process files 2018-11-04 22:13:52 +01:00
Almira Krdzic
1d097eda6f Get supplier organization from order item 2018-11-04 19:54:43 +01:00
Almira Krdzic
b7e4f7f49b Update db migration and remove unused files 2018-11-04 17:57:48 +01:00
Almira Krdzic
5e55d296e5 fix retrieval of process step action entries 2018-11-04 17:06:42 +01:00
Almira Krdzic
27795387df add dependencies 2018-11-04 14:50:54 +01:00
Almira Krdzic
3011c49474 remove error logs 2018-11-04 14:14:55 +01:00
Almira Krdzic
0b54ce54f8 remove procurement order 2018-11-04 13:25:19 +01:00
Almira Krdzic
a6640548ef Update delivery process fields and sample form 2018-11-04 13:20:13 +01:00
Almira Krdzic
e8a3668c25 Merge branch 'master' into order-delivery-flow 2018-11-04 11:17:42 +01:00
Almira
388f7df8a8 Merge branch 'schedule-installation-new' into 'master'
Schedule installation

See merge request saburly/wiaas/new-wiaas!49
2018-11-03 10:24:43 +00:00
Almira Krdzic
8d4f75cc41 Handle process navigation better 2018-11-03 11:15:52 +01:00
Bilal Catic
24e8515b30 show link to delivery process page 2018-11-03 07:35:39 +01:00
Bilal Catic
01b35dbac5 rename 2018-11-03 07:35:39 +01:00
Bilal Catic
93e17817dc move date selection to workflow 2018-11-03 07:35:39 +01:00
Bilal Catic
2a3f2f8245 fix formatting 2018-11-03 07:35:39 +01:00
Bilal Catic
a059f4b83d save items related to supplier in supplier list 2018-11-03 07:35:39 +01:00
Bilal Catic
c08c393b2d use taxonomy for supplier id 2018-11-03 07:35:39 +01:00
Bilal Catic
f8e3cc5875 move formatting to view 2018-11-03 07:35:39 +01:00
Bilal Catic
3af91a71d7 use acf field for additional days prior installation 2018-11-03 07:35:39 +01:00
Bilal Catic
8eeb3b9927 use order update meta 2018-11-03 07:35:39 +01:00
Bilal Catic
3e4324546b rename files and classes 2018-11-03 07:35:39 +01:00
Bilal Catic
b3ba1889b6 use existing function to get supplier name 2018-11-03 07:35:39 +01:00