senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
536 Commits 18 Branches 0 Tags
master
Commit Graph

536 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Almira
dd8a793ec4 Merge branch 'development' into 'master' 
Update number of packages per page

See merge request saburly/wiaas/new-wiaas!94
 2019-01-07 23:55:51 +00:00
Almira Krdzic
21b52b7086 update constant 2019-01-08 00:54:40 +01:00
Almira
5fd4beafe4 Merge branch 'development' into 'master' 
Fixes

See merge request saburly/wiaas/new-wiaas!93
 2019-01-07 23:35:51 +00:00
Almira
77ba75ab6c Merge branch 'fixes' into 'development' 
Fixes

See merge request saburly/wiaas/new-wiaas!92
 2019-01-07 23:18:34 +00:00
Almira Krdzic
81207c40ab fixes 2019-01-07 21:32:48 +01:00
Almira Krdzic
1c5a808a69 fixes 2019-01-07 21:21:43 +01:00
Almira Krdzic
423bb18b29 update shop page size 2019-01-07 21:17:55 +01:00
Almira Krdzic
e3392a9da7 Fixes 2019-01-07 21:15:06 +01:00
Almira
9043a45ed7 Merge branch 'development' into 'master' 
Rename pricing options

See merge request saburly/wiaas/new-wiaas!91
 2019-01-07 11:12:15 +00:00
Nedim Uka
b1230e5111 Merge branch 'rename-pricing' into 'development' 
Rename pricing options

See merge request saburly/wiaas/new-wiaas!90
 2019-01-07 10:31:04 +00:00
Almira Krdzic
b9ad9f2a34 Rename pricing options 2019-01-07 11:23:44 +01:00
Almira
8b3908782d Merge branch 'development' into 'master' 
Bugfixes

See merge request saburly/wiaas/new-wiaas!89
 2018-12-13 12:25:17 +00:00
Almira
395a60b1cf Merge branch 'abbrevations' into 'development' 
Extra commision column now split into 3 , and tooltip added

See merge request saburly/wiaas/new-wiaas!84
 2018-12-06 11:08:25 +00:00
Nedim Uka
85d21322a0 improved redability of cl-package prices table 2018-12-06 11:54:20 +01:00
Nedim Uka
c133374159 removed other abbervations 2018-12-06 11:43:16 +01:00
Almira
a3761f3c71 Merge branch 'max-cost-margin-tooltip' into 'development' 
show tooltip for max cost margin

See merge request saburly/wiaas/new-wiaas!83
 2018-12-05 19:39:28 +00:00
Bilal Catic
e4da6c7d45 use woocommerce help tip 2018-12-05 19:52:33 +01:00
Bilal Catic
4aed08a96b use wordpress icons for consistency 2018-12-05 19:52:33 +01:00
Bilal Catic
bb9dc470d4 show tooltip for max cost margin 2018-12-05 19:52:33 +01:00
Bilal Catic
017838cd6a Merge branch 'cherry-pick-392b1134' into 'master' 
Remove Co-Market from customer interface

See merge request saburly/wiaas/new-wiaas!88
 2018-12-05 18:45:14 +00:00
Almira
6a9211f84a Merge branch 'fix-image-style' into 'development' 
Fix banner image style (Remove Co-Market from customer interface)

See merge request saburly/wiaas/new-wiaas!87

(cherry picked from commit 392b113427)

3ce531ca Fix banner image style
d15cb6a2 fix image size
 2018-12-05 18:24:14 +00:00
Almira
392b113427 Merge branch 'fix-image-style' into 'development' 
Fix banner image style (Remove Co-Market from customer interface)

See merge request saburly/wiaas/new-wiaas!87
 2018-12-05 18:21:33 +00:00
Almira Krdzic
d15cb6a225 fix image size 2018-12-05 19:04:45 +01:00
Almira Krdzic
3ce531ca4e Fix banner image style 2018-12-05 14:54:31 +01:00
Nedim Uka
ba0549b9fb Mooved tooltip 2018-12-05 14:44:38 +01:00
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 f33c6aa6e2)

1726c3d7 Remove Co-Market from customer interface
 2018-12-05 13:20:43 +00:00
Bilal Catic
f33c6aa6e2 Merge branch 'remove-co-market' into 'development' 
Remove Co-Market from customer interface

See merge request saburly/wiaas/new-wiaas!85
 2018-12-05 11:57:01 +00:00
Almira Krdzic
1726c3d7f7 Remove Co-Market from customer interface 2018-12-04 20:34:23 +01:00
Nedim Uka
4f057b8338 Extra commision column now split into 3 , and tooltip added 2018-12-04 10:26:32 +01:00
Bilal Catic
89080780ed Merge branch 'dashboard' into 'development' 
Dashboard

See merge request saburly/wiaas/new-wiaas!82
 2018-12-03 15:04:27 +00:00
Almira Krdzic
17d4dfe3d7 Merge branch 'development' into dashboard 2018-12-03 16:03:29 +01:00
Almira Krdzic
103fc53c1d display instructions if any 2018-12-03 16:02:53 +01:00
Almira
d800f44b8d Merge branch 'backoffice-package-details' into 'development' 
Added pricing to quickedit

See merge request saburly/wiaas/new-wiaas!78
 2018-12-03 13:04:44 +00:00
Almira Krdzic
8476529bb4 Add timeline 2018-12-03 13:13:03 +01:00
Almira Krdzic
c5f590c3fe Use custom capability to manage access to order delivery process 2018-12-03 12:20:47 +01:00
Almira Krdzic
2c0e217a49 Handle access to order delivery process page 2018-12-03 01:59:24 +01:00
Almira Krdzic
5d5ab87595 Merge branch 'development' into dashboard 2018-12-03 00:52:04 +01:00
Almira
6c6612c7c6 Merge branch 'backend-add-missing-details-order-view' into 'development' 
Backend add missing details order view

See merge request saburly/wiaas/new-wiaas!77
 2018-12-02 23:08:34 +00:00
Almira Krdzic
a2c088ba52 Fix order details display 2018-12-03 00:02:23 +01:00
Bilal Catic
397a0ed831 add wiaas prefix 2018-12-03 00:02:23 +01:00
Bilal Catic
a0b7faa90f show delivery details 2018-12-03 00:02:23 +01:00
Bilal Catic
29fb07205e Remove custom class 2018-12-03 00:02:23 +01:00
Bilal Catic
00a1ef7da5 add order payment details to order preview 2018-12-03 00:02:23 +01:00
Bilal Catic
2f18e1e47c remove obsolete info from order preview 2018-12-03 00:02:23 +01:00
Bilal Catic
8b5ea356e7 show item prices in order preview 2018-12-03 00:02:23 +01:00
Bilal Catic
434d0ab6b3 add commercial lead name to order preview 2018-12-03 00:02:23 +01:00
Bilal Catic
a5419e2f3c add custom columns to order list view 2018-12-03 00:02:23 +01:00
Bilal Catic
00f9d5cafa Merge branch 'fix-order-assigment-bug' into 'development' 
Fix assigment order issues

See merge request saburly/wiaas/new-wiaas!81
 2018-12-02 22:59:08 +00:00
Almira Krdzic
670eb53da1 Fix countries 2018-12-02 22:59:20 +01:00