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

dd8a793ec4 Merge branch 'development' into 'master' master Almira 2019-01-07 23:55:51 +00:00
21b52b7086 update constant development Almira Krdzic 2019-01-08 00:54:40 +01:00
5fd4beafe4 Merge branch 'development' into 'master' Almira 2019-01-07 23:35:51 +00:00
77ba75ab6c Merge branch 'fixes' into 'development' Almira 2019-01-07 23:18:34 +00:00
81207c40ab fixes Almira Krdzic 2019-01-07 21:32:48 +01:00
1c5a808a69 fixes Almira Krdzic 2019-01-07 21:21:43 +01:00
423bb18b29 update shop page size Almira Krdzic 2019-01-07 21:17:55 +01:00
e3392a9da7 Fixes Almira Krdzic 2019-01-07 21:15:06 +01:00
9043a45ed7 Merge branch 'development' into 'master' Almira 2019-01-07 11:12:15 +00:00
b1230e5111 Merge branch 'rename-pricing' into 'development' Nedim Uka 2019-01-07 10:31:04 +00:00
b9ad9f2a34 Rename pricing options Almira Krdzic 2019-01-07 11:23:44 +01:00
8b3908782d Merge branch 'development' into 'master' Almira 2018-12-13 12:25:17 +00:00
1d6837e004 hide default role backend-contacts-page Bilal Catic 2018-12-08 22:24:22 +01:00
60de10633b show users phone number in users screen Bilal Catic 2018-12-08 22:17:41 +01:00
902d339c6e add missing function Bilal Catic 2018-12-08 22:00:47 +01:00
86867c4e04 add contacts page for commercial leads Bilal Catic 2018-12-08 21:58:43 +01:00
395a60b1cf Merge branch 'abbrevations' into 'development' Almira 2018-12-06 11:08:25 +00:00
85d21322a0 improved redability of cl-package prices table Nedim Uka 2018-12-06 11:54:20 +01:00
c133374159 removed other abbervations Nedim Uka 2018-12-06 11:43:16 +01:00
a3761f3c71 Merge branch 'max-cost-margin-tooltip' into 'development' Almira 2018-12-05 19:39:28 +00:00
e4da6c7d45 use woocommerce help tip Bilal Catic 2018-12-05 15:27:44 +01:00
4aed08a96b use wordpress icons for consistency Bilal Catic 2018-12-05 15:12:19 +01:00
bb9dc470d4 show tooltip for max cost margin Bilal Catic 2018-12-03 17:28:10 +01:00
017838cd6a Merge branch 'cherry-pick-392b1134' into 'master' Bilal Catic 2018-12-05 18:45:14 +00:00
6a9211f84a Merge branch 'fix-image-style' into 'development' cherry-pick-392b1134 Almira 2018-12-05 18:21:33 +00:00
392b113427 Merge branch 'fix-image-style' into 'development' Almira 2018-12-05 18:21:33 +00:00
d15cb6a225 fix image size Almira Krdzic 2018-12-05 19:04:45 +01:00
3ce531ca4e Fix banner image style Almira Krdzic 2018-12-05 14:54:31 +01:00
ba0549b9fb Mooved tooltip Nedim Uka 2018-12-05 14:44:38 +01:00
b7a5f075b1 Merge branch 'cherry-pick-f33c6aa6' into 'master' Bilal Catic 2018-12-05 13:28:06 +00:00
2cdef7c31e Merge branch 'remove-co-market' into 'development' cherry-pick-f33c6aa6 Bilal Catic 2018-12-05 11:57:01 +00:00
f33c6aa6e2 Merge branch 'remove-co-market' into 'development' Bilal Catic 2018-12-05 11:57:01 +00:00
1726c3d7f7 Remove Co-Market from customer interface remove-co-market Almira Krdzic 2018-12-04 20:34:23 +01:00
4f057b8338 Extra commision column now split into 3 , and tooltip added Nedim Uka 2018-12-04 10:24:50 +01:00
89080780ed Merge branch 'dashboard' into 'development' Bilal Catic 2018-12-03 15:04:27 +00:00
17d4dfe3d7 Merge branch 'development' into dashboard dashboard Almira Krdzic 2018-12-03 16:03:29 +01:00
103fc53c1d display instructions if any Almira Krdzic 2018-12-03 16:02:53 +01:00
d800f44b8d Merge branch 'backoffice-package-details' into 'development' Almira 2018-12-03 13:04:44 +00:00
8476529bb4 Add timeline Almira Krdzic 2018-12-03 13:13:03 +01:00
c5f590c3fe Use custom capability to manage access to order delivery process Almira Krdzic 2018-12-03 12:20:47 +01:00
2c0e217a49 Handle access to order delivery process page Almira Krdzic 2018-12-03 01:59:24 +01:00
5d5ab87595 Merge branch 'development' into dashboard Almira Krdzic 2018-12-03 00:52:04 +01:00
6c6612c7c6 Merge branch 'backend-add-missing-details-order-view' into 'development' Almira 2018-12-02 23:08:34 +00:00
a2c088ba52 Fix order details display Almira Krdzic 2018-12-01 00:17:54 +01:00
397a0ed831 add wiaas prefix Bilal Catic 2018-11-30 13:44:48 +01:00
a0b7faa90f show delivery details Bilal Catic 2018-11-29 13:24:03 +01:00
29fb07205e Remove custom class Bilal Catic 2018-11-29 12:44:12 +01:00
00a1ef7da5 add order payment details to order preview Bilal Catic 2018-11-29 05:01:51 +01:00
2f18e1e47c remove obsolete info from order preview Bilal Catic 2018-11-28 00:04:47 +01:00
8b5ea356e7 show item prices in order preview Bilal Catic 2018-11-27 00:01:09 +01:00
434d0ab6b3 add commercial lead name to order preview Bilal Catic 2018-11-26 22:45:56 +01:00
a5419e2f3c add custom columns to order list view Bilal Catic 2018-11-22 13:56:24 +01:00
00f9d5cafa Merge branch 'fix-order-assigment-bug' into 'development' Bilal Catic 2018-12-02 22:59:08 +00:00
670eb53da1 Fix countries fix-order-assigment-bug Almira Krdzic 2018-12-02 22:59:20 +01:00
e87d1521dd Fix assigment order issues Almira Krdzic 2018-12-02 22:18:09 +01:00
3dfe06bc76 Fix process navigation Almira Krdzic 2018-12-02 10:59:32 +01:00
fa4a792134 Hide pricing from quick edit, for unsupported product types Nedim Uka 2018-11-29 13:15:41 +01:00
1f74fd9c23 Added pricing to quickedit Nedim Uka 2018-11-29 13:05:53 +01:00
71d615907d Dashboards widgets Almira Krdzic 2018-11-29 11:13:15 +01:00
3dbdb657c9 Merge branch 'forms-filtering' into 'development' Bilal Catic 2018-11-27 12:08:22 +00:00
2b688e8a5e Remove unused code forms-filtering Almira Krdzic 2018-11-27 11:22:01 +01:00
95d162578f Add timestamp script to composer Almira Krdzic 2018-11-27 01:47:01 +01:00
798ad20534 Show countries for delivery process forms. Refactor countries. Almira Krdzic 2018-11-27 00:57:35 +01:00
61ff7dbc60 Merge branch 'add-phone-number-field-in-backoffice-profile' into 'development' Almira 2018-11-22 12:24:42 +00:00
09fc3f8018 Rename class Bilal Catic 2018-11-22 13:22:05 +01:00
217dfb1889 add validation functions class Bilal Catic 2018-11-22 12:08:41 +01:00
8d954469ee use woocommerce validation Bilal Catic 2018-11-22 11:27:30 +01:00
68c760a426 validate phone number from frontend Bilal Catic 2018-11-21 12:25:47 +01:00
35854d1367 add phone number field Bilal Catic 2018-11-21 12:25:34 +01:00
f51d9f5512 Merge branch 'development' into 'master' Bilal Catic 2018-11-19 15:42:25 +00:00
3db4b71c3f Merge branch 'fix-location-details-field' into 'development' Almira 2018-11-19 15:32:55 +00:00
3df6397280 remove comment Bilal Catic 2018-11-19 16:30:04 +01:00
e548e2a31c break project name and location details if too long Bilal Catic 2018-11-19 16:29:22 +01:00
3d37a88247 Merge branch 'ticketing-integration' into 'development' Almira 2018-11-19 12:44:16 +00:00
30e5d594ad highlight helpdesk when selected Bilal Catic 2018-11-19 12:28:57 +01:00
dd93677def add helpdesk module Bilal Catic 2018-11-16 00:54:44 +01:00
4de01d93d1 Merge branch 'fix-bundle-link-in-order-details' into 'development' Nedim Uka 2018-11-19 12:37:09 +00:00
2fdae06a59 set commercial id to real id, not object Bilal Catic 2018-11-19 13:25:21 +01:00
d0533b3d6e Merge branch 'support-email' into 'development' Almira 2018-11-19 12:24:10 +00:00
35e670fa52 removved debug log Nedim Uka 2018-11-19 13:15:50 +01:00
f56377f606 Handled proper endpoint naming Nedim Uka 2018-11-19 12:35:04 +01:00
95a9fd2110 Merge branch 'fix-additional-days-bug' into 'development' Almira 2018-11-19 11:11:34 +00:00
752df56d4a Fixed bug where order note text is saved as order ID Nedim Uka 2018-11-19 11:31:46 +01:00
e1594f3a7f Merge branch 'fixes' into 'development' Bilal Catic 2018-11-19 10:15:26 +00:00
4f97df5b45 Merge branch 'development' into fixes Almira Krdzic 2018-11-18 22:10:24 +01:00
ef5cf00983 Fix hidden metadata Almira Krdzic 2018-11-18 22:10:01 +01:00
ca0fed674f add only working days Bilal Catic 2018-11-16 20:30:47 +01:00
fb66d56d9c Merge branch 'installation-fix' into 'development' Bilal Catic 2018-11-16 19:20:35 +00:00
a07c0e4584 Added support for sending customer emails Nedim Uka 2018-11-16 17:14:15 +01:00
3708c9fb30 Fix installation selection installation-fix Almira Krdzic 2018-11-16 15:59:16 +01:00
c630452d0b Merge branch 'fix-tests' into 'development' Bilal Catic 2018-11-16 09:38:51 +00:00
a62de78172 fix and remove broken tests fix-tests Almira Krdzic 2018-11-15 23:40:58 +01:00
14550d2ea9 Merge branch 'allign-order-table' into 'development' Almira 2018-11-15 15:23:51 +00:00
56c171df3e break long words Bilal Catic 2018-11-15 11:38:09 +01:00
337f031705 Merge branch 'documents-fix' into 'development' Bilal Catic 2018-11-15 13:44:55 +00:00
b7be6fde42 Merge branch 'development' into documents-fix documents-fix Almira Krdzic 2018-11-15 14:33:15 +01:00
6c656a0b26 Handle order documents Almira Krdzic 2018-11-15 11:29:15 +01:00
c4d539f549 Merge branch 'documents-fix' into 'development' Bilal Catic 2018-11-07 10:17:46 +00:00
0ba27b2f1d documents fix Almira Krdzic 2018-11-07 03:05:54 +01:00
e6b372f5d0 Merge branch 'cart-validation' into 'development' Bilal Catic 2018-11-06 20:13:13 +00:00

1 2 3 4 5 ...