Bilal Catic
b7a5f075b1
Merge branch 'cherry-pick-f33c6aa6' into 'master'
...
Remove Co-Market from customer interface
See merge request saburly/wiaas/new-wiaas!86
2018-12-05 13:28:06 +00:00
Bilal Catic
2cdef7c31e
Merge branch 'remove-co-market' into 'development'
...
Remove Co-Market from customer interface
See merge request saburly/wiaas/new-wiaas!85
(cherry picked from commit f33c6aa6e21726c3d7
2018-12-05 13:20:43 +00:00
Bilal Catic
f51d9f5512
Merge branch 'development' into 'master'
...
Bugfixes
See merge request saburly/wiaas/new-wiaas!73
2018-11-19 15:42:25 +00:00
Almira
3db4b71c3f
Merge branch 'fix-location-details-field' into 'development'
...
Fix location details field
See merge request saburly/wiaas/new-wiaas!74
2018-11-19 15:32:55 +00:00
Bilal Catic
3df6397280
remove comment
2018-11-19 16:30:04 +01:00
Bilal Catic
e548e2a31c
break project name and location details if too long
2018-11-19 16:29:22 +01:00
Almira
3d37a88247
Merge branch 'ticketing-integration' into 'development'
...
add helpdesk module
See merge request saburly/wiaas/new-wiaas!66
2018-11-19 12:44:16 +00:00
Bilal Catic
30e5d594ad
highlight helpdesk when selected
2018-11-19 13:38:12 +01:00
Bilal Catic
dd93677def
add helpdesk module
2018-11-19 13:38:12 +01:00
Nedim Uka
4de01d93d1
Merge branch 'fix-bundle-link-in-order-details' into 'development'
...
set commercial id to real id, not object
See merge request saburly/wiaas/new-wiaas!72
2018-11-19 12:37:09 +00:00
Bilal Catic
2fdae06a59
set commercial id to real id, not object
2018-11-19 13:30:07 +01:00
Almira
d0533b3d6e
Merge branch 'support-email' into 'development'
...
Added support for sending customer emails
See merge request saburly/wiaas/new-wiaas!69
2018-11-19 12:24:10 +00:00
Nedim Uka
35e670fa52
removved debug log
2018-11-19 13:15:50 +01:00
Nedim Uka
f56377f606
Handled proper endpoint naming
2018-11-19 12:35:04 +01:00
Almira
95a9fd2110
Merge branch 'fix-additional-days-bug' into 'development'
...
add only working days
See merge request saburly/wiaas/new-wiaas!70
2018-11-19 11:11:34 +00:00
Nedim Uka
752df56d4a
Fixed bug where order note text is saved as order ID
2018-11-19 11:31:46 +01:00
Bilal Catic
e1594f3a7f
Merge branch 'fixes' into 'development'
...
Fixes
See merge request saburly/wiaas/new-wiaas!71
2018-11-19 10:15:26 +00:00
Almira Krdzic
4f97df5b45
Merge branch 'development' into fixes
2018-11-18 22:10:24 +01:00
Almira Krdzic
ef5cf00983
Fix hidden metadata
2018-11-18 22:10:01 +01:00
Bilal Catic
ca0fed674f
add only working days
2018-11-16 20:30:47 +01:00
Bilal Catic
fb66d56d9c
Merge branch 'installation-fix' into 'development'
...
Fix installation selection
See merge request saburly/wiaas/new-wiaas!68
2018-11-16 19:20:35 +00:00
Nedim Uka
a07c0e4584
Added support for sending customer emails
2018-11-16 17:16:28 +01:00
Almira Krdzic
3708c9fb30
Fix installation selection
2018-11-16 15:59:16 +01:00
Bilal Catic
c630452d0b
Merge branch 'fix-tests' into 'development'
...
Fix and remove broken tests
See merge request saburly/wiaas/new-wiaas!67
2018-11-16 09:38:51 +00:00
Almira Krdzic
a62de78172
fix and remove broken tests
2018-11-15 23:40:58 +01:00
Almira
14550d2ea9
Merge branch 'allign-order-table' into 'development'
...
break long words
See merge request saburly/wiaas/new-wiaas!65
2018-11-15 15:23:51 +00:00
Bilal Catic
56c171df3e
break long words
2018-11-15 14:50:02 +01:00
Bilal Catic
337f031705
Merge branch 'documents-fix' into 'development'
...
Handle documents upload
See merge request saburly/wiaas/new-wiaas!64
2018-11-15 13:44:55 +00:00
Almira Krdzic
b7be6fde42
Merge branch 'development' into documents-fix
2018-11-15 14:33:15 +01:00
Almira Krdzic
6c656a0b26
Handle order documents
2018-11-15 11:29:15 +01:00
Bilal Catic
c4d539f549
Merge branch 'documents-fix' into 'development'
...
Documents fix
See merge request saburly/wiaas/new-wiaas!63
2018-11-07 10:17:46 +00:00
Almira Krdzic
0ba27b2f1d
documents fix
2018-11-07 03:05:54 +01:00
Bilal Catic
e6b372f5d0
Merge branch 'cart-validation' into 'development'
...
Validate that items are from the same country and catalogue
See merge request saburly/wiaas/new-wiaas!61
2018-11-06 20:13:13 +00:00
Almira Krdzic
16b51c87bb
Merge branch 'development' into cart-validation
2018-11-06 21:11:38 +01:00
Almira
47b2214a99
Merge branch 'terms-and-conditions-link' into 'development'
...
update terms and conditions file and link
See merge request saburly/wiaas/new-wiaas!62
2018-11-06 15:17:21 +00:00
Almira Krdzic
c7bf4e8c03
Merge branch 'development' into cart-validation
2018-11-06 15:41:18 +01:00
Bilal Catic
15db815d01
update terms and conditions file and link
2018-11-06 15:38:09 +01:00
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
