old-new-wiaas

senaduka/old-new-wiaas

Fork 0

Commit Graph

Select branches

Hide Pull Requests

authentication-by-role

backend-contacts-page

backoffice-minimum-cost-margin

cart-validation

cherry-pick-392b1134

cherry-pick-f33c6aa6

commercial-lead-prices

dashboard

development

documents-fix

fix-order-assigment-bug

fix-tests

forms-filtering

installation-fix

master

package-reference

remove-co-market

templates

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#38

#4

#40

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

16b51c87bb Merge branch 'development' into cart-validation cart-validation Almira Krdzic 2018-11-06 21:11:38 +01:00
47b2214a99 Merge branch 'terms-and-conditions-link' into 'development' Almira 2018-11-06 15:17:21 +00:00
c7bf4e8c03 Merge branch 'development' into cart-validation Almira Krdzic 2018-11-06 15:41:18 +01:00
15db815d01 update terms and conditions file and link Bilal Catic 2018-11-06 15:38:09 +01:00
c555571607 Text change Almira Krdzic 2018-11-06 15:33:33 +01:00
a1997a813d Validate that items are from the same country and catalogue Almira Krdzic 2018-11-06 14:03:58 +01:00
a77a97b922 Merge branch 'hide-order-item-metadata' into 'master' Bilal Catic 2018-11-06 12:47:43 +00:00
99c203b920 Hide metadata for order item Almira Krdzic 2018-11-06 10:38:08 +01:00
053675b478 Merge branch 'add-customer-order-url-merge-tag' into 'master' Bilal Catic 2018-11-06 06:42:26 +00:00
f34ce98655 Merge branch 'master' into add-customer-order-url-merge-tag Almira Krdzic 2018-11-06 07:18:53 +01:00
6ef9936403 add merge tag for customer order url Almira Krdzic 2018-11-06 02:04:34 +01:00
e0060dd69d Merge branch 'fix-order-organizations-data' into 'master' Bilal Catic 2018-11-05 19:57:44 +00:00
d6528e75cf Merge branch 'master' into fix-order-organizations-data Almira Krdzic 2018-11-05 20:54:08 +01:00
c9b04dac1e Fix order organization info Almira Krdzic 2018-11-05 20:33:11 +01:00
09b5779056 Merge branch 'add-installation-date-action' into 'master' Bilal Catic 2018-11-05 19:17:18 +00:00
fcbddcb22a fix form import Almira Krdzic 2018-11-05 19:00:07 +01:00
dd53584d20 Enable admin to enter installation date on delivery process: : Almira Krdzic 2018-11-05 18:18:44 +01:00
c23e570399 Merge branch 'cart-number' into 'master' Bilal Catic 2018-11-05 13:05:54 +00:00
f5e9aa7495 Renamed Co-Market to Wiaas Market on frontend Nedim Uka 2018-11-05 13:55:10 +01:00
aef8347df3 Display * instead of cart count Nedim Uka 2018-11-05 13:37:47 +01:00
75141b6bd1 Merge branch 'bundle-units' into 'master' Bilal Catic 2018-11-05 11:41:53 +00:00
e2952a240c Added wiaas_units selection to bundle products Nedim Uka 2018-11-02 13:58:01 +01:00
afa370f403 Merge branch 'persist-workflow-documents' into 'master' Bilal Catic 2018-11-05 10:24:58 +00:00
b02f0881d3 Fix customer acceptance flow Almira Krdzic 2018-11-05 10:53:54 +01:00
0d62e7da4b Merge branch 'master' into persist-workflow-documents Almira Krdzic 2018-11-05 08:52:41 +01:00
3dcef84709 Persist workflow entry fields to order Almira Krdzic 2018-11-05 08:48:25 +01:00
0600bbee9f Merge branch 'set-default-status-to-open' into 'master' Almira 2018-11-04 23:03:09 +00:00
75a574279b change order status to processing when process is assigned Bilal Catic 2018-11-04 23:59:54 +01:00
9e599617c4 remove wiaas from method name Bilal Catic 2018-11-04 23:40:52 +01:00
bc310ed738 change order status to open Bilal Catic 2018-11-04 14:16:44 +01:00
5d872a33da register and display custom order statuses Bilal Catic 2018-11-04 13:52:18 +01:00
cedd4bf9e9 Merge branch 'order-delivery-flow' into 'master' Bilal Catic 2018-11-04 22:16:39 +00:00
4e8b04fa8d Handle order files download separately from delivery process files Almira Krdzic 2018-11-04 22:13:52 +01:00
1d097eda6f Get supplier organization from order item Almira Krdzic 2018-11-04 19:54:43 +01:00
b7e4f7f49b Update db migration and remove unused files Almira Krdzic 2018-11-04 17:57:48 +01:00
5e55d296e5 fix retrieval of process step action entries Almira Krdzic 2018-11-04 17:06:42 +01:00
27795387df add dependencies Almira Krdzic 2018-11-04 14:50:54 +01:00
3011c49474 remove error logs Almira Krdzic 2018-11-04 14:14:55 +01:00
0b54ce54f8 remove procurement order Almira Krdzic 2018-11-04 13:25:19 +01:00
a6640548ef Update delivery process fields and sample form Almira Krdzic 2018-11-04 13:20:13 +01:00
e8a3668c25 Merge branch 'master' into order-delivery-flow Almira Krdzic 2018-11-04 11:17:42 +01:00
388f7df8a8 Merge branch 'schedule-installation-new' into 'master' Almira 2018-11-03 10:24:43 +00:00
8d4f75cc41 Handle process navigation better Almira Krdzic 2018-11-03 11:15:52 +01:00
24e8515b30 show link to delivery process page Bilal Catic 2018-11-03 07:13:30 +01:00
01b35dbac5 rename Bilal Catic 2018-11-03 05:29:37 +01:00
93e17817dc move date selection to workflow Bilal Catic 2018-11-03 05:15:38 +01:00
2a3f2f8245 fix formatting Bilal Catic 2018-11-02 11:21:19 +01:00
a059f4b83d save items related to supplier in supplier list Bilal Catic 2018-11-02 04:09:53 +01:00
c08c393b2d use taxonomy for supplier id Bilal Catic 2018-11-01 20:19:35 +01:00
f8e3cc5875 move formatting to view Bilal Catic 2018-11-01 19:57:14 +01:00
3af91a71d7 use acf field for additional days prior installation Bilal Catic 2018-11-01 19:54:30 +01:00
8eeb3b9927 use order update meta Bilal Catic 2018-11-01 19:39:19 +01:00
3e4324546b rename files and classes Bilal Catic 2018-11-01 00:55:14 +01:00
b3ba1889b6 use existing function to get supplier name Bilal Catic 2018-11-01 00:55:01 +01:00
9e4ee644a0 change style Bilal Catic 2018-10-31 12:53:34 +01:00
d6c5a36e94 handle delivery schedule dates Bilal Catic 2018-10-31 12:48:45 +01:00
e6b6f6c136 add additional fields to order Bilal Catic 2018-10-31 12:47:31 +01:00
9956a94c7c remove debugging output Bilal Catic 2018-10-30 16:28:28 +01:00
f8dd5f1d9f add additional days prior installation field to bundle Bilal Catic 2018-10-30 16:21:24 +01:00
1f03563d2e replace buttons with dropdown Bilal Catic 2018-10-25 15:16:41 +02:00
9aa3b3d044 temporarily remove additional delivery process Bilal Catic 2018-10-21 17:16:47 +02:00
dbddcd47d3 add delivery process Bilal Catic 2018-10-21 16:54:50 +02:00
b91341c5df add missing file Bilal Catic 2018-10-21 16:43:52 +02:00
69c74d9340 order delivery process Bilal Catic 2018-10-21 16:39:58 +02:00
1ae60eb6eb Merge branch 'disable-email' into 'master' Bilal Catic 2018-11-02 12:33:09 +00:00
00076b89fd Disabled processing order email for customer Nedim Uka 2018-11-02 11:26:41 +01:00
26f997abbc Import new forms Almira Krdzic 2018-11-02 11:20:40 +01:00
cdbefc7ef0 Handle assigment for order delivery flow Almira Krdzic 2018-11-02 10:30:25 +01:00
8ffa5ddd3a Merge branch 'quantity-limit-fix' into 'master' Nedim Uka 2018-11-01 10:18:59 +00:00
4b0fc6c61d Merge branch 'master' into order-delivery-flow Almira Krdzic 2018-11-01 11:00:21 +01:00
3d16d5027b Handle process visualization and going from one step to another Almira Krdzic 2018-11-01 10:43:15 +01:00
165eb808b8 Merge branch 'suppliers-order' into 'master' Almira 2018-11-01 09:36:55 +00:00
281f71d853 Removed error logs Nedim Uka 2018-11-01 10:18:37 +01:00
1a33593cbe add more validation Bilal Catic 2018-11-01 00:28:33 +01:00
46e2259359 increase quantity limit in cart Bilal Catic 2018-10-31 21:31:44 +01:00
26353f0d80 Show supplier orders, and preview Nedim Uka 2018-10-31 15:04:23 +01:00
683cc68bb7 Merge branch 'fix-total-cost' into 'master' Almira 2018-10-31 10:24:37 +00:00
308c836460 handle order actions Almira Krdzic 2018-10-31 10:23:59 +01:00
5aca4e8572 delivery step actions Almira Krdzic 2018-10-30 17:20:56 +01:00
51cb2af438 Give order access to suppliers , when order is created Nedim Uka 2018-10-30 15:04:42 +01:00
d2ce84b3fb refactor Bilal Catic 2018-10-29 13:59:10 +01:00
bc39a69b7a fix bug with software cost Bilal Catic 2018-10-29 13:24:49 +01:00
f5766cda99 Fixed taxonomy search in simple product Nedim Uka 2018-10-29 15:18:49 +01:00
45090fa05f Merge branch 'organisation-bug' into 'master' Almira 2018-10-26 07:50:32 +00:00
42c9f07195 Merge branch 'template-category-in-simple-product-search' into 'master' Almira 2018-10-26 07:41:57 +00:00
06e7461245 Use roles from hook methods Nedim Uka 2018-10-25 14:15:05 +02:00
0926030133 Use wiaas edit and create methods for organisations when adding supplier Nedim Uka 2018-10-25 13:25:19 +02:00
a94afea151 Better format of template category in template search box Nedim Uka 2018-10-25 13:05:43 +02:00
ef020f57e5 Include empty template category in search Nedim Uka 2018-10-25 11:15:32 +02:00
892571b179 Merge branch 'optimize-docker' into 'master' Bilal Catic 2018-10-24 13:37:32 +00:00
1b5b8e2595 Merge branch 'master' into optimize-docker Almira Krdzic 2018-10-24 14:17:47 +02:00
0b4243e368 Merge branch 'fix-env' into 'master' Almira 2018-10-24 12:15:59 +00:00
d1a6d1a4d8 Update .dockerignore Bilal Catic 2018-10-24 12:14:23 +00:00
59e60bef4d handle order projects Almira Krdzic 2018-10-24 13:47:16 +02:00
e524e6d0d5 handle only order project with radio buttons Almira Krdzic 2018-10-24 12:43:02 +02:00
29ccb136d0 Remove unused db updates Almira Krdzic 2018-10-24 12:40:50 +02:00
e41b643fc5 Handle order number and product ui fields Almira Krdzic 2018-10-24 12:13:07 +02:00
aec480d110 fix env and docker build Bilal Catic 2018-10-24 12:09:35 +02:00
b0e6cbd9b2 Add supplyer for organisation only if it has supplier role Nedim Uka 2018-10-24 11:15:04 +02:00
e1589ee561 optimize docker Almira Krdzic 2018-10-24 02:15:48 +02:00

1 2 3 4 5 ...